diff --git a/.gitignore b/.gitignore
index 178135c..7ab6725 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 /dist/
+/nbproject/private/
+/build/
diff --git a/FUNET.iml b/FUNET.iml
new file mode 100644
index 0000000..70b61e7
--- /dev/null
+++ b/FUNET.iml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
+      <excludeFolder url="file://$MODULE_DIR$/.idea/copilot/chatSessions" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="library1" level="project" />
+    <orderEntry type="library" name="lib" level="project" />
+    <orderEntry type="library" name="library" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/database/FUNET.sql b/database/FUNET.sql
index e1e3573..7252c59 100644
--- a/database/FUNET.sql
+++ b/database/FUNET.sql
@@ -1,211 +1,436 @@
-CREATE DATABASE FUNET;
-
-GO
-USE FUNET;
-
-GO
-DROP TABLE IF EXISTS friendship;
-DROP TABLE IF EXISTS message;
-DROP TABLE IF EXISTS comment;
-DROP TABLE IF EXISTS post_like;
-DROP TABLE IF EXISTS post;
-DROP TABLE IF EXISTS conversation_member;
-DROP TABLE IF EXISTS userAccount;
-DROP TABLE IF EXISTS conversation;
-drop procedure if exists checkDuplicateEmail
-drop procedure if exists registerUser
-drop procedure if exists getAllFriends
-
-GO
-CREATE TABLE userAccount (
-  user_id INT IDENTITY(1,1) PRIMARY KEY,
-  first_name NVARCHAR(50) NOT NULL,
-  last_name NVARCHAR(50) NOT NULL,
-  password NVARCHAR(MAX) NULL,
-  email VARCHAR(70) NOT NULL UNIQUE,
-  profile_pic VARCHAR(max) NOT NULL,
-  role VARCHAR(20) NOT NULL, 
-  is_banned BIT NOT NULL
-);
-
-GO
-CREATE TABLE friendship (
-	friendship_id INT IDENTITY(1,1) PRIMARY KEY,
-	sender INT,
-	receiver INT,
-	status nvarchar(10) NOT NULL,
-	CONSTRAINT fk_sender FOREIGN KEY (sender) REFERENCES userAccount (user_id) ON DELETE NO ACTION ON UPDATE NO ACTION,
-	CONSTRAINT fk_receiver FOREIGN KEY (receiver) REFERENCES userAccount (user_id) ON DELETE NO ACTION ON UPDATE NO ACTION
-);
-
-GO
-CREATE TABLE post (
-  post_id INT IDENTITY(1,1) PRIMARY KEY,
-  user_id INT NOT NULL,
-  body NVARCHAR(200),
-  image_path NVARCHAR(max),
-  post_time DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  like_count INT not null default 0,
-  CONSTRAINT fk_post_user FOREIGN KEY (user_id) REFERENCES userAccount (user_id) ON DELETE CASCADE ON UPDATE CASCADE
-);
-
-GO
-CREATE TABLE post_like (
-	like_id INT NOT NULL IDENTITY(1,1) PRIMARY KEY, 
-    user_id INT NOT NULL,
-    post_id INT NOT NULL,
-    like_time DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-	CONSTRAINT fk_like_user FOREIGN KEY (user_id) REFERENCES userAccount (user_id),
-    CONSTRAINT fk_like_post FOREIGN KEY (post_id) REFERENCES post(post_id)
-);
-
-GO
-CREATE TABLE comment (
-    comment_id INT IDENTITY(1,1) PRIMARY KEY,
-    post_id INT NOT NULL,
-    user_id INT NOT NULL,
-    comment_text NVARCHAR(MAX) NOT NULL,
-	comment_time DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    CONSTRAINT fk_comment_post FOREIGN KEY (post_id) REFERENCES post (post_id) ON DELETE CASCADE,
-    CONSTRAINT fk_comment_user FOREIGN KEY (user_id) REFERENCES userAccount (user_id)
-);
-
-GO
-CREATE TABLE conversation (
-	conversation_id INT PRIMARY KEY, 
-	conversation_name NVARCHAR(50),
-	conversation_avater nvarchar(50) NOT NULL
-);
-
-GO
-CREATE TABLE message (
-	message_id INT IDENTITY(1,1) PRIMARY KEY,
-	sender INT NOT NULL,
-	receiver INT,
-	conversation_id INT NOT NULL,
-	message_text NVARCHAR(400) NOT NULL,
-	message_type VARCHAR(40) NOT NULL,
-	sent_date DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-	FOREIGN KEY (sender) REFERENCES userAccount (user_id) ON DELETE NO ACTION ON UPDATE NO ACTION,
-	FOREIGN KEY (receiver) REFERENCES userAccount (user_id) ON DELETE NO ACTION ON UPDATE NO ACTION,
-	FOREIGN KEY (conversation_id) REFERENCES conversation (conversation_id) ON DELETE NO ACTION ON UPDATE NO ACTION
-);
-
-GO 
-CREATE TABLE conversation_member (
-	is_admin BIT NOT NULL,
-	user_id INT,
-	conversation_id INT,
-	CONSTRAINT fk_user_id FOREIGN KEY (user_id) REFERENCES userAccount(user_id),
-	CONSTRAINT fk_convesation FOREIGN KEY (conversation_id) REFERENCES conversation (conversation_id) ON DELETE NO ACTION ON UPDATE NO ACTION,
-	PRIMARY KEY (user_id, conversation_id)
-)
-
-GO
-CREATE PROCEDURE registerUser
-    @first_name varchar(20),
-    @last_name varchar(20),
-    @password varchar(20),
-    @email varchar(50)
-AS
-	BEGIN TRANSACTION	
-    
-	IF EXISTS (
-        SELECT 1
-        FROM userAccount
-        WHERE email = @email
-    )
-    BEGIN
-        ROLLBACK TRANSACTION;
-		THROW 5000, 'Duplicated Email.', 1;
-        RETURN;
-    END
-    
-    INSERT INTO userAccount (first_name, last_name, password, email) 
-    VALUES (@first_name, @last_name, @password, @email)
-    
-    COMMIT TRANSACTION;
-
-GO
-CREATE PROCEDURE getAllFriends
-    @userId INT
-AS
-BEGIN
-    SELECT u.user_id, u.first_name, u.last_name, u.profile_pic, u.role, u.is_banned, f.status
-    FROM userAccount u
-    INNER JOIN friendship f ON 
-        (f.sender = u.user_id AND f.receiver = @userId)
-        OR (f.receiver = u.user_id AND f.sender = @userId)
-    WHERE f.status = 'accepted';
-END;
-
-insert into userAccount values ('Nguyen', 'Tuan' , '123', 'anhtuan123@gmail.com', 'default_avt.jpg', 'student', 'false')
-insert into userAccount values ('Ha', 'Phan', '123', 'haphan123@gmail.com', 'default_avt.jpg', 'staft', 'false')
-insert into userAccount values ('Thanh', 'Tung', '123', 'thanhtung123@gmail.com', 'default_avt.jpg', 'student', 'false')
-insert into userAccount values ('vua', 'ga', '123', 'vuaga1260@gmail.com', 'default_avt.jpg', 'student', 'false')
-
-
-
-Go
-Select * from userAccount
-
-EXEC getAllFriends 1;
-
-CREATE TABLE product (
-    product_id INT IDENTITY(1,1) PRIMARY KEY,
-    user_id INT NOT NULL,
-    product_name NVARCHAR(255) NOT NULL,
-    product_description NVARCHAR(500), -- Điều chỉnh độ dài nếu cần
-	product_img text NOT NULL,
-    product_tag NVARCHAR(255) NOT NULL,
-    publish_date DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    price DECIMAL(10, 2) NOT NULL, -- Điều chỉnh kiểu dữ liệu để biểu diễn giá
-    CONSTRAINT fk_product_user_id FOREIGN KEY (user_id) REFERENCES userAccount(user_id)
-);
-GO
-
-CREATE TABLE learningmaterial (
-    learningmaterial_id INT IDENTITY(1,1) PRIMARY KEY,
-    user_id INT NOT NULL,
-    learningmaterial_name NVARCHAR(255) NOT NULL,
-    learningmaterial_description NVARCHAR(500), -- Tăng độ dài mô tả nếu cần
-    learningmaterial_img NVARCHAR(MAX) NOT NULL, -- Change to NVARCHAR(MAX)
-    learningmaterial_context NVARCHAR(MAX) NOT NULL, -- Change to NVARCHAR(MAX)
-    subject_code NVARCHAR(7) NOT NULL,
-    publish_date DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, -- Thêm giá trị mặc định
-    review NVARCHAR(MAX), -- Thay đổi kiểu dữ liệu cho phù hợp
-    CONSTRAINT fk_learningmaterial_user_id FOREIGN KEY (user_id) REFERENCES userAccount(user_id)
-);
-GO
-
-INSERT INTO learningmaterial (user_id, learningmaterial_name, learningmaterial_description, learningmaterial_img, learningmaterial_context, subject_code, review)
-VALUES 
-(1, 'Introduction to Programming', 'A comprehensive guide to programming concepts for beginners.', 'assets/product/item.png', 'assets/leaningMaterial/SWR302_LAB.docx', 'CS101', 'Great resource for beginners.'),
-(3, 'Data Structures and Algorithms', 'Understand the key data structures and algorithms used in computer science.', 'assets/product/item.png', 'assets/leaningMaterial/SWR302_LAB.docx', 'CS404', 'Excellent for interview preparation.'),
-(2, 'Machine Learning Basics', 'An introduction to the concepts of machine learning and its applications.', 'assets/product/item.png', 'assets/leaningMaterial/SWR302_LAB.docx', 'CS505', 'Great starting point for ML enthusiasts.');
-
-GO
-
-SELECT * FROM learningmaterial
-
-ALTER TABLE friendship DROP CONSTRAINT fk_sender;
-ALTER TABLE friendship DROP CONSTRAINT fk_receiver;
-
-ALTER TABLE post DROP CONSTRAINT fk_post_user;
-
-ALTER TABLE post_like DROP CONSTRAINT fk_like_user;
-ALTER TABLE post_like DROP CONSTRAINT fk_like_post;
-
-ALTER TABLE comment DROP CONSTRAINT fk_comment_user;
-ALTER TABLE comment DROP CONSTRAINT fk_comment_post;
-
-ALTER TABLE message DROP CONSTRAINT fk_sender;
-ALTER TABLE message DROP CONSTRAINT fk_receiver;
-ALTER TABLE message DROP CONSTRAINT fk_conversation;
-
-ALTER TABLE conversation_member DROP CONSTRAINT fk_user_id;
-ALTER TABLE conversation_member DROP CONSTRAINT fk_convesation;
-
-ALTER TABLE product DROP CONSTRAINT fk_product_user_id;
-
-ALTER TABLE learningmaterial DROP CONSTRAINT fk_learningmaterial_user_id;
\ No newline at end of file
+
+CREATE DATABASE FUNET;
+
+GO
+USE FUNET;
+
+GO
+DROP TABLE IF EXISTS friendship;
+DROP TABLE IF EXISTS comment;
+DROP TABLE IF EXISTS post_like;
+DROP TABLE IF EXISTS post_share;
+DROP TABLE IF EXISTS post;
+DROP TABLE IF EXISTS message;
+DROP TABLE IF EXISTS conversation_users;
+DROP TABLE IF EXISTS conversation;
+DROP TABLE IF EXISTS categories;
+DROP TABLE IF EXISTS game;
+DROP TABLE IF EXISTS GameCategory;
+DROP TABLE IF EXISTS categories;
+DROP TABLE IF EXISTS learningmaterial;
+DROP TABLE IF EXISTS conversation;
+DROP TABLE IF EXISTS product;
+DROP TABLE IF EXISTS UserActivityLog;
+DROP TABLE IF EXISTS userAccount;
+drop procedure if exists getAllFriends;
+DROP TRIGGER IF EXISTS TR_Post_Activity;
+DROP TRIGGER IF EXISTS TR_Comment_Activity;
+DROP TRIGGER IF EXISTS TR_PostLike_Activity;
+
+GO
+CREATE TABLE userAccount (
+  user_id INT IDENTITY(1,1) PRIMARY KEY,
+  first_name NVARCHAR(50) NOT NULL,
+  last_name NVARCHAR(50) NOT NULL,
+  password VARCHAR(30) NULL,
+  email VARCHAR(70) NOT NULL UNIQUE,
+  profile_pic VARCHAR(max) NOT NULL,
+  role VARCHAR(20) NOT NULL, 
+  user_introduce NVARCHAR(50),
+  is_banned BIT NOT NULL,
+  created_at DATE DEFAULT CAST(GETDATE() AS DATE) NOT NULL
+);
+
+
+GO
+CREATE TABLE friendship (
+	friendship_id INT IDENTITY(1,1) PRIMARY KEY,
+	sender INT,
+	receiver INT,
+	status nvarchar(10) NOT NULL,
+	CONSTRAINT fk_sender FOREIGN KEY (sender) REFERENCES userAccount (user_id) ON DELETE NO ACTION ON UPDATE NO ACTION,
+	CONSTRAINT fk_receiver FOREIGN KEY (receiver) REFERENCES userAccount (user_id) ON DELETE NO ACTION ON UPDATE NO ACTION
+);
+
+GO
+CREATE TABLE post (
+  post_id INT IDENTITY(1,1) PRIMARY KEY,
+  user_id INT NOT NULL,
+  body NVARCHAR(200),
+  image_path NVARCHAR(max),
+  post_time DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  like_count INT not null default 0,
+  is_shared BIT NOT NULL DEFAULT 0,
+  original_post_id INT NULL,
+  share_count INT NOT NULL DEFAULT 0,
+  privacy_mode NVARCHAR(10) NOT NULL DEFAULT 'friend',
+  FOREIGN KEY (user_id) REFERENCES userAccount (user_id),
+  type NVARCHAR(max)
+);
+
+GO
+CREATE TABLE post_like (
+	like_id INT NOT NULL IDENTITY(1,1) PRIMARY KEY, 
+    user_id INT NOT NULL,
+    post_id INT NOT NULL,
+    like_time DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+	CONSTRAINT fk_like_user FOREIGN KEY (user_id) REFERENCES userAccount (user_id),
+    CONSTRAINT fk_like_post FOREIGN KEY (post_id) REFERENCES post(post_id)
+);
+
+GO
+CREATE TABLE comment (
+    comment_id INT IDENTITY(1,1) PRIMARY KEY,
+    post_id INT NOT NULL,
+    user_id INT NOT NULL,
+    comment_text NVARCHAR(MAX) NOT NULL,
+	comment_time DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    FOREIGN KEY (post_id) REFERENCES post (post_id),
+	comment_image NVARCHAR(MAX),
+    FOREIGN KEY (user_id) REFERENCES userAccount (user_id)
+);
+
+GO
+CREATE TABLE conversation (
+	conversation_id INT IDENTITY(1,1) PRIMARY KEY, 
+	conversation_name NVARCHAR(50),
+	conversation_avatar nvarchar(200) NOT NULL
+);
+
+GO 
+CREATE TABLE conversation_users (
+	is_admin BIT NOT NULL,
+	user_id INT,
+	conversation_id INT,
+	FOREIGN KEY (user_id) REFERENCES userAccount(user_id),
+	FOREIGN KEY (conversation_id) REFERENCES conversation (conversation_id),
+	PRIMARY KEY (user_id, conversation_id)
+);
+
+GO
+CREATE TABLE message (
+	message_id INT IDENTITY(1,1) PRIMARY KEY,
+	sender INT NOT NULL,
+	receiver INT,
+	conversation_id INT NOT NULL,
+	message_text NVARCHAR(400) NOT NULL,
+	message_type VARCHAR(40) NOT NULL,
+	sent_date DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+	FOREIGN KEY (sender) REFERENCES userAccount (user_id) ON DELETE NO ACTION ON UPDATE NO ACTION,
+	FOREIGN KEY (receiver) REFERENCES userAccount (user_id) ON DELETE NO ACTION ON UPDATE NO ACTION,
+	FOREIGN KEY (conversation_id) REFERENCES conversation (conversation_id) ON DELETE NO ACTION ON UPDATE NO ACTION
+);
+
+GO
+CREATE TABLE post_share (
+    share_id INT IDENTITY(1,1) PRIMARY KEY,
+    user_id INT NOT NULL,
+    post_id INT NOT NULL,
+    share_time DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    like_time DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+	FOREIGN KEY (user_id) REFERENCES userAccount (user_id),
+    FOREIGN KEY (post_id) REFERENCES post(post_id)
+);
+
+GO
+CREATE TABLE categories (
+    tag_id INT PRIMARY KEY IDENTITY(1,1),
+    tag_name NVARCHAR(50) NOT NULL
+);
+go
+CREATE TABLE GameCategory (
+    CategoryID INT PRIMARY KEY IDENTITY(1,1),
+    CategoryName NVARCHAR(50) NOT NULL
+);
+GO
+INSERT INTO GameCategory (CategoryName) VALUES 
+(N'Action'),
+(N'Adventure'),
+(N'Board game'),
+(N'Card game'),
+(N'Building'),
+(N'Combat');
+GO
+
+GO
+CREATE TABLE Game (
+    GameID INT PRIMARY KEY,
+    GameName NVARCHAR(50) NOT NULL,
+    GameLink NVARCHAR(200),
+	Img NVARCHAR(200),
+    CategoryID INT,
+    FOREIGN KEY (CategoryID) REFERENCES GameCategory(CategoryID)
+);
+
+
+select * from Game
+GO
+INSERT INTO Game (GameID, GameName, GameLink,Img, CategoryID) VALUES 
+(1, N'Triple Cars', 'https://cdn.htmlgames.com/TripleCars/','https://res.cloudinary.com/dxx8u5qnr/image/upload/v1730128426/1_m5ce3b.jpg', 1),
+(2, N'Pyramid Solitaire - Great Pyramid', 'https://cdn.htmlgames.com/PyramidSolitaire-GreatPyramid/','https://res.cloudinary.com/dxx8u5qnr/image/upload/v1730128429/2_hbckn7.jpg', 4),
+(3, N'Sushi Master', 'https://cdn.htmlgames.com/SushiMasterMatch3/','https://res.cloudinary.com/dxx8u5qnr/image/upload/v1730128432/3_fejrwt.jpg' ,3),
+(4, N'Goblin Run', 'https://cdn.htmlgames.com/GoblinRun/','https://res.cloudinary.com/dxx8u5qnr/image/upload/v1730128433/4_mwn2gs.jpg' ,1),
+(5, N'Solitaire Collection 2', 'https://cdn.htmlgames.com/SolitaireCollection2/','https://res.cloudinary.com/dxx8u5qnr/image/upload/v1730128434/5_kqtfci.jpg' ,4),
+(6, N'Escape Room - Home Escape', 'https://cdn.htmlgames.com/EscapeRoom-HomeEscape/','https://res.cloudinary.com/dxx8u5qnr/image/upload/v1730128436/6_jnwrix.jpg' ,2),
+(7, N'Reach 7', 'https://cdn.htmlgames.com/Reach7/', 'https://res.cloudinary.com/dxx8u5qnr/image/upload/v1730128437/7_mnp4xu.jpg',3),
+(8, N'Solitaire Collection', 'https://cdn.htmlgames.com/SolitaireCollection/', 'https://res.cloudinary.com/dxx8u5qnr/image/upload/v1730128440/8_zsb97b.jpg',4),
+(9, N'2048 Billiards', 'https://cdn.htmlgames.com/2048Billiards/', 'https://res.cloudinary.com/dxx8u5qnr/image/upload/v1730128443/9_n0pe4j.jpg',3),
+(10, N'Jungle Link', 'https://cdn.htmlgames.com/JungleLink/', 'https://res.cloudinary.com/dxx8u5qnr/image/upload/v1730128442/10_haa16t.jpg',2),
+(11, N'The Watermelon Game', 'https://cdn.htmlgames.com/TheWatermelonGame/','https://res.cloudinary.com/dxx8u5qnr/image/upload/v1730128447/11_mfk2fp.png' ,5),
+(12, N'Double Klondike', 'https://cdn.htmlgames.com/DoubleKlondike/','https://res.cloudinary.com/dxx8u5qnr/image/upload/v1730128446/12_chkpc8.png' ,4),
+(13, N'Water Sort', 'https://cdn.htmlgames.com/WaterSort/', 'https://res.cloudinary.com/dxx8u5qnr/image/upload/v1730128451/13_ln7tcj.png',1),
+(14, N'Jungle Sniper', 'https://cdn.htmlgames.com/JungleSniper/', 'https://res.cloudinary.com/dxx8u5qnr/image/upload/v1730128449/14_s56l3x.png',6),
+(15, N'Kitty Mahjong', 'https://cdn.htmlgames.com/KittyMahjong/','https://res.cloudinary.com/dxx8u5qnr/image/upload/v1730128455/15_vzjess.png' ,6),
+(16, N'Balloon Maze', 'https://cdn.htmlgames.com/BalloonMaze/','https://res.cloudinary.com/dxx8u5qnr/image/upload/v1730128456/16_duqruw.png' ,2),
+(17, N'Mysterious Pirate Jewels 3', 'https://cdn.htmlgames.com/MysteriousPirateJewels3/','https://res.cloudinary.com/dxx8u5qnr/image/upload/v1730128453/17_urluf9.png' ,2),
+(18, N'Aladdin Solitaire', 'https://cdn.htmlgames.com/AladdinSolitaire/','https://res.cloudinary.com/dxx8u5qnr/image/upload/v1730128463/18_linw8x.png' ,3),
+(19, N'Tap It Away 3D', 'https://cdn.htmlgames.com/TapItAway3D/','https://res.cloudinary.com/dxx8u5qnr/image/upload/v1730128459/19_nbcgxt.png' ,5),
+(20, N'Pyramid Solitaire - Ancient China', 'https://cdn.htmlgames.com/PyramidSolitaire-AncientChina/','https://res.cloudinary.com/dxx8u5qnr/image/upload/v1730128467/20_d8w2fu.png' ,2),
+(21, N'Ninja Breakout', 'https://cdn.htmlgames.com/NinjaBreakout/', 'https://res.cloudinary.com/dxx8u5qnr/image/upload/v1730128462/21_atiu5f.png',6),
+(22, N'Bubble Throw', 'https://cdn.htmlgames.com/BubbleThrow/', 'https://res.cloudinary.com/dxx8u5qnr/image/upload/v1730128473/22_tvl6jc.png',6),
+(23, N'Freecell Extreme', 'https://cdn.htmlgames.com/FreecellExtreme/','https://res.cloudinary.com/dxx8u5qnr/image/upload/v1730128474/23_ardt0p.png',4),
+(24, N'Connect the Dots', 'https://cdn.htmlgames.com/ConnectTheDots/','https://res.cloudinary.com/dxx8u5qnr/image/upload/v1730128466/24_szcuqa.png' ,5),
+(25, N'Harbour Escape', 'https://cdn.htmlgames.com/HarbourEscape/', 'https://res.cloudinary.com/dxx8u5qnr/image/upload/v1730128476/25_nag1rk.png',1),
+(26, N'Flower World 2', 'https://cdn.htmlgames.com/FlowerWorld2/','https://res.cloudinary.com/dxx8u5qnr/image/upload/v1730128478/26_hrruhx.png' ,1),
+(27, N'Black and White Mahjong 3', 'https://cdn.htmlgames.com/BlackAndWhiteMahjong3/','https://res.cloudinary.com/dxx8u5qnr/image/upload/v1730128471/27_uimb29.png' ,3),
+(28, N'Archery Training', 'https://cdn.htmlgames.com/ArcheryTraining/','https://res.cloudinary.com/dxx8u5qnr/image/upload/v1730128480/28_sdcsmp.png' ,6),
+(29, N'Spooky Dimensions', 'https://cdn.htmlgames.com/SpookyDimensions/','https://res.cloudinary.com/dxx8u5qnr/image/upload/v1730128482/29_xpuh9w.png' ,5),
+(30, N'Circus Match 3', 'https://cdn.htmlgames.com/CircusMatch3/', 'https://res.cloudinary.com/dxx8u5qnr/image/upload/v1730128484/30_s6hfa9.png',5);
+
+
+go
+select * from game
+
+CREATE TABLE UserActivityLog (
+    log_id INT IDENTITY(1,1) PRIMARY KEY,
+    user_id INT NOT NULL,
+    activity_type VARCHAR(50) NOT NULL,
+    activity_details NVARCHAR(MAX),
+    post_id INT NULL,
+    comment_id INT NULL,
+    timestamp DATETIME DEFAULT GETDATE(),
+    FOREIGN KEY (user_id) REFERENCES userAccount(user_id),
+    FOREIGN KEY (post_id) REFERENCES post(post_id),
+    FOREIGN KEY (comment_id) REFERENCES comment(comment_id) 
+);
+go
+CREATE TRIGGER TR_Post_Activity
+ON post
+AFTER INSERT, UPDATE
+AS
+BEGIN
+ 
+    INSERT INTO UserActivityLog (user_id, activity_type, activity_details, post_id)
+    SELECT 
+        i.user_id,
+        'POST_CREATED',
+        i.body, 
+        i.post_id
+    FROM inserted i
+    WHERE NOT EXISTS (SELECT 1 FROM deleted);
+
+   
+    INSERT INTO UserActivityLog (user_id, activity_type, activity_details, post_id)
+    SELECT 
+        i.user_id,
+        'POST_UPDATED',
+        'Changed from: ' + ISNULL(d.body, 'empty') + ' to: ' + ISNULL(i.body, 'empty'), -- Show content change
+        i.post_id
+    FROM inserted i
+    INNER JOIN deleted d ON i.post_id = d.post_id;
+END;
+
+go
+CREATE TRIGGER TR_Comment_Activity
+ON comment
+AFTER INSERT, UPDATE
+AS
+BEGIN
+ 
+    INSERT INTO UserActivityLog (user_id, activity_type, activity_details, post_id, comment_id)
+    SELECT 
+        i.user_id,
+        'COMMENT_CREATED',
+        i.comment_text, 
+        i.post_id,
+        i.comment_id
+    FROM inserted i
+    WHERE NOT EXISTS (SELECT 1 FROM deleted);
+
+  
+    INSERT INTO UserActivityLog (user_id, activity_type, activity_details, post_id, comment_id)
+    SELECT 
+        i.user_id,
+        'COMMENT_UPDATED',
+        'Changed from: ' + ISNULL(d.comment_text, 'empty') + ' to: ' + ISNULL(i.comment_text, 'empty'), -- Show content change
+        i.post_id,
+        i.comment_id
+    FROM inserted i
+    INNER JOIN deleted d ON i.comment_id = d.comment_id;
+
+ 
+    
+END;
+
+
+
+GO
+CREATE TABLE product (
+    product_id INT IDENTITY(1,1) PRIMARY KEY,
+    user_id INT NOT NULL,
+    product_name NVARCHAR(255) NOT NULL,
+    product_description NVARCHAR(500), 
+	product_img text NOT NULL,
+    product_tag NVARCHAR(255) NOT NULL,
+    publish_date DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    price DECIMAL(10, 2) NOT NULL, 
+    CONSTRAINT fk_product_user_id FOREIGN KEY (user_id) REFERENCES userAccount(user_id)
+);
+GO
+
+CREATE TABLE shoppingCart (
+	cart_id INT IDENTITY(1,1) PRIMARY KEY,
+	user_id INT NOT NULL,
+	add_date DATETIME DEFAULT GETDATE(),
+);
+Go
+
+CREATE TABLE shoppingCartItem (
+	item_id INT PRIMARY KEY IDENTITY(1,1),
+	cart_id INT NOT NULL,
+	product_id INT NOT NULL,
+    quantity INT NOT NULL CHECK (quantity > 0),
+    added_at DATETIME DEFAULT GETDATE(),
+    FOREIGN KEY (cart_id) REFERENCES ShoppingCart(cart_id),
+    FOREIGN KEY (product_id) REFERENCES Product(product_id)
+)
+
+CREATE TABLE Orders (
+    order_id INT primary key,
+    user_id INT NOT NULL,
+	cart_id INT NOT NULL,
+    total_amount DECIMAL(10, 2) NOT NULL,
+    order_status NVARCHAR(50) DEFAULT 'Pending', -- E.g., Pending, Shipped, Delivered
+    order_date DATETIME DEFAULT GETDATE(),
+	order_note NVARCHAR(MAX) NOT NULL,
+    shipping_address NVARCHAR(255) NOT NULL
+);
+GO
+
+
+INSERT INTO ShoppingCart (user_id)
+VALUES 
+(1),  
+(188); 
+GO
+
+INSERT INTO ShoppingCartItem (cart_id, product_id, quantity)
+VALUES 
+(3, 6, 1),  
+(3, 7, 2),  
+(4, 8, 1);  
+GO
+
+INSERT INTO Orders (user_id, total_amount, order_status, shipping_address)
+VALUES 
+(3, 1500.00, 'Pending', '123 Main St, City');
+GO
+
+INSERT INTO OrderDetails (order_id, product_id, quantity, price_per_unit)
+VALUES 
+(1, 6, 1, 1200.00),  -- 1 Laptop in Order ID 1
+(1, 7, 2, 150.00);    -- 2 Headphones in Order ID 1
+GO
+
+
+GO
+CREATE TABLE learningmaterial (
+    learningmaterial_id INT IDENTITY(1,1) PRIMARY KEY,
+    user_id INT NOT NULL,
+    learningmaterial_name NVARCHAR(255) NOT NULL,
+    learningmaterial_description NVARCHAR(500),
+    learningmaterial_context NVARCHAR(255) NOT NULL,
+    subject_code NVARCHAR(7) NOT NULL,
+    publish_date DATETIME2(3) NOT NULL DEFAULT CURRENT_TIMESTAMP, -- Ensure millisecond precision
+    review NVARCHAR(MAX),
+    department_id INT NOT NULL,
+    CONSTRAINT fk_learningmaterial_user_id FOREIGN KEY (user_id) REFERENCES userAccount(user_id)
+);
+INSERT INTO learningmaterial (user_id, learningmaterial_name, learningmaterial_description, learningmaterial_context, subject_code, publish_date, review, department_id) VALUES 
+(1, 'Economics 101', 'Introduction to Economics', 'econ101.pdf', 'ECON101', GETDATE(), 'Great material for beginners', 1),
+(2, 'Advanced IT', 'Deep dive into IT topics', 'adv_it.pdf', 'IT202', GETDATE(), 'In-depth and comprehensive', 2),
+(3, 'Tourism Basics', 'Fundamentals of Tourism', 'tourism_basics.pdf', 'TOUR101', GETDATE(), 'Essential for tourism students', 3),
+(4, 'Language Learning', 'Effective language learning techniques', 'lang_learning.pdf', 'LANG101', GETDATE(), 'Very helpful for language learners', 4);
+
+
+
+CREATE TABLE saved_post (
+    user_id INT NOT NULL,
+    post_id INT NOT NULL,
+    PRIMARY KEY (user_id, post_id),
+    CONSTRAINT fk_saved_user FOREIGN KEY (user_id) REFERENCES userAccount(user_id),
+    CONSTRAINT fk_saved_post FOREIGN KEY (post_id) REFERENCES post(post_id)
+);
+
+
+GO
+CREATE PROCEDURE getAllFriends
+    @userId INT
+AS
+BEGIN
+    SELECT u.user_id, u.first_name, u.last_name, u.profile_pic, u.role, u.is_banned, f.status
+    FROM userAccount u
+    INNER JOIN friendship f ON 
+        (f.sender = u.user_id AND f.receiver = @userId)
+        OR (f.receiver = u.user_id AND f.sender = @userId)
+    WHERE f.status = 'accepted';
+END;
+
+
+go
+ -- January
+INSERT INTO userAccount (first_name, last_name, password, email, profile_pic, role, is_banned, created_at)
+VALUES ('UserJan', 'LastnameJan', 'password', 'userjan@example.com', 'default_avt.jpg', 'student', 0, '2024-01-15');
+
+-- February
+INSERT INTO userAccount (first_name, last_name, password, email, profile_pic, role, is_banned, created_at)
+VALUES ('UserFeb', 'LastnameFeb', 'password', 'userfeb@example.com', 'default_avt.jpg', 'student', 0, '2024-02-15');
+
+-- March
+INSERT INTO userAccount (first_name, last_name, password, email, profile_pic, role, is_banned, created_at)
+VALUES ('UserMar', 'LastnameMar', 'password', 'usermar@example.com', 'default_avt.jpg', 'student', 0, '2024-03-15');
+
+-- April
+INSERT INTO userAccount (first_name, last_name, password, email, profile_pic, role, is_banned, created_at)
+VALUES ('UserApr', 'LastnameApr', 'password', 'userapr@example.com', 'default_avt.jpg', 'student', 0, '2024-04-15');
+
+-- May
+INSERT INTO userAccount (first_name, last_name, password, email, profile_pic, role, is_banned, created_at)
+VALUES ('UserMay', 'LastnameMay', 'password', 'usermay@example.com', 'default_avt.jpg', 'staff', 0, '2024-05-15');
+
+-- June
+INSERT INTO userAccount (first_name, last_name, password, email, profile_pic, role, is_banned, created_at)
+VALUES ('UserJun', 'LastnameJun', 'password', 'userjun@example.com', 'default_avt.jpg', 'staff', 0, '2024-06-15');
+
+-- July
+INSERT INTO userAccount (first_name, last_name, password, email, profile_pic, role, is_banned, created_at)
+VALUES ('UserJul', 'LastnameJul', 'password', 'userjul@example.com', 'default_avt.jpg', 'student', 0, '2024-07-15');
+
+-- August
+INSERT INTO userAccount (first_name, last_name, password, email, profile_pic, role, is_banned, created_at)
+VALUES ('UserAug', 'LastnameAug', 'password', 'useraug@example.com', 'default_avt.jpg', 'staff', 0, '2024-08-15');
+
+-- September
+INSERT INTO userAccount (first_name, last_name, password, email, profile_pic, role, is_banned, created_at)
+VALUES ('UserSep', 'LastnameSep', 'password', 'usersep@example.com', 'default_avt.jpg', 'student', 0, '2024-09-15');
+
+INSERT INTO userAccount (first_name, last_name, password, email, profile_pic, role, is_banned, created_at)
+VALUES ('UserOctgaaah', 'LastnameOct', 'password', 'useroct@exampddalems.com', 'default_avt.jpg', 'staff', 0, '2024-09-15');
+
+
+-- October
+INSERT INTO userAccount (first_name, last_name, password, email, profile_pic, role, is_banned, created_at)
+VALUES ('UserOct', 'LastnameOct', 'password', 'useroct@example.com', 'default_avt.jpg', 'staff', 0, '2024-10-15');
+
+INSERT INTO userAccount (first_name, last_name, password, email, profile_pic, role, is_banned, created_at)
+VALUES ('UserOctgh', 'LastnameOct', 'password', 'useroct@examplems.com', 'default_avt.jpg', 'staff', 0, '2024-10-15');
diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index e6235cf..c9e33e9 100644
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -982,48 +982,84 @@ exists or setup the property manually. For example like this:
     </target>
     <target depends="init,compile,compile-jsps,-pre-dist,-do-dist-with-manifest,-do-dist-without-manifest" name="do-dist"/>
     <target depends="init" if="dist.ear.dir" name="library-inclusion-in-manifest">
-        <copyfiles files="${file.reference.jakarta.servlet.jsp.jstl-3.0.1.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
-        <copyfiles files="${file.reference.jakarta.servlet.jsp.jstl-api-3.0.0.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
-        <copyfiles files="${file.reference.mssql-jdbc-12.6.1.jre11.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
-        <copyfiles files="${file.reference.jakarta.activation-api-2.1.3.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
-        <copyfiles files="${file.reference.jakarta.mail-2.0.1.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
-        <copyfiles files="${file.reference.json-20240303.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
-        <copyfiles files="${file.reference.jakarta.json-api-2.1.3.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
-        <copyfiles files="${file.reference.jakarta.websocket-api-2.2.0.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
-        <copyfiles files="${file.reference.jakarta.websocket-client-api-2.2.0.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.cloudinary-core-1.33.0.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.cloudinary-http44-1.39.0.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.commons-codec-1.17.1.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.commons-io-2.17.0.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.commons-logging-1.2.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.dotenv-java-3.0.2.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.httpclient-4.5.14.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.httpcore-4.4.16.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.httpmime-4.5.14.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.commons-logging-1.2.jar-1}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.fluent-hc-4.5.5.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.gson-2.10.1.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.httpclient-4.5.5.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.httpcore-4.4.9.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
-        <copyfiles files="${file.reference.javaee-api-7.0.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jackson-annotations-2.17.2.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jackson-core-2.17.2.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jackson-databind-2.17.2.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
-        <copyfiles files="${file.reference.gson-2.3.1.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.jakarta.activation-api-2.1.3.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.jakarta.json-api-2.1.3.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.jakarta.mail-2.0.1.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.jakarta.websocket-api-2.2.0.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.jakarta.websocket-client-api-2.2.0.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.javaee-api-7.0.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.json-20240303.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.jakarta.servlet.jsp.jstl-3.0.1.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.jakarta.servlet.jsp.jstl-api-3.0.0.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.mssql-jdbc-12.6.1.jre11.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.slf4j-simple-2.0.7.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.commons-fileupload-1.5.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.commons-io-2.11.0.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.dropbox-core-sdk-5.4.4.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.jackson-annotations-2.15.2.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.jackson-core-2.15.2.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.jackson-databind-2.15.2.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.javax.servlet-api-4.0.1.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.javax.servlet.jsp-api-2.3.3.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.slf4j-api-2.0.7.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <mkdir dir="${build.web.dir}/META-INF"/>
         <manifest file="${build.web.dir}/META-INF/MANIFEST.MF" mode="update"/>
     </target>
     <target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir">
-        <copyfiles files="${file.reference.jakarta.servlet.jsp.jstl-3.0.1.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copyfiles files="${file.reference.jakarta.servlet.jsp.jstl-api-3.0.0.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copyfiles files="${file.reference.mssql-jdbc-12.6.1.jre11.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copyfiles files="${file.reference.jakarta.activation-api-2.1.3.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copyfiles files="${file.reference.jakarta.mail-2.0.1.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copyfiles files="${file.reference.json-20240303.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copyfiles files="${file.reference.jakarta.json-api-2.1.3.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copyfiles files="${file.reference.jakarta.websocket-api-2.2.0.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copyfiles files="${file.reference.jakarta.websocket-client-api-2.2.0.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.cloudinary-core-1.33.0.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.cloudinary-http44-1.39.0.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.commons-codec-1.17.1.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.commons-io-2.17.0.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.commons-logging-1.2.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.dotenv-java-3.0.2.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.httpclient-4.5.14.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.httpcore-4.4.16.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.httpmime-4.5.14.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.commons-logging-1.2.jar-1}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.fluent-hc-4.5.5.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.gson-2.10.1.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.httpclient-4.5.5.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.httpcore-4.4.9.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copyfiles files="${file.reference.javaee-api-7.0.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.jackson-annotations-2.17.2.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.jackson-core-2.17.2.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.jackson-databind-2.17.2.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copyfiles files="${file.reference.gson-2.3.1.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.jakarta.activation-api-2.1.3.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.jakarta.json-api-2.1.3.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.jakarta.mail-2.0.1.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.jakarta.websocket-api-2.2.0.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.jakarta.websocket-client-api-2.2.0.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.javaee-api-7.0.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.json-20240303.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.jakarta.servlet.jsp.jstl-3.0.1.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.jakarta.servlet.jsp.jstl-api-3.0.0.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.mssql-jdbc-12.6.1.jre11.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.slf4j-simple-2.0.7.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.commons-fileupload-1.5.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.commons-io-2.11.0.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.dropbox-core-sdk-5.4.4.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.jackson-annotations-2.15.2.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.jackson-core-2.15.2.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.jackson-databind-2.15.2.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.javax.servlet-api-4.0.1.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.javax.servlet.jsp-api-2.3.3.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.slf4j-api-2.0.7.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
     </target>
     <target depends="init" if="dist.ear.dir" name="-clean-webinf-lib">
         <delete dir="${build.web.dir}/WEB-INF/lib"/>
diff --git a/nbproject/build-impl.xml~ b/nbproject/build-impl.xml~
new file mode 100644
index 0000000..3170928
--- /dev/null
+++ b/nbproject/build-impl.xml~
@@ -0,0 +1,1569 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+        *** GENERATED FROM project.xml - DO NOT EDIT  ***
+        ***         EDIT ../build.xml INSTEAD         ***
+
+        For the purpose of easier reading the script
+        is divided into following sections:
+        - initialization
+        - compilation
+        - dist
+        - execution
+        - debugging
+        - javadoc
+        - test compilation
+        - test execution
+        - test debugging
+        - cleanup
+
+        -->
+<project xmlns:webproject1="http://www.netbeans.org/ns/web-project/1" xmlns:webproject2="http://www.netbeans.org/ns/web-project/2" xmlns:webproject3="http://www.netbeans.org/ns/web-project/3" basedir=".." default="default" name="FUNET-impl">
+    <import file="ant-deploy.xml"/>
+    <fail message="Please build using Ant 1.7.1 or higher.">
+        <condition>
+            <not>
+                <antversion atleast="1.7.1"/>
+            </not>
+        </condition>
+    </fail>
+    <target depends="dist,javadoc" description="Build whole project." name="default"/>
+    <!--
+                INITIALIZATION SECTION
+            -->
+    <target name="-pre-init">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="-pre-init" name="-init-private">
+        <property file="nbproject/private/private.properties"/>
+    </target>
+    <target depends="-pre-init,-init-private" name="-init-user">
+        <property file="${user.properties.file}"/>
+        <!-- The two properties below are usually overridden -->
+        <!-- by the active platform. Just a fallback. -->
+        <property name="default.javac.source" value="1.4"/>
+        <property name="default.javac.target" value="1.4"/>
+    </target>
+    <target depends="-pre-init,-init-private,-init-user" name="-init-project">
+        <property file="nbproject/project.properties"/>
+    </target>
+    <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" if="dist.ear.dir" name="-do-ear-init"/>
+    <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
+        <condition property="have.tests">
+            <or>
+                <available file="${test.src.dir}"/>
+            </or>
+        </condition>
+        <condition property="have.sources">
+            <or>
+                <available file="${src.dir}"/>
+            </or>
+        </condition>
+        <condition property="netbeans.home+have.tests">
+            <and>
+                <isset property="netbeans.home"/>
+                <isset property="have.tests"/>
+            </and>
+        </condition>
+        <condition property="no.javadoc.preview">
+            <isfalse value="${javadoc.preview}"/>
+        </condition>
+        <property name="javac.compilerargs" value=""/>
+        <condition property="no.deps">
+            <and>
+                <istrue value="${no.dependencies}"/>
+            </and>
+        </condition>
+        <condition property="no.dist.ear.dir">
+            <not>
+                <isset property="dist.ear.dir"/>
+            </not>
+        </condition>
+        <property name="build.web.excludes" value="${build.classes.excludes}"/>
+        <condition property="do.compile.jsps">
+            <istrue value="${compile.jsps}"/>
+        </condition>
+        <condition property="do.debug.server">
+            <or>
+                <not>
+                    <isset property="debug.server"/>
+                </not>
+                <istrue value="${debug.server}"/>
+                <and>
+                    <not>
+                        <istrue value="${debug.server}"/>
+                    </not>
+                    <not>
+                        <istrue value="${debug.client}"/>
+                    </not>
+                </and>
+            </or>
+        </condition>
+        <condition property="do.debug.client">
+            <istrue value="${debug.client}"/>
+        </condition>
+        <condition property="do.display.browser">
+            <istrue value="${display.browser}"/>
+        </condition>
+        <condition property="do.display.browser.debug.old">
+            <and>
+                <isset property="do.display.browser"/>
+                <not>
+                    <isset property="do.debug.client"/>
+                </not>
+                <not>
+                    <isset property="browser.context"/>
+                </not>
+            </and>
+        </condition>
+        <condition property="do.display.browser.debug">
+            <and>
+                <isset property="do.display.browser"/>
+                <not>
+                    <isset property="do.debug.client"/>
+                </not>
+                <isset property="browser.context"/>
+            </and>
+        </condition>
+        <available file="${conf.dir}/MANIFEST.MF" property="has.custom.manifest"/>
+        <available file="${persistence.xml.dir}/persistence.xml" property="has.persistence.xml"/>
+        <condition property="do.war.package.with.custom.manifest">
+            <isset property="has.custom.manifest"/>
+        </condition>
+        <condition property="do.war.package.without.custom.manifest">
+            <not>
+                <isset property="has.custom.manifest"/>
+            </not>
+        </condition>
+        <condition property="do.tmp.war.package.with.custom.manifest">
+            <and>
+                <isset property="has.custom.manifest"/>
+                <or>
+                    <isfalse value="${directory.deployment.supported}"/>
+                    <isset property="dist.ear.dir"/>
+                </or>
+            </and>
+        </condition>
+        <condition property="do.tmp.war.package.without.custom.manifest">
+            <and>
+                <not>
+                    <isset property="has.custom.manifest"/>
+                </not>
+                <or>
+                    <isfalse value="${directory.deployment.supported}"/>
+                    <isset property="dist.ear.dir"/>
+                </or>
+            </and>
+        </condition>
+        <condition property="do.tmp.war.package">
+            <or>
+                <isfalse value="${directory.deployment.supported}"/>
+                <isset property="dist.ear.dir"/>
+            </or>
+        </condition>
+        <property name="build.meta.inf.dir" value="${build.web.dir}/META-INF"/>
+        <condition else="" property="application.args.param" value="${application.args}">
+            <and>
+                <isset property="application.args"/>
+                <not>
+                    <equals arg1="${application.args}" arg2="" trim="true"/>
+                </not>
+            </and>
+        </condition>
+        <property name="source.encoding" value="${file.encoding}"/>
+        <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
+            <and>
+                <isset property="javadoc.encoding"/>
+                <not>
+                    <equals arg1="${javadoc.encoding}" arg2=""/>
+                </not>
+            </and>
+        </condition>
+        <property name="javadoc.encoding.used" value="${source.encoding}"/>
+        <property name="includes" value="**"/>
+        <property name="excludes" value=""/>
+        <property name="runmain.jvmargs" value=""/>
+        <path id="endorsed.classpath.path" path="${endorsed.classpath}"/>
+        <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
+            <and>
+                <isset property="endorsed.classpath"/>
+                <length length="0" string="${endorsed.classpath}" when="greater"/>
+            </and>
+        </condition>
+        <condition else="false" property="jdkBug6558476">
+            <and>
+                <matches pattern="1\.[56]" string="${java.specification.version}"/>
+                <not>
+                    <os family="unix"/>
+                </not>
+            </and>
+        </condition>
+        <property name="javac.fork" value="${jdkBug6558476}"/>
+        <condition property="junit.available">
+            <or>
+                <available classname="org.junit.Test" classpath="${run.test.classpath}"/>
+                <available classname="junit.framework.Test" classpath="${run.test.classpath}"/>
+            </or>
+        </condition>
+        <condition property="testng.available">
+            <available classname="org.testng.annotations.Test" classpath="${run.test.classpath}"/>
+        </condition>
+        <condition property="junit+testng.available">
+            <and>
+                <istrue value="${junit.available}"/>
+                <istrue value="${testng.available}"/>
+            </and>
+        </condition>
+        <condition else="testng" property="testng.mode" value="mixed">
+            <istrue value="${junit+testng.available}"/>
+        </condition>
+        <condition else="" property="testng.debug.mode" value="-mixed">
+            <istrue value="${junit+testng.available}"/>
+        </condition>
+    </target>
+    <target depends="init" name="-init-cos" unless="deploy.on.save">
+        <condition property="deploy.on.save" value="true">
+            <or>
+                <istrue value="${j2ee.deploy.on.save}"/>
+                <istrue value="${j2ee.compile.on.save}"/>
+            </or>
+        </condition>
+    </target>
+    <target name="-post-init">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check">
+        <fail unless="src.dir">Must set src.dir</fail>
+        <fail unless="test.src.dir">Must set test.src.dir</fail>
+        <fail unless="build.dir">Must set build.dir</fail>
+        <fail unless="build.web.dir">Must set build.web.dir</fail>
+        <fail unless="build.generated.dir">Must set build.generated.dir</fail>
+        <fail unless="dist.dir">Must set dist.dir</fail>
+        <fail unless="build.classes.dir">Must set build.classes.dir</fail>
+        <fail unless="dist.javadoc.dir">Must set dist.javadoc.dir</fail>
+        <fail unless="build.test.classes.dir">Must set build.test.classes.dir</fail>
+        <fail unless="build.test.results.dir">Must set build.test.results.dir</fail>
+        <fail unless="build.classes.excludes">Must set build.classes.excludes</fail>
+        <fail unless="dist.war">Must set dist.war</fail>
+        <condition property="missing.j2ee.server.home">
+            <and>
+                <matches pattern="j2ee.server.home" string="${j2ee.platform.classpath}"/>
+                <not>
+                    <isset property="j2ee.server.home"/>
+                </not>
+            </and>
+        </condition>
+        <fail if="missing.j2ee.server.home">
+The Java EE server classpath is not correctly set up - server home directory is missing.
+Either open the project in the IDE and assign the server or setup the server classpath manually.
+For example like this:
+   ant -Dj2ee.server.home=&lt;app_server_installation_directory&gt;
+                </fail>
+        <fail unless="j2ee.platform.classpath">
+The Java EE server classpath is not correctly set up. Your active server type is ${j2ee.server.type}.
+Either open the project in the IDE and assign the server or setup the server classpath manually.
+For example like this:
+   ant -Duser.properties.file=&lt;path_to_property_file&gt; (where you put the property "j2ee.platform.classpath" in a .properties file)
+or ant -Dj2ee.platform.classpath=&lt;server_classpath&gt; (where no properties file is used)
+                </fail>
+    </target>
+    <target name="-init-macrodef-property">
+        <macrodef name="property" uri="http://www.netbeans.org/ns/web-project/1">
+            <attribute name="name"/>
+            <attribute name="value"/>
+            <sequential>
+                <property name="@{name}" value="${@{value}}"/>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors">
+        <macrodef name="javac" uri="http://www.netbeans.org/ns/web-project/2">
+            <attribute default="${src.dir}" name="srcdir"/>
+            <attribute default="${build.classes.dir}" name="destdir"/>
+            <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/>
+            <attribute default="${javac.processorpath}" name="processorpath"/>
+            <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="${javac.debug}" name="debug"/>
+            <attribute default="${empty.dir}" name="gensrcdir"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <property location="${build.dir}/empty" name="empty.dir"/>
+                <mkdir dir="${empty.dir}"/>
+                <mkdir dir="@{apgeneratedsrcdir}"/>
+                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" srcdir="@{srcdir}" target="${javac.target}">
+                    <src>
+                        <dirset dir="@{gensrcdir}" erroronmissingdir="false">
+                            <include name="*"/>
+                        </dirset>
+                    </src>
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                    <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
+                    <compilerarg line="${javac.compilerargs}"/>
+                    <compilerarg value="-processorpath"/>
+                    <compilerarg path="@{processorpath}:${empty.dir}"/>
+                    <compilerarg line="${ap.processors.internal}"/>
+                    <compilerarg value="-s"/>
+                    <compilerarg path="@{apgeneratedsrcdir}"/>
+                    <compilerarg line="${ap.proc.none.internal}"/>
+                    <customize/>
+                </javac>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">
+        <macrodef name="javac" uri="http://www.netbeans.org/ns/web-project/2">
+            <attribute default="${src.dir}" name="srcdir"/>
+            <attribute default="${build.classes.dir}" name="destdir"/>
+            <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/>
+            <attribute default="${javac.processorpath}" name="processorpath"/>
+            <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="${javac.debug}" name="debug"/>
+            <attribute default="${empty.dir}" name="gensrcdir"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <property location="${build.dir}/empty" name="empty.dir"/>
+                <mkdir dir="${empty.dir}"/>
+                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" includeantruntime="false" includes="@{includes}" source="${javac.source}" srcdir="@{srcdir}" target="${javac.target}">
+                    <src>
+                        <dirset dir="@{gensrcdir}" erroronmissingdir="false">
+                            <include name="*"/>
+                        </dirset>
+                    </src>
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                    <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
+                    <compilerarg line="${javac.compilerargs}"/>
+                    <customize/>
+                </javac>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">
+        <macrodef name="depend" uri="http://www.netbeans.org/ns/web-project/2">
+            <attribute default="${src.dir}" name="srcdir"/>
+            <attribute default="${build.classes.dir}" name="destdir"/>
+            <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/>
+            <sequential>
+                <depend cache="${build.dir}/depcache" destdir="@{destdir}" excludes="${excludes}" includes="${includes}" srcdir="@{srcdir}">
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                </depend>
+            </sequential>
+        </macrodef>
+        <macrodef name="force-recompile" uri="http://www.netbeans.org/ns/web-project/2">
+            <attribute default="${build.classes.dir}" name="destdir"/>
+            <sequential>
+                <fail unless="javac.includes">Must set javac.includes</fail>
+                <pathconvert pathsep="${line.separator}" property="javac.includes.binary">
+                    <path>
+                        <filelist dir="@{destdir}" files="${javac.includes}"/>
+                    </path>
+                    <globmapper from="*.java" to="*.class"/>
+                </pathconvert>
+                <tempfile deleteonexit="true" property="javac.includesfile.binary"/>
+                <echo file="${javac.includesfile.binary}" message="${javac.includes.binary}"/>
+                <delete>
+                    <files includesfile="${javac.includesfile.binary}"/>
+                </delete>
+                <delete file="${javac.includesfile.binary}"/>
+            </sequential>
+        </macrodef>
+    </target>
+    <target if="${junit.available}" name="-init-macrodef-junit-init">
+        <condition else="false" property="nb.junit.batch" value="true">
+            <and>
+                <istrue value="${junit.available}"/>
+                <not>
+                    <isset property="test.method"/>
+                </not>
+            </and>
+        </condition>
+        <condition else="false" property="nb.junit.single" value="true">
+            <and>
+                <istrue value="${junit.available}"/>
+                <isset property="test.method"/>
+            </and>
+        </condition>
+    </target>
+    <target name="-init-test-properties">
+        <property name="test.binaryincludes" value="&lt;nothing&gt;"/>
+        <property name="test.binarytestincludes" value=""/>
+        <property name="test.binaryexcludes" value=""/>
+    </target>
+    <target if="${nb.junit.single}" name="-init-macrodef-junit-single" unless="${nb.junit.batch}">
+        <macrodef name="junit" uri="http://www.netbeans.org/ns/web-project/2">
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="**" name="testincludes"/>
+            <attribute default="" name="testmethods"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true" tempdir="${java.io.tmpdir}">
+                    <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/>
+                    <syspropertyset>
+                        <propertyref prefix="test-sys-prop."/>
+                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
+                    </syspropertyset>
+                    <formatter type="brief" usefile="false"/>
+                    <formatter type="xml"/>
+                    <jvmarg value="-ea"/>
+                    <customize/>
+                </junit>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-test-properties" if="${nb.junit.batch}" name="-init-macrodef-junit-batch" unless="${nb.junit.single}">
+        <macrodef name="junit" uri="http://www.netbeans.org/ns/web-project/2">
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="**" name="testincludes"/>
+            <attribute default="" name="testmethods"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <property name="run.jvmargs.ide" value=""/>
+                <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true" tempdir="${build.dir}">
+                    <batchtest todir="${build.test.results.dir}">
+                        <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
+                            <filename name="@{testincludes}"/>
+                        </fileset>
+                        <fileset dir="${build.test.classes.dir}" excludes="@{excludes},${excludes},${test.binaryexcludes}" includes="${test.binaryincludes}">
+                            <filename name="${test.binarytestincludes}"/>
+                        </fileset>
+                    </batchtest>
+                    <syspropertyset>
+                        <propertyref prefix="test-sys-prop."/>
+                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
+                    </syspropertyset>
+                    <formatter type="brief" usefile="false"/>
+                    <formatter type="xml"/>
+                    <jvmarg value="-ea"/>
+                    <jvmarg line="${run.jvmargs.ide}"/>
+                    <customize/>
+                </junit>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-macrodef-junit-init,-init-macrodef-junit-single, -init-macrodef-junit-batch" if="${junit.available}" name="-init-macrodef-junit"/>
+    <target if="${testng.available}" name="-init-macrodef-testng">
+        <macrodef name="testng" uri="http://www.netbeans.org/ns/web-project/2">
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="**" name="testincludes"/>
+            <attribute default="" name="testmethods"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <condition else="" property="testng.methods.arg" value="@{testincludes}.@{testmethods}">
+                    <isset property="test.method"/>
+                </condition>
+                <union id="test.set">
+                    <fileset dir="${test.src.dir}" excludes="@{excludes},**/*.xml,${excludes}" includes="@{includes}">
+                        <filename name="@{testincludes}"/>
+                    </fileset>
+                </union>
+                <taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/>
+                <testng classfilesetref="test.set" failureProperty="tests.failed" listeners="org.testng.reporters.VerboseReporter" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="FUNET" testname="TestNG tests" workingDir="${basedir}">
+                    <xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/>
+                    <propertyset>
+                        <propertyref prefix="test-sys-prop."/>
+                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
+                    </propertyset>
+                    <customize/>
+                </testng>
+            </sequential>
+        </macrodef>
+    </target>
+    <target name="-init-macrodef-test-impl">
+        <macrodef name="test-impl" uri="http://www.netbeans.org/ns/web-project/2">
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="**" name="testincludes"/>
+            <attribute default="" name="testmethods"/>
+            <element implicit="true" name="customize" optional="true"/>
+            <sequential>
+                <echo>No tests executed.</echo>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-macrodef-junit" if="${junit.available}" name="-init-macrodef-junit-impl">
+        <macrodef name="test-impl" uri="http://www.netbeans.org/ns/web-project/2">
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="**" name="testincludes"/>
+            <attribute default="" name="testmethods"/>
+            <element implicit="true" name="customize" optional="true"/>
+            <sequential>
+                <webproject2:junit excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
+                    <customize/>
+                </webproject2:junit>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-macrodef-testng" if="${testng.available}" name="-init-macrodef-testng-impl">
+        <macrodef name="test-impl" uri="http://www.netbeans.org/ns/web-project/2">
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="**" name="testincludes"/>
+            <attribute default="" name="testmethods"/>
+            <element implicit="true" name="customize" optional="true"/>
+            <sequential>
+                <webproject2:testng excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
+                    <customize/>
+                </webproject2:testng>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-macrodef-test-impl,-init-macrodef-junit-impl,-init-macrodef-testng-impl" name="-init-macrodef-test">
+        <macrodef name="test" uri="http://www.netbeans.org/ns/web-project/2">
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="**" name="testincludes"/>
+            <attribute default="" name="testmethods"/>
+            <sequential>
+                <webproject2:test-impl excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
+                    <customize>
+                        <classpath>
+                            <path path="${run.test.classpath}:${j2ee.platform.classpath}:${j2ee.platform.embeddableejb.classpath}"/>
+                        </classpath>
+                        <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
+                        <jvmarg line="${runmain.jvmargs}"/>
+                    </customize>
+                </webproject2:test-impl>
+            </sequential>
+        </macrodef>
+    </target>
+    <target if="${junit.available}" name="-init-macrodef-junit-debug" unless="${nb.junit.batch}">
+        <macrodef name="junit-debug" uri="http://www.netbeans.org/ns/web-project/2">
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="**" name="testincludes"/>
+            <attribute default="" name="testmethods"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true" tempdir="${java.io.tmpdir}">
+                    <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/>
+                    <syspropertyset>
+                        <propertyref prefix="test-sys-prop."/>
+                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
+                    </syspropertyset>
+                    <formatter type="brief" usefile="false"/>
+                    <formatter type="xml"/>
+                    <jvmarg value="-ea"/>
+                    <jvmarg value="-agentlib:jdwp=transport=${debug-transport},address=${jpda.address}"/>
+                    <customize/>
+                </junit>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-test-properties" if="${nb.junit.batch}" name="-init-macrodef-junit-debug-batch">
+        <macrodef name="junit-debug" uri="http://www.netbeans.org/ns/web-project/2">
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="**" name="testincludes"/>
+            <attribute default="" name="testmethods"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <property name="run.jvmargs.ide" value=""/>
+                <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true" tempdir="${build.dir}">
+                    <batchtest todir="${build.test.results.dir}">
+                        <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
+                            <filename name="@{testincludes}"/>
+                        </fileset>
+                        <fileset dir="${build.test.classes.dir}" excludes="@{excludes},${excludes},${test.binaryexcludes}" includes="${test.binaryincludes}">
+                            <filename name="${test.binarytestincludes}"/>
+                        </fileset>
+                    </batchtest>
+                    <syspropertyset>
+                        <propertyref prefix="test-sys-prop."/>
+                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
+                    </syspropertyset>
+                    <formatter type="brief" usefile="false"/>
+                    <formatter type="xml"/>
+                    <jvmarg value="-ea"/>
+                    <jvmarg line="${run.jvmargs.ide}"/>
+                    <jvmarg value="-agentlib:jdwp=transport=${debug-transport},address=${jpda.address}"/>
+                    <customize/>
+                </junit>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-macrodef-junit-debug,-init-macrodef-junit-debug-batch" if="${junit.available}" name="-init-macrodef-junit-debug-impl">
+        <macrodef name="test-debug-impl" uri="http://www.netbeans.org/ns/web-project/2">
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="**" name="testincludes"/>
+            <attribute default="" name="testmethods"/>
+            <element implicit="true" name="customize" optional="true"/>
+            <sequential>
+                <webproject2:junit-debug excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
+                    <customize/>
+                </webproject2:junit-debug>
+            </sequential>
+        </macrodef>
+    </target>
+    <target if="${testng.available}" name="-init-macrodef-testng-debug">
+        <macrodef name="testng-debug" uri="http://www.netbeans.org/ns/web-project/2">
+            <attribute default="${main.class}" name="testClass"/>
+            <attribute default="" name="testMethod"/>
+            <element name="customize2" optional="true"/>
+            <sequential>
+                <condition else="-testclass @{testClass}" property="test.class.or.method" value="-methods @{testClass}.@{testMethod}">
+                    <isset property="test.method"/>
+                </condition>
+                <condition else="-suitename FUNET -testname @{testClass} ${test.class.or.method}" property="testng.cmd.args" value="@{testClass}">
+                    <matches pattern=".*\.xml" string="@{testClass}"/>
+                </condition>
+                <delete dir="${build.test.results.dir}" quiet="true"/>
+                <mkdir dir="${build.test.results.dir}"/>
+                <webproject1:debug args="${testng.cmd.args}" classname="org.testng.TestNG" classpath="${debug.test.classpath}:${j2ee.platform.embeddableejb.classpath}">
+                    <customize>
+                        <customize2/>
+                        <jvmarg value="-ea"/>
+                        <arg line="${testng.debug.mode}"/>
+                        <arg line="-d ${build.test.results.dir}"/>
+                        <arg line="-listener org.testng.reporters.VerboseReporter"/>
+                    </customize>
+                </webproject1:debug>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-macrodef-testng-debug" if="${testng.available}" name="-init-macrodef-testng-debug-impl">
+        <macrodef name="testng-debug-impl" uri="http://www.netbeans.org/ns/web-project/2">
+            <attribute default="${main.class}" name="testClass"/>
+            <attribute default="" name="testMethod"/>
+            <element implicit="true" name="customize2" optional="true"/>
+            <sequential>
+                <webproject2:testng-debug testClass="@{testClass}" testMethod="@{testMethod}">
+                    <customize2/>
+                </webproject2:testng-debug>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-macrodef-junit-debug-impl" if="${junit.available}" name="-init-macrodef-test-debug-junit">
+        <macrodef name="test-debug" uri="http://www.netbeans.org/ns/web-project/2">
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="**" name="testincludes"/>
+            <attribute default="" name="testmethods"/>
+            <attribute default="${main.class}" name="testClass"/>
+            <attribute default="" name="testMethod"/>
+            <sequential>
+                <webproject2:test-debug-impl excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
+                    <customize>
+                        <classpath>
+                            <path path="${run.test.classpath}:${j2ee.platform.classpath}:${j2ee.platform.embeddableejb.classpath}"/>
+                        </classpath>
+                        <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
+                        <jvmarg line="${runmain.jvmargs}"/>
+                    </customize>
+                </webproject2:test-debug-impl>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-macrodef-testng-debug-impl" if="${testng.available}" name="-init-macrodef-test-debug-testng">
+        <macrodef name="test-debug" uri="http://www.netbeans.org/ns/web-project/2">
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="**" name="testincludes"/>
+            <attribute default="" name="testmethods"/>
+            <attribute default="${main.class}" name="testClass"/>
+            <attribute default="" name="testMethod"/>
+            <sequential>
+                <webproject2:testng-debug-impl testClass="@{testClass}" testMethod="@{testMethod}">
+                    <customize2>
+                        <syspropertyset>
+                            <propertyref prefix="test-sys-prop."/>
+                            <mapper from="test-sys-prop.*" to="*" type="glob"/>
+                        </syspropertyset>
+                    </customize2>
+                </webproject2:testng-debug-impl>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-macrodef-test-debug-junit,-init-macrodef-test-debug-testng" name="-init-macrodef-test-debug"/>
+    <target name="-init-macrodef-java">
+        <macrodef name="java" uri="http://www.netbeans.org/ns/web-project/1">
+            <attribute default="${main.class}" name="classname"/>
+            <attribute default="${debug.classpath}" name="classpath"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <java classname="@{classname}" fork="true">
+                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
+                    <jvmarg line="${runmain.jvmargs}"/>
+                    <classpath>
+                        <path path="@{classpath}:${j2ee.platform.classpath}"/>
+                    </classpath>
+                    <syspropertyset>
+                        <propertyref prefix="run-sys-prop."/>
+                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
+                    </syspropertyset>
+                    <customize/>
+                </java>
+            </sequential>
+        </macrodef>
+    </target>
+    <target name="-init-macrodef-nbjsdebug">
+        <macrodef name="nbjsdebugstart" uri="http://www.netbeans.org/ns/web-project/1">
+            <attribute default="${client.url}" name="webUrl"/>
+            <sequential>
+                <nbjsdebugstart urlPart="${client.urlPart}" webUrl="@{webUrl}"/>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-debug-args" name="-init-macrodef-nbjpda">
+        <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/web-project/1">
+            <attribute default="${main.class}" name="name"/>
+            <attribute default="${debug.classpath}:${j2ee.platform.classpath}" name="classpath"/>
+            <sequential>
+                <nbjpdastart addressproperty="jpda.address" name="@{name}" transport="${debug-transport}">
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                </nbjpdastart>
+            </sequential>
+        </macrodef>
+        <macrodef name="nbjpdareload" uri="http://www.netbeans.org/ns/web-project/1">
+            <attribute default="${build.classes.dir}" name="dir"/>
+            <sequential>
+                <nbjpdareload>
+                    <fileset dir="@{dir}" includes="${fix.classes}">
+                        <include name="${fix.includes}*.class"/>
+                    </fileset>
+                </nbjpdareload>
+            </sequential>
+        </macrodef>
+        <macrodef name="nbjpdaappreloaded" uri="http://www.netbeans.org/ns/web-project/1">
+            <sequential>
+                <nbjpdaappreloaded/>
+            </sequential>
+        </macrodef>
+    </target>
+    <target name="-init-debug-args">
+        <condition else="dt_socket" property="debug-transport-by-os" value="dt_shmem">
+            <os family="windows"/>
+        </condition>
+        <condition else="${debug-transport-by-os}" property="debug-transport" value="${debug.transport}">
+            <isset property="debug.transport"/>
+        </condition>
+    </target>
+    <target depends="-init-debug-args" name="-init-macrodef-debug">
+        <macrodef name="debug" uri="http://www.netbeans.org/ns/web-project/1">
+            <attribute default="${main.class}" name="classname"/>
+            <attribute default="${debug.classpath}:${j2ee.platform.classpath}" name="classpath"/>
+            <attribute default="${application.args.param}" name="args"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <java classname="@{classname}" fork="true">
+                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
+                    <jvmarg value="-agentlib:jdwp=transport=${debug-transport},address=${jpda.address}"/>
+                    <jvmarg line="${runmain.jvmargs}"/>
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                    <syspropertyset>
+                        <propertyref prefix="run-sys-prop."/>
+                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
+                    </syspropertyset>
+                    <arg line="@{args}"/>
+                    <customize/>
+                </java>
+            </sequential>
+        </macrodef>
+    </target>
+    <target name="-init-taskdefs">
+        <fail unless="libs.CopyLibs.classpath">
+The libs.CopyLibs.classpath property is not set up.
+This property must point to 
+org-netbeans-modules-java-j2seproject-copylibstask.jar file which is part
+of NetBeans IDE installation and is usually located at 
+&lt;netbeans_installation&gt;/java&lt;version&gt;/ant/extra folder.
+Either open the project in the IDE and make sure CopyLibs library
+exists or setup the property manually. For example like this:
+ ant -Dlibs.CopyLibs.classpath=a/path/to/org-netbeans-modules-java-j2seproject-copylibstask.jar
+                </fail>
+        <taskdef classpath="${libs.CopyLibs.classpath}" resource="org/netbeans/modules/java/j2seproject/copylibstask/antlib.xml"/>
+    </target>
+    <target name="-init-ap-cmdline-properties">
+        <property name="annotation.processing.enabled" value="true"/>
+        <property name="annotation.processing.processors.list" value=""/>
+        <property name="annotation.processing.run.all.processors" value="true"/>
+        <property name="javac.processorpath" value="${javac.classpath}"/>
+        <property name="javac.test.processorpath" value="${javac.test.classpath}"/>
+        <condition property="ap.supported.internal" value="true">
+            <not>
+                <matches pattern="1\.[0-5](\..*)?" string="${javac.source}"/>
+            </not>
+        </condition>
+    </target>
+    <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-ap-cmdline-supported">
+        <condition else="" property="ap.processors.internal" value="-processor ${annotation.processing.processors.list}">
+            <isfalse value="${annotation.processing.run.all.processors}"/>
+        </condition>
+        <condition else="" property="ap.proc.none.internal" value="-proc:none">
+            <isfalse value="${annotation.processing.enabled}"/>
+        </condition>
+    </target>
+    <target depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported" name="-init-ap-cmdline">
+        <property name="ap.cmd.line.internal" value=""/>
+    </target>
+    <!--
+                pre NB7.2 profiling section; consider it deprecated
+            -->
+    <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-check" if="profiler.info.jvmargs.agent" name="profile-init"/>
+    <target if="profiler.info.jvmargs.agent" name="-profile-pre-init">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target if="profiler.info.jvmargs.agent" name="-profile-post-init">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="-profile-pre-init, init, -profile-post-init" if="profiler.info.jvmargs.agent" name="-profile-init-check">
+        <fail unless="profiler.info.jvm">Must set JVM to use for profiling in profiler.info.jvm</fail>
+        <fail unless="profiler.info.jvmargs.agent">Must set profiler agent JVM arguments in profiler.info.jvmargs.agent</fail>
+    </target>
+    <!--
+                end of pre NB7.2 profiling section
+            -->
+    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-test,-init-macrodef-test-debug,-init-macrodef-java,-init-macrodef-nbjpda,-init-macrodef-nbjsdebug,-init-macrodef-debug,-init-taskdefs,-init-ap-cmdline" name="init"/>
+    <!--
+                COMPILATION SECTION
+            -->
+    <target depends="init" if="no.dist.ear.dir" name="deps-module-jar" unless="no.deps"/>
+    <target depends="init" if="dist.ear.dir" name="deps-ear-jar" unless="no.deps"/>
+    <target depends="init, deps-module-jar, deps-ear-jar" name="deps-jar" unless="no.deps"/>
+    <target depends="init,deps-jar" name="-pre-pre-compile">
+        <mkdir dir="${build.classes.dir}"/>
+    </target>
+    <target name="-pre-compile">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target name="-copy-webdir">
+        <copy todir="${build.web.dir}">
+            <fileset dir="${web.docbase.dir}" excludes="${build.web.excludes},${excludes}" includes="${includes}"/>
+        </copy>
+        <copy todir="${build.web.dir}/WEB-INF">
+            <fileset dir="${webinf.dir}" excludes="${build.web.excludes}"/>
+        </copy>
+    </target>
+    <target depends="init, deps-jar, -pre-pre-compile, -pre-compile, -copy-manifest, -copy-persistence-xml, -copy-webdir, library-inclusion-in-archive,library-inclusion-in-manifest" if="have.sources" name="-do-compile">
+        <webproject2:javac destdir="${build.classes.dir}" gensrcdir="${build.generated.sources.dir}"/>
+        <copy todir="${build.classes.dir}">
+            <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+        </copy>
+    </target>
+    <target if="has.custom.manifest" name="-copy-manifest">
+        <mkdir dir="${build.meta.inf.dir}"/>
+        <copy todir="${build.meta.inf.dir}">
+            <fileset dir="${conf.dir}" includes="MANIFEST.MF"/>
+        </copy>
+    </target>
+    <target if="has.persistence.xml" name="-copy-persistence-xml">
+        <mkdir dir="${build.web.dir}/WEB-INF/classes/META-INF"/>
+        <copy todir="${build.web.dir}/WEB-INF/classes/META-INF">
+            <fileset dir="${persistence.xml.dir}" includes="persistence.xml orm.xml"/>
+        </copy>
+    </target>
+    <target name="-post-compile">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/>
+    <target name="-pre-compile-single">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
+        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
+        <webproject2:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}"/>
+        <copy todir="${build.classes.dir}">
+            <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+        </copy>
+    </target>
+    <target name="-post-compile-single">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,deps-jar,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>
+    <property name="jspc.schemas" value="/resources/schemas/"/>
+    <property name="jspc.dtds" value="/resources/dtds/"/>
+    <target depends="compile" description="Test compile JSP pages to expose compilation errors." if="do.compile.jsps" name="compile-jsps">
+        <mkdir dir="${build.generated.dir}/src"/>
+        <java classname="org.netbeans.modules.web.project.ant.JspC" failonerror="true" fork="true">
+            <arg value="-uriroot"/>
+            <arg file="${basedir}/${build.web.dir}"/>
+            <arg value="-d"/>
+            <arg file="${basedir}/${build.generated.dir}/src"/>
+            <arg value="-die1"/>
+            <arg value="-schemas ${jspc.schemas}"/>
+            <arg value="-dtds ${jspc.dtds}"/>
+            <arg value="-compilerSourceVM ${javac.source}"/>
+            <arg value="-compilerTargetVM ${javac.target}"/>
+            <arg value="-javaEncoding ${source.encoding}"/>
+            <arg value="-sysClasspath ${libs.jsp-compilation-syscp.classpath}"/>
+            <classpath path="${java.home}/../lib/tools.jar:${libs.jsp-compiler.classpath}:${libs.jsp-compilation.classpath}"/>
+        </java>
+        <mkdir dir="${build.generated.dir}/classes"/>
+        <webproject2:javac classpath="${build.classes.dir}:${libs.jsp-compilation.classpath}:${javac.classpath}:${j2ee.platform.classpath}" destdir="${build.generated.dir}/classes" srcdir="${build.generated.dir}/src"/>
+    </target>
+    <target depends="compile" if="jsp.includes" name="-do-compile-single-jsp">
+        <fail unless="javac.jsp.includes">Must select some files in the IDE or set javac.jsp.includes</fail>
+        <mkdir dir="${build.generated.dir}/src"/>
+        <java classname="org.netbeans.modules.web.project.ant.JspCSingle" failonerror="true" fork="true">
+            <arg value="-uriroot"/>
+            <arg file="${basedir}/${build.web.dir}"/>
+            <arg value="-d"/>
+            <arg file="${basedir}/${build.generated.dir}/src"/>
+            <arg value="-die1"/>
+            <arg value="-schemas ${jspc.schemas}"/>
+            <arg value="-dtds ${jspc.dtds}"/>
+            <arg value="-sysClasspath ${libs.jsp-compilation-syscp.classpath}"/>
+            <arg value="-jspc.files"/>
+            <arg path="${jsp.includes}"/>
+            <arg value="-compilerSourceVM ${javac.source}"/>
+            <arg value="-compilerTargetVM ${javac.target}"/>
+            <arg value="-javaEncoding ${source.encoding}"/>
+            <classpath path="${java.home}/../lib/tools.jar:${libs.jsp-compiler.classpath}:${libs.jsp-compilation.classpath}"/>
+        </java>
+        <mkdir dir="${build.generated.dir}/classes"/>
+        <webproject2:javac classpath="${build.classes.dir}:${libs.jsp-compilation.classpath}:${javac.classpath}:${j2ee.platform.classpath}" destdir="${build.generated.dir}/classes" srcdir="${build.generated.dir}/src">
+            <customize>
+                <patternset includes="${javac.jsp.includes}"/>
+            </customize>
+        </webproject2:javac>
+    </target>
+    <target name="compile-single-jsp">
+        <fail unless="jsp.includes">Must select a file in the IDE or set jsp.includes</fail>
+        <antcall target="-do-compile-single-jsp"/>
+    </target>
+    <!--
+                DIST BUILDING SECTION
+            -->
+    <target name="-pre-dist">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,compile,compile-jsps,-pre-dist" if="do.war.package.without.custom.manifest" name="-do-dist-without-manifest">
+        <dirname file="${dist.war}" property="dist.jar.dir"/>
+        <mkdir dir="${dist.jar.dir}"/>
+        <jar compress="${jar.compress}" jarfile="${dist.war}">
+            <fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*,${dist.archive.excludes}"/>
+        </jar>
+    </target>
+    <target depends="init,compile,compile-jsps,-pre-dist" if="do.war.package.with.custom.manifest" name="-do-dist-with-manifest">
+        <dirname file="${dist.war}" property="dist.jar.dir"/>
+        <mkdir dir="${dist.jar.dir}"/>
+        <jar compress="${jar.compress}" jarfile="${dist.war}" manifest="${build.meta.inf.dir}/MANIFEST.MF">
+            <fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*,${dist.archive.excludes}"/>
+        </jar>
+    </target>
+    <target depends="init,compile,compile-jsps,-pre-dist" if="do.tmp.war.package.without.custom.manifest" name="-do-tmp-dist-without-manifest">
+        <dirname file="${dist.war}" property="dist.jar.dir"/>
+        <mkdir dir="${dist.jar.dir}"/>
+        <jar compress="${jar.compress}" jarfile="${dist.war}">
+            <fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*,${dist.archive.excludes}"/>
+        </jar>
+    </target>
+    <target depends="init,compile,compile-jsps,-pre-dist" if="do.tmp.war.package.with.custom.manifest" name="-do-tmp-dist-with-manifest">
+        <dirname file="${dist.war}" property="dist.jar.dir"/>
+        <mkdir dir="${dist.jar.dir}"/>
+        <jar compress="${jar.compress}" jarfile="${dist.war}" manifest="${build.meta.inf.dir}/MANIFEST.MF">
+            <fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*,${dist.archive.excludes}"/>
+        </jar>
+    </target>
+    <target depends="init,compile,compile-jsps,-pre-dist,-do-dist-with-manifest,-do-dist-without-manifest" name="do-dist"/>
+    <target depends="init" if="dist.ear.dir" name="library-inclusion-in-manifest">
+<<<<<<< HEAD
+        <copyfiles files="${file.reference.jakarta.servlet.jsp.jstl-3.0.1.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.jakarta.servlet.jsp.jstl-api-3.0.0.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.mssql-jdbc-12.6.1.jre11.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.jakarta.activation-api-2.1.3.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.jakarta.mail-2.0.1.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.json-20240303.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.jakarta.json-api-2.1.3.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.jakarta.websocket-api-2.2.0.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.jakarta.websocket-client-api-2.2.0.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.commons-logging-1.2.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.fluent-hc-4.5.5.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.gson-2.10.1.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.httpclient-4.5.5.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.httpcore-4.4.9.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.javaee-api-7.0.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.jackson-annotations-2.17.2.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.jackson-core-2.17.2.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.jackson-databind-2.17.2.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.cloudinary-core-1.33.0.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.cloudinary-http44-1.39.0.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.commons-codec-1.17.1.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.commons-io-2.17.0.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.commons-logging-1.2.jar-1}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.dotenv-java-3.0.2.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.httpclient-4.5.14.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.httpcore-4.4.16.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.httpmime-4.5.14.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.commons-fileupload-1.5.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.commons-io-2.11.0.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.dropbox-core-sdk-5.4.4.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.jackson-annotations-2.15.2.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.jackson-core-2.15.2.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.jackson-databind-2.15.2.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.javax.servlet-api-4.0.1.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.javax.servlet.jsp-api-2.3.3.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.slf4j-api-2.0.7.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.slf4j-simple-2.0.7.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <mkdir dir="${build.web.dir}/META-INF"/>
+        <manifest file="${build.web.dir}/META-INF/MANIFEST.MF" mode="update"/>
+    </target>
+    <target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir">
+        <copyfiles files="${file.reference.jakarta.servlet.jsp.jstl-3.0.1.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.jakarta.servlet.jsp.jstl-api-3.0.0.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.mssql-jdbc-12.6.1.jre11.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.jakarta.activation-api-2.1.3.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.jakarta.mail-2.0.1.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.json-20240303.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.jakarta.json-api-2.1.3.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.jakarta.websocket-api-2.2.0.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.jakarta.websocket-client-api-2.2.0.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.commons-logging-1.2.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.fluent-hc-4.5.5.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.gson-2.10.1.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.httpclient-4.5.5.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.httpcore-4.4.9.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.javaee-api-7.0.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.jackson-annotations-2.17.2.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.jackson-core-2.17.2.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.jackson-databind-2.17.2.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.cloudinary-core-1.33.0.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.cloudinary-http44-1.39.0.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.commons-codec-1.17.1.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.commons-io-2.17.0.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.commons-logging-1.2.jar-1}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.dotenv-java-3.0.2.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.httpclient-4.5.14.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.httpcore-4.4.16.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.httpmime-4.5.14.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.commons-fileupload-1.5.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.commons-io-2.11.0.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.dropbox-core-sdk-5.4.4.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.jackson-annotations-2.15.2.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.jackson-core-2.15.2.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.jackson-databind-2.15.2.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.javax.servlet-api-4.0.1.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.javax.servlet.jsp-api-2.3.3.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.slf4j-api-2.0.7.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.slf4j-simple-2.0.7.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+=======
+        <copyfiles files="${file.reference.cloudinary-core-1.33.0.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.cloudinary-http44-1.39.0.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.commons-codec-1.17.1.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.commons-io-2.17.0.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.commons-logging-1.2.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.dotenv-java-3.0.2.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.httpclient-4.5.14.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.httpcore-4.4.16.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.httpmime-4.5.14.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.commons-logging-1.2.jar-1}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.fluent-hc-4.5.5.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.gson-2.10.1.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.gson-2.3.1.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.httpclient-4.5.5.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.httpcore-4.4.9.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.jackson-annotations-2.17.2.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.jackson-core-2.17.2.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.jackson-databind-2.17.2.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.jakarta.activation-api-2.1.3.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.jakarta.json-api-2.1.3.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.jakarta.mail-2.0.1.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.jakarta.websocket-api-2.2.0.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.jakarta.websocket-client-api-2.2.0.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.javaee-api-7.0.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.json-20240303.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.jakarta.servlet.jsp.jstl-3.0.1.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.jakarta.servlet.jsp.jstl-api-3.0.0.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.jaxb-api-2.1.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.sqljdbc42.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.mssql-jdbc-12.6.1.jre11.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <mkdir dir="${build.web.dir}/META-INF"/>
+        <manifest file="${build.web.dir}/META-INF/MANIFEST.MF" mode="update"/>
+    </target>
+    <target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir">
+        <copyfiles files="${file.reference.cloudinary-core-1.33.0.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.cloudinary-http44-1.39.0.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.commons-codec-1.17.1.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.commons-io-2.17.0.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.commons-logging-1.2.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.dotenv-java-3.0.2.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.httpclient-4.5.14.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.httpcore-4.4.16.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.httpmime-4.5.14.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.commons-logging-1.2.jar-1}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.fluent-hc-4.5.5.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.gson-2.10.1.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.gson-2.3.1.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.httpclient-4.5.5.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.httpcore-4.4.9.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.jackson-annotations-2.17.2.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.jackson-core-2.17.2.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.jackson-databind-2.17.2.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.jakarta.activation-api-2.1.3.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.jakarta.json-api-2.1.3.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.jakarta.mail-2.0.1.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.jakarta.websocket-api-2.2.0.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.jakarta.websocket-client-api-2.2.0.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.javaee-api-7.0.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.json-20240303.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.jakarta.servlet.jsp.jstl-3.0.1.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.jakarta.servlet.jsp.jstl-api-3.0.0.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.jaxb-api-2.1.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.sqljdbc42.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.mssql-jdbc-12.6.1.jre11.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+>>>>>>> origin/main
+    </target>
+    <target depends="init" if="dist.ear.dir" name="-clean-webinf-lib">
+        <delete dir="${build.web.dir}/WEB-INF/lib"/>
+    </target>
+    <target depends="init,-clean-webinf-lib,compile,compile-jsps,-pre-dist,library-inclusion-in-manifest" if="do.tmp.war.package" name="do-ear-dist">
+        <dirname file="${dist.ear.war}" property="dist.jar.dir"/>
+        <mkdir dir="${dist.jar.dir}"/>
+        <jar compress="${jar.compress}" jarfile="${dist.ear.war}" manifest="${build.web.dir}/META-INF/MANIFEST.MF">
+            <fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*,${dist.archive.excludes}"/>
+        </jar>
+    </target>
+    <target name="-post-dist">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,compile,-pre-dist,do-dist,-post-dist" description="Build distribution (WAR)." name="dist"/>
+    <target depends="init,-clean-webinf-lib,-init-cos,compile,-pre-dist,do-ear-dist,-post-dist" description="Build distribution (WAR) to be packaged into an EAR." name="dist-ear"/>
+    <!--
+                EXECUTION SECTION
+            -->
+    <target depends="run-deploy,run-display-browser" description="Deploy to server and show in browser." name="run"/>
+    <target name="-pre-run-deploy">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target name="-post-run-deploy">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target name="-pre-nbmodule-run-deploy">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- This target can be overriden by NetBeans modules. Don't override it directly, use -pre-run-deploy task instead. -->
+    </target>
+    <target name="-post-nbmodule-run-deploy">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- This target can be overriden by NetBeans modules. Don't override it directly, use -post-run-deploy task instead. -->
+    </target>
+    <target name="-run-deploy-am">
+        <!-- Task to deploy to the Access Manager runtime. -->
+    </target>
+    <target depends="init,-init-cos,compile,compile-jsps,-do-compile-single-jsp,-pre-dist,-do-tmp-dist-with-manifest,-do-tmp-dist-without-manifest,-pre-run-deploy,-pre-nbmodule-run-deploy,-run-deploy-nb,-init-deploy-ant,-deploy-ant,-run-deploy-am,-post-nbmodule-run-deploy,-post-run-deploy,-do-update-breakpoints" name="run-deploy"/>
+    <target if="netbeans.home" name="-run-deploy-nb">
+        <nbdeploy clientUrlPart="${client.urlPart}" debugmode="false" forceRedeploy="${forceRedeploy}"/>
+    </target>
+    <target name="-init-deploy-ant" unless="netbeans.home">
+        <property name="deploy.ant.archive" value="${dist.war}"/>
+        <property name="deploy.ant.docbase.dir" value="${web.docbase.dir}"/>
+        <property name="deploy.ant.resource.dir" value="${resource.dir}"/>
+        <property name="deploy.ant.enabled" value="true"/>
+    </target>
+    <target depends="dist,-run-undeploy-nb,-init-deploy-ant,-undeploy-ant" name="run-undeploy"/>
+    <target if="netbeans.home" name="-run-undeploy-nb">
+        <fail message="Undeploy is not supported from within the IDE"/>
+    </target>
+    <target depends="init,-pre-dist,dist,-post-dist" name="verify">
+        <nbverify file="${dist.war}"/>
+    </target>
+    <target depends="run-deploy,-init-display-browser,-display-browser-nb-old,-display-browser-nb,-display-browser-cl" name="run-display-browser"/>
+    <target if="do.display.browser" name="-init-display-browser">
+        <condition property="do.display.browser.nb.old">
+            <and>
+                <isset property="netbeans.home"/>
+                <not>
+                    <isset property="browser.context"/>
+                </not>
+            </and>
+        </condition>
+        <condition property="do.display.browser.nb">
+            <and>
+                <isset property="netbeans.home"/>
+                <isset property="browser.context"/>
+            </and>
+        </condition>
+        <condition property="do.display.browser.cl">
+            <isset property="deploy.ant.enabled"/>
+        </condition>
+    </target>
+    <target if="do.display.browser.nb.old" name="-display-browser-nb-old">
+        <nbbrowse url="${client.url}"/>
+    </target>
+    <target if="do.display.browser.nb" name="-display-browser-nb">
+        <nbbrowse context="${browser.context}" url="${client.url}" urlPath="${client.urlPart}"/>
+    </target>
+    <target if="do.display.browser.cl" name="-get-browser" unless="browser">
+        <condition property="browser" value="rundll32">
+            <os family="windows"/>
+        </condition>
+        <condition else="" property="browser.args" value="url.dll,FileProtocolHandler">
+            <os family="windows"/>
+        </condition>
+        <condition property="browser" value="/usr/bin/open">
+            <os family="mac"/>
+        </condition>
+        <property environment="env"/>
+        <condition property="browser" value="${env.BROWSER}">
+            <isset property="env.BROWSER"/>
+        </condition>
+        <condition property="browser" value="/usr/bin/firefox">
+            <available file="/usr/bin/firefox"/>
+        </condition>
+        <condition property="browser" value="/usr/local/firefox/firefox">
+            <available file="/usr/local/firefox/firefox"/>
+        </condition>
+        <condition property="browser" value="/usr/bin/mozilla">
+            <available file="/usr/bin/mozilla"/>
+        </condition>
+        <condition property="browser" value="/usr/local/mozilla/mozilla">
+            <available file="/usr/local/mozilla/mozilla"/>
+        </condition>
+        <condition property="browser" value="/usr/sfw/lib/firefox/firefox">
+            <available file="/usr/sfw/lib/firefox/firefox"/>
+        </condition>
+        <condition property="browser" value="/opt/csw/bin/firefox">
+            <available file="/opt/csw/bin/firefox"/>
+        </condition>
+        <condition property="browser" value="/usr/sfw/lib/mozilla/mozilla">
+            <available file="/usr/sfw/lib/mozilla/mozilla"/>
+        </condition>
+        <condition property="browser" value="/opt/csw/bin/mozilla">
+            <available file="/opt/csw/bin/mozilla"/>
+        </condition>
+    </target>
+    <target depends="-get-browser" if="do.display.browser.cl" name="-display-browser-cl">
+        <fail unless="browser">
+                    Browser not found, cannot launch the deployed application. Try to set the BROWSER environment variable.
+                </fail>
+        <property name="browse.url" value="${deploy.ant.client.url}${client.urlPart}"/>
+        <echo>Launching ${browse.url}</echo>
+        <exec executable="${browser}" spawn="true">
+            <arg line="${browser.args} ${browse.url}"/>
+        </exec>
+    </target>
+    <target depends="init,-init-cos,compile-single" name="run-main">
+        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
+        <webproject1:java classname="${run.class}"/>
+    </target>
+    <target depends="init,compile-test-single,-pre-test-run-single" name="run-test-with-main">
+        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
+        <webproject1:java classname="${run.class}" classpath="${run.test.classpath}"/>
+    </target>
+    <target depends="init" if="netbeans.home" name="-do-update-breakpoints">
+        <webproject1:nbjpdaappreloaded/>
+    </target>
+    <!--
+                DEBUGGING SECTION
+            -->
+    <target depends="init,-init-cos,compile,compile-jsps,-do-compile-single-jsp,-pre-dist,-do-tmp-dist-with-manifest,-do-tmp-dist-without-manifest" description="Debug project in IDE." if="netbeans.home" name="debug">
+        <nbstartserver debugmode="true"/>
+        <antcall target="connect-debugger"/>
+        <nbdeploy clientUrlPart="${client.urlPart}" debugmode="true" forceRedeploy="true"/>
+        <antcall target="debug-display-browser-old"/>
+        <antcall target="debug-display-browser"/>
+        <antcall target="connect-client-debugger"/>
+    </target>
+    <target if="do.debug.server" name="connect-debugger" unless="is.debugged">
+        <condition property="listeningcp" value="sourcepath">
+            <istrue value="${j2ee.compile.on.save}"/>
+        </condition>
+        <nbjpdaconnect address="${jpda.address}" host="${jpda.host}" listeningcp="${listeningcp}" name="${name}" transport="${jpda.transport}">
+            <classpath>
+                <path path="${debug.classpath}:${j2ee.platform.classpath}"/>
+            </classpath>
+            <sourcepath>
+                <path path="${web.docbase.dir}"/>
+            </sourcepath>
+        </nbjpdaconnect>
+    </target>
+    <target if="do.display.browser.debug.old" name="debug-display-browser-old">
+        <nbbrowse url="${client.url}"/>
+    </target>
+    <target if="do.display.browser.debug" name="debug-display-browser">
+        <nbbrowse context="${browser.context}" url="${client.url}" urlPath="${client.urlPart}"/>
+    </target>
+    <target if="do.debug.client" name="connect-client-debugger">
+        <webproject1:nbjsdebugstart webUrl="${client.url}"/>
+    </target>
+    <target depends="init,compile-test-single" if="netbeans.home" name="-debug-start-debuggee-main-test">
+        <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
+        <webproject1:debug classname="${debug.class}" classpath="${debug.test.classpath}"/>
+    </target>
+    <target depends="init,compile-test-single,-debug-start-debugger-main-test,-debug-start-debuggee-main-test" if="netbeans.home" name="debug-test-with-main"/>
+    <target depends="init,compile,compile-jsps,-do-compile-single-jsp,debug" if="netbeans.home" name="debug-single"/>
+    <target depends="init" if="netbeans.home" name="-debug-start-debugger-main-test">
+        <webproject1:nbjpdastart classpath="${debug.test.classpath}" name="${debug.class}"/>
+    </target>
+    <target depends="init" if="netbeans.home" name="-debug-start-debugger">
+        <webproject1:nbjpdastart name="${debug.class}"/>
+    </target>
+    <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-single">
+        <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
+        <webproject1:debug classname="${debug.class}"/>
+    </target>
+    <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single-main"/>
+    <target depends="init" name="-pre-debug-fix">
+        <fail unless="fix.includes">Must set fix.includes</fail>
+        <property name="javac.includes" value="${fix.includes}.java"/>
+    </target>
+    <target depends="init,-pre-debug-fix,compile-single" if="netbeans.home" name="-do-debug-fix">
+        <webproject1:nbjpdareload/>
+    </target>
+    <target depends="init,-pre-debug-fix,-do-debug-fix" if="netbeans.home" name="debug-fix"/>
+    <!--
+            =================
+            PROFILING SECTION
+            =================
+            -->
+    <!--
+                pre NB7.2 profiling section; consider it deprecated
+            -->
+    <target description="Profile a J2EE project in the IDE." if="profiler.info.jvmargs.agent" name="-profile-pre72">
+        <condition else="start-profiled-server" property="profiler.startserver.target" value="start-profiled-server-extraargs">
+            <isset property="profiler.info.jvmargs.extra"/>
+        </condition>
+        <antcall target="${profiler.startserver.target}"/>
+        <antcall target="run"/>
+        <antcall target="-profile-start-loadgen"/>
+    </target>
+    <target if="profiler.info.jvmargs.agent" name="start-profiled-server">
+        <nbstartprofiledserver forceRestart="${profiler.j2ee.serverForceRestart}" javaPlatform="${profiler.info.javaPlatform}" startupTimeout="${profiler.j2ee.serverStartupTimeout}">
+            <jvmarg value="${profiler.info.jvmargs.agent}"/>
+            <jvmarg value="${profiler.j2ee.agentID}"/>
+        </nbstartprofiledserver>
+    </target>
+    <target if="profiler.info.jvmargs.agent" name="start-profiled-server-extraargs">
+        <nbstartprofiledserver forceRestart="${profiler.j2ee.serverForceRestart}" javaPlatform="${profiler.info.javaPlatform}" startupTimeout="${profiler.j2ee.serverStartupTimeout}">
+            <jvmarg value="${profiler.info.jvmargs.extra}"/>
+            <jvmarg value="${profiler.info.jvmargs.agent}"/>
+            <jvmarg value="${profiler.j2ee.agentID}"/>
+        </nbstartprofiledserver>
+    </target>
+    <target depends="profile-init,compile-test-single" if="profiler.info.jvmargs.agent" name="-profile-test-single-pre72">
+        <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
+        <nbprofiledirect>
+            <classpath>
+                <path path="${run.test.classpath}"/>
+                <path path="${j2ee.platform.classpath}"/>
+            </classpath>
+        </nbprofiledirect>
+        <junit dir="${profiler.info.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" jvm="${profiler.info.jvm}" showoutput="true">
+            <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
+            <jvmarg value="${profiler.info.jvmargs.agent}"/>
+            <jvmarg line="${profiler.info.jvmargs}"/>
+            <test name="${profile.class}"/>
+            <classpath>
+                <path path="${run.test.classpath}"/>
+                <path path="${j2ee.platform.classpath}"/>
+            </classpath>
+            <syspropertyset>
+                <propertyref prefix="test-sys-prop."/>
+                <mapper from="test-sys-prop.*" to="*" type="glob"/>
+            </syspropertyset>
+            <formatter type="brief" usefile="false"/>
+            <formatter type="xml"/>
+        </junit>
+    </target>
+    <target if="netbeans.home" name="-profile-check">
+        <condition property="profiler.configured">
+            <or>
+                <contains casesensitive="true" string="${run.jvmargs.ide}" substring="-agentpath:"/>
+                <contains casesensitive="true" string="${run.jvmargs.ide}" substring="-javaagent:"/>
+            </or>
+        </condition>
+    </target>
+    <target depends="init,-init-cos,compile,compile-jsps,-do-compile-single-jsp,-pre-dist,-do-tmp-dist-with-manifest,-do-tmp-dist-without-manifest" name="-do-profile">
+        <startprofiler/>
+        <nbstartserver profilemode="true"/>
+        <nbdeploy clientUrlPart="${client.urlPart}" forceRedeploy="true" profilemode="true"/>
+        <antcall target="debug-display-browser-old"/>
+        <antcall target="debug-display-browser"/>
+        <antcall target="-profile-start-loadgen"/>
+    </target>
+    <target depends="-profile-check,-profile-pre72" description="Profile a J2EE project in the IDE." if="profiler.configured" name="profile" unless="profiler.info.jvmargs.agent">
+        <antcall target="-do-profile"/>
+    </target>
+    <target depends="-profile-test-single-pre72" name="profile-test-single"/>
+    <target depends="-profile-check" if="profiler.configured" name="profile-test" unless="profiler.info.jvmargs.agent">
+        <startprofiler/>
+        <antcall target="test-single"/>
+    </target>
+    <target if="profiler.loadgen.path" name="-profile-start-loadgen">
+        <loadgenstart path="${profiler.loadgen.path}"/>
+    </target>
+    <!--
+                JAVADOC SECTION
+            -->
+    <target depends="init" if="have.sources" name="javadoc-build">
+        <mkdir dir="${dist.javadoc.dir}"/>
+        <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
+            <classpath>
+                <path path="${javac.classpath}:${j2ee.platform.classpath}"/>
+            </classpath>
+            <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
+                <filename name="**/*.java"/>
+            </fileset>
+            <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
+                <include name="**/*.java"/>
+            </fileset>
+        </javadoc>
+        <copy todir="${dist.javadoc.dir}">
+            <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
+                <filename name="**/doc-files/**"/>
+            </fileset>
+            <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
+                <include name="**/doc-files/**"/>
+            </fileset>
+        </copy>
+    </target>
+    <target depends="init,javadoc-build" if="netbeans.home" name="javadoc-browse" unless="no.javadoc.preview">
+        <nbbrowse file="${dist.javadoc.dir}/index.html"/>
+    </target>
+    <target depends="init,javadoc-build,javadoc-browse" description="Build Javadoc." name="javadoc"/>
+    <!--
+                
+                TEST COMPILATION SECTION
+            -->
+    <target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
+        <mkdir dir="${build.test.classes.dir}"/>
+        <property name="j2ee.platform.embeddableejb.classpath" value=""/>
+    </target>
+    <target name="-pre-compile-test">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test" if="have.tests" name="-do-compile-test">
+        <webproject2:javac classpath="${javac.test.classpath}:${j2ee.platform.classpath}:${j2ee.platform.embeddableejb.classpath}" debug="true" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
+        <copy todir="${build.test.classes.dir}">
+            <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+        </copy>
+    </target>
+    <target name="-post-compile-test">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-do-compile-test,-post-compile-test" name="compile-test"/>
+    <target name="-pre-compile-test-single">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
+        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
+        <webproject2:javac classpath="${javac.test.classpath}:${j2ee.platform.classpath}:${j2ee.platform.embeddableejb.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" srcdir="${test.src.dir}"/>
+        <copy todir="${build.test.classes.dir}">
+            <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+        </copy>
+    </target>
+    <target name="-post-compile-test-single">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
+    <!--
+                
+                TEST EXECUTION SECTION
+            -->
+    <target depends="init" if="have.tests" name="-pre-test-run">
+        <mkdir dir="${build.test.results.dir}"/>
+    </target>
+    <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
+        <webproject2:test includes="${includes}" testincludes="**/*Test.java"/>
+    </target>
+    <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
+        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
+    </target>
+    <target depends="init" if="have.tests" name="test-report"/>
+    <target depends="init" if="netbeans.home+have.tests" name="-test-browse"/>
+    <target depends="init,compile-test,-pre-test-run,-do-test-run,test-report,-post-test-run,-test-browse" description="Run unit tests." name="test"/>
+    <target depends="init" if="have.tests" name="-pre-test-run-single">
+        <mkdir dir="${build.test.results.dir}"/>
+    </target>
+    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single">
+        <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
+        <webproject2:test excludes="" includes="${test.includes}" testincludes="${test.includes}"/>
+    </target>
+    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">
+        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
+    </target>
+    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
+    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single-method">
+        <fail unless="test.class">Must select some files in the IDE or set test.class</fail>
+        <fail unless="test.method">Must select some method in the IDE or set test.method</fail>
+        <webproject2:test excludes="" includes="${javac.includes}" testincludes="${test.class}" testmethods="${test.method}"/>
+    </target>
+    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single-method" if="have.tests" name="-post-test-run-single-method">
+        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
+    </target>
+    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single-method,-post-test-run-single-method" description="Run single unit test." name="test-single-method"/>
+    <!--
+                
+                TEST DEBUGGING SECTION
+            -->
+    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-debug-start-debuggee-test">
+        <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
+        <webproject2:test-debug excludes="" includes="${javac.includes}" testClass="${test.class}" testincludes="${javac.includes}"/>
+    </target>
+    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-debug-start-debuggee-test-method">
+        <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
+        <fail unless="test.method">Must select some method in the IDE or set test.method</fail>
+        <webproject2:test-debug excludes="" includes="${javac.includes}" testClass="${test.class}" testMethod="${test.method}" testincludes="${test.class}" testmethods="${test.method}"/>
+    </target>
+    <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">
+        <webproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/>
+    </target>
+    <target depends="init,compile-test,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
+    <target depends="init,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test-method" name="debug-test-method"/>
+    <target depends="debug-test-method" name="debug-single-method"/>
+    <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
+        <webproject1:nbjpdareload dir="${build.test.classes.dir}"/>
+    </target>
+    <target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
+    <!--
+                
+                CLEANUP SECTION
+            -->
+    <target depends="init" name="deps-clean" unless="no.deps"/>
+    <target depends="init" name="do-clean">
+        <condition property="build.dir.to.clean" value="${build.web.dir}">
+            <isset property="dist.ear.dir"/>
+        </condition>
+        <property name="build.dir.to.clean" value="${build.web.dir}"/>
+        <delete includeEmptyDirs="true" quiet="true">
+            <fileset dir="${build.dir.to.clean}/WEB-INF/lib"/>
+        </delete>
+        <delete dir="${build.dir}"/>
+        <available file="${build.dir.to.clean}/WEB-INF/lib" property="status.clean-failed" type="dir"/>
+        <delete dir="${dist.dir}"/>
+    </target>
+    <target depends="do-clean" if="status.clean-failed" name="check-clean">
+        <echo message="Warning: unable to delete some files in ${build.web.dir}/WEB-INF/lib - they are probably locked by the J2EE server. "/>
+        <echo level="info" message="To delete all files undeploy the module from Server Registry in Runtime tab and then use Clean again."/>
+    </target>
+    <target depends="init" if="netbeans.home" name="undeploy-clean">
+        <nbundeploy failOnError="false" startServer="false"/>
+    </target>
+    <target name="-post-clean">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,undeploy-clean,deps-clean,do-clean,check-clean,-post-clean" description="Clean build products." name="clean"/>
+    <target depends="clean" description="Clean build products." name="clean-ear"/>
+</project>
diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
index 535ca5c..65c1651 100644
--- a/nbproject/genfiles.properties
+++ b/nbproject/genfiles.properties
@@ -1,8 +1,19 @@
-build.xml.data.CRC32=bc5fa736
+<<<<<<< HEAD
+build.xml.data.CRC32=80e5c640
 build.xml.script.CRC32=3e217ebe
 build.xml.stylesheet.CRC32=1707db4f@1.99.0.1
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=bc5fa736
-nbproject/build-impl.xml.script.CRC32=05bf5cba
+nbproject/build-impl.xml.data.CRC32=80e5c640
+nbproject/build-impl.xml.script.CRC32=f80a9f5c
 nbproject/build-impl.xml.stylesheet.CRC32=334708a0@1.99.0.1
+=======
+build.xml.data.CRC32=2bac40e6
+build.xml.script.CRC32=3e217ebe
+build.xml.stylesheet.CRC32=1707db4f@1.97.0.1
+# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
+# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
+nbproject/build-impl.xml.data.CRC32=2bac40e6
+nbproject/build-impl.xml.script.CRC32=6d6280d3
+nbproject/build-impl.xml.stylesheet.CRC32=334708a0@1.97.0.1
+>>>>>>> origin/main
diff --git a/nbproject/private/private.properties b/nbproject/private/private.properties
index 4dfeb13..873004e 100644
--- a/nbproject/private/private.properties
+++ b/nbproject/private/private.properties
@@ -1,7 +1,7 @@
-deploy.ant.properties.file=C:\\Users\\ADMIN\\AppData\\Roaming\\NetBeans\\23\\tomcat101.properties
-j2ee.server.home=F:/Tomcat/apache-tomcat-10.1.23-windows-x64/apache-tomcat-10.1.23
-j2ee.server.instance=tomcat101:home=F:\\Tomcat\\apache-tomcat-10.1.23-windows-x64\\apache-tomcat-10.1.23
-javac.debug=true
-javadoc.preview=true
-selected.browser=default
-user.properties.file=C:\\Users\\ADMIN\\AppData\\Roaming\\NetBeans\\23\\build.properties
+deploy.ant.properties.file=C:\\Users\\OS\\AppData\\Roaming\\NetBeans\\17\\tomcat101.properties
+j2ee.server.home=C:/Program Files/Apache Software Foundation/Tomcat 10.1
+j2ee.server.instance=tomcat101:home=C:\\Program Files\\Apache Software Foundation\\Tomcat 10.1
+javac.debug=true
+javadoc.preview=true
+selected.browser=default
+user.properties.file=C:\\Users\\OS\\AppData\\Roaming\\NetBeans\\17\\build.properties
diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml
index 84e7071..bdd494c 100644
--- a/nbproject/private/private.xml
+++ b/nbproject/private/private.xml
@@ -1,22 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project-private xmlns="http://www.netbeans.org/ns/project-private/1">
-    <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="1">
-        <file>
-            <url>src/java/controller/marketLink.java</url>
-            <bookmark id="1">
-                <name/>
-                <line>19</line>
-                <key/>
-            </bookmark>
-        </file>
-    </editor-bookmarks>
+    <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
         <group>
-            <file>file:/F:/New%20folder/FUNET3/src/java/controller/notificationServlet.java</file>
-            <file>file:/F:/New%20folder/FUNET3/web/vnpay_return.jsp</file>
-            <file>file:/F:/New%20folder/FUNET3/src/java/controller/SearchProductServlet.java</file>
-            <file>file:/F:/New%20folder/FUNET3/src/java/controller/marketLink.java</file>
-            <file>file:/F:/New%20folder/FUNET3/web/WEB-INF/marketNotification.jsp</file>
+            <file>file:/E:/FUNET/FUNET/web/WEB-INF/friendRequest.jsp</file>
+            <file>file:/E:/FUNET/FUNET/src/java/model/Message.java</file>
+            <file>file:/E:/FUNET/FUNET/web/WEB-INF/verify.jsp</file>
+            <file>file:/E:/FUNET/FUNET/src/java/model/Comment.java</file>
+            <file>file:/E:/FUNET/FUNET/src/java/controller/VerifyServlet.java</file>
+            <file>file:/E:/FUNET/FUNET/src/java/websockets/MessageEncoder.java</file>
+            <file>file:/E:/FUNET/FUNET/web/assets/css/search.css</file>
+            <file>file:/E:/FUNET/FUNET/src/java/controller/ChatController.java</file>
+            <file>file:/E:/FUNET/FUNET/web/assets/css/profile.css</file>
+            <file>file:/E:/FUNET/FUNET/src/java/controller/signupServlet.java</file>
+            <file>file:/E:/FUNET/FUNET/src/java/dao/MessageDao.java</file>
+            <file>file:/E:/FUNET/FUNET/web/assets/css/home.css</file>
+            <file>file:/E:/FUNET/FUNET/src/java/websockets/MessageDecoder.java</file>
+            <file>file:/E:/FUNET/FUNET/web/assets/js/likeButton.js</file>
+            <file>file:/E:/FUNET/FUNET/web/META-INF/context.xml</file>
+            <file>file:/E:/FUNET/FUNET/src/java/services/ChatService.java</file>
+            <file>file:/E:/FUNET/FUNET/src/java/controller/changeAvatarServlet.java</file>
+            <file>file:/E:/FUNET/FUNET/src/java/controller/loginServlet.java</file>
+            <file>file:/E:/FUNET/FUNET/src/java/controller/postServlet.java</file>
+            <file>file:/E:/FUNET/FUNET/web/assets/js/bootstrap.min.js</file>
+            <file>file:/E:/FUNET/FUNET/src/java/controller/userpageServlet.java</file>
+            <file>file:/E:/FUNET/FUNET/web/WEB-INF/setting.jsp</file>
+            <file>file:/E:/FUNET/FUNET/src/java/websockets/ChatWebsocket.java</file>
+            <file>file:/E:/FUNET/FUNET/src/java/controller/settingServlet.java</file>
+            <file>file:/E:/FUNET/FUNET/web/assets/css/test.css</file>
+            <file>file:/E:/FUNET/FUNET/web/WEB-INF/chatbox.jsp</file>
+            <file>file:/E:/FUNET/FUNET/src/java/util/sqlConnect.java</file>
+            <file>file:/E:/FUNET/FUNET/web/assets/js/likeButton.js</file>
+            <file>file:/E:/FUNET/FUNET/web/WEB-INF/chatbox.jsp</file>
+            <file>file:/E:/FUNET/FUNET/src/java/controller/postServlet.java</file>
+            <file>file:/E:/FUNET/FUNET/web/WEB-INF/home.jsp</file>
         </group>
     </open-files>
 </project-private>
diff --git a/nbproject/project.properties b/nbproject/project.properties
index 34577b8..a4dd6f4 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 annotation.processing.enabled=true
 annotation.processing.enabled.in.editor=true
 annotation.processing.processors.list=
@@ -26,14 +27,28 @@ dist.ear.war=${dist.dir}/${war.ear.name}
 dist.javadoc.dir=${dist.dir}/javadoc
 dist.war=${dist.dir}/${war.name}
 excludes=
+file.reference.cloudinary-core-1.33.0.jar=web\\assets\\library\\Cloudinary\\cloudinary-core-1.33.0.jar
+file.reference.cloudinary-http44-1.39.0.jar=web\\assets\\library\\Cloudinary\\cloudinary-http44-1.39.0.jar
+file.reference.commons-codec-1.17.1.jar=web\\assets\\library\\Cloudinary\\commons-codec-1.17.1.jar
+file.reference.commons-fileupload-1.5.jar=web\\assets\\DropBox\\commons-fileupload-1.5.jar
+file.reference.commons-io-2.11.0.jar=web\\assets\\DropBox\\commons-io-2.11.0.jar
+file.reference.commons-io-2.17.0.jar=web\\assets\\library\\Cloudinary\\commons-io-2.17.0.jar
 file.reference.commons-logging-1.2.jar=web/assets/library/commons-logging-1.2.jar
+file.reference.commons-logging-1.2.jar-1=web\\assets\\library\\Cloudinary\\commons-logging-1.2.jar
+file.reference.dotenv-java-3.0.2.jar=web\\assets\\library\\Cloudinary\\dotenv-java-3.0.2.jar
+file.reference.dropbox-core-sdk-5.4.4.jar=web\\assets\\DropBox\\dropbox-core-sdk-5.4.4.jar
 file.reference.fluent-hc-4.5.5.jar=web/assets/library/fluent-hc-4.5.5.jar
 file.reference.gson-2.10.1.jar=web/assets/library/gson-2.10.1.jar
-file.reference.gson-2.3.1.jar=web\\assets\\gson-2.3.1.jar
+file.reference.httpclient-4.5.14.jar=web\\assets\\library\\Cloudinary\\httpclient-4.5.14.jar
 file.reference.httpclient-4.5.5.jar=web/assets/library/httpclient-4.5.5.jar
+file.reference.httpcore-4.4.16.jar=web\\assets\\library\\Cloudinary\\httpcore-4.4.16.jar
 file.reference.httpcore-4.4.9.jar=web/assets/library/httpcore-4.4.9.jar
+file.reference.httpmime-4.5.14.jar=web\\assets\\library\\Cloudinary\\httpmime-4.5.14.jar
+file.reference.jackson-annotations-2.15.2.jar=web\\assets\\DropBox\\jackson-annotations-2.15.2.jar
 file.reference.jackson-annotations-2.17.2.jar=web\\assets\\library\\jackson-annotations-2.17.2.jar
+file.reference.jackson-core-2.15.2.jar=web\\assets\\DropBox\\jackson-core-2.15.2.jar
 file.reference.jackson-core-2.17.2.jar=web\\assets\\library\\jackson-core-2.17.2.jar
+file.reference.jackson-databind-2.15.2.jar=web\\assets\\DropBox\\jackson-databind-2.15.2.jar
 file.reference.jackson-databind-2.17.2.jar=web\\assets\\library\\jackson-databind-2.17.2.jar
 file.reference.jakarta.activation-api-2.1.3.jar=web/assets/library/jakarta.activation-api-2.1.3.jar
 file.reference.jakarta.json-api-2.1.3.jar=web/assets/library/jakarta.json-api-2.1.3.jar
@@ -43,14 +58,18 @@ file.reference.jakarta.servlet.jsp.jstl-api-3.0.0.jar=web/assets/library/jakarta
 file.reference.jakarta.websocket-api-2.2.0.jar=web/assets/library/jakarta.websocket-api-2.2.0.jar
 file.reference.jakarta.websocket-client-api-2.2.0.jar=web/assets/library/jakarta.websocket-client-api-2.2.0.jar
 file.reference.javaee-api-7.0.jar=web/assets/library/javaee-api-7.0.jar
+file.reference.javax.servlet-api-4.0.1.jar=web\\assets\\DropBox\\javax.servlet-api-4.0.1.jar
+file.reference.javax.servlet.jsp-api-2.3.3.jar=web\\assets\\DropBox\\javax.servlet.jsp-api-2.3.3.jar
 file.reference.json-20240303.jar=web/assets/library/json-20240303.jar
 file.reference.mssql-jdbc-12.6.1.jre11.jar=web/assets/library/Microsoft_JDBC_12.6/mssql-jdbc-12.6.1.jre11.jar
+file.reference.slf4j-api-2.0.7.jar=web\\assets\\DropBox\\slf4j-api-2.0.7.jar
+file.reference.slf4j-simple-2.0.7.jar=web\\assets\\DropBox\\slf4j-simple-2.0.7.jar
 includes=**
 j2ee.compile.on.save=true
 j2ee.copy.static.files.on.save=true
 j2ee.deploy.on.save=true
 j2ee.platform=10-web
-j2ee.platform.classpath=${j2ee.server.home}/bin/tomcat-juli.jar:${j2ee.server.home}/lib/annotations-api.jar:${j2ee.server.home}/lib/catalina-ant.jar:${j2ee.server.home}/lib/catalina-ha.jar:${j2ee.server.home}/lib/catalina-ssi.jar:${j2ee.server.home}/lib/catalina-storeconfig.jar:${j2ee.server.home}/lib/catalina-tribes.jar:${j2ee.server.home}/lib/catalina.jar:${j2ee.server.home}/lib/ecj-4.27.jar:${j2ee.server.home}/lib/el-api.jar:${j2ee.server.home}/lib/jakartaee-migration-1.0.8-shaded.jar:${j2ee.server.home}/lib/jasper-el.jar:${j2ee.server.home}/lib/jasper.jar:${j2ee.server.home}/lib/jaspic-api.jar:${j2ee.server.home}/lib/jsp-api.jar:${j2ee.server.home}/lib/servlet-api.jar:${j2ee.server.home}/lib/tomcat-api.jar:${j2ee.server.home}/lib/tomcat-coyote.jar:${j2ee.server.home}/lib/tomcat-dbcp.jar:${j2ee.server.home}/lib/tomcat-i18n-cs.jar:${j2ee.server.home}/lib/tomcat-i18n-de.jar:${j2ee.server.home}/lib/tomcat-i18n-es.jar:${j2ee.server.home}/lib/tomcat-i18n-fr.jar:${j2ee.server.home}/lib/tomcat-i18n-ja.jar:${j2ee.server.home}/lib/tomcat-i18n-ko.jar:${j2ee.server.home}/lib/tomcat-i18n-pt-BR.jar:${j2ee.server.home}/lib/tomcat-i18n-ru.jar:${j2ee.server.home}/lib/tomcat-i18n-zh-CN.jar:${j2ee.server.home}/lib/tomcat-jdbc.jar:${j2ee.server.home}/lib/tomcat-jni.jar:${j2ee.server.home}/lib/tomcat-util-scan.jar:${j2ee.server.home}/lib/tomcat-util.jar:${j2ee.server.home}/lib/tomcat-websocket.jar:${j2ee.server.home}/lib/websocket-api.jar:${j2ee.server.home}/lib/websocket-client-api.jar
+j2ee.platform.classpath=${j2ee.server.home}/bin/tomcat-juli.jar:${j2ee.server.home}/lib/annotations-api.jar:${j2ee.server.home}/lib/catalina-ant.jar:${j2ee.server.home}/lib/catalina-ha.jar:${j2ee.server.home}/lib/catalina-ssi.jar:${j2ee.server.home}/lib/catalina-storeconfig.jar:${j2ee.server.home}/lib/catalina-tribes.jar:${j2ee.server.home}/lib/catalina.jar:${j2ee.server.home}/lib/ecj-4.31.jar:${j2ee.server.home}/lib/el-api.jar:${j2ee.server.home}/lib/jakartaee-migration-1.0.8-shaded.jar:${j2ee.server.home}/lib/jasper-el.jar:${j2ee.server.home}/lib/jasper.jar:${j2ee.server.home}/lib/jaspic-api.jar:${j2ee.server.home}/lib/jsp-api.jar:${j2ee.server.home}/lib/servlet-api.jar:${j2ee.server.home}/lib/tomcat-api.jar:${j2ee.server.home}/lib/tomcat-coyote.jar:${j2ee.server.home}/lib/tomcat-dbcp.jar:${j2ee.server.home}/lib/tomcat-i18n-cs.jar:${j2ee.server.home}/lib/tomcat-i18n-de.jar:${j2ee.server.home}/lib/tomcat-i18n-es.jar:${j2ee.server.home}/lib/tomcat-i18n-fr.jar:${j2ee.server.home}/lib/tomcat-i18n-ja.jar:${j2ee.server.home}/lib/tomcat-i18n-ko.jar:${j2ee.server.home}/lib/tomcat-i18n-pt-BR.jar:${j2ee.server.home}/lib/tomcat-i18n-ru.jar:${j2ee.server.home}/lib/tomcat-i18n-zh-CN.jar:${j2ee.server.home}/lib/tomcat-jdbc.jar:${j2ee.server.home}/lib/tomcat-jni.jar:${j2ee.server.home}/lib/tomcat-util-scan.jar:${j2ee.server.home}/lib/tomcat-util.jar:${j2ee.server.home}/lib/tomcat-websocket.jar:${j2ee.server.home}/lib/websocket-api.jar:${j2ee.server.home}/lib/websocket-client-api.jar
 j2ee.server.type=Tomcat
 jar.compress=false
 javac.classpath=\
@@ -72,7 +91,25 @@ javac.classpath=\
     ${file.reference.jackson-annotations-2.17.2.jar}:\
     ${file.reference.jackson-core-2.17.2.jar}:\
     ${file.reference.jackson-databind-2.17.2.jar}:\
-    ${file.reference.gson-2.3.1.jar}
+    ${file.reference.cloudinary-core-1.33.0.jar}:\
+    ${file.reference.cloudinary-http44-1.39.0.jar}:\
+    ${file.reference.commons-codec-1.17.1.jar}:\
+    ${file.reference.commons-io-2.17.0.jar}:\
+    ${file.reference.commons-logging-1.2.jar-1}:\
+    ${file.reference.dotenv-java-3.0.2.jar}:\
+    ${file.reference.httpclient-4.5.14.jar}:\
+    ${file.reference.httpcore-4.4.16.jar}:\
+    ${file.reference.httpmime-4.5.14.jar}:\
+    ${file.reference.commons-fileupload-1.5.jar}:\
+    ${file.reference.commons-io-2.11.0.jar}:\
+    ${file.reference.dropbox-core-sdk-5.4.4.jar}:\
+    ${file.reference.jackson-annotations-2.15.2.jar}:\
+    ${file.reference.jackson-core-2.15.2.jar}:\
+    ${file.reference.jackson-databind-2.15.2.jar}:\
+    ${file.reference.javax.servlet-api-4.0.1.jar}:\
+    ${file.reference.javax.servlet.jsp-api-2.3.3.jar}:\
+    ${file.reference.slf4j-api-2.0.7.jar}:\
+    ${file.reference.slf4j-simple-2.0.7.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.debug=true
@@ -118,3 +155,158 @@ war.ear.name=${war.name}
 war.name=FUNET.war
 web.docbase.dir=web
 webinf.dir=web/WEB-INF
+=======
+annotation.processing.enabled=true
+annotation.processing.enabled.in.editor=true
+annotation.processing.processors.list=
+annotation.processing.run.all.processors=true
+annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
+build.classes.dir=${build.web.dir}/WEB-INF/classes
+build.classes.excludes=**/*.java,**/*.form
+build.dir=build
+build.generated.dir=${build.dir}/generated
+build.generated.sources.dir=${build.dir}/generated-sources
+build.test.classes.dir=${build.dir}/test/classes
+build.test.results.dir=${build.dir}/test/results
+build.web.dir=${build.dir}/web
+build.web.excludes=${build.classes.excludes}
+client.urlPart=
+compile.jsps=false
+conf.dir=${source.root}/conf
+debug.classpath=${build.classes.dir}:${javac.classpath}
+debug.test.classpath=\
+    ${run.test.classpath}
+display.browser=true
+# Files to be excluded from distribution war
+dist.archive.excludes=
+dist.dir=dist
+dist.ear.war=${dist.dir}/${war.ear.name}
+dist.javadoc.dir=${dist.dir}/javadoc
+dist.war=${dist.dir}/${war.name}
+excludes=
+file.reference.cloudinary-core-1.33.0.jar=web\\assets\\library\\Cloudinary\\cloudinary-core-1.33.0.jar
+file.reference.cloudinary-http44-1.39.0.jar=web\\assets\\library\\Cloudinary\\cloudinary-http44-1.39.0.jar
+file.reference.commons-codec-1.17.1.jar=web\\assets\\library\\Cloudinary\\commons-codec-1.17.1.jar
+file.reference.commons-io-2.17.0.jar=web\\assets\\library\\Cloudinary\\commons-io-2.17.0.jar
+file.reference.commons-logging-1.2.jar=web\\assets\\library\\Cloudinary\\commons-logging-1.2.jar
+file.reference.commons-logging-1.2.jar-1=web\\assets\\library\\commons-logging-1.2.jar
+file.reference.dotenv-java-3.0.2.jar=web\\assets\\library\\Cloudinary\\dotenv-java-3.0.2.jar
+file.reference.fluent-hc-4.5.5.jar=web\\assets\\library\\fluent-hc-4.5.5.jar
+file.reference.gson-2.10.1.jar=web\\assets\\library\\gson-2.10.1.jar
+file.reference.gson-2.3.1.jar=web\\assets\\library\\gson-2.3.1.jar
+file.reference.httpclient-4.5.14.jar=web\\assets\\library\\Cloudinary\\httpclient-4.5.14.jar
+file.reference.httpclient-4.5.5.jar=web\\assets\\library\\httpclient-4.5.5.jar
+file.reference.httpcore-4.4.16.jar=web\\assets\\library\\Cloudinary\\httpcore-4.4.16.jar
+file.reference.httpcore-4.4.9.jar=web\\assets\\library\\httpcore-4.4.9.jar
+file.reference.httpmime-4.5.14.jar=web\\assets\\library\\Cloudinary\\httpmime-4.5.14.jar
+file.reference.jackson-annotations-2.17.2.jar=web\\assets\\library\\jackson-annotations-2.17.2.jar
+file.reference.jackson-core-2.17.2.jar=web\\assets\\library\\jackson-core-2.17.2.jar
+file.reference.jackson-databind-2.17.2.jar=web\\assets\\library\\jackson-databind-2.17.2.jar
+file.reference.jakarta.activation-api-2.1.3.jar=web\\assets\\library\\jakarta.activation-api-2.1.3.jar
+file.reference.jakarta.json-api-2.1.3.jar=web\\assets\\library\\jakarta.json-api-2.1.3.jar
+file.reference.jakarta.mail-2.0.1.jar=web\\assets\\library\\jakarta.mail-2.0.1.jar
+file.reference.jakarta.servlet.jsp.jstl-3.0.1.jar=web\\assets\\library\\jakarta_jstl\\jakarta.servlet.jsp.jstl-3.0.1.jar
+file.reference.jakarta.servlet.jsp.jstl-api-3.0.0.jar=web\\assets\\library\\jakarta_jstl\\jakarta.servlet.jsp.jstl-api-3.0.0.jar
+file.reference.jakarta.websocket-api-2.2.0.jar=web\\assets\\library\\jakarta.websocket-api-2.2.0.jar
+file.reference.jakarta.websocket-client-api-2.2.0.jar=web\\assets\\library\\jakarta.websocket-client-api-2.2.0.jar
+file.reference.javaee-api-7.0.jar=web\\assets\\library\\javaee-api-7.0.jar
+file.reference.jaxb-api-2.1.jar=web\\assets\\library\\jakarta_jstl\\jaxb-api-2.1.jar
+file.reference.json-20240303.jar=web\\assets\\library\\json-20240303.jar
+file.reference.mssql-jdbc-12.6.1.jre11.jar=web\\assets\\library\\Microsoft_JDBC_12.6\\mssql-jdbc-12.6.1.jre11.jar
+file.reference.sqljdbc42.jar=web\\assets\\library\\jakarta_jstl\\sqljdbc42.jar
+includes=**
+j2ee.compile.on.save=true
+j2ee.copy.static.files.on.save=true
+j2ee.deploy.on.save=true
+j2ee.platform=10-web
+j2ee.platform.classpath=${j2ee.server.home}/bin/tomcat-juli.jar:${j2ee.server.home}/lib/annotations-api.jar:${j2ee.server.home}/lib/catalina-ant.jar:${j2ee.server.home}/lib/catalina-ha.jar:${j2ee.server.home}/lib/catalina-ssi.jar:${j2ee.server.home}/lib/catalina-storeconfig.jar:${j2ee.server.home}/lib/catalina-tribes.jar:${j2ee.server.home}/lib/catalina.jar:${j2ee.server.home}/lib/ecj-4.27.jar:${j2ee.server.home}/lib/el-api.jar:${j2ee.server.home}/lib/jakartaee-migration-1.0.8-shaded.jar:${j2ee.server.home}/lib/jasper-el.jar:${j2ee.server.home}/lib/jasper.jar:${j2ee.server.home}/lib/jaspic-api.jar:${j2ee.server.home}/lib/jsp-api.jar:${j2ee.server.home}/lib/servlet-api.jar:${j2ee.server.home}/lib/tomcat-api.jar:${j2ee.server.home}/lib/tomcat-coyote-ffm.jar:${j2ee.server.home}/lib/tomcat-coyote.jar:${j2ee.server.home}/lib/tomcat-dbcp.jar:${j2ee.server.home}/lib/tomcat-i18n-cs.jar:${j2ee.server.home}/lib/tomcat-i18n-de.jar:${j2ee.server.home}/lib/tomcat-i18n-es.jar:${j2ee.server.home}/lib/tomcat-i18n-fr.jar:${j2ee.server.home}/lib/tomcat-i18n-ja.jar:${j2ee.server.home}/lib/tomcat-i18n-ko.jar:${j2ee.server.home}/lib/tomcat-i18n-pt-BR.jar:${j2ee.server.home}/lib/tomcat-i18n-ru.jar:${j2ee.server.home}/lib/tomcat-i18n-zh-CN.jar:${j2ee.server.home}/lib/tomcat-jdbc.jar:${j2ee.server.home}/lib/tomcat-jni.jar:${j2ee.server.home}/lib/tomcat-util-scan.jar:${j2ee.server.home}/lib/tomcat-util.jar:${j2ee.server.home}/lib/tomcat-websocket.jar:${j2ee.server.home}/lib/websocket-api.jar:${j2ee.server.home}/lib/websocket-client-api.jar
+j2ee.server.type=Tomcat
+jar.compress=false
+javac.classpath=\
+    ${file.reference.httpmime-4.5.14.jar}${file.reference.gson-2.3.1.jar}:\
+    ${file.reference.cloudinary-core-1.33.0.jar}:\
+    ${file.reference.cloudinary-http44-1.39.0.jar}:\
+    ${file.reference.commons-codec-1.17.1.jar}:\
+    ${file.reference.commons-io-2.17.0.jar}:\
+    ${file.reference.commons-logging-1.2.jar}:\
+    ${file.reference.dotenv-java-3.0.2.jar}:\
+    ${file.reference.httpclient-4.5.14.jar}:\
+    ${file.reference.httpcore-4.4.16.jar}:\
+    ${file.reference.httpmime-4.5.14.jar}:\
+    ${file.reference.commons-logging-1.2.jar-1}:\
+    ${file.reference.fluent-hc-4.5.5.jar}:\
+    ${file.reference.gson-2.10.1.jar}:\
+    ${file.reference.gson-2.3.1.jar}:\
+    ${file.reference.httpclient-4.5.5.jar}:\
+    ${file.reference.httpcore-4.4.9.jar}:\
+    ${file.reference.jackson-annotations-2.17.2.jar}:\
+    ${file.reference.jackson-core-2.17.2.jar}:\
+    ${file.reference.jackson-databind-2.17.2.jar}:\
+    ${file.reference.jakarta.activation-api-2.1.3.jar}:\
+    ${file.reference.jakarta.json-api-2.1.3.jar}:\
+    ${file.reference.jakarta.mail-2.0.1.jar}:\
+    ${file.reference.jakarta.websocket-api-2.2.0.jar}:\
+    ${file.reference.jakarta.websocket-client-api-2.2.0.jar}:\
+    ${file.reference.javaee-api-7.0.jar}:\
+    ${file.reference.json-20240303.jar}:\
+    ${file.reference.jakarta.servlet.jsp.jstl-3.0.1.jar}:\
+    ${file.reference.jakarta.servlet.jsp.jstl-api-3.0.0.jar}:\
+    ${file.reference.jaxb-api-2.1.jar}:\
+    ${file.reference.sqljdbc42.jar}:\
+    ${file.reference.mssql-jdbc-12.6.1.jre11.jar}:\
+    ${file.reference.slf4j-simple-2.0.7.jar}:\
+    ${file.reference.commons-fileupload-1.5.jar}:\
+    ${file.reference.commons-io-2.11.0.jar}:\
+    ${file.reference.dropbox-core-sdk-5.4.4.jar}:\
+    ${file.reference.jackson-annotations-2.15.2.jar}:\
+    ${file.reference.jackson-core-2.15.2.jar}:\
+    ${file.reference.jackson-databind-2.15.2.jar}:\
+    ${file.reference.javax.servlet-api-4.0.1.jar}:\
+    ${file.reference.javax.servlet.jsp-api-2.3.3.jar}:\
+    ${file.reference.slf4j-api-2.0.7.jar}
+# Space-separated list of extra javac options
+javac.compilerargs=
+javac.debug=true
+javac.deprecation=false
+javac.processorpath=\
+    ${javac.classpath}
+javac.source=17
+javac.target=17
+javac.test.classpath=\
+    ${javac.classpath}:\
+    ${build.classes.dir}
+javac.test.processorpath=\
+    ${javac.test.classpath}
+javadoc.additionalparam=
+javadoc.author=false
+javadoc.encoding=${source.encoding}
+javadoc.noindex=false
+javadoc.nonavbar=false
+javadoc.notree=false
+javadoc.preview=true
+javadoc.private=false
+javadoc.splitindex=true
+javadoc.use=true
+javadoc.version=false
+javadoc.windowtitle=
+lib.dir=${web.docbase.dir}/WEB-INF/lib
+no.dependencies=false
+persistence.xml.dir=${conf.dir}
+platform.active=default_platform
+resource.dir=setup
+run.test.classpath=\
+    ${javac.test.classpath}:\
+    ${build.test.classes.dir}
+# Space-separated list of JVM arguments used when running a class with a main method or a unit test
+# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value):
+runmain.jvmargs=
+source.encoding=UTF-8
+source.root=src
+src.dir=${source.root}/java
+test.src.dir=test
+war.content.additional=
+war.ear.name=${war.name}
+war.name=FUNET.war
+web.docbase.dir=web
+webinf.dir=web/WEB-INF
+>>>>>>> origin/main
diff --git a/nbproject/project.xml b/nbproject/project.xml
index 893d2e3..18e5b1d 100644
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -7,43 +7,46 @@
             <minimum-ant-version>1.6.5</minimum-ant-version>
             <web-module-libraries>
                 <library dirs="200">
-                    <file>${file.reference.jakarta.servlet.jsp.jstl-3.0.1.jar}</file>
+                    <file>${file.reference.httpmime-4.5.14.jar}${file.reference.gson-2.3.1.jar}</file>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.cloudinary-core-1.33.0.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
                 <library dirs="200">
-                    <file>${file.reference.jakarta.servlet.jsp.jstl-api-3.0.0.jar}</file>
+                    <file>${file.reference.cloudinary-http44-1.39.0.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
                 <library dirs="200">
-                    <file>${file.reference.mssql-jdbc-12.6.1.jre11.jar}</file>
+                    <file>${file.reference.commons-codec-1.17.1.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
                 <library dirs="200">
-                    <file>${file.reference.jakarta.activation-api-2.1.3.jar}</file>
+                    <file>${file.reference.commons-io-2.17.0.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
                 <library dirs="200">
-                    <file>${file.reference.jakarta.mail-2.0.1.jar}</file>
+                    <file>${file.reference.commons-logging-1.2.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
                 <library dirs="200">
-                    <file>${file.reference.json-20240303.jar}</file>
+                    <file>${file.reference.dotenv-java-3.0.2.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
                 <library dirs="200">
-                    <file>${file.reference.jakarta.json-api-2.1.3.jar}</file>
+                    <file>${file.reference.httpclient-4.5.14.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
                 <library dirs="200">
-                    <file>${file.reference.jakarta.websocket-api-2.2.0.jar}</file>
+                    <file>${file.reference.httpcore-4.4.16.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
                 <library dirs="200">
-                    <file>${file.reference.jakarta.websocket-client-api-2.2.0.jar}</file>
+                    <file>${file.reference.httpmime-4.5.14.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
                 <library dirs="200">
-                    <file>${file.reference.commons-logging-1.2.jar}</file>
+                    <file>${file.reference.commons-logging-1.2.jar-1}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
                 <library dirs="200">
@@ -54,6 +57,9 @@
                     <file>${file.reference.gson-2.10.1.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
+                <library dirs="200">
+                    <file>${file.reference.gson-2.3.1.jar}</file>
+                </library>
                 <library dirs="200">
                     <file>${file.reference.httpclient-4.5.5.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
@@ -62,24 +68,102 @@
                     <file>${file.reference.httpcore-4.4.9.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
+                <library dirs="200">
+                    <file>${file.reference.jackson-annotations-2.17.2.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.jackson-core-2.17.2.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.jackson-databind-2.17.2.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.jakarta.activation-api-2.1.3.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.jakarta.json-api-2.1.3.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.jakarta.mail-2.0.1.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.jakarta.websocket-api-2.2.0.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.jakarta.websocket-client-api-2.2.0.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
                 <library dirs="200">
                     <file>${file.reference.javaee-api-7.0.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
                 <library dirs="200">
-                    <file>${file.reference.jackson-annotations-2.17.2.jar}</file>
+                    <file>${file.reference.json-20240303.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
                 <library dirs="200">
-                    <file>${file.reference.jackson-core-2.17.2.jar}</file>
+                    <file>${file.reference.jakarta.servlet.jsp.jstl-3.0.1.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
                 <library dirs="200">
-                    <file>${file.reference.jackson-databind-2.17.2.jar}</file>
+                    <file>${file.reference.jakarta.servlet.jsp.jstl-api-3.0.0.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
                 <library dirs="200">
-                    <file>${file.reference.gson-2.3.1.jar}</file>
+                    <file>${file.reference.jaxb-api-2.1.jar}</file>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.sqljdbc42.jar}</file>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.mssql-jdbc-12.6.1.jre11.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.slf4j-simple-2.0.7.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.commons-fileupload-1.5.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.commons-io-2.11.0.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.dropbox-core-sdk-5.4.4.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.jackson-annotations-2.15.2.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.jackson-core-2.15.2.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.jackson-databind-2.15.2.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.javax.servlet-api-4.0.1.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.javax.servlet.jsp-api-2.3.3.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.slf4j-api-2.0.7.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
             </web-module-libraries>
diff --git a/src/java/Security/SHA512WithSalt.java b/src/java/Security/SHA512WithSalt.java
index f1edca7..defe824 100644
--- a/src/java/Security/SHA512WithSalt.java
+++ b/src/java/Security/SHA512WithSalt.java
@@ -1,58 +1,58 @@
-/*
- * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
- * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
- */
-package Security;
-
-import java.nio.charset.StandardCharsets;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.security.SecureRandom;
-import java.util.Base64;
-
-/**
- *
- * @author ADMIN
- */
-public class SHA512WithSalt {
-    
-    //Tạo salt ngẫu nhiên ( nân cao bảo mật để chống lại các cuộc tấn công từ rainbow table - bảng tra cứu mật khẩu )
-    
-    public static byte[] createSalt(){
-        SecureRandom random = new SecureRandom();
-        byte[] salt = new byte[16]; // mặc định salt có 16 byte
-        random.nextBytes(salt); // điền giá trị salt
-        return salt;
-    }
-    
-    public static String hashPassWordWithSHA512(String password, byte[] salt){
-        try{
-            
-            MessageDigest md = MessageDigest.getInstance("SHA-512");
-            md.update(salt);//thêm salt vào trc khi hash
-            
-            //hashing mật khẩu
-            byte[] hashBytes = md.digest(password.getBytes(StandardCharsets.UTF_8));//xử lý theo phương thức UTF_8
-            
-            // Kết hợp salt vào sau đó mã hóa thành base64 để lưu trữ
-            byte[] hashPassword = new byte[salt.length + hashBytes.length];
-            System.arraycopy(salt, 0, hashPassword, 0, salt.length);
-            System.arraycopy(hashBytes, 0, hashPassword, salt.length, hashBytes.length);
-            
-            return Base64.getEncoder().encodeToString(hashPassword);
-            
-        } catch (NoSuchAlgorithmException exception){
-            throw new RuntimeException(exception);
-        }
-    }
-    
-    public static void main(String[] args) {
-        //test case thử
-        String password = "123";
-        
-        byte[] salt = createSalt();
-        String hashedPassword = hashPassWordWithSHA512(password, salt);
-        
-        System.out.println("Mật khẩu sau khi hash là: " + hashedPassword);
-    }
-}
\ No newline at end of file
+///*
+// * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+// * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
+// */
+//package Security;
+//
+//import java.nio.charset.StandardCharsets;
+//import java.security.MessageDigest;
+//import java.security.NoSuchAlgorithmException;
+//import java.security.SecureRandom;
+//import java.util.Base64;
+//
+///**
+// *
+// * @author ADMIN
+// */
+//public class SHA512WithSalt {
+//    
+//    //Tạo salt ngẫu nhiên ( nân cao bảo mật để chống lại các cuộc tấn công từ rainbow table - bảng tra cứu mật khẩu )
+//    
+//    public static byte[] createSalt(){
+//        SecureRandom random = new SecureRandom();
+//        byte[] salt = new byte[16]; // mặc định salt có 16 byte
+//        random.nextBytes(salt); // điền giá trị salt
+//        return salt;
+//    }
+//    
+//    public static String hashPassWordWithSHA512(String password, byte[] salt){
+//        try{
+//            
+//            MessageDigest md = MessageDigest.getInstance("SHA-512");
+//            md.update(salt);//thêm salt vào trc khi hash
+//            
+//            //hashing mật khẩu
+//            byte[] hashBytes = md.digest(password.getBytes(StandardCharsets.UTF_8));//xử lý theo phương thức UTF_8
+//            
+//            // Kết hợp salt vào sau đó mã hóa thành base64 để lưu trữ
+//            byte[] hashPassword = new byte[salt.length + hashBytes.length];
+//            System.arraycopy(salt, 0, hashPassword, 0, salt.length);
+//            System.arraycopy(hashBytes, 0, hashPassword, salt.length, hashBytes.length);
+//            
+//            return Base64.getEncoder().encodeToString(hashPassword);
+//            
+//        } catch (NoSuchAlgorithmException exception){
+//            throw new RuntimeException(exception);
+//        }
+//    }
+//    
+//    public static void main(String[] args) {
+//        //test case thử
+//        String password = "123";
+//        
+//        byte[] salt = createSalt();
+//        String hashedPassword = hashPassWordWithSHA512(password, salt);
+//        
+//        System.out.println("Mật khẩu sau khi hash là: " + hashedPassword);
+//    }
+//}
\ No newline at end of file
diff --git a/src/java/com/vnpay/common/Config.java b/src/java/com/vnpay/common/Config.java
index 45a32e1..b47bb8c 100644
--- a/src/java/com/vnpay/common/Config.java
+++ b/src/java/com/vnpay/common/Config.java
@@ -22,7 +22,7 @@
 public class Config {
 
     public static String vnp_PayUrl = "https://sandbox.vnpayment.vn/paymentv2/vpcpay.html";
-    public static String vnp_ReturnUrl = "http://localhost:8080/FUNET/vnpay_return.jsp";
+    public static String vnp_ReturnUrl = "http://localhost:80/FUNET/vnpay_return.jsp";
     public static String vnp_TmnCode = "QMJKBD3P";
     public static String secretKey = "Z4JWL3JJYKLRWOGQR98UVE65P2RBLQAK";
     public static String vnp_ApiUrl = "https://sandbox.vnpayment.vn/merchant_webapi/api/transaction";
diff --git a/src/java/com/vnpay/common/ajaxServlet.java b/src/java/com/vnpay/common/ajaxServlet.java
index f53ad2f..7e29fa2 100644
--- a/src/java/com/vnpay/common/ajaxServlet.java
+++ b/src/java/com/vnpay/common/ajaxServlet.java
@@ -42,7 +42,7 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws S
 
         String vnp_TmnCode = Config.vnp_TmnCode;
         
-        Map<String, String> vnp_Params = new HashMap<>();
+        Map<String, String>  vnp_Params = new HashMap<>();
         vnp_Params.put("vnp_Version", vnp_Version);
         vnp_Params.put("vnp_Command", vnp_Command);
         vnp_Params.put("vnp_TmnCode", vnp_TmnCode);
diff --git a/src/java/controller/AddCartServlet.java b/src/java/controller/AddCartServlet.java
index b93cc80..061887e 100644
--- a/src/java/controller/AddCartServlet.java
+++ b/src/java/controller/AddCartServlet.java
@@ -56,4 +56,4 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
         }
         
     }
-}
+}
\ No newline at end of file
diff --git a/src/java/controller/AdminDeleteServlet.java b/src/java/controller/AdminDeleteServlet.java
new file mode 100644
index 0000000..bf62d05
--- /dev/null
+++ b/src/java/controller/AdminDeleteServlet.java
@@ -0,0 +1,117 @@
+/*
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+ * Click nbfs://nbhost/SystemFileSystem/Templates/JSP_Servlet/Servlet.java to edit this template
+ */
+package controller;
+
+import dao.UserActivityDAO;
+import dao.postDAO;
+import java.io.IOException;
+import java.io.PrintWriter;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ *
+ * @author Quocb
+ */
+public class AdminDeleteServlet extends HttpServlet {
+
+    /**
+     * Processes requests for both HTTP <code>GET</code> and <code>POST</code>
+     * methods.
+     *
+     * @param request servlet request
+     * @param response servlet response
+     * @throws ServletException if a servlet-specific error occurs
+     * @throws IOException if an I/O error occurs
+     */
+    protected void processRequest(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+        response.setContentType("text/html;charset=UTF-8");
+        try (PrintWriter out = response.getWriter()) {
+            /* TODO output your page here. You may use following sample code. */
+            out.println("<!DOCTYPE html>");
+            out.println("<html>");
+            out.println("<head>");
+            out.println("<title>Servlet AdminDeleteServlet</title>");
+            out.println("</head>");
+            out.println("<body>");
+            out.println("<h1>Servlet AdminDeleteServlet at " + request.getContextPath() + "</h1>");
+            out.println("</body>");
+            out.println("</html>");
+        }
+    }
+
+    // <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code.">
+    /**
+     * Handles the HTTP <code>GET</code> method.
+     *
+     * @param request servlet request
+     * @param response servlet response
+     * @throws ServletException if a servlet-specific error occurs
+     * @throws IOException if an I/O error occurs
+     */
+    @Override
+    protected void doGet(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+        processRequest(request, response);
+    }
+
+    /**
+     * Handles the HTTP <code>POST</code> method.
+     *
+     * @param request servlet request
+     * @param response servlet response
+     * @throws ServletException if a servlet-specific error occurs
+     * @throws IOException if an I/O error occurs
+     */
+    @Override
+    protected void doPost(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+        String type = request.getParameter("type");
+        int id = Integer.parseInt(request.getParameter("idtype"));
+        int userId = Integer.parseInt(request.getParameter("userId"));
+        postDAO postDAO = new postDAO();
+         UserActivityDAO useractivitydao=new UserActivityDAO();
+        if (type.equals("Post")) {
+            Logger.getLogger(userpageServlet.class.getName()).info("try to delete post");
+            
+            try {
+                 useractivitydao.deleteUserActivityByPostId(id);
+                postDAO.deletePost(id);
+                Logger.getLogger(userpageServlet.class.getName()).info("delete post complete");
+            } catch (Exception ex) {
+                Logger.getLogger(userpageServlet.class.getName()).log(Level.SEVERE, null, ex);
+            }
+            
+            response.sendRedirect("log?id="+userId);
+        }
+        if (type.equals("Comment")){
+             Logger.getLogger(userpageServlet.class.getName()).info("try to delete comment");
+              try {
+                  useractivitydao.deleteUserActivityByCommentId(id);
+                 postDAO.deleteComment(id);
+                 Logger.getLogger(userpageServlet.class.getName()).info("delete comment complete");
+            } catch (Exception ex) {
+                Logger.getLogger(userpageServlet.class.getName()).log(Level.SEVERE, null, ex);
+            }
+          response.sendRedirect("log?id="+userId);
+        }
+    }
+
+    /**
+     * Returns a short description of the servlet.
+     *
+     * @return a String containing servlet description
+     */
+    @Override
+    public String getServletInfo() {
+        return "Short description";
+    }// </editor-fold>
+
+}
diff --git a/src/java/controller/BanServlet.java b/src/java/controller/BanServlet.java
new file mode 100644
index 0000000..de44f54
--- /dev/null
+++ b/src/java/controller/BanServlet.java
@@ -0,0 +1,93 @@
+/*
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+ * Click nbfs://nbhost/SystemFileSystem/Templates/JSP_Servlet/Servlet.java to edit this template
+ */
+package controller;
+
+import dao.AdminDAO;
+import java.io.IOException;
+import java.io.PrintWriter;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+/**
+ *
+ * @author Quocb
+ */
+public class BanServlet extends HttpServlet {
+
+    /**
+     * Processes requests for both HTTP <code>GET</code> and <code>POST</code>
+     * methods.
+     *
+     * @param request servlet request
+     * @param response servlet response
+     * @throws ServletException if a servlet-specific error occurs
+     * @throws IOException if an I/O error occurs
+     */
+    protected void processRequest(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+        response.setContentType("text/html;charset=UTF-8");
+        try (PrintWriter out = response.getWriter()) {
+            /* TODO output your page here. You may use following sample code. */
+            out.println("<!DOCTYPE html>");
+            out.println("<html>");
+            out.println("<head>");
+            out.println("<title>Servlet BanServlet</title>");
+            out.println("</head>");
+            out.println("<body>");
+            out.println("<h1>Servlet BanServlet at " + request.getContextPath() + "</h1>");
+            out.println("</body>");
+            out.println("</html>");
+        }
+    }
+
+    // <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code.">
+    /**
+     * Handles the HTTP <code>GET</code> method.
+     *
+     * @param request servlet request
+     * @param response servlet response
+     * @throws ServletException if a servlet-specific error occurs
+     * @throws IOException if an I/O error occurs
+     */
+    @Override
+    protected void doGet(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+        Integer id=Integer.parseInt( request.getParameter("id"));
+        String action=request.getParameter("action");
+        AdminDAO dao=new AdminDAO();
+        if (action.equalsIgnoreCase("ban")){
+            dao.updateUserBanStatus(id, true);
+        }
+        else dao.updateUserBanStatus(id, false);
+        request.getRequestDispatcher("log?id="+id).forward(request, response);
+    }
+
+    /**
+     * Handles the HTTP <code>POST</code> method.
+     *
+     * @param request servlet request
+     * @param response servlet response
+     * @throws ServletException if a servlet-specific error occurs
+     * @throws IOException if an I/O error occurs
+     */
+    @Override
+    protected void doPost(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+        processRequest(request, response);
+    }
+
+    /**
+     * Returns a short description of the servlet.
+     *
+     * @return a String containing servlet description
+     */
+    @Override
+    public String getServletInfo() {
+        return "Short description";
+    }// </editor-fold>
+
+}
diff --git a/src/java/controller/ConversationRestController.java b/src/java/controller/ConversationRestController.java
index c1c7aab..b424100 100644
--- a/src/java/controller/ConversationRestController.java
+++ b/src/java/controller/ConversationRestController.java
@@ -30,10 +30,7 @@
  */
 public class ConversationRestController extends HttpServlet {
 
-    private ConversationDAO conversationDAO = ConversationDAO.getInstance();
-    private userDAO userDao = userDAO.getInstance();
-    private ObjectMapper objectMapper = new ObjectMapper();
-    private ConversationService conversationService = ConversationService.getInstance();
+    private static final Logger LOGGER = Logger.getLogger(ConversationRestController.class.getName());
 
     /**
      * Processes requests for both HTTP <code>GET</code> and <code>POST</code>
@@ -77,12 +74,13 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
         String usersConversationId = request.getParameter("usersConversationId");
         String messagesConversationId = request.getParameter("messagesConversationId");
         String conversationKeyword = request.getParameter("conversationKeyword");
-        String json = "Must have username or conversation id as request param";
+        String json = "";
 
+        ConversationService conversationService = ConversationService.getInstance();
         ObjectMapper objectMapper = new ObjectMapper();
         try {
             if (conversationKeyword != null && !conversationKeyword.isEmpty() && user_id != null && !user_id.isEmpty()) {
-
+                LOGGER.info("Fetching conversations by keyword for user");
                 List<ConversationDTO> conversationDTOs = conversationService
                         .getConversationsOfUserByKeyword(Integer.parseInt(user_id), conversationKeyword);
                 for (ConversationDTO c : conversationDTOs) {
@@ -92,21 +90,17 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
                 }
                 json = objectMapper.writeValueAsString(conversationDTOs);
 
-            } else if (user_id != null && !user_id.isEmpty()) {
-
+            } else if (user_id != null) {
                 List<ConversationDTO> conversationDTOs = conversationService
                         .getAllConversationsById(Integer.parseInt(user_id));
                 for (ConversationDTO conversationDTO : conversationDTOs) {
-                    conversationDTO
-                            .setUsers(conversationService.getAllUsersByConversationId(conversationDTO.getId()));
+                    conversationDTO.setUsers(conversationService.getAllUsersByConversationId(conversationDTO.getId()));
                 }
                 json = objectMapper.writeValueAsString(conversationDTOs);
-
             } else if (usersConversationId != null && !usersConversationId.isEmpty()) {
-
+                LOGGER.info("Fetch go here");
                 int id = Integer.parseInt(usersConversationId);
                 List<UserDTO> userDTOs = conversationService.getAllUsersByConversationId(id);
-
                 json = objectMapper.writeValueAsString(userDTOs);
 
             } else if (messagesConversationId != null && !messagesConversationId.isEmpty()) {
@@ -118,7 +112,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
 
             }
         } catch (Exception e) {
-
+            e.printStackTrace();
         }
 
         response.setContentType("application/json");
@@ -139,17 +133,19 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
     @Override
     protected void doPost(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
+        ConversationService conversationService = ConversationService.getInstance();
         response.setContentType("application/json");
         response.setCharacterEncoding("UTF-8");
         PrintWriter printWriter = response.getWriter();
         String json = "";
 
         StringBuilder requestBody = new StringBuilder();
-        String line;
+        String line = null;
         try {
             BufferedReader reader = request.getReader();
             while ((line = reader.readLine()) != null) {
                 requestBody.append(line);
+                Logger.getLogger(ConversationRestController.class.getName()).info(line);
             }
         } catch (IOException ex) {
             json = "{\"error\":\"" + ex.getMessage() + "\"}";
@@ -157,15 +153,16 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
             printWriter.flush();
             return;
         }
+        LOGGER.info(requestBody.toString());
 
+        ObjectMapper objectMapper = new ObjectMapper();
+        ConversationDTO conversation = objectMapper.readValue(requestBody.toString(), ConversationDTO.class);
         try {
-            Conversation conversation = objectMapper.readValue(requestBody.toString(), Conversation.class);
-            conversationDAO.saveConversation(conversation, null); // Assuming this method works with pure objects
-            json = objectMapper.writeValueAsString(conversation);
+            conversationService.saveConversation(conversation);
         } catch (Exception ex) {
-            json = "{\"error\":\"" + ex.getMessage() + "\"}";
+            Logger.getLogger(ConversationRestController.class.getName()).log(Level.SEVERE, null, ex);
         }
-
+        json = objectMapper.writeValueAsString(conversation);
         printWriter.print(json);
         printWriter.flush();
     }
@@ -175,19 +172,19 @@ protected void doDelete(HttpServletRequest request, HttpServletResponse response
             throws ServletException, IOException {
         String user_id = request.getParameter("user_id");
         String conversationId = request.getParameter("conversationId");
-        String json = "Must have username or conversation id as request param";
+        String json = "Must have userId or conversation id as request param";
         if (conversationId != null && !conversationId.isEmpty()) {
             int id = Integer.parseInt(conversationId);
             if (user_id != null && !user_id.isEmpty()) {
                 try {
-                    conversationDAO.deleteUserFromConversation(id, Integer.parseInt(user_id));
+                    ConversationService.getInstance().deleteUserFromConversation(id, Integer.parseInt(user_id));
                 } catch (Exception ex) {
                     Logger.getLogger(ConversationRestController.class.getName()).log(Level.SEVERE, null, ex);
                 }
                 json = "delete User by Id " + user_id + " From Conversation by Id " + id + " successfully";
             } else {
                 try {
-                    conversationDAO.deleteConversationById(id);
+                    ConversationService.getInstance().deleteConversationById(id);
                 } catch (Exception ex) {
                     Logger.getLogger(ConversationRestController.class.getName()).log(Level.SEVERE, null, ex);
                 }
@@ -213,4 +210,4 @@ public String getServletInfo() {
         return "Short description";
     }// </editor-fold>
 
-}
+}
\ No newline at end of file
diff --git a/src/java/controller/CreMaterialServlet.java b/src/java/controller/CreMaterialServlet.java
new file mode 100644
index 0000000..8659f7f
--- /dev/null
+++ b/src/java/controller/CreMaterialServlet.java
@@ -0,0 +1,184 @@
+/*
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+ * Click nbfs://nbhost/SystemFileSystem/Templates/JSP_Servlet/Servlet.java to edit this template
+ */
+package controller;
+
+import com.dropbox.core.DbxRequestConfig;
+import com.dropbox.core.v2.DbxClientV2;
+import com.dropbox.core.v2.files.WriteMode;
+import dao.learningMaterialDao;
+import java.io.IOException;
+import java.io.PrintWriter;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.MultipartConfig;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.http.Part;
+import java.io.InputStream;
+import java.lang.System.Logger;
+import java.lang.System.Logger.Level;
+import java.util.Date;
+import model.LearningMaterial;
+import model.User;
+
+/**
+ *
+ * @author Quocb
+ */
+@MultipartConfig
+public class CreMaterialServlet extends HttpServlet {
+
+    private static final java.util.logging.Logger logger = java.util.logging.Logger.getLogger(CreMaterialServlet.class.getName());
+
+    private static final String ACCESS_TOKEN = "sl.B_oVGLZBc_ZXr3lMWjy6DxIkooVzryaLCDrIp-mFaw3mFLxWlIqpC_vM1GYdC9t8A8XaevphHfLB_kuu5wTp_suI_wNCVWdDdFL6ldE37u2tB8ilYGFjuOLAsJqqgNfAlD9ctkXBGLzD2yieqHJmkPo";
+    private DbxClientV2 client;
+
+    @Override
+    public void init() throws ServletException {
+        logger.info("Initializing Dropbox client...");
+        DbxRequestConfig config = DbxRequestConfig.newBuilder("dropbox/java-tutorial").build();
+        client = new DbxClientV2(config, ACCESS_TOKEN);
+        logger.info("Dropbox client initialized.");
+    }
+
+    /**
+     * Processes requests for both HTTP <code>GET</code> and <code>POST</code>
+     * methods.
+     *
+     * @param request servlet request
+     * @param response servlet response
+     * @throws ServletException if a servlet-specific error occurs
+     * @throws IOException if an I/O error occurs
+     */
+    protected void processRequest(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+        response.setContentType("text/html;charset=UTF-8");
+        try (PrintWriter out = response.getWriter()) {
+            /* TODO output your page here. You may use following sample code. */
+            out.println("<!DOCTYPE html>");
+            out.println("<html>");
+            out.println("<head>");
+            out.println("<title>Servlet CreMaterialServlet</title>");
+            out.println("</head>");
+            out.println("<body>");
+            out.println("<h1>Servlet CreMaterialServlet at " + request.getContextPath() + "</h1>");
+            out.println("</body>");
+            out.println("</html>");
+        }
+    }
+
+    // <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code.">
+    /**
+     * Handles the HTTP <code>GET</code> method.
+     *
+     * @param request servlet request
+     * @param response servlet response
+     * @throws ServletException if a servlet-specific error occurs
+     * @throws IOException if an I/O error occurs
+     */
+    @Override
+    protected void doGet(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+        processRequest(request, response);
+    }
+
+    /**
+     * Handles the HTTP <code>POST</code> method.
+     *
+     * @param request servlet request
+     * @param response servlet response
+     * @throws ServletException if a servlet-specific error occurs
+     * @throws IOException if an I/O error occurs
+     */
+    private String getFileName(Part part) {
+        String contentDisp = part.getHeader("content-disposition");
+        String[] tokens = contentDisp.split(";");
+
+        for (String token : tokens) {
+            if (token.trim().startsWith("filename")) {
+                return token.substring(token.indexOf("=") + 2, token.length() - 1);
+            }
+        }
+        return "";
+    }
+
+    @Override
+    protected void doPost(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+        request.setCharacterEncoding("UTF-8");
+
+        HttpSession session = request.getSession(false);
+        if (session != null && session.getAttribute("user") != null) {
+            logger.info("User session found. Proceeding with file upload.");
+            User user = (User) session.getAttribute("user");
+            int userId = user.getUser_id(); 
+
+            String name = request.getParameter("name");
+            String description = request.getParameter("description");
+  if(description==null){
+      response.sendRedirect("ngu");
+return;
+  }
+            Part filePart = request.getPart("context");
+            String context = getFileName(filePart);
+            String subjectCode = request.getParameter("subjectCode");
+            String departmentIdStr = request.getParameter("departmentId");
+            String review = request.getParameter("review");
+
+            try {
+                InputStream inputStream = filePart.getInputStream();
+                logger.info("Uploading file to Dropbox: " + context);
+                client.files().uploadBuilder("/" + context)
+                        .withMode(WriteMode.OVERWRITE)
+                        .uploadAndFinish(inputStream);
+                logger.info("File uploaded successfully.");
+
+            } catch (Exception e) {
+                logger.info("Error uploading file to Dropbox");
+                response.sendRedirect("lmaterialLink");
+return;
+            }
+
+            int departmentId;
+            try {
+                departmentId = Integer.parseInt(departmentIdStr);
+                logger.info("Parsed department ID: " + departmentId);
+            } catch (NumberFormatException e) {
+                response.sendRedirect("lmaterialLink");
+                return;
+            }
+
+            Date publishDate = new Date();
+
+            LearningMaterial learningMaterial = new LearningMaterial(0, userId, name, description, context, subjectCode, publishDate, review, departmentId);
+
+            learningMaterialDao dao = new learningMaterialDao();
+            try {
+                dao.createLearningMaterial(learningMaterial);
+                logger.info("Learning material created successfully.");
+                request.setAttribute("successMessage", "Learning Material created successfully");
+                response.sendRedirect("lmaterialLink");
+            } catch (Exception e) {
+                e.printStackTrace();
+                request.setAttribute("errorMessage", "Error creating learning material");
+                response.sendRedirect("lmaterialLink");
+            }
+        } else {
+            response.sendRedirect("login.jsp"); // Redirect to login page if user is not logged in
+        }
+    }
+
+    /**
+     * Returns a short description of the servlet.
+     *
+     * @return a String containing servlet description
+     */
+    @Override
+    public String getServletInfo() {
+        return "Short description";
+    }// </editor-fold>
+
+}
\ No newline at end of file
diff --git a/src/java/controller/DashBoardServlet.java b/src/java/controller/DashBoardServlet.java
new file mode 100644
index 0000000..32380d4
--- /dev/null
+++ b/src/java/controller/DashBoardServlet.java
@@ -0,0 +1,79 @@
+/*
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+ * Click nbfs://nbhost/SystemFileSystem/Templates/JSP_Servlet/Servlet.java to edit this template
+ */
+package controller;
+
+import dao.MonthDAO;
+import dao.postDAO;
+import dao.userDAO;
+import java.io.IOException;
+import java.io.PrintWriter;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import model.Month;
+import model.User;
+import model.UserActivityLog;
+
+/**
+ *
+ * @author Quocb
+ */
+//@WebServlet("/dashBoard")
+public class DashBoardServlet extends HttpServlet {
+
+    @Override
+    protected void doGet(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+        HttpSession session = request.getSession(false);
+        if (session != null && session.getAttribute("user") != null) {
+            userDAO userdao = new userDAO();
+            MonthDAO monthdao = new MonthDAO();
+            List<Month> results = monthdao.Get7Month();
+            request.setAttribute("label0", results.get(0).getName());
+            request.setAttribute("label1", results.get(1).getName());
+            request.setAttribute("label2", results.get(2).getName());
+            request.setAttribute("label3", results.get(3).getName());
+            request.setAttribute("label4", results.get(4).getName());
+            request.setAttribute("label5", results.get(5).getName());
+            request.setAttribute("label6", results.get(6).getName());
+            request.setAttribute("data0", results.get(0).getCount() != null ? results.get(0).getCount() : 0);
+            request.setAttribute("data1", results.get(1).getCount() != null ? results.get(1).getCount() : 0);
+            request.setAttribute("data2", results.get(2).getCount() != null ? results.get(2).getCount() : 0);
+            request.setAttribute("data3", results.get(3).getCount() != null ? results.get(3).getCount() : 0);
+            request.setAttribute("data4", results.get(4).getCount() != null ? results.get(4).getCount() : 0);
+            request.setAttribute("data5", results.get(5).getCount() != null ? results.get(5).getCount() : 0);
+            request.setAttribute("data6", results.get(6).getCount() != null ? results.get(6).getCount() : 0);
+
+            try {
+                // request.setAttribute("",);
+                //request.setAttribute("activities",activities);
+                ArrayList<User> users = userdao.getAllUsers();
+                request.setAttribute("users", users);
+            } catch (Exception ex) {
+                Logger.getLogger(DashBoardServlet.class.getName()).log(Level.SEVERE, null, ex);
+            }
+            request.getRequestDispatcher("/WEB-INF/DashBoard.jsp").forward(request, response);
+        }
+    }
+
+    @Override
+    protected void doPost(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+
+    }
+
+    @Override
+    public String getServletInfo() {
+        return "Short description";
+    }// </editor-fold>
+
+}
\ No newline at end of file
diff --git a/src/java/controller/DeleteProductServlet.java b/src/java/controller/DeleteProductServlet.java
index bea23cd..ad37e80 100644
--- a/src/java/controller/DeleteProductServlet.java
+++ b/src/java/controller/DeleteProductServlet.java
@@ -6,9 +6,13 @@
 import jakarta.servlet.http.HttpServlet;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
+import java.util.List;
+import model.Product;
+import model.User;
 
 public class DeleteProductServlet extends HttpServlet {
-    protected void doPost(HttpServletRequest request, HttpServletResponse response) 
+
+    protected void doPost(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
         int productId = Integer.parseInt(request.getParameter("product_id"));
         productDAO dao = new productDAO();
@@ -18,10 +22,32 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
                 response.sendRedirect(request.getContextPath() + "/SellingProductServlet");
             } else {
                 request.setAttribute("error", "Error deleting product.");
+                productDAO productDAO = new productDAO();
+
+                List<Product> productList = null;
+                try {
+                    User currentUser = (User) request.getSession(false).getAttribute("user");
+                    productList = productDAO.getSellingList(currentUser.getUser_id());
+                } catch (Exception ex) {
+                    ex.printStackTrace();
+                }
+
+                request.setAttribute("productList", productList);
                 request.getRequestDispatcher("WEB-INF/selling.jsp").forward(request, response);
             }
         } catch (Exception e) {
-            request.setAttribute("error", "An error occurred: " + e.getMessage());
+            request.setAttribute("error", "You cannot delete product because the product is on transaction");
+            productDAO productDAO = new productDAO();
+
+            List<Product> productList = null;
+            try {
+                User currentUser = (User) request.getSession(false).getAttribute("user");
+                productList = productDAO.getSellingList(currentUser.getUser_id());
+            } catch (Exception ex) {
+                ex.printStackTrace();
+            }
+
+            request.setAttribute("productList", productList);
             request.getRequestDispatcher("WEB-INF/selling.jsp").forward(request, response);
         }
     }
diff --git a/src/java/controller/DownloadMaterialServlet.java b/src/java/controller/DownloadMaterialServlet.java
new file mode 100644
index 0000000..a24f832
--- /dev/null
+++ b/src/java/controller/DownloadMaterialServlet.java
@@ -0,0 +1,113 @@
+/*
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+ * Click nbfs://nbhost/SystemFileSystem/Templates/JSP_Servlet/Servlet.java to edit this template
+ */
+package controller;
+
+import com.dropbox.core.DbxRequestConfig;
+import com.dropbox.core.v2.DbxClientV2;
+import java.io.IOException;
+import java.io.PrintWriter;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import java.lang.System.Logger.Level;
+
+/**
+ *
+ * @author Quocb
+ */
+public class DownloadMaterialServlet extends HttpServlet {
+    private static final java.util.logging.Logger logger = java.util.logging.Logger.getLogger(DownloadMaterialServlet.class.getName());
+
+    private static final String ACCESS_TOKEN = "sl.B_oVGLZBc_ZXr3lMWjy6DxIkooVzryaLCDrIp-mFaw3mFLxWlIqpC_vM1GYdC9t8A8XaevphHfLB_kuu5wTp_suI_wNCVWdDdFL6ldE37u2tB8ilYGFjuOLAsJqqgNfAlD9ctkXBGLzD2yieqHJmkPo";
+    private DbxClientV2 client;
+
+    @Override
+    public void init() throws ServletException {
+        logger.info("Initializing Dropbox client...");
+        DbxRequestConfig config = DbxRequestConfig.newBuilder("dropbox/java-tutorial").build();
+        client = new DbxClientV2(config, ACCESS_TOKEN);
+        logger.info("Dropbox client initialized.");
+    }
+
+    /**
+     * Processes requests for both HTTP <code>GET</code> and <code>POST</code>
+     * methods.
+     *
+     * @param request servlet request
+     * @param response servlet response
+     * @throws ServletException if a servlet-specific error occurs
+     * @throws IOException if an I/O error occurs
+     */
+    protected void processRequest(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+        response.setContentType("text/html;charset=UTF-8");
+        try (PrintWriter out = response.getWriter()) {
+            /* TODO output your page here. You may use following sample code. */
+            out.println("<!DOCTYPE html>");
+            out.println("<html>");
+            out.println("<head>");
+            out.println("<title>Servlet DownloadMaterialServlet</title>");
+            out.println("</head>");
+            out.println("<body>");
+            out.println("<h1>Servlet DownloadMaterialServlet at " + request.getContextPath() + "</h1>");
+            out.println("</body>");
+            out.println("</html>");
+        }
+    }
+
+    // <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code.">
+    /**
+     * Handles the HTTP <code>GET</code> method.
+     *
+     * @param request servlet request
+     * @param response servlet response
+     * @throws ServletException if a servlet-specific error occurs
+     * @throws IOException if an I/O error occurs
+     */
+    @Override
+    protected void doGet(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+        String fileName= request.getParameter("name");
+        
+         try {
+            response.setContentType("application/vnd.openxmlformats-officedocument.wordprocessingml.document");
+            response.setHeader("Content-Disposition", "attachment; filename=\"" + fileName + "\"");
+            
+            client.files().downloadBuilder("/" + fileName)
+                .download(response.getOutputStream());
+                
+        } catch (Exception e) {
+            logger.info( "Error downloading file " + fileName);
+            
+        }
+        
+    }
+
+    /**
+     * Handles the HTTP <code>POST</code> method.
+     *
+     * @param request servlet request
+     * @param response servlet response
+     * @throws ServletException if a servlet-specific error occurs
+     * @throws IOException if an I/O error occurs
+     */
+    @Override
+    protected void doPost(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+        processRequest(request, response);
+    }
+
+    /**
+     * Returns a short description of the servlet.
+     *
+     * @return a String containing servlet description
+     */
+    @Override
+    public String getServletInfo() {
+        return "Short description";
+    }// </editor-fold>
+
+}
\ No newline at end of file
diff --git a/src/java/controller/MessageServlet.java b/src/java/controller/FileUploadServlet.java
similarity index 61%
rename from src/java/controller/MessageServlet.java
rename to src/java/controller/FileUploadServlet.java
index 47dbdc7..48032f1 100644
--- a/src/java/controller/MessageServlet.java
+++ b/src/java/controller/FileUploadServlet.java
@@ -4,22 +4,29 @@
  */
 package controller;
 
-import com.google.gson.Gson;
-import dao.MessageDao;
+import com.cloudinary.Cloudinary;
+import com.cloudinary.utils.ObjectUtils;
 import java.io.IOException;
 import java.io.PrintWriter;
 import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.MultipartConfig;
 import jakarta.servlet.http.HttpServlet;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-import model.Message;
-import java.util.List;
+import jakarta.servlet.http.Part;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.util.Map;
+import java.util.logging.Logger;
+import util.CloudinaryAPI;
 
 /**
  *
  * @author HELLO
  */
-public class MessageServlet extends HttpServlet {
+@MultipartConfig
+public class FileUploadServlet extends HttpServlet {
 
     /**
      * Processes requests for both HTTP <code>GET</code> and <code>POST</code>
@@ -38,10 +45,10 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re
             out.println("<!DOCTYPE html>");
             out.println("<html>");
             out.println("<head>");
-            out.println("<title>Servlet MessageServlet</title>");
+            out.println("<title>Servlet FileUploadServlet</title>");
             out.println("</head>");
             out.println("<body>");
-            out.println("<h1>Servlet MessageServlet at " + request.getContextPath() + "</h1>");
+            out.println("<h1>Servlet FileUploadServlet at " + request.getContextPath() + "</h1>");
             out.println("</body>");
             out.println("</html>");
         }
@@ -57,26 +64,9 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re
      * @throws IOException if an I/O error occurs
      */
     @Override
-    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-        int userId = Integer.parseInt(request.getParameter("userId"));
-
-        try {
-            List<Message> messages = MessageDao.getInstance().findAllMessagesBySenderAndReceiver((int) request.getSession().getAttribute("user_id"), userId);
-
-            // Convert messages to JSON
-            String json = new Gson().toJson(messages);
-
-            // Set response content type
-            response.setContentType("application/json");
-            response.setCharacterEncoding("UTF-8");
-
-            // Send JSON response back
-            response.getWriter().write(json);
-        } catch (Exception e) {
-            e.printStackTrace();
-            response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
-            response.getWriter().write("Failed to load messages.");
-        }
+    protected void doGet(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+        processRequest(request, response);
     }
 
     /**
@@ -90,20 +80,28 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t
     @Override
     protected void doPost(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
-        int sender = Integer.parseInt(request.getParameter("sender"));
-        int receiver = Integer.parseInt(request.getParameter("receiver"));
-        String messageText = request.getParameter("message");
-
-        Message message = new Message(sender, receiver, messageText);
+        Part filePart = request.getPart("file");
+        File tempFile = File.createTempFile("upload_", filePart.getSubmittedFileName());
 
         try {
-            MessageDao.getInstance().saveMessage(message);
-            // Optionally, you can return a success response to the client
-            response.getWriter().write("Message saved successfully");
+            InputStream inputStream = filePart.getInputStream();
+            FileOutputStream outputStream = new FileOutputStream(tempFile); 
+            byte[] buffer = new byte[1024];
+            int bytesRead;
+            while ((bytesRead = inputStream.read(buffer)) != -1) {
+                outputStream.write(buffer, 0, bytesRead);
+            }
+            Logger.getLogger(FileUploadServlet.class.getName()).info(tempFile.toString());
+            // Upload to Cloudinary
+            Map uploadResult = CloudinaryAPI.getInstance().uploader().upload(tempFile, ObjectUtils.emptyMap());
+            String fileUrl = (String) uploadResult.get("url");
+
+            // Send the URL back to the client
+            response.setContentType("application/json");
+            response.getWriter().write("{\"url\": \"" + fileUrl + "\"}");
         } catch (Exception e) {
-            // Handle exceptions appropriately
             response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
-            response.getWriter().write("Failed to save message: " + e.getMessage());
+            response.getWriter().write("Error uploading file: " + e.getMessage());
         }
     }
 
diff --git a/src/java/controller/GameServlet.java b/src/java/controller/GameServlet.java
new file mode 100644
index 0000000..53f6ec4
--- /dev/null
+++ b/src/java/controller/GameServlet.java
@@ -0,0 +1,62 @@
+/*
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+ * Click nbfs://nbhost/SystemFileSystem/Templates/JSP_Servlet/Servlet.java to edit this template
+ */
+package controller;
+
+
+import dao.gameDAO;
+import java.io.IOException;
+import java.io.PrintWriter;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.List;
+import model.game;
+
+/**
+ *
+ * @author Quocb
+ */
+@WebServlet("/game")
+public class GameServlet extends HttpServlet {
+
+   
+    @Override
+    protected void doGet(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+        String category = request.getParameter("category");
+    List<game> list = new ArrayList<game>();
+    gameDAO gamedao = new gameDAO();
+    list = gamedao.getAllGames();
+    request.setAttribute("list", list);
+     request.getRequestDispatcher("WEB-INF/game.jsp").forward(request, response);
+  
+       
+   
+     
+    }
+
+    /**
+     * Handles the HTTP <code>POST</code> method.
+     *
+     * @param request servlet request
+     * @param response servlet response
+     * @throws ServletException if a servlet-specific error occurs
+     * @throws IOException if an I/O error occurs
+     */
+    @Override
+    protected void doPost(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+  
+    }
+
+    @Override
+    public String getServletInfo() {
+        return "Short description";
+    }// </editor-fold>
+
+}
diff --git a/src/java/controller/LogServlet.java b/src/java/controller/LogServlet.java
new file mode 100644
index 0000000..88d2af4
--- /dev/null
+++ b/src/java/controller/LogServlet.java
@@ -0,0 +1,88 @@
+/*
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+ * Click nbfs://nbhost/SystemFileSystem/Templates/JSP_Servlet/Servlet.java to edit this template
+ */
+package controller;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+/**
+ *
+ * @author Quocb
+ */
+@WebServlet("/log")
+public class LogServlet extends HttpServlet {
+
+    /**
+     * Processes requests for both HTTP <code>GET</code> and <code>POST</code>
+     * methods.
+     *
+     * @param request servlet request
+     * @param response servlet response
+     * @throws ServletException if a servlet-specific error occurs
+     * @throws IOException if an I/O error occurs
+     */
+    protected void processRequest(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+        response.setContentType("text/html;charset=UTF-8");
+        try (PrintWriter out = response.getWriter()) {
+            /* TODO output your page here. You may use following sample code. */
+            out.println("<!DOCTYPE html>");
+            out.println("<html>");
+            out.println("<head>");
+            out.println("<title>Servlet LogServlet</title>");
+            out.println("</head>");
+            out.println("<body>");
+            out.println("<h1>Servlet LogServlet at " + request.getContextPath() + "</h1>");
+            out.println("</body>");
+            out.println("</html>");
+        }
+    }
+
+    // <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code.">
+    /**
+     * Handles the HTTP <code>GET</code> method.
+     *
+     * @param request servlet request
+     * @param response servlet response
+     * @throws ServletException if a servlet-specific error occurs
+     * @throws IOException if an I/O error occurs
+     */
+    @Override
+    protected void doGet(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+        String id=request.getParameter("id");
+      request.getRequestDispatcher("/WEB-INF/log.jsp?id="+id).forward(request, response);
+    }
+
+    /**
+     * Handles the HTTP <code>POST</code> method.
+     *
+     * @param request servlet request
+     * @param response servlet response
+     * @throws ServletException if a servlet-specific error occurs
+     * @throws IOException if an I/O error occurs
+     */
+    @Override
+    protected void doPost(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+        processRequest(request, response);
+    }
+
+    /**
+     * Returns a short description of the servlet.
+     *
+     * @return a String containing servlet description
+     */
+    @Override
+    public String getServletInfo() {
+        return "Short description";
+    }// </editor-fold>
+
+}
diff --git a/src/java/controller/SearchGameServlet.java b/src/java/controller/SearchGameServlet.java
new file mode 100644
index 0000000..22fdb53
--- /dev/null
+++ b/src/java/controller/SearchGameServlet.java
@@ -0,0 +1,72 @@
+/*
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+ * Click nbfs://nbhost/SystemFileSystem/Templates/JSP_Servlet/Servlet.java to edit this template
+ */
+package controller;
+
+
+import dao.SearchGameDAO;
+import java.io.IOException;
+import java.io.PrintWriter;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.List;
+import model.game;
+
+/**
+ *
+ * @author Quocb
+ */
+@WebServlet("/searchGame")
+public class SearchGameServlet extends HttpServlet {
+
+    @Override
+    protected void doGet(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+        String keyword = request.getParameter("keyword");
+        SearchGameDAO searchdao = new SearchGameDAO();
+        List<game> list = searchdao.searchGameByKeyword(keyword);
+
+        response.setContentType("text/html;charset=UTF-8");
+        PrintWriter out = response.getWriter();
+
+        if (list.isEmpty()) {
+             out.println("<div class='flex items-center space-x-4 p-2 border-b border-gray-200 w-full'>"
+            + "<div class='w-16 h-5'></div>"
+            + "<div class='flex flex-col'>"
+            + "<p class='text-lg font-medium text-gray-800'>Không tìm thấy kết quả</p>"
+            + "</div>"
+            + "</div>");
+        } else {
+            for (game sanPham : list) {
+                // Tạo mỗi game thành một div có hình ảnh, tên và thể loại game
+                out.println("<button  class='flex items-center space-x-4 p-2 border-b border-gray-200 hover:bg-gray-100 cursor-pointer w-full'"
+                        + " onclick=\"showGame('" + sanPham.getLink() + "')\">"
+                        + "<img src='" + sanPham.getLinkimg() + "' alt='" + sanPham.getTengame() + "' class='w-16 h-16 object-cover rounded-lg'>"
+                        + "<div class='flex flex-col'>"
+                        + "<h4 class='text-lg font-medium text-gray-800'>" + sanPham.getTengame() + "</h4>"
+                        + "<p class='text-sm text-gray-500'>" + sanPham.getTheloai() + "</p>"
+                        + "</div>"
+                        + "</button>");
+            }
+        }
+        out.close();
+
+    }
+
+    @Override
+    protected void doPost(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+
+    }
+
+    @Override
+    public String getServletInfo() {
+        return "Short description";
+    }// </editor-fold>
+
+}
\ No newline at end of file
diff --git a/src/java/controller/UpdateDiaryServlet.java b/src/java/controller/UpdateDiaryServlet.java
new file mode 100644
index 0000000..bbf9aac
--- /dev/null
+++ b/src/java/controller/UpdateDiaryServlet.java
@@ -0,0 +1,101 @@
+/*
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+ * Click nbfs://nbhost/SystemFileSystem/Templates/JSP_Servlet/Servlet.java to edit this template
+ */
+package controller;
+
+import dao.UserActivityDAO;
+import dao.postDAO;
+import java.io.IOException;
+import java.io.PrintWriter;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import java.lang.System.Logger;
+import java.text.SimpleDateFormat;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+import model.UserActivityLog;
+
+/**
+ *
+ * @author Quocb
+ */
+@WebServlet("/updateDiary")
+public class UpdateDiaryServlet extends HttpServlet {
+      private static final java.util.logging.Logger logger = java.util.logging.Logger.getLogger(UpdateDiaryServlet.class.getName());
+
+    @Override
+    protected void doGet(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+        UserActivityDAO dao = new UserActivityDAO();
+        Integer userId = Integer.valueOf(request.getParameter("userId"));
+   
+
+        List<UserActivityLog> activities = dao.getUserActivities(userId);
+       
+        response.setContentType("text/html");
+        response.setCharacterEncoding("UTF-8");
+        PrintWriter out = response.getWriter();
+
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+
+        for (UserActivityLog activity : activities) {
+            String typeValue;
+            if (activity.getCommentId() == 0) {
+                
+              
+                typeValue = "Post";
+            } else {
+           
+                typeValue = "Comment";
+                
+            }
+
+            int idTypeValue;
+            if (activity.getCommentId() != 0) {
+                idTypeValue = activity.getCommentId();
+            } else {
+                idTypeValue = activity.getPostId();
+            }
+
+            out.println("<tr>");
+            out.println("<td>" + activity.getUserId() + "</td>");
+            out.println("<td>" + activity.getRole() + "</td>");
+            out.println("<td>" + activity.getFirstName() + " " + activity.getLastName() + "</td>");
+            out.println("<td>" + activity.getActivityType() + "</td>");
+            out.println("<td>" + activity.getPostId() + "</td>");
+            out.println("<td>" + activity.getCommentId() + "</td>");
+            out.println("<td style='word-wrap: break-word;'>" + activity.getActivityDetails() + "</td>");
+            out.println("<td> " + activity.getTimestamp().format(formatter) + "</td>");
+            out.print("<td>");
+            out.println("<form action='adminDelete' method='post' style='display:inline;'>");
+            out.println("<input type='hidden' name='idtype' value='" + idTypeValue + "' />");
+            out.print("<input type='hidden' name='userId' value='" + userId + "'>");
+            out.println("<input type='hidden' name='type' value='" + typeValue + "' />");
+            out.println("<button type='submit' class='btn btn-danger btn-sm'>Delete</button>");
+            out.println("</form>");
+            out.print("</td>");
+            out.println("</tr>");
+
+            // Log activity details for debugging
+            
+        }
+
+       
+    }
+
+    @Override
+    protected void doPost(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+
+    }
+
+    @Override
+    public String getServletInfo() {
+        return "Short description";
+    }// </editor-fold>
+
+}
\ No newline at end of file
diff --git a/src/java/controller/UserChartData.java b/src/java/controller/UserChartData.java
new file mode 100644
index 0000000..b30dfae
--- /dev/null
+++ b/src/java/controller/UserChartData.java
@@ -0,0 +1,59 @@
+/*
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+ * Click nbfs://nbhost/SystemFileSystem/Templates/JSP_Servlet/Servlet.java to edit this template
+ */
+package controller;
+
+import dao.MonthDAO;
+import java.io.IOException;
+import java.io.PrintWriter;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import model.Month;
+import org.json.JSONObject;
+
+/**
+ *
+ * @author Quocb
+ */
+@WebServlet("/userChartData")
+public class UserChartData extends HttpServlet {
+
+    @Override
+    protected void doGet(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+             response.setContentType("application/json");
+        response.setCharacterEncoding("UTF-8");
+
+        JSONObject jsonResponse = new JSONObject();
+        
+        MonthDAO dao=new MonthDAO();
+        Month mon=dao.getLastMonthRegistrationCountAndName();
+        String month = mon.getName();
+        int userCount = mon.getCount();
+
+        jsonResponse.put("month", month);
+        jsonResponse.put("userCount", userCount);
+
+        PrintWriter out = response.getWriter();
+        out.print(jsonResponse.toString());
+        out.flush();
+    }
+
+
+    @Override
+    protected void doPost(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+  
+    }
+
+
+    @Override
+    public String getServletInfo() {
+        return "Short description";
+    }// </editor-fold>
+
+}
diff --git a/src/java/controller/UserRestController.java b/src/java/controller/UserRestController.java
index b359f6a..3cea4ac 100644
--- a/src/java/controller/UserRestController.java
+++ b/src/java/controller/UserRestController.java
@@ -70,16 +70,23 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
         List<User> listUsers = null;
         if (conversationId != null && !conversationId.isEmpty()) {
             int id = Integer.parseInt(conversationId);
-            //listUsers = userService.getFriendsNotInConversation(user_id, keyWord, id);
+            try {
+                listUsers = userDAO.getInstance().getFriendsNotInConversation(Integer.parseInt(user_id), keyWord, id);
+                Logger.getLogger(UserRestController.class.getName()).info("will it be here1");
+            } catch (Exception ex) {
+                Logger.getLogger(UserRestController.class.getName()).log(Level.SEVERE, null, ex);
+            }
         } else if (keyWord.isEmpty()) {
             try {
                 listUsers = userDAO.getInstance().getUserFriends(Integer.parseInt(user_id));
+                Logger.getLogger(UserRestController.class.getName()).info("will it be here2");
             } catch (Exception ex) {
                 Logger.getLogger(UserRestController.class.getName()).log(Level.SEVERE, null, ex);
             }
         } else {
             try {
                 listUsers = userDAO.getInstance().findFriendsByKeyWord(Integer.parseInt(user_id), keyWord);
+                Logger.getLogger(UserRestController.class.getName()).info("will it be here3");
             } catch (Exception ex) {
                 Logger.getLogger(UserRestController.class.getName()).log(Level.SEVERE, null, ex);
             }
@@ -90,7 +97,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
 
         response.setContentType("application/json");
         response.setCharacterEncoding("UTF-8");
-
+        
         PrintWriter printWriter = response.getWriter();
         printWriter.print(json);
         printWriter.flush();
@@ -120,4 +127,4 @@ public String getServletInfo() {
         return "Short description";
     }// </editor-fold>
 
-}
+}
\ No newline at end of file
diff --git a/src/java/controller/VerifyServlet.java b/src/java/controller/VerifyServlet.java
index 3d35231..5be8854 100644
--- a/src/java/controller/VerifyServlet.java
+++ b/src/java/controller/VerifyServlet.java
@@ -74,6 +74,50 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
      * @throws ServletException if a servlet-specific error occurs
      * @throws IOException if an I/O error occurs
      */
+//    @Override
+//    protected void doPost(HttpServletRequest request, HttpServletResponse response)
+//            throws ServletException, IOException {
+//        String act = request.getParameter("action");
+//        HttpSession session = request.getSession(false);
+//        String otp = (String) session.getAttribute("otpCode");
+//        String email = (String) session.getAttribute("pendingEmail");
+//
+//        if ("resend".equals(act)) {
+//            SmtpProtocol smtpProtocol = new SmtpProtocol();
+//            otp = Integer.toString(smtpProtocol.sendMail(email));
+//            session.setAttribute("otpCode", otp);
+//            request.getRequestDispatcher("WEB-INF/verify.jsp").forward(request, response);
+//        } else {
+//            String inputOtp = (String) request.getParameter("otp-code");
+//            if (otp.equals(inputOtp)) {
+//                if (act.equals("newPass")) {
+//                    request.getRequestDispatcher("WEB-INF/newPassword.jsp").forward(request, response);
+//                } else {
+//                    Map<String, String> pendingUserInfo = (Map<String, String>) session.getAttribute("pendingUserInfo");
+//                    User user = new User();
+//                    user.setEmail(email);
+//                    user.setFirst_name(pendingUserInfo.get("firstName"));
+//                    user.setLast_name(pendingUserInfo.get("lastName"));
+//                    user.setPassword(pendingUserInfo.get("password"));
+//                    user.setProfile_pic("default_avt.jpg");
+//                    user.setRole("student");
+//                    user.setStatus(false);
+//                    try {
+//                        userDao.hashPw(user.getFirst_name(), user.getLast_name(), user.getEmail(), user.getPassword(), user.getProfile_pic(), user.getRole());
+//                    } catch (Exception ex) {
+//                        Logger.getLogger(VerifyServlet.class.getName()).log(Level.SEVERE, null, ex);
+//                    }
+//                    // Clean up session
+//                    session.invalidate();
+//                    request.getRequestDispatcher("WEB-INF/login.jsp").forward(request, response);
+//                }
+//            } else {
+//                request.setAttribute("msg", "Invalid OTP. Please try again.");
+//                request.getRequestDispatcher("WEB-INF/verify.jsp").forward(request, response);
+//            }
+//        }
+//    }
+    
     @Override
     protected void doPost(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
@@ -103,7 +147,7 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
                     user.setRole("student");
                     user.setStatus(false);
                     try {
-                        userDao.hashPw(user.getFirst_name(), user.getLast_name(), user.getEmail(), user.getPassword(), user.getProfile_pic(), user.getRole());
+                        userDao.register(user);
                     } catch (Exception ex) {
                         Logger.getLogger(VerifyServlet.class.getName()).log(Level.SEVERE, null, ex);
                     }
diff --git a/src/java/controller/changeAvatarServlet.java b/src/java/controller/changeAvatarServlet.java
index 69597be..33568f0 100644
--- a/src/java/controller/changeAvatarServlet.java
+++ b/src/java/controller/changeAvatarServlet.java
@@ -89,7 +89,6 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
         Part file = request.getPart("profile_pic");
         String profile_pic = file.getSubmittedFileName();
         String uploadPath = getServletContext().getRealPath("/assets/profile_avt/") + profile_pic;
-//        String uploadPath = "D:/fpt/prj301/project/FUNET_FINAL/FUNET/Downloads/FUNET/web/assets/profile_avt/" + profile_pic;
         try {
             FileOutputStream fos = new FileOutputStream(uploadPath);
             InputStream is = file.getInputStream();
@@ -112,7 +111,7 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
                 request.setAttribute("errorMessage", "Error");
             }
         }
-        response.sendRedirect("userpageServlet");
+        response.sendRedirect("profile");
     }
 
     /**
diff --git a/src/java/controller/commentServlet.java b/src/java/controller/commentServlet.java
index 126dfad..e22c195 100644
--- a/src/java/controller/commentServlet.java
+++ b/src/java/controller/commentServlet.java
@@ -4,16 +4,20 @@
  */
 package controller;
 
+import com.google.gson.Gson;
 import dao.postDAO;
 import java.io.IOException;
 import java.io.PrintWriter;
 import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.MultipartConfig;
 import jakarta.servlet.http.HttpServlet;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.servlet.http.HttpSession;
 import java.sql.SQLException;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import model.Comment;
 import model.Post;
 import model.User;
@@ -22,6 +26,7 @@
  *
  * @author bim26
  */
+@MultipartConfig
 public class commentServlet extends HttpServlet {
 
     /**
@@ -91,11 +96,10 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
     @Override
     protected void doPost(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
-        HttpSession session = request.getSession(false);
+       HttpSession session = request.getSession(false);
     if (session != null && session.getAttribute("user") != null) {
         int post_id = Integer.parseInt(request.getParameter("post_id"));
         String commentContent = request.getParameter("commentContent");
-        String sourceUrl = request.getParameter("sourceUrl"); 
         postDAO postDAO = new postDAO();
         User user = (User) session.getAttribute("user");
         Comment comment = new Comment();
@@ -103,18 +107,30 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
             comment.setPost_id(post_id);
             comment.setUser_id(user.getUser_id());
             comment.setComment_text(commentContent);
+            comment.setFirst_name(user.getFirst_name()); 
+            comment.setLast_name(user.getLast_name());   
+            comment.setProfile_pic(user.getProfile_pic());
         }
         try {
             postDAO.addComment(comment);
-            
-            if (sourceUrl != null && sourceUrl.contains("profile")) {
-                response.sendRedirect("profile");
-            } else {
-                response.sendRedirect("home");
-            }
+            response.setContentType("application/json");
+            response.setCharacterEncoding("UTF-8");
+            PrintWriter out = response.getWriter();
+            Map<String, Object> jsonResponse = new HashMap<>();
+            jsonResponse.put("success", true);
+            jsonResponse.put("comment", comment);
+            out.print(new Gson().toJson(jsonResponse));
+            out.flush();
         } catch (Exception e) {
             e.printStackTrace();
-            response.sendRedirect("error.jsp"); 
+            response.setContentType("application/json");
+            response.setCharacterEncoding("UTF-8");
+            PrintWriter out = response.getWriter();
+            Map<String, Object> jsonResponse = new HashMap<>();
+            jsonResponse.put("success", false);
+            jsonResponse.put("error", e.getMessage());
+            out.print(new Gson().toJson(jsonResponse));
+            out.flush();
         }
     } else {
         response.sendRedirect("login");
diff --git a/src/java/controller/deleteCommentServlet.java b/src/java/controller/deleteCommentServlet.java
new file mode 100644
index 0000000..45799ac
--- /dev/null
+++ b/src/java/controller/deleteCommentServlet.java
@@ -0,0 +1,106 @@
+/*
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+ * Click nbfs://nbhost/SystemFileSystem/Templates/JSP_Servlet/Servlet.java to edit this template
+ */
+package controller;
+
+import dao.UserActivityDAO;
+import dao.postDAO;
+import java.io.IOException;
+import java.io.PrintWriter;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import model.Comment;
+import model.Post;
+import model.User;
+
+/**
+ *
+ * @author OS
+ */
+public class deleteCommentServlet extends HttpServlet {
+
+    /**
+     * Processes requests for both HTTP <code>GET</code> and <code>POST</code>
+     * methods.
+     *
+     * @param request servlet request
+     * @param response servlet response
+     * @throws ServletException if a servlet-specific error occurs
+     * @throws IOException if an I/O error occurs
+     */
+    protected void processRequest(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+        response.setContentType("text/html;charset=UTF-8");
+        try (PrintWriter out = response.getWriter()) {
+            /* TODO output your page here. You may use following sample code. */
+            out.println("<!DOCTYPE html>");
+            out.println("<html>");
+            out.println("<head>");
+            out.println("<title>Servlet deleteCommentServlet</title>");
+            out.println("</head>");
+            out.println("<body>");
+            out.println("<h1>Servlet deleteCommentServlet at " + request.getContextPath() + "</h1>");
+            out.println("</body>");
+            out.println("</html>");
+        }
+    }
+
+    // <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code.">
+    /**
+     * Handles the HTTP <code>GET</code> method.
+     *
+     * @param request servlet request
+     * @param response servlet response
+     * @throws ServletException if a servlet-specific error occurs
+     * @throws IOException if an I/O error occurs
+     */
+    @Override
+    protected void doGet(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+        processRequest(request, response);
+    }
+
+    /**
+     * Handles the HTTP <code>POST</code> method.
+     *
+     * @param request servlet request
+     * @param response servlet response
+     * @throws ServletException if a servlet-specific error occurs
+     * @throws IOException if an I/O error occurs
+     */
+    @Override
+    protected void doPost(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+        response.setContentType("application/json");
+        HttpSession session = request.getSession(false);
+        int comment_id = Integer.parseInt(request.getParameter("commentId"));
+         UserActivityDAO useractivitydao=new UserActivityDAO();
+        postDAO postDAO = new postDAO();
+        try {
+            useractivitydao.deleteUserActivityByCommentId(comment_id);
+            postDAO.deleteComment(comment_id);
+            response.getWriter().write("{\"success\": true}");
+        } catch (Exception ex) {
+            Logger.getLogger(userpageServlet.class.getName()).log(Level.SEVERE, null, ex);
+            response.getWriter().write("{\"success\": false}");
+        }
+    }
+
+    /**
+     * Returns a short description of the servlet.
+     *
+     * @return a String containing servlet description
+     */
+    @Override
+    public String getServletInfo() {
+        return "Short description";
+    }// </editor-fold>
+
+}
diff --git a/src/java/controller/deleteLearningMaterial.java b/src/java/controller/deleteLearningMaterial.java
new file mode 100644
index 0000000..8bef186
--- /dev/null
+++ b/src/java/controller/deleteLearningMaterial.java
@@ -0,0 +1,118 @@
+/*
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+ * Click nbfs://nbhost/SystemFileSystem/Templates/JSP_Servlet/Servlet.java to edit this template
+ */
+
+package controller;
+
+import dao.learningMaterialDao;
+import java.io.IOException;
+import java.io.PrintWriter;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
+import model.LearningMaterial;
+import model.User;
+
+/**
+ *
+ * @author gabri
+ */
+public class deleteLearningMaterial extends HttpServlet {
+   
+    /** 
+     * Processes requests for both HTTP <code>GET</code> and <code>POST</code> methods.
+     * @param request servlet request
+     * @param response servlet response
+     * @throws ServletException if a servlet-specific error occurs
+     * @throws IOException if an I/O error occurs
+     */
+    protected void processRequest(HttpServletRequest request, HttpServletResponse response)
+    throws ServletException, IOException {
+        response.setContentType("text/html;charset=UTF-8");
+        try (PrintWriter out = response.getWriter()) {
+            /* TODO output your page here. You may use following sample code. */
+            out.println("<!DOCTYPE html>");
+            out.println("<html>");
+            out.println("<head>");
+            out.println("<title>Servlet deleteLearningMaterial</title>");  
+            out.println("</head>");
+            out.println("<body>");
+            out.println("<h1>Servlet deleteLearningMaterial at " + request.getContextPath () + "</h1>");
+            out.println("</body>");
+            out.println("</html>");
+        }
+    } 
+
+    // <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code.">
+    /** 
+     * Handles the HTTP <code>GET</code> method.
+     * @param request servlet request
+     * @param response servlet response
+     * @throws ServletException if a servlet-specific error occurs
+     * @throws IOException if an I/O error occurs
+     */
+    @Override
+    protected void doGet(HttpServletRequest request, HttpServletResponse response)
+    throws ServletException, IOException {
+        processRequest(request, response);
+    } 
+
+    /** 
+     * Handles the HTTP <code>POST</code> method.
+     * @param request servlet request
+     * @param response servlet response
+     * @throws ServletException if a servlet-specific error occurs
+     * @throws IOException if an I/O error occurs
+     */
+   @Override
+protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+    HttpSession session = request.getSession(false);
+    if (session != null && session.getAttribute("user") != null) {
+        String idStr = request.getParameter("id");
+        User user = (User) session.getAttribute("user");
+
+        if (idStr == null) {
+            response.sendRedirect("lmaterialLink");
+            return;
+        }
+
+        int id;
+        try {
+            id = Integer.parseInt(idStr);
+        } catch (NumberFormatException e) {
+            response.sendRedirect("lmaterialLink");
+            return;
+        }
+
+        learningMaterialDao learningMaterialDao = new learningMaterialDao();
+        try {
+            LearningMaterial lm = learningMaterialDao.getLearningMaterialById(id);
+            if (lm != null && lm.getUserId() == user.getUser_id()) {
+                learningMaterialDao.deleteLearningMaterial(id);
+                request.setAttribute("successMessage", "Learning Material deleted successfully");
+            } else {
+                request.setAttribute("errorMessage", "You do not have permission to delete this learning material");
+            }
+            response.sendRedirect("lmaterialLink");
+        } catch (Exception e) {
+            e.printStackTrace();
+            request.setAttribute("errorMessage", "Error deleting learning material");
+            response.sendRedirect("lmaterialLink");
+        }
+    } else {
+        response.sendRedirect("WEB-INF/login.jsp");
+    }
+}
+    /** 
+     * Returns a short description of the servlet.
+     * @return a String containing servlet description
+     */
+    @Override
+    public String getServletInfo() {
+        return "Short description";
+    }// </editor-fold>
+
+}
diff --git a/src/java/controller/deleteServlet.java b/src/java/controller/deleteServlet.java
index b1322f7..c7d89e4 100644
--- a/src/java/controller/deleteServlet.java
+++ b/src/java/controller/deleteServlet.java
@@ -4,6 +4,7 @@
  */
 package controller;
 
+import dao.UserActivityDAO;
 import dao.postDAO;
 import java.io.IOException;
 import java.io.PrintWriter;
@@ -85,7 +86,9 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
 
         int postId = Integer.parseInt(request.getParameter("postId"));
         postDAO postDAO = new postDAO();
+        UserActivityDAO useractivitydao=new UserActivityDAO();
         try {
+            useractivitydao.deleteUserActivityByPostId(postId);
             postDAO.deletePost(postId);
         } catch (Exception ex) {
             Logger.getLogger(userpageServlet.class.getName()).log(Level.SEVERE, null, ex);
diff --git a/src/java/controller/learningMaterialDepartmentSearch.java b/src/java/controller/learningMaterialDepartmentSearch.java
new file mode 100644
index 0000000..64dacf5
--- /dev/null
+++ b/src/java/controller/learningMaterialDepartmentSearch.java
@@ -0,0 +1,97 @@
+/*
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+ * Click nbfs://nbhost/SystemFileSystem/Templates/JSP_Servlet/Servlet.java to edit this template
+ */
+
+package controller;
+
+import dao.learningMaterialDao;
+import java.io.IOException;
+import java.io.PrintWriter;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import java.util.List;
+import model.LearningMaterial;
+
+/**
+ *
+ * @author gabri
+ */
+public class learningMaterialDepartmentSearch extends HttpServlet {
+   
+    /** 
+     * Processes requests for both HTTP <code>GET</code> and <code>POST</code> methods.
+     * @param request servlet request
+     * @param response servlet response
+     * @throws ServletException if a servlet-specific error occurs
+     * @throws IOException if an I/O error occurs
+     */
+    protected void processRequest(HttpServletRequest request, HttpServletResponse response)
+    throws ServletException, IOException {
+        response.setContentType("text/html;charset=UTF-8");
+        try (PrintWriter out = response.getWriter()) {
+            /* TODO output your page here. You may use following sample code. */
+            out.println("<!DOCTYPE html>");
+            out.println("<html>");
+            out.println("<head>");
+            out.println("<title>Servlet learningMaterialDepartmentSearch</title>");  
+            out.println("</head>");
+            out.println("<body>");
+            out.println("<h1>Servlet learningMaterialDepartmentSearch at " + request.getContextPath () + "</h1>");
+            out.println("</body>");
+            out.println("</html>");
+        }
+    } 
+
+    // <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code.">
+    /** 
+     * Handles the HTTP <code>GET</code> method.
+     * @param request servlet request
+     * @param response servlet response
+     * @throws ServletException if a servlet-specific error occurs
+     * @throws IOException if an I/O error occurs
+     */
+    @Override
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        String departmentIdStr = request.getParameter("departmentId");
+        learningMaterialDao dao = new learningMaterialDao();
+            List<LearningMaterial> learningMaterialsList;
+        try {
+            if (departmentIdStr == null || departmentIdStr.trim().isEmpty()) {
+                learningMaterialsList = dao.getAll();
+            } else {
+                int departmentId = Integer.parseInt(departmentIdStr);
+                learningMaterialsList = dao.getByDepartment(departmentId);
+            }
+            request.setAttribute("learningMaterialsList", learningMaterialsList);
+            request.getRequestDispatcher("WEB-INF/LearningMaterial.jsp").forward(request, response);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    /** 
+     * Handles the HTTP <code>POST</code> method.
+     * @param request servlet request
+     * @param response servlet response
+     * @throws ServletException if a servlet-specific error occurs
+     * @throws IOException if an I/O error occurs
+     */
+    @Override
+    protected void doPost(HttpServletRequest request, HttpServletResponse response)
+    throws ServletException, IOException {
+        processRequest(request, response);
+    }
+
+    /** 
+     * Returns a short description of the servlet.
+     * @return a String containing servlet description
+     */
+    @Override
+    public String getServletInfo() {
+        return "Short description";
+    }// </editor-fold>
+
+}
diff --git a/src/java/controller/lmaterialLink.java b/src/java/controller/lmaterialLink.java
index 9ee05bb..38e34ac 100644
--- a/src/java/controller/lmaterialLink.java
+++ b/src/java/controller/lmaterialLink.java
@@ -1,7 +1,13 @@
+/*
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+ * Click nbfs://nbhost/SystemFileSystem/Templates/JSP_Servlet/Servlet.java to edit this template
+ */
+
 package controller;
 
 import dao.learningMaterialDao;
 import java.io.IOException;
+import java.io.PrintWriter;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServlet;
 import jakarta.servlet.http.HttpServletRequest;
@@ -9,8 +15,44 @@
 import java.util.List;
 import model.LearningMaterial;
 
+/**
+ *
+ * @author gabri
+ */
 public class lmaterialLink extends HttpServlet {
+   
+    /** 
+     * Processes requests for both HTTP <code>GET</code> and <code>POST</code> methods.
+     * @param request servlet request
+     * @param response servlet response
+     * @throws ServletException if a servlet-specific error occurs
+     * @throws IOException if an I/O error occurs
+     */
+    protected void processRequest(HttpServletRequest request, HttpServletResponse response)
+    throws ServletException, IOException {
+        response.setContentType("text/html;charset=UTF-8");
+        try (PrintWriter out = response.getWriter()) {
+            /* TODO output your page here. You may use following sample code. */
+            out.println("<!DOCTYPE html>");
+            out.println("<html>");
+            out.println("<head>");
+            out.println("<title>Servlet lmaterialLink</title>");  
+            out.println("</head>");
+            out.println("<body>");
+            out.println("<h1>Servlet lmaterialLink at " + request.getContextPath () + "</h1>");
+            out.println("</body>");
+            out.println("</html>");
+        }
+    } 
 
+    // <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code.">
+    /** 
+     * Handles the HTTP <code>GET</code> method.
+     * @param request servlet request
+     * @param response servlet response
+     * @throws ServletException if a servlet-specific error occurs
+     * @throws IOException if an I/O error occurs
+     */
     @Override
     protected void doGet(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
@@ -28,4 +70,27 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
         request.getRequestDispatcher("WEB-INF/LearningMaterial.jsp").forward(request, response);
         // chuyển hướng đến lmaterial.jsp
     }
-}
\ No newline at end of file
+
+    /** 
+     * Handles the HTTP <code>POST</code> method.
+     * @param request servlet request
+     * @param response servlet response
+     * @throws ServletException if a servlet-specific error occurs
+     * @throws IOException if an I/O error occurs
+     */
+    @Override
+    protected void doPost(HttpServletRequest request, HttpServletResponse response)
+    throws ServletException, IOException {
+        processRequest(request, response);
+    }
+
+    /** 
+     * Returns a short description of the servlet.
+     * @return a String containing servlet description
+     */
+    @Override
+    public String getServletInfo() {
+        return "Short description";
+    }// </editor-fold>
+
+}
diff --git a/src/java/controller/notificationServlet.java b/src/java/controller/notificationServlet.java
index f0da3d1..23783df 100644
--- a/src/java/controller/notificationServlet.java
+++ b/src/java/controller/notificationServlet.java
@@ -34,11 +34,11 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
         
             request.setAttribute("ordersList", buyerOrders);
             request.setAttribute("sellerOrders", sellerOrders);
-            request.setAttribute("currentUserId", userId);
+            request.setAttribute("userId", userId);
             request.getRequestDispatcher("WEB-INF/marketNotification.jsp").forward(request, response);
         } catch (Exception ex) {
             Logger.getLogger(notificationServlet.class.getName()).log(Level.SEVERE, null, ex);
         }
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/java/controller/postServlet.java b/src/java/controller/postServlet.java
index 861fd92..8a3a7c6 100644
--- a/src/java/controller/postServlet.java
+++ b/src/java/controller/postServlet.java
@@ -1,9 +1,7 @@
-/*
- * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
- * Click nbfs://nbhost/SystemFileSystem/Templates/JSP_Servlet/Servlet.java to edit this template
- */
 package controller;
 
+import com.cloudinary.Cloudinary;
+import com.cloudinary.utils.ObjectUtils;
 import dao.FriendDAO;
 import dao.postDAO;
 import model.Post;
@@ -17,154 +15,162 @@
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.servlet.http.HttpSession;
 import jakarta.servlet.http.Part;
+import java.io.File;
 import java.io.FileOutputStream;
 import java.io.InputStream;
 import java.io.PrintWriter;
+import java.nio.file.Files;
 import java.sql.SQLException;
-import java.util.List;
+import java.util.*;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import util.CloudinaryAPI;
 
-/**
- *
- * @author bim26
- */
-@MultipartConfig
+@MultipartConfig(
+        fileSizeThreshold = 1024 * 1024 * 10, // 10 MB
+        maxFileSize = 1024 * 1024 * 50, // 50 MB
+        maxRequestSize = 1024 * 1024 * 100 // 100 MB
+)
 public class postServlet extends HttpServlet {
 
-    private static final long serialVersionUID = 1L;
+    private static final Logger LOGGER = Logger.getLogger(postServlet.class.getName());
 
-    /**
-     * Processes requests for both HTTP <code>GET</code> and <code>POST</code>
-     * methods.
-     *
-     * @param request servlet request
-     * @param response servlet response
-     * @throws ServletException if a servlet-specific error occurs
-     * @throws IOException if an I/O error occurs
-     */
-    protected void processRequest(HttpServletRequest request, HttpServletResponse response)
-            throws ServletException, IOException {
-        response.setContentType("text/html;charset=UTF-8");
-        try (PrintWriter out = response.getWriter()) {
-            /* TODO output your page here. You may use following sample code. */
-            out.println("<!DOCTYPE html>");
-            out.println("<html>");
-            out.println("<head>");
-            out.println("<title>Servlet postServlet</title>");
-            out.println("</head>");
-            out.println("<body>");
-            out.println("<h1>Servlet postServlet at " + request.getContextPath() + "</h1>");
-            out.println("</body>");
-            out.println("</html>");
-        }
-    }
+    private static final Set<String> ALLOWED_IMAGE_TYPES = new HashSet<>(Arrays.asList(
+            "image/jpeg", "image/png", "image/gif", "image/bmp", "image/webp"
+    ));
+
+    private static final Set<String> ALLOWED_VIDEO_TYPES = new HashSet<>(Arrays.asList(
+            "video/mp4", "video/mpeg", "video/quicktime", "video/x-msvideo", "video/webm"
+    ));
+
+    private static final long serialVersionUID = 1L;
 
-    // <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code.">
-    /**
-     * Handles the HTTP <code>GET</code> method.
-     *
-     * @param request servlet request
-     * @param response servlet response
-     * @throws ServletException if a servlet-specific error occurs
-     * @throws IOException if an I/O error occurs
-     */
     @Override
     protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        LOGGER.info("Processing GET request");
         HttpSession session = request.getSession(false);
+
         if (session != null && session.getAttribute("user") != null) {
             User currentUser = (User) session.getAttribute("user");
-            List<Post> posts = postDAO.getAllPosts(currentUser.getUser_id());
-            postDAO dao = new postDAO();
-            for (Post post : posts) {
-                try {
+            LOGGER.info("User " + currentUser.getUser_id() + " requesting posts");
+
+            try {
+                List<Post> posts = postDAO.getAllPosts(currentUser.getUser_id());
+                postDAO dao = new postDAO();
+
+                for (Post post : posts) {
                     post.setLikedByCurrentUser(dao.hasUserLikedPost(currentUser.getUser_id(), post.getPost_id()));
-                } catch (SQLException e) {
-                    e.printStackTrace();
                 }
-            }
-            request.setAttribute("posts", posts);
-            try {
+                request.setAttribute("posts", posts);
+                LOGGER.info("Successfully retrieved " + posts.size() + " posts for user " + currentUser.getUser_id());
+
                 FriendDAO friendDAO = new FriendDAO();
                 List<User> friends = friendDAO.findFriend(currentUser.getUser_id());
                 request.setAttribute("friends", friends);
+                LOGGER.info("Successfully retrieved friends list for user " + currentUser.getUser_id());
+
+            } catch (SQLException e) {
+                LOGGER.log(Level.SEVERE, "Database error while processing GET request", e);
             } catch (Exception e) {
-                e.printStackTrace();
+                LOGGER.log(Level.SEVERE, "Error while retrieving friends", e);
             }
+
             request.getRequestDispatcher("WEB-INF/home.jsp").forward(request, response);
         } else {
+            LOGGER.warning("Unauthorized access attempt - redirecting to login");
             response.sendRedirect("login");
         }
     }
 
-    /**
-     * Handles the HTTP <code>POST</code> method.
-     *
-     * @param request servlet request
-     * @param response servlet response
-     * @throws ServletException if a servlet-specific error occurse
-     * @throws IOException if an I/O error occurs
-     */
     @Override
     protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        LOGGER.info("Processing POST request");
         HttpSession session = request.getSession(false);
 
-        // ------------------------------------------------------------------------------------------------- 
         if (session != null && session.getAttribute("user") != null) {
             User user = (User) session.getAttribute("user");
+            LOGGER.info("User " + user.getUser_id() + " attempting to create post");
+
             String body = request.getParameter("postContent");
-            Part file = request.getPart("image");
+            Part filePart = request.getPart("image");
             String sourceUrl = request.getParameter("sourceUrl");
-            String image_path = file.getSubmittedFileName();
-//            String uploadPath = "D:/fpt/prj301/project/FUNET_FINAL/FUNET/Downloads/FUNET/web/assets/post_image/" + image_path;
-            String uploadPath = getServletContext().getRealPath("/assets/post_image/") + image_path;
-            //E:\FUNET\FUNET\web\assets
-            try {
+            String imageUrl = null;
+            String resourceType = null;
 
-                FileOutputStream fos = new FileOutputStream(uploadPath);
-                InputStream is = file.getInputStream();
+            if (filePart != null && filePart.getSize() > 0) {
+                String contentType = filePart.getContentType();
+                LOGGER.info("File upload detected with content type: " + contentType);
 
-                byte[] data = new byte[is.available()];
-                is.read(data);
-                fos.write(data);
-                fos.close();
-            } catch (Exception e) {
-                e.printStackTrace();
+                if (!ALLOWED_IMAGE_TYPES.contains(contentType) && !ALLOWED_VIDEO_TYPES.contains(contentType)) {
+                    LOGGER.warning("Unsupported file type attempted: " + contentType);
+                    request.setAttribute("error", "Unsupported file type");
+                    response.sendRedirect(sourceUrl != null && sourceUrl.contains("profile") ? "profile" : "home");
+                    return;
+                }
+
+                resourceType = ALLOWED_IMAGE_TYPES.contains(contentType) ? "image" : "video";
+
+                try {
+                    File tempFile = File.createTempFile("upload_", filePart.getSubmittedFileName());
+                    LOGGER.info("Created temporary file for upload: " + tempFile.getName());
+
+                    try (InputStream inputStream = filePart.getInputStream(); FileOutputStream outputStream = new FileOutputStream(tempFile)) {
+                        byte[] buffer = new byte[1024];
+                        int bytesRead;
+                        while ((bytesRead = inputStream.read(buffer)) != -1) {
+                            outputStream.write(buffer, 0, bytesRead);
+                        }
+                    }
+
+                    Map uploadResult = CloudinaryAPI.getInstance().uploader().upload(tempFile, ObjectUtils.asMap(
+                            "resource_type", resourceType
+                    ));
+                    imageUrl = (String) uploadResult.get("url");
+                    LOGGER.info("Successfully uploaded file to Cloudinary: " + imageUrl);
+
+                    Files.deleteIfExists(tempFile.toPath());
+                    LOGGER.info("Deleted temporary file: " + tempFile.getName());
+
+                } catch (Exception e) {
+                    LOGGER.log(Level.SEVERE, "Error during file upload", e);
+                    request.setAttribute("errorMessage", "Error uploading image");
+                    response.sendRedirect("home");
+                    return;
+                }
             }
 
-            if (!body.trim().equals("") || !image_path.equals("")) {
+            if (!body.trim().equals("") || imageUrl != null) {
                 Post post = new Post();
                 post.setUser_id(user.getUser_id());
                 post.setBody(body);
-                post.setImage_path(image_path);
-                postDAO PostDao = new postDAO();
+                post.setImage_path(imageUrl);
+                post.setType(resourceType);
+
                 try {
+                    postDAO PostDao = new postDAO();
                     PostDao.addPost(post);
+                    LOGGER.info("Successfully created new post for user " + user.getUser_id());
 
                     TimeUnit.SECONDS.sleep(2);
-                    if (sourceUrl != null && sourceUrl.contains("profile")) {
-                        response.sendRedirect("profile");
-                    } else {
-                        response.sendRedirect("home");
-                    }
+                    response.sendRedirect(sourceUrl != null && sourceUrl.contains("profile") ? "profile" : "home");
+
                 } catch (Exception e) {
-                    e.printStackTrace();
+                    LOGGER.log(Level.SEVERE, "Error saving post to database", e);
                     request.setAttribute("errorMessage", "Error saving post");
                     response.sendRedirect("home");
                 }
             } else {
+                LOGGER.info("Empty post attempted - redirecting");
                 response.sendRedirect("home");
             }
         } else {
+            LOGGER.warning("Unauthorized post attempt - redirecting to home");
             response.sendRedirect("home");
         }
     }
 
-    /**
-     * Returns a short description of the servlet.
-     *
-     * @return a String containing servlet description
-     */
     @Override
     public String getServletInfo() {
-        return "Short description";
+        return "Post management servlet handling creation and retrieval of posts";
     }
 }
diff --git a/src/java/controller/saveLearningMaterial.java b/src/java/controller/saveLearningMaterial.java
new file mode 100644
index 0000000..306b03b
--- /dev/null
+++ b/src/java/controller/saveLearningMaterial.java
@@ -0,0 +1,101 @@
+/*
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+ * Click nbfs://nbhost/SystemFileSystem/Templates/JSP_Servlet/Servlet.java to edit this template
+ */
+package controller;
+
+import com.google.gson.Gson;
+import dao.learningMaterialDao;
+import model.User;
+import java.io.IOException;
+import java.io.PrintWriter;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import java.util.List;
+import model.LearningMaterial;
+
+/**
+ *
+ * @author gabri
+ */
+public class saveLearningMaterial extends HttpServlet {
+
+    /**
+     * Processes requests for both HTTP <code>GET</code> and <code>POST</code>
+     * methods.
+     *
+     * @param request servlet request
+     * @param response servlet response
+     * @throws ServletException if a servlet-specific error occurs
+     * @throws IOException if an I/O error occurs
+     */
+    protected void processRequest(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+        response.setContentType("text/html;charset=UTF-8");
+        try (PrintWriter out = response.getWriter()) {
+            /* TODO output your page here. You may use following sample code. */
+            out.println("<!DOCTYPE html>");
+            out.println("<html>");
+            out.println("<head>");
+            out.println("<title>Servlet saveLearningMaterial</title>");
+            out.println("</head>");
+            out.println("<body>");
+            out.println("<h1>Servlet saveLearningMaterial at " + request.getContextPath() + "</h1>");
+            out.println("</body>");
+            out.println("</html>");
+        }
+    }
+
+    // <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code.">
+    /**
+     * Handles the HTTP <code>GET</code> method.
+     *
+     * @param request servlet request
+     * @param response servlet response
+     * @throws ServletException if a servlet-specific error occurs
+     * @throws IOException if an I/O error occurs
+     */
+  @Override
+protected void doGet(HttpServletRequest request, HttpServletResponse response)
+        throws ServletException, IOException {
+    User currentUser = (User) request.getSession().getAttribute("user");
+    learningMaterialDao dao = new learningMaterialDao();
+
+    try {
+        List<LearningMaterial> savedMaterials = dao.getSavedLearningMaterials(currentUser.getUser_id());
+        request.setAttribute("savedMaterialsList", savedMaterials);
+        request.getRequestDispatcher("savedLearningMaterials.jsp").forward(request, response);
+    } catch (Exception e) {
+        e.printStackTrace();
+        response.sendRedirect("error.jsp");
+    }
+}
+
+    @Override
+    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        int learningMaterialId = Integer.parseInt(request.getParameter("id"));
+        User currentUser = (User) request.getSession().getAttribute("user");
+        learningMaterialDao dao = new learningMaterialDao();
+
+        try {
+            dao.saveLearningMaterial(currentUser.getUser_id(), learningMaterialId);
+            response.sendRedirect("lmaterialLink");
+        } catch (Exception e) {
+            e.printStackTrace();
+            response.sendRedirect("error.jsp");
+        }
+    }
+
+    /**
+     * Returns a short description of the servlet.
+     *
+     * @return a String containing servlet description
+     */
+    @Override
+    public String getServletInfo() {
+        return "Short description";
+    }// </editor-fold>
+
+}
diff --git a/src/java/controller/savePostServlet.java b/src/java/controller/savePostServlet.java
new file mode 100644
index 0000000..f6354cc
--- /dev/null
+++ b/src/java/controller/savePostServlet.java
@@ -0,0 +1,119 @@
+/*
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+ * Click nbfs://nbhost/SystemFileSystem/Templates/JSP_Servlet/Servlet.java to edit this template
+ */
+
+package controller;
+
+import dao.postDAO;
+import java.io.IOException;
+import java.io.PrintWriter;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
+import model.User;
+import java.sql.SQLException;
+import java.util.List;
+import model.Post;
+
+/**
+ *
+ * @author OS
+ */
+public class savePostServlet extends HttpServlet {
+    private static final long serialVersionUID = 1L;
+   
+    /** 
+     * Processes requests for both HTTP <code>GET</code> and <code>POST</code> methods.
+     * @param request servlet request
+     * @param response servlet response
+     * @throws ServletException if a servlet-specific error occurs
+     * @throws IOException if an I/O error occurs
+     */
+    protected void processRequest(HttpServletRequest request, HttpServletResponse response)
+    throws ServletException, IOException {
+        response.setContentType("text/html;charset=UTF-8");
+        try (PrintWriter out = response.getWriter()) {
+            /* TODO output your page here. You may use following sample code. */
+            out.println("<!DOCTYPE html>");
+            out.println("<html>");
+            out.println("<head>");
+            out.println("<title>Servlet savePostServlet</title>");  
+            out.println("</head>");
+            out.println("<body>");
+            out.println("<h1>Servlet savePostServlet at " + request.getContextPath () + "</h1>");
+            out.println("</body>");
+            out.println("</html>");
+        }
+    } 
+
+    // <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code.">
+    /** 
+     * Handles the HTTP <code>GET</code> method.
+     * @param request servlet request
+     * @param response servlet response
+     * @throws ServletException if a servlet-specific error occurs
+     * @throws IOException if an I/O error occurs
+     */
+    @Override
+    protected void doGet(HttpServletRequest request, HttpServletResponse response)
+    throws ServletException, IOException {
+        HttpSession session = request.getSession(false);
+        if (session != null && session.getAttribute("user") != null) {
+            User user = (User) session.getAttribute("user");
+            int userId = user.getUser_id();
+            postDAO dao = new postDAO();
+            List<Post> savedPosts = dao.getSavedPosts(userId);
+            request.setAttribute("posts", savedPosts);
+            request.getRequestDispatcher("WEB-INF/savedPosts.jsp").forward(request, response); 
+        } else {
+            response.sendRedirect("login");
+        }
+    } 
+
+    /** 
+     * Handles the HTTP <code>POST</code> method.
+     * @param request servlet request
+     * @param response servlet response
+     * @throws ServletException if a servlet-specific error occurs
+     * @throws IOException if an I/O error occurs
+     */
+    @Override
+    protected void doPost(HttpServletRequest request, HttpServletResponse response)
+    throws ServletException, IOException {
+        HttpSession session = request.getSession(false);
+        if (session != null && session.getAttribute("user") != null) {
+            User user = (User) session.getAttribute("user");
+            int userId = user.getUser_id();
+            int postId = Integer.parseInt(request.getParameter("postId"));
+            postDAO dao = new postDAO();
+
+            try {
+                if (dao.isPostSavedByUser(userId, postId)) {
+                    dao.unsavePost(userId, postId);
+                } else {
+                    dao.savePost(userId, postId);
+                }
+                response.sendRedirect("home");
+            } catch (SQLException e) {
+                e.printStackTrace();
+                response.sendRedirect("home");
+            }
+        } else {
+            response.sendRedirect("login");
+        }
+    }
+    
+
+    /** 
+     * Returns a short description of the servlet.
+     * @return a String containing servlet description
+     */
+    @Override
+    public String getServletInfo() {
+        return "Short description";
+    }// </editor-fold>
+
+}
diff --git a/src/java/controller/searchLearningMaterial.java b/src/java/controller/searchLearningMaterial.java
new file mode 100644
index 0000000..fcfd49a
--- /dev/null
+++ b/src/java/controller/searchLearningMaterial.java
@@ -0,0 +1,96 @@
+/*
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+ * Click nbfs://nbhost/SystemFileSystem/Templates/JSP_Servlet/Servlet.java to edit this template
+ */
+
+package controller;
+
+import dao.learningMaterialDao;
+import java.io.IOException;
+import java.io.PrintWriter;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import java.util.List;
+import model.LearningMaterial;
+
+/**
+ *
+ * @author gabri
+ */
+public class searchLearningMaterial extends HttpServlet {
+   
+    /** 
+     * Processes requests for both HTTP <code>GET</code> and <code>POST</code> methods.
+     * @param request servlet request
+     * @param response servlet response
+     * @throws ServletException if a servlet-specific error occurs
+     * @throws IOException if an I/O error occurs
+     */
+    protected void processRequest(HttpServletRequest request, HttpServletResponse response)
+    throws ServletException, IOException {
+        response.setContentType("text/html;charset=UTF-8");
+        try (PrintWriter out = response.getWriter()) {
+            /* TODO output your page here. You may use following sample code. */
+            out.println("<!DOCTYPE html>");
+            out.println("<html>");
+            out.println("<head>");
+            out.println("<title>Servlet searchLearningMaterial</title>");  
+            out.println("</head>");
+            out.println("<body>");
+            out.println("<h1>Servlet searchLearningMaterial at " + request.getContextPath () + "</h1>");
+            out.println("</body>");
+            out.println("</html>");
+        }
+    } 
+
+    // <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code.">
+    /** 
+     * Handles the HTTP <code>GET</code> method.
+     * @param request servlet request
+     * @param response servlet response
+     * @throws ServletException if a servlet-specific error occurs
+     * @throws IOException if an I/O error occurs
+     */
+    @Override
+   protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        String keyword = request.getParameter("search-name");
+        learningMaterialDao dao = new learningMaterialDao();
+        List<LearningMaterial> learningMaterialsList;
+        try {
+            if (keyword == null || keyword.trim().isEmpty()) {
+                learningMaterialsList = dao.getAll();
+            } else {
+                learningMaterialsList = dao.searchLearningMaterials(keyword);
+            }
+            request.setAttribute("learningMaterialsList", learningMaterialsList);
+            request.getRequestDispatcher("WEB-INF/LearningMaterial.jsp").forward(request, response);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    /** 
+     * Handles the HTTP <code>POST</code> method.
+     * @param request servlet request
+     * @param response servlet response
+     * @throws ServletException if a servlet-specific error occurs
+     * @throws IOException if an I/O error occurs
+     */
+    @Override
+    protected void doPost(HttpServletRequest request, HttpServletResponse response)
+    throws ServletException, IOException {
+        processRequest(request, response);
+    }
+
+    /** 
+     * Returns a short description of the servlet.
+     * @return a String containing servlet description
+     */
+    @Override
+    public String getServletInfo() {
+        return "Short description";
+    }// </editor-fold>
+
+}
diff --git a/src/java/controller/searchServlet.java b/src/java/controller/searchServlet.java
index c8c3c14..4ca4dd4 100644
--- a/src/java/controller/searchServlet.java
+++ b/src/java/controller/searchServlet.java
@@ -69,7 +69,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
             int currUser = (int) session.getAttribute("user_id");
             String name = request.getParameter("search-name");
             try {
-                ArrayList<User> userList = userDAO.getAllUserByName(name, currUser);
+                ArrayList<User> userList = userDAO.getInstance().findFriendsByKeyWord(currUser, name);
                 FriendDAO friendDAO = new FriendDAO();
                 HashMap<User, String> usersWithStatus = new HashMap<>();
 
diff --git a/src/java/controller/settingServlet.java b/src/java/controller/settingServlet.java
index d075bba..f767cea 100644
--- a/src/java/controller/settingServlet.java
+++ b/src/java/controller/settingServlet.java
@@ -37,7 +37,7 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
                         sessionUser.setLast_name(lastName);
                         userDao.updateUser(sessionUser);
                         request.setAttribute("notification", "Your name has been changed to: " + firstName + " " + lastName);
-                        response.sendRedirect("userpageServlet");
+                        response.sendRedirect("profile");
                     }
                     case "changePassword" -> {
                         String oldPassword = request.getParameter("oldPassword");
diff --git a/src/java/controller/updateCommentServlet.java b/src/java/controller/updateCommentServlet.java
new file mode 100644
index 0000000..89f80dd
--- /dev/null
+++ b/src/java/controller/updateCommentServlet.java
@@ -0,0 +1,107 @@
+/*
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+ * Click nbfs://nbhost/SystemFileSystem/Templates/JSP_Servlet/Servlet.java to edit this template
+ */
+
+package controller;
+
+import dao.postDAO;
+import java.io.IOException;
+import java.io.PrintWriter;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
+import java.util.concurrent.TimeUnit;
+import model.Comment;
+
+/**
+ *
+ * @author OS
+ */
+public class updateCommentServlet extends HttpServlet {
+   
+    /** 
+     * Processes requests for both HTTP <code>GET</code> and <code>POST</code> methods.
+     * @param request servlet request
+     * @param response servlet response
+     * @throws ServletException if a servlet-specific error occurs
+     * @throws IOException if an I/O error occurs
+     */
+    protected void processRequest(HttpServletRequest request, HttpServletResponse response)
+    throws ServletException, IOException {
+        response.setContentType("text/html;charset=UTF-8");
+        try (PrintWriter out = response.getWriter()) {
+            /* TODO output your page here. You may use following sample code. */
+            out.println("<!DOCTYPE html>");
+            out.println("<html>");
+            out.println("<head>");
+            out.println("<title>Servlet updateCommentServlet</title>");  
+            out.println("</head>");
+            out.println("<body>");
+            out.println("<h1>Servlet updateCommentServlet at " + request.getContextPath () + "</h1>");
+            out.println("</body>");
+            out.println("</html>");
+        }
+    } 
+
+    // <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code.">
+    /** 
+     * Handles the HTTP <code>GET</code> method.
+     * @param request servlet request
+     * @param response servlet response
+     * @throws ServletException if a servlet-specific error occurs
+     * @throws IOException if an I/O error occurs
+     */
+    @Override
+    protected void doGet(HttpServletRequest request, HttpServletResponse response)
+    throws ServletException, IOException {
+        processRequest(request, response);
+    } 
+
+    /** 
+     * Handles the HTTP <code>POST</code> method.
+     * @param request servlet request
+     * @param response servlet response
+     * @throws ServletException if a servlet-specific error occurs
+     * @throws IOException if an I/O error occurs
+     */
+    @Override
+    protected void doPost(HttpServletRequest request, HttpServletResponse response)
+    throws ServletException, IOException {
+        response.setContentType("application/json");
+    HttpSession session = request.getSession(false);
+    if (session != null && session.getAttribute("user") != null){
+        String newComment = request.getParameter("newCommentText");
+        int commentId = Integer.parseInt(request.getParameter("commentId"));
+        if(!newComment.trim().isEmpty()){
+            Comment comment = new Comment();
+            comment.setComment_id(commentId);
+            comment.setComment_text(newComment);
+            postDAO PostDao = new postDAO();
+            try {
+                PostDao.updateComment(comment);
+                response.getWriter().write("{\"success\": true}");
+            } catch (Exception e) {
+                e.printStackTrace();
+                response.getWriter().write("{\"success\": false}");
+            }
+        } else {
+            response.getWriter().write("{\"success\": false}");
+        }
+    } else {
+        response.getWriter().write("{\"success\": false}");
+    }
+    }
+
+    /** 
+     * Returns a short description of the servlet.
+     * @return a String containing servlet description
+     */
+    @Override
+    public String getServletInfo() {
+        return "Short description";
+    }// </editor-fold>
+
+}
diff --git a/src/java/controller/updateLearningMaterial.java b/src/java/controller/updateLearningMaterial.java
new file mode 100644
index 0000000..9fd0a82
--- /dev/null
+++ b/src/java/controller/updateLearningMaterial.java
@@ -0,0 +1,153 @@
+package controller;
+
+import com.dropbox.core.DbxException;
+import com.dropbox.core.DbxRequestConfig;
+import com.dropbox.core.v2.DbxClientV2;
+import com.dropbox.core.v2.files.WriteMode;
+import dao.learningMaterialDao;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.PrintWriter;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.MultipartConfig;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.http.Part;
+import java.util.Date;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import model.LearningMaterial;
+import model.User;
+
+@MultipartConfig
+public class updateLearningMaterial extends HttpServlet {
+
+    private static final java.util.logging.Logger logger = java.util.logging.Logger.getLogger(updateLearningMaterial.class.getName());
+
+    private static final String ACCESS_TOKEN = "sl.B_oVGLZBc_ZXr3lMWjy6DxIkooVzryaLCDrIp-mFaw3mFLxWlIqpC_vM1GYdC9t8A8XaevphHfLB_kuu5wTp_suI_wNCVWdDdFL6ldE37u2tB8ilYGFjuOLAsJqqgNfAlD9ctkXBGLzD2yieqHJmkPo";
+    private DbxClientV2 client;
+
+    @Override
+    public void init() throws ServletException {
+        logger.info("Initializing Dropbox client...");
+        DbxRequestConfig config = DbxRequestConfig.newBuilder("dropbox/java-tutorial").build();
+        client = new DbxClientV2(config, ACCESS_TOKEN);
+        logger.info("Dropbox client initialized.");
+    }
+
+    protected void processRequest(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+        response.setContentType("text/html;charset=UTF-8");
+        try (PrintWriter out = response.getWriter()) {
+            out.println("<!DOCTYPE html>");
+            out.println("<html>");
+            out.println("<head>");
+            out.println("<title>Servlet updateLearningMaterial</title>");
+            out.println("</head>");
+            out.println("<body>");
+            out.println("<h1>Servlet updateLearningMaterial at " + request.getContextPath() + "</h1>");
+            out.println("</body>");
+            out.println("</html>");
+        }
+    }
+
+    @Override
+    protected void doGet(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+        processRequest(request, response);
+    }
+
+    @Override
+    protected void doPost(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+        request.setCharacterEncoding("UTF-8");
+        learningMaterialDao dao = new learningMaterialDao();
+        HttpSession session = request.getSession(false);
+        if (session != null && session.getAttribute("user") != null) {
+            logger.info("User session found. Proceeding with file upload.");
+            User user = (User) session.getAttribute("user");
+            int userId = user.getUser_id();
+
+            int learningMaterialId = Integer.parseInt(request.getParameter("id"));
+            String name = request.getParameter("name");
+            String description = request.getParameter("description");
+            if (description == null) {
+                response.sendRedirect("lmaterialLink");
+                return;
+            }
+            Part filePart = request.getPart("context");
+            String context = getFileName(filePart);
+            String subjectCode = request.getParameter("subjectCode");
+            String departmentIdStr = request.getParameter("departmentId");
+            String review = request.getParameter("review");
+
+            try {
+                if (filePart != null && filePart.getSize() > 0) {
+                    InputStream inputStream = filePart.getInputStream();
+                    logger.log(Level.INFO, "Uploading file to Dropbox: {0}", context);
+                    client.files().uploadBuilder("/" + context)
+                            .withMode(WriteMode.OVERWRITE)
+                            .uploadAndFinish(inputStream);
+                    logger.info("File uploaded successfully.");
+                }
+                else {
+                    LearningMaterial lm=dao.getLearningMaterialById(learningMaterialId);
+                    context=lm.getLearningMaterialContext();
+                }
+                        
+            } catch (DbxException | IOException e) {
+                logger.info("Error uploading file to Dropbox");
+                response.sendRedirect("lmaterialLink");
+                return;
+            } catch (Exception ex) {
+                Logger.getLogger(updateLearningMaterial.class.getName()).log(Level.SEVERE, null, ex);
+            }
+
+            int departmentId;
+            try {
+                departmentId = Integer.parseInt(departmentIdStr);
+                logger.info("Parsed department ID: " + departmentId);
+            } catch (NumberFormatException e) {
+                response.sendRedirect("lmaterialLink");
+                return;
+            }
+
+            Date publishDate = new Date();
+
+            LearningMaterial learningMaterial = new LearningMaterial(learningMaterialId, userId, name, description, context, subjectCode, publishDate, review, departmentId);
+
+            
+            try {
+                dao.updateLearningMaterial(learningMaterial);
+                logger.info("Learning material updated successfully.");
+                request.setAttribute("successMessage", "Learning Material updated successfully");
+                response.sendRedirect("lmaterialLink");
+            } catch (Exception e) {
+                e.printStackTrace();
+                request.setAttribute("errorMessage", "Error updating learning material");
+                response.sendRedirect("lmaterialLink");
+            }
+        } else {
+            response.sendRedirect("login.jsp"); // Redirect to login page if user is not logged in
+        }
+    }
+
+    private String getFileName(Part part) {
+        String contentDisp = part.getHeader("content-disposition");
+        String[] tokens = contentDisp.split(";");
+
+        for (String token : tokens) {
+            if (token.trim().startsWith("filename")) {
+                return token.substring(token.indexOf("=") + 2, token.length() - 1);
+            }
+        }
+        return "";
+    }
+
+    @Override
+    public String getServletInfo() {
+        return "Short description";
+    }
+}
\ No newline at end of file
diff --git a/src/java/controller/updatePostServlet.java b/src/java/controller/updatePostServlet.java
new file mode 100644
index 0000000..ccd50f2
--- /dev/null
+++ b/src/java/controller/updatePostServlet.java
@@ -0,0 +1,234 @@
+/*
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+ * Click nbfs://nbhost/SystemFileSystem/Templates/JSP_Servlet/Servlet.java to edit this template
+ */
+package controller;
+
+import com.cloudinary.Cloudinary;
+import com.cloudinary.utils.ObjectUtils;
+import dao.postDAO;
+import java.io.IOException;
+import java.io.PrintWriter;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.MultipartConfig;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.http.Part;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import model.Post;
+import model.User;
+
+/**
+ *
+ * @author OS
+ */
+@MultipartConfig(
+        fileSizeThreshold = 1024 * 1024 * 2, // 2MB
+        maxFileSize = 1024 * 1024 * 50, // 50MB
+        maxRequestSize = 1024 * 1024 * 100 // 100MB
+)
+public class updatePostServlet extends HttpServlet {
+
+    private static final Logger LOGGER = Logger.getLogger(updatePostServlet.class.getName());
+
+    private static final long serialVersionUID = 1L;
+
+    private static final Set<String> ALLOWED_IMAGE_TYPES = new HashSet<>(Arrays.asList(
+            "image/jpeg", "image/png", "image/gif", "image/bmp", "image/webp"
+    ));
+
+    private static final Set<String> ALLOWED_VIDEO_TYPES = new HashSet<>(Arrays.asList(
+            "video/mp4", "video/mpeg", "video/quicktime", "video/x-msvideo", "video/webm"
+    ));
+
+    Cloudinary cloud;
+
+    public void init() throws ServletException {
+        Properties properties = new Properties();
+        String propFileName = "/WEB-INF/cloudinary.properties.txt";
+        InputStream inputStream = getServletContext().getResourceAsStream(propFileName);
+        if (inputStream == null) {
+            throw new ServletException("Property file '" + propFileName + "' not found in classpath");
+        }
+        try {
+            properties.load(inputStream);
+        } catch (IOException ex) {
+            Logger.getLogger(postServlet.class.getName()).log(Level.SEVERE, null, ex);
+        }
+        String cloudName = properties.getProperty("cloud_name");
+        String apiKey = properties.getProperty("api_key");
+        String apiSecret = properties.getProperty("api_secret");
+        try {
+            cloud = new Cloudinary(ObjectUtils.asMap(
+                    "cloud_name", cloudName,
+                    "api_key", apiKey,
+                    "api_secret", apiSecret
+            ));
+        } catch (Exception e) {
+            throw new ServletException("Failed to initialize Cloudinary", e);
+        }
+    }
+
+    /**
+     * Processes requests for both HTTP <code>GET</code> and <code>POST</code>
+     * methods.
+     *
+     * @param request servlet request
+     * @param response servlet response
+     * @throws ServletException if a servlet-specific error occurs
+     * @throws IOException if an I/O error occurs
+     */
+    protected void processRequest(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+        response.setContentType("text/html;charset=UTF-8");
+        try (PrintWriter out = response.getWriter()) {
+            /* TODO output your page here. You may use following sample code. */
+            out.println("<!DOCTYPE html>");
+            out.println("<html>");
+            out.println("<head>");
+            out.println("<title>Servlet updatePostServlet</title>");
+            out.println("</head>");
+            out.println("<body>");
+            out.println("<h1>Servlet updatePostServlet at " + request.getContextPath() + "</h1>");
+            out.println("</body>");
+            out.println("</html>");
+        }
+    }
+
+    // <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code.">
+    /**
+     * Handles the HTTP <code>GET</code> method.
+     *
+     * @param request servlet request
+     * @param response servlet response
+     * @throws ServletException if a servlet-specific error occurs
+     * @throws IOException if an I/O error occurs
+     */
+    @Override
+    protected void doGet(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+        processRequest(request, response);
+    }
+
+    /**
+     * Handles the HTTP <code>POST</code> method.
+     *
+     * @param request servlet request
+     * @param response servlet response
+     * @throws ServletException if a servlet-specific error occurs
+     * @throws IOException if an I/O error occurs
+     */
+    @Override
+    protected void doPost(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+        HttpSession session = request.getSession(false);
+        if (session != null && session.getAttribute("user") != null) {
+            LOGGER.info("Starting to process post update request");
+            try {
+                String newBody = request.getParameter("newBody");
+                Part filePart = request.getPart("newImage");
+                int postId = Integer.parseInt(request.getParameter("postId"));
+                String resourceType = null;
+                if (filePart == null) {
+                    LOGGER.warning("No file part found in request");
+
+                }
+
+                postDAO PostDao = new postDAO();
+                Post post = PostDao.getPostById(postId);
+                LOGGER.log(Level.INFO, "Updating post with ID: {0}", postId);
+                if (post == null) {
+                    LOGGER.warning("Post not found with ID: " + postId);
+                    session.setAttribute("errorMessage", "Post not found");
+                    response.sendRedirect("profile");
+                    return;
+                }
+
+                if (newBody != null && !newBody.trim().isEmpty()) {
+                    post.setBody(newBody);
+                }
+
+                if (filePart != null && filePart.getSize() > 0) {
+                    String contentType = filePart.getContentType();
+                    LOGGER.info("File upload detected with content type: " + contentType);
+                    if (!ALLOWED_IMAGE_TYPES.contains(contentType) && !ALLOWED_VIDEO_TYPES.contains(contentType)) {
+                        LOGGER.warning("Unsupported file type attempted: " + contentType);
+                        request.setAttribute("error", "Unsupported file type");
+                        response.sendRedirect("profile");
+                        return;
+                    }
+                    resourceType = ALLOWED_IMAGE_TYPES.contains(contentType) ? "image" : "video";
+                    try {
+                        LOGGER.info("Starting file upload process");
+                        File tempFile = File.createTempFile("upload_", filePart.getSubmittedFileName());
+
+                        try (InputStream inputStream = filePart.getInputStream(); FileOutputStream outputStream = new FileOutputStream(tempFile)) {
+                            byte[] buffer = new byte[8192];
+                            int bytesRead;
+                            while ((bytesRead = inputStream.read(buffer)) != -1) {
+                                outputStream.write(buffer, 0, bytesRead);
+                            }
+                        }
+
+                        Map uploadResult = cloud.uploader().upload(tempFile, ObjectUtils.asMap(
+                                "resource_type", resourceType
+                        ));
+                        String imageUrl = (String) uploadResult.get("url");
+                        post.setImage_path(imageUrl);
+                        post.setType(resourceType);
+                        LOGGER.info("File upload with type "+ resourceType);
+                        LOGGER.info("File uploaded successfully to Cloudinary");
+                        Files.deleteIfExists(tempFile.toPath());
+                    } catch (Exception e) {
+                        LOGGER.log(Level.SEVERE, "Error uploading file", e);
+                        e.printStackTrace();
+                        session.setAttribute("errorMessage", "Error uploading image");
+                        //response.sendRedirect("profile");
+                        return;
+                    }
+                }
+
+                PostDao.updatePost(post);
+                session.setAttribute("successMessage", "Post updated successfully");
+                LOGGER.info("Post updated successfully");
+                response.setContentType("text/plain");
+                response.getWriter().write("success");
+                // response.sendRedirect("profile");
+
+            } catch (Exception e) {
+                e.printStackTrace();
+                LOGGER.log(Level.SEVERE, "Error in doPost method", e);
+                session.setAttribute("errorMessage", "Error updating post: " + e.getMessage());
+                response.setContentType("text/plain");
+                response.getWriter().write("error: Invalid post ID");
+                // response.sendRedirect("profile");
+            }
+        } else {
+            response.sendRedirect("profile");
+        }
+    }
+
+    /**
+     * Returns a short description of the servlet.
+     *
+     * @return a String containing servlet description
+     */
+    @Override
+    public String getServletInfo() {
+        return "Short description";
+    }// </editor-fold>
+
+}
diff --git a/src/java/controller/updatePrivateServlet.java b/src/java/controller/updatePrivateServlet.java
new file mode 100644
index 0000000..07a6be8
--- /dev/null
+++ b/src/java/controller/updatePrivateServlet.java
@@ -0,0 +1,90 @@
+/*
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+ * Click nbfs://nbhost/SystemFileSystem/Templates/JSP_Servlet/Servlet.java to edit this template
+ */
+package controller;
+
+import dao.postDAO;
+import java.io.IOException;
+import java.io.PrintWriter;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+/**
+ *
+ * @author OS
+ */
+public class updatePrivateServlet extends HttpServlet {
+
+    /**
+     * Processes requests for both HTTP <code>GET</code> and <code>POST</code>
+     * methods.
+     *
+     * @param request servlet request
+     * @param response servlet response
+     * @throws ServletException if a servlet-specific error occurs
+     * @throws IOException if an I/O error occurs
+     */
+    protected void processRequest(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+        response.setContentType("text/html;charset=UTF-8");
+        try (PrintWriter out = response.getWriter()) {
+            /* TODO output your page here. You may use following sample code. */
+            out.println("<!DOCTYPE html>");
+            out.println("<html>");
+            out.println("<head>");
+            out.println("<title>Servlet updatePrivateServlet</title>");
+            out.println("</head>");
+            out.println("<body>");
+            out.println("<h1>Servlet updatePrivateServlet at " + request.getContextPath() + "</h1>");
+            out.println("</body>");
+            out.println("</html>");
+        }
+    }
+
+    // <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code.">
+    /**
+     * Handles the HTTP <code>GET</code> method.
+     *
+     * @param request servlet request
+     * @param response servlet response
+     * @throws ServletException if a servlet-specific error occurs
+     * @throws IOException if an I/O error occurs
+     */
+    @Override
+    protected void doGet(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+        processRequest(request, response);
+    }
+
+    /**
+     * Handles the HTTP <code>POST</code> method.
+     *
+     * @param request servlet request
+     * @param response servlet response
+     * @throws ServletException if a servlet-specific error occurs
+     * @throws IOException if an I/O error occurs
+     */
+    @Override
+    protected void doPost(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+        int postId = Integer.parseInt(request.getParameter("postId"));
+        String privacyMode = request.getParameter("privacyMode");
+        postDAO postDao = new postDAO();
+        postDao.updatePostPrivacy(postId, privacyMode);
+        response.sendRedirect("profile");
+    }
+
+    /**
+     * Returns a short description of the servlet.
+     *
+     * @return a String containing servlet description
+     */
+    @Override
+    public String getServletInfo() {
+        return "Short description";
+    }// </editor-fold>
+
+}
diff --git a/src/java/controller/userIntroduceServlet.java b/src/java/controller/userIntroduceServlet.java
new file mode 100644
index 0000000..4c7a4cb
--- /dev/null
+++ b/src/java/controller/userIntroduceServlet.java
@@ -0,0 +1,104 @@
+/*
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+ * Click nbfs://nbhost/SystemFileSystem/Templates/JSP_Servlet/Servlet.java to edit this template
+ */
+package controller;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
+import model.User;
+import dao.userDAO;
+import java.util.concurrent.TimeUnit;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ *
+ * @author bim26
+ */
+public class userIntroduceServlet extends HttpServlet {
+
+    /**
+     * Processes requests for both HTTP <code>GET</code> and <code>POST</code>
+     * methods.
+     *
+     * @param request servlet request
+     * @param response servlet response
+     * @throws ServletException if a servlet-specific error occurs
+     * @throws IOException if an I/O error occurs
+     */
+    protected void processRequest(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+        response.setContentType("text/html;charset=UTF-8");
+        try (PrintWriter out = response.getWriter()) {
+            /* TODO output your page here. You may use following sample code. */
+            out.println("<!DOCTYPE html>");
+            out.println("<html>");
+            out.println("<head>");
+            out.println("<title>Servlet userIntroduceServlet</title>");
+            out.println("</head>");
+            out.println("<body>");
+            out.println("<h1>Servlet userIntroduceServlet at " + request.getContextPath() + "</h1>");
+            out.println("</body>");
+            out.println("</html>");
+        }
+    }
+
+    // <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code.">
+    /**
+     * Handles the HTTP <code>GET</code> method.
+     *
+     * @param request servlet request
+     * @param response servlet response
+     * @throws ServletException if a servlet-specific error occurs
+     * @throws IOException if an I/O error occurs
+     */
+    @Override
+    protected void doGet(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+        processRequest(request, response);
+    }
+
+    /**
+     * Handles the HTTP <code>POST</code> method.
+     *
+     * @param request servlet request
+     * @param response servlet response
+     * @throws ServletException if a servlet-specific error occurs
+     * @throws IOException if an I/O error occurs
+     */
+    @Override
+    protected void doPost(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+        HttpSession session = request.getSession(false);
+        if (session != null && session.getAttribute("user") != null) {
+            User user = (User) session.getAttribute("user");
+            String newIntroduction = request.getParameter("userIntro");
+            if (newIntroduction != null && !newIntroduction.trim().isEmpty()) {
+                userDAO.getInstance().updateUserIntroduction(user.getUser_id(), newIntroduction);
+                user.setUser_introduce(newIntroduction);
+                response.sendRedirect("profile");
+            } else {
+                response.sendRedirect("profile");
+            }
+        } else {
+            response.sendRedirect("login");
+        }
+    }
+
+    /**
+     * Returns a short description of the servlet.
+     *
+     * @return a String containing servlet description
+     */
+    @Override
+    public String getServletInfo() {
+        return "Short description";
+    }// </editor-fold>
+
+}
diff --git a/src/java/controller/userpageServlet.java b/src/java/controller/userpageServlet.java
index 72ca951..c92a70d 100644
--- a/src/java/controller/userpageServlet.java
+++ b/src/java/controller/userpageServlet.java
@@ -53,6 +53,8 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t
                 request.getRequestDispatcher("error.jsp").forward(request, response);
                 return;
             }
+            String introduction = userDao.getUserIntroduce(user.getUser_id());
+            user.setUser_introduce(introduction);
         } catch (SQLException ex) {
             Logger.getLogger(userpageServlet.class.getName()).log(Level.SEVERE, "Error fetching user", ex);
             request.setAttribute("errorMessage", "Error fetching user data");
@@ -83,14 +85,13 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t
             request.setAttribute("friendCount", friendCount);
         } catch (Exception e) {
             Logger.getLogger(userpageServlet.class.getName()).log(Level.SEVERE, "Error fetching friends", e);
-            // We'll continue even if friends can't be fetched
+
         }
 
         request.setAttribute("user", user);
         request.setAttribute("posts", posts);
         request.getRequestDispatcher("/WEB-INF/profile.jsp").forward(request, response);
     }
-
     @Override
     protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
         HttpSession session = request.getSession(false);
@@ -100,12 +101,10 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
 
             Part file = request.getPart("image");
             String image_path = file.getSubmittedFileName();
-            String uploadPath = "E:/FUNET/FUNET/web/assets/profile_avt/" + image_path;
-            //E:\FUNET\FUNET\web\assets
+            String uploadPath = getServletContext().getRealPath("/assets/post_image/") + image_path;
             try {
                 FileOutputStream fos = new FileOutputStream(uploadPath);
                 InputStream is = file.getInputStream();
-
                 byte[] data = new byte[is.available()];
                 is.read(data);
                 fos.write(data);
diff --git a/src/java/dao/AdminDAO.java b/src/java/dao/AdminDAO.java
new file mode 100644
index 0000000..34a5cd7
--- /dev/null
+++ b/src/java/dao/AdminDAO.java
@@ -0,0 +1,36 @@
+/*
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
+ */
+package dao;
+
+import java.sql.*;
+import java.util.ArrayList;
+import java.util.List;
+import model.Month;
+import util.sqlConnect;
+/**
+ *
+ * @author Quocb
+ */
+public class AdminDAO {
+     public boolean updateUserBanStatus(int userId, boolean isBanned) {
+        String sql = "UPDATE userAccount SET is_banned = ? WHERE user_id = ?";
+        try (Connection conn = sqlConnect.getInstance().getConnection();
+             PreparedStatement ps = conn.prepareStatement(sql)) {
+            ps.setBoolean(1, isBanned);
+            ps.setInt(2, userId);
+            int rowsUpdated = ps.executeUpdate();
+            return rowsUpdated > 0;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+     
+       public static void main(String[] args) {
+       AdminDAO dao=new AdminDAO();
+       dao.updateUserBanStatus(1, true);
+    }
+    
+}
diff --git a/src/java/dao/ConversationDAO.java b/src/java/dao/ConversationDAO.java
index f0734dd..91942cf 100644
--- a/src/java/dao/ConversationDAO.java
+++ b/src/java/dao/ConversationDAO.java
@@ -4,19 +4,21 @@
  */
 package dao;
 
+import controller.ConversationRestController;
 import java.util.List;
 import model.Conversation;
 import model.User;
 import util.sqlConnect;
 import java.sql.*;
 import java.util.ArrayList;
+import java.util.logging.Logger;
 
 /**
  *
  * @author HELLO
  */
 public class ConversationDAO {
-
+private static final Logger LOGGER = Logger.getLogger(ConversationDAO.class.getName());
     /**
      * @param args the command line arguments
      */
@@ -34,26 +36,29 @@ public synchronized static ConversationDAO getInstance() {
     }
 
     public void saveConversation(Conversation conversation, List<User> users) throws Exception {
-        if (conversation == null) {
+        if (users == null) {
             return;
-        }
-
-        Connection conn = sqlConnect.getInstance().getConnection();
-        try {
-            if (conversation.getId() == 0) {
-                createNewConversation(conn, conversation, users);
-            } else {
-                updateConversation(conn, conversation);
+        } else {
+            Connection conn = sqlConnect.getInstance().getConnection();
+            try {
+                if (conversation.getId() == 0) {
+                    createNewConversation(conn, conversation, users);
+                } else {
+                    for (User user : users) {
+                        addUserToConversation(conn, conversation.getId(), user);
+                    }
+                }
+            } finally {
             }
-        } finally {
-            conn.close();
         }
     }
 
     private void createNewConversation(Connection conn, Conversation conversation, List<User> users) throws Exception {
-        String createConversationSQL = "INSERT INTO conversation(conversation_name, conversation_avatar) VALUES(?, CONCAT('group-', CAST(IDENT_CURRENT('conversation') AS CHAR(50))))";
+//      CONCAT('group-', CAST(IDENT_CURRENT('conversation') AS CHAR(50)))
+        String createConversationSQL = "INSERT INTO conversation(conversation_name, conversation_avatar) VALUES(?, ?)";
         PreparedStatement st = conn.prepareStatement(createConversationSQL, PreparedStatement.RETURN_GENERATED_KEYS);
         st.setString(1, conversation.getName());
+        st.setString(2, "assets/group/group1/group2.jpg");
         st.executeUpdate();
         ResultSet rs = st.getGeneratedKeys();
         if (rs.next()) {
@@ -76,13 +81,23 @@ private void addUserToConversation(Connection conn, int conversationId, User use
         st.executeUpdate();
     }
 
-    private void updateConversation(Connection conn, Conversation conversation) throws Exception {
-        String updateSQL = "UPDATE conversation SET conversation_name=?, conversation_avatar=? WHERE conversation_id=?";
-        PreparedStatement st = conn.prepareStatement(updateSQL);
-        st.setString(1, conversation.getName());
-        st.setString(2, conversation.getAvatar().replaceAll(" ", ""));
-        st.setInt(3, conversation.getId());
-        st.executeUpdate();
+    public void updateConversation(Conversation conversation) throws Exception {
+        Connection conn = sqlConnect.getInstance().getConnection();
+        LOGGER.info("update request");
+        if (conversation.getAvatar() == null) {
+            String updateSQL = "UPDATE conversation SET conversation_name=? WHERE conversation_id=?";
+            PreparedStatement st = conn.prepareStatement(updateSQL);
+            st.setString(1, conversation.getName());
+            st.setInt(2, conversation.getId());
+            st.executeUpdate();
+        } else {
+            LOGGER.info("perform change avatar with: " + conversation.getId() + "    " + conversation.getAvatar());
+            String updateSQL = "UPDATE conversation SET conversation_avatar=? WHERE conversation_id=?";
+            PreparedStatement st = conn.prepareStatement(updateSQL);
+            st.setString(1, conversation.getAvatar());
+            st.setInt(2, conversation.getId());
+            st.executeUpdate();
+        }
     }
 
     public List<Conversation> findAllConversationsByUserId(int userId) throws Exception {
@@ -98,7 +113,6 @@ public List<Conversation> findAllConversationsByUserId(int userId) throws Except
             Conversation conversation = new Conversation(rs.getInt("conversation_id"), rs.getString("conversation_name"), rs.getString("conversation_avatar"));
             conversations.add(conversation);
         }
-        conn.close();
         return conversations;
     }
 
@@ -112,7 +126,6 @@ public Conversation findConversationById(int id) throws Exception {
         if (rs.next()) {
             conversation = new Conversation(rs.getInt("conversation_id"), rs.getString("conversation_name"), rs.getString("conversation_avatar"));
         }
-        conn.close();
         return conversation;
     }
 
@@ -128,7 +141,6 @@ public void deleteConversationById(int id) throws Exception {
             st.setInt(3, id);
             st.executeUpdate();
         } finally {
-            conn.close();
         }
     }
 
@@ -139,7 +151,6 @@ public void deleteUserFromConversation(int conversationId, int userId) throws Ex
         st.setInt(1, conversationId);
         st.setInt(2, userId);
         st.executeUpdate();
-        conn.close();
     }
 
     public List<Conversation> findConversationsOfUserByKeyword(int userId, String keyword) throws Exception {
@@ -156,11 +167,13 @@ public List<Conversation> findConversationsOfUserByKeyword(int userId, String ke
             Conversation conversation = new Conversation(rs.getInt("conversation_id"), rs.getString("conversation_name"), rs.getString("conversation_avatar"));
             conversations.add(conversation);
         }
-        conn.close();
         return conversations;
     }
-    
+
     public static void main(String[] args) throws Exception {
-        ConversationDAO.getInstance().findAllConversationsByUserId(1);
+        List<Conversation> list = ConversationDAO.getInstance().findAllConversationsByUserId(1);
+        for (Conversation conversation : list) {
+            System.out.println(conversation.getId());
+        }
     }
 }
diff --git a/src/java/dao/FriendDAO.java b/src/java/dao/FriendDAO.java
index a434da2..02a6589 100644
--- a/src/java/dao/FriendDAO.java
+++ b/src/java/dao/FriendDAO.java
@@ -101,8 +101,8 @@ public String checkFriendStatus(int currUser, int responUser) throws Exception {
         PreparedStatement ps = conn.prepareStatement("SELECT * FROM friendship WHERE (sender = ? AND receiver=?) OR (sender = ? AND receiver = ?)");
         ps.setInt(1, currUser);
         ps.setInt(2, responUser);
-        ps.setInt(3, currUser);
-        ps.setInt(4, responUser);
+        ps.setInt(3, responUser);
+        ps.setInt(4, currUser);
 
         try (ResultSet rs = ps.executeQuery()) {
             while (rs.next()) {
diff --git a/src/java/dao/MessageDao.java b/src/java/dao/MessageDao.java
index 5de30d2..3ddb74c 100644
--- a/src/java/dao/MessageDao.java
+++ b/src/java/dao/MessageDao.java
@@ -90,7 +90,7 @@ public void saveMessage(Message message) throws Exception {
         int conversations_id = message.getGroupId();
         PreparedStatement stmt = null;
 
-        // If it's a one-on-one message (sender and receiver)
+        // If it's a one-to-one message (sender and receiver)
         if (receiver != 0) {
             String query = "INSERT INTO message(sender, receiver, message_text, message_type) VALUES(?,?,?,?)";
             stmt = conn.prepareStatement(query);
@@ -100,12 +100,12 @@ public void saveMessage(Message message) throws Exception {
             stmt.setString(4, type);      
         } // If it's a group message (sender and group)
         else {
-            String query = "INSERT INTO message(sender, message_text, message_type, conversations_id) VALUES(?,?,?,?)";
+            String query = "INSERT INTO message(sender, conversation_id, message_text, message_type) VALUES(?,?,?,?)";
             stmt = conn.prepareStatement(query);
             stmt.setInt(1, sender);       
-            stmt.setString(2, msg);         
-            stmt.setString(3, type);        
-            stmt.setInt(4, conversations_id); 
+            stmt.setInt(2, conversations_id);         
+            stmt.setString(3, msg);        
+            stmt.setString(4, type); 
         }
 
         // Execute the insert statement
@@ -114,5 +114,8 @@ public void saveMessage(Message message) throws Exception {
         // Close resources
         stmt.close();
     }
-
+    public static void main(String[] args) throws Exception {
+        List<Message> msg = MessageDao.getInstance().findAllMessagesBySenderAndReceiver(1, 2);
+        System.out.println(msg.get(1).getMessage());
+    }
 }
diff --git a/src/java/dao/MonthDAO.java b/src/java/dao/MonthDAO.java
new file mode 100644
index 0000000..36ea5ed
--- /dev/null
+++ b/src/java/dao/MonthDAO.java
@@ -0,0 +1,95 @@
+package dao;
+import java.sql.*;
+import java.util.ArrayList;
+import java.util.List;
+import model.Month;
+import util.sqlConnect;
+
+public class MonthDAO {
+    public List<Month> Get7Month() {
+        List<Month> results = new ArrayList<>();
+        String sql = "WITH LastSevenMonths AS ("
+                + "    SELECT "
+                + "        DATEADD(MONTH, number, DATEADD(MONTH, -7, DATEADD(MONTH, DATEDIFF(MONTH, 0, GETDATE()), 0))) AS MonthStart "
+                + "    FROM master.dbo.spt_values "
+                + "    WHERE type = 'P' AND number <= 6 "
+                + "), "
+                + "MonthlyRegistrations AS ("
+                + "    SELECT "
+                + "        DATEADD(MONTH, DATEDIFF(MONTH, 0, created_at), 0) AS MonthStart,"
+                + "        COUNT(*) AS RegistrationCount "
+                + "    FROM "
+                + "        userAccount "
+                + "    WHERE "
+                + "        created_at >= DATEADD(MONTH, -7, DATEADD(MONTH, DATEDIFF(MONTH, 0, GETDATE()), 0)) "
+                + "        AND created_at < DATEADD(MONTH, DATEDIFF(MONTH, 0, GETDATE()), 0) "
+                + "    GROUP BY "
+                + "        DATEADD(MONTH, DATEDIFF(MONTH, 0, created_at), 0) "
+                + ") "
+                + "SELECT "
+                + "    DATENAME(MONTH, m.MonthStart) AS MonthName, "
+                + "    ISNULL(r.RegistrationCount, 0) AS RegistrationCount "
+                + "FROM "
+                + "    LastSevenMonths m "
+                + "    LEFT JOIN MonthlyRegistrations r ON m.MonthStart = r.MonthStart "
+                + "ORDER BY "
+                + "    m.MonthStart ASC";
+
+        try (Connection conn = sqlConnect.getInstance().getConnection();
+             PreparedStatement stmt = conn.prepareStatement(sql)) {
+            try (ResultSet rs = stmt.executeQuery()) {
+                while (rs.next()) {
+                    String monthName = rs.getString("MonthName");
+                    int count = rs.getInt("RegistrationCount");
+                    results.add(new Month(monthName, count));
+                }
+            }
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+        return results;
+    }
+
+    public Month getLastMonthRegistrationCountAndName() {
+        String sql = "SELECT ISNULL(COUNT(*), 0) AS registration_count, "
+                + "DATENAME(MONTH, DATEADD(MONTH, -1, GETDATE())) AS month_name "
+                + "FROM userAccount WHERE "
+                + "created_at >= DATEADD(MONTH, -1, DATEADD(MONTH, DATEDIFF(MONTH, 0, GETDATE()), 0)) "
+                + "AND created_at < DATEADD(MONTH, DATEDIFF(MONTH, 0, GETDATE()), 0)";
+
+        try (Connection conn = sqlConnect.getInstance().getConnection();
+             PreparedStatement stmt = conn.prepareStatement(sql)) {
+            try (ResultSet rs = stmt.executeQuery()) {
+                if (rs.next()) {
+                    int count = rs.getInt("registration_count");
+                    String monthName = rs.getString("month_name");
+                    return new Month(monthName, count);
+                }
+            } catch (SQLException e) {
+                e.printStackTrace();
+            }
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+        return null;
+    }
+
+    public static void main(String[] args) {
+        MonthDAO dao = new MonthDAO();
+        // Kiểm tra Get7Month
+        System.out.println("Get7Month Results:");
+        List<Month> list = dao.Get7Month();
+        for (Month a : list) {
+            System.out.println(a);
+        }
+        
+        // Kiểm tra getLastMonthRegistrationCountAndName
+        System.out.println("\nLast Month Registration Count and Name:");
+        Month lastMonth = dao.getLastMonthRegistrationCountAndName();
+        if (lastMonth != null) {
+            System.out.println(lastMonth);
+        } else {
+            System.out.println("No data found for the last month.");
+        }
+    }
+}
diff --git a/src/java/dao/SearchGameDAO.java b/src/java/dao/SearchGameDAO.java
new file mode 100644
index 0000000..9e936e3
--- /dev/null
+++ b/src/java/dao/SearchGameDAO.java
@@ -0,0 +1,52 @@
+package dao;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+import model.game;
+import util.sqlConnect;
+
+public class SearchGameDAO {
+
+    public List<game> searchGameByKeyword(String keyword) {
+        List<game> list = new ArrayList<>();
+        String sql = "SELECT G.GameID, G.GameName, G.GameLink,G.Img , T.CategoryName "
+                + "FROM Game G "
+                + "JOIN GameCategory T ON G.CategoryID = T.CategoryID "
+                + "WHERE G.GameName LIKE ?";
+
+        try (Connection conn = sqlConnect.getInstance().getConnection(); PreparedStatement stmt = conn.prepareStatement(sql)) {
+
+            stmt.setString(1, "%" + keyword + "%");
+
+            try (ResultSet rs = stmt.executeQuery()) {
+                while (rs.next()) {
+                    game game = new game(
+                            rs.getInt("GameID"),
+                            rs.getString("GameName"),
+                            rs.getString("GameLink"),
+                            rs.getString("Img"),
+                            rs.getString("CategoryName")
+                    );
+                    list.add(game);
+                }
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return list;
+    }
+
+    public static void main(String[] args) {
+        SearchGameDAO dao = new SearchGameDAO();
+        List<game> games = dao.searchGameByKeyword("a");
+        for (game game : games) {
+            System.out.println(game);
+        }
+    }
+}
diff --git a/src/java/dao/UserActivityDAO.java b/src/java/dao/UserActivityDAO.java
new file mode 100644
index 0000000..98f7c26
--- /dev/null
+++ b/src/java/dao/UserActivityDAO.java
@@ -0,0 +1,133 @@
+/*
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
+ */
+package dao;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+import model.UserActivityLog;
+import util.sqlConnect;
+
+/**
+ *
+ * @author Quocb
+ */
+public class UserActivityDAO {
+
+    public List<UserActivityLog> getUserActivities(int userId) {
+        List<UserActivityLog> activities = new ArrayList<>();
+        String sql = "SELECT * FROM UserActivityLog ul JOIN userAccount u ON ul.user_id=u.user_id WHERE u.user_id = ? ORDER BY timestamp DESC";
+        try (Connection conn = sqlConnect.getInstance().getConnection(); PreparedStatement stmt = conn.prepareStatement(sql)) {
+
+            stmt.setInt(1, userId);
+            ResultSet rs = stmt.executeQuery();
+            while (rs.next()) {
+                UserActivityLog log = new UserActivityLog();
+                log.setLogId(rs.getInt("log_id"));
+                log.setUserId(rs.getInt("user_id"));
+                log.setRole(rs.getString("role"));
+                log.setFirstName(rs.getString("first_name"));
+                log.setLastName(rs.getString("last_name"));
+                log.setPostId(rs.getInt("post_id"));
+                log.setCommentId(rs.getInt("comment_id"));
+                log.setActivityType(rs.getString("activity_type"));
+                log.setActivityDetails(rs.getString("activity_details"));
+                log.setTimestamp(rs.getTimestamp("timestamp").toLocalDateTime());
+                activities.add(log);
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return activities;
+    }
+
+    public List<UserActivityLog> geAlltUserActivities() {
+        List<UserActivityLog> activities = new ArrayList<>();
+        String sql = "SELECT * FROM UserActivityLog ul JOIN userAccount u ON ul.user_id=u.user_id  ORDER BY timestamp DESC";
+        try (Connection conn = sqlConnect.getInstance().getConnection(); PreparedStatement stmt = conn.prepareStatement(sql)) {
+
+            ResultSet rs = stmt.executeQuery();
+            while (rs.next()) {
+                UserActivityLog log = new UserActivityLog();
+                log.setLogId(rs.getInt("log_id"));
+                log.setUserId(rs.getInt("user_id"));
+                log.setRole(rs.getString("role"));
+                log.setFirstName(rs.getString("first_name"));
+                log.setLastName(rs.getString("last_name"));
+                log.setPostId(rs.getInt("post_id"));
+                log.setCommentId(rs.getInt("comment_id"));
+                log.setActivityType(rs.getString("activity_type"));
+                log.setActivityDetails(rs.getString("activity_details"));
+                log.setTimestamp(rs.getTimestamp("timestamp").toLocalDateTime());
+                activities.add(log);
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return activities;
+    }
+
+    public void deleteUserActivityById(int logId) {
+        String sql = "DELETE FROM UserActivityLog WHERE log_id = ?";
+        try (Connection conn = sqlConnect.getInstance().getConnection(); PreparedStatement stmt = conn.prepareStatement(sql)) {
+
+            stmt.setInt(1, logId);
+            int rowsAffected = stmt.executeUpdate();
+
+        } catch (SQLException e) {
+            e.printStackTrace();
+        } catch (Exception e) {
+            e.printStackTrace();
+
+        }
+    }
+
+    public void deleteUserActivityByCommentId(int commentId) {
+        String sql = "DELETE FROM UserActivityLog WHERE comment_id = ?";
+        try (Connection conn = sqlConnect.getInstance().getConnection(); PreparedStatement stmt = conn.prepareStatement(sql)) {
+
+            stmt.setInt(1, commentId);
+            int rowsAffected = stmt.executeUpdate();
+
+          
+        } catch (SQLException e) {
+            e.printStackTrace();
+            } catch (Exception e) {
+            e.printStackTrace();
+            
+        }
+    }
+
+    public void deleteUserActivityByPostId(int postId) {
+        String sql = "DELETE FROM UserActivityLog WHERE post_id = ?";
+        try (Connection conn = sqlConnect.getInstance().getConnection(); PreparedStatement stmt = conn.prepareStatement(sql)) {
+
+            stmt.setInt(1, postId);
+            int rowsAffected = stmt.executeUpdate();
+
+            
+        } catch (SQLException e) {
+            e.printStackTrace();
+           } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    public static void main(String[] args) {
+        UserActivityDAO dao = new UserActivityDAO();
+        List<UserActivityLog> a = dao.geAlltUserActivities();
+        for (UserActivityLog s : a) {
+            System.out.println(s);
+        }
+    }
+
+}
diff --git a/src/java/dao/gameDAO.java b/src/java/dao/gameDAO.java
new file mode 100644
index 0000000..99026fa
--- /dev/null
+++ b/src/java/dao/gameDAO.java
@@ -0,0 +1,48 @@
+package dao;
+
+import model.game;
+import util.sqlConnect;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+
+public class gameDAO {
+    public List<game> getAllGames() {
+        List<game> games = new ArrayList<>();
+        String sql = "SELECT G.GameID, G.GameName, G.GameLink,G.Img, T.CategoryName " +
+                     "FROM Game G " +
+                     "JOIN GameCategory T ON G.CategoryID = T.CategoryID";
+        
+        try (Connection conn = sqlConnect.getInstance().getConnection();
+             PreparedStatement stmt = conn.prepareStatement(sql);
+             ResultSet rs = stmt.executeQuery()) {
+            
+            while (rs.next()) {
+                game Game = new game(
+                    rs.getInt("GameID"),
+                    rs.getString("GameName"),
+                    rs.getString("GameLink"),
+                  rs.getString("Img"),
+                    rs.getString("CategoryName")
+                );
+                games.add(Game);
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return games;
+    }
+
+    public static void main(String[] args) {
+        gameDAO dao = new gameDAO();
+        List<game> games = dao.getAllGames();
+        for (game game : games) {
+            System.out.println(game);
+        }
+    }
+}
diff --git a/src/java/dao/learningMaterialDao.java b/src/java/dao/learningMaterialDao.java
index 1d2fcbf..b71d006 100644
--- a/src/java/dao/learningMaterialDao.java
+++ b/src/java/dao/learningMaterialDao.java
@@ -1,50 +1,233 @@
+/*
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
+ */
 package dao;
 
+/**
+ *
+ * @author gabri
+ */
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import model.LearningMaterial;
 import util.sqlConnect;
 
 public class learningMaterialDao {
+
     public List<LearningMaterial> getAll() throws Exception {
-        
         List<LearningMaterial> learningMaterialsList = new ArrayList<>();
-        
-        String sql = "SELECT * FROM learningmaterial";  
-        
-        try (Connection conn = sqlConnect.getInstance().getConnection();
-             PreparedStatement preparedStatement = conn.prepareStatement(sql);
-             ResultSet resultSet = preparedStatement.executeQuery()) {
-            // ket noi sql va lay thong tin learningmaterial ra khoi sql
+        String sql = "SELECT * FROM learningmaterial";
+
+        try (Connection conn = sqlConnect.getInstance().getConnection(); PreparedStatement preparedStatement = conn.prepareStatement(sql); ResultSet resultSet = preparedStatement.executeQuery()) {
             while (resultSet.next()) {
                 int learningMaterialId = resultSet.getInt("learningmaterial_id");
                 int userId = resultSet.getInt("user_id");
                 String learningmaterialName = resultSet.getString("learningmaterial_name");
                 String learningmaterialDescription = resultSet.getString("learningmaterial_description");
-                String learningmaterialImg = resultSet.getString("learningmaterial_img");
                 String learningmaterialContext = resultSet.getString("learningmaterial_context");
                 String subjectCode = resultSet.getString("subject_code");
-                
                 java.util.Date publishDate = resultSet.getDate("publish_date");
-                
-                // luu learningmaterial vao list learning material
-                LearningMaterial learningMaterial = new LearningMaterial(learningMaterialId, userId, learningmaterialName, learningmaterialDescription, learningmaterialImg, learningmaterialContext, subjectCode, publishDate, "");
+                String review = resultSet.getString("review");
+                int departmentId = resultSet.getInt("department_id");
+
+                LearningMaterial learningMaterial = new LearningMaterial(learningMaterialId, userId, learningmaterialName, learningmaterialDescription, learningmaterialContext, subjectCode, publishDate, review, departmentId);
                 learningMaterialsList.add(learningMaterial);
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+
+        return learningMaterialsList;
+    }
+
+    public LearningMaterial getLearningMaterialById(int learningMaterialId) throws SQLException, Exception {
+        String sql = "SELECT * FROM learningmaterial WHERE learningmaterial_id = ?";
+        try (Connection conn = sqlConnect.getInstance().getConnection(); PreparedStatement stmt = conn.prepareStatement(sql)) {
+            stmt.setInt(1, learningMaterialId);
+            try (ResultSet rs = stmt.executeQuery()) {
+                if (rs.next()) {
+                    int userId = rs.getInt("user_id");
+                    String learningMaterialName = rs.getString("learningmaterial_name");
+                    String learningMaterialDescription = rs.getString("learningmaterial_description");
+                    String learningMaterialContext = rs.getString("learningmaterial_context");
+                    String subjectCode = rs.getString("subject_code");
+                    Date publishDate = rs.getDate("publish_date");
+                    String review = rs.getString("review");
+                    int departmentId = rs.getInt("department_id");
+
+                    return new LearningMaterial(learningMaterialId, userId, learningMaterialName, learningMaterialDescription, learningMaterialContext, subjectCode, publishDate, review, departmentId);
                 }
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+            throw new Exception("Error retrieving learning material", e);
+        }
+        return null;
+    }
 
+    public List<LearningMaterial> searchLearningMaterials(String keyword) throws Exception {
+        List<LearningMaterial> learningMaterialsList = new ArrayList<>();
+        String sql = "SELECT * FROM learningmaterial WHERE learningmaterial_name LIKE ? OR learningmaterial_description LIKE ? OR subject_code LIKE ?";
+
+        try (Connection conn = sqlConnect.getInstance().getConnection(); PreparedStatement preparedStatement = conn.prepareStatement(sql)) {
+            preparedStatement.setString(1, "%" + keyword + "%");
+            preparedStatement.setString(2, "%" + keyword + "%");
+            preparedStatement.setString(3, "%" + keyword + "%");
+            try (ResultSet resultSet = preparedStatement.executeQuery()) {
+                while (resultSet.next()) {
+                    int learningMaterialId = resultSet.getInt("learningmaterial_id");
+                    int userId = resultSet.getInt("user_id");
+                    String learningmaterialName = resultSet.getString("learningmaterial_name");
+                    String learningmaterialDescription = resultSet.getString("learningmaterial_description");
+                    String learningmaterialContext = resultSet.getString("learningmaterial_context");
+                    String subjectCode = resultSet.getString("subject_code");
+                    java.util.Date publishDate = resultSet.getDate("publish_date");
+                    String review = resultSet.getString("review");
+                    int departmentId = resultSet.getInt("department_id");
+
+                    LearningMaterial learningMaterial = new LearningMaterial(learningMaterialId, userId, learningmaterialName, learningmaterialDescription, learningmaterialContext, subjectCode, publishDate, review, departmentId);
+                    learningMaterialsList.add(learningMaterial);
+                }
+            }
         } catch (SQLException e) {
             e.printStackTrace();
         }
-        
+
         return learningMaterialsList;
     }
-    
-    public static void main(String[] args) throws Exception {
-        learningMaterialDao leMaterialDao = new learningMaterialDao();
-        System.out.println(leMaterialDao.getAll());
+
+    public List<LearningMaterial> getByDepartment(int departmentId) throws Exception {
+        List<LearningMaterial> learningMaterialsList = new ArrayList<>();
+        String sql = "SELECT * FROM learningmaterial WHERE department_id = ?";
+
+        try (Connection conn = sqlConnect.getInstance().getConnection(); PreparedStatement preparedStatement = conn.prepareStatement(sql)) {
+            preparedStatement.setInt(1, departmentId);
+            try (ResultSet resultSet = preparedStatement.executeQuery()) {
+                while (resultSet.next()) {
+                    int learningMaterialId = resultSet.getInt("learningmaterial_id");
+                    int userId = resultSet.getInt("user_id");
+                    String learningmaterialName = resultSet.getString("learningmaterial_name");
+                    String learningmaterialDescription = resultSet.getString("learningmaterial_description");
+                    String learningmaterialContext = resultSet.getString("learningmaterial_context");
+                    String subjectCode = resultSet.getString("subject_code");
+                    java.util.Date publishDate = resultSet.getDate("publish_date");
+                    String review = resultSet.getString("review");
+                    int departmentIdResult = resultSet.getInt("department_id");
+
+                    LearningMaterial learningMaterial = new LearningMaterial(learningMaterialId, userId, learningmaterialName, learningmaterialDescription, learningmaterialContext, subjectCode, publishDate, review, departmentIdResult);
+                    learningMaterialsList.add(learningMaterial);
+                }
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+
+        return learningMaterialsList;
+    }
+
+    public void createLearningMaterial(LearningMaterial learningMaterial) throws SQLException, Exception {
+        String sql = "INSERT INTO learningmaterial (user_id, learningmaterial_name, learningmaterial_description, learningmaterial_context, subject_code, publish_date, review, department_id) VALUES ( ?, ?, ?, ?, ?, ?, ?, ?)";
+        try (Connection conn = sqlConnect.getInstance().getConnection(); PreparedStatement stmt = conn.prepareStatement(sql)) {
+            stmt.setInt(1, learningMaterial.getUserId());
+            stmt.setString(2, learningMaterial.getLearningMaterialName());
+            stmt.setString(3, learningMaterial.getLearningMaterialDescription());
+            stmt.setString(4, learningMaterial.getLearningMaterialContext());
+            stmt.setString(5, learningMaterial.getSubjectCode());
+            stmt.setTimestamp(6, new java.sql.Timestamp(learningMaterial.getPublishDate().getTime()));
+            stmt.setString(7, learningMaterial.getReview());
+            stmt.setInt(8, learningMaterial.getDepartmentId());
+            stmt.executeUpdate();
+        } catch (SQLException e) {
+            e.printStackTrace();
+            throw new Exception("Error creating learning material", e);
+        }
+    }
+
+   public void updateLearningMaterial(LearningMaterial learningMaterial) throws SQLException, Exception {
+    String sql = "UPDATE learningmaterial SET learningmaterial_name = ?, learningmaterial_description = ?, learningmaterial_context = ?, subject_code = ?, publish_date = ?, review = ?, department_id = ? WHERE learningmaterial_id = ?";
+    try (Connection conn = sqlConnect.getInstance().getConnection(); PreparedStatement stmt = conn.prepareStatement(sql)) {
+        stmt.setString(1, learningMaterial.getLearningMaterialName());
+        stmt.setString(2, learningMaterial.getLearningMaterialDescription());
+        stmt.setString(3, learningMaterial.getLearningMaterialContext());
+        stmt.setString(4, learningMaterial.getSubjectCode());
+        stmt.setTimestamp(5, new java.sql.Timestamp(learningMaterial.getPublishDate().getTime()));
+        stmt.setString(6, learningMaterial.getReview());
+        stmt.setInt(7, learningMaterial.getDepartmentId());
+        stmt.setInt(8, learningMaterial.getLearningMaterialId());
+        stmt.executeUpdate();
+    } catch (SQLException e) {
+        e.printStackTrace();
+        throw new Exception("Error updating learning material", e);
+    }
+}
+
+    public void deleteLearningMaterial(int learningMaterialId) throws SQLException, Exception {
+        String sql = "DELETE FROM learningmaterial WHERE learningmaterial_id = ?";
+        try (Connection conn = sqlConnect.getInstance().getConnection(); PreparedStatement stmt = conn.prepareStatement(sql)) {
+            stmt.setInt(1, learningMaterialId);
+            stmt.executeUpdate();
+        } catch (SQLException e) {
+            e.printStackTrace();
+            throw new Exception("Error deleting learning material", e);
+        }
     }
+
+     public void saveLearningMaterial(int userId, int learningMaterialId) throws SQLException, Exception {
+        String sql = "INSERT INTO saved_learning_materials (user_id, learning_material_id) VALUES (?, ?)";
+        try (Connection conn = sqlConnect.getInstance().getConnection(); PreparedStatement stmt = conn.prepareStatement(sql)) {
+            stmt.setInt(1, userId);
+            stmt.setInt(2, learningMaterialId);
+            stmt.executeUpdate();
+        } catch (SQLException e) {
+            e.printStackTrace();
+            throw new Exception("Error saving learning material", e);
+        }
+    }
+
+    public List<LearningMaterial> getSavedLearningMaterials(int userId) throws SQLException, Exception {
+    List<LearningMaterial> savedMaterials = new ArrayList<>();
+    String query = "SELECT lm.learningmaterial_id, lm.user_id, lm.learningmaterial_name, lm.learningmaterial_description, lm.learningmaterial_context, lm.subject_code, lm.publish_date, lm.review, lm.department_id " +
+                   "FROM saved_learning_materials slm " +
+                   "JOIN learningmaterial lm ON slm.learning_material_id = lm.learningmaterial_id " +
+                   "WHERE slm.user_id = ?";
+    try (Connection conn = sqlConnect.getInstance().getConnection(); PreparedStatement stmt = conn.prepareStatement(query)) {
+        stmt.setInt(1, userId);
+        try (ResultSet rs = stmt.executeQuery()) {
+            while (rs.next()) {
+                int learningMaterialId = rs.getInt("learningmaterial_id");
+                int userIdDb = rs.getInt("user_id");
+                String learningMaterialName = rs.getString("learningmaterial_name");
+                String learningMaterialDescription = rs.getString("learningmaterial_description");
+                String learningMaterialContext = rs.getString("learningmaterial_context");
+                String subjectCode = rs.getString("subject_code");
+                Date publishDate = rs.getDate("publish_date");
+                String review = rs.getString("review");
+                int departmentId = rs.getInt("department_id");
+
+                LearningMaterial learningMaterial = new LearningMaterial(learningMaterialId, userIdDb, learningMaterialName, learningMaterialDescription, learningMaterialContext, subjectCode, publishDate, review, departmentId);
+                savedMaterials.add(learningMaterial);
+            }
+        }
+    } catch (SQLException e) {
+        e.printStackTrace();
+        throw new Exception("Error retrieving saved learning materials", e);
+    }
+    return savedMaterials;
+}
+    public static void main(String[] args) {
+        try {
+            learningMaterialDao dao = new learningMaterialDao();
+            List<LearningMaterial> materials = dao.getAll();
+            dao.getSavedLearningMaterials(2);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
 }
diff --git a/src/java/dao/ordersDAO.java b/src/java/dao/ordersDAO.java
index 7149876..dbb6ff2 100644
--- a/src/java/dao/ordersDAO.java
+++ b/src/java/dao/ordersDAO.java
@@ -8,6 +8,7 @@
 import java.sql.*;
 import java.util.ArrayList;
 import java.util.List;
+import model.OrderDetailDTO;
 import model.Orders;
 import util.sqlConnect;
 /**
@@ -186,9 +187,76 @@ public void updateOrderStatus(int orderId, String status) {
             e.printStackTrace();
         }
     }
-    
+
+    public List<OrderDetailDTO> getOrderDetailsForUser(int userId) {
+        List<OrderDetailDTO> orderDetails = new ArrayList<>();
+        String sql = "SELECT o.order_id, p.product_name, sci.quantity, "
+                + "p.price * sci.quantity AS total_price, o.order_status, "
+                + "o.order_date, CONCAT(u.first_name, ' ', u.last_name) AS seller_name "
+                + "FROM Orders o "
+                + "JOIN ShoppingCartItem sci ON o.cart_id = sci.cart_id "
+                + "JOIN Product p ON sci.product_id = p.product_id "
+                + "JOIN userAccount u ON p.user_id = u.user_id "
+                + "WHERE o.user_id = ? "
+                + "ORDER BY o.order_date DESC;";
+
+        try (Connection conn = sqlConnect.getInstance().getConnection(); PreparedStatement ps = conn.prepareStatement(sql)) {
+
+            ps.setInt(1, userId);
+            ResultSet rs = ps.executeQuery();
+
+            while (rs.next()) {
+                OrderDetailDTO detail = new OrderDetailDTO(
+                        rs.getInt("order_id"),
+                        rs.getString("product_name"),
+                        rs.getInt("quantity"),
+                        rs.getDouble("total_price"),
+                        rs.getString("order_status"),
+                        rs.getTimestamp("order_date"),
+                        rs.getString("seller_name")
+                );
+                orderDetails.add(detail);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return orderDetails;
+    }
+
+    public List<OrderDetailDTO> getOrdersForSeller(int sellerId) throws Exception {
+        List<OrderDetailDTO> orderDetails = new ArrayList<>();
+        String sql = "SELECT o.order_id, o.order_date, p.product_name, sci.quantity, "
+                + "p.price, CONCAT(u.first_name, ' ', u.last_name) AS buyer_name "
+                + "FROM Orders o "
+                + "JOIN ShoppingCartItem sci ON o.cart_id = sci.cart_id "
+                + "JOIN Product p ON sci.product_id = p.product_id "
+                + "JOIN userAccount u ON o.user_id = u.user_id " // Ensure this matches your user table structure
+                + "WHERE p.user_id = ?"; // Filter by sellerId
+
+        try (Connection conn = sqlConnect.getInstance().getConnection(); PreparedStatement stmt = conn.prepareStatement(sql)) {
+            stmt.setInt(1, sellerId);
+            ResultSet rs = stmt.executeQuery();
+            while (rs.next()) {
+                // Sử dụng constructor với tất cả các tham số
+                OrderDetailDTO detail = new OrderDetailDTO(
+                        rs.getInt("order_id"),
+                        rs.getString("product_name"),
+                        rs.getInt("quantity"),
+                        rs.getDouble("price"),
+                        "Pending", // Hoặc thay bằng trạng thái đơn hàng thực tế nếu có trong truy vấn
+                        rs.getTimestamp("order_date"), // Chuyển đổi thành Date
+                        rs.getString("buyer_name") // Tên người mua
+                );
+                orderDetails.add(detail);
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+        return orderDetails;
+    }
+
     public static void main(String[] args) throws Exception {
         ordersDAO o = new ordersDAO();
-        System.out.println(o.getOrdersBySellerProducts(4));
+        System.out.println(o.getOrdersForSeller(4));
     }
-}
+}
\ No newline at end of file
diff --git a/src/java/dao/postDAO.java b/src/java/dao/postDAO.java
index 487a490..89ac9df 100644
--- a/src/java/dao/postDAO.java
+++ b/src/java/dao/postDAO.java
@@ -11,18 +11,36 @@
 import java.sql.*;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import model.Comment;
 import model.Post;
+import model.UserActivityLog;
 import util.sqlConnect;
 
 public class postDAO {
 
     public void addPost(Post p) {
-        String query = "INSERT INTO post (user_id, body, image_path) VALUES (?, ?, ?)";
+        String query = "INSERT INTO post (user_id, body, image_path,type) VALUES (?, ?, ?,?)";
         try (Connection conn = sqlConnect.getInstance().getConnection(); PreparedStatement stmt = conn.prepareStatement(query)) {
             stmt.setInt(1, p.getUser_id());
             stmt.setString(2, p.getBody());
             stmt.setString(3, p.getImage_path());
+            stmt.setString(4, p.getType());
+            stmt.executeUpdate();
+
+        } catch (SQLException e) {
+            e.printStackTrace();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    public void updatePostPrivacy(int postId, String privacyMode) {
+        String query = "UPDATE post SET privacy_mode = ? WHERE post_id = ?";
+        try (Connection conn = sqlConnect.getInstance().getConnection(); PreparedStatement stmt = conn.prepareStatement(query)) {
+            stmt.setString(1, privacyMode);
+            stmt.setInt(2, postId);
             stmt.executeUpdate();
         } catch (SQLException e) {
             e.printStackTrace();
@@ -32,11 +50,12 @@ public void addPost(Post p) {
     }
 
     public void addComment(Comment c) {
-        String query = "INSERT INTO comment (post_id, user_id, comment_text) VALUES (?, ?, ?)";
+        String query = "INSERT INTO comment (post_id, user_id, comment_text, comment_image) VALUES (?, ?, ?, ?)";
         try (Connection conn = sqlConnect.getInstance().getConnection(); PreparedStatement stmt = conn.prepareStatement(query)) {
             stmt.setInt(1, c.getPost_id());
             stmt.setInt(2, c.getUser_id());
             stmt.setString(3, c.getComment_text());
+            stmt.setString(4, c.getComment_image());
             stmt.executeUpdate();
         } catch (SQLException e) {
             e.printStackTrace();
@@ -130,18 +149,18 @@ public static List<Post> getAllPosts(int sessionUserId) {
         List<Post> posts = new ArrayList<>();
         try {
             Connection conn = sqlConnect.getInstance().getConnection();
-
-            String query = "SELECT DISTINCT p.post_id, p.body, p.post_time, p.user_id, p.image_path, p.like_count, u.first_name, u.last_name, u.profile_pic, "
-                    + "p.is_shared, p.original_post_id, "
+            String query = "SELECT DISTINCT p.post_id, p.body, p.post_time, p.user_id, p.image_path, p.like_count, p.type, u.first_name, u.last_name, u.profile_pic, "
+                    + "p.is_shared, p.original_post_id, p.privacy_mode, "
                     + "CASE WHEN p.is_shared = 1 THEN CONCAT(op.first_name, ' ', op.last_name) ELSE NULL END AS original_poster_name, "
                     + "CASE WHEN p.is_shared = 1 THEN op.profile_pic ELSE NULL END AS original_poster_avatar, "
-                    + "(SELECT COUNT(*) FROM post_share WHERE post_id = p.post_id) AS share_count "
+                    + "(SELECT COUNT(*) FROM post_share WHERE post_id = p.post_id) AS share_count, "
+                    + "(SELECT COUNT(*) FROM saved_post WHERE user_id = ? AND post_id = p.post_id) AS saved_by_current_user "
                     + "FROM post p "
                     + "JOIN userAccount u ON p.user_id = u.user_id "
                     + "LEFT JOIN post op_post ON p.original_post_id = op_post.post_id "
                     + "LEFT JOIN userAccount op ON op_post.user_id = op.user_id "
-                    + "WHERE p.user_id = ? "
-                    + "OR p.user_id IN ( "
+                    + "WHERE (p.user_id = ? AND p.privacy_mode != 'private') "
+                    + "OR (p.user_id IN ( "
                     + "    SELECT CASE "
                     + "        WHEN f.sender = ? THEN f.receiver "
                     + "        ELSE f.sender "
@@ -149,13 +168,15 @@ public static List<Post> getAllPosts(int sessionUserId) {
                     + "    FROM friendship f "
                     + "    WHERE f.status = 'accepted' "
                     + "    AND (? IN (f.sender, f.receiver)) "
-                    + ") "
+                    + ") AND p.privacy_mode = 'friend') "
+                    + "OR p.privacy_mode = 'public' "
                     + "ORDER BY p.post_time DESC";
 
             try (PreparedStatement stmt = conn.prepareStatement(query)) {
                 stmt.setInt(1, sessionUserId);
                 stmt.setInt(2, sessionUserId);
                 stmt.setInt(3, sessionUserId);
+                stmt.setInt(4, sessionUserId);
 
                 try (ResultSet rs = stmt.executeQuery()) {
                     while (rs.next()) {
@@ -172,9 +193,16 @@ public static List<Post> getAllPosts(int sessionUserId) {
                         int originalPostId = rs.getInt("original_post_id");
                         String originalPosterName = rs.getString("original_poster_name");
                         int shareCount = rs.getInt("share_count");
+
                         String originalPosterAvatar = rs.getString("original_poster_avatar");
-                        Post post = new Post(post_id, user_id, body, post_time, first_name, last_name, image_path, profile_pic, like_count, isShared, originalPostId, originalPosterName, shareCount, originalPosterAvatar);
+                        String privacy_mode = rs.getString("privacy_mode");
+                        boolean savedByCurrentUser = rs.getInt("saved_by_current_user") > 0;
+
+                        Post post = new Post(post_id, user_id, body, post_time, first_name, last_name, image_path, profile_pic, like_count, isShared, originalPostId, originalPosterName, shareCount, originalPosterAvatar, privacy_mode);
+                        post.setSavedByCurrentUser(savedByCurrentUser);
                         post.setComments(getComments(post.getPost_id()));
+                        String type = rs.getString("type");
+                        post.setType(type);
                         posts.add(post);
                     }
                 }
@@ -194,7 +222,7 @@ public static List<Comment> getComments(int postId) {
             Connection conn = null;
             PreparedStatement stmt = null;
             conn = sqlConnect.getInstance().getConnection();
-            stmt = conn.prepareStatement("SELECT c.comment_id, c.post_id, c.user_id, c.comment_text, u.first_name, u.last_name, u.profile_pic "
+            stmt = conn.prepareStatement("SELECT c.comment_id, c.post_id, c.user_id, c.comment_text, c.comment_image, u.first_name, u.last_name, u.profile_pic "
                     + "FROM comment c "
                     + "JOIN userAccount u ON c.user_id = u.user_id "
                     + "WHERE c.post_id = ? "
@@ -206,10 +234,11 @@ public static List<Comment> getComments(int postId) {
                 int post_id = rs.getInt("post_id");
                 int user_id = rs.getInt("user_id");
                 String comment_text = rs.getString("comment_text");
+                String comment_image = rs.getString("comment_image");
                 String first_name = rs.getString("first_name");
                 String last_name = rs.getString("last_name");
                 String profile_pic = rs.getString("profile_pic");
-                Comment comment = new Comment(comment_id, post_id, user_id, first_name, last_name, comment_text, profile_pic);
+                Comment comment = new Comment(comment_id, post_id, user_id, first_name, last_name, comment_text, profile_pic, comment_image);
                 comments.add(comment);
             }
         } catch (SQLException e) {
@@ -221,66 +250,55 @@ public static List<Comment> getComments(int postId) {
     }
 
     public static List<Post> getMyPosts(int userId) {
-    List<Post> posts = new ArrayList<>();
-    try {
-        Connection conn = sqlConnect.getInstance().getConnection();
-        String query = "SELECT p.post_id, p.body, p.post_time, p.user_id, p.like_count, p.image_path, "
-                + "u.first_name, u.last_name, u.profile_pic, "
-                + "p.is_shared, p.original_post_id, "
-                + "CASE WHEN p.is_shared = 1 THEN CONCAT(op.first_name, ' ', op.last_name) ELSE NULL END AS original_poster_name, "
-                + "CASE WHEN p.is_shared = 1 THEN op.profile_pic ELSE NULL END AS original_poster_avatar, "
-                + "(SELECT COUNT(*) FROM post_share WHERE post_id = p.post_id) AS share_count "
-                + "FROM post p "
-                + "JOIN userAccount u ON p.user_id = u.user_id "
-                + "LEFT JOIN post op_post ON p.original_post_id = op_post.post_id "
-                + "LEFT JOIN userAccount op ON op_post.user_id = op.user_id "
-                + "WHERE p.user_id = ? "
-                + "ORDER BY p.post_time DESC";
+        List<Post> posts = new ArrayList<>();
+        try {
+            Connection conn = sqlConnect.getInstance().getConnection();
+            String query = "SELECT p.post_id, p.body, p.post_time, p.user_id, p.like_count,p.type, p.image_path, "
+                    + "u.first_name, u.last_name, u.profile_pic, "
+                    + "p.is_shared, p.original_post_id, "
+                    + "CASE WHEN p.is_shared = 1 THEN CONCAT(op.first_name, ' ', op.last_name) ELSE NULL END AS original_poster_name, "
+                    + "CASE WHEN p.is_shared = 1 THEN op.profile_pic ELSE NULL END AS original_poster_avatar, "
+                    + "(SELECT COUNT(*) FROM post_share WHERE post_id = p.post_id) AS share_count "
+                    + "FROM post p "
+                    + "JOIN userAccount u ON p.user_id = u.user_id "
+                    + "LEFT JOIN post op_post ON p.original_post_id = op_post.post_id "
+                    + "LEFT JOIN userAccount op ON op_post.user_id = op.user_id "
+                    + "WHERE p.user_id = ? "
+                    + "ORDER BY p.post_time DESC";
 
-        try (PreparedStatement stmt = conn.prepareStatement(query)) {
-            stmt.setInt(1, userId);
-            try (ResultSet rs = stmt.executeQuery()) {
-                while (rs.next()) {
-                    int post_id = rs.getInt("post_id");
-                    int user_id = rs.getInt("user_id");
-                    String body = rs.getString("body");
-                    Timestamp post_time = rs.getTimestamp("post_time");
-                    String first_name = rs.getString("first_name");
-                    String last_name = rs.getString("last_name");
-                    int like_count = rs.getInt("like_count");
-                    String image_path = rs.getString("image_path");
-                    String profile_pic = rs.getString("profile_pic");
-                    boolean isShared = rs.getBoolean("is_shared");
-                    int originalPostId = rs.getInt("original_post_id");
-                    String originalPosterName = rs.getString("original_poster_name");
-                    String originalPosterAvatar = rs.getString("original_poster_avatar");
-                    int shareCount = rs.getInt("share_count");
+            try (PreparedStatement stmt = conn.prepareStatement(query)) {
+                stmt.setInt(1, userId);
+                try (ResultSet rs = stmt.executeQuery()) {
+                    while (rs.next()) {
+                        int post_id = rs.getInt("post_id");
+                        int user_id = rs.getInt("user_id");
+                        String body = rs.getString("body");
+                        Timestamp post_time = rs.getTimestamp("post_time");
+                        String first_name = rs.getString("first_name");
+                        String last_name = rs.getString("last_name");
+                        int like_count = rs.getInt("like_count");
+                        String image_path = rs.getString("image_path");
+                        String profile_pic = rs.getString("profile_pic");
+                        boolean isShared = rs.getBoolean("is_shared");
+                        int originalPostId = rs.getInt("original_post_id");
+                        String originalPosterName = rs.getString("original_poster_name");
+                        String originalPosterAvatar = rs.getString("original_poster_avatar");
+                        int shareCount = rs.getInt("share_count");
 
-                    Post post = new Post(post_id, user_id, body, post_time, first_name, last_name, image_path, profile_pic, like_count, isShared, originalPostId, originalPosterName, shareCount, originalPosterAvatar);
-                    posts.add(post);
+                        Post post = new Post(post_id, user_id, body, post_time, first_name, last_name, image_path, profile_pic, like_count, isShared, originalPostId, originalPosterName, shareCount, originalPosterAvatar);
+                        String type = rs.getString("type");
+                        post.setType(type);
+                        posts.add(post);
+
+                    }
                 }
             }
-        }
-    } catch (SQLException e) {
-        e.printStackTrace();
-    } catch (Exception e) {
-        e.printStackTrace();
-    }
-    return posts;
-}
-
-    public void deletePost(int postId) {
-        String deletePostQuery = "DELETE FROM post WHERE post_id = ?";
-
-        try (Connection conn = sqlConnect.getInstance().getConnection(); PreparedStatement stmt = conn.prepareStatement(deletePostQuery)) {
-            stmt.setInt(1, postId);
-            stmt.executeUpdate();
         } catch (SQLException e) {
             e.printStackTrace();
         } catch (Exception e) {
             e.printStackTrace();
         }
-
+        return posts;
     }
 
     public void sharePost(int userId, int postId) throws SQLException {
@@ -327,8 +345,271 @@ public void sharePost(int userId, int postId) throws SQLException {
         }
     }
 
-    public static void main(String[] args) {
-        List<Post> posts;
-        posts = getMyPosts(2);
+    public void updatePost(Post p) {
+        String updatePostQuery = "UPDATE post SET body = ? WHERE post_id = ?";
+        String updateSharedPostsQuery = "UPDATE post SET body = ? WHERE original_post_id = ? AND is_shared = 1";
+        String updateImageQuery = "UPDATE post SET image_path = ?,type=? WHERE post_id = ?";
+        String updateSharedImageQuery = "UPDATE post SET image_path = ?,type= ? WHERE original_post_id = ? AND is_shared = 1";
+
+        try (Connection conn = sqlConnect.getInstance().getConnection()) {
+            conn.setAutoCommit(false);
+            try {
+                try (PreparedStatement stmt = conn.prepareStatement(updatePostQuery)) {
+                    stmt.setString(1, p.getBody());
+                    stmt.setInt(2, p.getPost_id());
+                    stmt.executeUpdate();
+                }
+                try (PreparedStatement stmt = conn.prepareStatement(updateSharedPostsQuery)) {
+                    stmt.setString(1, p.getBody());
+                    stmt.setInt(2, p.getPost_id());
+                    stmt.executeUpdate();
+                }
+                if (p.getImage_path() != null && !p.getImage_path().isEmpty()) {
+                    try (PreparedStatement stmt = conn.prepareStatement(updateImageQuery)) {
+                        stmt.setString(1, p.getImage_path());
+                        stmt.setString(2, p.getType());
+                        stmt.setInt(3, p.getPost_id());
+                        stmt.executeUpdate();
+                    }
+                    try (PreparedStatement stmt = conn.prepareStatement(updateSharedImageQuery)) {
+                        stmt.setString(1, p.getImage_path());
+                        stmt.setString(2, p.getType());
+                        stmt.setInt(3, p.getPost_id());
+                        stmt.executeUpdate();
+                    }
+                }
+
+                conn.commit();
+            } catch (SQLException e) {
+                conn.rollback();
+                throw e;
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    public void updateComment(Comment c) {
+        String updateCommentQuery = "UPDATE comment SET comment_text = ? WHERE comment_id = ?";
+        try (Connection conn = sqlConnect.getInstance().getConnection()) {
+            conn.setAutoCommit(false);
+            try (PreparedStatement stmt = conn.prepareStatement(updateCommentQuery)) {
+                stmt.setString(1, c.getComment_text());
+                stmt.setInt(2, c.getComment_id());
+                stmt.executeUpdate();
+                conn.commit();
+            } catch (SQLException ex) {
+                conn.rollback();
+                Logger.getLogger(postDAO.class.getName()).log(Level.SEVERE, null, ex);
+                throw ex;
+            }
+        } catch (SQLException ex) {
+            Logger.getLogger(postDAO.class.getName()).log(Level.SEVERE, null, ex);
+        } catch (Exception ex) {
+            Logger.getLogger(postDAO.class.getName()).log(Level.SEVERE, null, ex);
+        }
     }
+
+    public void deletePost(int postId) {
+        String deletePostQuery = "DELETE FROM post WHERE post_id = ? OR (original_post_id = ? AND is_shared = 1)";
+        String deleteCommentsQuery = "DELETE FROM comment WHERE post_id = ? OR post_id IN (SELECT post_id FROM post WHERE original_post_id = ? AND is_shared = 1)";
+        String deleteLikesQuery = "DELETE FROM post_like WHERE post_id = ? OR post_id IN (SELECT post_id FROM post WHERE original_post_id = ? AND is_shared = 1)";
+        String deleteSharesQuery = "DELETE FROM post_share WHERE post_id = ? OR post_id IN (SELECT post_id FROM post WHERE original_post_id = ? AND is_shared = 1)";
+
+        try (Connection conn = sqlConnect.getInstance().getConnection()) {
+            conn.setAutoCommit(false);
+            try {
+                try (PreparedStatement stmt = conn.prepareStatement(deleteCommentsQuery)) {
+                    stmt.setInt(1, postId);
+                    stmt.setInt(2, postId);
+                    stmt.executeUpdate();
+                }
+                try (PreparedStatement stmt = conn.prepareStatement(deleteLikesQuery)) {
+                    stmt.setInt(1, postId);
+                    stmt.setInt(2, postId);
+                    stmt.executeUpdate();
+                }
+                try (PreparedStatement stmt = conn.prepareStatement(deleteSharesQuery)) {
+                    stmt.setInt(1, postId);
+                    stmt.setInt(2, postId);
+                    stmt.executeUpdate();
+                }
+                try (PreparedStatement stmt = conn.prepareStatement(deletePostQuery)) {
+                    stmt.setInt(1, postId);
+                    stmt.setInt(2, postId);
+                    stmt.executeUpdate();
+                }
+                conn.commit();
+            } catch (SQLException e) {
+                conn.rollback();
+                throw e;
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    public void deleteComment(int commentId) {
+        String deleteCommentQuery = "DELETE FROM comment WHERE comment_id = ?";
+        try (Connection conn = sqlConnect.getInstance().getConnection()) {
+            conn.setAutoCommit(false);
+            try (PreparedStatement stmt = conn.prepareStatement(deleteCommentQuery)) {
+                stmt.setInt(1, commentId);
+                stmt.executeUpdate();
+                conn.commit();
+            } catch (SQLException e) {
+                conn.rollback();
+                throw e;
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        } catch (Exception ex) {
+            Logger.getLogger(postDAO.class.getName()).log(Level.SEVERE, null, ex);
+        }
+    }
+
+    public void savePost(int userId, int postId) throws SQLException {
+        String query = "INSERT INTO saved_post (user_id, post_id) VALUES (?, ?)";
+        try (Connection conn = sqlConnect.getInstance().getConnection(); PreparedStatement stmt = conn.prepareStatement(query)) {
+            stmt.setInt(1, userId);
+            stmt.setInt(2, postId);
+            stmt.executeUpdate();
+        } catch (Exception ex) {
+            Logger.getLogger(postDAO.class.getName()).log(Level.SEVERE, null, ex);
+        }
+    }
+
+    public void unsavePost(int userId, int postId) throws SQLException {
+        String query = "DELETE FROM saved_post WHERE user_id = ? AND post_id = ?";
+        try (Connection conn = sqlConnect.getInstance().getConnection(); PreparedStatement stmt = conn.prepareStatement(query)) {
+            stmt.setInt(1, userId);
+            stmt.setInt(2, postId);
+            stmt.executeUpdate();
+        } catch (Exception ex) {
+            Logger.getLogger(postDAO.class.getName()).log(Level.SEVERE, null, ex);
+        }
+    }
+
+    public boolean isPostSavedByUser(int userId, int postId) {
+        String query = "SELECT COUNT(*) FROM saved_post WHERE user_id = ? AND post_id = ?";
+        try (Connection conn = sqlConnect.getInstance().getConnection(); PreparedStatement stmt = conn.prepareStatement(query)) {
+            stmt.setInt(1, userId);
+            stmt.setInt(2, postId);
+            try (ResultSet rs = stmt.executeQuery()) {
+                if (rs.next()) {
+                    return rs.getInt(1) > 0;
+                }
+            }
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+        return false;
+    }
+
+    public List<Post> getSavedPosts(int userId) {
+        List<Post> posts = new ArrayList<>();
+        String query = "SELECT p.post_id, p.body, p.post_time, p.user_id, p.image_path, p.like_count, p.type, u.first_name, u.last_name, u.profile_pic, "
+                + "p.is_shared, p.original_post_id, p.privacy_mode, "
+                + "CASE WHEN p.is_shared = 1 THEN CONCAT(op.first_name, ' ', op.last_name) ELSE NULL END AS original_poster_name, "
+                + "CASE WHEN p.is_shared = 1 THEN op.profile_pic ELSE NULL END AS original_poster_avatar, "
+                + "(SELECT COUNT(*) FROM post_share WHERE post_id = p.post_id) AS share_count "
+                + "FROM post p "
+                + "JOIN userAccount u ON p.user_id = u.user_id "
+                + "LEFT JOIN post op_post ON p.original_post_id = op_post.post_id "
+                + "LEFT JOIN userAccount op ON op_post.user_id = op.user_id "
+                + "JOIN saved_post sp ON p.post_id = sp.post_id "
+                + "WHERE sp.user_id = ? "
+                + "ORDER BY p.post_time DESC";
+
+        try (Connection conn = sqlConnect.getInstance().getConnection(); PreparedStatement stmt = conn.prepareStatement(query)) {
+            stmt.setInt(1, userId);
+            try (ResultSet rs = stmt.executeQuery()) {
+                while (rs.next()) {
+                    int post_id = rs.getInt("post_id");
+                    int user_id = rs.getInt("user_id");
+                    String body = rs.getString("body");
+                    Timestamp post_time = rs.getTimestamp("post_time");
+                    String first_name = rs.getString("first_name");
+                    String last_name = rs.getString("last_name");
+                    String image_path = rs.getString("image_path");
+                    int like_count = rs.getInt("like_count");
+                    String profile_pic = rs.getString("profile_pic");
+                    boolean isShared = rs.getBoolean("is_shared");
+                    int originalPostId = rs.getInt("original_post_id");
+                    String originalPosterName = rs.getString("original_poster_name");
+                    int shareCount = rs.getInt("share_count");
+                    String originalPosterAvatar = rs.getString("original_poster_avatar");
+                    String privacy_mode = rs.getString("privacy_mode");
+
+                    Post post = new Post(post_id, user_id, body, post_time, first_name, last_name, image_path, profile_pic, like_count, isShared, originalPostId, originalPosterName, shareCount, originalPosterAvatar, privacy_mode);
+                    post.setComments(getComments(post.getPost_id()));
+                    String type = rs.getString("type");
+                    post.setType(type);
+                    posts.add(post);
+                }
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return posts;
+    }
+
+    public Post getPostById(int postId) {
+        Post post = null;
+        try {
+            Connection conn = sqlConnect.getInstance().getConnection();
+            String query = "SELECT p.post_id, p.body, p.post_time, p.user_id, p.like_count, p.image_path, "
+                    + "u.first_name, u.last_name, u.profile_pic, "
+                    + "p.is_shared, p.original_post_id, "
+                    + "CASE WHEN p.is_shared = 1 THEN CONCAT(op.first_name, ' ', op.last_name) ELSE NULL END AS original_poster_name, "
+                    + "CASE WHEN p.is_shared = 1 THEN op.profile_pic ELSE NULL END AS original_poster_avatar, "
+                    + "(SELECT COUNT(*) FROM post_share WHERE post_id = p.post_id) AS share_count "
+                    + "FROM post p "
+                    + "JOIN userAccount u ON p.user_id = u.user_id "
+                    + "LEFT JOIN post op_post ON p.original_post_id = op_post.post_id "
+                    + "LEFT JOIN userAccount op ON op_post.user_id = op.user_id "
+                    + "WHERE p.post_id = ?";
+
+            try (PreparedStatement stmt = conn.prepareStatement(query)) {
+                stmt.setInt(1, postId);
+                try (ResultSet rs = stmt.executeQuery()) {
+                    if (rs.next()) {
+                        int post_id = rs.getInt("post_id");
+                        int user_id = rs.getInt("user_id");
+                        String body = rs.getString("body");
+                        Timestamp post_time = rs.getTimestamp("post_time");
+                        String first_name = rs.getString("first_name");
+                        String last_name = rs.getString("last_name");
+                        int like_count = rs.getInt("like_count");
+                        String image_path = rs.getString("image_path");
+                        String profile_pic = rs.getString("profile_pic");
+                        boolean isShared = rs.getBoolean("is_shared");
+                        int originalPostId = rs.getInt("original_post_id");
+                        String originalPosterName = rs.getString("original_poster_name");
+                        String originalPosterAvatar = rs.getString("original_poster_avatar");
+                        int shareCount = rs.getInt("share_count");
+
+                        post = new Post(post_id, user_id, body, post_time, first_name, last_name, image_path, profile_pic, like_count, isShared, originalPostId, originalPosterName, shareCount, originalPosterAvatar);
+                        String type = rs.getString("type");
+                        post.setType(type);
+                    }
+                }
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return post;
+    }
+
+   
+
+    
 }
diff --git a/src/java/dao/shoppingCartDAO.java b/src/java/dao/shoppingCartDAO.java
index b7f90da..b605a93 100644
--- a/src/java/dao/shoppingCartDAO.java
+++ b/src/java/dao/shoppingCartDAO.java
@@ -18,22 +18,23 @@
  * @author ADMIN
  */
 public class shoppingCartDAO {
+
     private Connection connection;
-    
-    public List<ShoppingCart> getAllCarts() throws Exception{
+
+    public List<ShoppingCart> getAllCarts() throws Exception {
         List<ShoppingCart> shoppingList = new ArrayList<>();
         // ket noi sql va lay thong tin list shopping cart tu database
         String sql = "SELECT * FROM shoppingCart";
-        
+
         try {
             connection = sqlConnect.getInstance().getConnection();
             PreparedStatement preparedStatement = connection.prepareStatement(sql);
             ResultSet resultSet = preparedStatement.executeQuery();
-            while(resultSet.next()){
+            while (resultSet.next()) {
                 int cart_id = resultSet.getInt("cart_id");
                 int user_id = resultSet.getInt("user_id");
                 Date add_date = resultSet.getDate("add_date");
-                
+
                 ShoppingCart shoppingCart = new ShoppingCart(cart_id, user_id, add_date);
                 shoppingList.add(shoppingCart);
             }
@@ -71,27 +72,27 @@ public List<ShoppingCartItem> getAllItems(int cart_id) throws Exception {
     }
 
     // Tạo giỏ hàng
-    public void addShoppingCart(int userId) throws SQLException, Exception {
-    String sql = "INSERT INTO shoppingCart (user_id, add_date) VALUES (?, GETDATE())";
-    connection = sqlConnect.getInstance().getConnection();
-    PreparedStatement preparedStatement = connection.prepareStatement(sql);
-    preparedStatement.setInt(1, userId);
-    preparedStatement.executeUpdate();
-}
-    
+//    public void addShoppingCart(int userId) throws SQLException, Exception {
+//        String sql = "INSERT INTO shoppingCart (user_id, add_date) VALUES (?, GETDATE())";
+//        connection = sqlConnect.getInstance().getConnection();
+//        PreparedStatement preparedStatement = connection.prepareStatement(sql);
+//        preparedStatement.setInt(1, userId);
+//        preparedStatement.executeUpdate();
+//    }
+
     // Thêm item vào shopping cart
     public boolean addShoppingCartItem(int cartId, int productId, int quantity) throws SQLException, Exception {
-    String sql = "INSERT INTO shoppingCartItem (cart_id, product_id, quantity) VALUES (?, ?, ?)";
-    connection = sqlConnect.getInstance().getConnection();
-    PreparedStatement preparedStatement = connection.prepareStatement(sql);
-    preparedStatement.setInt(1, cartId);
-    preparedStatement.setInt(2, productId);
-    preparedStatement.setInt(3, quantity);
-    
-    int rowsAffected = preparedStatement.executeUpdate();
-    return rowsAffected > 0; // Trả về true nếu có ít nhất 1 dòng bị ảnh hưởng
+        String sql = "INSERT INTO shoppingCartItem (cart_id, product_id, quantity) VALUES (?, ?, ?)";
+        connection = sqlConnect.getInstance().getConnection();
+        PreparedStatement preparedStatement = connection.prepareStatement(sql);
+        preparedStatement.setInt(1, cartId);
+        preparedStatement.setInt(2, productId);
+        preparedStatement.setInt(3, quantity);
+
+        int rowsAffected = preparedStatement.executeUpdate();
+        return rowsAffected > 0; // Trả về true nếu có ít nhất 1 dòng bị ảnh hưởng
     }
-    
+
     public int getCartIdByUserId(int userId) throws Exception {
         String sql = "SELECT cart_id FROM shoppingCart WHERE user_id = ?";
         connection = sqlConnect.getInstance().getConnection();
@@ -124,18 +125,17 @@ public int getUserIdByCartId(int cartId) throws Exception {
 
         return userId;
     }
-    
+
     // Phương thức xóa sản phẩm khỏi giỏ hàng
     public void removeItem(int cartId, int productId) throws SQLException, Exception {
         String sql = "DELETE FROM shoppingCartItem WHERE cart_id = ? AND product_id = ?";
-        try (Connection conn = sqlConnect.getInstance().getConnection();
-             PreparedStatement stmt = conn.prepareStatement(sql)) {
+        try (Connection conn = sqlConnect.getInstance().getConnection(); PreparedStatement stmt = conn.prepareStatement(sql)) {
             stmt.setInt(1, cartId);
             stmt.setInt(2, productId);
             stmt.executeUpdate();
         }
     }
-    
+
     public static void main(String[] args) throws Exception {
         shoppingCartDAO s = new shoppingCartDAO();
         System.out.println(s.getUserIdByCartId(4));
diff --git a/src/java/dao/userDAO.java b/src/java/dao/userDAO.java
index 202cd4e..4d9ab6a 100644
--- a/src/java/dao/userDAO.java
+++ b/src/java/dao/userDAO.java
@@ -1,18 +1,18 @@
 package dao;
 
-import Security.SHA512WithSalt;
 import util.sqlConnect;
 import java.sql.*;
 import model.User;
 import java.util.ArrayList;
-import java.util.Base64;
 import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 public class userDAO {
 
     private static userDAO instance = null;
 
-    private userDAO() {
+    public userDAO() {
 
     }
 
@@ -27,60 +27,20 @@ public boolean login(String email, String password) {
         boolean result = false;
         try {
             Connection conn = sqlConnect.getInstance().getConnection();
-            PreparedStatement st = conn.prepareStatement("SELECT * FROM userAccount WHERE email=?");
+            PreparedStatement st = conn.prepareStatement("Select * from userAccount where email=? AND password=?");
             st.setString(1, email);
+            st.setString(2, password);
             ResultSet rs = st.executeQuery();
-
             if (rs.next()) {
-                // Lấy chuỗi kết hợp (lưu cả salt và sha512 hash vào password)
-                String combinedHash = rs.getString("password");
-
-                // Tách salt và hashedPassword
-                String[] parts = combinedHash.split(":"); // Sử dụng dấu phân cách
-                byte[] salt = Base64.getDecoder().decode(parts[0]); // Giải mã salt
-                String storedHash = parts[1]; // hashedPassword
-
-                // Băm mật khẩu đã nhập với salt
-                String hashedInputPassword = SHA512WithSalt.hashPassWordWithSHA512(password, salt);
-
-                // So sánh mật khẩu đã băm
-                if (hashedInputPassword.equals(storedHash)) {
-                    result = true;
-                }
+                result = true;
             }
         } catch (Exception e) {
-            System.out.println("Connect Failed: " + e.getMessage());
+            System.out.println("Connect Failed");
         }
         return result;
     }
-    
-    public void hashPw(String firstName, String lastName, String email, String password, String profilePic, String role) throws Exception {
-        userDAO uDAO = new userDAO(); // Giả định UserDAO có phương thức register
-
-        // Bước 1: Mã hóa mật khẩu với salt
-        byte[] salt = SHA512WithSalt.createSalt(); // Tạo salt
-        String hashedPassword = SHA512WithSalt.hashPassWordWithSHA512(password, salt); // Băm mật khẩu với SHA-512
-        String combinedHash = Base64.getEncoder().encodeToString(salt) + ":" + hashedPassword; // Kết hợp salt và mật khẩu đã băm
-
-        // Bước 2: Tạo đối tượng User mới
-        User newUser = new User(firstName, lastName, combinedHash, email, profilePic, role, false); // false ở đây là is_banned
-
-        // Bước 3: Gọi phương thức register để thêm người dùng vào cơ sở dữ liệu
-        int userId = uDAO.register(newUser);  // Phương thức register trả về userId nếu thành công
-
-        // Bước 4: Kiểm tra kết quả đăng ký
-        if (userId > 0) {
-            System.out.println("Đăng ký thành công cho email: " + email + " với userId: " + userId);
-        } else {
-            System.out.println("Đăng ký thất bại cho email: " + email);
-        }
-    }
 
     public int register(User user) throws Exception {
-        // tạo giỏ hàng cho người dùng khi register
-        shoppingCartDAO sCartDAO = new shoppingCartDAO();
-        sCartDAO.addShoppingCart(user.getUser_id());
-        
         int generatedUserId = 0;
         String sql = "INSERT INTO userAccount (first_name, last_name, password, email, profile_pic, role, is_banned) "
                 + "VALUES (?, ?, ?, ?, ?, ?, ?)";
@@ -94,7 +54,7 @@ public int register(User user) throws Exception {
             ps.setBoolean(7, user.getStatus());
 
             ps.executeUpdate();
-            
+
             ResultSet rs = ps.getGeneratedKeys();
             if (rs.next()) {
                 generatedUserId = rs.getInt(1); // Get the generated user_id
@@ -102,9 +62,7 @@ public int register(User user) throws Exception {
         } catch (SQLException e) {
             e.printStackTrace();
         }
-        
         return generatedUserId;
-        
     }
 
     public User getUserByEmail(String email) {
@@ -174,6 +132,7 @@ public static ArrayList<User> getAllUserByName(String name, int current_userId)
                 u.setUser_id(rs.getInt(1));
                 u.setFirst_name(rs.getString(2));
                 u.setLast_name(rs.getString(3));
+                u.setRole(rs.getString("role"));
                 u.setProfile_pic(rs.getString(4));
                 userList.add(u);
             }
@@ -228,6 +187,7 @@ public ArrayList<User> getAllUsers() throws Exception {
                 u.setFirst_name(rs.getString("first_name"));
                 u.setLast_name(rs.getString("last_name"));
                 u.setEmail(rs.getString("email"));
+                u.setRole(rs.getString("role"));
                 u.setProfile_pic(rs.getString("profile_pic"));
                 users.add(u);
             }
@@ -292,8 +252,8 @@ public void changePassword(String password, String email) {
         }
     }
 
-    public List<User> findFriendsByKeyWord(int userId, String keyWord) throws SQLException, Exception {
-        String sql = "SELECT u.user_id, u.profile_pic, u.first_name, u.last_name"
+    public ArrayList<User> findFriendsByKeyWord(int userId, String keyWord) throws SQLException, Exception {
+        String sql = "SELECT u.user_id, u.profile_pic, u.first_name, u.last_name "
                 + "FROM userAccount u "
                 + "WHERE u.user_id != ? AND (u.first_name LIKE ? OR u.last_name LIKE ?)";
 
@@ -304,13 +264,13 @@ public List<User> findFriendsByKeyWord(int userId, String keyWord) throws SQLExc
             ps.setString(3, "%" + keyWord + "%");
 
             ResultSet rs = ps.executeQuery();
-            List<User> users = new ArrayList<>();
+            ArrayList<User> users = new ArrayList<>();
             while (rs.next()) {
                 User user = new User();
                 user.setUser_id(rs.getInt("user_id"));
                 user.setProfile_pic(rs.getString("profile_pic"));
-                user.setFirst_name("first_name");
-                user.setLast_name("last_name");
+                user.setFirst_name(rs.getString("first_name"));
+                user.setLast_name(rs.getString("last_name"));
                 users.add(user);
             }
             return users;
@@ -320,7 +280,7 @@ public List<User> findFriendsByKeyWord(int userId, String keyWord) throws SQLExc
     public List<User> findUsersByConversationId(int conversationId) throws SQLException, Exception {
         String sql = "SELECT u.user_id, u.profile_pic, u.last_name, u.first_name, cu.is_admin "
                 + "FROM userAccount u "
-                + "JOIN conversations_users cu ON u.user_id = cu.user_id "
+                + "JOIN conversation_users cu ON u.user_id = cu.user_id "
                 + "WHERE cu.conversation_id = ?";
 
         try (Connection conn = sqlConnect.getInstance().getConnection(); PreparedStatement ps = conn.prepareStatement(sql)) {
@@ -333,8 +293,8 @@ public List<User> findUsersByConversationId(int conversationId) throws SQLExcept
                 User user = new User();
                 user.setUser_id(rs.getInt("user_id"));
                 user.setProfile_pic(rs.getString("profile_pic"));
-                user.setFirst_name("first_name");
-                user.setLast_name("last_name");
+                user.setFirst_name(rs.getString("first_name"));
+                user.setLast_name(rs.getString("last_name"));
                 user.setAdmin(rs.getBoolean("is_admin"));
                 users.add(user);
             }
@@ -342,39 +302,72 @@ public List<User> findUsersByConversationId(int conversationId) throws SQLExcept
         }
     }
 
-    public List<User> findFriendsNotInConversation(int userId, String keyword, int conversationId) throws SQLException, Exception {
-        String sql = "SELECT u2.user_id, u2.profile_pic, u2.last_name, u2.first_name"
+    public List<User> getFriendsNotInConversation(int userId, String keyword, int conversationId) throws SQLException, Exception {
+        List<User> list = new ArrayList<>();
+        String sql = "SELECT DISTINCT u2.user_id, u2.profile_pic, u2.last_name, u2.first_name "
                 + "FROM userAccount u1 "
-                + "JOIN friendship f ON u1.user_id = f.receiver "
-                + "JOIN userAccount u2 ON u2.user_id = f.sender "
-                + "WHERE u1.user_id = ? AND f.status = 1 AND (u2.first_name LIKE ? OR u2.last_name LIKE ?) "
+                + "LEFT JOIN friendship f ON (u1.user_id = f.receiver OR u1.user_id = f.sender) "
+                + "LEFT JOIN userAccount u2 ON (u2.user_id = f.sender OR u2.user_id = f.receiver) "
+                + "WHERE u1.user_id != u2.user_id "
+                + "AND u1.user_id = ? "
+                + "AND f.status = 'accepted' "
+                + "AND (u2.first_name LIKE ? OR u2.last_name LIKE ?) "
                 + "AND u2.user_id NOT IN ( "
                 + "    SELECT u.user_id FROM userAccount u "
-                + "    JOIN conversations_users cu ON u.user_id = cu.user_id "
+                + "    JOIN conversation_users cu ON u.user_id = cu.user_id "
                 + "    WHERE cu.conversation_id = ? )";
 
         try (Connection conn = sqlConnect.getInstance().getConnection(); PreparedStatement ps = conn.prepareStatement(sql)) {
-
             ps.setInt(1, userId);
             ps.setString(2, "%" + keyword + "%");
             ps.setString(3, "%" + keyword + "%");
             ps.setInt(4, conversationId);
 
             ResultSet rs = ps.executeQuery();
-            List<User> users = new ArrayList<>();
             while (rs.next()) {
                 User user = new User();
                 user.setUser_id(rs.getInt("user_id"));
                 user.setProfile_pic(rs.getString("profile_pic"));
-                user.setFirst_name("first_name");
-                user.setLast_name("last_name");
-                users.add(user);
+                user.setLast_name(rs.getString("last_name"));
+                user.setFirst_name(rs.getString("first_name"));
+                list.add(user);
             }
-            return users;
+        }
+        return list;
+    }
+
+    public void updateUserIntroduction(int userId, String introduction) {
+        String query = "UPDATE userAccount SET user_introduce = ? WHERE user_id = ?";
+        try (Connection conn = sqlConnect.getInstance().getConnection(); PreparedStatement stmt = conn.prepareStatement(query)) {
+            stmt.setString(1, introduction);
+            stmt.setInt(2, userId);
+            stmt.executeUpdate();
+        } catch (SQLException e) {
+            e.printStackTrace();
+        } catch (Exception ex) {
+            ex.printStackTrace();
         }
     }
-    
-    public static void main(String[] args) {
-        userDAO.getInstance().login("nguyenhuuanhtuan123@gmail.com", "123");
+
+    public String getUserIntroduce(int sessionUserId) {
+        String query = "SELECT user_introduce FROM userAccount WHERE user_id = ?";
+        try (Connection conn = sqlConnect.getInstance().getConnection(); PreparedStatement stmt = conn.prepareStatement(query)) {
+            stmt.setInt(1, sessionUserId);
+            try (ResultSet rs = stmt.executeQuery()) {
+                if (rs.next()) {
+                    return rs.getString("user_introduce");
+                }
+            }
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+        return "Xin chao`";
+    }
+
+    public static void main(String[] args) throws Exception {
+        List<User> list = userDAO.getInstance().findUsersByConversationId(1);
+        for (User user : list) {
+            System.out.println(user.getFirst_name());
+        }
     }
 }
diff --git a/src/java/dtos/UserDTO.java b/src/java/dtos/UserDTO.java
index f69281a..d6c05ea 100644
--- a/src/java/dtos/UserDTO.java
+++ b/src/java/dtos/UserDTO.java
@@ -25,7 +25,7 @@ public UserDTO() {
     public UserDTO(@JsonProperty("user_id") int userId,
             @JsonProperty("first_name") String firstName,
             @JsonProperty("last_name") String lastName,
-            @JsonProperty("profile)_pic") String profile_pic,
+            @JsonProperty("profile_pic") String profile_pic,
             @JsonProperty("isAdmin") boolean isAdmin) {
         this.userId = userId;
         this.firstName = firstName;
diff --git a/src/java/model/Comment.java b/src/java/model/Comment.java
index b3c6734..e9b3fdf 100644
--- a/src/java/model/Comment.java
+++ b/src/java/model/Comment.java
@@ -9,6 +9,7 @@
  * @author bim26
  */
 public class Comment {
+
     private int comment_id;
     private int post_id;
     private int user_id;
@@ -16,8 +17,9 @@ public class Comment {
     private String last_name;
     private String comment_text;
     private String profile_pic;
+    private String comment_image;
 
-    public Comment(int comment_id, int post_id, int user_id, String first_name, String last_name, String comment_text, String profile_pic) {
+    public Comment(int comment_id, int post_id, int user_id, String first_name, String last_name, String comment_text, String profile_pic, String comment_image) {
         this.comment_id = comment_id;
         this.post_id = post_id;
         this.user_id = user_id;
@@ -25,9 +27,20 @@ public Comment(int comment_id, int post_id, int user_id, String first_name, Stri
         this.last_name = last_name;
         this.comment_text = comment_text;
         this.profile_pic = profile_pic;
+        this.comment_image = comment_image;
     }
     
     
+    
+    public Comment(int comment_id, int post_id, int user_id, String first_name, String last_name, String comment_text, String profile_pic) {
+        this.comment_id = comment_id;
+        this.post_id = post_id;
+        this.user_id = user_id;
+        this.first_name = first_name;
+        this.last_name = last_name;
+        this.comment_text = comment_text;
+        this.profile_pic = profile_pic;
+    }
 
     public Comment(int comment_id, int post_id, int user_id, String first_name, String last_name, String comment_text) {
         this.comment_id = comment_id;
@@ -41,6 +54,16 @@ public Comment(int comment_id, int post_id, int user_id, String first_name, Stri
     public Comment() {
     }
 
+    public String getComment_image() {
+        return comment_image;
+    }
+
+    public void setComment_image(String comment_image) {
+        this.comment_image = comment_image;
+    }
+    
+    
+
     public String getProfile_pic() {
         return profile_pic;
     }
@@ -48,7 +71,7 @@ public String getProfile_pic() {
     public void setProfile_pic(String profile_pic) {
         this.profile_pic = profile_pic;
     }
-    
+
     public int getComment_id() {
         return comment_id;
     }
@@ -96,6 +119,5 @@ public String getComment_text() {
     public void setComment_text(String comment_text) {
         this.comment_text = comment_text;
     }
-    
-    
+
 }
diff --git a/src/java/model/Conversation.java b/src/java/model/Conversation.java
index 6f5d307..8277e82 100644
--- a/src/java/model/Conversation.java
+++ b/src/java/model/Conversation.java
@@ -15,8 +15,6 @@ public class Conversation {
     private int id;
     private String name;
     private String avatar;
-    private List<User> users;
-
 
     public Conversation() {
     }
diff --git a/src/java/model/LearningMaterial.java b/src/java/model/LearningMaterial.java
index 7c584b1..2d78740 100644
--- a/src/java/model/LearningMaterial.java
+++ b/src/java/model/LearningMaterial.java
@@ -1,5 +1,15 @@
+/*
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
+ */
 package model;
 
+/**
+ *
+ * @author gabri
+ */
+
+
 import java.util.Date;
 
 public class LearningMaterial {
@@ -10,32 +20,37 @@ public class LearningMaterial {
     private int userId;    
     private String learningMaterialName; 
     private String learningMaterialDescription; 
-    private String learningMaterial_img;
     private String learningMaterialContext; 
     private String subjectCode; 
     private Date publishDate; 
     private String review; 
+    private int departmentId;
 
-    public LearningMaterial(int learningMaterialId, int userId, String learningMaterialName, String learningMaterialDescription, String learningMaterial_img, String learningMaterialContext, String subjectCode, Date publishDate, String review) {
+    public LearningMaterial(int learningMaterialId, int userId, String learningMaterialName, String learningMaterialDescription, String learningMaterialContext, String subjectCode, Date publishDate, String review, int departmentId) {
         this.learningMaterialId = learningMaterialId;
         this.userId = userId;
         this.learningMaterialName = learningMaterialName;
         this.learningMaterialDescription = learningMaterialDescription;
-        this.learningMaterial_img = learningMaterial_img;
         this.learningMaterialContext = learningMaterialContext;
         this.subjectCode = subjectCode;
         this.publishDate = publishDate;
         this.review = review;
+        this.departmentId = departmentId;
     }
 
-    public String getLearningMaterial_img() {
-        return learningMaterial_img;
+ 
+
+    // Getters and setters for all fields, including departmentId
+    public int getDepartmentId() {
+        return departmentId;
     }
 
-    public void setLearningMaterial_img(String learningMaterial_img) {
-        this.learningMaterial_img = learningMaterial_img;
+    public void setDepartmentId(int departmentId) {
+        this.departmentId = departmentId;
     }
 
+
+
     public int getLearningMaterialId() {
         return learningMaterialId;
     }
@@ -100,3 +115,4 @@ public void setReview(String review) {
         this.review = review;
     } 
 }
+
diff --git a/src/java/model/Month.java b/src/java/model/Month.java
new file mode 100644
index 0000000..cd8582b
--- /dev/null
+++ b/src/java/model/Month.java
@@ -0,0 +1,44 @@
+/*
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
+ */
+package model;
+
+/**
+ *
+ * @author Quocb
+ */
+public class Month {
+    private String Name;
+    private Integer Count;
+
+    public Month(String Name, Integer Count) {
+        this.Name = Name;
+        this.Count = Count;
+    }
+
+    public Month() {
+    }
+
+    public String getName() {
+        return Name;
+    }
+
+    public void setName(String Name) {
+        this.Name = Name;
+    }
+
+    public Integer getCount() {
+        return Count;
+    }
+
+    public void setCount(Integer Count) {
+        this.Count = Count;
+    }
+
+    @Override
+    public String toString() {
+        return "Month{" + "Name=" + Name + ", Count=" + Count + '}';
+    }
+    
+}
diff --git a/src/java/model/OrderDetailDTO.java b/src/java/model/OrderDetailDTO.java
new file mode 100644
index 0000000..3a14d7c
--- /dev/null
+++ b/src/java/model/OrderDetailDTO.java
@@ -0,0 +1,90 @@
+/*
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
+ */
+package model;
+
+import java.util.Date;
+
+/**
+ *
+ * @author ADMIN
+ */
+public class OrderDetailDTO {
+    private int orderId;
+    private String productName;
+    private int quantity;
+    private double price;
+    private String orderStatus;
+    private Date orderDate;
+    private String sellerName;
+    
+    public OrderDetailDTO(int orderId, String productName, int quantity, double price, 
+            String orderStatus, Date orderDate, String sellerName) {
+        this.orderId = orderId;
+        this.productName = productName;
+        this.quantity = quantity;
+        this.price = price;
+        this.orderStatus = orderStatus;
+        this.orderDate = orderDate;
+        this.sellerName = sellerName;
+    }
+
+    public int getOrderId() {
+        return orderId;
+    }
+
+    public void setOrderId(int orderId) {
+        this.orderId = orderId;
+    }
+
+    public String getProductName() {
+        return productName;
+    }
+
+    public void setProductName(String productName) {
+        this.productName = productName;
+    }
+
+    public int getQuantity() {
+        return quantity;
+    }
+
+    public void setQuantity(int quantity) {
+        this.quantity = quantity;
+    }
+
+    public double getPrice() {
+        return price;
+    }
+
+    public void setPrice(double price) {
+        this.price = price;
+    }
+
+    public String getOrderStatus() {
+        return orderStatus;
+    }
+
+    public void setOrderStatus(String orderStatus) {
+        this.orderStatus = orderStatus;
+    }
+
+    public Date getOrderDate() {
+        return orderDate;
+    }
+
+    public void setOrderDate(Date orderDate) {
+        this.orderDate = orderDate;
+    }
+
+    public String getSellerName() {
+        return sellerName;
+    }
+
+    public void setSellerName(String sellerName) {
+        this.sellerName = sellerName;
+    }
+    
+    
+}
\ No newline at end of file
diff --git a/src/java/model/Orders.java b/src/java/model/Orders.java
index 05c039d..938a85f 100644
--- a/src/java/model/Orders.java
+++ b/src/java/model/Orders.java
@@ -105,6 +105,4 @@ public void setShipping_address(String shipping_address) {
     public String toString() {
         return "Orders{" + "order_id=" + order_id + ", user_id=" + user_id + ", cart_id=" + cart_id + ", total_amount=" + total_amount + ", order_status=" + order_status + ", order_date=" + order_date + ", order_note=" + order_note + ", shipping_address=" + shipping_address + '}';
     }
-
-    
-}
+}
\ No newline at end of file
diff --git a/src/java/model/Post.java b/src/java/model/Post.java
index 30cca9a..0fed4d5 100644
--- a/src/java/model/Post.java
+++ b/src/java/model/Post.java
@@ -28,6 +28,27 @@ public class Post {
     private String originalPosterName;
     private int shareCount;
     private String originalPosterAvatar;
+    private String privacy_mode;
+    private boolean savedByCurrentUser;
+    private String type;
+    
+    public Post(int post_id, int user_id, String body, Timestamp post_time, String first_name, String last_name, String image_path, String profile_pic, int like_count, boolean isShared, int originalPostId, String originalPosterName, int shareCount, String originalPosterAvatar, String privacy_mode) {
+        this.post_id = post_id;
+        this.user_id = user_id;
+        this.body = body;
+        this.post_time = post_time;
+        this.first_name = first_name;
+        this.last_name = last_name;
+        this.image_path = image_path;
+        this.profile_pic = profile_pic;
+        this.like_count = like_count;
+        this.isShared = isShared;
+        this.originalPostId = originalPostId;
+        this.originalPosterName = originalPosterName;
+        this.shareCount = shareCount;
+        this.originalPosterAvatar = originalPosterAvatar;
+        this.privacy_mode = privacy_mode;
+    }
 
     public Post(int post_id, int user_id, String body, Timestamp post_time, String first_name, String last_name, String image_path, String profile_pic, int like_count, boolean isShared, int originalPostId, String originalPosterName, int shareCount, String originalPosterAvatar) {
         this.post_id = post_id;
@@ -47,6 +68,7 @@ public Post(int post_id, int user_id, String body, Timestamp post_time, String f
     }
     
     
+    
 
     public Post(int post_id, int user_id, String body, Timestamp post_time, String first_name, String last_name, String image_path, String profile_pic, int like_count, boolean likedByCurrentUser, List<Comment> comments) {
         this.post_id = post_id;
@@ -76,6 +98,24 @@ public Post(int post_id, int user_id, String body, Timestamp post_time, String f
         this.comments = comments;
     }
 
+    public boolean isSavedByCurrentUser() {
+        return savedByCurrentUser;
+    }
+
+    public void setSavedByCurrentUser(boolean savedByCurrentUser) {
+        this.savedByCurrentUser = savedByCurrentUser;
+    }
+   
+    public String getPrivacy_mode() {
+        return privacy_mode;
+    }
+
+    public void setPrivacy_mode(String privacy_mode) {
+        this.privacy_mode = privacy_mode;
+    }
+    
+    
+
     public List<Comment> getComments() {
         return comments;
     }
@@ -201,6 +241,15 @@ public Post(int post_id, int user_id, String body, Timestamp post_time, String f
         this.profile_pic = profile_pic;
         this.like_count = like_count;
     }
+    
+    
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
 
     
     public String getProfile_pic() {
@@ -253,6 +302,7 @@ public Post(int post_id, int user_id, String body, Timestamp post_time) {
 
     }
     
+    
 
     public Post() {
     }
@@ -294,7 +344,12 @@ public void setPost_time(Timestamp post_time) {
         this.post_time = post_time;
     }
 
+    @Override
+    public String toString() {
+        return "Post{" + "post_id=" + post_id + ", user_id=" + user_id + ", body=" + body + ", post_time=" + post_time + ", first_name=" + first_name + ", last_name=" + last_name + ", image_path=" + image_path + ", profile_pic=" + profile_pic + ", like_count=" + like_count + ", likedByCurrentUser=" + likedByCurrentUser + ", comments=" + comments + ", isShared=" + isShared + ", originalPostId=" + originalPostId + ", originalPosterName=" + originalPosterName + ", shareCount=" + shareCount + ", originalPosterAvatar=" + originalPosterAvatar + ", type=" + type + '}';
+    }
+
     }
 
     
- 
\ No newline at end of file
+ 
diff --git a/src/java/model/User.java b/src/java/model/User.java
index 387a8b9..b1b3685 100644
--- a/src/java/model/User.java
+++ b/src/java/model/User.java
@@ -19,11 +19,30 @@ public class User {
     private String role;
     private boolean is_banned;
     private boolean isAdmin;
-    
+    private String user_introduce;
     
     public User() {
     }
 
+    public User(int user_id, String first_name, String last_name, String password, String email, String profile_pic, String role, boolean is_banned, boolean isAdmin, String user_introduce) {
+        this.user_id = user_id;
+        this.first_name = first_name;
+        this.last_name = last_name;
+        this.password = password;
+        this.email = email;
+        this.profile_pic = profile_pic;
+        this.role = role;
+        this.is_banned = is_banned;
+        this.isAdmin = isAdmin;
+        this.user_introduce = user_introduce;
+    }
+
+    public User(String user_introduce) {
+        this.user_introduce = user_introduce;
+    }
+    
+    
+
     public User(int user_id, String first_name, String last_name, String profile_pic) {
         this.user_id = user_id;
         this.first_name = first_name;
@@ -55,6 +74,12 @@ public User(int user_id, String first_name, String last_name, String password, S
         this.isAdmin = isAdmin;
     }
 
+    public User(int user_id, String user_introduce) {
+        this.user_id = user_id;
+        this.user_introduce = user_introduce;
+    }
+    
+
     public int getUser_id() {
         return user_id;
     }
@@ -134,5 +159,13 @@ public boolean isAdmin() {
     public void setAdmin(boolean isAdmin) {
         this.isAdmin = isAdmin;
     }
+
+    public String getUser_introduce() {
+        return user_introduce;
+    }
+
+    public void setUser_introduce(String user_introduce) {
+        this.user_introduce = user_introduce;
+    }
     
 }
diff --git a/src/java/model/UserActivityLog.java b/src/java/model/UserActivityLog.java
new file mode 100644
index 0000000..cffcf2c
--- /dev/null
+++ b/src/java/model/UserActivityLog.java
@@ -0,0 +1,140 @@
+/*
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
+ */
+package model;
+
+/**
+ *
+ * @author Quocb
+ */
+import java.time.LocalDateTime;
+import java.util.Date;
+
+public class UserActivityLog {
+    private int logId;
+    private int userId;
+    private String role;
+    private String activityType;
+    private String FirstName;
+    private String LastName;
+    private int postId;
+    private int commentId;
+    private String activityDetails;
+    private LocalDateTime timestamp;
+
+    public UserActivityLog(int logId, int userId, String role, String activityType, String FirstName, String LastName, String activityDetails, LocalDateTime timestamp) {
+        this.logId = logId;
+        this.userId = userId;
+        this.role = role;
+        this.activityType = activityType;
+        this.FirstName = FirstName;
+        this.LastName = LastName;
+        this.activityDetails = activityDetails;
+        this.timestamp = timestamp;
+    }
+
+  
+
+    public UserActivityLog(int logId, int userId, String activityType, String activityDetails, LocalDateTime timestamp) {
+        this.logId = logId;
+        this.userId = userId;
+        this.activityType = activityType;
+        this.activityDetails = activityDetails;
+        this.timestamp = timestamp;
+    }
+
+    public int getPostId() {
+        return postId;
+    }
+
+    public void setPostId(int postId) {
+        this.postId = postId;
+    }
+
+    public int getCommentId() {
+        return commentId;
+    }
+
+    public void setCommentId(int commentId) {
+        this.commentId = commentId;
+    }
+    
+
+    public String getRole() {
+        return role;
+    }
+
+    public void setRole(String role) {
+        this.role = role;
+    }
+    public String getFirstName() {
+        return FirstName;
+    }
+
+    public void setFirstName(String FirstName) {
+        this.FirstName = FirstName;
+    }
+
+    public String getLastName() {
+        return LastName;
+    }
+
+    public void setLastName(String LastName) {
+        this.LastName = LastName;
+    }
+
+    
+
+    public UserActivityLog() {
+    }
+
+    
+    public int getLogId() {
+        return logId;
+    }
+
+    public void setLogId(int logId) {
+        this.logId = logId;
+    }
+
+    public int getUserId() {
+        return userId;
+    }
+
+    public void setUserId(int userId) {
+        this.userId = userId;
+    }
+
+    public String getActivityType() {
+        return activityType;
+    }
+
+    public void setActivityType(String activityType) {
+        this.activityType = activityType;
+    }
+
+    public String getActivityDetails() {
+        return activityDetails;
+    }
+
+    public void setActivityDetails(String activityDetails) {
+        this.activityDetails = activityDetails;
+    }
+
+    public LocalDateTime getTimestamp() {
+        return timestamp;
+    }
+
+    public void setTimestamp(LocalDateTime timestamp) {
+        this.timestamp = timestamp;
+    }
+
+    @Override
+    public String toString() {
+        return "UserActivityLog{" + "logId=" + logId + ", userId=" + userId + ", role=" + role + ", activityType=" + activityType + ", FirstName=" + FirstName + ", LastName=" + LastName + ", postId=" + postId + ", commentId=" + commentId + ", activityDetails=" + activityDetails + ", timestamp=" + timestamp + '}';
+    }
+
+ 
+
+}
diff --git a/src/java/model/game.java b/src/java/model/game.java
new file mode 100644
index 0000000..53b014d
--- /dev/null
+++ b/src/java/model/game.java
@@ -0,0 +1,74 @@
+/*
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
+ */
+package model;
+
+/**
+ *
+ * @author Quocb
+ */
+public class game {
+    private int Magame;
+    private String tengame;
+    private String link;
+    private String linkimg;
+    private String  theloai;
+
+    public game(int Magame, String tengame, String link, String linkimg, String theloai) {
+        this.Magame = Magame;
+        this.tengame = tengame;
+        this.link = link;
+        this.linkimg = linkimg;
+        this.theloai = theloai;
+    }
+
+    public String getLinkimg() {
+        return linkimg;
+    }
+
+    public void setLinkimg(String linkimg) {
+        this.linkimg = linkimg;
+    }
+
+   
+
+    public int getMagame() {
+        return Magame;
+    }
+
+    public void setMagame(int Magame) {
+        this.Magame = Magame;
+    }
+
+    public String getTengame() {
+        return tengame;
+    }
+
+    public void setTengame(String tengame) {
+        this.tengame = tengame;
+    }
+
+    public String getLink() {
+        return link;
+    }
+
+    public void setLink(String link) {
+        this.link = link;
+    }
+
+    public String getTheloai() {
+        return theloai;
+    }
+
+    public void setTheloai(String theloai) {
+        this.theloai = theloai;
+    }
+
+    @Override
+    public String toString() {
+        return "game{" + "Magame=" + Magame + ", tengame=" + tengame + ", link=" + link + ", linkimg=" + linkimg + ", theloai=" + theloai + '}';
+    }
+
+     
+}
diff --git a/src/java/services/ChatService.java b/src/java/services/ChatService.java
index 8d991ed..4220fe9 100644
--- a/src/java/services/ChatService.java
+++ b/src/java/services/ChatService.java
@@ -1,9 +1,10 @@
 package services;
 
+import com.cloudinary.utils.ObjectUtils;
 import dao.userDAO;
+import dtos.FileDTO;
 import jakarta.websocket.EncodeException;
 import java.io.IOException;
-import java.util.Set;
 import java.util.HashSet;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArraySet;
@@ -11,9 +12,17 @@
 import websockets.ChatWebsocket;
 import model.User;
 import dtos.MessageDTO;
+import java.io.File;
+import java.nio.ByteBuffer;
+import java.util.Map;
+import java.util.Queue;
+import java.util.Set;
+import java.util.logging.Logger;
+import util.CloudinaryAPI;
 
 public class ChatService {
 
+    private static final Logger LOGGER = Logger.getLogger(ChatService.class.getName());
     private userDAO userDao = userDAO.getInstance();
     private static ChatService chatService = null;
     protected static final Set<ChatWebsocket> chatWebsockets = new CopyOnWriteArraySet<>();
@@ -56,40 +65,45 @@ public void sendMessageToAllUsers(MessageDTO message) {
         });
     }
 
-    public void sendMessageToOneUser(MessageDTO message) throws Exception {
-        if (message.getReceiver() != 0) {
-            // Send message to a single user
-            chatWebsockets.stream()
-                    .filter(chatWebsocket -> chatWebsocket.getUserId() == message.getReceiver())
-                    .forEach(chatWebsocket -> {
-                        try {
-                            chatWebsocket.getSession().getBasicRemote().sendObject(message);
-                        } catch (IOException | EncodeException e) {
-                            e.printStackTrace();
-                        }
-                    });
-        } else {
-            // Send message to a group of users
-            List<User> usersGroup = userDao.findUsersByConversationId(message.getGroupId());
-
-            // Collect all user IDs in the group
-            List<Integer> userIdGroup = usersGroup.stream()
-                    .map(User::getUser_id)
-                    .collect(Collectors.toList());
-
-            // Send the message to all users in the group, excluding the sender
-            chatWebsockets.stream()
-                    .filter(chatWebsocket -> userIdGroup.contains(chatWebsocket.getUserId())
-                    && chatWebsocket.getUserId() != message.getSender()) // Filter out the sender
-                    .forEach(chatWebsocket -> {
-                        try {
-                            chatWebsocket.getSession().getBasicRemote().sendObject(message);
-                        } catch (IOException | EncodeException e) {
-                            System.err.println("Error sending message to user: " + chatWebsocket.getUserId());
-                            e.printStackTrace();
-                        }
-                    });
+    public void sendMessageToOneUser(MessageDTO message, Queue<FileDTO> fileDTOs) throws Exception {
+        // Send message to a single user
+        if (!message.getType().equals("text")) {
+            String url = message.getMessage();
+            String typeFile = message.getType();
+            if (typeFile.startsWith("audio")) {
+                message.setMessage("<audio controls>\r\n" + "  <source src=\"" + url + "\" type=\""
+                        + typeFile + "\">\r\n" + "</audio>");
+            } else if (typeFile.startsWith("video")) {
+                message.setMessage("<video width=\"400\" controls>\r\n" + "  <source src=\"" + url
+                        + "\" type=\"" + typeFile + "\">\r\n" + "</video>");
+            } else if (typeFile.startsWith("image")) {
+                message.setMessage("<img src=\"" + url + "\" alt=\"\">");
+            }
         }
+        chatWebsockets.stream()
+                .filter(chatWebsocket -> chatWebsocket.getUserId() == message.getReceiver())
+                .forEach(chatWebsocket -> {
+                    try {
+                        chatWebsocket.getSession().getBasicRemote().sendObject(message);
+                    } catch (IOException | EncodeException e) {
+                        e.printStackTrace();
+                    }
+                });
+    }
+
+    public void sendMessageToGroup(MessageDTO message, Queue<FileDTO> fileDTOs) throws Exception {
+        List<User> usersGroup = userDao.findUsersByConversationId(message.getGroupId());
+        Set<Integer> userIdGroup = usersGroup.stream().map(User::getUser_id).collect(Collectors.toSet());
+        chatWebsockets.stream()
+                .filter(chatWebsocket -> userIdGroup.contains(chatWebsocket.getUserId())
+                && chatWebsocket.getUserId() != message.getSender())
+                .forEach(chatWebsocket -> {
+                    try {
+                        chatWebsocket.getSession().getBasicRemote().sendObject(message);
+                    } catch (IOException | EncodeException e) {
+                        e.printStackTrace();
+                    }
+                });
     }
 
     protected Set<Integer> getIdList() {
diff --git a/src/java/services/ConversationService.java b/src/java/services/ConversationService.java
index 67adfe8..b1ff360 100644
--- a/src/java/services/ConversationService.java
+++ b/src/java/services/ConversationService.java
@@ -20,6 +20,7 @@
 import dtos.ConversationDTO;
 import dtos.MessageDTO;
 import dtos.UserDTO;
+import java.util.ArrayList;
 
 /**
  *
@@ -27,148 +28,161 @@
  */
 public class ConversationService {
 
-        private ConversationDAO conversationDAO = ConversationDAO.getInstance();
-    
-	private userDAO userDaoInterface = userDAO.getInstance();
-
-	private MessageDao messageDaoInterface = MessageDao.getInstance();
-
-	private static ConversationService instance = null;
-
-	private ConversationService() {
-
-	}
-
-	public synchronized static ConversationService getInstance() {
-		if (instance == null) {
-			instance = new ConversationService();
-		}
-		return instance;
-	}
-
-	private User convertToUserEntity(UserDTO userDTO) {
-		User user = new User();
-		user.setUser_id(userDTO.getUserId());
-		user.setAdmin(userDTO.isIsAdmin());
-		return user;
-	}
-
-	private UserDTO convertToUserDTO(User user) {
-		UserDTO userDTO = new UserDTO();
-		user.setUser_id(userDTO.getUserId());
-		userDTO.setProfile_pic(user.getProfile_pic());
-		user.setAdmin(userDTO.isIsAdmin());
-		return userDTO;
-	}
-
-	private ConversationDTO convertToConversationDTO(Conversation conversation) {
-		ConversationDTO conversationDTO = new ConversationDTO();
-		conversationDTO.setId(conversation.getId());
-		conversationDTO.setName(conversation.getName());
-		conversationDTO.setAvatar(conversation.getAvatar().trim());
-		return conversationDTO;
-	}
-
-	private Conversation convertToConversation(ConversationDTO conversationDTO) {
-		Conversation conversation = new Conversation();
-		conversation.setId(conversationDTO.getId());
-		conversation.setName(conversationDTO.getName());
-		if (conversationDTO.getAvatar() != null && !conversationDTO.getAvatar().isEmpty()) {
-			conversation.setAvatar(conversationDTO.getAvatar().trim());
-		}
-		return conversation;
-	}
-
-	private MessageDTO convertToMessageDTO(Message messageEntity) {
-		int user_id = messageEntity.getSender();
-		String type = messageEntity.getType();
-		String message = messageEntity.getMessage();
-		if (!type.equals("text")) {
-			message = FileService.toTagHtml(type, user_id, message);
-		}
-		int receiver = messageEntity.getReceiver();
-		int groupId = messageEntity.getGroupId();
-		MessageDTO messageDTO = new MessageDTO(user_id, receiver, message, type, groupId);
-		return messageDTO;
-	}
-
-	public void saveConversation(ConversationDTO conversationDTO) throws Exception {
-		Conversation conversation = convertToConversation(conversationDTO);
-		List<User> users = conversationDTO.getUsers().stream().map(userDTO -> convertToUserEntity(userDTO))
-				.collect(Collectors.toList());
-		conversationDAO.saveConversation(conversation, users);
-		conversationDTO.setId(conversation.getId());
-
-		String dirName = "group-" + conversationDTO.getId();
-		File privateDir = new File(FileService.rootLocation.toString() + "/" + dirName);
-		privateDir.mkdir();
-		String fileName = dirName + ".png";
-		File newFile = new File(privateDir.toString() + "/" + fileName);
-		try {
-			File defaultAvatar = new File(FileService.rootLocation.toString() + "/default/group.png");
-			Files.copy(defaultAvatar.toPath(), newFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
-			conversation.setAvatar(fileName);
-			conversationDAO.saveConversation(conversation, null);
-			conversationDTO.setAvatar(fileName);
-		} catch (IOException ex) {
-		}
-	}
-
-	public List<ConversationDTO> getAllConversationsById(int user_id) throws Exception {
-		List<Conversation> conversations = conversationDAO.findAllConversationsByUserId(user_id);
-		List<ConversationDTO> conversationDTOs = conversations.stream()
-				.map(conversation -> convertToConversationDTO(conversation)).collect(Collectors.toList());
-		return conversationDTOs;
-	}
-
-	public List<UserDTO> getAllUsersByConversationId(int id) throws Exception {
-		List<UserDTO> userDTOs = userDaoInterface.findUsersByConversationId(id).stream()
-				.map(user -> convertToUserDTO(user)).collect(Collectors.toList());
-		return userDTOs;
-	}
-
-	public List<MessageDTO> getAllMessagesByConversationId(int id) throws Exception {
-		List<MessageDTO> messageDTOs = messageDaoInterface.findAllMessagesByConversationId(id).stream()
-				.map(message -> convertToMessageDTO(message)).collect(Collectors.toList());
-		return messageDTOs;
-	}
-
-	public void updateConversationById(int id, String name, Part avatar) throws Exception {
-		try {
-			String fileName = "";
-			String origin = avatar.getSubmittedFileName();
-			if (!origin.isEmpty()) {
-				String dirName = "group-" + id;
-				File privateDir = new File(FileService.rootLocation.toString() + "/" + dirName);
-				String tail = origin.substring(origin.lastIndexOf("."), origin.length());
-				fileName = dirName + tail;
-				System.err.println("file: " + fileName);
-				avatar.write(privateDir.getAbsolutePath() + File.separator + fileName);
-			}
-			Conversation conversation = new Conversation(id, name, fileName);
-			conversationDAO.saveConversation(conversation, null);
-		} catch (IOException ex) {
-		}
-	}
-
-	public ConversationDTO getConversationById(int id) throws Exception {
-		Conversation conversation = conversationDAO.findConversationById(id);
-		return convertToConversationDTO(conversation);
-	}
-
-	public void deleteConversationById(int id) throws Exception {
-		conversationDAO.deleteConversationById(id);
-
-	}
-
-	public void deleteUserFromConversation(int conversationId, int user_id) throws Exception {
-		conversationDAO.deleteUserFromConversation(conversationId, user_id);
-	}
-
-	public List<ConversationDTO> getConversationsOfUserByKeyword(int user_id, String keyword) throws Exception {
-		List<ConversationDTO> conversationDTOs = conversationDAO
-				.findConversationsOfUserByKeyword(user_id, keyword).stream()
-				.map(conversation -> convertToConversationDTO(conversation)).collect(Collectors.toList());
-		return conversationDTOs;
-	}
-}
\ No newline at end of file
+    private ConversationDAO conversationDAO = ConversationDAO.getInstance();
+
+    private userDAO userDaoInterface = userDAO.getInstance();
+
+    private MessageDao messageDaoInterface = MessageDao.getInstance();
+
+    private static ConversationService instance = null;
+
+    private ConversationService() {
+
+    }
+
+    public synchronized static ConversationService getInstance() {
+        if (instance == null) {
+            instance = new ConversationService();
+        }
+        return instance;
+    }
+
+    private User convertToUserEntity(UserDTO userDTO) {
+        User user = new User();
+        user.setUser_id(userDTO.getUserId());
+        user.setAdmin(userDTO.isIsAdmin());
+        return user;
+    }
+
+    //Sau này thêm set first last name để hiển thị trong group
+    private UserDTO convertToUserDTO(User user) {
+        UserDTO userDTO = new UserDTO();
+        userDTO.setFirstName(user.getFirst_name());
+        userDTO.setLastName(user.getLast_name());
+        userDTO.setUserId(user.getUser_id());
+        userDTO.setProfile_pic(user.getProfile_pic());
+        userDTO.setIsAdmin(user.isAdmin());
+        return userDTO;
+    }
+
+    private ConversationDTO convertToConversationDTO(Conversation conversation) {
+        ConversationDTO conversationDTO = new ConversationDTO();
+        conversationDTO.setId(conversation.getId());
+        conversationDTO.setName(conversation.getName());
+        conversationDTO.setAvatar(conversation.getAvatar().trim());
+        return conversationDTO;
+    }
+
+    private Conversation convertToConversation(ConversationDTO conversationDTO) {
+        Conversation conversation = new Conversation();
+        conversation.setId(conversationDTO.getId());
+        conversation.setName(conversationDTO.getName());
+        if (conversationDTO.getAvatar() != null && !conversationDTO.getAvatar().isEmpty()) {
+            conversation.setAvatar(conversationDTO.getAvatar().trim());
+        }
+        return conversation;
+    }
+
+    private MessageDTO convertToMessageDTO(Message messageEntity) {
+        int user_id = messageEntity.getSender();
+        String type = messageEntity.getType();
+        String message = messageEntity.getMessage();
+        if (!type.equals("text")) {
+            message = FileService.toTagHtml(type, user_id, message);
+        }
+        int receiver = messageEntity.getReceiver();
+        int groupId = messageEntity.getGroupId();
+        MessageDTO messageDTO = new MessageDTO(user_id, receiver, message, type, groupId);
+        return messageDTO;
+    }
+
+    public void saveConversation(ConversationDTO conversationDTO) throws Exception {
+        Conversation conversation = convertToConversation(conversationDTO);
+        List<User> users = conversationDTO.getUsers().stream().map(userDTO -> convertToUserEntity(userDTO))
+                .collect(Collectors.toList());
+        conversationDAO.saveConversation(conversation, users);
+        conversationDTO.setId(conversation.getId());
+
+//		String dirName = "group-" + conversationDTO.getId();
+//		File privateDir = new File(FileService.rootLocation.toString() + "/" + dirName);
+//		privateDir.mkdir();
+//		String fileName = dirName + ".png";
+//		File newFile = new File(privateDir.toString() + "/" + fileName);
+//		try {
+//			File defaultAvatar = new File(FileService.rootLocation.toString() + "/default/group.png");
+//			Files.copy(defaultAvatar.toPath(), newFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
+//			conversation.setAvatar(fileName);
+//			conversationDAO.saveConversation(conversation, null);
+//			conversationDTO.setAvatar(fileName);
+//		} catch (IOException ex) {
+//		}
+    }
+
+    public List<ConversationDTO> getAllConversationsById(int user_id) throws Exception {
+        List<Conversation> conversations = conversationDAO.findAllConversationsByUserId(user_id);
+        List<ConversationDTO> conversationDTOs = conversations.stream()
+                .map(conversation -> convertToConversationDTO(conversation)).collect(Collectors.toList());
+        return conversationDTOs;
+    }
+
+    public List<UserDTO> getAllUsersByConversationId(int id) throws Exception {
+        List<UserDTO> userDTOs = userDaoInterface.findUsersByConversationId(id).stream()
+                .map(user -> convertToUserDTO(user)).collect(Collectors.toList());
+        return userDTOs;
+    }
+
+    public List<MessageDTO> getAllMessagesByConversationId(int id) throws Exception {
+        List<MessageDTO> messageDTOs = messageDaoInterface.findAllMessagesByConversationId(id).stream()
+                .map(message -> convertToMessageDTO(message)).collect(Collectors.toList());
+        return messageDTOs;
+    }
+
+    public void updateConversationById(int id, String name, String avatar) throws Exception {
+        try {
+            Conversation conversation = new Conversation(id, name, avatar);
+            conversationDAO.updateConversation(conversation);
+        } catch (IOException ex) {
+        }
+    }
+
+    public ConversationDTO getConversationById(int id) throws Exception {
+        Conversation conversation = conversationDAO.findConversationById(id);
+        return convertToConversationDTO(conversation);
+    }
+
+    public void deleteConversationById(int id) throws Exception {
+        conversationDAO.deleteConversationById(id);
+
+    }
+
+    public void deleteUserFromConversation(int conversationId, int user_id) throws Exception {
+        conversationDAO.deleteUserFromConversation(conversationId, user_id);
+    }
+
+    public List<ConversationDTO> getConversationsOfUserByKeyword(int user_id, String keyword) throws Exception {
+        List<ConversationDTO> conversationDTOs = conversationDAO
+                .findConversationsOfUserByKeyword(user_id, keyword).stream()
+                .map(conversation -> convertToConversationDTO(conversation)).collect(Collectors.toList());
+        return conversationDTOs;
+    }
+
+    public static void main(String[] args) throws Exception {
+//            UserDTO user = new UserDTO();   
+//            user.setIsAdmin(true);
+//            user.setUserId(2);
+//            List<UserDTO> list = new ArrayList<>();
+//            list.add(user);
+//            ConversationDTO conversationDTO = new ConversationDTO(0, "abc", "abc", list);
+//            ConversationService.getInstance().saveConversation(conversationDTO);
+
+//              List<ConversationDTO> c = ConversationService.getInstance().getAllConversationsById(2);
+//              for (ConversationDTO ca : c) {
+//                  System.out.println(ca.getId());
+//              }
+//                List<UserDTO> user = ConversationService.getInstance().getAllUsersByConversationId(4);
+//                System.out.println(user.size());
+//                System.out.println(user.get(0).getUserId());
+        List<UserDTO> message = ConversationService.getInstance().getAllUsersByConversationId(1);
+        System.out.println(message.get(0).getFirstName());
+    }
+}
diff --git a/src/java/services/FileService.java b/src/java/services/FileService.java
index 73c656c..9998fd4 100644
--- a/src/java/services/FileService.java
+++ b/src/java/services/FileService.java
@@ -34,19 +34,18 @@ public static FileService getInstance() {
     // Generate HTML tag based on file type
     public static String toTagHtml(String type, int user_id, String message) {
         String tag = "";
-        String url = rootURL + user_id + "/" + message;
         if (type.startsWith("audio")) {
             tag = "<audio controls>\r\n" + 
-                  "  <source src=\"" + url + "\" type=\"" + type + "\">\r\n" + 
+                  "  <source src=\"" + message + "\" type=\"" + type + "\">\r\n" + 
                   "</audio>";
         } else if (type.startsWith("video")) {
             tag = "<video width=\"400\" controls>\r\n" + 
-                  "  <source src=\"" + url + "\" type=\"" + type + "\">\r\n" + 
+                  "  <source src=\"" + message + "\" type=\"" + type + "\">\r\n" + 
                   "</video>";
         } else if (type.startsWith("image")) {
-            tag = "<img src=\"" + url + "\" alt=\"\">";
+            tag = "<img src=\"" + message + "\" alt=\"\">";
         } else {
-            tag = "<a href=\"" + url + "\">" + message + "</a>";
+            tag = "<a href=\"" + message + "\">" + message + "</a>";
         }
         return tag;
     }
diff --git a/src/java/services/MessageService.java b/src/java/services/MessageService.java
index bbfcbd2..6fbd683 100644
--- a/src/java/services/MessageService.java
+++ b/src/java/services/MessageService.java
@@ -4,13 +4,24 @@
  */
 package services;
 
+import com.cloudinary.Cloudinary;
+import com.cloudinary.utils.ObjectUtils;
+import controller.postServlet;
 import dao.MessageDao;
 import java.util.ArrayList;
 import java.util.List;
 import model.Message;
 import dtos.MessageDTO;
+import jakarta.servlet.ServletException;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Map;
+import java.util.Properties;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import util.CloudinaryAPI;
 
 /**
  *
@@ -20,60 +31,61 @@ public class MessageService {
 
     private static MessageService instance = null;
 
-	private MessageDao messageDAO = MessageDao.getInstance();
+    private MessageDao messageDAO = MessageDao.getInstance();
 
-	public static MessageService getInstance() {
-		if (instance == null) {
-			instance = new MessageService();
-		}
-		return instance;
-	}
-        
-     private Message convertToEntity(MessageDTO messageDTO) {
-		int user_id = messageDTO.getSender();
-		String message = messageDTO.getMessage();
-		String type = messageDTO.getType();
-		int receiver = messageDTO.getReceiver();
-		int groupId = messageDTO.getGroupId();
-		Message messageEntity = new Message(user_id, receiver, message, type, groupId);
-		return messageEntity;
-	}
+    private Cloudinary cloud;
 
-	private MessageDTO convertToDTO(Message messageEntity) {
-		int user_id = messageEntity.getSender();
-		String type = messageEntity.getType();
-		String message = messageEntity.getMessage();
-		if (!type.equals("text")) {
-			message = FileService.toTagHtml(type, user_id, message);
-		}
-		int receiver = messageEntity.getReceiver();
-		int groupId = messageEntity.getGroupId();
-		MessageDTO messageDTO = new MessageDTO(user_id, receiver, message, type, groupId);
-		return messageDTO;
-	}
+    public static MessageService getInstance() {
+        if (instance == null) {
+            instance = new MessageService();
+        }
+        return instance;
+    }
+
+    private Message convertToEntity(MessageDTO messageDTO) {
+        int user_id = messageDTO.getSender();
+        String message = messageDTO.getMessage();
+        String type = messageDTO.getType();
+        int receiver = messageDTO.getReceiver();
+        int groupId = messageDTO.getGroupId();
+        Message messageEntity = new Message(user_id, receiver, message, type, groupId);
+        return messageEntity;
+    }
+
+    private MessageDTO convertToDTO(Message messageEntity) {
+        int user_id = messageEntity.getSender();
+        String type = messageEntity.getType();
+        String message = messageEntity.getMessage();
+        if (!type.equals("text")) {
+            message = FileService.toTagHtml(type, user_id, message);
+        }
+        int receiver = messageEntity.getReceiver();
+        int groupId = messageEntity.getGroupId();
+        MessageDTO messageDTO = new MessageDTO(user_id, receiver, message, type, groupId);
+        return messageDTO;
+    }
 
-	public List<MessageDTO> getAllMessagesBySenderAndReceiver(int sender, int receiver) throws Exception {
-		List<Message> listMessages = messageDAO.findAllMessagesBySenderAndReceiver(sender, receiver);
-		List<MessageDTO> listMessageDTOs = new ArrayList<>();
-		listMessages.stream().forEach(msg -> {
-			MessageDTO messageDTO = convertToDTO(msg);
-			listMessageDTOs.add(messageDTO);
-		});
-		return listMessageDTOs;
-	}
+    public List<MessageDTO> getAllMessagesBySenderAndReceiver(int sender, int receiver) throws Exception {
+        List<Message> listMessages = messageDAO.findAllMessagesBySenderAndReceiver(sender, receiver);
+        List<MessageDTO> listMessageDTOs = new ArrayList<>();
+        listMessages.stream().forEach(msg -> {
+            MessageDTO messageDTO = convertToDTO(msg);
+            listMessageDTOs.add(messageDTO);
+        });
+        return listMessageDTOs;
+    }
 
-	public void saveMessage(MessageDTO messageDTO) {
+    public void saveMessage(MessageDTO messageDTO) {
         try {
             Message messageEntity = convertToEntity(messageDTO);
             messageDAO.saveMessage(messageEntity);
         } catch (Exception ex) {
             System.out.println("Err here");
         }
-	}
-        
-        public static void main(String[] args) {
-        MessageDTO msg = new MessageDTO(1, 2, "ok", "text", 0);
-        MessageService service = new MessageService();
-        service.saveMessage(msg);
+    }
+
+    public static void main(String[] args) throws Exception {
+        List<MessageDTO> list = MessageService.getInstance().getAllMessagesBySenderAndReceiver(1, 2);
+        System.out.println(list.get(list.size()-1).getMessage());
     }
 }
diff --git a/src/java/util/CloudinaryAPI.java b/src/java/util/CloudinaryAPI.java
new file mode 100644
index 0000000..e4e6358
--- /dev/null
+++ b/src/java/util/CloudinaryAPI.java
@@ -0,0 +1,43 @@
+/*
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Other/File.java to edit this template
+ */
+package util;
+
+import com.cloudinary.Cloudinary;
+import com.cloudinary.utils.ObjectUtils;
+
+/**
+ *
+ * @author HELLO
+ */
+public class CloudinaryAPI {
+
+    private static Cloudinary cloud;
+    private static final Object lock = new Object();  // To ensure thread-safety
+
+    private CloudinaryAPI() {
+        // Private constructor to prevent instantiation
+    }
+
+    public static Cloudinary getInstance() {
+        if (cloud == null) {
+            synchronized (lock) {
+                if (cloud == null) {
+                    // Load Cloudinary config from properties file
+                    String cloudName = "dxx8u5qnr";
+                    String apiKey = "694793228885481";
+                    String apiSecret = "ydUuGLOQjJ2UTdMaiJes0zggIpw";
+
+                    cloud = new Cloudinary(ObjectUtils.asMap(
+                            "cloud_name", cloudName,
+                            "api_key", apiKey,
+                            "api_secret", apiSecret
+                    ));
+
+                }
+            }
+        }
+        return cloud;
+    }
+}
diff --git a/src/java/util/sqlConnect.java b/src/java/util/sqlConnect.java
index bc18a23..9b4713d 100644
--- a/src/java/util/sqlConnect.java
+++ b/src/java/util/sqlConnect.java
@@ -22,9 +22,9 @@ public class sqlConnect {
     private String port = "1433";
     private String ip = "127.0.0.1";
     private String dbName = "FUNET";
-    private String deviceName = "MSI";
+    private String deviceName = "WINDOWS-10";
     private String driverClass = "com.microsoft.sqlserver.jdbc.SQLServerDriver";
-    private String sqlUrl = "jdbc:sqlserver://MSI;databaseName=FUNET;encrypt=false;trustServerCertificate=false";
+    private String sqlUrl = "jdbc:sqlserver://" + deviceName + ";databaseName=FUNET;encrypt=false;trustServerCertificate=false";
 
     private sqlConnect() throws Exception {
         try {
@@ -47,4 +47,4 @@ public static sqlConnect getInstance() throws SQLException, Exception {
     public Connection getConnection() {
         return connection;
     }
-}
+}
\ No newline at end of file
diff --git a/src/java/websockets/ChatWebsocket.java b/src/java/websockets/ChatWebsocket.java
index 041074d..ca447b9 100644
--- a/src/java/websockets/ChatWebsocket.java
+++ b/src/java/websockets/ChatWebsocket.java
@@ -1,23 +1,32 @@
 package websockets;
 
-import dao.MessageDao;
+import com.cloudinary.utils.ObjectUtils;
+import dtos.FileDTO;
 import jakarta.websocket.OnClose;
 import jakarta.websocket.OnMessage;
 import jakarta.websocket.OnOpen;
 import jakarta.websocket.Session;
 import jakarta.websocket.server.PathParam;
 import jakarta.websocket.server.ServerEndpoint;
-import model.Message;
 import services.ChatService;
 import jakarta.websocket.DecodeException;
 import dtos.MessageDTO;
+import java.io.File;
+import java.nio.ByteBuffer;
+import java.util.LinkedList;
+import java.util.Map;
+import java.util.Queue;
 import services.MessageService;
+import java.util.logging.Logger;
+import util.CloudinaryAPI;
 
 @ServerEndpoint(value = "/chat/{user_id}", encoders = MessageEncoder.class, decoders = MessageDecoder.class)
 public class ChatWebsocket {
 
+    private static final Logger LOGGER = Logger.getLogger(ChatWebsocket.class.getName());
     private Session session;
     private int user_id;
+    private Queue<FileDTO> fileDTOs = new LinkedList<>();
 
     ChatService chatService = ChatService.getInstance();
     MessageService messageService = MessageService.getInstance();
@@ -33,7 +42,12 @@ public void onOpen(@PathParam("user_id") int user_id, Session session) {
 
     @OnMessage
     public void onMessage(MessageDTO message, Session session) throws DecodeException, Exception {
-        chatService.sendMessageToOneUser(message);
+        if (message.getReceiver() != 0) {
+            chatService.sendMessageToOneUser(message, fileDTOs);
+        } else {
+            message.setReceiver(0);
+            chatService.sendMessageToGroup(message, fileDTOs);
+        }
         messageService.saveMessage(message);
     }
 
diff --git a/web/WEB-INF/DashBoard.jsp b/web/WEB-INF/DashBoard.jsp
new file mode 100644
index 0000000..af9c9a4
--- /dev/null
+++ b/web/WEB-INF/DashBoard.jsp
@@ -0,0 +1,184 @@
+<%-- 
+    Document   : DashBoard
+    Created on : 5 thg 10, 2024, 23:15:47
+    Author     : Quocb
+--%>
+
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ page import="java.util.List, model.Post, dao.postDAO, model.User" %>
+<%@ page import="model.UserActivityLog" %>
+<%@ taglib prefix="c" uri="jakarta.tags.core"%>
+<%@ taglib prefix="fmt" uri="jakarta.tags.fmt"%>
+<!DOCTYPE html>
+<html lang="en">
+    <head>
+        <meta charset="UTF-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+        <title>Admin Dashboard</title>
+        <link href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.3.0/css/bootstrap.min.css" rel="stylesheet">
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.3.0/js/bootstrap.bundle.min.js"></script>
+        <style>
+            .sidebar {
+                height: 100vh;
+                background-color: #f8f9fa;
+            }
+            .main-content {
+                padding: 20px;
+            }
+            .nav-button {
+                width: 100%;
+                text-align: left;
+                padding: 10px 15px;
+                margin-bottom: 5px;
+                background-color: transparent;
+                border: none;
+                cursor: pointer;
+                transition: background-color 0.3s;
+            }
+            .nav-button:hover, .nav-button.active {
+                background-color: #007bff;
+                color: white;
+            }
+            .nav-button svg {
+                margin-right: 10px;
+            }
+            .page {
+                display: none;
+                opacity: 0;
+                transition: opacity 0.5s ease-in-out;
+            }
+            .page.active {
+                display: block;
+                opacity: 1;
+            }
+        </style>
+    </head>
+    <body>
+        <div class="container-fluid">
+            <div class="row">
+                <!-- Sidebar -->
+                <nav class="col-md-3 col-lg-2 d-md-block sidebar collapse">
+                    <div class="position-sticky pt-3">
+                        <div class="nav flex-column">
+                            <button class="nav-button active" data-page="dashboard">
+                                <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-home"><path d="M3 9l9-7 9 7v11a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2z"></path><polyline points="9 22 9 12 15 12 15 22"></polyline></svg>
+                                Dashboard
+                            </button>
+                            <button class="nav-button" data-page="users">
+                                <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-users"><path d="M17 21v-2a4 4 0 0 0-4-4H5a4 4 0 0 0-4 4v2"></path><circle cx="9" cy="7" r="4"></circle><path d="M23 21v-2a4 4 0 0 0-3-3.87"></path><path d="M16 3.13a4 4 0 0 1 0 7.75"></path></svg>
+                                Users
+                            </button>
+                            <button class="nav-button" data-page="analytics">
+                                <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-bar-chart-2"><line x1="18" y1="20" x2="18" y2="10"></line><line x1="12" y1="20" x2="12" y2="4"></line><line x1="6" y1="20" x2="6" y2="14"></line></svg>
+                                Analytics
+                            </button>
+                        </div>
+                    </div>
+                </nav>
+
+                <!-- Main content -->
+                <main class="col-md-9 ms-sm-auto col-lg-10 px-md-4 main-content">
+                    <!-- Dashboard Page -->
+                    <div id="dashboard-page" class="page active">
+                        <h1 class="mt-4">Dashboard</h1>
+                        <div class="row mt-4">
+                            <div class="col-md-4">
+                                <div class="card">
+                                    <div class="card-body">
+                                        <h5 class="card-title">Total Users</h5>
+                                        <p class="card-text display-4">10,234</p>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="col-md-4">
+                                <div class="card">
+                                    <div class="card-body">
+                                        <h5 class="card-title">New Posts Today</h5>
+                                        <p class="card-text display-4">156</p>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="col-md-4">
+                                <div class="card">
+                                    <div class="card-body">
+                                        <h5 class="card-title">Active Users</h5>
+                                        <p class="card-text display-4">8,742</p>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+
+                    <!-- Users Page -->
+                    <div id="users-page" class="page">
+                        <h1 class="mt-4">Users Management</h1>
+                        <table class="table mt-4">
+                            <thead>
+                                <tr>
+                                    <th>User Id</th>
+                                    <th>Role</th>
+                                    <th>Name</th>
+
+                                </tr>
+                            </thead>
+
+                            <tbody>
+                            <tbody>
+                                <c:forEach var="user" items="${users}">
+                                    <tr>
+                                        <td>${user.user_id}</td>
+                                        <td>${user.role}</td>
+                                        <td><a href="log?id=${user.user_id}"> ${user.first_name} ${user.last_name} </a></td>
+                                    </tr>
+                                </c:forEach>
+                            </tbody>
+
+                            </tbody>
+                        </table>
+                    </div>
+
+                    <!-- Analytics Page -->
+                    <div id="analytics-page" class="page">
+                        <h1 class="mt-4">Analytics</h1>
+                        <div class="row mt-4">
+                            <div class="col-md-6">
+                                <canvas id="userGrowthChart"></canvas>
+                            </div>
+                            <div class="col-md-6">
+                                <canvas id="postEngagementChart"></canvas>
+                            </div>
+                        </div>
+                    </div>
+                </main>
+            </div>
+        </div>
+
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/3.7.0/chart.min.js"></script>
+        <script src="assets/js/DashBoard.js">
+
+        </script>
+        <script type="text/javascript">
+            // Khai báo biến cho các label (tên tháng)
+            let label0 = "${label0}";
+            let label1 = "${label1}";
+            let label2 = "${label2}";
+            let label3 = "${label3}";
+            let label4 = "${label4}";
+            let label5 = "${label5}";
+            let label6 = "${label6}";
+
+            // Khai báo biến cho các data (số liệu tương ứng với từng tháng)
+            let data0 = ${data0};
+            let data1 = ${data1};
+            let data2 = ${data2};
+            let data3 = ${data3};
+            let data4 = ${data4};
+            let data5 = ${data5};
+            let data6 = ${data6};
+
+
+
+
+        </script>
+    </body>
+</html>
diff --git a/web/WEB-INF/LearningMaterial.jsp b/web/WEB-INF/LearningMaterial.jsp
new file mode 100644
index 0000000..3ba2585
--- /dev/null
+++ b/web/WEB-INF/LearningMaterial.jsp
@@ -0,0 +1,347 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ page import="java.util.List, model.Post, dao.postDAO, model.User" %>
+<%@ page import="model.Message, dao.MessageDao" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<!DOCTYPE html>
+<html lang="en">
+    <head>
+        <meta charset="UTF-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+        <title>Home Page</title>
+        <link href="assets/css/bootstrap.min.css" rel="stylesheet">
+        <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
+        <script src="https://kit.fontawesome.com/7f80ec1f7e.js" crossorigin="anonymous"></script>
+        <link rel="stylesheet" href="assets/css/home.css">
+        <link rel="stylesheet" href="assets/css/learningMaterial.css">
+
+        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css">
+        <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
+        <link rel="stylesheet" href="https://www.w3schools.com/w3css/4/w3.css">
+        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
+        <script src="https://unpkg.com/boxicons@2.1.4/dist/boxicons.js"></script>
+        <link href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.3.0/css/bootstrap.min.css" rel="stylesheet">
+ <link href="assets/css/logonavbar.css" rel="stylesheet"> 
+        <style>
+            body {
+                background-color: #f8f9fa;
+            }
+            .material-container {
+                border: 1px solid #ddd;
+                border-radius: 5px;
+                padding: 15px;
+                background-color: #fff;
+                margin-bottom: 20px;
+                text-align: center;
+            }
+            .material-img {
+                max-width: 100%;
+                height: auto;
+                border-radius: 5px;
+            }
+            h5 {
+                margin-top: 10px;
+                color: #007bff;
+            }
+            .text-muted {
+                font-size: 14px;
+            }
+
+            .accordion-collapse {
+                transition: max-height 0.3s ease;
+                overflow: hidden;
+            }
+            #learningMaterialForm {
+                display: none;
+                margin-top: 20px;
+            }
+        </style>
+    </head>
+    <body>
+        <div class="flex-container navbar">
+            <a href="home" style ="text-decoration:none">   <div class="logo" style="margin-bottom: 10%">FUNET</div>
+            </a>
+            <form class="" method="get" action="/FUNET/searchServlet" id="searchForm">
+                <div class="search-bar" style="margin-top:1%;">
+                    <input class="form-control" name="search-name" type="search" placeholder="Searching in FUNET" aria-label="Search" id="search-input" style="padding-left:5%;">
+
+                </div>
+            </form>
+            <div class="center-buttons">
+                <a href="home">
+                    <button class="center-button" id="home-btn">
+                        <box-icon type='solid' name='home'></box-icon>
+                    </button>
+                </a>
+                <a href="lmaterialLink"> 
+                    <button class="center-button" id="video-btn">
+                        <box-icon type='solid' name='book'></box-icon>
+                    </button>
+                </a>
+                <a href="market">
+                    <button class="center-button" id="market-btn">
+                        <box-icon name='store-alt' type='solid'></box-icon>
+                    </button>
+                </a>
+                <a href="/FUNET/friendRequestServlet" class="friend-icon me-3">
+                    <button class="center-button" id="friend-btn">
+                        <box-icon name='group' type='solid'></box-icon>
+                    </button>
+                </a>
+            </div>
+            <div class="right-icons">
+                <a href="/FUNET/chat" class="mess-icon" style='margin-left:5px'>
+                    <span class="icon icon-circle" id="messenger-btn"><box-icon name='messenger' type='logo'></box-icon></span>
+                </a>
+                <span class="icon icon-circle" id="notification-btn" style="display:none"><box-icon name='bell' type='solid' ></box-icon></span>
+                <span class="icon icon-circle" id="user-btn">&#128100;</span>
+            </div>
+
+        </div>
+
+        <div class="dropdown-menu" id="notification-menu">
+            <p>Notification content goes here...</p>
+        </div>
+    
+    <div class="dropdown-menu" id="notification-menu">
+        <p>Notification content goes here...</p>
+    </div>
+    <div class="user-menu" id="user-menu" >
+        <div class="user-info">
+            <a href="profile?userId=${sessionScope.user['user_id']}" class="d-flex align-items-center text-decoration-none text-dark">
+                <button class="user-info-button">
+                    <img src="assets/profile_avt/${sessionScope.user['profile_pic']}" class="img-fluid rounded-circle avatar" style="object-fit: cover;">
+                    <p class="mb-0 ms-2 ava-name">${sessionScope.user['first_name']} ${sessionScope.user['last_name']}</p>
+                </button>
+            </a>
+        </div>
+        <div class="menu-item">
+            <box-icon name='cog' type='solid' style="margin-right:3%; margin-left:1%;">Settings</box-icon>Settings
+        </div>
+        <div class="menu-item" >
+            <box-icon name='error-circle'style="margin-right:3%; margin-left:1%;"></box-icon>Report
+        </div>
+        
+
+        <form method="post" action="/FUNET/logout" style="display: inline; width: 100%;">
+            <div class="menu-item" style="display: flex; align-items: center; cursor: pointer; width: 100%;">
+                <box-icon type='solid' name='log-out'style=" margin-left:1%;"></box-icon>
+                <button type="submit" style="border: none; background: none; color: black; font-size: 16px; margin-left: 5px; cursor: pointer; flex: 1; text-align: left;">
+                    Log Out
+                </button>
+            </div>
+        </form>
+    </div>
+        <!-- chức năng ngang -->
+        <div class="container-fluid">
+            <div class="row all-post">
+                <nav class="col-2 py-3 sidebar sticky-sidebar position-sticky" style="top: 76px;background: white;box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);height:fit-content;">
+                    <a href="lmaterialLink" style="text-decoration:none;"><h2 class="text-primary">Learning Material</h2></a>      
+                    <form class="d-flex mb-3 search-learning-material-container" method="get" action="/FUNET/searchLearningMaterial">
+                        <input class="search-form-controller me-2" name="search-name" type="search" placeholder="Find learning material" aria-label="Search" style="width:100%;">
+                    </form>
+                    <div class="accordion" id="accordionCategories">
+                        <div class="accordion-item">
+                            <h2 class="accordion-header" id="headingOne">
+                                <button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#departmentList" aria-expanded="true" aria-controls="departmentList">
+                                    Department
+                                </button>
+                            </h2>
+                            <div id="departmentList" class="accordion-collapse collapse show" aria-labelledby="headingOne" data-bs-parent="#accordionCategories">
+                                <div class="accordion-body">
+                                    <ul class="list-group">
+                                        <li class="list-group-item"><a href="/FUNET/learningMaterialDepartmentSearch?departmentId=1" style="text-decoration: none;">Economy</a></li>
+                                        <li class="list-group-item"><a href="/FUNET/learningMaterialDepartmentSearch?departmentId=2" style="text-decoration: none;">IT</a></li>
+                                        <li class="list-group-item"><a href="/FUNET/learningMaterialDepartmentSearch?departmentId=3" style="text-decoration: none;">Tourism</a></li>
+                                        <li class="list-group-item"><a href="/FUNET/learningMaterialDepartmentSearch?departmentId=4" style="text-decoration: none;">Languages</a></li>
+                                    </ul>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <button class="btn btn-primary mt-3" id="toggleFormBtn" style="width:100%;">Add Learning Material</button>
+                    <!--                    <button class="btn btn-secondary mt-3" id="showSavedMaterialsBtn" style="width:100%;">Saved Learning Materials</button>-->
+
+                </nav>
+
+                <main class="main-class col-10" style="margin-top: 2%; position: relative;">
+                    <div class="row">
+                        <c:forEach var="material" items="${learningMaterialsList}">
+                            <div class="col-lg-4 col-md-6 mb-4">
+                                <div class="material-container">
+                                    <div class="dropdown">
+                                        <button class="btn btn-secondary dropdown-toggle" type="button" id="dropdownMenuButton" data-bs-toggle="dropdown" aria-expanded="false" style="background-color:white;border: none;">
+                                            <i class="fa fa-ellipsis-h" style="color:black;"></i>
+                                        </button>
+                                        <ul class="dropdown-menu" aria-labelledby="dropdownMenuButton" style="height:fit-content;width: fit-content;">
+                                            <li><a class="dropdown-item" href="#" onclick="showUpdateForm(${material.learningMaterialId}, '${material.learningMaterialName}', '${material.learningMaterialDescription}', '${material.learningMaterialContext}', '${material.subjectCode}', ${material.departmentId}, '${material.review}', ${material.userId})">Update</a></li>
+                                            <li>
+                                                <form id="deleteForm-${material.learningMaterialId}" action="deleteLearningMaterial" method="post" style="display:inline;">
+                                                    <input type="hidden" name="id" value="${material.learningMaterialId}">
+                                                    <button type="button" class="dropdown-item" onclick="confirmDelete(${material.learningMaterialId}, ${material.userId})">Delete</button>
+                                                </form>
+                                            </li>
+                                        </ul>
+                                    </div>
+
+                                    <h5>${material.learningMaterialName}</h5>
+                                    <p>${material.learningMaterialDescription}</p>
+                                    <p><small class="text-muted">Subject: ${material.subjectCode}</small></p>
+                                    <p><small class="text-muted">Published on: ${material.publishDate}</small></p>
+                                    <p><small class="text-muted">Review: ${material.review}</small></p>
+                                    <a href="downloadMaterial?name=${material.learningMaterialContext}" >Download this document</a>
+                                </div>
+                            </div>
+                        </c:forEach>
+                    </div>
+                </main>
+
+                <div class="container mt-4" id="learningMaterialForm" enctype="multipart/form-data" style="position: relative; width: 75%; background: none;">
+                    <h2>Create Learning Material</h2>
+                    <form action="creMaterial" method="post" enctype="multipart/form-data">
+                        <div class="form-group">
+                            <label for="name">Name:</label>
+                            <input type="text" class="form-control" id="name" name="name" required>
+                        </div>
+                        <div class="form-group">
+                            <label for="description">Description:</label>
+                            <textarea class="form-control" id="description" name="description" required></textarea>
+                        </div>
+                        <div class="form-group">
+                            <label for="subjectCode">Subject Code:</label>
+                            <input type="text" class="form-control" id="subjectCode" name="subjectCode" required>
+                        </div>
+                        <div class="form-group">
+                            <label for="departmentId">Department:</label>
+                            <select class="form-control" id="departmentId" name="departmentId" required>
+                                <option value="1">Economy</option>
+                                <option value="2">IT</option>
+                                <option value="3">Tourism</option>
+                                <option value="4">Languages</option>
+                            </select>
+                        </div>
+                        <div class="form-group">
+                            <label for="context">Context File:</label>
+                            <input type="file" class="form-control" id="context" name="context" required >
+                        </div>
+                        <div class="form-group">
+                            <label for="review">Review:</label>
+                            <input type="text" class="form-control" id="review" name="review" required>
+                        </div>
+                        <button type="submit" class="btn btn-primary" style="position: relative;right: 50%;left: 50%;">Create</button>
+                    </form>
+                </div>
+                <div class="container mt-4" id="updateLearningMaterialForm" enctype="multipart/form-data" style="position: relative; width: 75%; background: none; display: none;">
+                    <h2>Update Learning Material</h2>
+                    <form action="updateLearningMaterial"  method="post" enctype="multipart/form-data">
+                        <input type="hidden" id="updateLearningMaterialId" name="id">
+                        <div class="form-group">
+                            <label for="updateName">Name:</label>
+                            <input type="text" class="form-control" id="updateName" name="name" required>
+                        </div>
+                        <div class="form-group">
+                            <label for="updateDescription">Description:</label>
+                            <textarea class="form-control" id="updateDescription" name="description" required></textarea>
+                        </div>
+                        <div class="form-group">
+                            <label for="updateSubjectCode">Subject Code:</label>
+                            <input type="text" class="form-control" id="updateSubjectCode" name="subjectCode" required>
+                        </div>
+                        <div class="form-group">
+                            <label for="updateDepartmentId">Department:</label>
+                            <select class="form-control" id="updateDepartmentId" name="departmentId" required>
+                                <option value="1">Economy</option>
+                                <option value="2">IT</option>
+                                <option value="3">Tourism</option>
+                                <option value="4">Languages</option>
+                            </select>
+                        </div>
+
+                        <div class="form-group">
+                            <label for="updateContext">Context File:</label>
+                            <input type="file" class="form-control" id="updateContext" name="context">
+                        </div>
+                        <div class="form-group">
+                            <label for="updateReview">Review:</label>
+                            <input type="text" class="form-control" id="updateReview" name="review" required>
+                        </div>
+                        <button type="submit" class="btn btn-primary" style="position: relative;right: 50%;left: 50%;">Update</button>
+                    </form>
+                </div>
+
+            </div>
+        </div>
+
+        <script src="assets/js/bootstrap.min.js"></script>
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.3.0/js/bootstrap.bundle.min.js"></script>
+                <script src="assets/js/logonavbar.js" defer></script>
+
+        <script>
+                                                        document.addEventListener('DOMContentLoaded', function () {
+                                                            var departmentList = document.getElementById('departmentList');
+                                                            var toggleButton = document.querySelector('.accordion-button');
+                                                            var toggleFormBtn = document.getElementById('toggleFormBtn');
+                                                            var learningMaterialForm = document.getElementById('learningMaterialForm');
+                                                            var updateLearningMaterialForm = document.getElementById('updateLearningMaterialForm');
+                                                            var mainContent = document.querySelector('.main-class');
+
+                                                            toggleFormBtn.addEventListener('click', function () {
+                                                                if (learningMaterialForm.style.display === 'none') {
+                                                                    learningMaterialForm.style.display = 'block';
+                                                                    updateLearningMaterialForm.style.display = 'none';
+                                                                    mainContent.style.display = 'none';
+                                                                } else {
+                                                                    learningMaterialForm.style.display = 'none';
+                                                                    mainContent.style.display = 'block';
+                                                                }
+                                                            });
+
+                                                            document.querySelector('form').addEventListener('submit', function () {
+                                                                learningMaterialForm.style.display = 'none';
+                                                                updateLearningMaterialForm.style.display = 'none';
+                                                                mainContent.style.display = 'block';
+                                                            });
+                                                        });
+
+                                                        function showUpdateForm(id, name, description, context, subjectCode, departmentId, review, creatorId) {
+
+                                                            console.log('showUpdateForm called with:', id, name, description, context, subjectCode, departmentId, review);
+
+                                                            var currentUserId = ${sessionScope.user['user_id']};
+                                                            if (currentUserId !== creatorId) {
+                                                                alert('Insufficient permissions to update this document.');
+                                                                return;
+                                                            }
+
+
+                                                            var updateForm = document.getElementById('updateLearningMaterialForm');
+                                                            var mainContent = document.querySelector('.main-class');
+                                                            var learningMaterialForm = document.getElementById('learningMaterialForm');
+
+                                                            document.getElementById('updateLearningMaterialId').value = id;
+                                                            document.getElementById('updateName').value = name;
+                                                            document.getElementById('updateDescription').value = description;
+                                                            document.getElementById('updateSubjectCode').value = subjectCode;
+                                                            document.getElementById('updateDepartmentId').value = departmentId;
+                                                            document.getElementById('updateReview').value = review;
+
+                                                            updateForm.style.display = 'block';
+                                                            learningMaterialForm.style.display = 'none';
+                                                            mainContent.style.display = 'none';
+
+                                                        }
+                                                        function confirmDelete(id, creatorId) {
+                                                            var currentUserId = ${sessionScope.user['user_id']};
+
+                                                            if (currentUserId !== creatorId) {
+                                                                alert('Insufficient permissions to delete this document.');
+                                                                return;
+                                                            }
+
+                                                            if (confirm('Are you sure you want to delete this document?')) {
+                                                                document.getElementById('deleteForm-' + id).submit();
+                                                            }
+                                                        }
+        </script>
+    </body>
+</html>
\ No newline at end of file
diff --git a/web/WEB-INF/addProduct.jsp b/web/WEB-INF/addProduct.jsp
index 555c68d..e3375c9 100644
--- a/web/WEB-INF/addProduct.jsp
+++ b/web/WEB-INF/addProduct.jsp
@@ -80,40 +80,25 @@
             <div class="row all-post">
                 <nav class="col-2 py-3 bg-light sidebar sticky-sidebar position-sticky" style="top: 76px;">
                     <div class="profile-section mb-3 d-flex align-items-center">
-                        <a href="userpageServlet?userId=${sessionScope.user['user_id']}" class="d-flex align-items-center text-decoration-none text-dark">
-                            <img src="assets/profile_avt/main.jpg" class="img-fluid rounded-circle avatar" style="object-fit: cover;">
-                            <p class="mb-0 ms-2 ava-name">${"vuaga1260"}</p>
-                        </a>
+                        <a href="profile?userId=${sessionScope.user['user_id']}" class="d-flex align-items-center text-decoration-none text-dark">
+                <button class="user-info-button">
+                    <img src="assets/profile_avt/${sessionScope.user['profile_pic']}" class="img-fluid rounded-circle avatar" style="object-fit: cover;">
+                    <p class="mb-0 ms-2 ava-name">${sessionScope.user['first_name']} ${sessionScope.user['last_name']}</p>
+                </button>
+            </a>
                     </div>
                     <div class="chat-box mb-3"></div>
 
-                    <form class="d-flex mb-3">
-                        <input class="form-control me-2" type="search" placeholder="Find product" aria-label="Search">
+                    <form action ="SearchProductServlet" class="d-flex mb-3">
+                       <input type="text" class="form-control me-2" name="keyword" placeholder="Find product">
                         <button class="btn btn-outline-primary" type="submit">Search</button>
                     </form>
+
                     <div class="btn-group-vertical w-100 mb-3">
                         <a href="/FUNET/home" class="btn btn-outline-primary mb-2">Main Page</a>
                         <a href="/FUNET/notificationServlet" class="btn btn-outline-primary mb-2">Notifications</a>
-                        <a href="/FUNET/AddProductServlet" class="btn btn-outline-primary mb-2">Add Product</a>
-                        <a href="/FUNET/SellingProductServlet" class="btn btn-outline-primary mb-2">Your products on sale</a>
-                    </div>
-
-                    <div class="accordion" id="accordionCategories">
-                        <div class="accordion-item">
-                            <h2 class="accordion-header" id="headingOne">
-                                <button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#collapseOne" aria-expanded="true" aria-controls="collapseOne">
-                                    Categories
-                                </button>
-                            </h2>
-                            <div id="collapseOne" class="accordion-collapse collapse show" aria-labelledby="headingOne" data-bs-parent="#accordionCategories">
-                                <div class="accordion-body">
-                                    <ul class="list-group">
-                                        <li class="btn btn-outline-secondary mb-2"><a href="/FUNET/marketLink" class="text-decoration-none">Market Place</a></li>
-                                        <li class="btn btn-outline-secondary mb-2"><a href="/FUNET/lmaterialLink" class="text-decoration-none">Learning Material</a></li>
-                                    </ul>
-                                </div>
-                            </div>
-                        </div>
+                        <a href="/FUNET/AddProductServlet" class="btn btn-outline-primary mb-2">Add product to market</a>
+                        <a href="/FUNET/SellingProductServlet" class="btn btn-outline-primary mb-2">Yours products</a>
                     </div>
                 </nav>
 
@@ -154,4 +139,4 @@
 
         <script src="assets/js/bootstrap.bundle.min.js"></script>
     </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/web/WEB-INF/chatbox.jsp b/web/WEB-INF/chatbox.jsp
index 8c2eb91..3b56adb 100644
--- a/web/WEB-INF/chatbox.jsp
+++ b/web/WEB-INF/chatbox.jsp
@@ -12,10 +12,51 @@
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.2/css/all.min.css" integrity="sha512-SnH5WK+bZxgPHs44uWIX+LLJAJ9/2PkPKZ5QiAj6Ta86w+fsb2TkcmfRyVX3pBnMFcV7oQPJkl9QevSCWr3W6A==" crossorigin="anonymous" referrerpolicy="no-referrer" />
     </head>
     <body>
+        <p id="first_name" style="display: none">${sessionScope.user['first_name']}</p>
+        <p id="last_name" style="display: none">${sessionScope.user['last_name']}</p>
         <p id="user_id" style="display: none">${sessionScope.user['user_id']}</p>
         <p id="userAvatar" style="display: none">assets/profile_avt/${sessionScope.user['profile_pic']}</p>
         <div class="container">
             <div class="conversation-container">
+                <div class="modal-box border" id="settings">
+                    <div class="modal-box-head">
+                        <div class="modal-box-title">
+                            Group Settings
+                        </div>
+                        <div class="modal-box-close toggle-btn" data-id="add-user" onclick="toggleModal(this, false)">
+                            <i class="fa fa-times"></i>
+                        </div>
+                    </div>
+                    <div class="modal-box-body">
+                        <div data-id="manage-user" onclick="toggleModal(this, true)">
+                            <h2>Groups Member</h2>
+                        </div>
+                        <div data-id="change-name" onclick="toggleModal(this, true)">
+                            <h2>Change Group Name</h2>
+                        </div>
+                        <label style="cursor: pointer; display: inline-block;">
+                            <input type="file" style="display: none;" accept="image/*" onchange="uploadGroupAvatar(this)" />
+                            <h2>Change Group Avatar</h2>
+                        </label>
+                    </div>
+                </div>
+                <div class="modal-box border" id="change-name">
+                    <div class="modal-box-head">
+                        <div class="modal-box-title">
+                            Change Group Name
+                        </div>
+                        <div class="modal-box-close toggle-btn" data-id="add-group" onclick="toggleModal(this, false)">
+                            <i class="fa fa-times"></i>
+                        </div>
+                    </div>
+                    <hr>
+                    <form action="" onsubmit="changeGroupName(event)">
+                        <div class="modal-box-body">
+                            <input type="text" class="txt-input txt-new-group-name" placeholder="Group Name...">
+                        </div>		
+                        <button type="submit" class="btn">Save</button>		
+                    </form>
+                </div>
                 <div class="modal-box border" id="add-group">
                     <div class="modal-box-head">
                         <div class="modal-box-title">
@@ -26,7 +67,7 @@
                         </div>
                     </div>
                     <hr>
-                    <form action="" onsubmit="return createGroup(event);">
+                    <form action="" onsubmit="createGroup(event)">
                         <div class="modal-box-body">
                             <input type="text" class="txt-input txt-group-name" placeholder="Group Name...">
                         </div>		
@@ -78,12 +119,7 @@
                 <div class="left-side active">
                     <div class="add-group border toggle-btn" data-id="add-group" onclick="toggleModal(this, true)"><i class="fa fa-plus-circle"></i></div>
                     <h2>
-                        <a href="<c:url value="/users/update"/>"
-                           style="text-decoration: none; color: white;margin-right: 3rem;">Welcome
-                            ${sessionScope.user['user_id']}</a>
-                        :
-                        <a href="<c:url value="/users/logout"/>"
-                           style="text-decoration: none; color: white; margin-left: 3rem;">Logout</a>
+                        Chats
                     </h2>
                     <div class="tab-control">
                         <i class="fa fa-comment active" onclick="chatOne(this)"></i>
diff --git a/web/WEB-INF/cloudinary.properties.txt b/web/WEB-INF/cloudinary.properties.txt
new file mode 100644
index 0000000..0638968
--- /dev/null
+++ b/web/WEB-INF/cloudinary.properties.txt
@@ -0,0 +1,3 @@
+cloud_name=dxx8u5qnr
+api_key=694793228885481
+api_secret=ydUuGLOQjJ2UTdMaiJes0zggIpw
diff --git a/web/WEB-INF/friendRequest.jsp b/web/WEB-INF/friendRequest.jsp
index 5f5fbee..336bcf9 100644
--- a/web/WEB-INF/friendRequest.jsp
+++ b/web/WEB-INF/friendRequest.jsp
@@ -19,32 +19,91 @@
         <link rel="stylesheet" href="assets/css/friendRequest.css">
         <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
         <script src="https://kit.fontawesome.com/7f80ec1f7e.js" crossorigin="anonymous"></script>
+           <link href="assets/css/bootstrap.min.css" rel="stylesheet">    
+        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css">
+        <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
+        <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
+        <link rel="stylesheet" href="https://www.w3schools.com/w3css/4/w3.css">
+        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
+        <script src="https://unpkg.com/boxicons@2.1.4/dist/boxicons.js"></script>
+        <script src='https://kit.fontawesome.com/a076d05399.js' crossorigin='anonymous'></script>
+   <link href="assets/css/logonavbar.css" rel="stylesheet">   
     </head>
     <body>
-        <header id="header">
-            <nav class="navbar custom-navbar">
-                <div class="container-fluid d-flex align-items-center">
-                    <a class="navbar-brand text-primary" href="/FUNET/home" style="font-weight: bold">FUNET</a>
-                    <form class="d-flex ms-2 flex-grow-1" method="get" action="/FUNET/searchServlet">
-                        <input class="form-control" name="search-name" type="search" placeholder="Searching in FUNET" aria-label="Search">
-                        <button type="submit" class="search-button">
-                            <i class="fa-solid fa-magnifying-glass"></i>
-                        </button>
-                    </form>
-                    <div class="nav-icons d-flex align-items-center">
-                        <a href="/FUNET/friendRequestServlet" class="friend-icon me-3">
-                            <svg viewBox="0 0 24 24" width="24" height="24" fill="currentColor" class="x19dipnz x1lliihq x1tzjh5l x1k90msu x2h7rmj x1qfuztq" style="--color:var(--secondary-icon)"><path d="M.5 12c0 6.351 5.149 11.5 11.5 11.5S23.5 18.351 23.5 12 18.351.5 12 .5.5 5.649.5 12zm2 0c0-.682.072-1.348.209-1.99a2 2 0 0 1 0 3.98A9.539 9.539 0 0 1 2.5 12zm.84-3.912A9.502 9.502 0 0 1 12 2.5a9.502 9.502 0 0 1 8.66 5.588 4.001 4.001 0 0 0 0 7.824 9.514 9.514 0 0 1-1.755 2.613A5.002 5.002 0 0 0 14 14.5h-4a5.002 5.002 0 0 0-4.905 4.025 9.515 9.515 0 0 1-1.755-2.613 4.001 4.001 0 0 0 0-7.824zM12 5a4 4 0 1 1 0 8 4 4 0 0 1 0-8zm-2 4a2 2 0 1 0 4 0 2 2 0 0 0-4 0zm11.291 1.01a9.538 9.538 0 0 1 0 3.98 2 2 0 0 1 0-3.98zM16.99 20.087A9.455 9.455 0 0 1 12 21.5c-1.83 0-3.54-.517-4.99-1.414a1.004 1.004 0 0 1-.01-.148V19.5a3 3 0 0 1 3-3h4a3 3 0 0 1 3 3v.438a1 1 0 0 1-.01.148z"></path></svg>
-                        </a>
-                        <a href="/FUNET/chat" class="mess-icon me-3">
-                            <i class="fas fa-comments"></i>
-                        </a> 
-                    </div>
-                    <form method="post" action="/FUNET/logout">
-                        <button type="submit" class="navbar-brand text-primary log-out" style="font-weight: bold">Log out</button>
-                    </form>
+        <div class="flex-container navbar">
+            <a href="home" style ="text-decoration:none">   <div class="logo" style="margin-bottom: 10%">FUNET</div>
+            </a>
+            <form class="" method="get" action="/FUNET/searchServlet" id="searchForm">
+                <div class="search-bar" style="margin-top:1%; margin-left:1%">
+                    <input class="form-control" name="search-name" type="search" placeholder="Searching in FUNET" aria-label="Search" id="search-input" style="padding-left:5%;">
+
                 </div>
-            </nav>
-        </header>
+            </form>
+            <div class="center-buttons">
+                <a href="home">
+                    <button class="center-button" id="home-btn">
+                        <box-icon type='solid' name='home'></box-icon>
+                    </button>
+                </a>
+                <a href="lmaterialLink"> 
+                    <button class="center-button" id="video-btn">
+                        <box-icon type='solid' name='book'></box-icon>
+                    </button>
+                </a>
+                <a href="market">
+                    <button class="center-button" id="market-btn">
+                        <box-icon name='store-alt' type='solid'></box-icon>
+                    </button>
+                </a>
+                <a href="/FUNET/friendRequestServlet" class="friend-icon me-3">
+                    <button class="center-button" id="friend-btn">
+                        <box-icon name='group' type='solid'></box-icon>
+                    </button>
+                </a>
+            </div>
+            <div class="right-icons">
+                <a href="/FUNET/chat" class="mess-icon" style='margin-left:5px'>
+                    <span class="icon icon-circle" id="messenger-btn"><box-icon name='messenger' type='logo'></box-icon></span>
+                </a>
+                <span class="icon icon-circle" id="notification-btn" style="display:none"><box-icon name='bell' type='solid' ></box-icon></span>
+                <span class="icon icon-circle" id="user-btn">&#128100;</span>
+            </div>
+
+        </div>
+
+        <div class="dropdown-menu" id="notification-menu">
+            <p>Notification content goes here...</p>
+        </div>
+    
+    <div class="dropdown-menu" id="notification-menu">
+        <p>Notification content goes here...</p>
+    </div>
+    <div class="user-menu" id="user-menu" >
+        <div class="user-info">
+            <a href="profile?userId=${sessionScope.user['user_id']}" class="d-flex align-items-center text-decoration-none text-dark">
+                <button class="user-info-button">
+                    <img src="assets/profile_avt/${sessionScope.user['profile_pic']}" class="img-fluid rounded-circle avatar" style="object-fit: cover;">
+                    <p class="mb-0 ms-2 ava-name">${sessionScope.user['first_name']} ${sessionScope.user['last_name']}</p>
+                </button>
+            </a>
+        </div>
+        <div class="menu-item">
+            <box-icon name='cog' type='solid' style="margin-right:3%; margin-left:1%;">Settings</box-icon>Settings
+        </div>
+        <div class="menu-item" >
+            <box-icon name='error-circle'style="margin-right:3%; margin-left:1%;"></box-icon>Report
+        </div>
+        
+
+        <form method="post" action="/FUNET/logout" style="display: inline; width: 100%;">
+            <div class="menu-item" style="display: flex; align-items: center; cursor: pointer; width: 100%;">
+                <box-icon type='solid' name='log-out'style=" margin-left:1%;"></box-icon>
+                <button type="submit" style="border: none; background: none; color: black; font-size: 16px; margin-left: 5px; cursor: pointer; flex: 1; text-align: left;">
+                    Log Out
+                </button>
+            </div>
+        </form>
+    </div>
         <div class="friend-requests-container">
             <h2>Pending Friend Requests</h2>
             <c:forEach var="friendRequest" items="${pendingList}">
@@ -65,5 +124,7 @@
             </c:forEach>
         </div>
         <script src="assets/js/ajaxInviteFriend.js"></script>   
+                        <script src="assets/js/logonavbar.js" defer></script>
+
     </body>
 </html>
diff --git a/web/WEB-INF/game.jsp b/web/WEB-INF/game.jsp
new file mode 100644
index 0000000..fbb4706
--- /dev/null
+++ b/web/WEB-INF/game.jsp
@@ -0,0 +1,477 @@
+<%-- 
+    Document   : index
+    Created on : 1 thg 10, 2024, 12:46:41
+    Author     : Quocb
+--%>
+
+<%@page import="java.util.ArrayList"%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<!DOCTYPE html>
+<html lang="vi">
+    <head>
+        <meta charset="UTF-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+        <title>Game Catalog</title>
+        <link href="https://cdn.jsdelivr.net/npm/tailwindcss@2.2.19/dist/tailwind.min.css" rel="stylesheet">
+        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.3/css/all.min.css">
+        <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
+        <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
+        <link rel="stylesheet" href="https://www.w3schools.com/w3css/4/w3.css">
+        <script src="https://unpkg.com/boxicons@2.1.4/dist/boxicons.js"></script>
+        <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
+           <link href="assets/css/logonavbar.css" rel="stylesheet">   
+
+
+        <style>
+            .button {
+                transition: background-color 0.3s, transform 0.3s;
+            }
+            body {
+                overflow: hidden; /* Prevents scrolling on the body */
+            }
+
+            .sidebargame {
+                position: fixed;
+                top: 70px;
+                left: 0;
+                bottom: 0;
+                width: 340px;
+                overflow-y: auto;
+                height: calc(100vh - 70px);
+                scrollbar-width: thin; /*  Firefox */
+                scrollbar-color: #888 #f1f1f1; /*  Firefox */
+            }
+
+            /* Webkit Chrome, Safari */
+            .sidebargame::-webkit-scrollbar {
+                width: 6px;
+            }
+
+            .sidebargame::-webkit-scrollbar-track {
+                background: #f1f1f1;
+            }
+
+            .sidebargame::-webkit-scrollbar-thumb {
+                background: #888;
+                border-radius: 3px;
+            }
+
+            .sidebargame::-webkit-scrollbar-thumb:hover {
+                background: #555;
+            }
+
+            .main-content {
+
+                height: calc(100vh - 80px); /* Subtract header height from viewport height */
+                overflow-y: auto;
+            }
+            .main-content {
+                margin-left: 340px;
+                padding-top: 0px; 
+            }
+            aside {
+                width: 360px;
+                height: 919px;
+            }
+
+            .game-card {
+                aspect-ratio: 3/4;
+            }
+            #result{
+                overflow-y: auto;
+                weight:290px;
+                height: 324px;
+            }
+
+
+            .navbar {
+                display: flex;
+                align-items: center;
+                justify-content: space-around;
+                position: relative;
+                background-color: #ffffff;
+                padding: 10px 20px;
+                height: 60px;
+                width: 100%;
+                top: 0;
+                z-index: 1000;
+                box-sizing: border-box;
+                position: sticky;
+                index: 1000;
+            }
+
+            .center-buttons {
+                display: flex;
+                gap: 10px;
+                justify-content: center;
+                align-items: center;
+                flex-grow: 1;
+                margin-left: 10%;
+            }
+
+            .center-button {
+                flex: 1;
+                max-width: 80px;
+                height: 48px;
+                background: none;
+                border: none;
+                color: black;
+                cursor: pointer;
+                border-radius: 15px;
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                transition: background-color 0.3s ease;
+                margin: 0;
+            }
+
+            .center-button:hover {
+                background-color: #CFC6C6;
+            }
+
+            .logo {
+                font-size: 24px;
+                font-weight: bold;
+            }
+
+            .search-bar {
+                margin-bottom: 5px;
+                margin-bottom: 10px;
+            }
+
+            .search-bar input {
+                padding: 8px;
+                border: none;
+                border-radius: 15px;
+                height: 35px;
+                width: 250px;
+                transition: width 0.3s ease;
+                outline: 1px solid rgb(133, 130, 130);
+                font-size: 15px;
+            }
+
+            .right-icons {
+                display: flex;
+                gap: 10px;
+                align-items: center;
+                width: 500px;
+                padding-left: 330px;
+                justify-content: flex-end;
+            }
+
+            .icon {
+                font-size: 20px;
+                cursor: pointer;
+                color: black;
+            }
+
+            .icon-circle {
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                width: 40px;
+                height: 40px;
+                background-color: rgb(211, 211, 211);
+                border-radius: 50%;
+                transition: background-color 0.3s ease;
+            }
+
+            .icon-circle:hover {
+                background-color: darkgrey;
+            }
+
+            @media screen and (max-width: 1250px) {
+                .center-buttons {
+                    display: none;
+                }
+                .home-logo {
+                    display: none;
+                }
+            }
+
+            @media screen and (max-width: 1050px) {
+                .search-bar input {
+                    width: 200px;
+                }
+            }
+
+            @media screen and (max-width: 850px) {
+                .search-bar {
+                    display: none;
+                }
+                .logo {
+                    display: none;
+                }
+                .RightItem {
+                    margin: 0;
+                    justify-content: center;
+                }
+            }
+
+
+        </style>
+
+    </head>
+    <body class="bg-gray-100">
+
+        <!-- Top Navigation -->
+       <div class="flex-container navbar">
+            <a href="home" style ="text-decoration:none">   <div class="logo" style="margin-bottom: 10%">FUNET</div>
+            </a>
+            <form class="" method="get" action="/FUNET/searchServlet" id="searchForm">
+                <div class="search-bar" style="margin-top:1%; margin-left:1%">
+                    <input class="form-control" name="search-name" type="search" placeholder="Searching in FUNET" aria-label="Search" id="search-input" style="padding-left:5%;">
+
+                </div>
+            </form>
+            <div class="center-buttons">
+                <a href="home">
+                    <button class="center-button" id="home-btn">
+                        <box-icon type='solid' name='home'></box-icon>
+                    </button>
+                </a>
+                <a href="lmaterialLink"> 
+                    <button class="center-button" id="video-btn">
+                        <box-icon type='solid' name='book'></box-icon>
+                    </button>
+                </a>
+                <a href="market">
+                    <button class="center-button" id="market-btn">
+                        <box-icon name='store-alt' type='solid'></box-icon>
+                    </button>
+                </a>
+                <a href="/FUNET/friendRequestServlet" class="friend-icon me-3">
+                    <button class="center-button" id="friend-btn">
+                        <box-icon name='group' type='solid'></box-icon>
+                    </button>
+                </a>
+            </div>
+            <div class="right-icons">
+                <a href="/FUNET/chat" class="mess-icon" style='margin-left:5px'>
+                    <span class="icon icon-circle" id="messenger-btn"><box-icon name='messenger' type='logo'></box-icon></span>
+                </a>
+                <span class="icon icon-circle" id="notification-btn" style="display:none"><box-icon name='bell' type='solid' ></box-icon></span>
+                <span class="icon icon-circle" id="user-btn">&#128100;</span>
+            </div>
+
+        </div>
+
+        <div class="dropdown-menu" id="notification-menu">
+            <p>Notification content goes here...</p>
+        </div>
+    
+    <div class="dropdown-menu" id="notification-menu">
+        <p>Notification content goes here...</p>
+    </div>
+    <div class="user-menu" id="user-menu" >
+        <div class="user-info">
+            <a href="profile?userId=${sessionScope.user['user_id']}" class="d-flex align-items-center text-decoration-none text-dark">
+                <button class="user-info-button">
+                    <img src="assets/profile_avt/${sessionScope.user['profile_pic']}" class="img-fluid rounded-circle avatar" style="object-fit: cover;">
+                    <p class="mb-0 ms-2 ava-name">${sessionScope.user['first_name']} ${sessionScope.user['last_name']}</p>
+                </button>
+            </a>
+        </div>
+        <div class="menu-item">
+            <box-icon name='cog' type='solid' style="margin-right:3%; margin-left:1%;">Settings</box-icon>Settings
+        </div>
+        <div class="menu-item" >
+            <box-icon name='error-circle'style="margin-right:3%; margin-left:1%;"></box-icon>Report
+        </div>
+        
+
+        <form method="post" action="/FUNET/logout" style="display: inline; width: 100%;">
+            <div class="menu-item" style="display: flex; align-items: center; cursor: pointer; width: 100%;">
+                <box-icon type='solid' name='log-out'style=" margin-left:1%;"></box-icon>
+                <button type="submit" style="border: none; background: none; color: black; font-size: 16px; margin-left: 5px; cursor: pointer; flex: 1; text-align: left;">
+                    Log Out
+                </button>
+            </div>
+        </form>
+    </div>
+
+        <!-- Main Container -->
+        <div class="flex h-screen">
+            <!-- Sidebar -->
+            <aside class="bg-white p-5 shadow-md sidebargame">
+                <h2 class="text-xl font-bold mb-4">Chơi game</h2>
+                <i class="fa fa-setting"></i>
+                <!-- Tìm kiếm -->
+
+                <script type="text/javascript">
+                    $(document).ready(function () {
+                        // Sự kiện keyup sẽ gọi AJAX mỗi khi có thay đổi trong ô input
+                        $("#keyword").on("keyup", function () {
+                            var keyword = $(this).val();
+
+                            if (keyword.length > 0) {
+                                $.ajax({
+                                    url: "searchGame", // Servlet mà AJAX gửi yêu cầu tới
+                                    type: "GET",
+                                    data: {keyword: keyword},
+                                    success: function (result) {
+                                        // Hiển thị kết quả trả về 
+                                        $("#result").html(result);
+                                        $("#result").removeClass("hidden");
+                                    },
+                                    error: function () {
+                                        alert("Có lỗi xảy ra, vui lòng thử lại.");
+                                    }
+                                });
+                            } else {
+                                // Nếu không có từ khóa, xóa kết quả hiển thị
+                                $("#result").html("");
+                                $("#result").addClass("hidden");
+                            }
+                        });
+                    });
+                </script>
+                <div class="relative mb-6">
+                    <input type="text" id="keyword" placeholder="Tìm kiếm trong phần chơi game" class="border p-2 rounded-lg w-full pr-10 focus:outline-none focus:ring-2 focus:ring-blue-500">
+                    <div class="absolute inset-y-0 right-0 flex items-center pr-3">
+                        <svg class="h-5 w-5 text-gray-400" viewBox="0 0 20 20" fill="currentColor">
+                        <path fill-rule="evenodd" d="M8 4a4 4 0 100 8 4 4 0 000-8zM2 8a6 6 0 1110.89 3.476l4.817 4.817a1 1 0 01-1.414 1.414l-4.816-4.816A6 6 0 012 8z" clip-rule="evenodd" />
+                        </svg>
+                    </div>
+                    <div id="result" class="absolute z-10 bg-white border border-gray-300 rounded-lg mt-1 shadow-lg hidden  ">
+                        <!-- kết quả trả về -->
+                        <!--   <div id="search-result-template" class="hidden flex items-center space-x-4 p-2 border-b border-gray-200 hover:bg-gray-100 cursor-pointer">
+                               <img src="" alt="Game Image" class="w-16 h-16 object-cover rounded-lg">
+                               <div class="flex flex-col">
+                                   <h4 class="text-lg font-medium text-gray-800">Tên Game</h4>
+                                   <p class="text-sm text-gray-500">Thể loại Game</p>
+                               </div>
+                           </div>  -->
+                    </div>
+
+                </div>
+                <!-- Game Options -->
+                <div class="flex flex-col space-y-2">
+                    <button onclick="filterGames('All')" class="sidebar-btn flex items-center space-x-2 transition-transform transform hover:scale-105 hover:bg-blue-100 rounded-lg p-2">
+                        <i class="fas fa-gamepad w-6 h-6 flex-shrink-0"></i> 
+                        <span>Chơi game</span>
+                    </button>
+                    <button class="sidebar-btn flex items-center space-x-2 transition-transform transform hover:scale-105 hover:bg-blue-100 rounded-lg p-2">
+                        <i class="fas fa-bell w-6 h-6 flex-shrink-0"></i> 
+                        <span>Thông Báo</span>
+                    </button>
+
+                 <hr class="my-5">
+
+                    <p class="text-sm text-gray-500 mb-2">Game của bạn</p>
+                     <button class="sidebar-btn flex items-center space-x-2 transition-transform transform hover:scale-105 hover:bg-blue-100 rounded-lg p-2">
+                        <i class="far fa-bookmark w-6 h-6 flex-shrink-0"></i>    
+                        <span>Lưu game</span>
+                    </button> 
+                 
+
+                    <hr class="my-4">
+
+                    <!-- Categories -->
+                    <h3 class="text-lg font-semibold mb-4">Hạng mục</h3>
+                    <button onclick="filterGames('All')" class="sidebar-btn flex items-center space-x-2 transition-transform transform hover:scale-105 hover:bg-blue-100 rounded-lg p-2">
+                        <i class="fas fa-th-large w-6 h-6 flex-shrink-0"></i> 
+                        <span>Tất cả game</span>
+                    </button>
+                    <button onclick="filterGames('Action')" class="sidebar-btn flex items-center space-x-2 transition-transform transform hover:scale-105 hover:bg-blue-100 rounded-lg p-2">
+                        <i class="fas fa-running w-6 h-6 flex-shrink-0"></i> 
+                        <span>Hành động</span>
+                    </button>
+                    <button onclick="filterGames('Adventure')" class="sidebar-btn flex items-center space-x-2 transition-transform transform hover:scale-105 hover:bg-blue-100 rounded-lg p-2">
+                        <i class="fas fa-map w-6 h-6 flex-shrink-0"></i> 
+                        <span>Phiêu lưu</span>
+                    </button>
+                    <Button onclick="filterGames('Board game')" class="sidebar-btn flex items-center space-x-2 transition-transform transform hover:scale-105 hover:bg-blue-100 rounded-lg p-2">
+                        <i class="fas fa-chess-board w-6 h-6 flex-shrink-0"></i> 
+                        <span>Board game</span>
+                    </Button>
+                    <button onclick="filterGames('Card game')" class="sidebar-btn flex items-center space-x-2 transition-transform transform hover:scale-105 hover:bg-blue-100 rounded-lg p-2">
+                        <i class="fas fa-cards w-6 h-6 flex-shrink-0"></i> 
+                        <span>Đánh bài</span>
+                    </button>
+                    <button onclick="filterGames('Building')" class="sidebar-btn flex items-center space-x-2 transition-transform transform hover:scale-105 hover:bg-blue-100 rounded-lg p-2">
+                        <i class="fas fa-building w-6 h-6 flex-shrink-0"></i> 
+                        <span>Xây dựng</span>
+                    </button>
+                    <button onclick="filterGames('Combat')" class="sidebar-btn flex items-center space-x-2 transition-transform transform hover:scale-105 hover:bg-blue-100 rounded-lg p-2">
+                        <i class="fas fa-fist-raised w-6 h-6 flex-shrink-0"></i> 
+                        <span>Chiến đấu</span>
+                    </button>
+                </div>
+            </aside>
+            <script>
+                function filterGames(theloai) {
+
+                    const games = document.querySelectorAll('.game-item');
+                    if (theloai !== 'All')
+                        document.querySelector('.title').textContent = theloai;
+                    else
+                        document.querySelector('.title').textContent = 'Tất cả game';
+
+
+                    games.forEach(game => {
+                        // Kiểm tra nếu game có thể loại phù hợp với điều kiện
+                        if (game.getAttribute('data-theloai') === theloai || theloai === 'All') {
+                            game.style.display = 'block'; // Hiển thị game
+                        } else {
+                            game.style.display = 'none'; // Ẩn game
+                        }
+                    });
+                }
+            </script>
+
+
+            <!-- Main Content -->
+            <main class="flex-grow p-6 main-content">
+                <h1 id="title" class=" title text-4xl font-bold text-center" style="margin: 20px ">Tất cả game</h1>
+                <div class="grid grid-cols-4 gap-6">
+                    <!-- Game Cards -->
+                    <c:forEach var="game" items="${list}">
+                        <button data-theloai="${game.theloai}" onclick="showGame('${game.link}')" class="game-item relative overflow-hidden rounded-lg shadow-lg group transition-transform duration-300 ease-in-out transform hover:scale-105 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500">
+                            <img src="${game.linkimg}" alt="Game image" class="w-full h-full object-cover transition-transform duration-300 ease-in-out group-hover:scale-110" />
+                            <div class="absolute bottom-0 left-0 right-0 bg-gradient-to-t from-black to-transparent p-4">
+                                <h4 class="text-lg font-semibold text-white mb-1 transition-colors duration-300 ease-in-out group-hover:text-blue-300">${game.tengame}</h4>
+                                <p class="text-sm text-gray-300 transition-colors duration-300 ease-in-out group-hover:text-blue-200">${game.theloai}</p>
+                            </div>
+                        </button>
+                    </c:forEach>
+
+
+
+                </div>
+            </main>
+        </div>
+        <!-- Div ẩn chứa iframe để tải trò chơi -->
+        <div id="gameModal" aria-hidden="true" class="fixed inset-0 bg-gray-800 bg-opacity-75 flex justify-center items-center hidden">
+            <div class="bg-white" style="width: 800px; height: 600px; padding: 16px; border-radius: 8px; box-shadow: 0px 0px 24px 0px rgba(0, 0, 0, 0.2); position: relative;">
+                <button id="closeModal" style="position: absolute; top: 16px; right: 16px; color: #4a5568;">&times;</button>
+                <div id="gameContent" class="w-full h-full">
+                    <!-- Iframe chứa trò chơi -->
+                    <iframe id="gameIframe" src="" width="100%" height="100%" frameborder="0" allowfullscreen></iframe>
+                </div>
+            </div>
+        </div>
+                        <script src="assets/js/logonavbar.js" defer></script>
+
+        <script>
+            function showGame(gameUrl) {
+                // Hiển thị modal chứa game
+                document.getElementById('gameModal').classList.remove('hidden');
+                document.getElementById('gameModal').setAttribute('aria-hidden', 'false');
+
+                // Đặt URL cho iframe để tải trò chơi
+                document.getElementById('gameIframe').src = gameUrl;
+            }
+            // Khi người dùng nhấp vào nút đóng
+            document.getElementById('closeModal').addEventListener('click', function () {
+                document.getElementById('gameModal').classList.add('hidden');
+                document.getElementById('gameModal').setAttribute('aria-hidden', 'true');
+                document.getElementById('gameIframe').src = ''; // Xóa nội dung trò chơi
+            });
+        </script>
+        <!-- <script src="game.js"></script> -->
+
+
+    </body>
+</html>
diff --git a/web/WEB-INF/home.jsp b/web/WEB-INF/home.jsp
index 85765a1..438bfff 100644
--- a/web/WEB-INF/home.jsp
+++ b/web/WEB-INF/home.jsp
@@ -8,104 +8,260 @@
 <%@ page import="model.Message, dao.MessageDao" %>
 <%@ taglib prefix="c" uri="jakarta.tags.core"%>
 <%@ taglib prefix="fmt" uri="jakarta.tags.fmt"%>
+
 <!DOCTYPE html>
 <html lang="en">
     <head>
         <meta charset="UTF-8">
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
-        <title>Home Page</title>
-        <link href="assets/css/bootstrap.min.css" rel="stylesheet">
-        <link rel="stylesheet" href="assets/css/home.css">
+        <title>Social Network</title>
+        <link href="assets/css/bootstrap.min.css" rel="stylesheet">    
+        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css">
         <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
-        <script src="https://kit.fontawesome.com/7f80ec1f7e.js" crossorigin="anonymous"></script>
-
+        <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
+        <link rel="stylesheet" href="https://www.w3schools.com/w3css/4/w3.css">
+        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
+        <script src="https://unpkg.com/boxicons@2.1.4/dist/boxicons.js"></script>
+        <script src='https://kit.fontawesome.com/a076d05399.js' crossorigin='anonymous'></script>
+        <link href="assets/css/home.css" rel="stylesheet">    
+        <link href="assets/css/logonavbar.css" rel="stylesheet">   
     </head>
     <body>
-        <header id="header">
-            <nav class="navbar custom-navbar">
-                <div class="container-fluid d-flex align-items-center">
-                    <a class="navbar-brand text-primary" href="/FUNET/home" style="font-weight: bold">FUNET</a>
-                    <form class="d-flex ms-2 flex-grow-1" method="get" action="/FUNET/searchServlet">
-                        <input class="form-control" name="search-name" type="search" placeholder="Searching in FUNET" aria-label="Search">
-                        <button type="submit" class="search-button">
-                            <i class="fa-solid fa-magnifying-glass"></i>
-                        </button>
-                    </form>
-                    <div class="nav-icons d-flex align-items-center justify-content-between">
-                        <a href="/FUNET/lmaterialLink" class="lm-icon fa-solid fa-book fa-lg me-3">
-                        </a>
-                        <a href="/FUNET/marketLink" class="market-icon fa-solid fa-store fa-lg me-3"></a>
-                        <a href="/FUNET/friendRequestServlet" class="friend-icon me-3">
-                            <svg viewBox="0 0 24 24" width="24" height="24" fill="currentColor" class="x19dipnz x1lliihq x1tzjh5l x1k90msu x2h7rmj x1qfuztq" style="--color:var(--secondary-icon)"><path d="M.5 12c0 6.351 5.149 11.5 11.5 11.5S23.5 18.351 23.5 12 18.351.5 12 .5.5 5.649.5 12zm2 0c0-.682.072-1.348.209-1.99a2 2 0 0 1 0 3.98A9.539 9.539 0 0 1 2.5 12zm.84-3.912A9.502 9.502 0 0 1 12 2.5a9.502 9.502 0 0 1 8.66 5.588 4.001 4.001 0 0 0 0 7.824 9.514 9.514 0 0 1-1.755 2.613A5.002 5.002 0 0 0 14 14.5h-4a5.002 5.002 0 0 0-4.905 4.025 9.515 9.515 0 0 1-1.755-2.613 4.001 4.001 0 0 0 0-7.824zM12 5a4 4 0 1 1 0 8 4 4 0 0 1 0-8zm-2 4a2 2 0 1 0 4 0 2 2 0 0 0-4 0zm11.291 1.01a9.538 9.538 0 0 1 0 3.98 2 2 0 0 1 0-3.98zM16.99 20.087A9.455 9.455 0 0 1 12 21.5c-1.83 0-3.54-.517-4.99-1.414a1.004 1.004 0 0 1-.01-.148V19.5a3 3 0 0 1 3-3h4a3 3 0 0 1 3 3v.438a1 1 0 0 1-.01.148z"></path></svg>
-                        </a>
-                        <a href="/FUNET/chat" class="mess-icon me-3">
-                            <i class="fas fa-comments"></i>
-                        </a> 
-                    </div>
-                    <form method="post" action="/FUNET/logout">
-                        <button type="submit" class="navbar-brand text-primary log-out" style="font-weight: bold">Log out</button>
-                    </form>
+        <div class="flex-container navbar">
+            <a href="home" style ="text-decoration:none">   <div class="logo" style="margin-bottom: 10%">FUNET</div>
+            </a>
+            <form class="" method="get" action="/FUNET/searchServlet" id="searchForm">
+                <div class="search-bar" style="margin-top:1%;">
+                    <input class="form-control" name="search-name" type="search" placeholder="Searching in FUNET" aria-label="Search" id="search-input" style="padding-left:5%;">
+
+                </div>
+            </form>
+            <div class="center-buttons">
+                <a href="home">
+                    <button class="center-button" id="home-btn">
+                        <box-icon type='solid' name='home'></box-icon>
+                    </button>
+                </a>
+                <a href="lmaterialLink"> 
+                    <button class="center-button" id="video-btn">
+                        <box-icon type='solid' name='book'></box-icon>
+                    </button>
+                </a>
+                <a href="market">
+                    <button class="center-button" id="market-btn">
+                        <box-icon name='store-alt' type='solid'></box-icon>
+                    </button>
+                </a>
+                <a href="/FUNET/friendRequestServlet" class="friend-icon me-3">
+                    <button class="center-button" id="friend-btn">
+                        <box-icon name='group' type='solid'></box-icon>
+                    </button>
+                </a>
+            </div>
+            <div class="right-icons">
+                <a href="/FUNET/chat" class="mess-icon" style='margin-left:5px'>
+                    <span class="icon icon-circle" id="messenger-btn"><box-icon name='messenger' type='logo'></box-icon></span>
+                </a>
+                <span class="icon icon-circle" id="notification-btn" style="display:none"><box-icon name='bell' type='solid' ></box-icon></span>
+                <span class="icon icon-circle" id="user-btn">&#128100;</span>
+            </div>
+
+        </div>
+
+        <div class="dropdown-menu" id="notification-menu">
+            <p>Notification content goes here...</p>
+        </div>
+    
+    <div class="dropdown-menu" id="notification-menu">
+        <p>Notification content goes here...</p>
+    </div>
+    <div class="user-menu" id="user-menu" >
+        <div class="user-info">
+            <a href="profile?userId=${sessionScope.user['user_id']}" class="d-flex align-items-center text-decoration-none text-dark">
+                <button class="user-info-button">
+                    <img src="assets/profile_avt/${sessionScope.user['profile_pic']}" class="img-fluid rounded-circle avatar" style="object-fit: cover;">
+                    <p class="mb-0 ms-2 ava-name">${sessionScope.user['first_name']} ${sessionScope.user['last_name']}</p>
+                </button>
+            </a>
+        </div>
+        <div class="menu-item">
+            <box-icon name='cog' type='solid' style="margin-right:3%; margin-left:1%;">Settings</box-icon>Settings
+        </div>
+        <div class="menu-item" >
+            <box-icon name='error-circle'style="margin-right:3%; margin-left:1%;"></box-icon>Report
+        </div>
+        
+
+        <form method="post" action="/FUNET/logout" style="display: inline; width: 100%;">
+            <div class="menu-item" style="display: flex; align-items: center; cursor: pointer; width: 100%;">
+                <box-icon type='solid' name='log-out'style=" margin-left:1%;"></box-icon>
+                <button type="submit" style="border: none; background: none; color: black; font-size: 16px; margin-left: 5px; cursor: pointer; flex: 1; text-align: left;">
+                    Log Out
+                </button>
+            </div>
+        </form>
+    </div>
+
+    <div class="container">
+        <div class="row">
+            <div class="col-4 dashBoard" style="margin-top:1%;">
+                <a href="profile?userId=${sessionScope.user['user_id']}" style="text-decoration:none; width: fit-content;">
+                    <div class="UserAvatar" >
+                        <img src="assets/profile_avt/${user.profile_pic}" class="img-fluid rounded-circle avatar" style="margin-left:1%;">
+                        <span class="mb-0 ms-2 ava-name">${sessionScope.user['first_name']} ${sessionScope.user['last_name']}</span>        
+                    </div></a>
+
+                <div class="RightItem">
+                    <a href="/FUNET/friendRequestServlet" style="text-decoration: none">
+                         <div><i class='fas fa-user-friends'style="margin-left:5%;" > </i>    Friends</div>
+                    </a>                   
+                    <a href="savePostServlet" style="text-decoration: none">
+                        <div>
+                            <box-icon type='solid' name='bookmark'style="margin-left:5%;"></box-icon> Saved
+                        </div>
+                    </a>
+                    <a href="marketLink" style="text-decoration: none">
+                         <div><box-icon name='store-alt' type='solid'style="margin-left:5%;"></box-icon> Market</div>
+                    </a>
+                   
+                    <a href="lmaterialLink"style="text-decoration: none"> 
+                        <div><box-icon type='solid' name='book'style="margin-left:5%;"></box-icon> Learning Materials</div>
+                    </a>
+                    <a href="game" style="text-decoration: none"><div><i class='fas fa-gamepad' style='font-size:20px;margin-left:5%;'></i> Game</div></a>
+                    
+                    <hr style="border: 1px solid black; width: 100%;"><!-- comment -->
+
+                    <p>Your ShortCut</p>
                 </div>
-            </nav>
-        </header>
-        <div class="container-fluid">
-            <div class="row all-post">
-                <nav class="col-2 py-3 bg-light sticky-sidebar">
-                    <div class="profile-section mb-3 d-flex align-items-center">
-                        <a href="profile?userId=${sessionScope.user['user_id']}" class="d-flex align-items-center text-decoration-none text-dark">
-                            <img src="assets/profile_avt/${sessionScope.user['profile_pic']}" class="img-fluid rounded-circle avatar" style="object-fit: cover;">
-                            <p class="mb-0 ms-2 ava-name">${sessionScope.user['first_name']} ${sessionScope.user['last_name']}</p>
-                        </a>
-                    </div>
-                    <div class="chat-box mb-3">
-
-                    </div>
-                </nav>
-
-                <main class="main-class col-8">
-                    <h1 class="mt-3 text-primary home-logo">HOME</h1>
-
-                    <form action="/FUNET/home" method="post" class="mb-4 post-method" enctype="multipart/form-data" onsubmit="document.getElementById('myBtn').disabled = true;">
-                        <div class="mb-3">
-                            <textarea class="form-control" id="body" name="postContent" rows="2" placeholder="What ya thinking" maxlength="300"></textarea>
+            </div>
+            <div class="col-4 mainContainer">
+                <div class="post">
+                    <section class="input">
+                        <a href="profile?userId=${sessionScope.user['user_id']}" style="text-decoration:none"  ><img src="assets/profile_avt/${user.profile_pic}"  class="img-fluid rounded-circle avatar2" style="margin-right: 10px;"></a> 
+                        <div class="inputArea">
+                            <input type="text" placeholder="What ya thinking..." id="posting">
+                        </div>
+                        <hr style="border: 1px solid black; width: 100%; margin:0;">
+                        <div class="btn-document">
+                            <div class="item" id="photoVideoBtn" >Photo/Video</div>
+                            <div class="item" id="fileBtn">File</div>
                         </div>
-                        <div class="mb-3">
-                            <label for="file-upload" class="custom-file-upload">
-                                <i class="fas fa-cloud-upload-alt"></i> Choose Image
-                            </label>
-                            <input id="file-upload" type="file" name="image" accept=".jpeg, .png, .jpg" style="display:none;" onchange="updateFileName(this)">
-                            <span id="file-name"></span>
+                    </section>
+                </div>
+
+                <div class="overlay" id="overlay" style="display: none;"></div>
+
+                <div class="form-container" id="formContainer" style="display: none;">
+                    <form action="/FUNET/home" method="post" enctype="multipart/form-data" onsubmit="document.getElementById('myBtn').disabled = true;">
+                        <div class="form-content">
+                            <div class="head"><p class="form-title">Create post</p>
+                                <button type="button" class="close-button" aria-label="Close">X</button>
+                            </div>
+                            <hr class="hr-line">
+                            <div class="form-header">                        
+                                <a href="profile?userId=${sessionScope.user['user_id']}" style="text-decoration:none"  ><img src="assets/profile_avt/${sessionScope.user['profile_pic']}" class="avatar"></a> 
+                                <p class="mb-0 ava-name">${sessionScope.user['first_name']} ${sessionScope.user['last_name']}</p>
+                            </div>
+                            <div class="textarea-container"　id="formContainer">
+                                <textarea class="form-control" id="body" name="postContent" placeholder="What ya thinking" maxlength="300" oninput="adjustFontSize()"></textarea>
+                            </div>
+                            <hr class="hr-line" >
+                            <div class="upload-section" style="margin-top:0;margin-bottom:1%;">
+                                <div class="item" style="height:50px; padding-top:3%;">
+                                    <label for="photo-upload">
+                                        <i class="fas fa-cloud-upload-alt"></i> Photo/Video
+                                    </label>
+                                    <input id="photo-upload" type="file" name="image" accept=".jpeg, .png, .jpg" style="display: none;" onchange="updateFileName(this)">
+                                </div>
+                                <div class="item"style="height:50px; padding-top:3%;">
+                                    <label for="file-upload">
+                                        <i class="fas fa-file-alt"></i> File
+                                    </label>
+                                    <input id="file-upload" type="file" name="file" accept=".txt, .pdf, .docx" style="display: none;" onchange="updateFileName(this)">
+                                </div>
+                            </div>
                         </div>
-                        <button id="myBtn" type="submit" class="btn btn-primary" style="padding: 5px 25px;">Post</button>
+                        <button id="myBtn" type="submit" class="submit-button">Post</button>
                     </form>
+                </div>
 
-                    <br>
 
+                 <div>
                     <c:forEach var="post" items="${posts}">
                         <div class="post mb-4" style="overflow-wrap: break-word" data-post-id="${post.post_id}" data-liked="${post.likedByCurrentUser}">
-                            <div class="post-header">
-                                <img src="assets/profile_avt/${post.profile_pic}" class="img-fluid rounded-circle avatar me-2" style="width: 40px; height: 40px;object-fit: cover;">
-                                <small>${post.first_name} ${post.last_name} -- <fmt:formatDate value="${post.post_time}" pattern="yyyy-MM-dd HH:mm:ss" /></small>
+                            <div class="post-header d-flex justify-content-between align-items-center">
+                                <div class="d-flex align-items-center">
+                                    <img src="assets/profile_avt/${post.profile_pic}" class="img-fluid rounded-circle avatar me-2" style="width: 40px; height: 40px;object-fit: cover;">
+                                    <small>${post.first_name} ${post.last_name} -- <fmt:formatDate value="${post.post_time}" pattern="yyyy-MM-dd HH:mm:ss" /></small>
+                                </div>
+                                <span class="thre-dto-btn fas fa-ellipsis-h"></span>
+                                <div class="dropdown-save" style="display: none;">
+                                    <form action="/FUNET/savePostServlet" method="post">
+                                        <input type="hidden" name="postId" value="${post.post_id}">
+                                        <c:choose>
+                                            <c:when test="${post.savedByCurrentUser}">
+                                                <button type="submit" class="btn-warning">
+                                                    <i class="fas fa-bookmark me-2"></i>Unsave Post
+                                                </button>
+                                            </c:when>
+                                            <c:otherwise>
+                                                <button type="submit" class="btn-primary">
+                                                    <i class="far fa-bookmark me-2"></i>Save Post
+                                                </button>
+                                            </c:otherwise>
+                                        </c:choose>
+                                    </form>
+                                </div>
                             </div>
+
+                            <c:if test="${post.isShared}">
+
+                                <div class="original-post-info d-flex align-items-center">
+                                    <img src="assets/profile_avt/${post.originalPosterAvatar}" class="img-fluid rounded-circle avatar me-2" style="width: 30px; height: 30px;object-fit: cover;">
+                                    <small>${post.originalPosterName}</small>
+                                </div>
+                            </c:if>
                             <p>${post.body}</p> 
                             <c:if test="${not empty post.image_path}">
                                 <div>
-                                    <img src="assets/post_image/${post.image_path}" style="max-width : 60%">
+
+                                    <c:choose>
+                                        <c:when test="${post.type == 'image'}">
+                                            <img src="${post.image_path}" style="max-width : 100%">
+                                        </c:when>
+                                        <c:otherwise>
+                                            <video style="max-width: 100%" controls>
+                                                <source src="${post.image_path}" type="video/mp4">
+                                                
+                                            </video>
+                                        </c:otherwise>
+                                    </c:choose>
+
                                 </div>
                             </c:if>
 
 
                             <div class="post-ratings-container">
-                                <div class="post-rating ${post.likedByCurrentUser ? 'post-rating-selected' : ''}">
+                                <div class="post-rating ${post.likedByCurrentUser ? 'post-rating-selected' : ''}" style="margin-left:2%;">
                                     <button type="button" style="background: none; border: none; cursor: pointer; padding: 0;">
                                         <span class="material-icons" style="color: ${post.likedByCurrentUser ? '#1877f2' : '#65676b'};">
                                             thumb_up
                                         </span>
                                     </button>
-                                    <span class="post-rating-count">${post.like_count}</span>
+                                    <span class="like-count"><span class="post-rating-count">${post.like_count}</span></span>
+                                </div>
+                                <%-- <c:if test="${!post.isShared}"> --%>
+                              
+                                <div class="post-share" style="margin-left:78%">
+                                    <form action="sharePostServlet" method="post" style="display: inline;">
+                                        <input type="hidden" name="postId" value="${post.post_id}">
+                                        <input type="hidden" name="sourceUrl" value="home">
+                                        <button type="submit" class="btn btn-link">Share</button>
+                                    </form>
+                                    <span class="post-share-count">${post.shareCount}</span>
                                 </div>
+                                <%--   </c:if> --%>
                             </div>
-
                             <div class="post-comments">
                                 <c:forEach var="comment" items="${post.comments}">
                                     <div class="comment mb-2" style="margin-left: 20px;">
@@ -113,20 +269,40 @@
                                             <img src="assets/profile_avt/${comment.profile_pic}" class="img-fluid rounded-circle avatar me-2" style="width: 30px; height: 30px; object-fit: cover;">
                                             <small><strong>${comment.first_name} ${comment.last_name}</strong></small>
                                         </div>
-                                        <div class="comment-body">
-                                            <p style="margin-bottom: 0;">${comment.comment_text}</p>
+                                        <div class="comment-body" style="display: flex; justify-content: space-between; align-items: center;">
+                                            <p style="margin-bottom: 0;" class="comment-text">${comment.comment_text}</p>
+                                            <div class="comment-options">
+                                                <c:if test="${sessionScope.user['user_id'] == comment.user_id}">
+                                                    <button class="three-dot-btn" data-comment-id="${comment.comment_id}">...</button>
+                                                </c:if>
+                                                <div class="comment-actions" style="display: none; flex-direction:column;">
+                                                    
+                                                    <button class="edit-comment-btn" data-comment-id="${comment.comment_id}">Edit</button>
+                                                    <form action="/FUNET/deleteCommentServlet" method="post" class="delete-comment-form" style="display: inline;">
+                                                        <input type="hidden" name="commentId" value="${comment.comment_id}">
+                                                        <button type="submit" class="delete-comment-btn">Delete</button>
+                                                    </form>
+                                                       
+                                                </div>
+                                            </div>
                                         </div>
+                                        <form action="/FUNET/updateCommentServlet" method="post" class="edit-comment-form" style="display: none;">
+                                            <input type="hidden" name="commentId" value="${comment.comment_id}">
+                                            <textarea name="newCommentText" class="form-control">${comment.comment_text}</textarea>
+                                            <button type="submit" class="btn btn-primary">Save</button>
+                                            <button type="button" class="btn btn-secondary cancel-edit-comment">Cancel</button>
+                                        </form>
                                     </div>
                                 </c:forEach>
                             </div>
 
 
-                            <form action="/FUNET/commentServlet" method="post" class="mb-4 post-method">
+                            <form action="/FUNET/commentServlet" method="post" id="commentform" class="mb-4 post-method">
                                 <div class="mb-3">
-                                    <textarea class="form-control" id="body" name="commentContent" maxlength="300" rows="2" placeholder="Reply"></textarea>
+                                    <input type="text" class="form-control" style="border-radius: 20px;width: 90%; height: 30px;margin-bottom:0;" id="body" name="commentContent" maxlength="300" rows="2" placeholder="Comment" style="width:80%; height: 35px">
                                 </div>
+                                <input type="hidden" name="sourceUrl" value="home">
                                 <input type="hidden" name="post_id" value="${post.post_id}">
-                                <button type="submit" class="btn btn-primary" style="padding: 5px 25px; margin-top: 5px">Comment</button>
                             </form>
 
 
@@ -134,28 +310,293 @@
                         </div>
                         <br>
                     </c:forEach>
-                </main>
-                <aside class="col-2 py-3 bg-light friend-list sticky-sidebar">
+                </div>
+            </div>
+
+            <div class="col-4 listFriend">
+                <aside class="col-2 py-3  friend-list sticky-sidebar" style="width:90%;justify-content: end;display:grid;">
                     <h2 style="color: #0d6efd">List Friends</h2>
-                    <hr>
+                    <hr style="margin:0;border:solid black 1px">
                     <c:forEach var="friend" items="${friends}">
-                        <div class="post mb-4 d-flex align-items-center" style="overflow-wrap: break-word">
-                            <a href="#" class="user-link friend" data-user-id="${friend.user_id}">
+                        <div class="post mb-4 d-flex align-items-center friends" style="overflow-wrap: break-word;border: none;background: none;">
+                            <a href="profile?userId=${friend.user_id}" class="user-link friend" data-user-id="${friend.user_id}" style="text-decoration:none;">
                                 <img src="assets/profile_avt/${friend.profile_pic}" alt="avatar picture" class="img-fluid rounded-circle avatar me-2" style="width: 50px; height: 50px; object-fit: cover;">
+                                 <small>${friend.first_name} ${friend.last_name}</small>
                             </a>
-                            <small>${friend.first_name} ${friend.last_name}</small>
+                           
                         </div>
                     </c:forEach>
+                     
                 </aside>
             </div>
         </div>
+    </div>
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
+        <script src="assets/js/bootstrap.bundle.min.js"></script>
+         <script src="assets/js/reaction.js" defer></script>
+
+        <script>
+                                        document.addEventListener('DOMContentLoaded', function () {
+                                            const style = document.createElement('style');
+                                            style.textContent = `
+        .post {
+            position: relative;
+        }
+        
+        .thre-dto-btn {
+            cursor: pointer;
+            padding: 5px 10px;
+            float: right;
+        }
+        
+        .post .dropdown-save {
+            position: absolute;
+            right: 10px;
+            top: 40px;
+            background-color: white;
+            border-radius: 8px;
+            box-shadow: 0 2px 10px rgba(0,0,0,0.1);
+            padding: 8px;
+            min-width: 150px;
+            z-index: 1000;
+        }
+        
+        .post .dropdown-save button {
+            width: 100%;
+            padding: 8px 12px;
+            border: none;
+            background: none;
+            text-align: left;
+            cursor: pointer;
+            border-radius: 4px;
+            transition: background-color 0.2s;
+        }
+        
+        .post .dropdown-save button:hover {
+            background-color: #f0f2f5;
+        }
+        
+        .post .dropdown-save button.btn-primary {
+            color: #1877f2;
+        }
+        
+        .post .dropdown-save button.btn-warning {
+            color: #ed6c02;
+        }
+    `;
+                                            document.head.appendChild(style);
+
+                                            const posts = document.querySelectorAll('.post');
+
+                                            posts.forEach(post => {
+                                                const threeDotBtn = post.querySelector('.thre-dto-btn');
+                                                const dropdownMenu = post.querySelector('.dropdown-save');
+
+                                                if (threeDotBtn && dropdownMenu) {
+                                                    threeDotBtn.addEventListener('click', (e) => {
+                                                        e.stopPropagation();
+
+                                                        document.querySelectorAll('.post .dropdown-save').forEach(menu => {
+                                                            if (menu !== dropdownMenu) {
+                                                                menu.style.display = 'none';
+                                                            }
+                                                        });
+
+                                                        dropdownMenu.style.display = dropdownMenu.style.display === 'none' ? 'block' : 'none';
+                                                    });
+                                                }
+                                            });
+
+                                            document.addEventListener('click', (e) => {
+                                                if (!e.target.closest('.thre-dto-btn')) {
+                                                    document.querySelectorAll('.post .dropdown-save').forEach(menu => {
+                                                        menu.style.display = 'none';
+                                                    });
+                                                }
+                                            });
+                                        });
+        </script>
+
+        <!-- delete update comment + button"..." -->
+        <script>
+            document.addEventListener('DOMContentLoaded', function () {
+                document.querySelectorAll('.edit-comment-btn').forEach(button => {
+                    button.addEventListener('click', function () {
+                        const commentId = this.getAttribute('data-comment-id');
+                        const commentText = this.closest('.comment').querySelector('.comment-text');
+                        const editForm = this.closest('.comment').querySelector('.edit-comment-form');
+                        commentText.style.display = 'none';
+                        editForm.style.display = 'block';
+                    });
+                });
+
+                document.querySelectorAll('.cancel-edit-comment').forEach(button => {
+                    button.addEventListener('click', function () {
+                        const commentText = this.closest('.comment').querySelector('.comment-text');
+                        const editForm = this.closest('.comment').querySelector('.edit-comment-form');
+                        commentText.style.display = 'block';
+                        editForm.style.display = 'none';
+                    });
+                });
+            });
+
+            document.addEventListener('DOMContentLoaded', function () {
+                document.querySelectorAll('.three-dot-btn').forEach(button => {
+                    button.addEventListener('click', function () {
+                        const commentId = this.getAttribute('data-comment-id');
+                        const actions = this.closest('.comment-options').querySelector('.comment-actions');
+                        actions.style.display = actions.style.display === 'none' ? 'block' : 'none';
+                    });
+                });
+
+                document.querySelectorAll('.edit-comment-btn').forEach(button => {
+                    button.addEventListener('click', function () {
+                        const commentId = this.getAttribute('data-comment-id');
+                        const commentText = this.closest('.comment').querySelector('.comment-text');
+                        const editForm = this.closest('.comment').querySelector('.edit-comment-form');
+                        commentText.style.display = 'none';
+                        editForm.style.display = 'block';
+                    });
+                });
+
+                document.querySelectorAll('.cancel-edit-comment').forEach(button => {
+                    button.addEventListener('click', function () {
+                        const commentText = this.closest('.comment').querySelector('.comment-text');
+                        const editForm = this.closest('.comment').querySelector('.edit-comment-form');
+                        commentText.style.display = 'block';
+                        editForm.style.display = 'none';
+                    });
+                });
+            });
+        </script>
+        <!-- --------- -->
         <script>
-            function updateFileName(input) {
-                var fileName = input.files[0].name;
-                document.getElementById('file-name').textContent = fileName;
+            document.addEventListener('DOMContentLoaded', function () {
+                const searchInput = document.getElementById('search-input');
+                const searchForm = document.getElementById('searchForm');
+
+                searchInput.addEventListener('keypress', function (event) {
+                    if (event.key === 'Enter') {
+                        event.preventDefault();
+                        searchForm.submit();
+                    }
+                });
+            });
+
+            document.getElementById('messenger-btn').addEventListener('click', function () {
+                toggleMenu('messenger-menu', 'messenger-btn');
+            });
+
+            document.getElementById('notification-btn').addEventListener('click', function () {
+                toggleMenu('notification-menu', 'notification-btn');
+            });
+
+            document.getElementById('user-btn').addEventListener('click', function () {
+                toggleMenu('user-menu', 'user-btn');
+            });
+
+//            document.addEventListener('click', function (event) {
+//                const messengerMenu = document.getElementById('messenger-menu');
+//                const notificationMenu = document.getElementById('notification-menu');
+//                const userMenu = document.getElementById('user-menu');
+//                const messengerBtn = document.getElementById('messenger-btn');
+//                const notificationBtn = document.getElementById('notification-btn');
+//                const userBtn = document.getElementById('user-btn');
+//
+//                if (!messengerMenu.contains(event.target) && !messengerBtn.contains(event.target)) {
+//                    messengerMenu.style.display = 'none';
+//                    messengerBtn.classList.remove('active-button');
+//                }
+//                if (!notificationMenu.contains(event.target) && !notificationBtn.contains(event.target)) {
+//                    notificationMenu.style.display = 'none';
+//                    notificationBtn.classList.remove('active-button');
+//                }
+//                if (!userMenu.contains(event.target) && !userBtn.contains(event.target)) {
+//                    userMenu.style.display = 'none';
+//                    userBtn.classList.remove('active-button');
+//                }
+//            });
+
+            function toggleMenu(menuId, btnId) {
+                const menu = document.getElementById(menuId);
+                const button = document.getElementById(btnId);
+                const otherMenuIds = ['messenger-menu', 'notification-menu', 'user-menu'].filter(id => id !== menuId);
+                const otherButtons = ['messenger-btn', 'notification-btn', 'user-btn'].filter(id => id !== btnId);
+
+                if (menu.style.display === 'none' || menu.style.display === '') {
+                    menu.style.display = 'block';
+                    button.classList.add('active-button');
+                    otherMenuIds.forEach(id => document.getElementById(id).style.display = 'none');
+                    otherButtons.forEach(id => document.getElementById(id).classList.remove('active-button'));
+                } else {
+                    menu.style.display = 'none';
+                    button.classList.remove('active-button');
+                }
             }
+            document.addEventListener('DOMContentLoaded', function () {
+                const overlay = document.getElementById('overlay');
+                const formContainer = document.getElementById('formContainer');
+                const postingInput = document.getElementById('posting');
+                const photoVideoBtn = document.getElementById('photoVideoBtn');
+                const fileBtn = document.getElementById('fileBtn');
+                const closeButton = document.querySelector('.close-button');
+
+                function showForm() {
+                    overlay.style.display = 'flex';
+                    formContainer.style.display = 'block';
+                }
+
+                function hideForm() {
+                    overlay.style.display = 'none';
+                    formContainer.style.display = 'none';
+                }
+
+                postingInput.addEventListener('click', showForm);
+                photoVideoBtn.addEventListener('click', showForm);
+                fileBtn.addEventListener('click', showForm);
+
+                closeButton.addEventListener('click', hideForm);
+                overlay.addEventListener('click', function (event) {
+                    if (event.target === overlay) {
+                        hideForm();
+                    }
+                });
+                postForm.addEventListener('submit', function (event) {
+                    event.preventDefault();
+                    hideForm();
+
+                });
+            });
+
+
+            document.addEventListener('DOMContentLoaded', function () {
+                const textarea = document.getElementById('body');
+                const formContainer = document.getElementById('formContainer');
+                const baseFormHeight = 415;
+                const initialTextareaHeight = 125;
+                textarea.addEventListener('input', function () {
+                    adjustFontSizeAndFormHeight();
+                });
+                function adjustFontSizeAndFormHeight() {
+                    const maxLines = 3;
+                    const initialFontSize = 25;
+                    const reducedFontSize = 15;
+                    textarea.style.fontSize = initialFontSize + 'px';
+                    textarea.style.height = 'auto';
+
+                    const lineHeight = parseInt(window.getComputedStyle(textarea).lineHeight);
+                    const lines = Math.floor(textarea.scrollHeight / lineHeight);
+                    if (lines > maxLines) {
+                        textarea.style.fontSize = reducedFontSize + 'px';
+                    }
+                    textarea.style.height = textarea.scrollHeight + 'px';
+                    const textareaExtraHeight = textarea.scrollHeight - initialTextareaHeight;
+                    formContainer.style.height = (baseFormHeight + textareaExtraHeight) + 'px';
+                }
+            });
         </script>
-        <script src="assets/js/likeButton.js" defer></script>
-        <script src="assets/js/bootstrap.min.js"></script>   
-    </body>
-</html>
\ No newline at end of file
+
+
+
+</body>
+</html>
diff --git a/web/WEB-INF/log.jsp b/web/WEB-INF/log.jsp
new file mode 100644
index 0000000..2405345
--- /dev/null
+++ b/web/WEB-INF/log.jsp
@@ -0,0 +1,50 @@
+<%@page contentType="text/html" pageEncoding="UTF-8"%>
+<!DOCTYPE html>
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+        <title>User Log</title>
+        <!-- Bootstrap CSS for styling -->
+        <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/css/bootstrap.min.css" rel="stylesheet">
+    </head>
+    <body>
+        <div id="users-page" class="container mt-5">
+            <h1 class="mt-4">Users Management</h1>
+
+            <% String userId = request.getParameter("id");%>
+            <input type="hidden" id="userId" value="<%= userId%>">
+
+            <!-- Add Ban and Unban buttons -->
+            <div class="d-flex justify-content-end mb-4">
+                 <a id="ban-user" class="btn btn-danger me-2" href="dashBoard ">DashBoard</a>
+                <a id="ban-user" class="btn btn-danger me-2" href="ban?id=<%= userId%>&action=ban ">Ban User</a>
+                <a id="unban-user" class="btn btn-success" href="ban?id=<%= userId%>&action=unban">Unban User</a>
+            </div>
+
+            <!-- User Activities Table -->
+            <table class="table table-bordered table-hover">
+                <thead class="table-dark">
+                    <tr>
+                        <th>Post Id</th>
+                        <th>Role</th>
+                        <th>Name</th>
+                        <th>Activity Type</th>
+                        <th>Post id</th>
+                        <th>Comment id</th>
+                        <th>Details</th>
+                        <th>Time</th>
+                        <th>Delete</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <!-- Placeholder for dynamically inserting activity data -->
+                </tbody>
+            </table>
+        </div>
+
+        <!-- JavaScript logic for handling ban and unban -->
+        <script src="assets/js/log.js"></script>
+        <!-- Bootstrap JS (optional) -->
+        <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.bundle.min.js"></script>
+    </body>
+</html>
diff --git a/web/WEB-INF/market.jsp b/web/WEB-INF/market.jsp
index 5c2ff0a..5f39203 100644
--- a/web/WEB-INF/market.jsp
+++ b/web/WEB-INF/market.jsp
@@ -56,30 +56,20 @@
             <div class="row all-post">
                 <nav class="col-2 py-3 bg-light sidebar sticky-sidebar position-sticky" style="top: 76px;">
                     <div class="profile-section mb-3 d-flex align-items-center">
-                        <a href="userpageServlet?userId=${sessionScope.user['user_id']}" class="d-flex align-items-center text-decoration-none text-dark">
-                            <img src="assets/profile_avt/main.jpg" class="img-fluid rounded-circle avatar" style="object-fit: cover;">
-                            <p class="mb-0 ms-2 ava-name">${"vuaga1260"}</p>
-                        </a>
+                        <a href="profile?userId=${sessionScope.user['user_id']}" class="d-flex align-items-center text-decoration-none text-dark">
+                <button class="user-info-button">
+                    <img src="assets/profile_avt/${sessionScope.user['profile_pic']}" class="img-fluid rounded-circle avatar" style="object-fit: cover;">
+                    <p class="mb-0 ms-2 ava-name">${sessionScope.user['first_name']} ${sessionScope.user['last_name']}</p>
+                </button>
+            </a>
                     </div>
                     <div class="chat-box mb-3"></div>
 
-                    <!<!-- chưa có search -->
                     <form action ="SearchProductServlet" class="d-flex mb-3">
                        <input type="text" class="form-control me-2" name="keyword" placeholder="Find product">
                         <button class="btn btn-outline-primary" type="submit">Search</button>
                     </form>
 
-                    <div class="dropdown categories">
-                        <button class="btn btn-primary dropdown-toggle w-100" type="button" id="dropdownMenuBtn" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                            Product Type
-                        </button>
-                        <div class="dropdown-menu w-100" aria-labelledby="dropdownMenuBtn">
-                            <a class="dropdown-item" href="#">Action</a>
-                            <a class="dropdown-item" href="#">Another action</a>
-                            <a class="dropdown-item" href="#">Something else here</a>
-                        </div>
-                    </div>
-
                     <div class="btn-group-vertical w-100 mb-3">
                         <a href="/FUNET/home" class="btn btn-outline-primary mb-2">Main Page</a>
                         <a href="/FUNET/notificationServlet" class="btn btn-outline-primary mb-2">Notifications</a>
@@ -194,6 +184,9 @@
                                             <div class="modal-body">
                                                 <img class="w-100 h-100 productImg" src="${product.product_img}" alt="img" style="width: auto;">
                                             </div>
+                                            <div class="modal-body">
+                                                <h5 class="w-100 h-100 producDescription">${product.productDescription}</h5>
+                                            </div>
 
 
                                                 <div class="quantity-container d-flex align-items-center mt-3">
@@ -243,4 +236,4 @@
                                                     }
         </script>
     </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/web/WEB-INF/marketNotification.jsp b/web/WEB-INF/marketNotification.jsp
index 69de26f..6a8889c 100644
--- a/web/WEB-INF/marketNotification.jsp
+++ b/web/WEB-INF/marketNotification.jsp
@@ -80,22 +80,25 @@
             <div class="row all-post">
                 <nav class="col-2 py-3 bg-light sidebar sticky-sidebar position-sticky" style="top: 76px;">
                     <div class="profile-section mb-3 d-flex align-items-center">
-                        <a href="userpageServlet?userId=${sessionScope.user['user_id']}" class="d-flex align-items-center text-decoration-none text-dark">
-                            <img src="assets/profile_avt/main.jpg" class="img-fluid rounded-circle avatar" style="object-fit: cover;">
-                            <p class="mb-0 ms-2 ava-name">${"vuaga1260"}</p>
-                        </a>
+                        <a href="profile?userId=${sessionScope.user['user_id']}" class="d-flex align-items-center text-decoration-none text-dark">
+                <button class="user-info-button">
+                    <img src="assets/profile_avt/${sessionScope.user['profile_pic']}" class="img-fluid rounded-circle avatar" style="object-fit: cover;">
+                    <p class="mb-0 ms-2 ava-name">${sessionScope.user['first_name']} ${sessionScope.user['last_name']}</p>
+                </button>
+            </a>
                     </div>
                     <div class="chat-box mb-3"></div>
 
-                    <form class="d-flex mb-3">
-                        <input class="form-control me-2" type="search" placeholder="Find product" aria-label="Search">
+                    <form action ="SearchProductServlet" class="d-flex mb-3">
+                        <input type="text" class="form-control me-2" name="keyword" placeholder="Find product">
                         <button class="btn btn-outline-primary" type="submit">Search</button>
                     </form>
+
                     <div class="btn-group-vertical w-100 mb-3">
                         <a href="/FUNET/home" class="btn btn-outline-primary mb-2">Main Page</a>
                         <a href="/FUNET/notificationServlet" class="btn btn-outline-primary mb-2">Notifications</a>
-                        <a href="/FUNET/AddProductServlet" class="btn btn-outline-primary mb-2">Add Learning Material</a>
-                        <a href="/FUNET/SellingProductServlet" class="btn btn-outline-primary mb-2">Yours learning material</a>
+                        <a href="/FUNET/AddProductServlet" class="btn btn-outline-primary mb-2">Add product to market</a>
+                        <a href="/FUNET/SellingProductServlet" class="btn btn-outline-primary mb-2">Yours products</a>
                     </div>
                 </nav>
                 <div class="col-10 main-content">
@@ -111,7 +114,7 @@
                                         <p>Status: ${order.order_status}</p>
 
                                         <c:if test="${order.order_status == 'ongoing'}">
-                                            <form action="updateOrderStatus" method="POST">
+                                            <form action="UpdateOrderStatusServlet" method="POST">
                                                 <input type="hidden" name="orderId" value="${order.order_id}">
                                                 <input type="hidden" name="action" value="confirm">
                                                 <button type="submit" class="btn btn-success">Confirm Receipt</button>
@@ -130,9 +133,8 @@
                                     <p>Buyer ID: ${order.user_id}</p>
                                     <p>Total Amount: $${order.total_amount}</p>
                                     <p>Status: ${order.order_status}</p>
-
-                                    <c:if test="${order.order_status == 'pending'}">
-                                        <form action="updateOrderStatus" method="POST">
+                                    <c:if test="${order.order_status == 'Pending'}">
+                                        <form action="UpdateOrderStatusServlet" method="POST">
                                             <input type="hidden" name="orderId" value="${order.order_id}">
                                             <input type="hidden" name="action" value="submit">
                                             <button type="submit" class="btn btn-primary">Send Order</button>
@@ -140,7 +142,7 @@
                                     </c:if>
 
                                     <c:if test="${order.order_status == 'received'}">
-                                        <form action="updateOrderStatus" method="POST">
+                                        <form action="UpdateOrderStatusServlet" method="POST">
                                             <input type="hidden" name="orderId" value="${order.order_id}">
                                             <input type="hidden" name="action" value="getMoney">
                                             <button type="submit" class="btn btn-warning">Receive Payment</button>
@@ -163,4 +165,4 @@
 
         <script src="assets/js/bootstrap.bundle.min.js"></script>
     </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/web/WEB-INF/paymentInfoProcess.jsp b/web/WEB-INF/paymentInfoProcess.jsp
index 2201f43..75bf3ef 100644
--- a/web/WEB-INF/paymentInfoProcess.jsp
+++ b/web/WEB-INF/paymentInfoProcess.jsp
@@ -74,20 +74,23 @@
         <div class="row all-post">
             <nav class="col-2 py-3 bg-light sidebar sticky-sidebar position-sticky" style="top: 76px;">
                 <div class="profile-section mb-3 d-flex align-items-center">
-                    <a href="userpageServlet?userId=${sessionScope.user['user_id']}" class="d-flex align-items-center text-decoration-none text-dark">
-                        <img src="assets/profile_avt/main.jpg" class="img-fluid rounded-circle avatar" style="object-fit: cover;">
-                        <p class="mb-0 ms-2 ava-name">${"vuaga1260"}</p>
-                    </a>
+                    <a href="profile?userId=${sessionScope.user['user_id']}" class="d-flex align-items-center text-decoration-none text-dark">
+                <button class="user-info-button">
+                    <img src="assets/profile_avt/${sessionScope.user['profile_pic']}" class="img-fluid rounded-circle avatar" style="object-fit: cover;">
+                    <p class="mb-0 ms-2 ava-name">${sessionScope.user['first_name']} ${sessionScope.user['last_name']}</p>
+                </button>
+            </a>
                 </div>
-                <form class="d-flex mb-3">
-                    <input class="form-control me-2" type="search" placeholder="Find product" aria-label="Search">
+                <form action ="SearchProductServlet" class="d-flex mb-3">
+                    <input type="text" class="form-control me-2" name="keyword" placeholder="Find product">
                     <button class="btn btn-outline-primary" type="submit">Search</button>
                 </form>
+
                 <div class="btn-group-vertical w-100 mb-3">
                     <a href="/FUNET/home" class="btn btn-outline-primary mb-2">Main Page</a>
                     <a href="/FUNET/notificationServlet" class="btn btn-outline-primary mb-2">Notifications</a>
-                    <a href="/FUNET/AddProductServlet" class="btn btn-outline-primary mb-2">Add Learning Material</a>
-                    <a href="/FUNET/SellingProductServlet" class="btn btn-outline-primary mb-2">Your Learning Material</a>
+                    <a href="/FUNET/AddProductServlet" class="btn btn-outline-primary mb-2">Add product to market</a>
+                    <a href="/FUNET/SellingProductServlet" class="btn btn-outline-primary mb-2">Yours products</a>
                 </div>
             </nav>
 
@@ -176,4 +179,4 @@
 
     <script src="assets/js/bootstrap.bundle.min.js"></script>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/web/WEB-INF/profile.jsp b/web/WEB-INF/profile.jsp
index 7762792..616157c 100644
--- a/web/WEB-INF/profile.jsp
+++ b/web/WEB-INF/profile.jsp
@@ -16,9 +16,34 @@
         <script src="https://kit.fontawesome.com/7f80ec1f7e.js" crossorigin="anonymous"></script>
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
         <script src="https://unpkg.com/boxicons@2.1.4/dist/boxicons.js"></script>
+
     </head>
 
     <body>
+        <header id="header">
+            <nav class="navbar custom-navbar">
+                <div class="container-fluid d-flex align-items-center">
+                    <a class="navbar-brand text-primary" href="/FUNET/home" style="font-weight: bold">FUNET</a>
+                    <form class="d-flex ms-2 flex-grow-1" method="get" action="/FUNET/searchServlet">
+                        <input class="form-control" name="search-name" type="search" placeholder="Searching in FUNET" aria-label="Search">
+                        <button type="submit" class="search-button">
+                            <i class="fa-solid fa-magnifying-glass"></i>
+                        </button>
+                    </form>
+                    <div class="nav-icons d-flex align-items-center">
+                        <a href="/FUNET/friendRequestServlet" class="friend-icon me-3">
+                            <svg viewBox="0 0 24 24" width="24" height="24" fill="currentColor" class="x19dipnz x1lliihq x1tzjh5l x1k90msu x2h7rmj x1qfuztq" style="--color:var(--secondary-icon)"><path d="M.5 12c0 6.351 5.149 11.5 11.5 11.5S23.5 18.351 23.5 12 18.351.5 12 .5.5 5.649.5 12zm2 0c0-.682.072-1.348.209-1.99a2 2 0 0 1 0 3.98A9.539 9.539 0 0 1 2.5 12zm.84-3.912A9.502 9.502 0 0 1 12 2.5a9.502 9.502 0 0 1 8.66 5.588 4.001 4.001 0 0 0 0 7.824 9.514 9.514 0 0 1-1.755 2.613A5.002 5.002 0 0 0 14 14.5h-4a5.002 5.002 0 0 0-4.905 4.025 9.515 9.515 0 0 1-1.755-2.613 4.001 4.001 0 0 0 0-7.824zM12 5a4 4 0 1 1 0 8 4 4 0 0 1 0-8zm-2 4a2 2 0 1 0 4 0 2 2 0 0 0-4 0zm11.291 1.01a9.538 9.538 0 0 1 0 3.98 2 2 0 0 1 0-3.98zM16.99 20.087A9.455 9.455 0 0 1 12 21.5c-1.83 0-3.54-.517-4.99-1.414a1.004 1.004 0 0 1-.01-.148V19.5a3 3 0 0 1 3-3h4a3 3 0 0 1 3 3v.438a1 1 0 0 1-.01.148z"></path></svg>
+                        </a>
+                        <a href="/FUNET/chat" class="mess-icon me-3">
+                            <i class="fas fa-comments"></i>
+                        </a> 
+                    </div>
+                    <form method="post" action="/FUNET/logout">
+                        <button type="submit" class="navbar-brand text-primary log-out" style="font-weight: bold">Log out</button>
+                    </form>
+                </div>
+            </nav>
+        </header>
         <div class="popop-background"></div>
         <div class="thim-div">
             <div class="hadr-thim-bar">
@@ -49,10 +74,12 @@
                 <img src="assets/profile_avt/${user.profile_pic}">
                 <div class="cover-image-div">
                     <div class="cover-image-edite-btn">
-                        <button>
-                            <i class="fas fa-camera"></i>
-                            Edit Cover Photo
-                        </button>
+                        <a href="setting" style="text-decoration: none">
+                            <button>
+                                <i class="fas fa-camera"></i>
+                                Edit Cover Photo
+                            </button>
+                        </a>
                     </div>
                 </div>
             </header>
@@ -61,7 +88,7 @@
             <div class="profile-section-in">
                 <div class="profile-image-site">
                     <div class="profile-image-div">
-                        <a href="#">
+                        <a href="setting" style="text-decoration: none">
                             <img src="assets/profile_avt/${user.profile_pic}">
                         </a>
                         <span class="fas fa-camera"></span>
@@ -78,14 +105,18 @@
                         </span>
                     </p>
                 </div>
-                <div class="profile-button-site">
-                    <div class="btn-site-pro">
-                        <span class="edit-profile-btn">
-                            <i class="fas fa-pen"></i>
-                            Edit Profile
-                        </span>
-                    </div>
-                </div>
+                <%--
+    <div class="profile-button-site">
+        <div class="btn-site-pro">
+            <a href="setting" style="text-decoration: none">
+                <span class="edit-profile-btn">
+                    <i class="fas fa-pen"></i>
+                    Edit Profile
+                </span>
+            </a>
+        </div>
+    </div>
+                --%>
             </div>
         </section>
         <section class="full-navbar">
@@ -116,8 +147,18 @@
             <div class="post-section-in">
                 <section class="info-section">
                     <div class="about-info">
-                        <h4>Intro</h4>
-                        <p>Xin chào</p>
+                        <div class="user-introduction">
+                            <h2>Introduction</h2>
+                            <p id="user-intro-text">${user.user_introduce}</p>
+                            <c:if test="${sessionScope.user['user_id'] == user.user_id}">
+                                <button id="edit-intro-btn" class="btn btn-primary">Edit Introduction</button>
+                            </c:if>
+                            <form id="edit-intro-form" action="userIntroduceServlet" method="post" style="display: none;">
+                                <input type="text" name="userIntro" class="form-control" placeholder="Introduce yourself..." value="${user.user_introduce}">
+                                <button type="submit" class="btn btn-success">Save</button>
+                                <button type="button" id="cancel-edit-btn" class="btn btn-secondary">Cancel</button>
+                            </form>
+                        </div>
                         <!--
                                 <div class="bio-btn-click">
                                         <input class="input-box" type="text" value="MD Mehedi Hasan">
@@ -175,7 +216,7 @@
                                 <button class="edit-bio btn">Edit Hobbies</button>
                         -->
 
-                        <button class="edit-bio btn">Edit Featured</button>
+                        <!-- <button class="edit-bio btn">Edit Featured</button> -->
                     </div>
 
                     <div class="box-design images-site">
@@ -186,11 +227,11 @@
 
                         <div class="at9-images">
                             <c:forEach var="post" items="${posts}">
-                                <c:if test="${not empty post.image_path}">
-                                    <div class="images-div">
-                                        <img src="assets/post_image/${post.image_path}" alt="User posted image">
-                                    </div>
+
+                                <c:if test="${post.type == 'image'}">
+                                    <img src="${post.image_path}" style="max-width : 100%">
                                 </c:if>
+
                             </c:forEach>
                         </div>
                     </div>
@@ -200,7 +241,6 @@
                         <span>Friends <br>
                             <p>
                                 <span>
-                                    <!-- friend count here -->
                                     ${friendCount}
                                 </span>
                                 Friends
@@ -212,7 +252,7 @@
                             <c:forEach var="friend" items="${friends}">
                                 <div class="images-div">
                                     <img src="assets/profile_avt/${friend.profile_pic}" alt="${friend.first_name} ${friend.last_name}">
-                                    <p><a href="#" class="user-link friend" data-user-id="${friend.user_id}">${friend.first_name} ${friend.last_name}</a></p>
+                                    <p><a href="profile?userId=${friend.user_id}" class="user-link friend" data-user-id="${friend.user_id}">${friend.first_name} ${friend.last_name}</a></p>
                                 </div>
                             </c:forEach>
                         </div>
@@ -240,9 +280,9 @@
                                 <div class="post-upl">
 
 
-                                    <label for="photo-upload">
+                                    <p for="photo-upload">
                                         <i class="fas fa-cloud-upload-alt"></i> Photo/Video
-                                    </label>
+                                    </p>
                                     <input id="photo-upload" type="file" name="image" accept=".jpeg, .png, .jpg" style="display: none;" onchange="updateFileName(this)">
 
 
@@ -284,16 +324,18 @@
                                         </div>
                                     </c:if>
 
-                                    <c:if test="${sessionScope.user['user_id'] == user.user_id}">
-                                        <!-- Delete form -->
-
-                                        <form action="deleteServlet" method="post">
-                                            <input type="hidden" name="_method" value="delete">
-                                            <input type="hidden" name="postId" value="${post.post_id}">
-                                            <button type="submit" class="btn btn-danger delete-button">Delete</button>
-                                        </form>
-
-                                    </c:if>
+                                    <form action="updatePostServlet" method="post" class="update-form" enctype="multipart/form-data" style="display: none;">
+                                        <input type="hidden" name="postId" value="${post.post_id}">
+                                        <textarea name="newBody" class="form-control">${post.body}</textarea>
+                                        <button type="submit" class="btn btn-primary">Update</button>
+                                        <div class="item">
+                                            <label for="photo-upload">
+                                                <i class="fas fa-cloud-upload-alt"></i> Photo/Video
+                                            </label>
+                                            <input id="photo-upload" type="file" name="newImage" accept=".jpeg, .png, .jpg" style="display: none;" onchange="updateFileName(this)">
+                                        </div>
+                                        <button type="button" class="btn btn-secondary cancel-update">Cancel</button>
+                                    </form>
 
                                     <span>
                                         <div class="Select-audience">
@@ -303,51 +345,85 @@
                                             </div>
 
                                             <div class="content-popaap">
-                                                <ul>
-                                                    <li id="public-btn">
-                                                        <div class="icon-div">
-                                                            <i class="fas fa-globe-europe"></i>
-                                                        </div>
-                                                        <div class="text-aria">
-                                                            <h2>Public</h2>
-                                                            <p>Anyone on or off Facebook</p>
-                                                            <i id="public-li-icon" class="far fa-circle"></i>
-                                                        </div>
-                                                    </li>
-
-                                                    <li class="activ-li-div" id="friends-btn">
-                                                        <div class="icon-div">
-                                                            <i class="fas fa-user-friends frind-icon"></i>
-                                                        </div>
-                                                        <div class="text-aria">
-                                                            <h2>Friends</h2>
-                                                            <p>Your friends on Facebook</p>
-                                                            <i id="friends-li-icon"
-                                                               class="far fa-dot-circle activ-li-icon"></i>
-                                                        </div>
-                                                    </li>
-
-                                                    <li id="lock-btn">
-                                                        <div class="icon-div">
-                                                            <i class="fas fa-lock"></i>
-                                                        </div>
-                                                        <div class="text-aria">
-                                                            <h2 class="onlu-me">Only Me</h2>
-                                                            <i id="lock-li-icon" class="far fa-circle"></i>
-                                                        </div>
-                                                    </li>
-                                                </ul>
+                                                <form id="updatePrivacyForm" action="updatePrivateServlet" method="post">
+                                                    <input type="hidden" name="postId" value="${post.post_id}">
+                                                    <input type="hidden" name="privacyMode" id="privacyMode">
+                                                    <ul>
+                                                        <li id="public-btn" onclick="updatePrivacy('public')">
+                                                            <div class="icon-div">
+                                                                <i class="fas fa-globe-europe"></i>
+                                                            </div>
+                                                            <div class="text-aria">
+                                                                <h2>Public</h2>
+                                                                <p>Anyone on or off FUNET</p>
+                                                                <i id="public-li-icon" class="far fa-circle"></i>
+                                                            </div>
+                                                        </li>
+                                                        <li class="activ-li-div" id="friends-btn" onclick="updatePrivacy('friend')">
+                                                            <div class="icon-div">
+                                                                <i class="fas fa-user-friends frind-icon"></i>
+                                                            </div>
+                                                            <div class="text-aria">
+                                                                <h2>Friends</h2>
+                                                                <p>Your friends on FUNET</p>
+                                                                <i id="friends-li-icon" class="far fa-dot-circle activ-li-icon"></i>
+                                                            </div>
+                                                        </li>
+                                                        <li id="lock-btn" onclick="updatePrivacy('private')">
+                                                            <div class="icon-div">
+                                                                <i class="fas fa-lock"></i>
+                                                            </div>
+                                                            <div class="text-aria">
+                                                                <h2 class="onlu-me">Only Me</h2>
+                                                                <i id="lock-li-icon" class="far fa-circle"></i>
+                                                            </div>
+                                                        </li>
+                                                    </ul>
+                                                </form>
                                             </div>
                                         </div>
                                     </span>
                                 </div>
                                 <span class="thre-dto-btn fas fa-ellipsis-h"></span>
+                                <c:if test="${sessionScope.user['user_id'] == user.user_id}">
+                                    <div class="dropdown-menu" style="display: none;">
+                                        <form action="updatePostServlet" method="post" class="update-form" enctype="multipart/form-data" style="display: none;">
+                                            <input type="hidden" name="postId" value="${post.post_id}">
+                                            <textarea name="newBody" class="form-control">${post.body}</textarea>
+                                            <button type="submit" class="btn btn-primary">Update</button>
+                                            <div class="item">
+                                                <label for="photo-upload">
+                                                    <i class="fas fa-cloud-upload-alt"></i> Photo/Video
+                                                </label>
+                                                <input id="photo-upload" type="file" name="newImage" accept=".jpeg, .png, .jpg" style="display: none;" onchange="updateFileName(this)">
+                                            </div>
+                                            <button type="button" class="btn btn-secondary cancel-update">Cancel</button>
+                                        </form>
+                                        <!-- Update button -->
+                                        <c:if test="${!post.isShared}">
+                                            <button class="btn btn-primary show-update-form update-post-btn" data-post-id="${post.post_id}" onclick="UpdatePostClick('${post.post_id}', '${post.body}')">Update</button>
+                                        </c:if>
+                                        <form action="deleteServlet" method="post" class="delete-form">
+                                            <input type="hidden" name="_method" value="delete">
+                                            <input type="hidden" name="postId" value="${post.post_id}">
+                                            <button type="submit" class="btn btn-link">Delete</button>
+                                        </form>
+                                    </div>
+                                </c:if>
                             </div>
                             <p class="post-text-show">${post.body}</p>
                             <c:if test="${not empty post.image_path}">
-                                <div class=div-post-images>
-                                    <img class="post-images" src="assets/post_image/${post.image_path}" style="max-width: 60%">
-                                </div>
+                                <c:choose>
+                                    <c:when test="${post.type == 'image'}">
+                                        <img src="${post.image_path}" style="max-width : 100%">
+                                    </c:when>
+                                    <c:otherwise>
+                                        <video style="max-width: 100%" controls>
+                                            <source src="${post.image_path}" type="video/mp4">
+
+                                        </video>
+                                    </c:otherwise>
+                                </c:choose>
                             </c:if>
                             <div class="post-reaction">
                                 <div class="reaction">
@@ -376,22 +452,26 @@
                             <div class="activate">
                                 <div class="lcs-btn lcs-btn_i post-rating ${post.likedByCurrentUser ? 'post-rating-selected' : ''}">
                                     <p>
+
                                         <span class="material-icons" style="color: ${post.likedByCurrentUser ? '#1877f2' : '#65676b'};">
                                             thumb_up
                                         </span>
                                         <span class="post-icon-text_i">${post.likedByCurrentUser ? 'Liked' : 'Like'}</span>
                                     </p>
                                 </div>
-                                <div class="lcs-btn">
-                                    <p><i class="far fa-comment-alt"></i> Comment</p>
+                                <div class="lcs-btn d-flex align-items-center" style="font-weight: bold">
+                                    <i class="far fa-comment-alt"></i>
+                                    <span class="ms-1">Comment</span>
                                 </div>
-                                <div class="lcs-btn">
+                                <div class="lcs-btn d-flex align-items-center">
                                     <form action="sharePostServlet" method="post" style="display: inline;">
                                         <input type="hidden" name="postId" value="${post.post_id}">
                                         <input type="hidden" name="sourceUrl" value="profile">
-                                        <p><button type="submit" class="btn btn-link fas fa-share">Share</button></P>
+                                        <button type="submit" class="btn btn-link p-0 d-flex align-items-center" style="background:white; text-decoration: none">
+                                            <i class="fas fa-share"></i>
+                                            <span class="ms-1">Share</span>
+                                        </button>
                                     </form>
-
                                 </div>
                             </div>
                             <div class="comment-site">
@@ -401,22 +481,27 @@
                                     </a>
                                 </div>
                                 <div class="comment-input">
-                                    <form action="/FUNET/commentServlet" method="post" class="mb-4 post-method" id="commentForm">
+                                    <form action="/FUNET/commentServlet" method="post" class="mb-4 post-method" id="commentForm" enctype="multipart/form-data">
                                         <div class="mb-3">
-                                            <input class="form-control" id="body" name="commentContent" maxlength="300" rows="2" placeholder="Write a comment…">
+                                            <input type="text" class="form-control" id="body" name="commentContent" maxlength="300" rows="2" placeholder="Write a comment…">
                                         </div>
                                         <input type="hidden" name="sourceUrl" value="profile">
                                         <input type="hidden" name="post_id" value="${post.post_id}">
-                                    </form>
 
+                                        <!-- 
                                     <div class="comment-icon-div">
                                         <div>
                                             <i class="far fa-grin-alt"></i>
                                         </div>
                                         <div>
+                                             <label for="photo-upload">
                                             <i class="fas fa-camera"></i>
+                                            <input id="photo-upload" type="file" name="commentImage" accept=".jpeg, .png, .jpg">
+                                             </label>
                                         </div>
                                     </div>
+                                        -->
+                                    </form>
                                 </div>
                             </div>
                             <c:forEach var="comment" items="${post.comments}">
@@ -425,9 +510,27 @@
                                         <img src="assets/profile_avt/${comment.profile_pic}" class="img-fluid rounded-circle avatar me-2" style="width: 30px; height: 30px; object-fit: cover;">
                                         <small><strong>${comment.first_name} ${comment.last_name}</strong></small>
                                     </div>
-                                    <div class="comment-body">
-                                        <p style="margin-bottom: 0;">${comment.comment_text}</p>
+                                    <div class="comment-body" style="display: flex; justify-content: space-between; align-items: center;">
+                                        <p style="margin-bottom: 0;" class="comment-text">${comment.comment_text}</p>
+                                        <div class="comment-options">
+                                            <c:if test="${sessionScope.user['user_id'] == comment.user_id}">
+                                                <button class="three-dot-btn" data-comment-id="${comment.comment_id}">...</button>
+                                            </c:if>
+                                            <div class="comment-actions" style="display: none;">
+                                                <button class="edit-comment-btn" data-comment-id="${comment.comment_id}">Edit</button>
+                                                <form action="/FUNET/deleteCommentServlet" method="post" class="delete-comment-form" style="display: inline;">
+                                                    <input type="hidden" name="commentId" value="${comment.comment_id}">
+                                                    <button type="submit" class="delete-comment-btn">Delete</button>
+                                                </form>
+                                            </div>
+                                        </div>
                                     </div>
+                                    <form action="/FUNET/updateCommentServlet" method="post" class="edit-comment-form" style="display: none;">
+                                        <input type="hidden" name="commentId" value="${comment.comment_id}">
+                                        <textarea name="newCommentText" class="form-control">${comment.comment_text}</textarea>
+                                        <button type="submit" class="btn btn-primary">Save</button>
+                                        <button type="button" class="btn btn-secondary cancel-edit-comment">Cancel</button>
+                                    </form>
                                 </div>
                             </c:forEach>
 
@@ -435,29 +538,204 @@
                     </c:forEach>
                 </section>
             </div>
+            <!-- Thêm modal để hiển thị form cập nhật bài đăng -->
+            <div class="modal fade" id="updatePostModal" tabindex="-1" aria-labelledby="updatePostModalLabel" aria-hidden="true">
+                <div class="modal-dialog">
+                    <div class="modal-content">
+                        <div class="modal-header">
+                            <h5 class="modal-title" id="updatePostModalLabel">Update Post</h5>
+                            <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+                        </div>
+                        <form id="updatePostForm" method="post" enctype="multipart/form-data">
+                            <div class="modal-body">
+                                <input type="hidden" name="postId" id="postIdInput">
+                                <div class="mb-3">
+                                    <label for="newBody" class="form-label" id="formupdateidcontent">New Content</label>
+                                    <textarea class="form-control" id="newBody" name="newBody" rows="2"></textarea>
+                                </div>
+                                <div class="mb-3">
+                                    <label for="newImage" class="form-label" id="formupdateidimage photo-upload">New Image</label>
+                                    <input type="file" class="form-control" id="newImage" name="newImage" accept=".jpeg, .png, .jpg, .mp4" onchange="updateFileName(this)">
+                                </div>
+                            </div>
+                            <div class="modal-footer">
+                                <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
+                                <button type="submit" class="btn btn-primary">Update</button>
+                            </div>
+                        </form>
+                    </div>
+                </div>
+            </div>
         </section>
 
         <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
         <script src="assets/js/profile.js"></script>
         <script src="assets/js/bootstrap.min.js"></script> 
         <script src="assets/js/likeButton.js" defer></script>
+        <script src="assets/js/comment.js" defer></script>
 
         <script>
-                                        document.addEventListener('DOMContentLoaded', function () {
-                                            const commentForm = document.getElementById('commentForm');
-                                            const commentInput = document.getElementById('body');
-
-                                            commentInput.addEventListener('keydown', function (event) {
-                                                if (event.key === 'Enter' && !event.shiftKey) {
-                                                    event.preventDefault();
-                                                    if (commentInput.value.trim() !== '') {
-                                                        commentForm.submit();
+                                        function updatePrivacy(postId, mode) {
+                                            document.getElementById('privacyMode-' + postId).value = mode;
+                                            document.getElementById('updatePrivacyForm-' + postId).submit();
+                                        }
+
+                                        function UpdatePostClick(id, body) {
+                                            document.getElementById('postIdInput').value = id;
+                                            document.getElementById('newBody').value = body;
+
+                                            $('#updatePostModal').modal('show');
+                                        }
+                                        $('#updatePostForm').on('submit', function (event) {
+                                            event.preventDefault();
+
+                                            var formData = new FormData(this);
+
+                                            $.ajax({
+                                                url: 'updatePostServlet',
+                                                type: 'POST',
+                                                data: formData,
+                                                contentType: false,
+                                                processData: false,
+                                                success: function (response) {
+                                                    if (response.trim() === 'success') {
+
+                                                        $('#updatePostModal').modal('hide');
+                                                        location.reload();
+                                                    } else {
+
+                                                        alert('Error updating post server: ' + response);
                                                     }
+                                                },
+                                                error: function (xhr, status, error) {
+
+                                                    alert('Error updating post ajax: ' + error);
                                                 }
                                             });
                                         });
         </script>
 
 
+        <script>
+            document.addEventListener('DOMContentLoaded', function () {
+                const commentForm = document.getElementById('commentForm');
+                const commentInput = document.getElementById('body');
+
+                commentInput.addEventListener('keydown', function (event) {
+                    if (event.key === 'Enter' && !event.shiftKey) {
+                        event.preventDefault();
+                        if (commentInput.value.trim() !== '') {
+                            commentForm.submit();
+                        }
+                    }
+                });
+            });
+
+        </script>
+
+        <script>
+            document.addEventListener('DOMContentLoaded', function () {
+                document.querySelectorAll('.edit-comment-btn').forEach(button => {
+                    button.addEventListener('click', function () {
+                        const commentId = this.getAttribute('data-comment-id');
+                        const commentText = this.closest('.comment').querySelector('.comment-text');
+                        const editForm = this.closest('.comment').querySelector('.edit-comment-form');
+                        commentText.style.display = 'none';
+                        editForm.style.display = 'block';
+                    });
+                });
+
+                document.querySelectorAll('.cancel-edit-comment').forEach(button => {
+                    button.addEventListener('click', function () {
+                        const commentText = this.closest('.comment').querySelector('.comment-text');
+                        const editForm = this.closest('.comment').querySelector('.edit-comment-form');
+                        commentText.style.display = 'block';
+                        editForm.style.display = 'none';
+                    });
+                });
+            });
+        </script>
+
+        <script>
+            document.addEventListener('DOMContentLoaded', function () {
+                const posts = document.querySelectorAll('.post');
+
+                posts.forEach(post => {
+                    const showUpdateFormBtn = post.querySelector('.show-update-form');
+                    const updateForm = post.querySelector('.update-form');
+                    const cancelUpdateBtn = post.querySelector('.cancel-update');
+
+                    if (showUpdateFormBtn) {
+                        showUpdateFormBtn.addEventListener('click', () => {
+                            // updateForm.style.display = 'block';
+                            showUpdateFormBtn.style.display = 'none';
+                        });
+                    }
+
+                    if (cancelUpdateBtn) {
+                        cancelUpdateBtn.addEventListener('click', () => {
+                            // updateForm.style.display = 'none';
+                            showUpdateFormBtn.style.display = 'block';
+                        });
+                    }
+                });
+            });
+        </script>
+        <script>
+            document.addEventListener('DOMContentLoaded', function () {
+                const editBtn = document.getElementById('edit-intro-btn');
+                const editForm = document.getElementById('edit-intro-form');
+                const cancelBtn = document.getElementById('cancel-edit-btn');
+                const introText = document.getElementById('user-intro-text');
+
+                editBtn.addEventListener('click', function () {
+                    editForm.style.display = 'block';
+                    introText.style.display = 'none';
+                    editBtn.style.display = 'none';
+                });
+
+                cancelBtn.addEventListener('click', function () {
+                    editForm.style.display = 'none';
+                    introText.style.display = 'block';
+                    editBtn.style.display = 'block';
+                });
+            });
+        </script>
+        <script>
+            document.addEventListener('DOMContentLoaded', function () {
+                const posts = document.querySelectorAll('.post');
+                posts.forEach(post => {
+                    const threeDotBtn = post.querySelector('.thre-dto-btn');
+                    const dropdownMenu = post.querySelector('.dropdown-menu');
+                    const showUpdateFormBtn = post.querySelector('.show-update-form');
+                    const updateForm = post.querySelector('.update-form');
+                    const cancelUpdateBtn = post.querySelector('.cancel-update');
+                    threeDotBtn.addEventListener('click', () => {
+                        dropdownMenu.style.display = dropdownMenu.style.display === 'none' ? 'block' : 'none';
+                    });
+                    if (showUpdateFormBtn) {
+                        showUpdateFormBtn.addEventListener('click', () => {
+                            //   updateForm.style.display = 'block';
+                            showUpdateFormBtn.style.display = 'none';
+                            dropdownMenu.style.display = 'none';
+                        });
+                    }
+
+                    if (cancelUpdateBtn) {
+                        cancelUpdateBtn.addEventListener('click', () => {
+                            // updateForm.style.display = 'none';
+                            showUpdateFormBtn.style.display = 'block';
+                        });
+                    }
+                });
+                document.addEventListener('click', function (event) {
+                    if (!event.target.closest('.post')) {
+                        document.querySelectorAll('.dropdown-menu').forEach(menu => {
+                            menu.style.display = 'none';
+                        });
+                    }
+                });
+            });
+        </script> 
     </body>
 </html>
diff --git a/web/WEB-INF/savedPosts.jsp b/web/WEB-INF/savedPosts.jsp
new file mode 100644
index 0000000..dd366a8
--- /dev/null
+++ b/web/WEB-INF/savedPosts.jsp
@@ -0,0 +1,844 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<!DOCTYPE html>
+<html>
+    <head>
+        <meta charset="UTF-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+        <title>Social Network</title>
+        <link href="assets/css/bootstrap.min.css" rel="stylesheet">    
+        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css">
+        <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
+        <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
+        <link rel="stylesheet" href="https://www.w3schools.com/w3css/4/w3.css">
+        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
+        <script src="https://unpkg.com/boxicons@2.1.4/dist/boxicons.js"></script>
+        <script src='https://kit.fontawesome.com/a076d05399.js' crossorigin='anonymous'></script>
+    </head>
+    <style>
+        body {
+            font-family: Arial, sans-serif;
+            margin: 0;
+            background-color: whitesmoke;
+        }
+        .navbar {
+            display: flex;
+            align-items: center;
+            justify-content: space-around;
+            position: relative;
+            background-color: #ffffff;
+            padding: 10px 20px;
+            height: 60px;
+            width: 100%;
+            top: 0;
+            z-index: 1000;
+            box-sizing: border-box;
+            position:sticky;
+            index:1000;
+        }
+
+        .center-buttons {
+            display: flex;
+            gap: 10px;
+            justify-content: center;
+            align-items: center;
+            flex-grow: 1;
+            margin-left: 10%;
+
+        }
+
+        .center-button {
+            flex: 1;
+            max-width: 80px;
+            height: 48px;
+            background: none;
+            border: none;
+            color: black;
+            cursor: pointer;
+            border-radius: 15px;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            transition: background-color 0.3s ease;
+            margin: 0;
+        }
+
+
+
+
+        .logo {
+
+            font-size: 24px;
+            font-weight: bold;
+
+        }
+        .search-bar {
+            margin-bottom: 5px;
+            margin-bottom: 10px;
+        }
+        .search-bar input {
+            padding: 8px;
+            border: none;
+            border-radius: 15px;
+            height: 35px;
+            width: 250px;
+            transition: width 0.3s ease;
+            outline: 1px solid rgb(133, 130, 130);
+            font-size:15px;
+        }
+        .center-button:hover {
+            background-color: #CFC6C6;
+        }
+
+        .right-icons {
+            display: flex;
+            gap: 10px;
+            align-items: center;
+            width: 500px;
+            padding-left:330px;
+            justify-content:flex-end;
+        }
+
+        .icon {
+            font-size: 20px;
+            cursor: pointer;
+            color: black;
+        }
+        .icon-circle {
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            width: 40px;
+            height: 40px;
+            background-color: rgb(211, 211, 211);
+            border-radius: 50%;
+            transition: background-color 0.3s ease;
+        }
+        .icon-circle:hover {
+            background-color: darkgrey;
+        }
+        .dropdown-menu {
+            display: none;
+            position: fixed;
+
+            right: 20px;
+            width: 360px;
+            height: 500px;
+            background-color: white;
+            color: black;
+            border-radius: 15px;
+            padding: 10px;
+            z-index: 1000;
+            box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
+        }
+
+        .user-info {
+            width: 330px;
+            height: 75px;
+            box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
+            border-radius: 7px;
+            margin-bottom: 10px;
+        }
+        .user-info-button {
+            display: flex;
+            align-items: center;
+            width: 328px;
+            height: 70px;
+            border: none;
+            background: none;
+            cursor: pointer;
+            border-radius: 7px;
+            padding: 5px;
+            transition: background-color 0.3s ease;
+        }
+        .user-info-button:hover {
+            background-color: #f2f2f2;
+        }
+        .avatar {
+            width: 50px;
+            height: 50px;
+            border-radius: 50%;
+            margin-right: 10px;
+        }
+        .username {
+            font-size: 16px;
+            font-weight: bold;
+        }
+        .menu-item {
+            align-items: center;
+            height: 75px;
+            padding: 10px;
+            cursor: pointer;
+            border-radius: 7px;
+            transition: background-color 0.3s ease;
+        }
+
+        .user-menu {
+            display: none;
+            position: fixed;
+            top: 50px;
+            right: 20px;
+            width: 360px;
+            max-height: 400px;
+            background-color: white;
+            color: black;
+            border-radius: 7px;
+            padding: 10px;
+            z-index: 1000;
+            box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
+        }
+
+        .user-menu div {
+            display: flex;
+            align-items: center;
+            padding: 10px 0;
+            cursor: pointer;
+            font-size: 16px;
+        }
+
+        .user-menu div:hover {
+            background-color: #eee;
+        }
+        .active-button {
+            background-color: rgb(191, 217, 243);
+            color: white;
+        }
+        .container{
+            max-width: 100%;
+        }
+
+        .RightItem, .UserAvatar{
+
+            width: 350px;
+
+        }
+
+        .UserAvatar:hover{
+            background-color: #e4e6e8;
+            border-radius: 7px;
+        }
+        .RightItem div:hover{
+            background-color: #e4e6e8;
+            border-radius: 7px;
+        }
+        .RightItem div{
+            margin-top: 10px;
+            display: flex;
+            align-items: center;
+            padding: 10px 0;
+            cursor: pointer;
+            font-size: 16px;
+            gap:20px;
+        }
+        .post {
+            height: fit-content;
+            background-color: #fff;
+            border-radius: 15px;
+            padding: 10px;
+            box-sizing: border-box;
+            margin-top: 30px;
+        }
+
+        .input {
+            display: flex;
+            align-items: center;
+            flex-wrap: wrap;
+        }
+
+        .inputArea {
+            flex: 1;
+            min-width: 0;
+        }
+
+        .inputArea input {
+            border: none;
+            border-radius: 15px;
+            height: 40px;
+            width: 90%;
+            transition: width 0.3s ease;
+            outline: 1px solid rgb(133, 130, 130);
+            box-sizing: border-box;
+        }
+        .btn-document{
+            display:flex;
+            justify-content: space-between;
+            width:100%;
+
+        }
+
+
+        .item {
+            flex: 1;
+            text-align: center;
+            height:50px;
+            padding: 10px;
+            margin: 5px;
+            margin-bottom: 10px;
+            transition: transform 0.2s;
+            cursor: pointer;
+            max-height:400px;
+        }
+
+        .item:hover {
+            transform: scale(1.1);
+            background-color: #e0e0e0;
+            border-radius: 20px;
+
+
+        }
+        .overlay {
+            position: fixed;
+            top: 0;
+            left: 0;
+            width: 100%;
+            height: 100%;
+            background: rgba(0, 0, 0, 0.5);
+            z-index: 10;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+        }
+
+        .form-container {
+            background: white;
+            padding: 20px;
+            border-radius: 10px;
+            box-shadow: 0 0 10px rgba(0, 0, 0, 0.3);
+            z-index: 20;
+            max-width: 600px;
+            width: 100%;
+            position: absolute;
+            left: 50%;
+            top: 50%;
+            transform: translate(-50%, -50%);
+        }
+        .post {
+            height: auto;
+            border-top: 1px solid #ddd;
+            padding-top: 10px;
+            border-bottom: 1px solid #ddd;
+            padding-bottom: 10px;
+            padding-top: 10px;
+        }
+
+        .post-header {
+            display: flex;
+            font-weight: bold;
+            margin-bottom: 5px;
+        }
+
+        .add-friend {
+            border-top: 1px solid #ddd;
+            padding-top: 10px;
+        }
+
+        .list-group-item {
+            border: none;
+            padding-left: 0;
+        }
+
+
+        .post-ratings-container {
+            display: flex;
+            justify-content: left;
+            padding: 12px 0;
+        }
+
+        .post-rating {
+            display: flex;
+            align-items: center;
+            cursor: default;
+        }
+
+        .post-rating-selected > .post-rating-button,
+        .post-rating-selected > .post-rating-count {
+            color: #009578;
+        }
+
+        .post-rating-button {
+            margin-right: 6px;
+            color: #555555;
+        }
+
+        .post-rating:not(.post-rating-selected) > .post-rating-button:hover {
+            color: #009578;
+        }
+
+        .three-dot-btn {
+            border: none;
+            background-color: white;
+            outline: none;
+            cursor: pointer;
+        }
+        .edit-comment-btn{
+            border: none;
+            background-color: white;
+            outline: none;
+            cursor: pointer;
+        }
+        .delete-comment-btn{
+            border: none;
+            background-color: white;
+            outline: none;
+            cursor: pointer;
+        }
+
+
+        @media screen and (max-width: 1250px) {
+            .center-buttons{
+                display:none;
+            }
+            .ava-name{
+                display: none;
+            }
+            .friend-list{
+                display: none;
+            }
+            .chat-box{
+                display: none;
+            }
+            .post-method{
+                width: 125%;
+            }
+            .home-logo{
+                display: none;
+            }
+            .all-post{
+                margin-top: 5%;
+            }
+
+        }
+        @media screen and (max-width: 1050px) {
+            .search-bar input {
+                width:200px;
+
+            }
+
+
+        }
+        @media screen and (max-width: 850px) {
+            .search-bar {
+                display:none;
+            }
+            .logo{
+                display:none;
+            }
+            .RightItem{
+                margin:0;
+                justify-content: center;
+            }
+        }
+
+
+
+
+        .form-container {
+            width: 554px;
+            min-height: 415px;
+            margin: 0 auto;
+            border: 1px solid #e5e5e5;
+            border-radius: 10px;
+            padding: 10px;
+            background-color: #ffffff;
+            font-family: Arial, sans-serif;
+            display: flex;
+            flex-direction: column;
+        }
+
+        .form-title {
+            text-align: center;
+            font-size: 18px;
+            font-weight: bold;
+            margin: 0;
+            height: 15px;
+        }
+
+        .form-header {
+            display: flex;
+
+            margin: 5px 0 10px 40px;
+        }
+        .head {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            width: 100%;
+        }
+
+        .form-title {
+            flex-grow: 1;
+            text-align: center;
+            margin: 0;
+        }
+
+        .close-button {
+            width: 30px;
+            height:30px
+                ;
+            border-radius: 50%;
+            text-align: center;
+        }
+        .close-button:hover{
+            background-color: #cccfd4;
+        }
+
+
+        .ava-name {
+            margin-left: 5px;
+            font-size: 14px;
+        }
+
+        .hr-line {
+            border: 0.5px solid black;
+            width: 100%;
+            margin:0;
+
+        }
+
+        .textarea-container {
+            margin: 0;
+            width: 462px;
+
+        }
+
+        .form-control {
+            width: 100%;
+            height: 125px;
+            padding: 10px;
+            border-radius: 5px;
+            border: none;
+            resize: none;
+            margin-left:15px;
+            margin-bottom:10px;
+            font-size: 25px;
+            overflow: hidden;
+        }
+        .form-content {
+            flex-grow: 1;
+            display: flex;
+            flex-direction: column;
+            gap: 10px;
+        }
+
+        .upload-section {
+            display: flex;
+            justify-content: space-between;
+            margin-top: 10px;
+            width: 100%;
+            margin-left: auto;
+            margin-right: auto;
+        }
+
+        .upload-div {
+            cursor: pointer;
+            font-size: 14px;
+            color: #007bff;
+            display: flex;
+            align-items: center;
+        }
+
+        .submit-button {
+            width: 100%;
+            padding: 10px;
+            background-color: #007bff;
+            border: none;
+            border-radius: 5px;
+            color: #ffffff;
+            cursor: pointer;
+            margin:0;
+            align-self: flex-end;
+        }
+
+        .submit-button:disabled {
+            background-color: #e0e0e0;
+        }
+    </style>
+    <body>
+        <div class="container">
+            <h1>Saved Posts</h1>
+            <c:forEach var="post" items="${posts}">
+                        <div class="post mb-4" style="overflow-wrap: break-word" data-post-id="${post.post_id}" data-liked="${post.likedByCurrentUser}">
+                            <div class="post-header d-flex justify-content-between align-items-center">
+                                <img src="assets/profile_avt/${post.profile_pic}" class="img-fluid rounded-circle avatar me-2" style="width: 40px; height: 40px;object-fit: cover;">
+                                <small>${post.first_name} ${post.last_name} -- <fmt:formatDate value="${post.post_time}" pattern="yyyy-MM-dd HH:mm:ss" /></small>
+                                    <form action="/FUNET/savePostServlet" method="post">
+                                        <input type="hidden" name="postId" value="${post.post_id}">
+                                        <button type="submit" class="btn btn-warning">Unsave Post</button>
+                                    </form>
+                            </div>
+                            <c:if test="${post.isShared}">
+
+                                <div class="original-post-info d-flex align-items-center">
+                                    <img src="assets/profile_avt/${post.originalPosterAvatar}" class="img-fluid rounded-circle avatar me-2" style="width: 30px; height: 30px;object-fit: cover;">
+                                    <small>${post.originalPosterName}</small>
+                                </div>
+                            </c:if>
+                            <p>${post.body}</p> 
+                            <c:if test="${not empty post.image_path}">
+                                <div>
+                                    <c:choose>
+                                        <c:when test="${post.type == 'image'}">
+                                            <img src="${post.image_path}" style="max-width : 100%">
+                                        </c:when>
+                                        <c:otherwise>
+                                            <video style="max-width: 100%" controls>
+                                                <source src="${post.image_path}" type="video/mp4">
+                                                
+                                            </video>
+                                        </c:otherwise>
+                                    </c:choose>
+
+                                </div>
+                            </c:if>
+
+
+                            <div class="post-ratings-container">
+                                <div class="post-rating ${post.likedByCurrentUser ? 'post-rating-selected' : ''}">
+                                    <button type="button" style="background: none; border: none; cursor: pointer; padding: 0;">
+                                        <span class="material-icons" style="color: ${post.likedByCurrentUser ? '#1877f2' : '#65676b'};">
+                                            thumb_up
+                                        </span>
+                                    </button>
+                                    <span class="like-count"><span class="post-rating-count">${post.like_count}</span></span>
+                                </div>
+                                <%-- <c:if test="${!post.isShared}"> --%>
+                                <div class="post-share">
+                                    <form action="sharePostServlet" method="post" style="display: inline;">
+                                        <input type="hidden" name="postId" value="${post.post_id}">
+                                        <input type="hidden" name="sourceUrl" value="home">
+                                        <button type="submit" class="btn btn-link">Share</button>
+                                    </form>
+                                    <span class="post-share-count">${post.shareCount}</span>
+                                </div>
+                                <%--   </c:if> --%>
+                            </div>
+                            <div class="post-comments">
+                                <c:forEach var="comment" items="${post.comments}">
+                                    <div class="comment mb-2" style="margin-left: 20px;">
+                                        <div class="comment-header">
+                                            <img src="assets/profile_avt/${comment.profile_pic}" class="img-fluid rounded-circle avatar me-2" style="width: 30px; height: 30px; object-fit: cover;">
+                                            <small><strong>${comment.first_name} ${comment.last_name}</strong></small>
+                                        </div>
+                                        <div class="comment-body" style="display: flex; justify-content: space-between; align-items: center;">
+                                            <p style="margin-bottom: 0;" class="comment-text">${comment.comment_text}</p>
+                                            <div class="comment-options">
+                                                <c:if test="${sessionScope.user['user_id'] == comment.user_id}">
+                                                    <button class="three-dot-btn" data-comment-id="${comment.comment_id}">...</button>
+                                                </c:if>
+                                                <div class="comment-actions" style="display: none;">
+                                                    <button class="edit-comment-btn" data-comment-id="${comment.comment_id}">Edit</button>
+                                                    <form action="/FUNET/deleteCommentServlet" method="post" class="delete-comment-form" style="display: inline;">
+                                                        <input type="hidden" name="commentId" value="${comment.comment_id}">
+                                                        <button type="submit" class="delete-comment-btn">Delete</button>
+                                                    </form>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <form action="/FUNET/updateCommentServlet" method="post" class="edit-comment-form" style="display: none;">
+                                            <input type="hidden" name="commentId" value="${comment.comment_id}">
+                                            <textarea name="newCommentText" class="form-control">${comment.comment_text}</textarea>
+                                            <button type="submit" class="btn btn-primary">Save</button>
+                                            <button type="button" class="btn btn-secondary cancel-edit-comment">Cancel</button>
+                                        </form>
+                                    </div>
+                                </c:forEach>
+                            </div>
+
+
+                            <form action="/FUNET/commentServlet" method="post" id="commentform" class="mb-4 post-method">
+                                <div class="mb-3">
+                                    <input type="text" class="form-control" style="border-radius: 20px;width: 90%; height: 30px;" id="body" name="commentContent" maxlength="300" rows="2" placeholder="Comment" style="width:80%; height: 35px">
+                                </div>
+                                <input type="hidden" name="sourceUrl" value="home">
+                                <input type="hidden" name="post_id" value="${post.post_id}">
+                            </form>
+
+
+                            <%----%>
+                        </div>
+                        <br>
+                    </c:forEach>
+        </div>
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
+        <script src="assets/js/bootstrap.bundle.min.js"></script>
+        <script src="assets/js/reaction.js" defer></script>
+        <!-- delete update comment + button"..." -->
+        <script>
+            document.addEventListener('DOMContentLoaded', function () {
+                document.querySelectorAll('.edit-comment-btn').forEach(button => {
+                    button.addEventListener('click', function () {
+                        const commentId = this.getAttribute('data-comment-id');
+                        const commentText = this.closest('.comment').querySelector('.comment-text');
+                        const editForm = this.closest('.comment').querySelector('.edit-comment-form');
+                        commentText.style.display = 'none';
+                        editForm.style.display = 'block';
+                    });
+                });
+
+                document.querySelectorAll('.cancel-edit-comment').forEach(button => {
+                    button.addEventListener('click', function () {
+                        const commentText = this.closest('.comment').querySelector('.comment-text');
+                        const editForm = this.closest('.comment').querySelector('.edit-comment-form');
+                        commentText.style.display = 'block';
+                        editForm.style.display = 'none';
+                    });
+                });
+            });
+
+            document.addEventListener('DOMContentLoaded', function () {
+                document.querySelectorAll('.three-dot-btn').forEach(button => {
+                    button.addEventListener('click', function () {
+                        const commentId = this.getAttribute('data-comment-id');
+                        const actions = this.closest('.comment-options').querySelector('.comment-actions');
+                        actions.style.display = actions.style.display === 'none' ? 'block' : 'none';
+                    });
+                });
+
+                document.querySelectorAll('.edit-comment-btn').forEach(button => {
+                    button.addEventListener('click', function () {
+                        const commentId = this.getAttribute('data-comment-id');
+                        const commentText = this.closest('.comment').querySelector('.comment-text');
+                        const editForm = this.closest('.comment').querySelector('.edit-comment-form');
+                        commentText.style.display = 'none';
+                        editForm.style.display = 'block';
+                    });
+                });
+
+                document.querySelectorAll('.cancel-edit-comment').forEach(button => {
+                    button.addEventListener('click', function () {
+                        const commentText = this.closest('.comment').querySelector('.comment-text');
+                        const editForm = this.closest('.comment').querySelector('.edit-comment-form');
+                        commentText.style.display = 'block';
+                        editForm.style.display = 'none';
+                    });
+                });
+            });
+        </script>
+        <!-- --------- -->
+        <script>
+            document.addEventListener('DOMContentLoaded', function () {
+                const searchInput = document.getElementById('search-input');
+                const searchForm = document.getElementById('searchForm');
+
+                searchInput.addEventListener('keypress', function (event) {
+                    if (event.key === 'Enter') {
+                        event.preventDefault();
+                        searchForm.submit();
+                    }
+                });
+            });
+
+            document.getElementById('messenger-btn').addEventListener('click', function () {
+                toggleMenu('messenger-menu', 'messenger-btn');
+            });
+
+            document.getElementById('notification-btn').addEventListener('click', function () {
+                toggleMenu('notification-menu', 'notification-btn');
+            });
+
+            document.getElementById('user-btn').addEventListener('click', function () {
+                toggleMenu('user-menu', 'user-btn');
+            });
+
+            document.addEventListener('click', function (event) {
+                const messengerMenu = document.getElementById('messenger-menu');
+                const notificationMenu = document.getElementById('notification-menu');
+                const userMenu = document.getElementById('user-menu');
+                const messengerBtn = document.getElementById('messenger-btn');
+                const notificationBtn = document.getElementById('notification-btn');
+                const userBtn = document.getElementById('user-btn');
+
+                if (!messengerMenu.contains(event.target) && !messengerBtn.contains(event.target)) {
+                    messengerMenu.style.display = 'none';
+                    messengerBtn.classList.remove('active-button');
+                }
+                if (!notificationMenu.contains(event.target) && !notificationBtn.contains(event.target)) {
+                    notificationMenu.style.display = 'none';
+                    notificationBtn.classList.remove('active-button');
+                }
+                if (!userMenu.contains(event.target) && !userBtn.contains(event.target)) {
+                    userMenu.style.display = 'none';
+                    userBtn.classList.remove('active-button');
+                }
+            });
+
+            function toggleMenu(menuId, btnId) {
+                const menu = document.getElementById(menuId);
+                const button = document.getElementById(btnId);
+                const otherMenuIds = ['messenger-menu', 'notification-menu', 'user-menu'].filter(id => id !== menuId);
+                const otherButtons = ['messenger-btn', 'notification-btn', 'user-btn'].filter(id => id !== btnId);
+
+                if (menu.style.display === 'none' || menu.style.display === '') {
+                    menu.style.display = 'block';
+                    button.classList.add('active-button');
+                    otherMenuIds.forEach(id => document.getElementById(id).style.display = 'none');
+                    otherButtons.forEach(id => document.getElementById(id).classList.remove('active-button'));
+                } else {
+                    menu.style.display = 'none';
+                    button.classList.remove('active-button');
+                }
+            }
+            document.addEventListener('DOMContentLoaded', function () {
+                const overlay = document.getElementById('overlay');
+                const formContainer = document.getElementById('formContainer');
+                const postingInput = document.getElementById('posting');
+                const photoVideoBtn = document.getElementById('photoVideoBtn');
+                const fileBtn = document.getElementById('fileBtn');
+                const closeButton = document.querySelector('.close-button');
+
+                function showForm() {
+                    overlay.style.display = 'flex';
+                    formContainer.style.display = 'block';
+                }
+
+                function hideForm() {
+                    overlay.style.display = 'none';
+                    formContainer.style.display = 'none';
+                }
+
+                postingInput.addEventListener('click', showForm);
+                photoVideoBtn.addEventListener('click', showForm);
+                fileBtn.addEventListener('click', showForm);
+
+                closeButton.addEventListener('click', hideForm);
+                overlay.addEventListener('click', function (event) {
+                    if (event.target === overlay) {
+                        hideForm();
+                    }
+                });
+                postForm.addEventListener('submit', function (event) {
+                    event.preventDefault();
+                    hideForm();
+
+                });
+            });
+
+
+            document.addEventListener('DOMContentLoaded', function () {
+                const textarea = document.getElementById('body');
+                const formContainer = document.getElementById('formContainer');
+                const baseFormHeight = 415;
+                const initialTextareaHeight = 125;
+                textarea.addEventListener('input', function () {
+                    adjustFontSizeAndFormHeight();
+                });
+                function adjustFontSizeAndFormHeight() {
+                    const maxLines = 3;
+                    const initialFontSize = 25;
+                    const reducedFontSize = 15;
+                    textarea.style.fontSize = initialFontSize + 'px';
+                    textarea.style.height = 'auto';
+
+                    const lineHeight = parseInt(window.getComputedStyle(textarea).lineHeight);
+                    const lines = Math.floor(textarea.scrollHeight / lineHeight);
+                    if (lines > maxLines) {
+                        textarea.style.fontSize = reducedFontSize + 'px';
+                    }
+                    textarea.style.height = textarea.scrollHeight + 'px';
+                    const textareaExtraHeight = textarea.scrollHeight - initialTextareaHeight;
+                    formContainer.style.height = (baseFormHeight + textareaExtraHeight) + 'px';
+                }
+            });
+        </script>
+    </body>
+</html>
\ No newline at end of file
diff --git a/web/WEB-INF/search.jsp b/web/WEB-INF/search.jsp
index 7617816..9ba9ae3 100644
--- a/web/WEB-INF/search.jsp
+++ b/web/WEB-INF/search.jsp
@@ -11,50 +11,130 @@
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
         <title>Search Result</title>
         <link href="assets/css/bootstrap.min.css" rel="stylesheet">
-        <link rel="stylesheet" href="assets/css/search.css">
         <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
         <script src="https://kit.fontawesome.com/7f80ec1f7e.js" crossorigin="anonymous"></script>
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
+        <script src="https://kit.fontawesome.com/7f80ec1f7e.js" crossorigin="anonymous"></script>
+        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css">
+        <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
+        <link rel="stylesheet" href="https://www.w3schools.com/w3css/4/w3.css">
+        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
+        <script src="https://unpkg.com/boxicons@2.1.4/dist/boxicons.js"></script>
+        <script src='https://kit.fontawesome.com/a076d05399.js' crossorigin='anonymous'></script>
+   <link href="assets/css/logonavbar.css" rel="stylesheet">   
+      <link href="assets/css/home.css" rel="stylesheet">   
+
     </head>
     <body>
-        <header id="header">
-            <nav class="navbar custom-navbar">
-                <div class="container-fluid d-flex align-items-center">
-                    <a class="navbar-brand text-primary" href="/FUNET/home" style="font-weight: bold">FUNET</a>
-                    <form class="d-flex ms-2 flex-grow-1" method="get" action="/FUNET/searchServlet">
-                        <input class="form-control" name="search-name" type="search" placeholder="Searching in FUNET" aria-label="Search">
-                        <button type="submit" class="search-button">
-                            <i class="fa-solid fa-magnifying-glass"></i>
-                        </button>
-                    </form>
-                    <div class="nav-icons d-flex align-items-center">
-                        <a href="/FUNET/friendRequestServlet" class="friend-icon me-3">
-                            <svg viewBox="0 0 24 24" width="24" height="24" fill="currentColor" class="x19dipnz x1lliihq x1tzjh5l x1k90msu x2h7rmj x1qfuztq" style="--color:var(--secondary-icon)"><path d="M.5 12c0 6.351 5.149 11.5 11.5 11.5S23.5 18.351 23.5 12 18.351.5 12 .5.5 5.649.5 12zm2 0c0-.682.072-1.348.209-1.99a2 2 0 0 1 0 3.98A9.539 9.539 0 0 1 2.5 12zm.84-3.912A9.502 9.502 0 0 1 12 2.5a9.502 9.502 0 0 1 8.66 5.588 4.001 4.001 0 0 0 0 7.824 9.514 9.514 0 0 1-1.755 2.613A5.002 5.002 0 0 0 14 14.5h-4a5.002 5.002 0 0 0-4.905 4.025 9.515 9.515 0 0 1-1.755-2.613 4.001 4.001 0 0 0 0-7.824zM12 5a4 4 0 1 1 0 8 4 4 0 0 1 0-8zm-2 4a2 2 0 1 0 4 0 2 2 0 0 0-4 0zm11.291 1.01a9.538 9.538 0 0 1 0 3.98 2 2 0 0 1 0-3.98zM16.99 20.087A9.455 9.455 0 0 1 12 21.5c-1.83 0-3.54-.517-4.99-1.414a1.004 1.004 0 0 1-.01-.148V19.5a3 3 0 0 1 3-3h4a3 3 0 0 1 3 3v.438a1 1 0 0 1-.01.148z"></path></svg>
-                        </a>
-                        <a href="/FUNET/chat" class="mess-icon me-3">
-                            <i class="fas fa-comments"></i>
-                        </a> 
-                    </div>
-                    <form method="post" action="/FUNET/logout">
-                        <button type="submit" class="navbar-brand text-primary log-out" style="font-weight: bold">Log out</button>
-                    </form>
+        <div class="flex-container navbar">
+            <a href="home" style ="text-decoration:none">   <div class="logo" style="margin-bottom: 10%">FUNET</div>
+            </a>
+            <form class="" method="get" action="/FUNET/searchServlet" id="searchForm">
+                <div class="search-bar" style="margin-top:1%; margin-left:1%">
+                    <input class="form-control" name="search-name" type="search" placeholder="Searching in FUNET" aria-label="Search" id="search-input" style="padding-left:5%;">
+
                 </div>
-            </nav>
-        </header>
+            </form>
+            <div class="center-buttons">
+                <a href="home">
+                    <button class="center-button" id="home-btn">
+                        <box-icon type='solid' name='home'></box-icon>
+                    </button>
+                </a>
+                <a href="lmaterialLink"> 
+                    <button class="center-button" id="video-btn">
+                        <box-icon type='solid' name='book'></box-icon>
+                    </button>
+                </a>
+                <a href="market">
+                    <button class="center-button" id="market-btn">
+                        <box-icon name='store-alt' type='solid'></box-icon>
+                    </button>
+                </a>
+                <a href="/FUNET/friendRequestServlet" class="friend-icon me-3">
+                    <button class="center-button" id="friend-btn">
+                        <box-icon name='group' type='solid'></box-icon>
+                    </button>
+                </a>
+            </div>
+            <div class="right-icons">
+                <a href="/FUNET/chat" class="mess-icon" style='margin-left:5px'>
+                    <span class="icon icon-circle" id="messenger-btn"><box-icon name='messenger' type='logo'></box-icon></span>
+                </a>
+                <span class="icon icon-circle" id="notification-btn" style="display:none"><box-icon name='bell' type='solid' ></box-icon></span>
+                <span class="icon icon-circle" id="user-btn">&#128100;</span>
+            </div>
+
+        </div>
+
+        <div class="dropdown-menu" id="notification-menu">
+            <p>Notification content goes here...</p>
+        </div>
+    
+    <div class="dropdown-menu" id="notification-menu">
+        <p>Notification content goes here...</p>
+    </div>
+    <div class="user-menu" id="user-menu" >
+        <div class="user-info">
+            <a href="profile?userId=${sessionScope.user['user_id']}" class="d-flex align-items-center text-decoration-none text-dark">
+                <button class="user-info-button">
+                    <img src="assets/profile_avt/${sessionScope.user['profile_pic']}" class="img-fluid rounded-circle avatar" style="object-fit: cover;">
+                    <p class="mb-0 ms-2 ava-name">${sessionScope.user['first_name']} ${sessionScope.user['last_name']}</p>
+                </button>
+            </a>
+        </div>
+        <div class="menu-item">
+            <box-icon name='cog' type='solid' style="margin-right:3%; margin-left:1%;">Settings</box-icon>Settings
+        </div>
+        <div class="menu-item" >
+            <box-icon name='error-circle'style="margin-right:3%; margin-left:1%;"></box-icon>Report
+        </div>
+        
+
+        <form method="post" action="/FUNET/logout" style="display: inline; width: 100%;">
+            <div class="menu-item" style="display: flex; align-items: center; cursor: pointer; width: 100%;">
+                <box-icon type='solid' name='log-out'style=" margin-left:1%;"></box-icon>
+                <button type="submit" style="border: none; background: none; color: black; font-size: 16px; margin-left: 5px; cursor: pointer; flex: 1; text-align: left;">
+                    Log Out
+                </button>
+            </div>
+        </form>
+    </div>
+                
+                
         <div class="container-fluid">
-            <div class="row all-post">
-                <nav class="col-2 py-3 bg-light">
-                    <div class="profile-section mb-3 d-flex align-items-center">
-                        <a href="profile" class="d-flex align-items-center text-decoration-none text-dark">
-                            <img src="assets/profile_avt/${user.profile_pic}" class="img-fluid rounded-circle avatar">
-                            <p class="mb-0 ms-2 ava-name">${sessionScope.user['first_name']} ${sessionScope.user['last_name']}</p>
-                        </a>
-                    </div>
-                    <div class="chat-box mb-3">
-                        <h5>Chat box</h5>   
-                    </div>
-                </nav>
+            <div class="col-4 dashBoard" style="margin-top:1%;">
+                <a href="profile?userId=${sessionScope.user['user_id']}" style="text-decoration:none; width: fit-content;">
+                    <div class="UserAvatar" >
+                        <img src="assets/profile_avt/${user.profile_pic}" class="img-fluid rounded-circle avatar" style="margin-left:1%;">
+                        <span class="mb-0 ms-2 ava-name">${sessionScope.user['first_name']} ${sessionScope.user['last_name']}</span>        
+                    </div></a>
+
+                <div class="RightItem">
+                    <a href="/FUNET/friendRequestServlet" style="text-decoration: none">
+                         <div><i class='fas fa-user-friends'style="margin-left:5%;" > </i>    Friends</div>
+                    </a>                   
+                    <a href="savePostServlet" style="text-decoration: none">
+                        <div>
+                            <box-icon type='solid' name='bookmark'style="margin-left:5%;"></box-icon> Saved
+                        </div>
+                    </a>
+                    <a href="marketLink" style="text-decoration: none">
+                         <div><box-icon name='store-alt' type='solid'style="margin-left:5%;"></box-icon> Market</div>
+                    </a>
+                   
+                    <a href="lmaterialLink"style="text-decoration: none"> 
+                        <div><box-icon type='solid' name='book'style="margin-left:5%;"></box-icon> Learning Materials</div>
+                    </a>
+                    <a href="game" style="text-decoration: none"><div><i class='fas fa-gamepad' style='font-size:20px;margin-left:5%;'></i> Game</div></a>
+                    
+                    <hr style="border: 1px solid black; width: 100%;"><!-- comment -->
 
-                <main class="col-8">
+                    <p>Your ShortCut</p>
+                </div>
+            </div>
+
+                <main class="col-6" style="margin-left:20%">
                     <h1 class="mt-3 text-primary home-logo">Search Result</h1>
                     <hr>
                     <c:forEach var="userResult" items="${usersWithStatus}">
@@ -64,7 +144,7 @@
                             <a href="profile?userId=${userSearched.user_id}">
                                 <img src="assets/profile_avt/${userSearched.profile_pic}" class="img-fluid rounded-circle avatar me-2" style="width: 30px; height: 30px;">
                             </a>
-                            <a href="profile?userId=${userSearched.user_id}" style="margin-left: 5px">${userSearched.first_name} ${userSearched.last_name}</a>
+                            <a href="profile?userId=${userSearched.user_id}" style="margin-left: 5px;text-decoration:none;">${userSearched.first_name} ${userSearched.last_name}</a>
                             <c:choose>
                                 <c:when test="${userStatus == 'pending'}">
                                     <button class="btn btn-secondary btn-sm" style="margin-left: auto;" disabled>Invited</button>
@@ -89,18 +169,12 @@
 
                 </main>
 
-                <aside class="col-2 py-3 bg-light friend-list">
-                    <h2>List Friends</h2>
-                    <ul class="list-group">
-                        <li class="list-group-item">Friend 1</li>
-                        <li class="list-group-item">Friend 2</li>
-                        <li class="list-group-item">Friend 3</li>
-                    </ul>
-                </aside>
+               
             </div>
-        </div>
         <script src="assets/js/jquery-3.7.1.min.js"></script>
         <script src="assets/js/bootstrap.min.js"></script>
         <script src="assets/js/ajaxInviteFriend.js"></script>
+                        <script src="assets/js/logonavbar.js" defer></script>
+
     </body>
 </html>
diff --git a/web/WEB-INF/selling.jsp b/web/WEB-INF/selling.jsp
index 73fbfe7..3fa9f8f 100644
--- a/web/WEB-INF/selling.jsp
+++ b/web/WEB-INF/selling.jsp
@@ -10,7 +10,7 @@
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
         <title>Home Page</title>
         <link href="assets/css/bootstrap.min.css" rel="stylesheet">
-        <link rel="stylesheet" href="assets/css/lmaterial.css">
+        <link rel="stylesheet" href="assets/css/market.css">
         <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
         <script src="https://kit.fontawesome.com/7f80ec1f7e.js" crossorigin="anonymous"></script>
@@ -55,53 +55,39 @@
             <div class="row all-post">
                 <nav class="col-2 py-3 bg-light sidebar sticky-sidebar position-sticky" style="top: 76px;">
                     <div class="profile-section mb-3 d-flex align-items-center">
-                        <a href="userpageServlet?userId=${sessionScope.user['user_id']}" class="d-flex align-items-center text-decoration-none text-dark">
-                            <img src="assets/profile_avt/main.jpg" class="img-fluid rounded-circle avatar" style="object-fit: cover;">
-                            <p class="mb-0 ms-2 ava-name">${"vuaga1260"}</p>
-                        </a>
+                        <a href="profile?userId=${sessionScope.user['user_id']}" class="d-flex align-items-center text-decoration-none text-dark">
+                <button class="user-info-button">
+                    <img src="assets/profile_avt/${sessionScope.user['profile_pic']}" class="img-fluid rounded-circle avatar" style="object-fit: cover;">
+                    <p class="mb-0 ms-2 ava-name">${sessionScope.user['first_name']} ${sessionScope.user['last_name']}</p>
+                </button>
+            </a>
                     </div>
                     <div class="chat-box mb-3"></div>
 
-                    <form class="d-flex mb-3">
-                        <input class="form-control me-2" type="search" placeholder="Find product" aria-label="Search">
+                    <form action ="SearchProductServlet" class="d-flex mb-3">
+                       <input type="text" class="form-control me-2" name="keyword" placeholder="Find product">
                         <button class="btn btn-outline-primary" type="submit">Search</button>
                     </form>
+
                     <div class="btn-group-vertical w-100 mb-3">
                         <a href="/FUNET/home" class="btn btn-outline-primary mb-2">Main Page</a>
                         <a href="/FUNET/notificationServlet" class="btn btn-outline-primary mb-2">Notifications</a>
-                        <a href="/FUNET/AddProductServlet" class="btn btn-outline-primary mb-2">Add product to our market</a>
-                        <a href="/FUNET/SellingProductServlet" class="btn btn-outline-primary mb-2">Yours products on sale</a>
-                    </div>
-
-                    <div class="accordion" id="accordionCategories">
-                        <div class="accordion-item">
-                            <h2 class="accordion-header" id="headingOne">
-                                <button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#collapseOne" aria-expanded="true" aria-controls="collapseOne">
-                                    Categories
-                                </button>
-                            </h2>
-                            <div id="collapseOne" class="accordion-collapse collapse show" aria-labelledby="headingOne" data-bs-parent="#accordionCategories">
-                                <div class="accordion-body">
-                                    <ul class="list-group">
-                                        <li class="btn btn-outline-secondary mb-2"><a href="/FUNET/marketLink" class="text-decoration-none">Market Place</a></li>
-                                        <li class="btn btn-outline-secondary mb-2"><a href="/FUNET/lmaterialLink" class="text-decoration-none">Learning Material</a></li>
-                                    </ul>
-                                </div>
-                            </div>
-                        </div>
+                        <a href="/FUNET/AddProductServlet" class="btn btn-outline-primary mb-2">Add product to market</a>
+                        <a href="/FUNET/SellingProductServlet" class="btn btn-outline-primary mb-2">Yours products</a>
                     </div>
                 </nav>
 
                 <main class="main-class col-10">
 
                     <h2 class="mt-4 mb-5 text-primary d-flex justify-content-center">Your Product</h2>
+                    <h5 class="text-danger text-center mt-3">${error}</h5>
                     <div class="row">
                         <c:forEach var="product" items="${productList}">
                             <div class="col-3 mb-3">
                                 <div class="product-card border" style="border: 2px solid black; padding: 10px; text-align: center;">
                                     <h5>${product.productName}</h5>
-                                    <img src="${product.product_img}" alt="Item 1" class="img-fluid" style="max-width: 100%; height: auto;">
-                                    <!--<p>Price: {product.price}</p> -->
+                                    <img src="${product.product_img}" alt="Item 1" class="img-fluid" style="max-width: 100%;">
+                                    <p>Price: ${product.price}</p>
                                     <form method="post" action="/FUNET/DeleteProductServlet">
                                         <input type="hidden" name="product_id" value="${product.productId}" />
                                         <button type="submit" class="btn btn-danger">Delete</button>
diff --git a/web/WEB-INF/updateLearningMaterial.jsp b/web/WEB-INF/updateLearningMaterial.jsp
new file mode 100644
index 0000000..6dbbf3a
--- /dev/null
+++ b/web/WEB-INF/updateLearningMaterial.jsp
@@ -0,0 +1,58 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ page import="model.LearningMaterial, dao.learningMaterialDao" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Update Learning Material</title>
+    <link href="assets/css/bootstrap.min.css" rel="stylesheet">
+    <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
+    <script src="https://kit.fontawesome.com/7f80ec1f7e.js" crossorigin="anonymous"></script>
+    <link rel="stylesheet" href="assets/css/home.css">
+    <link rel="stylesheet" href="assets/css/learningMaterial.css">
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css">
+    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
+    <link rel="stylesheet" href="https://www.w3schools.com/w3css/4/w3.css">
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
+    <script src="https://unpkg.com/boxicons@2.1.4/dist/boxicons.js"></script>
+    <link href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.3.0/css/bootstrap.min.css" rel="stylesheet">
+</head>
+<body>
+    <form action="updateLearningMaterial" method="post" enctype="multipart/form-data">
+    <input type="hidden" id="updateId" name="updateId" value="${param.updateId}">
+    <div class="form-group">
+        <label for="updateName">Name:</label>
+        <input type="text" class="form-control" id="updateName" name="updateName" value="${param.updateName}" required>
+    </div>
+    <div class="form-group">
+        <label for="updateDescription">Description:</label>
+        <textarea class="form-control" id="updateDescription" name="updateDescription" required>${param.updateDescription}</textarea>
+    </div>
+    <div class="form-group">
+        <label for="updateSubjectCode">Subject Code:</label>
+        <input type="text" class="form-control" id="updateSubjectCode" name="updateSubjectCode" value="${param.updateSubjectCode}" required>
+    </div>
+    <div class="form-group">
+        <label for="updateDepartmentId">Department:</label>
+        <select class="form-control" id="updateDepartmentId" name="updateDepartmentId" required>
+            <option value="1" ${param.updateDepartmentId == 1 ? 'selected' : ''}>Economy</option>
+            <option value="2" ${param.updateDepartmentId == 2 ? 'selected' : ''}>IT</option>
+            <option value="3" ${param.updateDepartmentId == 3 ? 'selected' : ''}>Tourism</option>
+            <option value="4" ${param.updateDepartmentId == 4 ? 'selected' : ''}>Languages</option>
+        </select>
+    </div>
+    <div class="form-group">
+        <label for="updateContext">Context File:</label>
+        <input type="file" class="form-control" id="updateContext" name="updateContext">
+    </div>
+    <div class="form-group">
+        <label for="updateReview">Review:</label>
+        <input type="text" class="form-control" id="updateReview" name="updateReview" value="${param.updateReview}" required>
+    </div>
+    <button type="submit" class="btn btn-primary">Update</button>
+</form>
+</body>
+</html>
\ No newline at end of file
diff --git a/web/WEB-INF/userpage.jsp b/web/WEB-INF/userpage.jsp
index 4e89d97..60997db 100644
--- a/web/WEB-INF/userpage.jsp
+++ b/web/WEB-INF/userpage.jsp
@@ -8,36 +8,130 @@
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
         <title>User Page</title>
         <link href="assets/css/bootstrap.min.css" rel="stylesheet">
-        <link rel="stylesheet" href="assets/css/home.css">
         <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
         <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
         <script src="https://kit.fontawesome.com/7f80ec1f7e.js" crossorigin="anonymous"></script>
+         <link href="assets/css/bootstrap.min.css" rel="stylesheet">
+        <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
+        <script src="https://kit.fontawesome.com/7f80ec1f7e.js" crossorigin="anonymous"></script>
+
+        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css">
+        <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
+        <link rel="stylesheet" href="https://www.w3schools.com/w3css/4/w3.css">
+        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
+        <script src="https://unpkg.com/boxicons@2.1.4/dist/boxicons.js"></script>
+        <link href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.3.0/css/bootstrap.min.css" rel="stylesheet">
+ <link href="assets/css/logonavbar.css" rel="stylesheet"> 
     </head>
     <body>
-        <header id="header">
-            <nav class="navbar custom-navbar">
-                <div class="container-fluid d-flex align-items-center">
-                    <a class="navbar-brand text-primary" href="/FUNET/home" style="font-weight: bold">FUNET</a>
-                    <form class="d-flex ms-2 flex-grow-1" method="get" action="/FUNET/searchServlet">
-                        <input class="form-control" name="search-name" type="search" placeholder="Searching in FUNET" aria-label="Search">
-                        <button type="submit" class="search-button">
-                            <i class="fa-solid fa-magnifying-glass"></i>
-                        </button>
-                    </form>
-                    <div class="nav-icons d-flex align-items-center">
-                        <a href="/FUNET/friendRequestServlet" class="friend-icon me-3">
-                            <svg viewBox="0 0 24 24" width="24" height="24" fill="currentColor" class="x19dipnz x1lliihq x1tzjh5l x1k90msu x2h7rmj x1qfuztq" style="--color:var(--secondary-icon)"><path d="M.5 12c0 6.351 5.149 11.5 11.5 11.5S23.5 18.351 23.5 12 18.351.5 12 .5.5 5.649.5 12zm2 0c0-.682.072-1.348.209-1.99a2 2 0 0 1 0 3.98A9.539 9.539 0 0 1 2.5 12zm.84-3.912A9.502 9.502 0 0 1 12 2.5a9.502 9.502 0 0 1 8.66 5.588 4.001 4.001 0 0 0 0 7.824 9.514 9.514 0 0 1-1.755 2.613A5.002 5.002 0 0 0 14 14.5h-4a5.002 5.002 0 0 0-4.905 4.025 9.515 9.515 0 0 1-1.755-2.613 4.001 4.001 0 0 0 0-7.824zM12 5a4 4 0 1 1 0 8 4 4 0 0 1 0-8zm-2 4a2 2 0 1 0 4 0 2 2 0 0 0-4 0zm11.291 1.01a9.538 9.538 0 0 1 0 3.98 2 2 0 0 1 0-3.98zM16.99 20.087A9.455 9.455 0 0 1 12 21.5c-1.83 0-3.54-.517-4.99-1.414a1.004 1.004 0 0 1-.01-.148V19.5a3 3 0 0 1 3-3h4a3 3 0 0 1 3 3v.438a1 1 0 0 1-.01.148z"></path></svg>
-                        </a>
-                        <a href="/FUNET/chat" class="mess-icon me-3">
-                            <i class="fas fa-comments"></i>
-                        </a> 
-                    </div>
-                    <form method="post" action="/FUNET/logout">
-                        <button type="submit" class="navbar-brand text-primary log-out" style="font-weight: bold">Log out</button>
-                    </form>
+       <div class="flex-container navbar">
+            <a href="home" style ="text-decoration:none">   <div class="logo" style="margin-bottom: 10%">FUNET</div>
+            </a>
+            <form class="" method="get" action="/FUNET/searchServlet" id="searchForm">
+                <div class="search-bar" style="margin-top:1%; margin-left:1%">
+                    <input class="form-control" name="search-name" type="search" placeholder="Searching in FUNET" aria-label="Search" id="search-input" style="padding-left:5%;">
+
                 </div>
-            </nav>
-        </header>
+            </form>
+            <div class="center-buttons">
+                <a href="home">
+                    <button class="center-button" id="home-btn">
+                        <box-icon type='solid' name='home'></box-icon>
+                    </button>
+                </a>
+                <a href="lmaterialLink"> 
+                    <button class="center-button" id="video-btn">
+                        <box-icon type='solid' name='book'></box-icon>
+                    </button>
+                </a>
+                <a href="market">
+                    <button class="center-button" id="market-btn">
+                        <box-icon name='store-alt' type='solid'></box-icon>
+                    </button>
+                </a>
+                <a href="/FUNET/friendRequestServlet" class="friend-icon me-3">
+                    <button class="center-button" id="friend-btn">
+                        <box-icon name='group' type='solid'></box-icon>
+                    </button>
+                </a>
+            </div>
+            <div class="right-icons">
+                <a href="/FUNET/chat" class="mess-icon" style='margin-left:5px'>
+                    <span class="icon icon-circle" id="messenger-btn"><box-icon name='messenger' type='logo'></box-icon></span>
+                </a>
+                <span class="icon icon-circle" id="notification-btn" style="display:none"><box-icon name='bell' type='solid' ></box-icon></span>
+                <span class="icon icon-circle" id="user-btn">&#128100;</span>
+            </div>
+
+        </div>
+
+        <div class="dropdown-menu" id="notification-menu">
+            <p>Notification content goes here...</p>
+        </div>
+    
+    <div class="dropdown-menu" id="notification-menu">
+        <p>Notification content goes here...</p>
+    </div>
+    <div class="user-menu" id="user-menu" >
+        <div class="user-info">
+            <a href="profile?userId=${sessionScope.user['user_id']}" class="d-flex align-items-center text-decoration-none text-dark">
+                <button class="user-info-button">
+                    <img src="assets/profile_avt/${sessionScope.user['profile_pic']}" class="img-fluid rounded-circle avatar" style="object-fit: cover;">
+                    <p class="mb-0 ms-2 ava-name">${sessionScope.user['first_name']} ${sessionScope.user['last_name']}</p>
+                </button>
+            </a>
+        </div>
+        <div class="menu-item">
+            <box-icon name='cog' type='solid' style="margin-right:3%; margin-left:1%;">Settings</box-icon>Settings
+        </div>
+        <div class="menu-item" >
+            <box-icon name='error-circle'style="margin-right:3%; margin-left:1%;"></box-icon>Report
+        </div>
+        
+
+        <form method="post" action="/FUNET/logout" style="display: inline; width: 100%;">
+            <div class="menu-item" style="display: flex; align-items: center; cursor: pointer; width: 100%;">
+                <box-icon type='solid' name='log-out'style=" margin-left:1%;"></box-icon>
+                <button type="submit" style="border: none; background: none; color: black; font-size: 16px; margin-left: 5px; cursor: pointer; flex: 1; text-align: left;">
+                    Log Out
+                </button>
+            </div>
+        </form>
+    </div>
+
+        <div class="dropdown-menu" id="notification-menu">
+            <p>Notification content goes here...</p>
+        </div>
+    
+    <div class="dropdown-menu" id="notification-menu">
+        <p>Notification content goes here...</p>
+    </div>
+    <div class="user-menu" id="user-menu" >
+        <div class="user-info">
+            <a href="profile?userId=${sessionScope.user['user_id']}" class="d-flex align-items-center text-decoration-none text-dark">
+                <button class="user-info-button">
+                    <img src="assets/profile_avt/${sessionScope.user['profile_pic']}" class="img-fluid rounded-circle avatar" style="object-fit: cover;">
+                    <p class="mb-0 ms-2 ava-name">${sessionScope.user['first_name']} ${sessionScope.user['last_name']}</p>
+                </button>
+            </a>
+        </div>
+        <div class="menu-item">
+            <box-icon name='cog' type='solid' style="margin-right:3%; margin-left:1%;">Settings</box-icon>Settings
+        </div>
+        <div class="menu-item" >
+            <box-icon name='error-circle'style="margin-right:3%; margin-left:1%;"></box-icon>Report
+        </div>
+        
+
+        <form method="post" action="/FUNET/logout" style="display: inline; width: 100%;">
+            <div class="menu-item" style="display: flex; align-items: center; cursor: pointer; width: 100%;">
+                <box-icon type='solid' name='log-out'style=" margin-left:1%;"></box-icon>
+                <button type="submit" style="border: none; background: none; color: black; font-size: 16px; margin-left: 5px; cursor: pointer; flex: 1; text-align: left;">
+                    Log Out
+                </button>
+            </div>
+        </form>
+    </div>
         <div class="container-fluid">
             <div class="row all-post">
                 <nav class="col-2 py-3 bg-light sticky-sidebar">
@@ -145,6 +239,8 @@
                     </c:forEach>
                 </aside>
             </div>
+                                    <script src="assets/js/logonavbar.js" defer></script>
+
             <script>
                 function updateFileName(input) {
                     var fileName = input.files[0].name;
diff --git a/web/WEB-INF/web.xml b/web/WEB-INF/web.xml
index fc54448..f07dd4b 100644
--- a/web/WEB-INF/web.xml
+++ b/web/WEB-INF/web.xml
@@ -1,5 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <web-app version="6.0" xmlns="https://jakarta.ee/xml/ns/jakartaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd">
+    <filter>
+        <filter-name>SessionCheckFilter</filter-name>
+        <filter-class>filter.SessionCheckFilter</filter-class>
+    </filter>
+    <filter-mapping>
+        <filter-name>SessionCheckFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
     <servlet>
         <servlet-name>ProductAjaxServlet</servlet-name>
         <servlet-class>controller.ProductAjaxServlet</servlet-class>
@@ -21,8 +29,8 @@
         <servlet-class>controller.UpdateOrderStatusServlet</servlet-class>
     </servlet>
     <servlet>
-        <servlet-name>lmaterialLink</servlet-name>
-        <servlet-class>controller.lmaterialLink</servlet-class>
+        <servlet-name>AdminDeleteServlet</servlet-name>
+        <servlet-class>controller.AdminDeleteServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>RemoveItemServlet</servlet-name>
@@ -48,15 +56,6 @@
         <servlet-name>UpdateOrderStatusServlet</servlet-name>
         <url-pattern>/UpdateOrderStatusServlet</url-pattern>
     </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>lmaterialLink</servlet-name>
-        <url-pattern>/lmaterialLink</url-pattern>
-    </servlet-mapping>
-    <session-config>
-        <session-timeout>
-            30
-        </session-timeout>
-    </session-config>
     <servlet>
         <servlet-name>ajaxServlet</servlet-name>
         <servlet-class>com.vnpay.common.ajaxServlet</servlet-class>
@@ -85,14 +84,6 @@
         <servlet-name>vnpayRefund</servlet-name>
         <url-pattern>/vnpayrefund/*</url-pattern>
     </servlet-mapping>
-    <filter>
-        <filter-name>SessionCheckFilter</filter-name>
-        <filter-class>filter.SessionCheckFilter</filter-class>
-    </filter>
-    <filter-mapping>
-        <filter-name>SessionCheckFilter</filter-name>
-        <url-pattern>/</url-pattern>
-    </filter-mapping>
     <servlet>
         <servlet-name>loginServlet</servlet-name>
         <servlet-class>controller.loginServlet</servlet-class>
@@ -213,6 +204,42 @@
         <servlet-name>sharePostServlet</servlet-name>
         <servlet-class>controller.sharePostServlet</servlet-class>
     </servlet>
+    <servlet>
+        <servlet-name>UserIntroduce</servlet-name>
+        <servlet-class>controller.UserIntroduce</servlet-class>
+    </servlet>
+    <servlet>
+        <servlet-name>userIntroduceServlet</servlet-name>
+        <servlet-class>controller.userIntroduceServlet</servlet-class>
+    </servlet>
+    <servlet>
+        <servlet-name>updatePostServlet</servlet-name>
+        <servlet-class>controller.updatePostServlet</servlet-class>
+    </servlet>
+    <servlet>
+        <servlet-name>BanServlet</servlet-name>
+        <servlet-class>controller.BanServlet</servlet-class>
+    </servlet>
+    <servlet>
+        <servlet-name>FileUploadServlet</servlet-name>
+        <servlet-class>controller.FileUploadServlet</servlet-class>
+    </servlet>
+    <servlet>
+        <servlet-name>updatePrivateServlet</servlet-name>
+        <servlet-class>controller.updatePrivateServlet</servlet-class>
+    </servlet>
+    <servlet>
+        <servlet-name>deleteCommentServlet</servlet-name>
+        <servlet-class>controller.deleteCommentServlet</servlet-class>
+    </servlet>
+    <servlet>
+        <servlet-name>updateCommentServlet</servlet-name>
+        <servlet-class>controller.updateCommentServlet</servlet-class>
+    </servlet>
+    <servlet>
+        <servlet-name>savePostServlet</servlet-name>
+        <servlet-class>controller.savePostServlet</servlet-class>
+    </servlet>
     <servlet>
         <servlet-name>AddToCartServlet</servlet-name>
         <servlet-class>controller.AddToCartServlet</servlet-class>
@@ -241,6 +268,51 @@
         <servlet-name>testServlet</servlet-name>
         <servlet-class>controller.testServlet</servlet-class>
     </servlet>
+     <servlet>
+        <servlet-name>searchLearningMaterial</servlet-name>
+        <servlet-class>controller.searchLearningMaterial</servlet-class>
+    </servlet>
+    <servlet>
+        <servlet-name>lmaterialLink</servlet-name>
+        <servlet-class>controller.lmaterialLink</servlet-class>
+    </servlet>
+    <servlet>
+        <servlet-name>learningMaterialDepartmentSearch</servlet-name>
+        <servlet-class>controller.learningMaterialDepartmentSearch</servlet-class>
+    </servlet>
+    <servlet>
+        <servlet-name>createLearningMaterial</servlet-name>
+        <servlet-class>controller.createLearningMaterial</servlet-class>
+    </servlet>
+    <servlet>
+        <servlet-name>updateLearningMaterial</servlet-name>
+        <servlet-class>controller.updateLearningMaterial</servlet-class>
+    </servlet>
+    <servlet>
+        <servlet-name>deleteLearningMaterial</servlet-name>
+        <servlet-class>controller.deleteLearningMaterial</servlet-class>
+    </servlet>
+    <servlet>
+        <servlet-name>CreateLearningMaterial</servlet-name>
+        <servlet-class>controller.CreateLearningMaterial</servlet-class>
+    </servlet>
+    <servlet>
+        <servlet-name>saveLearningMaterial</servlet-name>
+        <servlet-class>controller.saveLearningMaterial</servlet-class>
+    </servlet>
+    <servlet>
+        <servlet-name>viewSavedLearningMaterials</servlet-name>
+        <servlet-class>controller.viewSavedLearningMaterials</servlet-class>
+    </servlet>
+    <servlet>
+        <servlet-name>CreMaterialServlet</servlet-name>
+        <servlet-class>controller.CreMaterialServlet</servlet-class>
+    </servlet>
+    <servlet>
+        <servlet-name>DownloadMaterialServlet</servlet-name>
+        <servlet-class>controller.DownloadMaterialServlet</servlet-class>
+    </servlet>
+    
     <servlet-mapping>
         <servlet-name>loginServlet</servlet-name>
         <url-pattern>/login</url-pattern>
@@ -355,12 +427,48 @@
     </servlet-mapping>
     <servlet-mapping>
         <servlet-name>UserRestController</servlet-name>
-        <url-pattern>/user-rest-controller</url-pattern>
+        <url-pattern>/users-rest-controller</url-pattern>
     </servlet-mapping>
     <servlet-mapping>
         <servlet-name>sharePostServlet</servlet-name>
         <url-pattern>/sharePostServlet</url-pattern>
     </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>UserIntroduce</servlet-name>
+        <url-pattern>/UserIntroduce</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>userIntroduceServlet</servlet-name>
+        <url-pattern>/userIntroduceServlet</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>updatePostServlet</servlet-name>
+        <url-pattern>/updatePostServlet</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>BanServlet</servlet-name>
+        <url-pattern>/ban</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>FileUploadServlet</servlet-name>
+        <url-pattern>/upload</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>updatePrivateServlet</servlet-name>
+        <url-pattern>/updatePrivateServlet</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>deleteCommentServlet</servlet-name>
+        <url-pattern>/deleteCommentServlet</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>updateCommentServlet</servlet-name>
+        <url-pattern>/updateCommentServlet</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>savePostServlet</servlet-name>
+        <url-pattern>/savePostServlet</url-pattern>
+    </servlet-mapping>
     <servlet-mapping>
         <servlet-name>AddCartServlet</servlet-name>
         <url-pattern>/AddCartServlet</url-pattern>
@@ -385,7 +493,56 @@
         <servlet-name>testServlet</servlet-name>
         <url-pattern>/testServlet</url-pattern>
     </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>AdminDeleteServlet</servlet-name>
+        <url-pattern>/adminDelete</url-pattern>
+    </servlet-mapping>
+     <servlet-mapping>
+        <servlet-name>searchLearningMaterial</servlet-name>
+        <url-pattern>/searchLearningMaterial</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>lmaterialLink</servlet-name>
+        <url-pattern>/lmaterialLink</url-pattern>
+    </servlet-mapping>
+     <servlet-mapping>
+        <servlet-name>learningMaterialDepartmentSearch</servlet-name>
+        <url-pattern>/learningMaterialDepartmentSearch</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>createLearningMaterial</servlet-name>
+        <url-pattern>/createLearningMaterial</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>updateLearningMaterial</servlet-name>
+        <url-pattern>/updateLearningMaterial</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>deleteLearningMaterial</servlet-name>
+        <url-pattern>/deleteLearningMaterial</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>CreateLearningMaterial</servlet-name>
+        <url-pattern>/CreateLearningMaterial</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>saveLearningMaterial</servlet-name>
+        <url-pattern>/saveLearningMaterial</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>viewSavedLearningMaterials</servlet-name>
+        <url-pattern>/viewSavedLearningMaterials</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>CreMaterialServlet</servlet-name>
+        <url-pattern>/creMaterial</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>DownloadMaterialServlet</servlet-name>
+        <url-pattern>/downloadMaterial</url-pattern>
+    </servlet-mapping>
+    
     <welcome-file-list>
         <welcome-file>/WEB-INF/login.jsp</welcome-file>
     </welcome-file-list>
-</web-app>
+</web-app>
\ No newline at end of file
diff --git a/web/assets/DropBox/commons-fileupload-1.5.jar b/web/assets/DropBox/commons-fileupload-1.5.jar
new file mode 100644
index 0000000..5e60875
Binary files /dev/null and b/web/assets/DropBox/commons-fileupload-1.5.jar differ
diff --git a/web/assets/DropBox/commons-io-2.11.0.jar b/web/assets/DropBox/commons-io-2.11.0.jar
new file mode 100644
index 0000000..be507d9
Binary files /dev/null and b/web/assets/DropBox/commons-io-2.11.0.jar differ
diff --git a/web/assets/DropBox/dropbox-core-sdk-5.4.4.jar b/web/assets/DropBox/dropbox-core-sdk-5.4.4.jar
new file mode 100644
index 0000000..ac4bf7b
Binary files /dev/null and b/web/assets/DropBox/dropbox-core-sdk-5.4.4.jar differ
diff --git a/web/assets/DropBox/jackson-annotations-2.15.2.jar b/web/assets/DropBox/jackson-annotations-2.15.2.jar
new file mode 100644
index 0000000..f8799c3
Binary files /dev/null and b/web/assets/DropBox/jackson-annotations-2.15.2.jar differ
diff --git a/web/assets/DropBox/jackson-core-2.15.2.jar b/web/assets/DropBox/jackson-core-2.15.2.jar
new file mode 100644
index 0000000..a0e7486
Binary files /dev/null and b/web/assets/DropBox/jackson-core-2.15.2.jar differ
diff --git a/web/assets/DropBox/jackson-databind-2.15.2.jar b/web/assets/DropBox/jackson-databind-2.15.2.jar
new file mode 100644
index 0000000..86f9a86
Binary files /dev/null and b/web/assets/DropBox/jackson-databind-2.15.2.jar differ
diff --git a/web/assets/DropBox/javax.servlet-api-4.0.1.jar b/web/assets/DropBox/javax.servlet-api-4.0.1.jar
new file mode 100644
index 0000000..844ec7f
Binary files /dev/null and b/web/assets/DropBox/javax.servlet-api-4.0.1.jar differ
diff --git a/web/assets/DropBox/javax.servlet.jsp-api-2.3.3.jar b/web/assets/DropBox/javax.servlet.jsp-api-2.3.3.jar
new file mode 100644
index 0000000..8b3333a
Binary files /dev/null and b/web/assets/DropBox/javax.servlet.jsp-api-2.3.3.jar differ
diff --git a/web/assets/DropBox/slf4j-api-2.0.7.jar b/web/assets/DropBox/slf4j-api-2.0.7.jar
new file mode 100644
index 0000000..be5447c
Binary files /dev/null and b/web/assets/DropBox/slf4j-api-2.0.7.jar differ
diff --git a/web/assets/DropBox/slf4j-simple-2.0.7.jar b/web/assets/DropBox/slf4j-simple-2.0.7.jar
new file mode 100644
index 0000000..35ca2ab
Binary files /dev/null and b/web/assets/DropBox/slf4j-simple-2.0.7.jar differ
diff --git a/web/assets/css/friendRequest.css b/web/assets/css/friendRequest.css
index e7eb0f7..d894f46 100644
--- a/web/assets/css/friendRequest.css
+++ b/web/assets/css/friendRequest.css
@@ -141,13 +141,7 @@ header{
     left: 57%;
     transform: translateX(-50%);
 }
-.friend-icon,
-.mess-icon {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-     margin: 0 200px;
-}
+
 .mess-icon i {
     font-size: 25px;
 }
diff --git a/web/assets/css/home.css b/web/assets/css/home.css
index e5852c1..2897686 100644
--- a/web/assets/css/home.css
+++ b/web/assets/css/home.css
@@ -1,356 +1,379 @@
-
-/*
-Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
-Click nbfs://nbhost/SystemFileSystem/Templates/JSP_Servlet/CascadeStyleSheet.css to edit this template
-*/
-
-/* 
-    Created on : Jun 19, 2024, 1:35:13 PM
-    Author     : bim26
-*/
-body {
-    background-image: linear-gradient(to bottom, #f8f9fa, #fff);
-}
-.custom-navbar {
-    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
-}
-.profile-section, .settings-section {
-    background-color: #f7f7f7;
-    padding: 10px;
-    border-radius: 10px;
-    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
-}
-.post {
-    background-color: #fff;
-    padding: 15px;
-    border-radius: 10px;
-    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
-}
-.post-header {
-    color: #337ab7;
-}
-.post-rating-selected > .post-rating-button,
-.post-rating-selected > .post-rating-count {
-    color: #337ab7; /* blue color for liked posts */
-}
-.post-rating-button {
-    font-size: 18px;
-    margin-right: 5px;
-}
-.post-rating-count {
-    font-size: 14px;
-    margin-left: 5px;
-}
 body {
-    background-color: #f8f9fa;
-}
-header{
-    position: sticky;
-    width:100%;
-    top: 0;
-    left: 0;
-}
-
-.custom-navbar {
-    background-color: #ececec;
-    padding: 0.5rem 1rem;
-}
-
-.custom-navbar .form-control {
-    margin-left: 1rem;
-    max-width: 300px;
-}
-.log-out{
-    margin-right: 1rem;
-    border: 0;
-}
-.sidebar {
-    border-right: 1px solid #ddd;
-    border-left: 1px solid #ddd;
-    height: 100%;
-}
-
-.profile-section {
-    text-align: center;
-}
-
-.profile-section .avatar {
-    object-fit: cover;
-    width: 50px;
-    height: 50px;
-    border-radius: 50%;
-}
-
-.profile-section a {
-    display: flex;
-    align-items: center;
-    text-decoration: none;
-    color: inherit;
-}
-
-.profile-section p {
-    font-weight: 600;
-    margin-bottom: 0;
-}
-
-.chat-box {
-    border-top: 1px solid #ddd;
-    padding-top: 10px;
-}
-.main-class{
-    border-left: 1px solid #ddd;
-    border-right: 1px solid #ddd;
-}
-.post {
-    height: auto;
-    border-top: 1px solid #ddd;
-    padding-top: 10px;
-    border-bottom: 1px solid #ddd;
-    padding-bottom: 10px;
-    padding-top: 10px;
-}
-
-.post-header {
-    font-weight: bold;
-    margin-bottom: 5px;
-}
-
-.add-friend {
-    border-top: 1px solid #ddd;
-    padding-top: 10px;
-}
-
-.list-group-item {
-    border: none;
-    padding-left: 0;
-}
-.sticky-sidebar {
-    position: sticky;
-    top: 70px; /* Adjust this value based on your navbar height */
-    height: calc(100vh - 70px); /* Subtract the top offset from the viewport height */
-    overflow-y: auto; /* Allow scrolling within the sidebar if content is too long */
-}
-
-.custom-navbar {
-    position: sticky;
-    top: 0;
-    z-index: 1000;
-}
-
-.custom-file-upload {
-    border: 1px solid #ccc;
-    display: inline-block;
-    padding: 6px 12px;
-    cursor: pointer;
-    background-color: #f8f9fa;
-    color: #495057;
-    border-radius: 4px;
-    transition: all 0.3s;
-}
-.custom-file-upload:hover {
-    background-color: #e9ecef;
-}
-.custom-file-upload i {
-    margin-right: 5px;
-}
-#file-name {
-    margin-left: 10px;
-    font-style: italic;
-}
-
-
-.post-ratings-container {
-    display: flex;
-    justify-content: left;
-    padding: 12px 0;
-}
-
-.post-rating {
-    display: flex;
-    align-items: center;
-    cursor: default;
-}
-
-.post-rating-selected > .post-rating-button,
-.post-rating-selected > .post-rating-count {
-    color: #009578;
-}
-
-.post-rating-button {
-    margin-right: 6px;
-    color: #555555;
-}
-
-.post-rating:not(.post-rating-selected) > .post-rating-button:hover {
-    color: #009578;
-}
-
-.custom-navbar .form-control {
-    margin-left: 1rem;
-    max-width: 300px;
-    border-radius: 30px;
-}
-.log-out{
-    margin-right: 1rem;
-    border: 0;
-}
-.sidebar {
-    border-right: 1px solid #ddd;
-    border-left: 1px solid #ddd;
-    height: 100%;
-}
-
-.profile-section {
-    text-align: center;
-    background-color: #f7f7f7;
-    padding: 10px;
-    border-radius: 10px;
-    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
-}
-
-.profile-section .avatar {
-    width: 50px;
-    height: 50px;
-    border-radius: 50%;
-}
-
-.profile-section a {
-    display: flex;
-    align-items: center;
-    text-decoration: none;
-    color: inherit;
-}
-
-.profile-section p {
-    font-weight: 600;
-    margin-bottom: 0;
-}
-
-.chat-box {
-    border-top: 1px solid #ddd;
-    padding-top: 10px;
-}
-.main-class{
-    border-left: 1px solid #ddd;
-    border-right: 1px solid #ddd;
-}
-.post {
-    height: auto;
-    border-top: 1px solid #ddd;
-    padding-top: 10px;
-    border-bottom: 1px solid #ddd;
-    padding-bottom: 10px;
-    padding-top: 10px;
-}
-
-.post-header {
-    font-weight: bold;
-    margin-bottom: 5px;
-    color: #337ab7;
-}
-
-.add-friend {
-    border-top: 1px solid #ddd;
-    padding-top: 10px;
-}
-
-.list-group-item {
-    border: none;
-    padding-left: 0;
-}
-
-
-.post-ratings-container {
-    display: flex;
-    justify-content: left;
-    padding: 12px 0;
-}
-
-.post-rating {
-    display: flex;
-    align-items: center;
-    cursor: default;
-}
-
-.post-rating-selected > .post-rating-button,
-.post-rating-selected > .post-rating-count {
-    color: #009578;
-}
-
-.post-rating-button {
-    color: #555555;
-    font-size: 18px;
-    margin-right: 5px;
-}
-
-.post-rating-count {
-    font-size: 14px;
-    margin-left: 5px;
-}
-
-.post-rating:not(.post-rating-selected) > .post-rating-button:hover {
-    color: #009578;
-}
-.search-button {
-    background: none;
-    border: none;
-    cursor: pointer;
-    font-size: 20px;
-    color: #333;
-    background-color: #f7f7f7;
-    padding: 10px;
-    border-radius: 10px;
-    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
-}
-.search-button:hover {
-    color: #007bff;
-}
-.nav-icons {
-    position: absolute;
-    left: 57%;
-    transform: translateX(-50%);
-}
-.lm-icon,
-.market-icon,
-.friend-icon,
-.mess-icon {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    margin: 0 150px;
-}
-.mess-icon i {
-    font-size: 25px;
-}
-.friend-icon svg{
-    width: 30px;
-    height: 30px;
-}
-
-.post-rating-selected > .post-rating-button,
-.post-rating-selected > .post-rating-count {
-    color: #337ab7; /* blue color for liked posts */
-}
-
-
-@media screen and (max-width: 768px) {
-    .ava-name{
-        display: none;
-    }
-    .friend-list{
-        display: none;
-    }
-    .chat-box{
-        display: none;
-    }
-    .post-method{
-        width: 125%;
-    }
-    .home-logo{
-        display: none;
-    }
-    .all-post{
-        margin-top: 5%;
-    }
-
-}
+                font-family: Arial, sans-serif;
+                margin: 0;
+                background-color: whitesmoke;
+            }
+            .container{
+                max-width: 100%;
+            }
+
+            .RightItem, .UserAvatar{
+
+                width: 350px;
+
+            }
+
+            .UserAvatar:hover{
+                background-color: #e4e6e8;
+                border-radius: 7px;
+            }
+            .RightItem div:hover{
+                background-color: #e4e6e8;
+                border-radius: 7px;
+            }
+            .RightItem div{
+                margin-top: 10px;
+                display: flex;
+                align-items: center;
+                padding: 10px 0;
+                cursor: pointer;
+                font-size: 16px;
+                gap:20px;
+            }
+            .post {
+                height: fit-content;
+                background-color: #fff;
+                border-radius: 15px;
+                padding: 10px;
+                box-sizing: border-box;
+                margin-top: 30px;
+            }
+            .avatar2{
+                height:40px;
+                width:40px;
+            }
+
+            .input {
+                display: flex;
+                align-items: center;
+                flex-wrap: wrap;
+            }
+
+            .inputArea {
+                flex: 1;
+                min-width: 0;
+            }
+
+            .inputArea input {
+                border: none;
+                border-radius: 15px;
+                height: 30px;
+                width: 98%;
+                transition: width 0.3s ease;
+                outline: 1px solid rgb(133, 130, 130);
+                box-sizing: border-box;
+            }
+            .btn-document{
+                display:flex;
+                justify-content: space-between;
+                width:100%;
+            }
+
+
+            .item {
+                flex: 1;
+                text-align: center;
+                height:30px;
+                margin-left:5px;
+                margin-right: 5px;
+                
+                margin-top:1%;             
+                padding-top:1%;
+                transition: transform 0.2s;
+                cursor: pointer;
+            }
+            .item2 {
+                flex: 1;
+                text-align: center;
+                height:50px;
+                margin-left:5px;
+                margin-right: 5px;
+                
+                margin-top:1%;             
+                padding-top:1%;
+                transition: transform 0.2s;
+                cursor: pointer;
+            }
+
+            .item:hover {
+                transform: scale(1.1);
+                background-color: #e0e0e0;
+                border-radius: 20px;
+
+
+            }
+            .overlay {
+                position: fixed;
+                top: 0;
+                left: 0;
+                width: 100%;
+                height: 100%;
+                background: rgba(0, 0, 0, 0.5);
+                z-index: 10;
+                display: flex;
+                justify-content: center;
+                align-items: center;
+            }
+
+            .form-container {
+                background: white;
+                padding: 20px;
+                border-radius: 10px;
+                box-shadow: 0 0 10px rgba(0, 0, 0, 0.3);
+                z-index: 20;
+                max-width: 600px;
+                width: 100%;
+                position: absolute;
+                left: 50%;
+                top: 50%;
+                transform: translate(-50%, -50%);
+            }
+            .post {
+                height: auto;
+                border-top: 1px solid #ddd;
+                padding-top: 10px;
+                border-bottom: 1px solid #ddd;
+                padding-bottom: 10px;
+                padding-top: 10px;
+            }
+
+            .post-header {
+                font-weight: bold;
+                margin-bottom: 5px;
+            }
+
+            .add-friend {
+                border-top: 1px solid #ddd;
+                padding-top: 10px;
+            }
+
+            .list-group-item {
+                border: none;
+                padding-left: 0;
+            }
+
+
+            .post-ratings-container {
+                display: flex;
+                justify-content: left;
+                padding: 12px 0;
+            }
+
+            .post-rating {
+                display: flex;
+                align-items: center;
+                cursor: default;
+            }
+
+            .post-rating-selected > .post-rating-button,
+            .post-rating-selected > .post-rating-count {
+                color: #009578;
+            }
+
+            .post-rating-button {
+                margin-right: 6px;
+                color: #555555;
+            }
+
+            .post-rating:not(.post-rating-selected) > .post-rating-button:hover {
+                color: #009578;
+            }
+
+            .three-dot-btn {
+                border: none;
+                background-color: white;
+                outline: none;
+                cursor: pointer;
+            }
+            .edit-comment-btn{
+                border: none;
+                background-color: white;
+                outline: none;
+                cursor: pointer;
+            }
+            .delete-comment-btn{
+                border: none;
+                background-color: white;
+                outline: none;
+                cursor: pointer;
+            }
+
+
+            @media screen and (max-width: 1250px) {
+                .center-buttons{
+                    display:none;
+                }
+                .ava-name{
+                    display: none;
+                }
+                .friend-list{
+                    display: none;
+                }
+                .chat-box{
+                    display: none;
+                }
+                .post-method{
+                    width: 125%;
+                }
+                .home-logo{
+                    display: none;
+                }
+                .all-post{
+                    margin-top: 5%;
+                }
+
+            }
+            @media screen and (max-width: 1050px) {
+                .search-bar input {
+                    width:200px;
+
+                }
+
+
+            }
+            @media screen and (max-width: 850px) {
+                .search-bar {
+                    display:none;
+                }
+                .logo{
+                    display:none;
+                }
+                .RightItem{
+                    margin:0;
+                    justify-content: center;
+                }
+            }
+            .form-container {
+                width: 554px;
+                min-height: 415px;
+                margin: 0 auto;
+                border: 1px solid #e5e5e5;
+                border-radius: 10px;
+                padding: 10px;
+                background-color: #ffffff;
+                font-family: Arial, sans-serif;
+                display: flex;
+                flex-direction: column;
+            }
+
+            .form-title {
+                text-align: center;
+                font-size: 18px;
+                font-weight: bold;
+                margin: 0;
+                height: 15px;
+            }
+
+            .form-header {
+                display: flex;
+
+                margin: 5px 0 10px 40px;
+            }
+            .head {
+                display: flex;
+                justify-content: space-between;
+                align-items: center;
+                width: 100%;
+            }
+
+            .form-title {
+                flex-grow: 1;
+                text-align: center;
+                margin: 0;
+            }
+
+            .close-button {
+                width: 30px;
+                height:30px
+                    ;
+                border-radius: 50%;
+                text-align: center;
+            }
+            .close-button:hover{
+                background-color: #cccfd4;
+            }
+
+
+            .ava-name {
+                margin-left: 5px;
+                font-size: 14px;
+            }
+
+            .hr-line {
+                border: 0.5px solid black;
+                width: 100%;
+                margin:0;
+
+            }
+
+            .textarea-container {
+                margin: 0;
+                width: 462px;
+
+            }
+
+            .form-control {
+                width: 100%;
+                height: 125px;
+                padding: 10px;
+                border-radius: 5px;
+                border: none;
+                resize: none;
+                margin-left:15px;
+                margin-bottom:10px;
+                font-size: 25px;
+                overflow: hidden;
+            }
+            .form-content {
+                flex-grow: 1;
+                display: flex;
+                flex-direction: column;
+                gap: 10px;
+            }
+
+            .upload-section {
+                display: flex;
+                justify-content: space-between;
+                margin-top: 10px;
+                width: 100%;
+                margin-left: auto;
+                margin-right: auto;
+            }
+
+            .upload-div {
+                cursor: pointer;
+                font-size: 14px;
+                color: #007bff;
+                display: flex;
+                align-items: center;
+            }
+
+            .submit-button {
+                width: 100%;
+                padding: 10px;
+                background-color: #007bff;
+                border: none;
+                border-radius: 5px;
+                color: #ffffff;
+                cursor: pointer;
+                margin:0;
+                align-self: flex-end;
+            }
+
+            .submit-button:disabled {
+                background-color: #e0e0e0;
+            }
+            .dashBoard{
+                position:fixed;
+                
+            }
+            .mainContainer{
+                margin-left:33%;
+                
+                
+            }
+            .listFriend{
+                position:fixed;
+                margin-left: 67%;
+            }
+            
\ No newline at end of file
diff --git a/web/assets/css/learningMaterial.css b/web/assets/css/learningMaterial.css
new file mode 100644
index 0000000..33278bc
--- /dev/null
+++ b/web/assets/css/learningMaterial.css
@@ -0,0 +1,52 @@
+/*
+Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+Click nbfs://nbhost/SystemFileSystem/Templates/ClientSide/css.css to edit this template
+*/
+/* 
+    Created on : Oct 23, 2024, 12:01:13 AM
+    Author     : gabri
+*/
+.body{
+    
+}
+.search-form-controller{
+    border-radius: 15px;
+    border:none;
+    outline: 1px solid rgb(133,130,130);
+    padding-left: 5%;
+    height:100%;
+}
+.search-learning-material-container{
+    height:35px;
+}
+.main-class{
+        margin-top: 2%;
+
+}
+
+#learningMaterialForm {
+    display: none;
+    top: 0;
+    left: 0;
+    width: 100%;
+    background-color: white;
+    padding: 20px;
+    box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
+    z-index: 10;
+}
+.form-control{
+    height: 70px;
+}
+#savedBtn {
+    width: 100%;
+}
+
+/* Dropdown menu position for the three-dot button */
+.material-container .dropdown {
+   position:relative;
+   left:45%;
+}
+
+.material-container .dropdown .dropdown-menu {
+    min-width: 150px;
+}
\ No newline at end of file
diff --git a/web/assets/css/logonavbar.css b/web/assets/css/logonavbar.css
new file mode 100644
index 0000000..09423e7
--- /dev/null
+++ b/web/assets/css/logonavbar.css
@@ -0,0 +1,191 @@
+/*
+Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+Click nbfs://nbhost/SystemFileSystem/Templates/JSP_Servlet/CascadeStyleSheet.css to edit this template
+*/
+/* 
+    Created on : Oct 28, 2024, 8:58:12 PM
+    Author     : OS
+*/
+
+
+            .navbar {
+                display: flex;
+                align-items: center;
+                justify-content: space-around;
+                position: relative;
+                background-color: #ffffff;
+                height: 60px;
+                width: 100%;
+                top: 0;
+                z-index: 1000;
+                box-sizing: border-box;
+                position:sticky;
+              box-shadow: 1px 1px 3px 3px rgba(0,0,0,0.1);
+            }
+
+            .center-buttons {
+                display: flex;
+                gap: 10px;
+                justify-content: center;
+                align-items: center;
+                flex-grow: 1;
+                margin-left: 10%;
+
+            }
+
+            .center-button {
+                flex: 1;
+                width:80px;
+                height: 48px;
+                background: none;
+                border: none;
+                color: black;
+                cursor: pointer;
+                border-radius: 15px;
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                transition: background-color 0.3s ease;
+                margin-bottom: 1%;
+            }
+
+
+
+
+            .logo {
+
+                font-size: 24px;
+                font-weight: bold;
+
+            }
+            .search-bar {
+                margin-bottom: 5px;
+                margin-bottom: 10px;
+                margin-left: 1%;
+            }
+            .search-bar input {
+                padding: 8px;
+                border: none;
+                border-radius: 15px;
+                height: 35px;
+                width: 250px;
+                transition: width 0.3s ease;
+                outline: 1px solid rgb(133, 130, 130);
+                font-size:15px;
+            }
+            .center-button:hover {
+                background-color: #CFC6C6;
+            }
+
+            .right-icons {
+                display: flex;
+                gap: 10px;
+                align-items: center;
+                width: 500px;
+                padding-left:330px;
+                justify-content:flex-end;
+            }
+
+            .icon {
+                font-size: 20px;
+                cursor: pointer;
+                color: black;
+            }
+            .icon-circle {
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                width: 40px;
+                height: 40px;
+                background-color: rgb(211, 211, 211);
+                border-radius: 50%;
+                transition: background-color 0.3s ease;
+            }
+            .icon-circle:hover {
+                background-color: darkgrey;
+            }
+            .dropdown-menu {
+                display: none;
+                position: fixed;
+
+                right: 20px;
+                width: 360px;
+                height: 500px;
+                background-color: white;
+                color: black;
+                border-radius: 15px;
+                padding: 10px;
+                z-index: 1000;
+                box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
+            }
+
+            .user-info {
+                width: 330px;
+                height: 75px;
+                box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
+                border-radius: 7px;
+                margin-bottom: 10px;
+            }
+            .user-info-button {
+                display: flex;
+                align-items: center;
+                width: 328px;
+                border: none;
+                background: none;
+                cursor: pointer;
+                border-radius: 7px;
+                padding: 5px;
+                transition: background-color 0.3s ease;
+            }
+            .user-info-button:hover {
+                background-color: #f2f2f2;
+            }
+            .avatar {
+                width: 50px;
+                height: 50px;
+                border-radius: 50%;
+                margin-right: 10px;
+            }
+            .username {
+                font-size: 16px;
+                font-weight: bold;
+            }
+            .menu-item {
+                align-items: center;
+                height: 75px;
+                padding: 10px;
+                cursor: pointer;
+                border-radius: 7px;
+                transition: background-color 0.3s ease;
+            }
+
+            .user-menu {
+                display: none;
+                position: fixed;
+                right: 20px;
+                width: 360px;
+                height: fit-content;
+                background-color: white;
+                color: black;
+                border-radius: 7px;
+                padding: 10px;
+                z-index: 1000;
+                box-shadow: 1px 2px 3px 4px rgba(0, 0, 0, 0.1);
+            }
+
+            .user-menu div {
+                display: flex;
+                align-items: center;
+                padding: 10px 0;
+                cursor: pointer;
+                font-size: 16px;
+                height:50px;
+            }
+
+            .user-menu div:hover {
+                background-color: #eee;
+            }
+            .active-button {
+                background-color: rgb(191, 217, 243);
+                color: white;
+            }
\ No newline at end of file
diff --git a/web/assets/css/profile.css b/web/assets/css/profile.css
index 43061f3..d2d0e47 100644
--- a/web/assets/css/profile.css
+++ b/web/assets/css/profile.css
@@ -8,7 +8,49 @@ body {
     font-family: arial;
     position: relative;
 }
+.user-introduction {
+    margin-bottom: 20px;
+}
+
+.user-introduction h2 {
+    margin-bottom: 10px;
+}
 
+.user-introduction p {
+    margin-bottom: 10px;
+}
+.three-dot-btn {
+    border: none;
+    background-color: white;
+    outline: none;
+    cursor: pointer;
+}
+.edit-comment-btn{
+    border: none;
+    background-color: white;
+    outline: none;
+    cursor: pointer;
+}
+.delete-comment-btn{
+    border: none;
+    background-color: white;
+    outline: none;
+    cursor: pointer;
+}
+#edit-intro-form {
+    display: flex;
+    flex-direction: column;
+}
+
+#edit-intro-form .form-control {
+    margin-bottom: 10px;
+    padding: 10px;
+    font-size: 16px;
+}
+
+#edit-intro-form .btn {
+    margin-right: 10px;
+}
 .popop-background {
     position: absolute;
     left: 0px;
@@ -795,11 +837,11 @@ body {
 }
 
 .privacy-info {
-    display:flex;    
+    display:flex;
 }
 
 .privacy-info i{
-    font-size: 9px;  
+    font-size: 9px;
     margin-left: 2%;
     margin-top: 3px;
 }
@@ -822,7 +864,7 @@ body {
 }
 
 .thre-dto-btn:hover {
-	background-color: #E4E6E9;
+    background-color: #E4E6E9;
 }
 
 .post-div {
@@ -1446,4 +1488,33 @@ For multi pictures display function
 
 .bio-btn-click {
     display: none;
-}
\ No newline at end of file
+}
+
+.post {
+    position: relative;
+}
+
+.dropdown-menu {
+    position: absolute;
+    top: 30px;
+    right: 0;
+    display: none;
+    background-color: white;
+    border: 1px solid #ccc;
+    box-shadow: 0 2px 10px rgba(0, 0, 0, 0.1);
+    z-index: 1000;
+}
+
+.dropdown-menu button {
+    display: block;
+    width: 100%;
+    padding: 10px;
+    border: none;
+    background: none;
+    text-align: left;
+    cursor: pointer;
+}
+
+.dropdown-menu button:hover {
+    background-color: #f0f0f0;
+}
diff --git a/web/assets/css/profile_navbar_temp.css b/web/assets/css/profile_navbar_temp.css
new file mode 100644
index 0000000..c00258f
--- /dev/null
+++ b/web/assets/css/profile_navbar_temp.css
@@ -0,0 +1,9 @@
+/*
+Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+Click nbfs://nbhost/SystemFileSystem/Templates/JSP_Servlet/CascadeStyleSheet.css to edit this template
+*/
+/* 
+    Created on : Oct 11, 2024, 3:32:07 PM
+    Author     : HELLO
+*/
+
diff --git a/web/assets/css/search.css b/web/assets/css/search.css
index 0b9106c..cd8f0c7 100644
--- a/web/assets/css/search.css
+++ b/web/assets/css/search.css
@@ -97,13 +97,7 @@ header{
     left: 57%;
     transform: translateX(-50%);
 }
-.friend-icon,
-.mess-icon {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-     margin: 0 200px;
-}
+
 .mess-icon i {
     font-size: 25px;
 }
diff --git a/web/assets/css/test.css b/web/assets/css/test.css
index 9413a0f..a5ee278 100644
--- a/web/assets/css/test.css
+++ b/web/assets/css/test.css
@@ -41,9 +41,11 @@ img {
 }
 
 .container {
-    width: 100%;
+    margin: 0 0;
+    padding: 0 0;
+    width: 100vw;
     height: 100vh;
-    display: flex;
+    min-width: 100vw;
     justify-content: center;
     align-items: center;
 }
@@ -131,132 +133,148 @@ img {
     box-shadow: 0rem .2rem .4rem rgba(1, 1, 1, 0.05);
     display: flex;
     flex-wrap: wrap;
-    height: 70rem;
+    height: 100vh;
+    width: 100vw;
     overflow: hidden;
 }
 
 .conversation-container .left-side {
-    width: 30rem;
+    width: 20%;
     background: var(--btnColor);
     padding: 2rem 1.5rem;
     box-sizing: border-box;
-    border-radius: 1rem 0rem 0rem 1rem;
     position: relative;
 }
 
 .conversation-container .right-side {
-    width: 70rem;
+    width: 80%;
     background: var(--conversationBody);
     box-sizing: border-box;
     border-radius: 0rem 1rem 1rem 0rem;
     overflow: hidden;
+    display: flex;
+    flex-direction: column;
 }
 
 .add-group {
-	position: absolute;
-	left: 2rem;
-	bottom: 2rem;
-	font-size: 1.8rem;
-	cursor: pointer;
-	display: none;
-	padding: 0.5rem 1rem;
-	background: var(--mainColor);
-	z-index: 9;
+    position: absolute;
+    left: 2rem;
+    bottom: 2rem;
+    font-size: 1.8rem;
+    cursor: pointer;
+    display: none;
+    padding: 0.5rem 1rem;
+    background: var(--mainColor);
+    z-index: 9;
 }
 
 .add-group.active {
-	display: block;
+    display: block;
+}
+
+.setting-menu {
+    position: absolute;
+    left: 80%;
+    top: 20%;
+    transform: translate(-50%, -50%);
+    width: 30rem;
+    background: var(--txtColorSecond);
+    color: var(--txtBlack);
+    padding: 1rem;
+    box-sizing: border-box;
+    z-index: 999;
+    display: none;
 }
 
 .modal-box {
-	position: absolute;
-	left: 50%;
-	top: 50%;
-	transform: translate(-50%, -50%);
-	width: 30rem;
-	background: var(--txtColorSecond);
-	color: var(--txtBlack);
-	padding: 1rem;
-	box-sizing: border-box;
-	z-index: 999;
-	display: none;
+    position: absolute;
+    left: 50%;
+    top: 50%;
+    transform: translate(-50%, -50%);
+    width: 30rem;
+    background: var(--txtColorSecond);
+    color: var(--txtBlack);
+    padding: 1rem;
+    box-sizing: border-box;
+    z-index: 999;
+    display: none;
 }
 
 .modal-box.active {
-	display: block;
+    display: block;
 }
 
 .modal-box-head {
-	display: flex;
-	justify-content: space-between;
-	align-items: center;
-	padding-bottom: 1rem;
-	font-size: 1.4rem;
-	font-weight: 600;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding-bottom: 1rem;
+    font-size: 1.4rem;
+    font-weight: 600;
 }
 
 .modal-box-body input {
-	background: #dbdbdb;
+    background: #dbdbdb;
 }
 
 .modal-box-body .list-user {
-	max-height: 25rem;
+    max-height: 25rem;
 }
 
 .modal-box-body .list-user li:hover {
-	background: none;
+    background: none;
 }
 
 .modal-box-close {
-	padding: 1rem;
-	cursor: pointer;
+    padding: 1rem;
+    cursor: pointer;
 }
 
 .user-select-dot {
-	width: 1.2rem;
-	height: 1.2rem;
-	border-radius: 50%;
-	border: 0.1rem solid var(--txtBlack);
-	position: relative;
+    width: 1.2rem;
+    height: 1.2rem;
+    border-radius: 50%;
+    border: 0.1rem solid var(--txtBlack);
+    position: relative;
 }
 
 .user-select-dot::before {
-	content: "";
-	position: absolute;
-	width: .8rem;
-	height: .8rem;
-	border-radius: 50%;
-	background: var(--mainColor);
-	left: calc(50% - 0.4rem);
-	top: calc(50% - 0.4rem);
-	z-index: 9999;
-	display: none;
+    content: "";
+    position: absolute;
+    width: .8rem;
+    height: .8rem;
+    border-radius: 50%;
+    background: var(--mainColor);
+    left: calc(50% - 0.4rem);
+    top: calc(50% - 0.4rem);
+    z-index: 9999;
+    display: none;
 }
 
 .add-member-body li {
-	display: flex;
-	justify-content: space-between;
-	align-items: center;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
 }
 
 .add-member-body li:hover {
-	background: none !important;
+    background: none !important;
 }
 
 .add-member-body label {
-	flex-grow: 1;
+    flex-grow: 1;
 }
 
 .add-member-body .list-user {
-	max-height: 25rem !important;
+    max-height: 25rem !important;
 }
 
 .add-member-body input[type="checkbox"] {
-	display: none;
+    display: none;
 }
 
 .add-member-body input[type="checkbox"]:checked ~ .user-select-dot::before {
-	display: block;
+    display: block;
 }
 
 .tab-control {
@@ -288,7 +306,7 @@ img {
 }
 
 .list-user li {
-	position: relative;
+    position: relative;
 }
 
 .list-user-search .txt-input {
@@ -308,6 +326,10 @@ img {
     box-sizing: border-box;
 }
 
+.list-user ul {
+    padding-left: 0px;
+}
+
 .list-user li:hover, .list-user li.active {
     background: var(--mainColor);
 }
@@ -319,13 +341,13 @@ img {
 }
 
 .group-delete {
-	position: absolute;
-	right: 1rem;
-	top: 50%;
-	transform: translateY(-50%);
-	z-index: 10;
-	padding: 1rem;
-	background: var(--txtBlack);
+    position: absolute;
+    right: 1rem;
+    top: 50%;
+    transform: translateY(-50%);
+    z-index: 10;
+    padding: 1rem;
+    background: white;
 }
 
 .user-img {
@@ -374,7 +396,7 @@ img {
 
 .right-side .user-contact {
     box-shadow: 0rem .2rem .4rem rgba(1, 1, 1, 0.05);
-    padding: 1.5rem;
+    padding: 0;
     color: var(--txtBlack);
     display: flex;
     flex-wrap: wrap;
@@ -425,7 +447,8 @@ img {
 
 .list-messages-contain {
     padding: 0rem 1.5rem;
-    height: 56rem;
+    height: 65rem;
+    flex-grow: 1;
     overflow-y: auto;
 }
 
@@ -452,16 +475,16 @@ img {
 }
 
 .message-img .sender-name {
-	position: absolute;
-	left: 4rem;
-	bottom: -1.5rem;
-	color: var(--txtColor);
-	font-style: italic;
-	font-weight: 700;
+    position: absolute;
+    left: 4rem;
+    bottom: -1.5rem;
+    color: var(--txtColor);
+    font-style: italic;
+    font-weight: 700;
 }
 
 .message.right .sender-name {
-	left: -2rem;
+    left: -2rem;
 }
 
 .message-img img {
@@ -481,6 +504,23 @@ img {
     word-break: break-word;
 }
 
+#confirmation-popup {
+    position: fixed;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    padding: 20px;
+    background-color: white;
+    border: 2px solid black;
+    z-index: 1000;
+    text-align: center;
+}
+
+#confirmation-popup button {
+    margin: 5px;
+    padding: 10px 20px;
+}
+
 .message-text>* {
     max-width: 100%;
 }
@@ -544,7 +584,8 @@ img {
     background: var(--txtColorSecond);
     height: 5.6rem;
     align-items: center;
-    display: flex;
+    display: grid;
+    grid-template-columns: 9fr 0.33fr 0.33fr 0.33fr;
     position: relative;
 }
 
@@ -577,7 +618,6 @@ img {
     .conversation-container .right-side, .conversation-container .left-side {
         width: 45rem;
         display: none;
-        border-radius: 1rem;
     }
 
     .conversation-container .right-side.active, .conversation-container .left-side.active {
@@ -593,6 +633,5 @@ img {
     .conversation-container .right-side, .conversation-container .left-side {
         width: 30rem;
         display: none;
-        border-radius: 1rem;
     }
-}
\ No newline at end of file
+}
diff --git a/web/assets/game_image/1.jpg b/web/assets/game_image/1.jpg
new file mode 100644
index 0000000..bd4fca8
Binary files /dev/null and b/web/assets/game_image/1.jpg differ
diff --git a/web/assets/game_image/10.jpg b/web/assets/game_image/10.jpg
new file mode 100644
index 0000000..d585ed4
Binary files /dev/null and b/web/assets/game_image/10.jpg differ
diff --git a/web/assets/game_image/11.jpg b/web/assets/game_image/11.jpg
new file mode 100644
index 0000000..c8c82ca
Binary files /dev/null and b/web/assets/game_image/11.jpg differ
diff --git a/web/assets/game_image/12.jpg b/web/assets/game_image/12.jpg
new file mode 100644
index 0000000..cd4e1e5
Binary files /dev/null and b/web/assets/game_image/12.jpg differ
diff --git a/web/assets/game_image/13.jpg b/web/assets/game_image/13.jpg
new file mode 100644
index 0000000..16de70f
Binary files /dev/null and b/web/assets/game_image/13.jpg differ
diff --git a/web/assets/game_image/14.jpg b/web/assets/game_image/14.jpg
new file mode 100644
index 0000000..7eb911a
Binary files /dev/null and b/web/assets/game_image/14.jpg differ
diff --git a/web/assets/game_image/15.jpg b/web/assets/game_image/15.jpg
new file mode 100644
index 0000000..e5d2e21
Binary files /dev/null and b/web/assets/game_image/15.jpg differ
diff --git a/web/assets/game_image/16.jpg b/web/assets/game_image/16.jpg
new file mode 100644
index 0000000..45128c9
Binary files /dev/null and b/web/assets/game_image/16.jpg differ
diff --git a/web/assets/game_image/17.jpg b/web/assets/game_image/17.jpg
new file mode 100644
index 0000000..c95bb9d
Binary files /dev/null and b/web/assets/game_image/17.jpg differ
diff --git a/web/assets/game_image/18.jpg b/web/assets/game_image/18.jpg
new file mode 100644
index 0000000..704b1d0
Binary files /dev/null and b/web/assets/game_image/18.jpg differ
diff --git a/web/assets/game_image/19.jpg b/web/assets/game_image/19.jpg
new file mode 100644
index 0000000..199cfe0
Binary files /dev/null and b/web/assets/game_image/19.jpg differ
diff --git a/web/assets/game_image/2.jpg b/web/assets/game_image/2.jpg
new file mode 100644
index 0000000..4179efe
Binary files /dev/null and b/web/assets/game_image/2.jpg differ
diff --git a/web/assets/game_image/20.jpg b/web/assets/game_image/20.jpg
new file mode 100644
index 0000000..e7acead
Binary files /dev/null and b/web/assets/game_image/20.jpg differ
diff --git a/web/assets/game_image/21.jpg b/web/assets/game_image/21.jpg
new file mode 100644
index 0000000..b5bbb56
Binary files /dev/null and b/web/assets/game_image/21.jpg differ
diff --git a/web/assets/game_image/22.jpg b/web/assets/game_image/22.jpg
new file mode 100644
index 0000000..9597270
Binary files /dev/null and b/web/assets/game_image/22.jpg differ
diff --git a/web/assets/game_image/23.jpg b/web/assets/game_image/23.jpg
new file mode 100644
index 0000000..57530f7
Binary files /dev/null and b/web/assets/game_image/23.jpg differ
diff --git a/web/assets/game_image/24.jpg b/web/assets/game_image/24.jpg
new file mode 100644
index 0000000..26b9b58
Binary files /dev/null and b/web/assets/game_image/24.jpg differ
diff --git a/web/assets/game_image/25.jpg b/web/assets/game_image/25.jpg
new file mode 100644
index 0000000..46d0f24
Binary files /dev/null and b/web/assets/game_image/25.jpg differ
diff --git a/web/assets/game_image/26.jpg b/web/assets/game_image/26.jpg
new file mode 100644
index 0000000..85b707f
Binary files /dev/null and b/web/assets/game_image/26.jpg differ
diff --git a/web/assets/game_image/27.jpg b/web/assets/game_image/27.jpg
new file mode 100644
index 0000000..badadc7
Binary files /dev/null and b/web/assets/game_image/27.jpg differ
diff --git a/web/assets/game_image/28.jpg b/web/assets/game_image/28.jpg
new file mode 100644
index 0000000..ac730e8
Binary files /dev/null and b/web/assets/game_image/28.jpg differ
diff --git a/web/assets/game_image/29.jpg b/web/assets/game_image/29.jpg
new file mode 100644
index 0000000..d1d18bc
Binary files /dev/null and b/web/assets/game_image/29.jpg differ
diff --git a/web/assets/game_image/3.jpg b/web/assets/game_image/3.jpg
new file mode 100644
index 0000000..3a35b8e
Binary files /dev/null and b/web/assets/game_image/3.jpg differ
diff --git a/web/assets/game_image/30.jpg b/web/assets/game_image/30.jpg
new file mode 100644
index 0000000..1dc166f
Binary files /dev/null and b/web/assets/game_image/30.jpg differ
diff --git a/web/assets/game_image/4.jpg b/web/assets/game_image/4.jpg
new file mode 100644
index 0000000..d0f485c
Binary files /dev/null and b/web/assets/game_image/4.jpg differ
diff --git a/web/assets/game_image/5.jpg b/web/assets/game_image/5.jpg
new file mode 100644
index 0000000..b15b3fc
Binary files /dev/null and b/web/assets/game_image/5.jpg differ
diff --git a/web/assets/game_image/6.jpg b/web/assets/game_image/6.jpg
new file mode 100644
index 0000000..1f622d7
Binary files /dev/null and b/web/assets/game_image/6.jpg differ
diff --git a/web/assets/game_image/7.jpg b/web/assets/game_image/7.jpg
new file mode 100644
index 0000000..f7e9050
Binary files /dev/null and b/web/assets/game_image/7.jpg differ
diff --git a/web/assets/game_image/8.jpg b/web/assets/game_image/8.jpg
new file mode 100644
index 0000000..e65c255
Binary files /dev/null and b/web/assets/game_image/8.jpg differ
diff --git a/web/assets/game_image/9.jpg b/web/assets/game_image/9.jpg
new file mode 100644
index 0000000..91cb21a
Binary files /dev/null and b/web/assets/game_image/9.jpg differ
diff --git a/web/assets/group/group1/group2.jpg b/web/assets/group/group1/group2.jpg
new file mode 100644
index 0000000..43ab827
Binary files /dev/null and b/web/assets/group/group1/group2.jpg differ
diff --git a/web/assets/js/DashBoard.js b/web/assets/js/DashBoard.js
new file mode 100644
index 0000000..b62b78a
--- /dev/null
+++ b/web/assets/js/DashBoard.js
@@ -0,0 +1,161 @@
+// Navigation
+document.querySelectorAll('.nav-button').forEach(button => {
+    button.addEventListener('click', function () {
+        const page = this.getAttribute('data-page');
+        console.log('Button clicked:', page); // Debug log
+        showPage(page);
+    });
+});
+
+function showPage(pageId) {
+    console.log('Showing page:', pageId); // Debug log
+    document.querySelectorAll('.page').forEach(page => {
+        page.classList.remove('active');
+    });
+    const activePage = document.getElementById(`${pageId}-page`);
+    activePage.classList.add('active');
+    console.log('Active page:', activePage); // Debug log
+
+    document.querySelectorAll('.nav-button').forEach(button => {
+        button.classList.remove('active');
+    });
+    const activeButton = document.querySelector(`[data-page="${pageId}"]`);
+    activeButton.classList.add('active');
+    console.log('Active button:', activeButton); // Debug log
+}
+
+// Initialize charts
+function initCharts() {
+    const userGrowthCtx = document.getElementById('userGrowthChart').getContext('2d');
+    chart = new Chart(userGrowthCtx, {
+        type: 'line',
+        data: {
+            labels: [label0,label1, label2, label3, label4, label5, label6],
+            datasets: [{
+                    label: 'User Growth',
+                    data: [data0,data1, data2,data3,data4, data5, data6],
+                    borderColor: 'rgb(75, 192, 192)',
+                    tension: 0.1
+                }]
+        },
+        options: {
+            responsive: true,
+            scales: {
+                y: {
+                    beginAtZero: true
+                }
+            }
+        }
+    });
+}
+// kiểm tra xem hôm nay có phải ngày đầu của tháng
+function isFirstDayOfMonth() {
+    const today = new Date();
+    return today.getDate() === 1;
+}
+function setupMonthlyCheck() {
+    // Hàm kiểm tra ngày đầu tháng và cập nhật biểu đồ nếu cần
+    function checkAndUpdate() {
+        const now = new Date();
+        if (now.getDate() === 1) {
+            updateChart();
+            
+        }
+    }
+
+    // Kiểm tra ngay lập tức và cập nhật nếu là ngày đầu tháng
+    checkAndUpdate();
+    
+    // Thiết lập kiểm tra hàng ngày vào 00:01
+    const now = new Date();
+    const tomorrow = new Date(now.getFullYear(), now.getMonth(), now.getDate() + 1, 0, 1, 0);
+    const timeUntilNextCheck = tomorrow - now;
+    
+    setTimeout(() => {
+        checkAndUpdate();
+        // Thiết lập interval hàng ngày để kiểm tra vào 00:01
+        setInterval(checkAndUpdate, 24 * 60 * 60 * 1000);
+    }, timeUntilNextCheck);
+}
+// Gọi hàm thiết lập,nhớ bỏ setInterval của updateChart trước khi gọi
+setupMonthlyCheck();
+
+function updateChart() {
+    fetch('userChartData')
+        .then(response => response.json())
+        .then(data => {
+            // Thêm dữ liệu mới vào biểu đồ
+            chart.data.labels.push(data.month);
+            chart.data.datasets[0].data.push(data.userCount);
+            
+            // Giới hạn số điểm dữ liệu hiển thị ( chỉ hiển thị 7 tháng gần nhất)
+            if (chart.data.labels.length > 7) {
+                chart.data.labels.shift();
+                chart.data.datasets[0].data.shift();
+            }
+            
+            // Cập nhật biểu đồ
+            chart.update();
+        })
+        .catch(error => console.error('Error:', error));
+}
+// đặt thời gian 5s 1 lần cập nhật
+//setInterval(updateChart, 5000);
+
+const postEngagementCtx = document.getElementById('postEngagementChart').getContext('2d');
+new Chart(postEngagementCtx, {
+    type: 'bar',
+    data: {
+        labels: ['Likes', 'Comments', 'Shares'],
+        datasets: [{
+                label: 'Post Engagement',
+                data: [12000, 5000, 3000],
+                backgroundColor: [
+                    'rgba(255, 99, 132, 0.2)',
+                    'rgba(54, 162, 235, 0.2)',
+                    'rgba(255, 206, 86, 0.2)'
+                ],
+                borderColor: [
+                    'rgba(255, 99, 132, 1)',
+                    'rgba(54, 162, 235, 1)',
+                    'rgba(255, 206, 86, 1)'
+                ],
+                borderWidth: 1
+            }]
+    },
+    options: {
+        responsive: true,
+        scales: {
+            y: {
+                beginAtZero: true
+            }
+        }
+    }
+});
+
+
+// Initialize charts when the Analytics page is shown
+document.querySelector('[data-page="analytics"]').addEventListener('click', initCharts);
+
+
+// cập nhật user log theo giây
+/*function updateActivities() {
+    fetch('updateDiary')
+            .then(response => {
+                if (!response.ok) {
+                    throw new Error(`HTTP error! status: ${response.status}`);
+                }
+                return response.text();
+            })
+            .then(html => {
+                const tableBody = document.querySelector('#users-page table tbody');
+                tableBody.innerHTML = html; 
+            })
+            .catch(error => console.error('Error:', error));
+} */
+
+// cập nhật mỗi 0.3 giây
+//setInterval(updateActivities, 300);
+
+// cập nhật
+//updateActivities();
\ No newline at end of file
diff --git a/web/assets/js/chatbox.js b/web/assets/js/chatbox.js
index 29a6ab9..de7ffc0 100644
--- a/web/assets/js/chatbox.js
+++ b/web/assets/js/chatbox.js
@@ -3,16 +3,18 @@ var websocket = null;
 var receiver = null;
 var userAvatar = document.getElementById("userAvatar").textContent;
 var receiverAvatar = null;
+var first_name = document.getElementById("first_name").textContent;
+var last_name = document.getElementById("last_name").textContent;
 
 var typeChat = "user";
-//var groupName = null;
-//var groupId = null
-//
+var groupName = null;
+var groupId = null;
+
 var back = null;
 var rightSide = null;
 var leftSide = null;
 var conversation = null;
-//
+
 var attachFile = null;
 var imageFile = null;
 var file = null;
@@ -53,6 +55,81 @@ function cleanUp() {
     receiver = null;
 }
 
+function displayFiles() {
+    attachFile = document.getElementById("attach");
+    imageFile = document.getElementById("image");
+    file = document.querySelector(".list-file");
+    deleteAttach = document.querySelectorAll(".delete-attach");
+
+    attachFile.addEventListener("change", function (e) {
+        let filesInput = e.target.files;
+
+        for (const file of filesInput) {
+            listFile.push(file);
+        }
+
+        typeFile = "file";
+        renderFile("attach");
+
+        this.value = null;
+    });
+
+    imageFile.addEventListener("change", function (e) {
+        let filesImage = e.target.files;
+
+        for (const file of filesImage) {
+            listFile.push(file);
+        }
+
+        typeFile = "image";
+
+        renderFile("image");
+
+        this.value = null;
+    });
+}
+
+function deleteFile(idx) {
+    if (!isNaN(idx))
+        listFile.splice(idx, 1);
+
+    renderFile(typeFile);
+}
+
+function renderFile(typeFile) {
+    let listFileHTML = "";
+    let idx = 0;
+
+    if (typeFile == "image") {
+        for (const file of listFile) {
+            listFileHTML += '<li><img src="' + URL.createObjectURL(file)
+                    + '" alt="Image file"><span data-idx="'
+                    + (idx) + '" onclick="deleteFile('
+                    + idx + ')" class="delete-attach">X</span></li>';
+            idx++;
+        }
+    } else {
+        for (const file of listFile) {
+            listFileHTML += '<li><div class="file-input">' + file.name
+                    + '</div><span data-idx="'
+                    + (idx) + '" onclick="deleteFile('
+                    + idx + ')" class="delete-attach">X</span></li>';
+            idx++;
+        }
+    }
+
+
+    if (listFile.length == 0) {
+        file.innerHTML = "";
+        file.classList.remove("active");
+    } else {
+        file.innerHTML = listFileHTML;
+        file.classList.add("active");
+    }
+
+    deleteAttach = document.querySelectorAll(".delete-attach");
+}
+
 function setReceiver(element) {
     groupId = null;
     receiver = element.id;
@@ -89,7 +166,7 @@ function setReceiver(element) {
             + '<label class="btn btn-image" for="attach"><i class="fa fa-file"></i></label>'
             + '<input type="file" multiple id="attach">'
             + '<p id="receiver" style="display:none">' + receiver + '</p>'
-            + '<label class="btn btn-image" for="image"><i class="fa fa-file-image-o"></i></label>'
+            + '<label class="btn btn-image" for="image"><i class="fa fa-image"></i></label>'
             + '<input type="file" accept="image/*" multiple id="image">'
             + '<button type="submit" class="btn btn-send">'
             + '<i class="fa fa-paper-plane"></i>'
@@ -100,6 +177,8 @@ function setReceiver(element) {
 
     loadMessages();
 
+    displayFiles();
+
     handleResponsive();
 }
 
@@ -127,12 +206,15 @@ function sendMessage(e) {
     var inputText = document.getElementById("message").value;
     if (inputText != '') {
         sendText();
+    } else {
+        sendAttachments();
     }
     return false;
 }
 
 function sendText() {
     var messageContent = document.getElementById("message").value;
+
     var messageType = "text";
     document.getElementById("message").value = ''; // Clear input field
 
@@ -140,10 +222,9 @@ function sendText() {
         console.log("Empty message. Not sending.");
         return; // Do not send empty messages
     }
-
     var message = buildMessageToJson(messageContent, messageType);
-
     if (websocket.readyState === WebSocket.OPEN) {
+        console.log(message.message);
         websocket.send(JSON.stringify(message));
     } else {
         console.log("WebSocket is not open.");
@@ -151,6 +232,63 @@ function sendText() {
     setMessage(message);
 }
 
+function sendAttachments() {
+    var messageType = "attachment";
+    for (file of listFile) {
+        var messageContent = file.name.trim();
+        messageType = file.type;
+        var message = buildMessageToJson(messageContent, messageType);
+        const formData = new FormData();
+        formData.append('file', file);
+        fetch("http://" + window.location.host + "/FUNET/upload", {
+            method: 'POST',
+            cache: 'no-cache',
+            body: formData // No Content-Type header set
+        })
+                .then(response => response.json())
+                .then(data => {
+                    // Check if the upload was successful
+                    if (data.url) {
+                        console.log(data.url);
+                        // Set the message content based on file type and the uploaded URL
+                        if (messageType.startsWith("audio")) {
+                            message.message = '<audio controls>'
+                                    + '<source src="' + data.url + '" type="' + messageType + '">'
+                                    + '</audio>';
+                        } else if (messageType.startsWith("video")) {
+                            message.message = '<video width="400" controls>'
+                                    + '<source src="' + data.url + '" type="' + messageType + '">'
+                                    + '</video>';
+                        } else if (messageType.startsWith("image")) {
+                            message.message = '<img src="' + data.url + '" alt="">';
+                        } else {
+                            // Handle other file types (e.g., documents)
+                            message.message = '<a href="' + data.url + '" target="_blank">' + messageContent + '</a>';
+                        }
+                        setMessage(message);
+                        message.message = data.url;
+                        // Send the message containing the Cloudinary URL through WebSocket
+                        websocket.send(JSON.stringify(message)); // Send the message via WebSocket
+                        console.log("Message sent via WebSocket:", message.message);
+                        // Optionally, call setMessage(message) if you want to display the message locally as well
+
+                    } else {
+                        console.error('Upload failed:', data);
+                    }
+                })
+                .catch(error => {
+                    console.error('Error uploading to server:', error);
+                });
+    }
+
+    // Clear the file input after processing
+    var fileElement = document.querySelector(".list-file");
+    fileElement.classList.remove("active");
+    fileElement.innerHTML = "";
+    listFile = [];
+}
+
+
 function buildMessageToJson(message, type) {
     return {
         sender: user_id, // Ensure user_id is globally defined
@@ -163,8 +301,10 @@ function buildMessageToJson(message, type) {
 
 function setMessage(msg) {
     var currentChat = document.getElementById('chat');
-    if (receiver != null) {
+    if (msg.receiver != 0) {
         var newChatMsg = customLoadMessage(msg.sender, msg.message);
+    } else {
+        var newChatMsg = customLoadMessageGroup(msg.sender, msg.groupId, msg.message);
     }
     currentChat.innerHTML += newChatMsg;
     goLastestMsg(); // Scroll to latest message
@@ -187,23 +327,52 @@ function loadMessages() {
         if (this.readyState == 4 && this.status == 200) {
             var messages = JSON.parse(this.responseText);
             var chatbox = "";
+            var imageCount = 0;
+            var loadedImages = 0;
+
             messages.forEach(msg => {
-                //console.log(msg);
                 try {
-                    chatbox += customLoadMessage(msg.sender, msg.message);
+                    var messageHtml = customLoadMessage(msg.sender, msg.message);
+                    chatbox += messageHtml;
+
+                    var tempDiv = document.createElement("div");
+                    tempDiv.innerHTML = messageHtml;
+
+                    var imgs = tempDiv.getElementsByTagName("img");
+                    imageCount += imgs.length;
+
+                    for (let img of imgs) {
+                        img.onload = () => {
+                            loadedImages++;
+                            if (loadedImages === imageCount) {
+                                goLastestMsg();
+                            }
+                        };
+                        img.onerror = () => {
+                            loadedImages++;
+                            if (loadedImages === imageCount) {
+                                goLastestMsg();
+                            }
+                        };
+                    }
                 } catch (ex) {
-
+                    console.error(ex);
                 }
             });
+
             currentChatbox.innerHTML = chatbox;
-            goLastestMsg();
+
+            if (imageCount === 0) {
+                goLastestMsg();
+            }
         }
     };
-    xhttp.open("GET", "http://" + window.location.host + "/FUNET/chat-rest-controller?sender=" + user_id
-            + "&receiver=" + receiver, true);
+
+    xhttp.open("GET", "http://" + window.location.host + "/FUNET/chat-rest-controller?sender=" + user_id + "&receiver=" + receiver, true);
     xhttp.send();
 }
 
+
 function customLoadMessage(sender, message) {
     var imgSrc = receiverAvatar;
     var msgDisplay = '<li>'
@@ -238,269 +407,362 @@ function goLastestMsg() {
 //****************************************** GROUP FUNCTION GO HERE ******************************************************
 
 
-//function setGroup(element) {
-//	receiver = null;
-//	groupName = element.getAttribute("data-name");
-//	groupId = element.getAttribute("data-id");
-//
-//	receiverAvatar = document.getElementById("img-group-" + groupId).src;
-//
-//	listUserAdd = [];
-//
-//	numberMember = parseInt(element.getAttribute("data-number"));
-//
-//
-//	fetch("http://" + window.location.host + "/conversations-rest-controller?usersConversationId=" + groupId)
-//		.then(data => data.json())
-//		.then(data => {
-//			let findObject = data.find(element => element.username == username);
-//			let isAdmin = findObject.admin;
-//
-//			var rightSide = '<div class="user-contact">' + '<div class="back">'
-//				+ '<i class="fa fa-arrow-left"></i>'
-//				+ '</div>'
-//				+ '<div class="user-contain">'
-//				+ '<div class="user-img">'
-//				+ '<img id="img-group-' + groupId + '" src="' + receiverAvatar + '"'
-//				+ 'alt="Image of user">'
-//				+ '</div>'
-//				+ '<div class="user-info">'
-//				+ '<a href="http://' + window.location.host + '/conversation?conversationId=' + groupId + '" class="user-name">' + groupName + '</a>'
-//				+ '</div>'
-//				+ '</div>'
-//				+ '<div class="invite-user">'
-//				+ '<span class="total-invite-user">' + numberMember + ' paticipants</span>'
-//				+ '<span data-id="add-user" onclick="toggleModal(this, true); searchMemberByKeyword(``);" class="invite toggle-btn">Invite</span>'
-//				+ '</div>'
-//				+ '<div class="setting toggle-btn" data-id="manage-user" onclick="toggleModal(this, true);  fetchUser();">'
-//				+ '<i class="fa fa-cog"></i>'
-//				+ '</div>'
-//				+ '</div>'
-//				+ '<div class="list-messages-contain">'
-//				+ '<ul id="chat" class="list-messages">'
-//				+ '</ul>'
-//				+ '</div>'
-//				+ '<form class="form-send-message" onsubmit="return sendMessage(event)">'
-//				+ '<ul class="list-file"></ul> '
-//				+ '<input type="text" id="message" class="txt-input" placeholder="Type message...">'
-//				+ '<label class="btn btn-image" for="attach"><i class="fa fa-file"></i></label>'
-//				+ '<input type="file" multiple id="attach">'
-//				+ '<label class="btn btn-image" for="image"><i class="fa fa-file-image-o"></i></label>'
-//				+ '<input type="file" accept="image/*" multiple id="image">'
-//				+ '<button type="submit" class="btn btn-send">'
-//				+ '<i class="fa fa-paper-plane"></i>'
-//				+ '</button>'
-//				+ '</form>';
-//
-//			document.getElementById("receiver").innerHTML = rightSide;
-//
-//			loadMessagesGroup();
-//
-//			handleResponsive();
-//		})
-//		.catch(ex => console.log(ex));
-//}
-//
-//function createGroup(e) {
-//	e.preventDefault();
-//
-//	let groupName = document.querySelector(".txt-group-name").value;
-//
-//	let object = new Object();
-//	let user = new Object();
-//
-//	user.username = username;
-//	user.admin = true;
-//
-//	object.name = groupName;
-//	object.users = [];
-//	object.users.push(user);
-//	toggleAllModal();
-//
-//	fetch("http://" + window.location.host + "/conversations-rest-controller", {
-//		method: "post",
-//		cache: 'no-cache',
-//		headers: {
-//			'Content-Type': 'application/json;charset=utf-8'
-//		},
-//		body: JSON.stringify(object)
-//	})
-//		.then(function(data) {
-//			return data.json();
-//		})
-//		.then(function(data) {
-//
-//			if (typeChat != "group") return;
-//
-//			let numberMember = data.users.length;
-//
-//			let imgSrc = ' src="http://' + window.location.host + '/files/group-' + data.id + '/' + data.avatar + '"';
-//			let appendUser = '<li id="group-' + data.id + '">'
-//				+ '<div class="user-contain" data-id="' + data.id + '" data-number="' + numberMember + '" data-name="' + data.name + '" onclick="setGroup(this);">'
-//				+ '<div class="user-img">'
-//				+ '<img id="img-group-' + data.id + '"'
-//				+ imgSrc
-//				+ ' alt="Image of user">'
-//				+ '</div>'
-//				+ '<div class="user-info" style="flex-grow:1 ;">'
-//				+ '<span class="user-name">' + data.name + '</span>'
-//				+ '</div>'
-//				+ '</div>'
-//				+ '<div class="group-delete border" data-id="' + data.id + '" onclick="deleteGroup(this)">Delete</div>'
-//				+ '</li>';
-//			document.querySelector(".left-side .list-user").innerHTML += appendUser;
-//			document.querySelector(".txt-group-name").value = "";
-//		});
-//}
-//
-//function addMember(e) {
-//	e.preventDefault();
-//
-//	let object = new Object();
-//	object.name = groupName;
-//	object.id = groupId;
-//	object.users = [];
-//
-//
-//	listUserAdd.forEach(function(username) {
-//		let user = new Object();
-//
-//		user.username = username;
-//		user.admin = false;
-//		user.avatar = null;
-//
-//		object.users.push(user);
-//	});
-//
-//
-//	fetch("http://" + window.location.host + "/conversations-rest-controller", {
-//		method: "post",
-//		cache: 'no-cache',
-//		headers: {
-//			'Content-Type': 'application/json;charset=utf-8'
-//		},
-//		body: JSON.stringify(object)
-//	})
-//		.then(function(data) {
-//			return data.json();
-//		})
-//		.then(function(data) {
-//			numberMember += parseInt(listUserAdd.length);
-//			listUserAdd = [];
-//			let inviteNumber = document.querySelector(".total-invite-user");
-//			if (inviteNumber) inviteNumber.innerHTML = numberMember + " paticipants";
-//
-//			document.getElementById("group-" + groupId).querySelector(".user-contain").setAttribute("data-number", numberMember);
-//
-//			toggleAllModal();
-//		});
-//}
-//
-//function fetchUser() {
-//
-//	fetch("http://" + window.location.host + "/conversations-rest-controller?usersConversationId=" + groupId)
-//		.then(data => data.json())
-//		.then(users => {
-//			document.querySelector(".manage-member-body .list-user ul").innerHTML = "";
-//
-//			if (users.length == 1) {
-//				document.querySelector(".manage-member-body .list-user ul").innerHTML = "No members in group";
-//				document.querySelector(".manage-member-body .list-user ul").style = "text-align: center; font-size: 1.8rem;";
-//			} else {
-//				document.querySelector(".manage-member-body .list-user ul").style = "";
-//			}
-//
-//			users.forEach(function(data) {
-//				if (data.username == username) return;
-//
-//				let appendUser = '<li>'
-//					+ '<div class="user-contain">'
-//					+ '<div class="user-img">'
-//					+ '<img '
-//					+ ' src="http://' + window.location.host + '/files/' + data.username + '/' + data.avatar + '"'
-//					+ 'alt="Image of user">'
-//					+ '</div>'
-//					+ '<div class="user-info" style="flex-grow: 1;">'
-//					+ '<span class="user-name">' + data.username + '</span>'
-//					+ '</div>';
-//
-//				if (!data.admin)
-//					appendUser += '<div class="user-delete" style="font-weight: 700;" data-username="' + data.username + '" onclick="deleteMember(this)">Delete</div>'
-//
-//				appendUser += '</div></li>';
-//
-//				document.querySelector(".manage-member-body .list-user ul").innerHTML += appendUser;
-//			});
-//
-//		})
-//		.catch(ex => console.log(ex));
-//
-//}
-//
-//function deleteGroup(ele) {
-//	let grpId = ele.getAttribute("data-id");
-//
-//	if (grpId == groupId) document.querySelector(".right-side").innerHTML = "";
-//
-//	fetch("http://" + window.location.host + "/conversations-rest-controller?conversationId=" + grpId, {
-//		method: 'delete'
-//	})
-//		.then(function(data) {
-//			return data.json();
-//		})
-//		.then(function(data) {
-//
-//			let groupNumber = document.getElementById("group-" + grpId);
-//			if (groupNumber) groupNumber.outerHTML = "";
-//
-//		})
-//		.catch(ex => console.log(ex));
-//}
-//
-//function deleteMember(ele) {
-//	let username = ele.getAttribute("data-username");
-//
-//	fetch("http://" + window.location.host + "/conversations-rest-controller?conversationId=" + groupId + "&username=" + username, {
-//		method: 'delete'
-//	})
-//		.then(function(data) {
-//			return data.json();
-//		})
-//		.then(function(data) {
-//
-//			numberMember -= 1;
-//
-//			let inviteNumber = document.querySelector(".total-invite-user");
-//			if (inviteNumber) inviteNumber.innerHTML = numberMember + " paticipants";
-//
-//			toggleAllModal();
-//		})
-//		.catch(ex => console.log(ex));
-//
-//}
-//
-//function toggleAllModal() {
-//	let modalBox = document.querySelectorAll(".modal-box");
-//
-//	modalBox.forEach(function(modal) {
-//		modal.classList.remove("active");
-//	});
-//
-//}
-//
-//function toggleModal(ele, mode) {
-//	let modalBox = document.querySelectorAll(".modal-box");
-//	let id = ele.getAttribute("data-id");
-//
-//	modalBox.forEach(function(modal) {
-//		modal.classList.remove("active");
-//	});
-//
-//
-//	if (mode) document.getElementById(id).classList.add("active");
-//	else document.getElementById(id).classList.remove("active");
-//}
-//
+function setGroup(element) {
+    receiver = null;
+    groupName = element.getAttribute("data-name");
+    groupId = element.getAttribute("data-id");
+
+    receiverAvatar = document.getElementById("img-group-" + groupId).src;
+
+    listUserAdd = [];
+
+    numberMember = parseInt(element.getAttribute("data-number"));
+
+
+    fetch("http://" + window.location.host + "/FUNET/conversations-rest-controller?usersConversationId=" + groupId)
+            .then(data => data.json())
+            .then(data => {
+                let findObject = data.find(element => element.user_id == user_id);
+                let isAdmin = findObject.isAdmin;
+
+                var rightSide = '<div class="user-contact">' + '<div class="back">'
+                        + '<i class="fa fa-arrow-left"></i>'
+                        + '</div>'
+                        + '<div class="user-contain">'
+                        + '<div class="user-img">'
+                        + '<img id="img-group-' + groupId + '" src="' + receiverAvatar + '"'
+                        + 'alt="Image of user">'
+                        + '</div>'
+                        + '<div class="user-info">'
+                        + '<a href="http://' + window.location.host + '/FUNET/conversation?conversationId=' + groupId + '" class="user-name">' + groupName + '</a>'
+                        + '</div>'
+                        + '</div>'
+                        + '<div class="invite-user">'
+                        + '<span class="total-invite-user">' + numberMember + ' paticipants</span>'
+                        + '<span data-id="add-user" onclick="toggleModal(this, true); searchMemberByKeyword(1);" class="invite toggle-btn">Invite</span>'
+                        + '</div>'
+                        + '<div class="setting toggle-btn" data-id="settings" onclick="toggleModal(this, true);  fetchUser();">'
+                        + '<i class="fa fa-cog"></i>'
+                        + '</div>'
+                        + '</div>'
+                        + '<div class="list-messages-contain">'
+                        + '<ul id="chat" class="list-messages">'
+                        + '</ul>'
+                        + '</div>'
+                        + '<form class="form-send-message" onsubmit="return sendMessage(event)">'
+                        + '<ul class="list-file"></ul> '
+                        + '<input type="text" id="message" class="txt-input" placeholder="Type message...">'
+                        + '<label class="btn btn-image" for="attach"><i class="fa fa-file"></i></label>'
+                        + '<input type="file" multiple id="attach">'
+                        + '<label class="btn btn-image" for="image"><i class="fa fa-image"></i></label>'
+                        + '<input type="file" accept="image/*" multiple id="image">'
+                        + '<button type="submit" class="btn btn-send">'
+                        + '<i class="fa fa-paper-plane"></i>'
+                        + '</button>'
+                        + '</form>';
+
+                document.getElementById("receiver").innerHTML = rightSide;
+
+                loadMessagesGroup();
+
+                displayFiles();
+
+                handleResponsive();
+            })
+            .catch(ex => console.log(ex));
+}
+
+function createGroup(e) {
+    e.preventDefault();
+
+    let groupName = document.querySelector(".txt-group-name").value;
+
+    let object = new Object();
+    let user = new Object();
+
+    user.user_id = user_id;
+    user.first_name = first_name;
+    user.last_name = last_name;
+    user.isAdmin = true;
+
+    object.name = groupName;
+    object.users = [];
+    object.users.push(user);
+    toggleAllModal();
+    fetch("http://" + window.location.host + "/FUNET/conversations-rest-controller", {
+        method: "post",
+        cache: 'no-cache',
+        headers: {
+            'Content-Type': 'application/json;charset=utf-8'
+        },
+        body: JSON.stringify(object)
+    })
+            .then(function () {
+                return fetchGroup();
+            });
+
+}
+
+function addMember(e) {
+    e.preventDefault();
+
+    let object = new Object();
+    object.name = groupName;
+    object.id = groupId;
+    object.users = [];
+
+
+    listUserAdd.forEach(function (user_id) {
+        let user = new Object();
+
+        user.user_id = user_id;
+        user.isAdmin = false;
+        user.profile_pic = "1";
+
+        object.users.push(user);
+    });
+
+
+    fetch("http://" + window.location.host + "/FUNET/conversations-rest-controller", {
+        method: "post",
+        cache: 'no-cache',
+        headers: {
+            'Content-Type': 'application/json;charset=utf-8'
+        },
+        body: JSON.stringify(object)
+    })
+            .then(function (data) {
+                return data.json();
+            })
+            .then(function (data) {
+                numberMember += parseInt(listUserAdd.length);
+                listUserAdd = [];
+                let inviteNumber = document.querySelector(".total-invite-user");
+                if (inviteNumber)
+                    inviteNumber.innerHTML = numberMember + " paticipants";
+
+                document.getElementById("group-" + groupId).querySelector(".user-contain").setAttribute("data-number", numberMember);
+
+                toggleAllModal();
+            });
+}
+
+function fetchUser() {
+
+    fetch("http://" + window.location.host + "/FUNET/conversations-rest-controller?usersConversationId=" + groupId)
+            .then(data => data.json())
+            .then(users => {
+                document.querySelector(".manage-member-body .list-user ul").innerHTML = "";
+
+                if (users.length == 0) {
+                    document.querySelector(".manage-member-body .list-user ul").innerHTML = "No members in group";
+                    document.querySelector(".manage-member-body .list-user ul").style = "text-align: center; font-size: 1.8rem;";
+                } else {
+                    document.querySelector(".manage-member-body .list-user ul").style = "";
+                }
+
+                let findObject = users.find(element => element.user_id == user_id);
+                let isAdmin = findObject.isAdmin;
+                users.forEach(function (data) {
+                    let appendUser = '<li>'
+                            + '<div class="user-contain">'
+                            + '<div class="user-img">'
+                            + '<img '
+                            + ' src="assets/profile_avt/default_avt.jpg"'
+                            + 'alt="Image of user">'
+                            + '</div>'
+                            + '<div class="user-info" style="flex-grow: 1;">'
+                            + '<span class="user-name">' + data.first_name + " " + data.last_name + '</span>'
+                            + '</div>';
+
+                    if (isAdmin && data.user_id != user_id)
+                        appendUser += '<div class="user-delete" style="font-weight: 700;" data-username="' + data.user_id + '" onclick="deleteMember(this)">Delete</div>'
+
+                    appendUser += '</div></li>';
+
+                    document.querySelector(".manage-member-body .list-user ul").innerHTML += appendUser;
+                });
+            })
+            .catch(ex => console.log(ex));
+
+}
+
+function deleteGroup(ele) {
+    let grpId = ele.getAttribute("data-id");
+
+    if (grpId == groupId)
+        document.querySelector(".right-side").innerHTML = "";
+
+    let confirmationHTML = `
+		<div id="confirmation-popup">
+			<h3>Are you sure you want to delete this group?</h3>
+			<button id="confirm-yes">Yes</button>
+			<button id="confirm-no">No</button>
+		</div>
+	`;
+
+    // Append the HTML structure to the body
+    document.body.insertAdjacentHTML('beforeend', confirmationHTML);
+
+    // Add event listener for the 'Yes' button
+    document.getElementById('confirm-yes').addEventListener('click', function () {
+        confirmDelete(grpId);
+        document.getElementById('confirmation-popup').remove(); // Remove the confirmation popup
+    });
+
+    // Add event listener for the 'No' button
+    document.getElementById('confirm-no').addEventListener('click', function () {
+        document.getElementById('confirmation-popup').remove(); // Just remove the confirmation popup
+    });
+}
+
+function confirmDelete(grpId) {
+    fetch("http://" + window.location.host + "/FUNET/conversations-rest-controller?conversationId=" + grpId, {
+        method: 'Delete'
+    })
+            .then(function (data) {
+                return data.json();
+            })
+            .then(function (data) {
+
+                let groupNumber = document.getElementById("group-" + grpId);
+                if (groupNumber)
+                    groupNumber.outerHTML = "";
+
+            })
+            .catch(ex => console.log(ex));
+}
+
+function deleteMember(ele) {
+    let data_id = ele.getAttribute("data-username");
+
+    fetch("http://" + window.location.host + "/FUNET/conversations-rest-controller?conversationId=" + groupId + "&user_id=" + data_id, {
+        method: 'delete'
+    })
+            .then(function (data) {
+                return data.json();
+            })
+            .then(function (data) {
+
+                numberMember -= 1;
+
+                let inviteNumber = document.querySelector(".total-invite-user");
+                if (inviteNumber)
+                    inviteNumber.innerHTML = numberMember + " paticipants";
+
+                ele.closest("li").remove();
+            })
+            .catch(ex => console.log(ex));
+
+}
+
+function toggleAllModal() {
+    let modalBox = document.querySelectorAll(".modal-box");
+
+    modalBox.forEach(function (modal) {
+        modal.classList.remove("active");
+    });
+
+}
+
+function changeGroupName(e) {
+    e.preventDefault();
+
+    let newName = document.querySelector(".txt-new-group-name").value;
+    let object = new Object();
+    object.groupId = groupId;
+    object.groupName = newName;
+    object.avatar = null;
+    toggleAllModal();
+
+    fetch("http://" + window.location.host + "/FUNET/chat?group-name", {
+        method: "post",
+        cache: 'no-cache',
+        headers: {
+            'Content-Type': 'application/json;charset=utf-8'
+        },
+        body: JSON.stringify(object)
+    })
+            .then(function () {
+                return fetchGroup();
+            });
+
+}
+
+function uploadGroupAvatar(avt) {
+    var avatarData = new FormData();
+    // Access the first file from the input's files array
+    var file = avt.files[0];
+
+    if (file) { // Check if a file was selected
+        avatarData.append('file', file);
+
+        fetch("http://" + window.location.host + "/FUNET/upload", {
+            method: 'POST',
+            cache: 'no-cache',
+            body: avatarData // No Content-Type header set
+        })
+                .then(response => response.json())
+                .then(data => {
+                    if (data.url) {
+                        console.log("Avatar uploaded successfully:", data.url);
+                        updateGroupAvatar(data.url);
+                    } else {
+                        console.error('Upload failed:', data);
+                    }
+                })
+                .catch(error => {
+                    console.error('Error uploading to server:', error);
+                });
+    } else {
+        console.error('No file selected');
+    }
+}
+
+
+function updateGroupAvatar(avatarUrl) {
+    var id = groupId;
+    console.log("log id: " + id)
+    let object = new Object();
+    object.groupId = groupId;
+    object.avatar = avatarUrl;
+    object.name = null;
+
+    fetch("http://" + window.location.host + "/FUNET/chat?update-avatar", {
+        method: 'POST',
+        cache: 'no-cache',
+        headers: {
+            'Content-Type': 'application/json;charset=utf-8'
+        },
+        body: JSON.stringify(object)
+    })
+            .then(response => {
+                if (response.ok) {
+                    console.log("Group avatar updated successfully.");
+                } else {
+                    console.error('Failed to update group avatar:', response);
+                }
+            })
+            .catch(error => {
+                console.error('Error updating group avatar:', error);
+            });
+}
+
+
+function toggleModal(ele, mode) {
+    let modalBox = document.querySelectorAll(".modal-box");
+    let id = ele.getAttribute("data-id");
+
+    modalBox.forEach(function (modal) {
+        modal.classList.remove("active");
+    });
+
+    if (mode)
+        document.getElementById(id).classList.add("active");
+    else
+        document.getElementById(id).classList.remove("active");
+}
+
 function chatOne(ele) {
     typeChat = "user";
     resetChat();
@@ -528,6 +790,7 @@ function addUserChange(e) {
 }
 
 function fetchGroup() {
+    console.log(user_id);
     fetch("http://" + window.location.host + "/FUNET/conversations-rest-controller?user_id=" + user_id)
             .then(function (data) {
                 return data.json();
@@ -537,24 +800,23 @@ function fetchGroup() {
                 document.querySelector(".left-side .list-user").innerHTML = "";
                 data.forEach(function (data) {
                     let numberMember = data.users ? data.users.length : 0;
-
                     let findObject = data.users.find(element => element.user_id == user_id);
-                    let isAdmin = findObject.admin;
+                    let isAdmin = findObject.isAdmin;
 
-                    let imgSrc = ' src="http://' + window.location.host + '/files/group-' + data.id + '/' + data.avatar + '"';
+                    let imgSrc = ' src="' + data.avatar + '"';
                     let appendUser = '<li id="group-' + data.id + '">'
                             + '<div class="user-contain" data-id="' + data.id + '" data-number="' + numberMember + '" data-name="' + data.name + '" onclick="setGroup(this);">'
                             + '<div class="user-img">'
                             + '<img id="img-group-' + data.id + '"'
                             + imgSrc
-                            + ' alt="Image of user">'
+                            + 'alt="Image of user">'
                             + '</div>'
                             + '<div class="user-info" style="flex-grow:1 ;">'
                             + '<span class="user-name">' + data.name + '</span>'
                             + '</div>'
                             + '</div>';
                     if (isAdmin) {
-                        appendUser += '<div class="group-delete border" data-id="' + data.id + '" onclick="deleteGroup(this)">Delete</div>';
+                        appendUser += '<div class="group-delete fa fa-trash border" data-id="' + data.id + '" onclick="deleteGroup(this)"></div>';
                     }
                     appendUser += '</li>';
                     document.querySelector(".left-side .list-user").innerHTML += appendUser;
@@ -585,72 +847,114 @@ function handleResponsive() {
 }
 
 function searchFriendByKeyword(keyword) {
-    fetch("http://" + window.location.host + "/FUNET/user-rest-controller?user_id=" + user_id + "&keyword=" + keyword)
+    if (keyword != null)
+        fetch("http://" + window.location.host + "/FUNET/users-rest-controller?user_id=" + user_id + "&keyword=" + keyword)
+                .then(function (data) {
+                    return data.json();
+                })
+                .then(data => {
+
+                    document.querySelector(".left-side .list-user").innerHTML = "";
+                    data.forEach(function (data) {
+                        let appendUser = '<li id="' + data.user_id + '" onclick="setReceiver(this)" data-name="' + data.first_name + ' ' + data.last_name + '">'
+                                + '<div class="user-contain">'
+                                + '<div class="user-img">'
+                                + '<img id="img-' + data.user_id + '"'
+                                + ' src="http://' + window.location.host + '/FUNET/assets/profile_avt/' + data.profile_pic + '"'
+                                + 'alt="Image of user">'
+                                + '<div id="status-' + data.user_id + '" class="user-img-dot ' + status + '"></div>'
+                                + '</div>'
+                                + '<div class="user-info">'
+                                + '<span class="user-name">' + data.first_name + ' ' + data.last_name + '</span>'
+                                + '</div>'
+                                + '</div>'
+                                + '</li>';
+                        document.querySelector(".left-side .list-user").innerHTML += appendUser;
+                    });
+                });
+}
+
+function loadMessagesGroup() {
+    var currentChatbox = document.getElementById("chat");
+    var xhttp = new XMLHttpRequest();
+    xhttp.onreadystatechange = function () {
+        if (this.readyState == 4 && this.status == 200) {
+            var messages = JSON.parse(this.responseText);
+            var chatbox = "";
+            messages.forEach(msg => {
+                try {
+                    chatbox += customLoadMessageGroup(msg.sender, groupId, msg.message);
+                } catch (ex) {
+                    console.log(ex.toString());
+                }
+            });
+            currentChatbox.innerHTML = chatbox;
+            goLastestMsg();
+        }
+    };
+    xhttp.open("GET", "http://" + window.location.host + "/FUNET/conversations-rest-controller?messagesConversationId=" + groupId, true);
+    xhttp.send();
+}
+
+function customLoadMessageGroup(sender, groupIdFromServer, message) {
+    console.log("Load group msg: " + groupIdFromServer);
+    //let imgSrc = 'http://' + window.location.host + '/files/' + sender + '/' + avatar;
+    var msgDisplay = '<li>'
+            + '<div class="message';
+    if (groupIdFromServer != groupId) {
+        return '';
+    }
+    if (user_id != sender) {
+        msgDisplay += '">';
+    } else {
+        imgSrc = userAvatar;
+        msgDisplay += ' right">';
+    }
+    return msgDisplay + '<div class="message-img">'
+            + '<img src="' + imgSrc + '" alt="">'
+            + '<div class="sender-name">' + sender + '</div>'
+            + ' </div>'
+            + '<div class="message-text">' + message + '</div>'
+            + '</div>'
+            + '</li>';
+}
+
+function searchMemberByKeyword(ele) {
+    let keyword = ele.value;
+    fetch("http://" + window.location.host + "/FUNET/users-rest-controller?user_id=" + user_id + "&keyword=" + keyword + "&conversationId=" + groupId)
             .then(function (data) {
                 return data.json();
             })
             .then(data => {
 
-                document.querySelector(".left-side .list-user").innerHTML = "";
+                document.querySelector(".add-member-body .list-user ul").innerHTML = "";
                 data.forEach(function (data) {
-                    let appendUser = '<li id="' + data.user_id + '" onclick="setReceiver(this)" data-name="' + data.first_name + ' ' + data.last_name + '">'
+                    if (data.online)
+                        status = "online";
+                    else
+                        status = "";
+
+                    let check = "";
+                    if (listUserAdd.indexOf(data.user_id) >= 0)
+                        check = "checked";
+                    console.log(data.first_name);
+                    let appendUser = '<li>'
+                            + '<input id="member-' + data.user_id + '" type="checkbox" ' + check + ' value="' + data.user_id + '" onchange="addUserChange(this)">'
+                            + '<label for="member-' + data.user_id + '">'
                             + '<div class="user-contain">'
                             + '<div class="user-img">'
-                            + '<img id="img-' + data.user_id + '"'
-                            + ' src="http://' + window.location.host + '/FUNET/assets/profile_avt/' + data.profile_pic + '"'
+                            + '<img '
+                            + ' src="assets/profile_avt' + '/' + data.profile_pic + '"'
                             + 'alt="Image of user">'
-                            + '<div id="status-' + data.user_id + '" class="user-img-dot ' + status + '"></div>'
                             + '</div>'
                             + '<div class="user-info">'
-                            + '<span class="user-name">' + data.first_name + ' ' +data.last_name + '</span>'
+                            + '<span class="user-name">' + data.first_name + ' ' + data.last_name + '</span>'
                             + '</div>'
                             + '</div>'
+                            + '</label>'
+                            + '<div class="user-select-dot"></div>'
                             + '</li>';
-                    document.querySelector(".left-side .list-user").innerHTML += appendUser;
+                    document.querySelector(".add-member-body .list-user ul").innerHTML += appendUser;
                 });
             });
 }
-//
-//function loadMessagesGroup() {
-//	var currentChatbox = document.getElementById("chat");
-//	var xhttp = new XMLHttpRequest();
-//	xhttp.onreadystatechange = function() {
-//		if (this.readyState == 4 && this.status == 200) {
-//			var messages = JSON.parse(this.responseText);
-//			var chatbox = "";
-//			messages.forEach(msg => {
-//				try {
-//					chatbox += customLoadMessageGroup(msg.username, groupId, msg.message, msg.avatar);
-//				} catch (ex) {
-//
-//				}
-//			});
-//			currentChatbox.innerHTML = chatbox;
-//			goLastestMsg();
-//		}
-//	};
-//	xhttp.open("GET", "http://" + window.location.host + "/conversations-rest-controller?messagesConversationId=" + groupId, true);
-//	xhttp.send();
-//}
-//
-//function customLoadMessageGroup(sender, groupIdFromServer, message, avatar) {
-//	let imgSrc = 'http://' + window.location.host + '/files/' + sender + '/' + avatar;
-//	var msgDisplay = '<li>'
-//		+ '<div class="message';
-//	if (groupIdFromServer != groupId) {
-//		return '';
-//	}
-//	if (username != sender) {
-//		msgDisplay += '">';
-//	} else {
-//		imgSrc = userAvatar;
-//		msgDisplay += ' right">';
-//	}
-//	return msgDisplay + '<div class="message-img">'
-//		+ '<img src="' + imgSrc + '" alt="">'
-//		+ '<div class="sender-name">'+ sender +'</div>'
-//		+ ' </div>'
-//		+ '<div class="message-text">' + message + '</div>'
-//		+ '</div>'
-//		+ '</li>';
-//}
\ No newline at end of file
diff --git a/web/assets/js/comment.js b/web/assets/js/comment.js
new file mode 100644
index 0000000..8953db3
--- /dev/null
+++ b/web/assets/js/comment.js
@@ -0,0 +1,188 @@
+/* 
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+ * Click nbfs://nbhost/SystemFileSystem/Templates/JSP_Servlet/JavaScript.js to edit this template
+ */
+document.addEventListener('DOMContentLoaded', function() {
+    const commentForms = document.querySelectorAll('.post-method');
+
+    commentForms.forEach(form => {
+        const commentInput = form.querySelector('input[name="commentContent"]');
+        
+        form.addEventListener('keydown', function(event) {
+            if (event.key === 'Enter' && !event.shiftKey) {
+                event.preventDefault();
+                if (commentInput.value.trim() !== '') {
+                    submitComment(form);
+                }
+            }
+        });
+
+        form.addEventListener('submit', function(event) {
+            event.preventDefault();
+            if (commentInput.value.trim() !== '') {
+                submitComment(form);
+            }
+        });
+    });
+
+    function submitComment(form) {
+        const formData = new FormData(form);
+        const postId = formData.get('post_id');
+        const commentContent = formData.get('commentContent');
+
+        fetch('/FUNET/commentServlet', {
+            method: 'POST',
+            body: formData
+        })
+        .then(response => response.json())
+        .then(data => {
+            if (data.success) {
+                const comment = data.comment;
+                const commentHtml = `
+                    <div class="comment mb-2" style="margin-left: 20px;">
+                        <div class="comment-header">
+                            <img src="assets/profile_avt/${comment.profile_pic}" class="img-fluid rounded-circle avatar me-2" style="width: 30px; height: 30px; object-fit: cover;">
+                            <small><strong>${comment.first_name} ${comment.last_name}</strong></small>
+                        </div>
+                        <div class="comment-body" style="display: flex; justify-content: space-between; align-items: center;">
+                            <p style="margin-bottom: 0;" class="comment-text">${comment.comment_text}</p>
+                            <div class="comment-options">
+                                <button class="three-dot-btn" data-comment-id="${comment.comment_id}">...</button>
+                                <div class="comment-actions" style="display: none;">
+                                    <button class="edit-comment-btn" data-comment-id="${comment.comment_id}">Edit</button>
+                                    <form action="/FUNET/deleteCommentServlet" method="post" class="delete-comment-form" style="display: inline;">
+                                        <input type="hidden" name="commentId" value="${comment.comment_id}">
+                                        <button type="submit" class="delete-comment-btn">Delete</button>
+                                    </form>
+                                </div>
+                            </div>
+                        </div>
+                        <form action="/FUNET/updateCommentServlet" method="post" class="edit-comment-form" style="display: none;">
+                            <input type="hidden" name="commentId" value="${comment.comment_id}">
+                            <textarea name="newCommentText" class="form-control">${comment.comment_text}</textarea>
+                            <button type="submit" class="btn btn-primary">Save</button>
+                            <button type="button" class="btn btn-secondary cancel-edit-comment">Cancel</button>
+                        </form>
+                    </div>
+                `;
+                
+                const post = document.querySelector(`.post[data-post-id="${postId}"]`);
+                const commentSection = post.querySelector('.comment-site');
+                commentSection.insertAdjacentHTML('afterend', commentHtml);
+                
+                form.reset();
+
+                const newComment = post.querySelector(`.comment:last-child`);
+                initializeCommentButtons(newComment);
+            } else {
+                console.error('Error:', data.error);
+            }
+        })
+        .catch(error => console.error('Error:', error));
+    }
+
+    // Function to initialize comment buttons
+    function initializeCommentButtons(comment) {
+        const threeDotBtn = comment.querySelector('.three-dot-btn');
+        const commentActions = comment.querySelector('.comment-actions');
+        const editBtn = comment.querySelector('.edit-comment-btn');
+        const editForm = comment.querySelector('.edit-comment-form');
+        const cancelEditBtn = comment.querySelector('.cancel-edit-comment');
+        const commentText = comment.querySelector('.comment-text');
+
+        if (threeDotBtn) {
+            threeDotBtn.addEventListener('click', () => {
+                commentActions.style.display = commentActions.style.display === 'none' ? 'block' : 'none';
+            });
+        }
+
+        if (editBtn) {
+            editBtn.addEventListener('click', () => {
+                commentText.style.display = 'none';
+                editForm.style.display = 'block';
+                commentActions.style.display = 'none';
+            });
+        }
+
+        if (cancelEditBtn) {
+            cancelEditBtn.addEventListener('click', () => {
+                commentText.style.display = 'block';
+                editForm.style.display = 'none';
+            });
+        }
+    }
+});
+
+
+
+document.addEventListener('DOMContentLoaded', function () {
+    document.querySelectorAll('.edit-comment-btn').forEach(button => {
+        button.addEventListener('click', function () {
+            const commentId = this.getAttribute('data-comment-id');
+            const commentText = this.closest('.comment').querySelector('.comment-text');
+            const editForm = this.closest('.comment').querySelector('.edit-comment-form');
+            commentText.style.display = 'none';
+            editForm.style.display = 'block';
+        });
+    });
+
+    document.querySelectorAll('.cancel-edit-comment').forEach(button => {
+        button.addEventListener('click', function () {
+            const commentText = this.closest('.comment').querySelector('.comment-text');
+            const editForm = this.closest('.comment').querySelector('.edit-comment-form');
+            commentText.style.display = 'block';
+            editForm.style.display = 'none';
+        });
+    });
+
+    document.querySelectorAll('.edit-comment-form').forEach(form => {
+        form.addEventListener('submit', function (event) {
+            event.preventDefault();
+            const commentId = this.querySelector('input[name="commentId"]').value;
+            const newCommentText = this.querySelector('textarea[name="newCommentText"]').value;
+            const commentText = this.closest('.comment').querySelector('.comment-text');
+
+            fetch('/FUNET/updateCommentServlet', {
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'application/x-www-form-urlencoded'
+                },
+                body: `commentId=${commentId}&newCommentText=${encodeURIComponent(newCommentText)}`
+            })
+            .then(response => response.json())
+            .then(data => {
+                if (data.success) {
+                    commentText.textContent = newCommentText;
+                    commentText.style.display = 'block';
+                    this.style.display = 'none';
+                } else {
+                    alert('Error updating comment');
+                }
+            });
+        });
+    });
+
+    document.querySelectorAll('.delete-comment-form').forEach(form => {
+        form.addEventListener('submit', function (event) {
+            event.preventDefault();
+            const commentId = this.querySelector('input[name="commentId"]').value;
+            const commentElement = this.closest('.comment');
+
+            fetch('/FUNET/deleteCommentServlet', {
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'application/x-www-form-urlencoded'
+                },
+                body: `commentId=${commentId}`
+            })
+            .then(response => response.json())
+            .then(data => {
+                if (data.success) {
+                    commentElement.remove();
+                } else {
+                    alert('Error deleting comment');
+                }
+            });
+        });
+    });
+});
\ No newline at end of file
diff --git a/web/assets/js/log.js b/web/assets/js/log.js
new file mode 100644
index 0000000..6dd3fbb
--- /dev/null
+++ b/web/assets/js/log.js
@@ -0,0 +1,24 @@
+function updateActivities() {
+           
+            const userId = document.getElementById('userId').value;
+            
+           
+            fetch(`updateDiary?userId=${userId}`)
+                .then(response => {
+                    if (!response.ok) {
+                        throw new Error(`HTTP error! status: ${response.status}`);
+                    }
+                    return response.text();
+                })
+                .then(html => {
+                    const tableBody = document.querySelector('#users-page table tbody');
+                    tableBody.innerHTML = html;
+                })
+                .catch(error => console.error('Error:', error));
+        }
+
+     
+        setInterval(updateActivities, 300);
+
+        updateActivities();
+
diff --git a/web/assets/js/logonavbar.js b/web/assets/js/logonavbar.js
new file mode 100644
index 0000000..026e0a9
--- /dev/null
+++ b/web/assets/js/logonavbar.js
@@ -0,0 +1,68 @@
+/* 
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+ * Click nbfs://nbhost/SystemFileSystem/Templates/JSP_Servlet/JavaScript.js to edit this template
+ */
+
+
+            document.addEventListener('DOMContentLoaded', function () {
+                const searchInput = document.getElementById('search-input');
+                const searchForm = document.getElementById('searchForm');
+
+                searchInput.addEventListener('keypress', function (event) {
+                    if (event.key === 'Enter') {
+                        event.preventDefault();
+                        searchForm.submit();
+                    }
+                });
+            });
+
+            document.getElementById('messenger-btn').addEventListener('click', function () {
+                toggleMenu('messenger-menu', 'messenger-btn');
+            });
+
+            document.getElementById('notification-btn').addEventListener('click', function () {
+                toggleMenu('notification-menu', 'notification-btn');
+            });
+
+            document.getElementById('user-btn').addEventListener('click', function () {
+                toggleMenu('user-menu', 'user-btn');
+            });
+
+            document.addEventListener('click', function (event) {
+                const messengerMenu = document.getElementById('messenger-menu');
+                const notificationMenu = document.getElementById('notification-menu');
+                const userMenu = document.getElementById('user-menu');
+                const messengerBtn = document.getElementById('messenger-btn');
+                const notificationBtn = document.getElementById('notification-btn');
+                const userBtn = document.getElementById('user-btn');
+
+                if (!messengerMenu.contains(event.target) && !messengerBtn.contains(event.target)) {
+                    messengerMenu.style.display = 'none';
+                    messengerBtn.classList.remove('active-button');
+                }
+                if (!notificationMenu.contains(event.target) && !notificationBtn.contains(event.target)) {
+                    notificationMenu.style.display = 'none';
+                    notificationBtn.classList.remove('active-button');
+                }
+                if (!userMenu.contains(event.target) && !userBtn.contains(event.target)) {
+                    userMenu.style.display = 'none';
+                    userBtn.classList.remove('active-button');
+                }
+            });
+
+            function toggleMenu(menuId, btnId) {
+                const menu = document.getElementById(menuId);
+                const button = document.getElementById(btnId);
+                const otherMenuIds = ['messenger-menu', 'notification-menu', 'user-menu'].filter(id => id !== menuId);
+                const otherButtons = ['messenger-btn', 'notification-btn', 'user-btn'].filter(id => id !== btnId);
+
+                if (menu.style.display === 'none' || menu.style.display === '') {
+                    menu.style.display = 'block';
+                    button.classList.add('active-button');
+                    otherMenuIds.forEach(id => document.getElementById(id).style.display = 'none');
+                    otherButtons.forEach(id => document.getElementById(id).classList.remove('active-button'));
+                } else {
+                    menu.style.display = 'none';
+                    button.classList.remove('active-button');
+                }
+            }
\ No newline at end of file
diff --git a/web/assets/js/profile.js b/web/assets/js/profile.js
index 08f56ba..aafeb20 100644
--- a/web/assets/js/profile.js
+++ b/web/assets/js/profile.js
@@ -4,21 +4,21 @@ let popop_background = document.querySelector(".Select-audience");
 let public_btn_i = document.getElementById('public-btn-i');
 
 
-public_btn_i.addEventListener("click", function() {
-	popop_background.classList.toggle("dis_block");
-	select_audience.classList.toggle("dis_block");
+public_btn_i.addEventListener("click", function () {
+    popop_background.classList.toggle("dis_block");
+    select_audience.classList.toggle("dis_block");
 });
 
 let popup_close_btn = document.getElementById("popup-close-btn");
 
-popup_close_btn.addEventListener("click", function() {
-	select_audience.classList.remove("dis_block");
-	popop_background.classList.remove("dis_block");
+popup_close_btn.addEventListener("click", function () {
+    select_audience.classList.remove("dis_block");
+    popop_background.classList.remove("dis_block");
 });
 
-select_audience.addEventListener("click", function() {
-	select_audience.classList.remove("dis_block");
-	popop_background.classList.remove("dis_block");
+select_audience.addEventListener("click", function () {
+    select_audience.classList.remove("dis_block");
+    popop_background.classList.remove("dis_block");
 });
 
 
@@ -31,78 +31,112 @@ let public_li_icon = document.getElementById("public-li-icon");
 let friends_li_icon = document.getElementById("friends-li-icon");
 let lock_li_icon = document.getElementById("lock-li-icon");
 
-public_btn.addEventListener("click", function() {
-	public_btn.classList.add("activ-li-div");
-	friends_btn.classList.remove("activ-li-div");
+public_btn.addEventListener("click", function () {
+    public_btn.classList.add("activ-li-div");
+    friends_btn.classList.remove("activ-li-div");
 
-	public_li_icon.classList.add("activ-li-icon");
-	public_li_icon.classList.add("fa-dot-circle");
+    public_li_icon.classList.add("activ-li-icon");
+    public_li_icon.classList.add("fa-dot-circle");
 
-	lock_li_icon.classList.remove("activ-li-icon");
-	public_btn_i.classList.remove("fa-lock");
-	lock_li_icon.classList.add("fa-circle");
-	lock_btn.classList.remove("activ-li-div");
+    lock_li_icon.classList.remove("activ-li-icon");
+    public_btn_i.classList.remove("fa-lock");
+    lock_li_icon.classList.add("fa-circle");
+    lock_btn.classList.remove("activ-li-div");
 
-	friends_li_icon.classList.remove("activ-li-icon");
-	friends_li_icon.style.color= "#707070";
-	friends_li_icon.classList.add("fa-circle");
-	friends_li_icon.classList.remove("fa-dot-circle");
+    friends_li_icon.classList.remove("activ-li-icon");
+    friends_li_icon.style.color = "#707070";
+    friends_li_icon.classList.add("fa-circle");
+    friends_li_icon.classList.remove("fa-dot-circle");
 
-	public_btn_i.classList.add("fa-globe-europe");
-	public_btn_i.classList.remove("fa-user-friends");
+    public_btn_i.classList.add("fa-globe-europe");
+    public_btn_i.classList.remove("fa-user-friends");
 
-	select_audience.classList.remove("dis_block");
-	popop_background.classList.remove("dis_block");
+    select_audience.classList.remove("dis_block");
+    popop_background.classList.remove("dis_block");
 });
 
 
 
-friends_btn.addEventListener("click", function() {
-	public_btn.classList.remove("activ-li-div");
-	friends_btn.classList.add("activ-li-div");
+friends_btn.addEventListener("click", function () {
+    public_btn.classList.remove("activ-li-div");
+    friends_btn.classList.add("activ-li-div");
 
-	public_li_icon.classList.remove("activ-li-icon");
-	public_li_icon.classList.remove("fa-dot-circle");
+    public_li_icon.classList.remove("activ-li-icon");
+    public_li_icon.classList.remove("fa-dot-circle");
 
-	friends_li_icon.classList.add("activ-li-icon");
-	friends_li_icon.classList.remove("fa-circle");
-	friends_li_icon.classList.add("fa-dot-circle");
+    friends_li_icon.classList.add("activ-li-icon");
+    friends_li_icon.classList.remove("fa-circle");
+    friends_li_icon.classList.add("fa-dot-circle");
 
-	lock_li_icon.classList.remove("activ-li-icon");
-	public_btn_i.classList.remove("fa-lock");
-	lock_li_icon.classList.add("fa-circle");
-	lock_btn.classList.remove("activ-li-div");
-	lock_li_icon.classList.remove("fa-dot-circle");
+    lock_li_icon.classList.remove("activ-li-icon");
+    public_btn_i.classList.remove("fa-lock");
+    lock_li_icon.classList.add("fa-circle");
+    lock_btn.classList.remove("activ-li-div");
+    lock_li_icon.classList.remove("fa-dot-circle");
 
-	public_btn_i.classList.remove("fa-globe-europe");
-	public_btn_i.classList.add("fa-user-friends");
+    public_btn_i.classList.remove("fa-globe-europe");
+    public_btn_i.classList.add("fa-user-friends");
 
-	select_audience.classList.remove("dis_block")
-	popop_background.classList.remove("dis_block")
+    select_audience.classList.remove("dis_block")
+    popop_background.classList.remove("dis_block")
 });
 
 
-lock_btn.addEventListener("click", function() {
-	public_btn.classList.remove("activ-li-div");
-	friends_btn.classList.remove("activ-li-div");
+lock_btn.addEventListener("click", function () {
+    public_btn.classList.remove("activ-li-div");
+    friends_btn.classList.remove("activ-li-div");
 
-	public_li_icon.classList.remove("activ-li-icon");
-	public_li_icon.classList.remove("fa-dot-circle");
+    public_li_icon.classList.remove("activ-li-icon");
+    public_li_icon.classList.remove("fa-dot-circle");
 
-	friends_li_icon.classList.remove("activ-li-icon");
-	friends_li_icon.style.color= "#707070";
-	friends_li_icon.classList.add("fa-circle");
-	friends_li_icon.classList.remove("fa-dot-circle");
+    friends_li_icon.classList.remove("activ-li-icon");
+    friends_li_icon.style.color = "#707070";
+    friends_li_icon.classList.add("fa-circle");
+    friends_li_icon.classList.remove("fa-dot-circle");
 
-	lock_li_icon.classList.remove("fa-circle");
-	lock_li_icon.classList.add("fa-dot-circle");
-	lock_li_icon.classList.add("activ-li-icon");
-	lock_btn.classList.add("activ-li-div");
+    lock_li_icon.classList.remove("fa-circle");
+    lock_li_icon.classList.add("fa-dot-circle");
+    lock_li_icon.classList.add("activ-li-icon");
+    lock_btn.classList.add("activ-li-div");
 
-	public_btn_i.classList.remove("fa-globe-europe");
-	public_btn_i.classList.remove("fa-user-friends");
-	public_btn_i.classList.add("fa-lock");
+    public_btn_i.classList.remove("fa-globe-europe");
+    public_btn_i.classList.remove("fa-user-friends");
+    public_btn_i.classList.add("fa-lock");
 
-	select_audience.classList.remove("dis_block");
-	popop_background.classList.remove("dis_block");
+    select_audience.classList.remove("dis_block");
+    popop_background.classList.remove("dis_block");
 });
+
+
+
+
+document.addEventListener('DOMContentLoaded', function () {
+    document.querySelectorAll('.three-dot-btn').forEach(button => {
+        button.addEventListener('click', function () {
+            const commentId = this.getAttribute('data-comment-id');
+            const actions = this.closest('.comment-options').querySelector('.comment-actions');
+            actions.style.display = actions.style.display === 'none' ? 'block' : 'none';
+        });
+    });
+
+    document.querySelectorAll('.edit-comment-btn').forEach(button => {
+        button.addEventListener('click', function () {
+            const commentId = this.getAttribute('data-comment-id');
+            const commentText = this.closest('.comment').querySelector('.comment-text');
+            const editForm = this.closest('.comment').querySelector('.edit-comment-form');
+            commentText.style.display = 'none';
+            editForm.style.display = 'block';
+        });
+    });
+
+    document.querySelectorAll('.cancel-edit-comment').forEach(button => {
+        button.addEventListener('click', function () {
+            const commentText = this.closest('.comment').querySelector('.comment-text');
+            const editForm = this.closest('.comment').querySelector('.edit-comment-form');
+            commentText.style.display = 'block';
+            editForm.style.display = 'none';
+        });
+    });
+});
+
+
diff --git a/web/assets/js/reaction.js b/web/assets/js/reaction.js
new file mode 100644
index 0000000..9b7eaa7
--- /dev/null
+++ b/web/assets/js/reaction.js
@@ -0,0 +1,178 @@
+/* 
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+ * Click nbfs://nbhost/SystemFileSystem/Templates/JSP_Servlet/JavaScript.js to edit this template
+ */
+
+
+document.addEventListener('DOMContentLoaded', function() {
+    document.querySelectorAll('.post-rating').forEach(function(element) {
+        element.addEventListener('click', function(e) {
+            e.preventDefault();
+            var postId = this.closest('.post').dataset.postId;
+            var likeButton = this.querySelector('.material-icons');
+            var likeCountElement = this.closest('.post').querySelector('.like-count span');
+            fetch('likeServlet', {
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'application/x-www-form-urlencoded',
+                },
+                body: 'postId=' + postId
+            })
+            .then(response => response.json())
+            .then(data => {
+                if (data.success) {
+                    if (data.action === 'liked') {
+                        likeButton.style.color = '#1877f2';
+                        this.classList.add('post-rating-selected');
+                    } else {
+                        likeButton.style.color = '#65676b';
+                        this.classList.remove('post-rating-selected');
+                    }
+                    likeCountElement.textContent = data.likeCount;
+                } else {
+                    console.error('Error:', data.error);
+                }
+            })
+            .catch((error) => {
+                console.error('Error:', error);
+            });
+        });
+    });
+});
+
+
+document.addEventListener('DOMContentLoaded', function () {
+    const commentForms = document.querySelectorAll('.post-method');
+
+    commentForms.forEach(form => {
+        form.addEventListener('submit', function (event) {
+            event.preventDefault();
+            const formData = new FormData(this);
+            const postId = formData.get('post_id');
+            const commentContent = formData.get('commentContent');
+
+            if (commentContent.trim() === '') {
+                return;
+            }
+
+            fetch('/FUNET/commentServlet', {
+                method: 'POST',
+                body: formData
+            })
+            .then(response => response.json())
+            .then(data => {
+                if (data.success) {
+                    const comment = data.comment;
+                    const commentHtml = `
+                        <div class="comment mb-2" style="margin-left: 20px;">
+                            <div class="comment-header">
+                                <img src="assets/profile_avt/${comment.profile_pic}" class="img-fluid rounded-circle avatar me-2" style="width: 30px; height: 30px; object-fit: cover;">
+                                <small><strong>${comment.first_name} ${comment.last_name}</strong></small>
+                            </div>
+                            <div class="comment-body" style="display: flex; justify-content: space-between; align-items: center;">
+                                <p style="margin-bottom: 0;" class="comment-text">${comment.comment_text}</p>
+                                <div class="comment-options">
+                                    <button class="three-dot-btn" data-comment-id="${comment.comment_id}">...</button>
+                                    <div class="comment-actions" style="display: none;">
+                                        <button class="edit-comment-btn" data-comment-id="${comment.comment_id}">Edit</button>
+                                        <form action="/FUNET/deleteCommentServlet" method="post" class="delete-comment-form" style="display: inline;">
+                                            <input type="hidden" name="commentId" value="${comment.comment_id}">
+                                            <button type="submit" class="delete-comment-btn">Delete</button>
+                                        </form>
+                                    </div>
+                                </div>
+                            </div>
+                            <form action="/FUNET/updateCommentServlet" method="post" class="edit-comment-form" style="display: none;">
+                                <input type="hidden" name="commentId" value="${comment.comment_id}">
+                                <textarea name="newCommentText" class="form-control">${comment.comment_text}</textarea>
+                                <button type="submit" class="btn btn-primary">Save</button>
+                                <button type="button" class="btn btn-secondary cancel-edit-comment">Cancel</button>
+                            </form>
+                        </div>
+                    `;
+                    const commentsContainer = document.querySelector(`.post[data-post-id="${postId}"] .post-comments`);
+                    commentsContainer.insertAdjacentHTML('beforeend', commentHtml);
+                    form.reset();
+                } else {
+                    console.error('Error:', data.error);
+                }
+            })
+            .catch(error => console.error('Error:', error));
+        });
+    });
+});
+
+
+
+
+document.addEventListener('DOMContentLoaded', function () {
+    document.querySelectorAll('.edit-comment-btn').forEach(button => {
+        button.addEventListener('click', function () {
+            const commentId = this.getAttribute('data-comment-id');
+            const commentText = this.closest('.comment').querySelector('.comment-text');
+            const editForm = this.closest('.comment').querySelector('.edit-comment-form');
+            commentText.style.display = 'none';
+            editForm.style.display = 'block';
+        });
+    });
+
+    document.querySelectorAll('.cancel-edit-comment').forEach(button => {
+        button.addEventListener('click', function () {
+            const commentText = this.closest('.comment').querySelector('.comment-text');
+            const editForm = this.closest('.comment').querySelector('.edit-comment-form');
+            commentText.style.display = 'block';
+            editForm.style.display = 'none';
+        });
+    });
+
+    document.querySelectorAll('.edit-comment-form').forEach(form => {
+        form.addEventListener('submit', function (event) {
+            event.preventDefault();
+            const commentId = this.querySelector('input[name="commentId"]').value;
+            const newCommentText = this.querySelector('textarea[name="newCommentText"]').value;
+            const commentText = this.closest('.comment').querySelector('.comment-text');
+
+            fetch('/FUNET/updateCommentServlet', {
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'application/x-www-form-urlencoded'
+                },
+                body: `commentId=${commentId}&newCommentText=${encodeURIComponent(newCommentText)}`
+            })
+            .then(response => response.json())
+            .then(data => {
+                if (data.success) {
+                    commentText.textContent = newCommentText;
+                    commentText.style.display = 'block';
+                    this.style.display = 'none';
+                } else {
+                    alert('Error updating comment');
+                }
+            });
+        });
+    });
+
+    document.querySelectorAll('.delete-comment-form').forEach(form => {
+        form.addEventListener('submit', function (event) {
+            event.preventDefault();
+            const commentId = this.querySelector('input[name="commentId"]').value;
+            const commentElement = this.closest('.comment');
+
+            fetch('/FUNET/deleteCommentServlet', {
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'application/x-www-form-urlencoded'
+                },
+                body: `commentId=${commentId}`
+            })
+            .then(response => response.json())
+            .then(data => {
+                if (data.success) {
+                    commentElement.remove();
+                } else {
+                    alert('Error deleting comment');
+                }
+            });
+        });
+    });
+});
\ No newline at end of file
diff --git a/web/assets/learningMaterial/1.jpg b/web/assets/learningMaterial/1.jpg
new file mode 100644
index 0000000..ca1f4bc
Binary files /dev/null and b/web/assets/learningMaterial/1.jpg differ
diff --git a/web/assets/learningMaterial/tao.txt b/web/assets/learningMaterial/tao.txt
new file mode 100644
index 0000000..e69de29
diff --git a/web/assets/library/Cloudinary/cloudinary-core-1.33.0.jar b/web/assets/library/Cloudinary/cloudinary-core-1.33.0.jar
new file mode 100644
index 0000000..06ba63d
Binary files /dev/null and b/web/assets/library/Cloudinary/cloudinary-core-1.33.0.jar differ
diff --git a/web/assets/library/Cloudinary/cloudinary-http44-1.39.0.jar b/web/assets/library/Cloudinary/cloudinary-http44-1.39.0.jar
new file mode 100644
index 0000000..6e0ef6f
Binary files /dev/null and b/web/assets/library/Cloudinary/cloudinary-http44-1.39.0.jar differ
diff --git a/web/assets/library/Cloudinary/commons-codec-1.17.1.jar b/web/assets/library/Cloudinary/commons-codec-1.17.1.jar
new file mode 100644
index 0000000..5023670
Binary files /dev/null and b/web/assets/library/Cloudinary/commons-codec-1.17.1.jar differ
diff --git a/web/assets/library/Cloudinary/commons-io-2.17.0.jar b/web/assets/library/Cloudinary/commons-io-2.17.0.jar
new file mode 100644
index 0000000..ad00ddc
Binary files /dev/null and b/web/assets/library/Cloudinary/commons-io-2.17.0.jar differ
diff --git a/web/assets/library/Cloudinary/commons-logging-1.2.jar b/web/assets/library/Cloudinary/commons-logging-1.2.jar
new file mode 100644
index 0000000..93a3b9f
Binary files /dev/null and b/web/assets/library/Cloudinary/commons-logging-1.2.jar differ
diff --git a/web/assets/library/Cloudinary/dotenv-java-3.0.2.jar b/web/assets/library/Cloudinary/dotenv-java-3.0.2.jar
new file mode 100644
index 0000000..4ad00b0
Binary files /dev/null and b/web/assets/library/Cloudinary/dotenv-java-3.0.2.jar differ
diff --git a/web/assets/library/Cloudinary/httpclient-4.5.14.jar b/web/assets/library/Cloudinary/httpclient-4.5.14.jar
new file mode 100644
index 0000000..2bb7c07
Binary files /dev/null and b/web/assets/library/Cloudinary/httpclient-4.5.14.jar differ
diff --git a/web/assets/library/Cloudinary/httpcore-4.4.16.jar b/web/assets/library/Cloudinary/httpcore-4.4.16.jar
new file mode 100644
index 0000000..f0bdebe
Binary files /dev/null and b/web/assets/library/Cloudinary/httpcore-4.4.16.jar differ
diff --git a/web/assets/library/Cloudinary/httpmime-4.5.14.jar b/web/assets/library/Cloudinary/httpmime-4.5.14.jar
new file mode 100644
index 0000000..331e95c
Binary files /dev/null and b/web/assets/library/Cloudinary/httpmime-4.5.14.jar differ
diff --git a/web/assets/library/gson-2.3.1.jar b/web/assets/library/gson-2.3.1.jar
new file mode 100644
index 0000000..250132c
Binary files /dev/null and b/web/assets/library/gson-2.3.1.jar differ
diff --git a/web/assets/library/jquery-1.11.3.min.js b/web/assets/library/jquery-1.11.3.min.js
new file mode 100644
index 0000000..f364443
--- /dev/null
+++ b/web/assets/library/jquery-1.11.3.min.js
@@ -0,0 +1,6 @@
+/*! jQuery v1.11.3 | (c) 2005, 2015 jQuery Foundation, Inc. | jquery.org/license */
+!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=c.slice,e=c.concat,f=c.push,g=c.indexOf,h={},i=h.toString,j=h.hasOwnProperty,k={},l="1.11.3",m=function(a,b){return new m.fn.init(a,b)},n=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,o=/^-ms-/,p=/-([\da-z])/gi,q=function(a,b){return b.toUpperCase()};m.fn=m.prototype={jquery:l,constructor:m,selector:"",length:0,toArray:function(){return d.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:d.call(this)},pushStack:function(a){var b=m.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a,b){return m.each(this,a,b)},map:function(a){return this.pushStack(m.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(d.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor(null)},push:f,sort:c.sort,splice:c.splice},m.extend=m.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||m.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(e=arguments[h]))for(d in e)a=g[d],c=e[d],g!==c&&(j&&c&&(m.isPlainObject(c)||(b=m.isArray(c)))?(b?(b=!1,f=a&&m.isArray(a)?a:[]):f=a&&m.isPlainObject(a)?a:{},g[d]=m.extend(j,f,c)):void 0!==c&&(g[d]=c));return g},m.extend({expando:"jQuery"+(l+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===m.type(a)},isArray:Array.isArray||function(a){return"array"===m.type(a)},isWindow:function(a){return null!=a&&a==a.window},isNumeric:function(a){return!m.isArray(a)&&a-parseFloat(a)+1>=0},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},isPlainObject:function(a){var b;if(!a||"object"!==m.type(a)||a.nodeType||m.isWindow(a))return!1;try{if(a.constructor&&!j.call(a,"constructor")&&!j.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}if(k.ownLast)for(b in a)return j.call(a,b);for(b in a);return void 0===b||j.call(a,b)},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?h[i.call(a)]||"object":typeof a},globalEval:function(b){b&&m.trim(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(o,"ms-").replace(p,q)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b,c){var d,e=0,f=a.length,g=r(a);if(c){if(g){for(;f>e;e++)if(d=b.apply(a[e],c),d===!1)break}else for(e in a)if(d=b.apply(a[e],c),d===!1)break}else if(g){for(;f>e;e++)if(d=b.call(a[e],e,a[e]),d===!1)break}else for(e in a)if(d=b.call(a[e],e,a[e]),d===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(n,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(r(Object(a))?m.merge(c,"string"==typeof a?[a]:a):f.call(c,a)),c},inArray:function(a,b,c){var d;if(b){if(g)return g.call(b,a,c);for(d=b.length,c=c?0>c?Math.max(0,d+c):c:0;d>c;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,b){var c=+b.length,d=0,e=a.length;while(c>d)a[e++]=b[d++];if(c!==c)while(void 0!==b[d])a[e++]=b[d++];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,f=0,g=a.length,h=r(a),i=[];if(h)for(;g>f;f++)d=b(a[f],f,c),null!=d&&i.push(d);else for(f in a)d=b(a[f],f,c),null!=d&&i.push(d);return e.apply([],i)},guid:1,proxy:function(a,b){var c,e,f;return"string"==typeof b&&(f=a[b],b=a,a=f),m.isFunction(a)?(c=d.call(arguments,2),e=function(){return a.apply(b||this,c.concat(d.call(arguments)))},e.guid=a.guid=a.guid||m.guid++,e):void 0},now:function(){return+new Date},support:k}),m.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(a,b){h["[object "+b+"]"]=b.toLowerCase()});function r(a){var b="length"in a&&a.length,c=m.type(a);return"function"===c||m.isWindow(a)?!1:1===a.nodeType&&b?!0:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var s=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+1*new Date,v=a.document,w=0,x=0,y=ha(),z=ha(),A=ha(),B=function(a,b){return a===b&&(l=!0),0},C=1<<31,D={}.hasOwnProperty,E=[],F=E.pop,G=E.push,H=E.push,I=E.slice,J=function(a,b){for(var c=0,d=a.length;d>c;c++)if(a[c]===b)return c;return-1},K="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",L="[\\x20\\t\\r\\n\\f]",M="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",N=M.replace("w","w#"),O="\\["+L+"*("+M+")(?:"+L+"*([*^$|!~]?=)"+L+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+N+"))|)"+L+"*\\]",P=":("+M+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+O+")*)|.*)\\)|)",Q=new RegExp(L+"+","g"),R=new RegExp("^"+L+"+|((?:^|[^\\\\])(?:\\\\.)*)"+L+"+$","g"),S=new RegExp("^"+L+"*,"+L+"*"),T=new RegExp("^"+L+"*([>+~]|"+L+")"+L+"*"),U=new RegExp("="+L+"*([^\\]'\"]*?)"+L+"*\\]","g"),V=new RegExp(P),W=new RegExp("^"+N+"$"),X={ID:new RegExp("^#("+M+")"),CLASS:new RegExp("^\\.("+M+")"),TAG:new RegExp("^("+M.replace("w","w*")+")"),ATTR:new RegExp("^"+O),PSEUDO:new RegExp("^"+P),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+L+"*(even|odd|(([+-]|)(\\d*)n|)"+L+"*(?:([+-]|)"+L+"*(\\d+)|))"+L+"*\\)|)","i"),bool:new RegExp("^(?:"+K+")$","i"),needsContext:new RegExp("^"+L+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+L+"*((?:-\\d)?\\d*)"+L+"*\\)|)(?=[^-]|$)","i")},Y=/^(?:input|select|textarea|button)$/i,Z=/^h\d$/i,$=/^[^{]+\{\s*\[native \w/,_=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,aa=/[+~]/,ba=/'|\\/g,ca=new RegExp("\\\\([\\da-f]{1,6}"+L+"?|("+L+")|.)","ig"),da=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)},ea=function(){m()};try{H.apply(E=I.call(v.childNodes),v.childNodes),E[v.childNodes.length].nodeType}catch(fa){H={apply:E.length?function(a,b){G.apply(a,I.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function ga(a,b,d,e){var f,h,j,k,l,o,r,s,w,x;if((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,d=d||[],k=b.nodeType,"string"!=typeof a||!a||1!==k&&9!==k&&11!==k)return d;if(!e&&p){if(11!==k&&(f=_.exec(a)))if(j=f[1]){if(9===k){if(h=b.getElementById(j),!h||!h.parentNode)return d;if(h.id===j)return d.push(h),d}else if(b.ownerDocument&&(h=b.ownerDocument.getElementById(j))&&t(b,h)&&h.id===j)return d.push(h),d}else{if(f[2])return H.apply(d,b.getElementsByTagName(a)),d;if((j=f[3])&&c.getElementsByClassName)return H.apply(d,b.getElementsByClassName(j)),d}if(c.qsa&&(!q||!q.test(a))){if(s=r=u,w=b,x=1!==k&&a,1===k&&"object"!==b.nodeName.toLowerCase()){o=g(a),(r=b.getAttribute("id"))?s=r.replace(ba,"\\$&"):b.setAttribute("id",s),s="[id='"+s+"'] ",l=o.length;while(l--)o[l]=s+ra(o[l]);w=aa.test(a)&&pa(b.parentNode)||b,x=o.join(",")}if(x)try{return H.apply(d,w.querySelectorAll(x)),d}catch(y){}finally{r||b.removeAttribute("id")}}}return i(a.replace(R,"$1"),b,d,e)}function ha(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function ia(a){return a[u]=!0,a}function ja(a){var b=n.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function ka(a,b){var c=a.split("|"),e=a.length;while(e--)d.attrHandle[c[e]]=b}function la(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||C)-(~a.sourceIndex||C);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function ma(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function na(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function oa(a){return ia(function(b){return b=+b,ia(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function pa(a){return a&&"undefined"!=typeof a.getElementsByTagName&&a}c=ga.support={},f=ga.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},m=ga.setDocument=function(a){var b,e,g=a?a.ownerDocument||a:v;return g!==n&&9===g.nodeType&&g.documentElement?(n=g,o=g.documentElement,e=g.defaultView,e&&e!==e.top&&(e.addEventListener?e.addEventListener("unload",ea,!1):e.attachEvent&&e.attachEvent("onunload",ea)),p=!f(g),c.attributes=ja(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ja(function(a){return a.appendChild(g.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=$.test(g.getElementsByClassName),c.getById=ja(function(a){return o.appendChild(a).id=u,!g.getElementsByName||!g.getElementsByName(u).length}),c.getById?(d.find.ID=function(a,b){if("undefined"!=typeof b.getElementById&&p){var c=b.getElementById(a);return c&&c.parentNode?[c]:[]}},d.filter.ID=function(a){var b=a.replace(ca,da);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(ca,da);return function(a){var c="undefined"!=typeof a.getAttributeNode&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return"undefined"!=typeof b.getElementsByTagName?b.getElementsByTagName(a):c.qsa?b.querySelectorAll(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return p?b.getElementsByClassName(a):void 0},r=[],q=[],(c.qsa=$.test(g.querySelectorAll))&&(ja(function(a){o.appendChild(a).innerHTML="<a id='"+u+"'></a><select id='"+u+"-\f]' msallowcapture=''><option selected=''></option></select>",a.querySelectorAll("[msallowcapture^='']").length&&q.push("[*^$]="+L+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+L+"*(?:value|"+K+")"),a.querySelectorAll("[id~="+u+"-]").length||q.push("~="),a.querySelectorAll(":checked").length||q.push(":checked"),a.querySelectorAll("a#"+u+"+*").length||q.push(".#.+[+~]")}),ja(function(a){var b=g.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+L+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=$.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&ja(function(a){c.disconnectedMatch=s.call(a,"div"),s.call(a,"[s!='']:x"),r.push("!=",P)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=$.test(o.compareDocumentPosition),t=b||$.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===g||a.ownerDocument===v&&t(v,a)?-1:b===g||b.ownerDocument===v&&t(v,b)?1:k?J(k,a)-J(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,e=a.parentNode,f=b.parentNode,h=[a],i=[b];if(!e||!f)return a===g?-1:b===g?1:e?-1:f?1:k?J(k,a)-J(k,b):0;if(e===f)return la(a,b);c=a;while(c=c.parentNode)h.unshift(c);c=b;while(c=c.parentNode)i.unshift(c);while(h[d]===i[d])d++;return d?la(h[d],i[d]):h[d]===v?-1:i[d]===v?1:0},g):n},ga.matches=function(a,b){return ga(a,null,null,b)},ga.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(U,"='$1']"),!(!c.matchesSelector||!p||r&&r.test(b)||q&&q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return ga(b,n,null,[a]).length>0},ga.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},ga.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&D.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},ga.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},ga.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=null,a},e=ga.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=ga.selectors={cacheLength:50,createPseudo:ia,match:X,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(ca,da),a[3]=(a[3]||a[4]||a[5]||"").replace(ca,da),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||ga.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&ga.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return X.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&V.test(c)&&(b=g(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(ca,da).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+" "];return b||(b=new RegExp("(^|"+L+")"+a+"("+L+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||"undefined"!=typeof a.getAttribute&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=ga.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e.replace(Q," ")+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h;if(q){if(f){while(p){l=b;while(l=l[p])if(h?l.nodeName.toLowerCase()===r:1===l.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){k=q[u]||(q[u]={}),j=k[a]||[],n=j[0]===w&&j[1],m=j[0]===w&&j[2],l=n&&q.childNodes[n];while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if(1===l.nodeType&&++m&&l===b){k[a]=[w,n,m];break}}else if(s&&(j=(b[u]||(b[u]={}))[a])&&j[0]===w)m=j[1];else while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if((h?l.nodeName.toLowerCase()===r:1===l.nodeType)&&++m&&(s&&((l[u]||(l[u]={}))[a]=[w,m]),l===b))break;return m-=e,m===d||m%d===0&&m/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||ga.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?ia(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=J(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:ia(function(a){var b=[],c=[],d=h(a.replace(R,"$1"));return d[u]?ia(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),b[0]=null,!c.pop()}}),has:ia(function(a){return function(b){return ga(a,b).length>0}}),contains:ia(function(a){return a=a.replace(ca,da),function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:ia(function(a){return W.test(a||"")||ga.error("unsupported lang: "+a),a=a.replace(ca,da).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return Z.test(a.nodeName)},input:function(a){return Y.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:oa(function(){return[0]}),last:oa(function(a,b){return[b-1]}),eq:oa(function(a,b,c){return[0>c?c+b:c]}),even:oa(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:oa(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:oa(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:oa(function(a,b,c){for(var d=0>c?c+b:c;++d<b;)a.push(d);return a})}},d.pseudos.nth=d.pseudos.eq;for(b in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})d.pseudos[b]=ma(b);for(b in{submit:!0,reset:!0})d.pseudos[b]=na(b);function qa(){}qa.prototype=d.filters=d.pseudos,d.setFilters=new qa,g=ga.tokenize=function(a,b){var c,e,f,g,h,i,j,k=z[a+" "];if(k)return b?0:k.slice(0);h=a,i=[],j=d.preFilter;while(h){(!c||(e=S.exec(h)))&&(e&&(h=h.slice(e[0].length)||h),i.push(f=[])),c=!1,(e=T.exec(h))&&(c=e.shift(),f.push({value:c,type:e[0].replace(R," ")}),h=h.slice(c.length));for(g in d.filter)!(e=X[g].exec(h))||j[g]&&!(e=j[g](e))||(c=e.shift(),f.push({value:c,type:g,matches:e}),h=h.slice(c.length));if(!c)break}return b?h.length:h?ga.error(a):z(a,i).slice(0)};function ra(a){for(var b=0,c=a.length,d="";c>b;b++)d+=a[b].value;return d}function sa(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=x++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j=[w,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(b=b[d])if(1===b.nodeType||e){if(i=b[u]||(b[u]={}),(h=i[d])&&h[0]===w&&h[1]===f)return j[2]=h[2];if(i[d]=j,j[2]=a(b,c,g))return!0}}}function ta(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function ua(a,b,c){for(var d=0,e=b.length;e>d;d++)ga(a,b[d],c);return c}function va(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(!c||c(f,d,e))&&(g.push(f),j&&b.push(h));return g}function wa(a,b,c,d,e,f){return d&&!d[u]&&(d=wa(d)),e&&!e[u]&&(e=wa(e,f)),ia(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||ua(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:va(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=va(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?J(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=va(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):H.apply(g,r)})}function xa(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=sa(function(a){return a===b},h,!0),l=sa(function(a){return J(b,a)>-1},h,!0),m=[function(a,c,d){var e=!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d));return b=null,e}];f>i;i++)if(c=d.relative[a[i].type])m=[sa(ta(m),c)];else{if(c=d.filter[a[i].type].apply(null,a[i].matches),c[u]){for(e=++i;f>e;e++)if(d.relative[a[e].type])break;return wa(i>1&&ta(m),i>1&&ra(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(R,"$1"),c,e>i&&xa(a.slice(i,e)),f>e&&xa(a=a.slice(e)),f>e&&ra(a))}m.push(c)}return ta(m)}function ya(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,m,o,p=0,q="0",r=f&&[],s=[],t=j,u=f||e&&d.find.TAG("*",k),v=w+=null==t?1:Math.random()||.1,x=u.length;for(k&&(j=g!==n&&g);q!==x&&null!=(l=u[q]);q++){if(e&&l){m=0;while(o=a[m++])if(o(l,g,h)){i.push(l);break}k&&(w=v)}c&&((l=!o&&l)&&p--,f&&r.push(l))}if(p+=q,c&&q!==p){m=0;while(o=b[m++])o(r,s,g,h);if(f){if(p>0)while(q--)r[q]||s[q]||(s[q]=F.call(i));s=va(s)}H.apply(i,s),k&&!f&&s.length>0&&p+b.length>1&&ga.uniqueSort(i)}return k&&(w=v,j=t),r};return c?ia(f):f}return h=ga.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=xa(b[c]),f[u]?d.push(f):e.push(f);f=A(a,ya(e,d)),f.selector=a}return f},i=ga.select=function(a,b,e,f){var i,j,k,l,m,n="function"==typeof a&&a,o=!f&&g(a=n.selector||a);if(e=e||[],1===o.length){if(j=o[0]=o[0].slice(0),j.length>2&&"ID"===(k=j[0]).type&&c.getById&&9===b.nodeType&&p&&d.relative[j[1].type]){if(b=(d.find.ID(k.matches[0].replace(ca,da),b)||[])[0],!b)return e;n&&(b=b.parentNode),a=a.slice(j.shift().value.length)}i=X.needsContext.test(a)?0:j.length;while(i--){if(k=j[i],d.relative[l=k.type])break;if((m=d.find[l])&&(f=m(k.matches[0].replace(ca,da),aa.test(j[0].type)&&pa(b.parentNode)||b))){if(j.splice(i,1),a=f.length&&ra(j),!a)return H.apply(e,f),e;break}}}return(n||h(a,o))(f,b,!p,e,aa.test(a)&&pa(b.parentNode)||b),e},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ja(function(a){return 1&a.compareDocumentPosition(n.createElement("div"))}),ja(function(a){return a.innerHTML="<a href='#'></a>","#"===a.firstChild.getAttribute("href")})||ka("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&ja(function(a){return a.innerHTML="<input/>",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||ka("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),ja(function(a){return null==a.getAttribute("disabled")})||ka(K,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),ga}(a);m.find=s,m.expr=s.selectors,m.expr[":"]=m.expr.pseudos,m.unique=s.uniqueSort,m.text=s.getText,m.isXMLDoc=s.isXML,m.contains=s.contains;var t=m.expr.match.needsContext,u=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,v=/^.[^:#\[\.,]*$/;function w(a,b,c){if(m.isFunction(b))return m.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return m.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(v.test(b))return m.filter(b,a,c);b=m.filter(b,a)}return m.grep(a,function(a){return m.inArray(a,b)>=0!==c})}m.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?m.find.matchesSelector(d,a)?[d]:[]:m.find.matches(a,m.grep(b,function(a){return 1===a.nodeType}))},m.fn.extend({find:function(a){var b,c=[],d=this,e=d.length;if("string"!=typeof a)return this.pushStack(m(a).filter(function(){for(b=0;e>b;b++)if(m.contains(d[b],this))return!0}));for(b=0;e>b;b++)m.find(a,d[b],c);return c=this.pushStack(e>1?m.unique(c):c),c.selector=this.selector?this.selector+" "+a:a,c},filter:function(a){return this.pushStack(w(this,a||[],!1))},not:function(a){return this.pushStack(w(this,a||[],!0))},is:function(a){return!!w(this,"string"==typeof a&&t.test(a)?m(a):a||[],!1).length}});var x,y=a.document,z=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,A=m.fn.init=function(a,b){var c,d;if(!a)return this;if("string"==typeof a){if(c="<"===a.charAt(0)&&">"===a.charAt(a.length-1)&&a.length>=3?[null,a,null]:z.exec(a),!c||!c[1]&&b)return!b||b.jquery?(b||x).find(a):this.constructor(b).find(a);if(c[1]){if(b=b instanceof m?b[0]:b,m.merge(this,m.parseHTML(c[1],b&&b.nodeType?b.ownerDocument||b:y,!0)),u.test(c[1])&&m.isPlainObject(b))for(c in b)m.isFunction(this[c])?this[c](b[c]):this.attr(c,b[c]);return this}if(d=y.getElementById(c[2]),d&&d.parentNode){if(d.id!==c[2])return x.find(a);this.length=1,this[0]=d}return this.context=y,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):m.isFunction(a)?"undefined"!=typeof x.ready?x.ready(a):a(m):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),m.makeArray(a,this))};A.prototype=m.fn,x=m(y);var B=/^(?:parents|prev(?:Until|All))/,C={children:!0,contents:!0,next:!0,prev:!0};m.extend({dir:function(a,b,c){var d=[],e=a[b];while(e&&9!==e.nodeType&&(void 0===c||1!==e.nodeType||!m(e).is(c)))1===e.nodeType&&d.push(e),e=e[b];return d},sibling:function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c}}),m.fn.extend({has:function(a){var b,c=m(a,this),d=c.length;return this.filter(function(){for(b=0;d>b;b++)if(m.contains(this,c[b]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=t.test(a)||"string"!=typeof a?m(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&m.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?m.unique(f):f)},index:function(a){return a?"string"==typeof a?m.inArray(this[0],m(a)):m.inArray(a.jquery?a[0]:a,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(m.unique(m.merge(this.get(),m(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function D(a,b){do a=a[b];while(a&&1!==a.nodeType);return a}m.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return m.dir(a,"parentNode")},parentsUntil:function(a,b,c){return m.dir(a,"parentNode",c)},next:function(a){return D(a,"nextSibling")},prev:function(a){return D(a,"previousSibling")},nextAll:function(a){return m.dir(a,"nextSibling")},prevAll:function(a){return m.dir(a,"previousSibling")},nextUntil:function(a,b,c){return m.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return m.dir(a,"previousSibling",c)},siblings:function(a){return m.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return m.sibling(a.firstChild)},contents:function(a){return m.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:m.merge([],a.childNodes)}},function(a,b){m.fn[a]=function(c,d){var e=m.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=m.filter(d,e)),this.length>1&&(C[a]||(e=m.unique(e)),B.test(a)&&(e=e.reverse())),this.pushStack(e)}});var E=/\S+/g,F={};function G(a){var b=F[a]={};return m.each(a.match(E)||[],function(a,c){b[c]=!0}),b}m.Callbacks=function(a){a="string"==typeof a?F[a]||G(a):m.extend({},a);var b,c,d,e,f,g,h=[],i=!a.once&&[],j=function(l){for(c=a.memory&&l,d=!0,f=g||0,g=0,e=h.length,b=!0;h&&e>f;f++)if(h[f].apply(l[0],l[1])===!1&&a.stopOnFalse){c=!1;break}b=!1,h&&(i?i.length&&j(i.shift()):c?h=[]:k.disable())},k={add:function(){if(h){var d=h.length;!function f(b){m.each(b,function(b,c){var d=m.type(c);"function"===d?a.unique&&k.has(c)||h.push(c):c&&c.length&&"string"!==d&&f(c)})}(arguments),b?e=h.length:c&&(g=d,j(c))}return this},remove:function(){return h&&m.each(arguments,function(a,c){var d;while((d=m.inArray(c,h,d))>-1)h.splice(d,1),b&&(e>=d&&e--,f>=d&&f--)}),this},has:function(a){return a?m.inArray(a,h)>-1:!(!h||!h.length)},empty:function(){return h=[],e=0,this},disable:function(){return h=i=c=void 0,this},disabled:function(){return!h},lock:function(){return i=void 0,c||k.disable(),this},locked:function(){return!i},fireWith:function(a,c){return!h||d&&!i||(c=c||[],c=[a,c.slice?c.slice():c],b?i.push(c):j(c)),this},fire:function(){return k.fireWith(this,arguments),this},fired:function(){return!!d}};return k},m.extend({Deferred:function(a){var b=[["resolve","done",m.Callbacks("once memory"),"resolved"],["reject","fail",m.Callbacks("once memory"),"rejected"],["notify","progress",m.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return m.Deferred(function(c){m.each(b,function(b,f){var g=m.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&m.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?m.extend(a,d):d}},e={};return d.pipe=d.then,m.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=d.call(arguments),e=c.length,f=1!==e||a&&m.isFunction(a.promise)?e:0,g=1===f?a:m.Deferred(),h=function(a,b,c){return function(e){b[a]=this,c[a]=arguments.length>1?d.call(arguments):e,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(e>1)for(i=new Array(e),j=new Array(e),k=new Array(e);e>b;b++)c[b]&&m.isFunction(c[b].promise)?c[b].promise().done(h(b,k,c)).fail(g.reject).progress(h(b,j,i)):--f;return f||g.resolveWith(k,c),g.promise()}});var H;m.fn.ready=function(a){return m.ready.promise().done(a),this},m.extend({isReady:!1,readyWait:1,holdReady:function(a){a?m.readyWait++:m.ready(!0)},ready:function(a){if(a===!0?!--m.readyWait:!m.isReady){if(!y.body)return setTimeout(m.ready);m.isReady=!0,a!==!0&&--m.readyWait>0||(H.resolveWith(y,[m]),m.fn.triggerHandler&&(m(y).triggerHandler("ready"),m(y).off("ready")))}}});function I(){y.addEventListener?(y.removeEventListener("DOMContentLoaded",J,!1),a.removeEventListener("load",J,!1)):(y.detachEvent("onreadystatechange",J),a.detachEvent("onload",J))}function J(){(y.addEventListener||"load"===event.type||"complete"===y.readyState)&&(I(),m.ready())}m.ready.promise=function(b){if(!H)if(H=m.Deferred(),"complete"===y.readyState)setTimeout(m.ready);else if(y.addEventListener)y.addEventListener("DOMContentLoaded",J,!1),a.addEventListener("load",J,!1);else{y.attachEvent("onreadystatechange",J),a.attachEvent("onload",J);var c=!1;try{c=null==a.frameElement&&y.documentElement}catch(d){}c&&c.doScroll&&!function e(){if(!m.isReady){try{c.doScroll("left")}catch(a){return setTimeout(e,50)}I(),m.ready()}}()}return H.promise(b)};var K="undefined",L;for(L in m(k))break;k.ownLast="0"!==L,k.inlineBlockNeedsLayout=!1,m(function(){var a,b,c,d;c=y.getElementsByTagName("body")[0],c&&c.style&&(b=y.createElement("div"),d=y.createElement("div"),d.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",c.appendChild(d).appendChild(b),typeof b.style.zoom!==K&&(b.style.cssText="display:inline;margin:0;border:0;padding:1px;width:1px;zoom:1",k.inlineBlockNeedsLayout=a=3===b.offsetWidth,a&&(c.style.zoom=1)),c.removeChild(d))}),function(){var a=y.createElement("div");if(null==k.deleteExpando){k.deleteExpando=!0;try{delete a.test}catch(b){k.deleteExpando=!1}}a=null}(),m.acceptData=function(a){var b=m.noData[(a.nodeName+" ").toLowerCase()],c=+a.nodeType||1;return 1!==c&&9!==c?!1:!b||b!==!0&&a.getAttribute("classid")===b};var M=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,N=/([A-Z])/g;function O(a,b,c){if(void 0===c&&1===a.nodeType){var d="data-"+b.replace(N,"-$1").toLowerCase();if(c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:M.test(c)?m.parseJSON(c):c}catch(e){}m.data(a,b,c)}else c=void 0}return c}function P(a){var b;for(b in a)if(("data"!==b||!m.isEmptyObject(a[b]))&&"toJSON"!==b)return!1;
+
+return!0}function Q(a,b,d,e){if(m.acceptData(a)){var f,g,h=m.expando,i=a.nodeType,j=i?m.cache:a,k=i?a[h]:a[h]&&h;if(k&&j[k]&&(e||j[k].data)||void 0!==d||"string"!=typeof b)return k||(k=i?a[h]=c.pop()||m.guid++:h),j[k]||(j[k]=i?{}:{toJSON:m.noop}),("object"==typeof b||"function"==typeof b)&&(e?j[k]=m.extend(j[k],b):j[k].data=m.extend(j[k].data,b)),g=j[k],e||(g.data||(g.data={}),g=g.data),void 0!==d&&(g[m.camelCase(b)]=d),"string"==typeof b?(f=g[b],null==f&&(f=g[m.camelCase(b)])):f=g,f}}function R(a,b,c){if(m.acceptData(a)){var d,e,f=a.nodeType,g=f?m.cache:a,h=f?a[m.expando]:m.expando;if(g[h]){if(b&&(d=c?g[h]:g[h].data)){m.isArray(b)?b=b.concat(m.map(b,m.camelCase)):b in d?b=[b]:(b=m.camelCase(b),b=b in d?[b]:b.split(" ")),e=b.length;while(e--)delete d[b[e]];if(c?!P(d):!m.isEmptyObject(d))return}(c||(delete g[h].data,P(g[h])))&&(f?m.cleanData([a],!0):k.deleteExpando||g!=g.window?delete g[h]:g[h]=null)}}}m.extend({cache:{},noData:{"applet ":!0,"embed ":!0,"object ":"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(a){return a=a.nodeType?m.cache[a[m.expando]]:a[m.expando],!!a&&!P(a)},data:function(a,b,c){return Q(a,b,c)},removeData:function(a,b){return R(a,b)},_data:function(a,b,c){return Q(a,b,c,!0)},_removeData:function(a,b){return R(a,b,!0)}}),m.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=m.data(f),1===f.nodeType&&!m._data(f,"parsedAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=m.camelCase(d.slice(5)),O(f,d,e[d])));m._data(f,"parsedAttrs",!0)}return e}return"object"==typeof a?this.each(function(){m.data(this,a)}):arguments.length>1?this.each(function(){m.data(this,a,b)}):f?O(f,a,m.data(f,a)):void 0},removeData:function(a){return this.each(function(){m.removeData(this,a)})}}),m.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=m._data(a,b),c&&(!d||m.isArray(c)?d=m._data(a,b,m.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=m.queue(a,b),d=c.length,e=c.shift(),f=m._queueHooks(a,b),g=function(){m.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return m._data(a,c)||m._data(a,c,{empty:m.Callbacks("once memory").add(function(){m._removeData(a,b+"queue"),m._removeData(a,c)})})}}),m.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.length<c?m.queue(this[0],a):void 0===b?this:this.each(function(){var c=m.queue(this,a,b);m._queueHooks(this,a),"fx"===a&&"inprogress"!==c[0]&&m.dequeue(this,a)})},dequeue:function(a){return this.each(function(){m.dequeue(this,a)})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,b){var c,d=1,e=m.Deferred(),f=this,g=this.length,h=function(){--d||e.resolveWith(f,[f])};"string"!=typeof a&&(b=a,a=void 0),a=a||"fx";while(g--)c=m._data(f[g],a+"queueHooks"),c&&c.empty&&(d++,c.empty.add(h));return h(),e.promise(b)}});var S=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,T=["Top","Right","Bottom","Left"],U=function(a,b){return a=b||a,"none"===m.css(a,"display")||!m.contains(a.ownerDocument,a)},V=m.access=function(a,b,c,d,e,f,g){var h=0,i=a.length,j=null==c;if("object"===m.type(c)){e=!0;for(h in c)m.access(a,b,h,c[h],!0,f,g)}else if(void 0!==d&&(e=!0,m.isFunction(d)||(g=!0),j&&(g?(b.call(a,d),b=null):(j=b,b=function(a,b,c){return j.call(m(a),c)})),b))for(;i>h;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f},W=/^(?:checkbox|radio)$/i;!function(){var a=y.createElement("input"),b=y.createElement("div"),c=y.createDocumentFragment();if(b.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",k.leadingWhitespace=3===b.firstChild.nodeType,k.tbody=!b.getElementsByTagName("tbody").length,k.htmlSerialize=!!b.getElementsByTagName("link").length,k.html5Clone="<:nav></:nav>"!==y.createElement("nav").cloneNode(!0).outerHTML,a.type="checkbox",a.checked=!0,c.appendChild(a),k.appendChecked=a.checked,b.innerHTML="<textarea>x</textarea>",k.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue,c.appendChild(b),b.innerHTML="<input type='radio' checked='checked' name='t'/>",k.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,k.noCloneEvent=!0,b.attachEvent&&(b.attachEvent("onclick",function(){k.noCloneEvent=!1}),b.cloneNode(!0).click()),null==k.deleteExpando){k.deleteExpando=!0;try{delete b.test}catch(d){k.deleteExpando=!1}}}(),function(){var b,c,d=y.createElement("div");for(b in{submit:!0,change:!0,focusin:!0})c="on"+b,(k[b+"Bubbles"]=c in a)||(d.setAttribute(c,"t"),k[b+"Bubbles"]=d.attributes[c].expando===!1);d=null}();var X=/^(?:input|select|textarea)$/i,Y=/^key/,Z=/^(?:mouse|pointer|contextmenu)|click/,$=/^(?:focusinfocus|focusoutblur)$/,_=/^([^.]*)(?:\.(.+)|)$/;function aa(){return!0}function ba(){return!1}function ca(){try{return y.activeElement}catch(a){}}m.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,n,o,p,q,r=m._data(a);if(r){c.handler&&(i=c,c=i.handler,e=i.selector),c.guid||(c.guid=m.guid++),(g=r.events)||(g=r.events={}),(k=r.handle)||(k=r.handle=function(a){return typeof m===K||a&&m.event.triggered===a.type?void 0:m.event.dispatch.apply(k.elem,arguments)},k.elem=a),b=(b||"").match(E)||[""],h=b.length;while(h--)f=_.exec(b[h])||[],o=q=f[1],p=(f[2]||"").split(".").sort(),o&&(j=m.event.special[o]||{},o=(e?j.delegateType:j.bindType)||o,j=m.event.special[o]||{},l=m.extend({type:o,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&m.expr.match.needsContext.test(e),namespace:p.join(".")},i),(n=g[o])||(n=g[o]=[],n.delegateCount=0,j.setup&&j.setup.call(a,d,p,k)!==!1||(a.addEventListener?a.addEventListener(o,k,!1):a.attachEvent&&a.attachEvent("on"+o,k))),j.add&&(j.add.call(a,l),l.handler.guid||(l.handler.guid=c.guid)),e?n.splice(n.delegateCount++,0,l):n.push(l),m.event.global[o]=!0);a=null}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,n,o,p,q,r=m.hasData(a)&&m._data(a);if(r&&(k=r.events)){b=(b||"").match(E)||[""],j=b.length;while(j--)if(h=_.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o){l=m.event.special[o]||{},o=(d?l.delegateType:l.bindType)||o,n=k[o]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),i=f=n.length;while(f--)g=n[f],!e&&q!==g.origType||c&&c.guid!==g.guid||h&&!h.test(g.namespace)||d&&d!==g.selector&&("**"!==d||!g.selector)||(n.splice(f,1),g.selector&&n.delegateCount--,l.remove&&l.remove.call(a,g));i&&!n.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||m.removeEvent(a,o,r.handle),delete k[o])}else for(o in k)m.event.remove(a,o+b[j],c,d,!0);m.isEmptyObject(k)&&(delete r.handle,m._removeData(a,"events"))}},trigger:function(b,c,d,e){var f,g,h,i,k,l,n,o=[d||y],p=j.call(b,"type")?b.type:b,q=j.call(b,"namespace")?b.namespace.split("."):[];if(h=l=d=d||y,3!==d.nodeType&&8!==d.nodeType&&!$.test(p+m.event.triggered)&&(p.indexOf(".")>=0&&(q=p.split("."),p=q.shift(),q.sort()),g=p.indexOf(":")<0&&"on"+p,b=b[m.expando]?b:new m.Event(p,"object"==typeof b&&b),b.isTrigger=e?2:3,b.namespace=q.join("."),b.namespace_re=b.namespace?new RegExp("(^|\\.)"+q.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=d),c=null==c?[b]:m.makeArray(c,[b]),k=m.event.special[p]||{},e||!k.trigger||k.trigger.apply(d,c)!==!1)){if(!e&&!k.noBubble&&!m.isWindow(d)){for(i=k.delegateType||p,$.test(i+p)||(h=h.parentNode);h;h=h.parentNode)o.push(h),l=h;l===(d.ownerDocument||y)&&o.push(l.defaultView||l.parentWindow||a)}n=0;while((h=o[n++])&&!b.isPropagationStopped())b.type=n>1?i:k.bindType||p,f=(m._data(h,"events")||{})[b.type]&&m._data(h,"handle"),f&&f.apply(h,c),f=g&&h[g],f&&f.apply&&m.acceptData(h)&&(b.result=f.apply(h,c),b.result===!1&&b.preventDefault());if(b.type=p,!e&&!b.isDefaultPrevented()&&(!k._default||k._default.apply(o.pop(),c)===!1)&&m.acceptData(d)&&g&&d[p]&&!m.isWindow(d)){l=d[g],l&&(d[g]=null),m.event.triggered=p;try{d[p]()}catch(r){}m.event.triggered=void 0,l&&(d[g]=l)}return b.result}},dispatch:function(a){a=m.event.fix(a);var b,c,e,f,g,h=[],i=d.call(arguments),j=(m._data(this,"events")||{})[a.type]||[],k=m.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=m.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,g=0;while((e=f.handlers[g++])&&!a.isImmediatePropagationStopped())(!a.namespace_re||a.namespace_re.test(e.namespace))&&(a.handleObj=e,a.data=e.data,c=((m.event.special[e.origType]||{}).handle||e.handler).apply(f.elem,i),void 0!==c&&(a.result=c)===!1&&(a.preventDefault(),a.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&(!a.button||"click"!==a.type))for(;i!=this;i=i.parentNode||this)if(1===i.nodeType&&(i.disabled!==!0||"click"!==a.type)){for(e=[],f=0;h>f;f++)d=b[f],c=d.selector+" ",void 0===e[c]&&(e[c]=d.needsContext?m(c,this).index(i)>=0:m.find(c,this,null,[i]).length),e[c]&&e.push(d);e.length&&g.push({elem:i,handlers:e})}return h<b.length&&g.push({elem:this,handlers:b.slice(h)}),g},fix:function(a){if(a[m.expando])return a;var b,c,d,e=a.type,f=a,g=this.fixHooks[e];g||(this.fixHooks[e]=g=Z.test(e)?this.mouseHooks:Y.test(e)?this.keyHooks:{}),d=g.props?this.props.concat(g.props):this.props,a=new m.Event(f),b=d.length;while(b--)c=d[b],a[c]=f[c];return a.target||(a.target=f.srcElement||y),3===a.target.nodeType&&(a.target=a.target.parentNode),a.metaKey=!!a.metaKey,g.filter?g.filter(a,f):a},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){return null==a.which&&(a.which=null!=b.charCode?b.charCode:b.keyCode),a}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,b){var c,d,e,f=b.button,g=b.fromElement;return null==a.pageX&&null!=b.clientX&&(d=a.target.ownerDocument||y,e=d.documentElement,c=d.body,a.pageX=b.clientX+(e&&e.scrollLeft||c&&c.scrollLeft||0)-(e&&e.clientLeft||c&&c.clientLeft||0),a.pageY=b.clientY+(e&&e.scrollTop||c&&c.scrollTop||0)-(e&&e.clientTop||c&&c.clientTop||0)),!a.relatedTarget&&g&&(a.relatedTarget=g===a.target?b.toElement:g),a.which||void 0===f||(a.which=1&f?1:2&f?3:4&f?2:0),a}},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==ca()&&this.focus)try{return this.focus(),!1}catch(a){}},delegateType:"focusin"},blur:{trigger:function(){return this===ca()&&this.blur?(this.blur(),!1):void 0},delegateType:"focusout"},click:{trigger:function(){return m.nodeName(this,"input")&&"checkbox"===this.type&&this.click?(this.click(),!1):void 0},_default:function(a){return m.nodeName(a.target,"a")}},beforeunload:{postDispatch:function(a){void 0!==a.result&&a.originalEvent&&(a.originalEvent.returnValue=a.result)}}},simulate:function(a,b,c,d){var e=m.extend(new m.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?m.event.trigger(e,null,b):m.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},m.removeEvent=y.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){var d="on"+b;a.detachEvent&&(typeof a[d]===K&&(a[d]=null),a.detachEvent(d,c))},m.Event=function(a,b){return this instanceof m.Event?(a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||void 0===a.defaultPrevented&&a.returnValue===!1?aa:ba):this.type=a,b&&m.extend(this,b),this.timeStamp=a&&a.timeStamp||m.now(),void(this[m.expando]=!0)):new m.Event(a,b)},m.Event.prototype={isDefaultPrevented:ba,isPropagationStopped:ba,isImmediatePropagationStopped:ba,preventDefault:function(){var a=this.originalEvent;this.isDefaultPrevented=aa,a&&(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){var a=this.originalEvent;this.isPropagationStopped=aa,a&&(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){var a=this.originalEvent;this.isImmediatePropagationStopped=aa,a&&a.stopImmediatePropagation&&a.stopImmediatePropagation(),this.stopPropagation()}},m.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(a,b){m.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c,d=this,e=a.relatedTarget,f=a.handleObj;return(!e||e!==d&&!m.contains(d,e))&&(a.type=f.origType,c=f.handler.apply(this,arguments),a.type=b),c}}}),k.submitBubbles||(m.event.special.submit={setup:function(){return m.nodeName(this,"form")?!1:void m.event.add(this,"click._submit keypress._submit",function(a){var b=a.target,c=m.nodeName(b,"input")||m.nodeName(b,"button")?b.form:void 0;c&&!m._data(c,"submitBubbles")&&(m.event.add(c,"submit._submit",function(a){a._submit_bubble=!0}),m._data(c,"submitBubbles",!0))})},postDispatch:function(a){a._submit_bubble&&(delete a._submit_bubble,this.parentNode&&!a.isTrigger&&m.event.simulate("submit",this.parentNode,a,!0))},teardown:function(){return m.nodeName(this,"form")?!1:void m.event.remove(this,"._submit")}}),k.changeBubbles||(m.event.special.change={setup:function(){return X.test(this.nodeName)?(("checkbox"===this.type||"radio"===this.type)&&(m.event.add(this,"propertychange._change",function(a){"checked"===a.originalEvent.propertyName&&(this._just_changed=!0)}),m.event.add(this,"click._change",function(a){this._just_changed&&!a.isTrigger&&(this._just_changed=!1),m.event.simulate("change",this,a,!0)})),!1):void m.event.add(this,"beforeactivate._change",function(a){var b=a.target;X.test(b.nodeName)&&!m._data(b,"changeBubbles")&&(m.event.add(b,"change._change",function(a){!this.parentNode||a.isSimulated||a.isTrigger||m.event.simulate("change",this.parentNode,a,!0)}),m._data(b,"changeBubbles",!0))})},handle:function(a){var b=a.target;return this!==b||a.isSimulated||a.isTrigger||"radio"!==b.type&&"checkbox"!==b.type?a.handleObj.handler.apply(this,arguments):void 0},teardown:function(){return m.event.remove(this,"._change"),!X.test(this.nodeName)}}),k.focusinBubbles||m.each({focus:"focusin",blur:"focusout"},function(a,b){var c=function(a){m.event.simulate(b,a.target,m.event.fix(a),!0)};m.event.special[b]={setup:function(){var d=this.ownerDocument||this,e=m._data(d,b);e||d.addEventListener(a,c,!0),m._data(d,b,(e||0)+1)},teardown:function(){var d=this.ownerDocument||this,e=m._data(d,b)-1;e?m._data(d,b,e):(d.removeEventListener(a,c,!0),m._removeData(d,b))}}}),m.fn.extend({on:function(a,b,c,d,e){var f,g;if("object"==typeof a){"string"!=typeof b&&(c=c||b,b=void 0);for(f in a)this.on(f,b,c,a[f],e);return this}if(null==c&&null==d?(d=b,c=b=void 0):null==d&&("string"==typeof b?(d=c,c=void 0):(d=c,c=b,b=void 0)),d===!1)d=ba;else if(!d)return this;return 1===e&&(g=d,d=function(a){return m().off(a),g.apply(this,arguments)},d.guid=g.guid||(g.guid=m.guid++)),this.each(function(){m.event.add(this,a,d,c,b)})},one:function(a,b,c,d){return this.on(a,b,c,d,1)},off:function(a,b,c){var d,e;if(a&&a.preventDefault&&a.handleObj)return d=a.handleObj,m(a.delegateTarget).off(d.namespace?d.origType+"."+d.namespace:d.origType,d.selector,d.handler),this;if("object"==typeof a){for(e in a)this.off(e,b,a[e]);return this}return(b===!1||"function"==typeof b)&&(c=b,b=void 0),c===!1&&(c=ba),this.each(function(){m.event.remove(this,a,c,b)})},trigger:function(a,b){return this.each(function(){m.event.trigger(a,b,this)})},triggerHandler:function(a,b){var c=this[0];return c?m.event.trigger(a,b,c,!0):void 0}});function da(a){var b=ea.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}var ea="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",fa=/ jQuery\d+="(?:null|\d+)"/g,ga=new RegExp("<(?:"+ea+")[\\s/>]","i"),ha=/^\s+/,ia=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,ja=/<([\w:]+)/,ka=/<tbody/i,la=/<|&#?\w+;/,ma=/<(?:script|style|link)/i,na=/checked\s*(?:[^=]|=\s*.checked.)/i,oa=/^$|\/(?:java|ecma)script/i,pa=/^true\/(.*)/,qa=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,ra={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],area:[1,"<map>","</map>"],param:[1,"<object>","</object>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:k.htmlSerialize?[0,"",""]:[1,"X<div>","</div>"]},sa=da(y),ta=sa.appendChild(y.createElement("div"));ra.optgroup=ra.option,ra.tbody=ra.tfoot=ra.colgroup=ra.caption=ra.thead,ra.th=ra.td;function ua(a,b){var c,d,e=0,f=typeof a.getElementsByTagName!==K?a.getElementsByTagName(b||"*"):typeof a.querySelectorAll!==K?a.querySelectorAll(b||"*"):void 0;if(!f)for(f=[],c=a.childNodes||a;null!=(d=c[e]);e++)!b||m.nodeName(d,b)?f.push(d):m.merge(f,ua(d,b));return void 0===b||b&&m.nodeName(a,b)?m.merge([a],f):f}function va(a){W.test(a.type)&&(a.defaultChecked=a.checked)}function wa(a,b){return m.nodeName(a,"table")&&m.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function xa(a){return a.type=(null!==m.find.attr(a,"type"))+"/"+a.type,a}function ya(a){var b=pa.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function za(a,b){for(var c,d=0;null!=(c=a[d]);d++)m._data(c,"globalEval",!b||m._data(b[d],"globalEval"))}function Aa(a,b){if(1===b.nodeType&&m.hasData(a)){var c,d,e,f=m._data(a),g=m._data(b,f),h=f.events;if(h){delete g.handle,g.events={};for(c in h)for(d=0,e=h[c].length;e>d;d++)m.event.add(b,c,h[c][d])}g.data&&(g.data=m.extend({},g.data))}}function Ba(a,b){var c,d,e;if(1===b.nodeType){if(c=b.nodeName.toLowerCase(),!k.noCloneEvent&&b[m.expando]){e=m._data(b);for(d in e.events)m.removeEvent(b,d,e.handle);b.removeAttribute(m.expando)}"script"===c&&b.text!==a.text?(xa(b).text=a.text,ya(b)):"object"===c?(b.parentNode&&(b.outerHTML=a.outerHTML),k.html5Clone&&a.innerHTML&&!m.trim(b.innerHTML)&&(b.innerHTML=a.innerHTML)):"input"===c&&W.test(a.type)?(b.defaultChecked=b.checked=a.checked,b.value!==a.value&&(b.value=a.value)):"option"===c?b.defaultSelected=b.selected=a.defaultSelected:("input"===c||"textarea"===c)&&(b.defaultValue=a.defaultValue)}}m.extend({clone:function(a,b,c){var d,e,f,g,h,i=m.contains(a.ownerDocument,a);if(k.html5Clone||m.isXMLDoc(a)||!ga.test("<"+a.nodeName+">")?f=a.cloneNode(!0):(ta.innerHTML=a.outerHTML,ta.removeChild(f=ta.firstChild)),!(k.noCloneEvent&&k.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||m.isXMLDoc(a)))for(d=ua(f),h=ua(a),g=0;null!=(e=h[g]);++g)d[g]&&Ba(e,d[g]);if(b)if(c)for(h=h||ua(a),d=d||ua(f),g=0;null!=(e=h[g]);g++)Aa(e,d[g]);else Aa(a,f);return d=ua(f,"script"),d.length>0&&za(d,!i&&ua(a,"script")),d=h=e=null,f},buildFragment:function(a,b,c,d){for(var e,f,g,h,i,j,l,n=a.length,o=da(b),p=[],q=0;n>q;q++)if(f=a[q],f||0===f)if("object"===m.type(f))m.merge(p,f.nodeType?[f]:f);else if(la.test(f)){h=h||o.appendChild(b.createElement("div")),i=(ja.exec(f)||["",""])[1].toLowerCase(),l=ra[i]||ra._default,h.innerHTML=l[1]+f.replace(ia,"<$1></$2>")+l[2],e=l[0];while(e--)h=h.lastChild;if(!k.leadingWhitespace&&ha.test(f)&&p.push(b.createTextNode(ha.exec(f)[0])),!k.tbody){f="table"!==i||ka.test(f)?"<table>"!==l[1]||ka.test(f)?0:h:h.firstChild,e=f&&f.childNodes.length;while(e--)m.nodeName(j=f.childNodes[e],"tbody")&&!j.childNodes.length&&f.removeChild(j)}m.merge(p,h.childNodes),h.textContent="";while(h.firstChild)h.removeChild(h.firstChild);h=o.lastChild}else p.push(b.createTextNode(f));h&&o.removeChild(h),k.appendChecked||m.grep(ua(p,"input"),va),q=0;while(f=p[q++])if((!d||-1===m.inArray(f,d))&&(g=m.contains(f.ownerDocument,f),h=ua(o.appendChild(f),"script"),g&&za(h),c)){e=0;while(f=h[e++])oa.test(f.type||"")&&c.push(f)}return h=null,o},cleanData:function(a,b){for(var d,e,f,g,h=0,i=m.expando,j=m.cache,l=k.deleteExpando,n=m.event.special;null!=(d=a[h]);h++)if((b||m.acceptData(d))&&(f=d[i],g=f&&j[f])){if(g.events)for(e in g.events)n[e]?m.event.remove(d,e):m.removeEvent(d,e,g.handle);j[f]&&(delete j[f],l?delete d[i]:typeof d.removeAttribute!==K?d.removeAttribute(i):d[i]=null,c.push(f))}}}),m.fn.extend({text:function(a){return V(this,function(a){return void 0===a?m.text(this):this.empty().append((this[0]&&this[0].ownerDocument||y).createTextNode(a))},null,a,arguments.length)},append:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=wa(this,a);b.appendChild(a)}})},prepend:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=wa(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},remove:function(a,b){for(var c,d=a?m.filter(a,this):this,e=0;null!=(c=d[e]);e++)b||1!==c.nodeType||m.cleanData(ua(c)),c.parentNode&&(b&&m.contains(c.ownerDocument,c)&&za(ua(c,"script")),c.parentNode.removeChild(c));return this},empty:function(){for(var a,b=0;null!=(a=this[b]);b++){1===a.nodeType&&m.cleanData(ua(a,!1));while(a.firstChild)a.removeChild(a.firstChild);a.options&&m.nodeName(a,"select")&&(a.options.length=0)}return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return m.clone(this,a,b)})},html:function(a){return V(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a)return 1===b.nodeType?b.innerHTML.replace(fa,""):void 0;if(!("string"!=typeof a||ma.test(a)||!k.htmlSerialize&&ga.test(a)||!k.leadingWhitespace&&ha.test(a)||ra[(ja.exec(a)||["",""])[1].toLowerCase()])){a=a.replace(ia,"<$1></$2>");try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(m.cleanData(ua(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=arguments[0];return this.domManip(arguments,function(b){a=this.parentNode,m.cleanData(ua(this)),a&&a.replaceChild(b,this)}),a&&(a.length||a.nodeType)?this:this.remove()},detach:function(a){return this.remove(a,!0)},domManip:function(a,b){a=e.apply([],a);var c,d,f,g,h,i,j=0,l=this.length,n=this,o=l-1,p=a[0],q=m.isFunction(p);if(q||l>1&&"string"==typeof p&&!k.checkClone&&na.test(p))return this.each(function(c){var d=n.eq(c);q&&(a[0]=p.call(this,c,d.html())),d.domManip(a,b)});if(l&&(i=m.buildFragment(a,this[0].ownerDocument,!1,this),c=i.firstChild,1===i.childNodes.length&&(i=c),c)){for(g=m.map(ua(i,"script"),xa),f=g.length;l>j;j++)d=i,j!==o&&(d=m.clone(d,!0,!0),f&&m.merge(g,ua(d,"script"))),b.call(this[j],d,j);if(f)for(h=g[g.length-1].ownerDocument,m.map(g,ya),j=0;f>j;j++)d=g[j],oa.test(d.type||"")&&!m._data(d,"globalEval")&&m.contains(h,d)&&(d.src?m._evalUrl&&m._evalUrl(d.src):m.globalEval((d.text||d.textContent||d.innerHTML||"").replace(qa,"")));i=c=null}return this}}),m.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){m.fn[a]=function(a){for(var c,d=0,e=[],g=m(a),h=g.length-1;h>=d;d++)c=d===h?this:this.clone(!0),m(g[d])[b](c),f.apply(e,c.get());return this.pushStack(e)}});var Ca,Da={};function Ea(b,c){var d,e=m(c.createElement(b)).appendTo(c.body),f=a.getDefaultComputedStyle&&(d=a.getDefaultComputedStyle(e[0]))?d.display:m.css(e[0],"display");return e.detach(),f}function Fa(a){var b=y,c=Da[a];return c||(c=Ea(a,b),"none"!==c&&c||(Ca=(Ca||m("<iframe frameborder='0' width='0' height='0'/>")).appendTo(b.documentElement),b=(Ca[0].contentWindow||Ca[0].contentDocument).document,b.write(),b.close(),c=Ea(a,b),Ca.detach()),Da[a]=c),c}!function(){var a;k.shrinkWrapBlocks=function(){if(null!=a)return a;a=!1;var b,c,d;return c=y.getElementsByTagName("body")[0],c&&c.style?(b=y.createElement("div"),d=y.createElement("div"),d.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",c.appendChild(d).appendChild(b),typeof b.style.zoom!==K&&(b.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:1px;width:1px;zoom:1",b.appendChild(y.createElement("div")).style.width="5px",a=3!==b.offsetWidth),c.removeChild(d),a):void 0}}();var Ga=/^margin/,Ha=new RegExp("^("+S+")(?!px)[a-z%]+$","i"),Ia,Ja,Ka=/^(top|right|bottom|left)$/;a.getComputedStyle?(Ia=function(b){return b.ownerDocument.defaultView.opener?b.ownerDocument.defaultView.getComputedStyle(b,null):a.getComputedStyle(b,null)},Ja=function(a,b,c){var d,e,f,g,h=a.style;return c=c||Ia(a),g=c?c.getPropertyValue(b)||c[b]:void 0,c&&(""!==g||m.contains(a.ownerDocument,a)||(g=m.style(a,b)),Ha.test(g)&&Ga.test(b)&&(d=h.width,e=h.minWidth,f=h.maxWidth,h.minWidth=h.maxWidth=h.width=g,g=c.width,h.width=d,h.minWidth=e,h.maxWidth=f)),void 0===g?g:g+""}):y.documentElement.currentStyle&&(Ia=function(a){return a.currentStyle},Ja=function(a,b,c){var d,e,f,g,h=a.style;return c=c||Ia(a),g=c?c[b]:void 0,null==g&&h&&h[b]&&(g=h[b]),Ha.test(g)&&!Ka.test(b)&&(d=h.left,e=a.runtimeStyle,f=e&&e.left,f&&(e.left=a.currentStyle.left),h.left="fontSize"===b?"1em":g,g=h.pixelLeft+"px",h.left=d,f&&(e.left=f)),void 0===g?g:g+""||"auto"});function La(a,b){return{get:function(){var c=a();if(null!=c)return c?void delete this.get:(this.get=b).apply(this,arguments)}}}!function(){var b,c,d,e,f,g,h;if(b=y.createElement("div"),b.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",d=b.getElementsByTagName("a")[0],c=d&&d.style){c.cssText="float:left;opacity:.5",k.opacity="0.5"===c.opacity,k.cssFloat=!!c.cssFloat,b.style.backgroundClip="content-box",b.cloneNode(!0).style.backgroundClip="",k.clearCloneStyle="content-box"===b.style.backgroundClip,k.boxSizing=""===c.boxSizing||""===c.MozBoxSizing||""===c.WebkitBoxSizing,m.extend(k,{reliableHiddenOffsets:function(){return null==g&&i(),g},boxSizingReliable:function(){return null==f&&i(),f},pixelPosition:function(){return null==e&&i(),e},reliableMarginRight:function(){return null==h&&i(),h}});function i(){var b,c,d,i;c=y.getElementsByTagName("body")[0],c&&c.style&&(b=y.createElement("div"),d=y.createElement("div"),d.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",c.appendChild(d).appendChild(b),b.style.cssText="-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;display:block;margin-top:1%;top:1%;border:1px;padding:1px;width:4px;position:absolute",e=f=!1,h=!0,a.getComputedStyle&&(e="1%"!==(a.getComputedStyle(b,null)||{}).top,f="4px"===(a.getComputedStyle(b,null)||{width:"4px"}).width,i=b.appendChild(y.createElement("div")),i.style.cssText=b.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:0",i.style.marginRight=i.style.width="0",b.style.width="1px",h=!parseFloat((a.getComputedStyle(i,null)||{}).marginRight),b.removeChild(i)),b.innerHTML="<table><tr><td></td><td>t</td></tr></table>",i=b.getElementsByTagName("td"),i[0].style.cssText="margin:0;border:0;padding:0;display:none",g=0===i[0].offsetHeight,g&&(i[0].style.display="",i[1].style.display="none",g=0===i[0].offsetHeight),c.removeChild(d))}}}(),m.swap=function(a,b,c,d){var e,f,g={};for(f in b)g[f]=a.style[f],a.style[f]=b[f];e=c.apply(a,d||[]);for(f in b)a.style[f]=g[f];return e};var Ma=/alpha\([^)]*\)/i,Na=/opacity\s*=\s*([^)]*)/,Oa=/^(none|table(?!-c[ea]).+)/,Pa=new RegExp("^("+S+")(.*)$","i"),Qa=new RegExp("^([+-])=("+S+")","i"),Ra={position:"absolute",visibility:"hidden",display:"block"},Sa={letterSpacing:"0",fontWeight:"400"},Ta=["Webkit","O","Moz","ms"];function Ua(a,b){if(b in a)return b;var c=b.charAt(0).toUpperCase()+b.slice(1),d=b,e=Ta.length;while(e--)if(b=Ta[e]+c,b in a)return b;return d}function Va(a,b){for(var c,d,e,f=[],g=0,h=a.length;h>g;g++)d=a[g],d.style&&(f[g]=m._data(d,"olddisplay"),c=d.style.display,b?(f[g]||"none"!==c||(d.style.display=""),""===d.style.display&&U(d)&&(f[g]=m._data(d,"olddisplay",Fa(d.nodeName)))):(e=U(d),(c&&"none"!==c||!e)&&m._data(d,"olddisplay",e?c:m.css(d,"display"))));for(g=0;h>g;g++)d=a[g],d.style&&(b&&"none"!==d.style.display&&""!==d.style.display||(d.style.display=b?f[g]||"":"none"));return a}function Wa(a,b,c){var d=Pa.exec(b);return d?Math.max(0,d[1]-(c||0))+(d[2]||"px"):b}function Xa(a,b,c,d,e){for(var f=c===(d?"border":"content")?4:"width"===b?1:0,g=0;4>f;f+=2)"margin"===c&&(g+=m.css(a,c+T[f],!0,e)),d?("content"===c&&(g-=m.css(a,"padding"+T[f],!0,e)),"margin"!==c&&(g-=m.css(a,"border"+T[f]+"Width",!0,e))):(g+=m.css(a,"padding"+T[f],!0,e),"padding"!==c&&(g+=m.css(a,"border"+T[f]+"Width",!0,e)));return g}function Ya(a,b,c){var d=!0,e="width"===b?a.offsetWidth:a.offsetHeight,f=Ia(a),g=k.boxSizing&&"border-box"===m.css(a,"boxSizing",!1,f);if(0>=e||null==e){if(e=Ja(a,b,f),(0>e||null==e)&&(e=a.style[b]),Ha.test(e))return e;d=g&&(k.boxSizingReliable()||e===a.style[b]),e=parseFloat(e)||0}return e+Xa(a,b,c||(g?"border":"content"),d,f)+"px"}m.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=Ja(a,"opacity");return""===c?"1":c}}}},cssNumber:{columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":k.cssFloat?"cssFloat":"styleFloat"},style:function(a,b,c,d){if(a&&3!==a.nodeType&&8!==a.nodeType&&a.style){var e,f,g,h=m.camelCase(b),i=a.style;if(b=m.cssProps[h]||(m.cssProps[h]=Ua(i,h)),g=m.cssHooks[b]||m.cssHooks[h],void 0===c)return g&&"get"in g&&void 0!==(e=g.get(a,!1,d))?e:i[b];if(f=typeof c,"string"===f&&(e=Qa.exec(c))&&(c=(e[1]+1)*e[2]+parseFloat(m.css(a,b)),f="number"),null!=c&&c===c&&("number"!==f||m.cssNumber[h]||(c+="px"),k.clearCloneStyle||""!==c||0!==b.indexOf("background")||(i[b]="inherit"),!(g&&"set"in g&&void 0===(c=g.set(a,c,d)))))try{i[b]=c}catch(j){}}},css:function(a,b,c,d){var e,f,g,h=m.camelCase(b);return b=m.cssProps[h]||(m.cssProps[h]=Ua(a.style,h)),g=m.cssHooks[b]||m.cssHooks[h],g&&"get"in g&&(f=g.get(a,!0,c)),void 0===f&&(f=Ja(a,b,d)),"normal"===f&&b in Sa&&(f=Sa[b]),""===c||c?(e=parseFloat(f),c===!0||m.isNumeric(e)?e||0:f):f}}),m.each(["height","width"],function(a,b){m.cssHooks[b]={get:function(a,c,d){return c?Oa.test(m.css(a,"display"))&&0===a.offsetWidth?m.swap(a,Ra,function(){return Ya(a,b,d)}):Ya(a,b,d):void 0},set:function(a,c,d){var e=d&&Ia(a);return Wa(a,c,d?Xa(a,b,d,k.boxSizing&&"border-box"===m.css(a,"boxSizing",!1,e),e):0)}}}),k.opacity||(m.cssHooks.opacity={get:function(a,b){return Na.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=m.isNumeric(b)?"alpha(opacity="+100*b+")":"",f=d&&d.filter||c.filter||"";c.zoom=1,(b>=1||""===b)&&""===m.trim(f.replace(Ma,""))&&c.removeAttribute&&(c.removeAttribute("filter"),""===b||d&&!d.filter)||(c.filter=Ma.test(f)?f.replace(Ma,e):f+" "+e)}}),m.cssHooks.marginRight=La(k.reliableMarginRight,function(a,b){return b?m.swap(a,{display:"inline-block"},Ja,[a,"marginRight"]):void 0}),m.each({margin:"",padding:"",border:"Width"},function(a,b){m.cssHooks[a+b]={expand:function(c){for(var d=0,e={},f="string"==typeof c?c.split(" "):[c];4>d;d++)e[a+T[d]+b]=f[d]||f[d-2]||f[0];return e}},Ga.test(a)||(m.cssHooks[a+b].set=Wa)}),m.fn.extend({css:function(a,b){return V(this,function(a,b,c){var d,e,f={},g=0;if(m.isArray(b)){for(d=Ia(a),e=b.length;e>g;g++)f[b[g]]=m.css(a,b[g],!1,d);return f}return void 0!==c?m.style(a,b,c):m.css(a,b)},a,b,arguments.length>1)},show:function(){return Va(this,!0)},hide:function(){return Va(this)},toggle:function(a){return"boolean"==typeof a?a?this.show():this.hide():this.each(function(){U(this)?m(this).show():m(this).hide()})}});function Za(a,b,c,d,e){
+return new Za.prototype.init(a,b,c,d,e)}m.Tween=Za,Za.prototype={constructor:Za,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||"swing",this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(m.cssNumber[c]?"":"px")},cur:function(){var a=Za.propHooks[this.prop];return a&&a.get?a.get(this):Za.propHooks._default.get(this)},run:function(a){var b,c=Za.propHooks[this.prop];return this.options.duration?this.pos=b=m.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):this.pos=b=a,this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):Za.propHooks._default.set(this),this}},Za.prototype.init.prototype=Za.prototype,Za.propHooks={_default:{get:function(a){var b;return null==a.elem[a.prop]||a.elem.style&&null!=a.elem.style[a.prop]?(b=m.css(a.elem,a.prop,""),b&&"auto"!==b?b:0):a.elem[a.prop]},set:function(a){m.fx.step[a.prop]?m.fx.step[a.prop](a):a.elem.style&&(null!=a.elem.style[m.cssProps[a.prop]]||m.cssHooks[a.prop])?m.style(a.elem,a.prop,a.now+a.unit):a.elem[a.prop]=a.now}}},Za.propHooks.scrollTop=Za.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},m.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2}},m.fx=Za.prototype.init,m.fx.step={};var $a,_a,ab=/^(?:toggle|show|hide)$/,bb=new RegExp("^(?:([+-])=|)("+S+")([a-z%]*)$","i"),cb=/queueHooks$/,db=[ib],eb={"*":[function(a,b){var c=this.createTween(a,b),d=c.cur(),e=bb.exec(b),f=e&&e[3]||(m.cssNumber[a]?"":"px"),g=(m.cssNumber[a]||"px"!==f&&+d)&&bb.exec(m.css(c.elem,a)),h=1,i=20;if(g&&g[3]!==f){f=f||g[3],e=e||[],g=+d||1;do h=h||".5",g/=h,m.style(c.elem,a,g+f);while(h!==(h=c.cur()/d)&&1!==h&&--i)}return e&&(g=c.start=+g||+d||0,c.unit=f,c.end=e[1]?g+(e[1]+1)*e[2]:+e[2]),c}]};function fb(){return setTimeout(function(){$a=void 0}),$a=m.now()}function gb(a,b){var c,d={height:a},e=0;for(b=b?1:0;4>e;e+=2-b)c=T[e],d["margin"+c]=d["padding"+c]=a;return b&&(d.opacity=d.width=a),d}function hb(a,b,c){for(var d,e=(eb[b]||[]).concat(eb["*"]),f=0,g=e.length;g>f;f++)if(d=e[f].call(c,b,a))return d}function ib(a,b,c){var d,e,f,g,h,i,j,l,n=this,o={},p=a.style,q=a.nodeType&&U(a),r=m._data(a,"fxshow");c.queue||(h=m._queueHooks(a,"fx"),null==h.unqueued&&(h.unqueued=0,i=h.empty.fire,h.empty.fire=function(){h.unqueued||i()}),h.unqueued++,n.always(function(){n.always(function(){h.unqueued--,m.queue(a,"fx").length||h.empty.fire()})})),1===a.nodeType&&("height"in b||"width"in b)&&(c.overflow=[p.overflow,p.overflowX,p.overflowY],j=m.css(a,"display"),l="none"===j?m._data(a,"olddisplay")||Fa(a.nodeName):j,"inline"===l&&"none"===m.css(a,"float")&&(k.inlineBlockNeedsLayout&&"inline"!==Fa(a.nodeName)?p.zoom=1:p.display="inline-block")),c.overflow&&(p.overflow="hidden",k.shrinkWrapBlocks()||n.always(function(){p.overflow=c.overflow[0],p.overflowX=c.overflow[1],p.overflowY=c.overflow[2]}));for(d in b)if(e=b[d],ab.exec(e)){if(delete b[d],f=f||"toggle"===e,e===(q?"hide":"show")){if("show"!==e||!r||void 0===r[d])continue;q=!0}o[d]=r&&r[d]||m.style(a,d)}else j=void 0;if(m.isEmptyObject(o))"inline"===("none"===j?Fa(a.nodeName):j)&&(p.display=j);else{r?"hidden"in r&&(q=r.hidden):r=m._data(a,"fxshow",{}),f&&(r.hidden=!q),q?m(a).show():n.done(function(){m(a).hide()}),n.done(function(){var b;m._removeData(a,"fxshow");for(b in o)m.style(a,b,o[b])});for(d in o)g=hb(q?r[d]:0,d,n),d in r||(r[d]=g.start,q&&(g.end=g.start,g.start="width"===d||"height"===d?1:0))}}function jb(a,b){var c,d,e,f,g;for(c in a)if(d=m.camelCase(c),e=b[d],f=a[c],m.isArray(f)&&(e=f[1],f=a[c]=f[0]),c!==d&&(a[d]=f,delete a[c]),g=m.cssHooks[d],g&&"expand"in g){f=g.expand(f),delete a[d];for(c in f)c in a||(a[c]=f[c],b[c]=e)}else b[d]=e}function kb(a,b,c){var d,e,f=0,g=db.length,h=m.Deferred().always(function(){delete i.elem}),i=function(){if(e)return!1;for(var b=$a||fb(),c=Math.max(0,j.startTime+j.duration-b),d=c/j.duration||0,f=1-d,g=0,i=j.tweens.length;i>g;g++)j.tweens[g].run(f);return h.notifyWith(a,[j,f,c]),1>f&&i?c:(h.resolveWith(a,[j]),!1)},j=h.promise({elem:a,props:m.extend({},b),opts:m.extend(!0,{specialEasing:{}},c),originalProperties:b,originalOptions:c,startTime:$a||fb(),duration:c.duration,tweens:[],createTween:function(b,c){var d=m.Tween(a,j.opts,b,c,j.opts.specialEasing[b]||j.opts.easing);return j.tweens.push(d),d},stop:function(b){var c=0,d=b?j.tweens.length:0;if(e)return this;for(e=!0;d>c;c++)j.tweens[c].run(1);return b?h.resolveWith(a,[j,b]):h.rejectWith(a,[j,b]),this}}),k=j.props;for(jb(k,j.opts.specialEasing);g>f;f++)if(d=db[f].call(j,a,k,j.opts))return d;return m.map(k,hb,j),m.isFunction(j.opts.start)&&j.opts.start.call(a,j),m.fx.timer(m.extend(i,{elem:a,anim:j,queue:j.opts.queue})),j.progress(j.opts.progress).done(j.opts.done,j.opts.complete).fail(j.opts.fail).always(j.opts.always)}m.Animation=m.extend(kb,{tweener:function(a,b){m.isFunction(a)?(b=a,a=["*"]):a=a.split(" ");for(var c,d=0,e=a.length;e>d;d++)c=a[d],eb[c]=eb[c]||[],eb[c].unshift(b)},prefilter:function(a,b){b?db.unshift(a):db.push(a)}}),m.speed=function(a,b,c){var d=a&&"object"==typeof a?m.extend({},a):{complete:c||!c&&b||m.isFunction(a)&&a,duration:a,easing:c&&b||b&&!m.isFunction(b)&&b};return d.duration=m.fx.off?0:"number"==typeof d.duration?d.duration:d.duration in m.fx.speeds?m.fx.speeds[d.duration]:m.fx.speeds._default,(null==d.queue||d.queue===!0)&&(d.queue="fx"),d.old=d.complete,d.complete=function(){m.isFunction(d.old)&&d.old.call(this),d.queue&&m.dequeue(this,d.queue)},d},m.fn.extend({fadeTo:function(a,b,c,d){return this.filter(U).css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=m.isEmptyObject(a),f=m.speed(b,c,d),g=function(){var b=kb(this,m.extend({},a),f);(e||m._data(this,"finish"))&&b.stop(!0)};return g.finish=g,e||f.queue===!1?this.each(g):this.queue(f.queue,g)},stop:function(a,b,c){var d=function(a){var b=a.stop;delete a.stop,b(c)};return"string"!=typeof a&&(c=b,b=a,a=void 0),b&&a!==!1&&this.queue(a||"fx",[]),this.each(function(){var b=!0,e=null!=a&&a+"queueHooks",f=m.timers,g=m._data(this);if(e)g[e]&&g[e].stop&&d(g[e]);else for(e in g)g[e]&&g[e].stop&&cb.test(e)&&d(g[e]);for(e=f.length;e--;)f[e].elem!==this||null!=a&&f[e].queue!==a||(f[e].anim.stop(c),b=!1,f.splice(e,1));(b||!c)&&m.dequeue(this,a)})},finish:function(a){return a!==!1&&(a=a||"fx"),this.each(function(){var b,c=m._data(this),d=c[a+"queue"],e=c[a+"queueHooks"],f=m.timers,g=d?d.length:0;for(c.finish=!0,m.queue(this,a,[]),e&&e.stop&&e.stop.call(this,!0),b=f.length;b--;)f[b].elem===this&&f[b].queue===a&&(f[b].anim.stop(!0),f.splice(b,1));for(b=0;g>b;b++)d[b]&&d[b].finish&&d[b].finish.call(this);delete c.finish})}}),m.each(["toggle","show","hide"],function(a,b){var c=m.fn[b];m.fn[b]=function(a,d,e){return null==a||"boolean"==typeof a?c.apply(this,arguments):this.animate(gb(b,!0),a,d,e)}}),m.each({slideDown:gb("show"),slideUp:gb("hide"),slideToggle:gb("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){m.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),m.timers=[],m.fx.tick=function(){var a,b=m.timers,c=0;for($a=m.now();c<b.length;c++)a=b[c],a()||b[c]!==a||b.splice(c--,1);b.length||m.fx.stop(),$a=void 0},m.fx.timer=function(a){m.timers.push(a),a()?m.fx.start():m.timers.pop()},m.fx.interval=13,m.fx.start=function(){_a||(_a=setInterval(m.fx.tick,m.fx.interval))},m.fx.stop=function(){clearInterval(_a),_a=null},m.fx.speeds={slow:600,fast:200,_default:400},m.fn.delay=function(a,b){return a=m.fx?m.fx.speeds[a]||a:a,b=b||"fx",this.queue(b,function(b,c){var d=setTimeout(b,a);c.stop=function(){clearTimeout(d)}})},function(){var a,b,c,d,e;b=y.createElement("div"),b.setAttribute("className","t"),b.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",d=b.getElementsByTagName("a")[0],c=y.createElement("select"),e=c.appendChild(y.createElement("option")),a=b.getElementsByTagName("input")[0],d.style.cssText="top:1px",k.getSetAttribute="t"!==b.className,k.style=/top/.test(d.getAttribute("style")),k.hrefNormalized="/a"===d.getAttribute("href"),k.checkOn=!!a.value,k.optSelected=e.selected,k.enctype=!!y.createElement("form").enctype,c.disabled=!0,k.optDisabled=!e.disabled,a=y.createElement("input"),a.setAttribute("value",""),k.input=""===a.getAttribute("value"),a.value="t",a.setAttribute("type","radio"),k.radioValue="t"===a.value}();var lb=/\r/g;m.fn.extend({val:function(a){var b,c,d,e=this[0];{if(arguments.length)return d=m.isFunction(a),this.each(function(c){var e;1===this.nodeType&&(e=d?a.call(this,c,m(this).val()):a,null==e?e="":"number"==typeof e?e+="":m.isArray(e)&&(e=m.map(e,function(a){return null==a?"":a+""})),b=m.valHooks[this.type]||m.valHooks[this.nodeName.toLowerCase()],b&&"set"in b&&void 0!==b.set(this,e,"value")||(this.value=e))});if(e)return b=m.valHooks[e.type]||m.valHooks[e.nodeName.toLowerCase()],b&&"get"in b&&void 0!==(c=b.get(e,"value"))?c:(c=e.value,"string"==typeof c?c.replace(lb,""):null==c?"":c)}}}),m.extend({valHooks:{option:{get:function(a){var b=m.find.attr(a,"value");return null!=b?b:m.trim(m.text(a))}},select:{get:function(a){for(var b,c,d=a.options,e=a.selectedIndex,f="select-one"===a.type||0>e,g=f?null:[],h=f?e+1:d.length,i=0>e?h:f?e:0;h>i;i++)if(c=d[i],!(!c.selected&&i!==e||(k.optDisabled?c.disabled:null!==c.getAttribute("disabled"))||c.parentNode.disabled&&m.nodeName(c.parentNode,"optgroup"))){if(b=m(c).val(),f)return b;g.push(b)}return g},set:function(a,b){var c,d,e=a.options,f=m.makeArray(b),g=e.length;while(g--)if(d=e[g],m.inArray(m.valHooks.option.get(d),f)>=0)try{d.selected=c=!0}catch(h){d.scrollHeight}else d.selected=!1;return c||(a.selectedIndex=-1),e}}}}),m.each(["radio","checkbox"],function(){m.valHooks[this]={set:function(a,b){return m.isArray(b)?a.checked=m.inArray(m(a).val(),b)>=0:void 0}},k.checkOn||(m.valHooks[this].get=function(a){return null===a.getAttribute("value")?"on":a.value})});var mb,nb,ob=m.expr.attrHandle,pb=/^(?:checked|selected)$/i,qb=k.getSetAttribute,rb=k.input;m.fn.extend({attr:function(a,b){return V(this,m.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){m.removeAttr(this,a)})}}),m.extend({attr:function(a,b,c){var d,e,f=a.nodeType;if(a&&3!==f&&8!==f&&2!==f)return typeof a.getAttribute===K?m.prop(a,b,c):(1===f&&m.isXMLDoc(a)||(b=b.toLowerCase(),d=m.attrHooks[b]||(m.expr.match.bool.test(b)?nb:mb)),void 0===c?d&&"get"in d&&null!==(e=d.get(a,b))?e:(e=m.find.attr(a,b),null==e?void 0:e):null!==c?d&&"set"in d&&void 0!==(e=d.set(a,c,b))?e:(a.setAttribute(b,c+""),c):void m.removeAttr(a,b))},removeAttr:function(a,b){var c,d,e=0,f=b&&b.match(E);if(f&&1===a.nodeType)while(c=f[e++])d=m.propFix[c]||c,m.expr.match.bool.test(c)?rb&&qb||!pb.test(c)?a[d]=!1:a[m.camelCase("default-"+c)]=a[d]=!1:m.attr(a,c,""),a.removeAttribute(qb?c:d)},attrHooks:{type:{set:function(a,b){if(!k.radioValue&&"radio"===b&&m.nodeName(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}}}}),nb={set:function(a,b,c){return b===!1?m.removeAttr(a,c):rb&&qb||!pb.test(c)?a.setAttribute(!qb&&m.propFix[c]||c,c):a[m.camelCase("default-"+c)]=a[c]=!0,c}},m.each(m.expr.match.bool.source.match(/\w+/g),function(a,b){var c=ob[b]||m.find.attr;ob[b]=rb&&qb||!pb.test(b)?function(a,b,d){var e,f;return d||(f=ob[b],ob[b]=e,e=null!=c(a,b,d)?b.toLowerCase():null,ob[b]=f),e}:function(a,b,c){return c?void 0:a[m.camelCase("default-"+b)]?b.toLowerCase():null}}),rb&&qb||(m.attrHooks.value={set:function(a,b,c){return m.nodeName(a,"input")?void(a.defaultValue=b):mb&&mb.set(a,b,c)}}),qb||(mb={set:function(a,b,c){var d=a.getAttributeNode(c);return d||a.setAttributeNode(d=a.ownerDocument.createAttribute(c)),d.value=b+="","value"===c||b===a.getAttribute(c)?b:void 0}},ob.id=ob.name=ob.coords=function(a,b,c){var d;return c?void 0:(d=a.getAttributeNode(b))&&""!==d.value?d.value:null},m.valHooks.button={get:function(a,b){var c=a.getAttributeNode(b);return c&&c.specified?c.value:void 0},set:mb.set},m.attrHooks.contenteditable={set:function(a,b,c){mb.set(a,""===b?!1:b,c)}},m.each(["width","height"],function(a,b){m.attrHooks[b]={set:function(a,c){return""===c?(a.setAttribute(b,"auto"),c):void 0}}})),k.style||(m.attrHooks.style={get:function(a){return a.style.cssText||void 0},set:function(a,b){return a.style.cssText=b+""}});var sb=/^(?:input|select|textarea|button|object)$/i,tb=/^(?:a|area)$/i;m.fn.extend({prop:function(a,b){return V(this,m.prop,a,b,arguments.length>1)},removeProp:function(a){return a=m.propFix[a]||a,this.each(function(){try{this[a]=void 0,delete this[a]}catch(b){}})}}),m.extend({propFix:{"for":"htmlFor","class":"className"},prop:function(a,b,c){var d,e,f,g=a.nodeType;if(a&&3!==g&&8!==g&&2!==g)return f=1!==g||!m.isXMLDoc(a),f&&(b=m.propFix[b]||b,e=m.propHooks[b]),void 0!==c?e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:a[b]=c:e&&"get"in e&&null!==(d=e.get(a,b))?d:a[b]},propHooks:{tabIndex:{get:function(a){var b=m.find.attr(a,"tabindex");return b?parseInt(b,10):sb.test(a.nodeName)||tb.test(a.nodeName)&&a.href?0:-1}}}}),k.hrefNormalized||m.each(["href","src"],function(a,b){m.propHooks[b]={get:function(a){return a.getAttribute(b,4)}}}),k.optSelected||(m.propHooks.selected={get:function(a){var b=a.parentNode;return b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex),null}}),m.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){m.propFix[this.toLowerCase()]=this}),k.enctype||(m.propFix.enctype="encoding");var ub=/[\t\r\n\f]/g;m.fn.extend({addClass:function(a){var b,c,d,e,f,g,h=0,i=this.length,j="string"==typeof a&&a;if(m.isFunction(a))return this.each(function(b){m(this).addClass(a.call(this,b,this.className))});if(j)for(b=(a||"").match(E)||[];i>h;h++)if(c=this[h],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(ub," "):" ")){f=0;while(e=b[f++])d.indexOf(" "+e+" ")<0&&(d+=e+" ");g=m.trim(d),c.className!==g&&(c.className=g)}return this},removeClass:function(a){var b,c,d,e,f,g,h=0,i=this.length,j=0===arguments.length||"string"==typeof a&&a;if(m.isFunction(a))return this.each(function(b){m(this).removeClass(a.call(this,b,this.className))});if(j)for(b=(a||"").match(E)||[];i>h;h++)if(c=this[h],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(ub," "):"")){f=0;while(e=b[f++])while(d.indexOf(" "+e+" ")>=0)d=d.replace(" "+e+" "," ");g=a?m.trim(d):"",c.className!==g&&(c.className=g)}return this},toggleClass:function(a,b){var c=typeof a;return"boolean"==typeof b&&"string"===c?b?this.addClass(a):this.removeClass(a):this.each(m.isFunction(a)?function(c){m(this).toggleClass(a.call(this,c,this.className,b),b)}:function(){if("string"===c){var b,d=0,e=m(this),f=a.match(E)||[];while(b=f[d++])e.hasClass(b)?e.removeClass(b):e.addClass(b)}else(c===K||"boolean"===c)&&(this.className&&m._data(this,"__className__",this.className),this.className=this.className||a===!1?"":m._data(this,"__className__")||"")})},hasClass:function(a){for(var b=" "+a+" ",c=0,d=this.length;d>c;c++)if(1===this[c].nodeType&&(" "+this[c].className+" ").replace(ub," ").indexOf(b)>=0)return!0;return!1}}),m.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(a,b){m.fn[b]=function(a,c){return arguments.length>0?this.on(b,null,a,c):this.trigger(b)}}),m.fn.extend({hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return 1===arguments.length?this.off(a,"**"):this.off(b,a||"**",c)}});var vb=m.now(),wb=/\?/,xb=/(,)|(\[|{)|(}|])|"(?:[^"\\\r\n]|\\["\\\/bfnrt]|\\u[\da-fA-F]{4})*"\s*:?|true|false|null|-?(?!0\d)\d+(?:\.\d+|)(?:[eE][+-]?\d+|)/g;m.parseJSON=function(b){if(a.JSON&&a.JSON.parse)return a.JSON.parse(b+"");var c,d=null,e=m.trim(b+"");return e&&!m.trim(e.replace(xb,function(a,b,e,f){return c&&b&&(d=0),0===d?a:(c=e||b,d+=!f-!e,"")}))?Function("return "+e)():m.error("Invalid JSON: "+b)},m.parseXML=function(b){var c,d;if(!b||"string"!=typeof b)return null;try{a.DOMParser?(d=new DOMParser,c=d.parseFromString(b,"text/xml")):(c=new ActiveXObject("Microsoft.XMLDOM"),c.async="false",c.loadXML(b))}catch(e){c=void 0}return c&&c.documentElement&&!c.getElementsByTagName("parsererror").length||m.error("Invalid XML: "+b),c};var yb,zb,Ab=/#.*$/,Bb=/([?&])_=[^&]*/,Cb=/^(.*?):[ \t]*([^\r\n]*)\r?$/gm,Db=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Eb=/^(?:GET|HEAD)$/,Fb=/^\/\//,Gb=/^([\w.+-]+:)(?:\/\/(?:[^\/?#]*@|)([^\/?#:]*)(?::(\d+)|)|)/,Hb={},Ib={},Jb="*/".concat("*");try{zb=location.href}catch(Kb){zb=y.createElement("a"),zb.href="",zb=zb.href}yb=Gb.exec(zb.toLowerCase())||[];function Lb(a){return function(b,c){"string"!=typeof b&&(c=b,b="*");var d,e=0,f=b.toLowerCase().match(E)||[];if(m.isFunction(c))while(d=f[e++])"+"===d.charAt(0)?(d=d.slice(1)||"*",(a[d]=a[d]||[]).unshift(c)):(a[d]=a[d]||[]).push(c)}}function Mb(a,b,c,d){var e={},f=a===Ib;function g(h){var i;return e[h]=!0,m.each(a[h]||[],function(a,h){var j=h(b,c,d);return"string"!=typeof j||f||e[j]?f?!(i=j):void 0:(b.dataTypes.unshift(j),g(j),!1)}),i}return g(b.dataTypes[0])||!e["*"]&&g("*")}function Nb(a,b){var c,d,e=m.ajaxSettings.flatOptions||{};for(d in b)void 0!==b[d]&&((e[d]?a:c||(c={}))[d]=b[d]);return c&&m.extend(!0,a,c),a}function Ob(a,b,c){var d,e,f,g,h=a.contents,i=a.dataTypes;while("*"===i[0])i.shift(),void 0===e&&(e=a.mimeType||b.getResponseHeader("Content-Type"));if(e)for(g in h)if(h[g]&&h[g].test(e)){i.unshift(g);break}if(i[0]in c)f=i[0];else{for(g in c){if(!i[0]||a.converters[g+" "+i[0]]){f=g;break}d||(d=g)}f=f||d}return f?(f!==i[0]&&i.unshift(f),c[f]):void 0}function Pb(a,b,c,d){var e,f,g,h,i,j={},k=a.dataTypes.slice();if(k[1])for(g in a.converters)j[g.toLowerCase()]=a.converters[g];f=k.shift();while(f)if(a.responseFields[f]&&(c[a.responseFields[f]]=b),!i&&d&&a.dataFilter&&(b=a.dataFilter(b,a.dataType)),i=f,f=k.shift())if("*"===f)f=i;else if("*"!==i&&i!==f){if(g=j[i+" "+f]||j["* "+f],!g)for(e in j)if(h=e.split(" "),h[1]===f&&(g=j[i+" "+h[0]]||j["* "+h[0]])){g===!0?g=j[e]:j[e]!==!0&&(f=h[0],k.unshift(h[1]));break}if(g!==!0)if(g&&a["throws"])b=g(b);else try{b=g(b)}catch(l){return{state:"parsererror",error:g?l:"No conversion from "+i+" to "+f}}}return{state:"success",data:b}}m.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:zb,type:"GET",isLocal:Db.test(yb[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Jb,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":m.parseJSON,"text xml":m.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(a,b){return b?Nb(Nb(a,m.ajaxSettings),b):Nb(m.ajaxSettings,a)},ajaxPrefilter:Lb(Hb),ajaxTransport:Lb(Ib),ajax:function(a,b){"object"==typeof a&&(b=a,a=void 0),b=b||{};var c,d,e,f,g,h,i,j,k=m.ajaxSetup({},b),l=k.context||k,n=k.context&&(l.nodeType||l.jquery)?m(l):m.event,o=m.Deferred(),p=m.Callbacks("once memory"),q=k.statusCode||{},r={},s={},t=0,u="canceled",v={readyState:0,getResponseHeader:function(a){var b;if(2===t){if(!j){j={};while(b=Cb.exec(f))j[b[1].toLowerCase()]=b[2]}b=j[a.toLowerCase()]}return null==b?null:b},getAllResponseHeaders:function(){return 2===t?f:null},setRequestHeader:function(a,b){var c=a.toLowerCase();return t||(a=s[c]=s[c]||a,r[a]=b),this},overrideMimeType:function(a){return t||(k.mimeType=a),this},statusCode:function(a){var b;if(a)if(2>t)for(b in a)q[b]=[q[b],a[b]];else v.always(a[v.status]);return this},abort:function(a){var b=a||u;return i&&i.abort(b),x(0,b),this}};if(o.promise(v).complete=p.add,v.success=v.done,v.error=v.fail,k.url=((a||k.url||zb)+"").replace(Ab,"").replace(Fb,yb[1]+"//"),k.type=b.method||b.type||k.method||k.type,k.dataTypes=m.trim(k.dataType||"*").toLowerCase().match(E)||[""],null==k.crossDomain&&(c=Gb.exec(k.url.toLowerCase()),k.crossDomain=!(!c||c[1]===yb[1]&&c[2]===yb[2]&&(c[3]||("http:"===c[1]?"80":"443"))===(yb[3]||("http:"===yb[1]?"80":"443")))),k.data&&k.processData&&"string"!=typeof k.data&&(k.data=m.param(k.data,k.traditional)),Mb(Hb,k,b,v),2===t)return v;h=m.event&&k.global,h&&0===m.active++&&m.event.trigger("ajaxStart"),k.type=k.type.toUpperCase(),k.hasContent=!Eb.test(k.type),e=k.url,k.hasContent||(k.data&&(e=k.url+=(wb.test(e)?"&":"?")+k.data,delete k.data),k.cache===!1&&(k.url=Bb.test(e)?e.replace(Bb,"$1_="+vb++):e+(wb.test(e)?"&":"?")+"_="+vb++)),k.ifModified&&(m.lastModified[e]&&v.setRequestHeader("If-Modified-Since",m.lastModified[e]),m.etag[e]&&v.setRequestHeader("If-None-Match",m.etag[e])),(k.data&&k.hasContent&&k.contentType!==!1||b.contentType)&&v.setRequestHeader("Content-Type",k.contentType),v.setRequestHeader("Accept",k.dataTypes[0]&&k.accepts[k.dataTypes[0]]?k.accepts[k.dataTypes[0]]+("*"!==k.dataTypes[0]?", "+Jb+"; q=0.01":""):k.accepts["*"]);for(d in k.headers)v.setRequestHeader(d,k.headers[d]);if(k.beforeSend&&(k.beforeSend.call(l,v,k)===!1||2===t))return v.abort();u="abort";for(d in{success:1,error:1,complete:1})v[d](k[d]);if(i=Mb(Ib,k,b,v)){v.readyState=1,h&&n.trigger("ajaxSend",[v,k]),k.async&&k.timeout>0&&(g=setTimeout(function(){v.abort("timeout")},k.timeout));try{t=1,i.send(r,x)}catch(w){if(!(2>t))throw w;x(-1,w)}}else x(-1,"No Transport");function x(a,b,c,d){var j,r,s,u,w,x=b;2!==t&&(t=2,g&&clearTimeout(g),i=void 0,f=d||"",v.readyState=a>0?4:0,j=a>=200&&300>a||304===a,c&&(u=Ob(k,v,c)),u=Pb(k,u,v,j),j?(k.ifModified&&(w=v.getResponseHeader("Last-Modified"),w&&(m.lastModified[e]=w),w=v.getResponseHeader("etag"),w&&(m.etag[e]=w)),204===a||"HEAD"===k.type?x="nocontent":304===a?x="notmodified":(x=u.state,r=u.data,s=u.error,j=!s)):(s=x,(a||!x)&&(x="error",0>a&&(a=0))),v.status=a,v.statusText=(b||x)+"",j?o.resolveWith(l,[r,x,v]):o.rejectWith(l,[v,x,s]),v.statusCode(q),q=void 0,h&&n.trigger(j?"ajaxSuccess":"ajaxError",[v,k,j?r:s]),p.fireWith(l,[v,x]),h&&(n.trigger("ajaxComplete",[v,k]),--m.active||m.event.trigger("ajaxStop")))}return v},getJSON:function(a,b,c){return m.get(a,b,c,"json")},getScript:function(a,b){return m.get(a,void 0,b,"script")}}),m.each(["get","post"],function(a,b){m[b]=function(a,c,d,e){return m.isFunction(c)&&(e=e||d,d=c,c=void 0),m.ajax({url:a,type:b,dataType:e,data:c,success:d})}}),m._evalUrl=function(a){return m.ajax({url:a,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0})},m.fn.extend({wrapAll:function(a){if(m.isFunction(a))return this.each(function(b){m(this).wrapAll(a.call(this,b))});if(this[0]){var b=m(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&1===a.firstChild.nodeType)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){return this.each(m.isFunction(a)?function(b){m(this).wrapInner(a.call(this,b))}:function(){var b=m(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=m.isFunction(a);return this.each(function(c){m(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){m.nodeName(this,"body")||m(this).replaceWith(this.childNodes)}).end()}}),m.expr.filters.hidden=function(a){return a.offsetWidth<=0&&a.offsetHeight<=0||!k.reliableHiddenOffsets()&&"none"===(a.style&&a.style.display||m.css(a,"display"))},m.expr.filters.visible=function(a){return!m.expr.filters.hidden(a)};var Qb=/%20/g,Rb=/\[\]$/,Sb=/\r?\n/g,Tb=/^(?:submit|button|image|reset|file)$/i,Ub=/^(?:input|select|textarea|keygen)/i;function Vb(a,b,c,d){var e;if(m.isArray(b))m.each(b,function(b,e){c||Rb.test(a)?d(a,e):Vb(a+"["+("object"==typeof e?b:"")+"]",e,c,d)});else if(c||"object"!==m.type(b))d(a,b);else for(e in b)Vb(a+"["+e+"]",b[e],c,d)}m.param=function(a,b){var c,d=[],e=function(a,b){b=m.isFunction(b)?b():null==b?"":b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};if(void 0===b&&(b=m.ajaxSettings&&m.ajaxSettings.traditional),m.isArray(a)||a.jquery&&!m.isPlainObject(a))m.each(a,function(){e(this.name,this.value)});else for(c in a)Vb(c,a[c],b,e);return d.join("&").replace(Qb,"+")},m.fn.extend({serialize:function(){return m.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var a=m.prop(this,"elements");return a?m.makeArray(a):this}).filter(function(){var a=this.type;return this.name&&!m(this).is(":disabled")&&Ub.test(this.nodeName)&&!Tb.test(a)&&(this.checked||!W.test(a))}).map(function(a,b){var c=m(this).val();return null==c?null:m.isArray(c)?m.map(c,function(a){return{name:b.name,value:a.replace(Sb,"\r\n")}}):{name:b.name,value:c.replace(Sb,"\r\n")}}).get()}}),m.ajaxSettings.xhr=void 0!==a.ActiveXObject?function(){return!this.isLocal&&/^(get|post|head|put|delete|options)$/i.test(this.type)&&Zb()||$b()}:Zb;var Wb=0,Xb={},Yb=m.ajaxSettings.xhr();a.attachEvent&&a.attachEvent("onunload",function(){for(var a in Xb)Xb[a](void 0,!0)}),k.cors=!!Yb&&"withCredentials"in Yb,Yb=k.ajax=!!Yb,Yb&&m.ajaxTransport(function(a){if(!a.crossDomain||k.cors){var b;return{send:function(c,d){var e,f=a.xhr(),g=++Wb;if(f.open(a.type,a.url,a.async,a.username,a.password),a.xhrFields)for(e in a.xhrFields)f[e]=a.xhrFields[e];a.mimeType&&f.overrideMimeType&&f.overrideMimeType(a.mimeType),a.crossDomain||c["X-Requested-With"]||(c["X-Requested-With"]="XMLHttpRequest");for(e in c)void 0!==c[e]&&f.setRequestHeader(e,c[e]+"");f.send(a.hasContent&&a.data||null),b=function(c,e){var h,i,j;if(b&&(e||4===f.readyState))if(delete Xb[g],b=void 0,f.onreadystatechange=m.noop,e)4!==f.readyState&&f.abort();else{j={},h=f.status,"string"==typeof f.responseText&&(j.text=f.responseText);try{i=f.statusText}catch(k){i=""}h||!a.isLocal||a.crossDomain?1223===h&&(h=204):h=j.text?200:404}j&&d(h,i,j,f.getAllResponseHeaders())},a.async?4===f.readyState?setTimeout(b):f.onreadystatechange=Xb[g]=b:b()},abort:function(){b&&b(void 0,!0)}}}});function Zb(){try{return new a.XMLHttpRequest}catch(b){}}function $b(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}m.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(a){return m.globalEval(a),a}}}),m.ajaxPrefilter("script",function(a){void 0===a.cache&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),m.ajaxTransport("script",function(a){if(a.crossDomain){var b,c=y.head||m("head")[0]||y.documentElement;return{send:function(d,e){b=y.createElement("script"),b.async=!0,a.scriptCharset&&(b.charset=a.scriptCharset),b.src=a.url,b.onload=b.onreadystatechange=function(a,c){(c||!b.readyState||/loaded|complete/.test(b.readyState))&&(b.onload=b.onreadystatechange=null,b.parentNode&&b.parentNode.removeChild(b),b=null,c||e(200,"success"))},c.insertBefore(b,c.firstChild)},abort:function(){b&&b.onload(void 0,!0)}}}});var _b=[],ac=/(=)\?(?=&|$)|\?\?/;m.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=_b.pop()||m.expando+"_"+vb++;return this[a]=!0,a}}),m.ajaxPrefilter("json jsonp",function(b,c,d){var e,f,g,h=b.jsonp!==!1&&(ac.test(b.url)?"url":"string"==typeof b.data&&!(b.contentType||"").indexOf("application/x-www-form-urlencoded")&&ac.test(b.data)&&"data");return h||"jsonp"===b.dataTypes[0]?(e=b.jsonpCallback=m.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,h?b[h]=b[h].replace(ac,"$1"+e):b.jsonp!==!1&&(b.url+=(wb.test(b.url)?"&":"?")+b.jsonp+"="+e),b.converters["script json"]=function(){return g||m.error(e+" was not called"),g[0]},b.dataTypes[0]="json",f=a[e],a[e]=function(){g=arguments},d.always(function(){a[e]=f,b[e]&&(b.jsonpCallback=c.jsonpCallback,_b.push(e)),g&&m.isFunction(f)&&f(g[0]),g=f=void 0}),"script"):void 0}),m.parseHTML=function(a,b,c){if(!a||"string"!=typeof a)return null;"boolean"==typeof b&&(c=b,b=!1),b=b||y;var d=u.exec(a),e=!c&&[];return d?[b.createElement(d[1])]:(d=m.buildFragment([a],b,e),e&&e.length&&m(e).remove(),m.merge([],d.childNodes))};var bc=m.fn.load;m.fn.load=function(a,b,c){if("string"!=typeof a&&bc)return bc.apply(this,arguments);var d,e,f,g=this,h=a.indexOf(" ");return h>=0&&(d=m.trim(a.slice(h,a.length)),a=a.slice(0,h)),m.isFunction(b)?(c=b,b=void 0):b&&"object"==typeof b&&(f="POST"),g.length>0&&m.ajax({url:a,type:f,dataType:"html",data:b}).done(function(a){e=arguments,g.html(d?m("<div>").append(m.parseHTML(a)).find(d):a)}).complete(c&&function(a,b){g.each(c,e||[a.responseText,b,a])}),this},m.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(a,b){m.fn[b]=function(a){return this.on(b,a)}}),m.expr.filters.animated=function(a){return m.grep(m.timers,function(b){return a===b.elem}).length};var cc=a.document.documentElement;function dc(a){return m.isWindow(a)?a:9===a.nodeType?a.defaultView||a.parentWindow:!1}m.offset={setOffset:function(a,b,c){var d,e,f,g,h,i,j,k=m.css(a,"position"),l=m(a),n={};"static"===k&&(a.style.position="relative"),h=l.offset(),f=m.css(a,"top"),i=m.css(a,"left"),j=("absolute"===k||"fixed"===k)&&m.inArray("auto",[f,i])>-1,j?(d=l.position(),g=d.top,e=d.left):(g=parseFloat(f)||0,e=parseFloat(i)||0),m.isFunction(b)&&(b=b.call(a,c,h)),null!=b.top&&(n.top=b.top-h.top+g),null!=b.left&&(n.left=b.left-h.left+e),"using"in b?b.using.call(a,n):l.css(n)}},m.fn.extend({offset:function(a){if(arguments.length)return void 0===a?this:this.each(function(b){m.offset.setOffset(this,a,b)});var b,c,d={top:0,left:0},e=this[0],f=e&&e.ownerDocument;if(f)return b=f.documentElement,m.contains(b,e)?(typeof e.getBoundingClientRect!==K&&(d=e.getBoundingClientRect()),c=dc(f),{top:d.top+(c.pageYOffset||b.scrollTop)-(b.clientTop||0),left:d.left+(c.pageXOffset||b.scrollLeft)-(b.clientLeft||0)}):d},position:function(){if(this[0]){var a,b,c={top:0,left:0},d=this[0];return"fixed"===m.css(d,"position")?b=d.getBoundingClientRect():(a=this.offsetParent(),b=this.offset(),m.nodeName(a[0],"html")||(c=a.offset()),c.top+=m.css(a[0],"borderTopWidth",!0),c.left+=m.css(a[0],"borderLeftWidth",!0)),{top:b.top-c.top-m.css(d,"marginTop",!0),left:b.left-c.left-m.css(d,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||cc;while(a&&!m.nodeName(a,"html")&&"static"===m.css(a,"position"))a=a.offsetParent;return a||cc})}}),m.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,b){var c=/Y/.test(b);m.fn[a]=function(d){return V(this,function(a,d,e){var f=dc(a);return void 0===e?f?b in f?f[b]:f.document.documentElement[d]:a[d]:void(f?f.scrollTo(c?m(f).scrollLeft():e,c?e:m(f).scrollTop()):a[d]=e)},a,d,arguments.length,null)}}),m.each(["top","left"],function(a,b){m.cssHooks[b]=La(k.pixelPosition,function(a,c){return c?(c=Ja(a,b),Ha.test(c)?m(a).position()[b]+"px":c):void 0})}),m.each({Height:"height",Width:"width"},function(a,b){m.each({padding:"inner"+a,content:b,"":"outer"+a},function(c,d){m.fn[d]=function(d,e){var f=arguments.length&&(c||"boolean"!=typeof d),g=c||(d===!0||e===!0?"margin":"border");return V(this,function(b,c,d){var e;return m.isWindow(b)?b.document.documentElement["client"+a]:9===b.nodeType?(e=b.documentElement,Math.max(b.body["scroll"+a],e["scroll"+a],b.body["offset"+a],e["offset"+a],e["client"+a])):void 0===d?m.css(b,c,g):m.style(b,c,d,g)},b,f?d:void 0,f,null)}})}),m.fn.size=function(){return this.length},m.fn.andSelf=m.fn.addBack,"function"==typeof define&&define.amd&&define("jquery",[],function(){return m});var ec=a.jQuery,fc=a.$;return m.noConflict=function(b){return a.$===m&&(a.$=fc),b&&a.jQuery===m&&(a.jQuery=ec),m},typeof b===K&&(a.jQuery=a.$=m),m});
+//# sourceMappingURL=jquery.min.map
\ No newline at end of file
diff --git a/web/assets/library/jumbotron-narrow.css b/web/assets/library/jumbotron-narrow.css
new file mode 100644
index 0000000..2a482bf
--- /dev/null
+++ b/web/assets/library/jumbotron-narrow.css
@@ -0,0 +1,122 @@
+/* Space out content a bit */
+body {
+  padding-top: 20px;
+  padding-bottom: 20px;
+}
+
+/* Everything but the jumbotron gets side spacing for mobile first views */
+.header,
+.marketing,
+.footer {
+  padding-right: 15px;
+  padding-left: 15px;
+}
+
+/* Custom page header */
+.header {
+  padding-bottom: 20px;
+  border-bottom: 1px solid #e5e5e5;
+}
+/* Make the masthead heading the same height as the navigation */
+.header h3 {
+  margin-top: 0;
+  margin-bottom: 0;
+  line-height: 40px;
+}
+
+/* Custom page footer */
+.footer {
+  padding-top: 19px;
+  color: #777;
+  border-top: 1px solid #e5e5e5;
+}
+
+/* Customize container */
+@media (min-width: 768px) {
+  .container {
+    max-width: 970px;
+  }
+}
+.container-narrow > hr {
+  margin: 30px 0;
+}
+
+/* Main marketing message and sign up button */
+.jumbotron {
+  text-align: center;
+  border-bottom: 1px solid #e5e5e5;
+}
+.jumbotron .btn {
+  padding: 14px 24px;
+  font-size: 21px;
+}
+
+/* Supporting marketing content */
+.marketing {
+  margin: 40px 0;
+}
+.marketing p + h4 {
+  margin-top: 28px;
+}
+
+/* Responsive: Portrait tablets and up */
+@media screen and (min-width: 768px) {
+  /* Remove the padding we set earlier */
+  .header,
+  .marketing,
+  .footer {
+    padding-right: 0;
+    padding-left: 0;
+  }
+  /* Space out the masthead */
+  .header {
+    margin-bottom: 30px;
+  }
+  /* Remove the bottom border on the jumbotron for visual effect */
+  .jumbotron {
+    border-bottom: 0;
+  }
+}
+.pay-success{ color: blue;}
+.pay-unsuccess{ color:black;}
+.pay-error{ color:red;}
+.footer{text-align:center}
+/* Pager */
+.pager
+{
+	margin: 8px 3px;
+	padding: 3px;
+}
+
+.pager .disabled
+{
+	border: 1px solid #ddd;
+	color: #999;
+	margin-top: 4px;
+	padding: 3px;
+	text-align: center;
+}
+
+.pager .current
+{
+	background-color: #6ea9bf;
+	border: 1px solid #6e99aa;
+	color: #fff;
+	font-weight: bold;
+	margin-top: 4px;
+	padding: 3px 5px;
+	text-align: center;
+}
+
+.pager span, .pager a
+{
+	margin: 4px 3px;
+}
+
+.pager a
+{
+	border: 1px solid #aaa;
+	padding: 3px 5px;
+	text-align: center;
+	text-decoration: none;
+}
\ No newline at end of file