From 3552b8a021ad25a87fab011be77670456d9652d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Qu=E1=BB=91c=20Ch=C6=B0=C6=A1ng?= <quocchuong2609@gmail.com>
Date: Sun, 29 Dec 2024 20:11:31 +0700
Subject: [PATCH 1/5] fix: err build frontend

---
 frontend/package.json                         | 10 ++++----
 frontend/pnpm-lock.yaml                       | 10 ++++----
 frontend/src/containers/public/Home.tsx       |  1 -
 frontend/src/containers/public/Navigation.tsx | 18 --------------
 frontend/src/main.tsx                         |  5 ++--
 frontend/src/schemas/booking.schema.ts        | 24 +++++++++----------
 frontend/src/schemas/notify.schema.ts         |  2 +-
 frontend/src/schemas/payment.schema.ts        |  2 +-
 frontend/src/schemas/review.schema.ts         |  3 +--
 frontend/vite.config.ts                       |  5 +---
 10 files changed, 28 insertions(+), 52 deletions(-)

diff --git a/frontend/package.json b/frontend/package.json
index 451dbea..5481c37 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -15,17 +15,17 @@
     "react": "18.3.1",
     "react-dom": "18.3.1",
     "react-icon": "1.0.0",
-    "react-icons": "^5.4.0",
-    "react-redux": "^9.2.0",
-    "react-router-dom": "^7.1.0",
-    "slick-carousel": "^1.8.1"
+    "react-icons": "5.4.0",
+    "react-redux": "9.2.0",
+    "react-router-dom": "7.1.0",
+    "slick-carousel": "1.8.1"
   },
   "devDependencies": {
     "@eslint/js": "9.17.0",
     "@types/react": "18.3.17",
     "@types/react-dom": "18.3.5",
     "@vitejs/plugin-react-swc": "3.5.0",
-    "autoprefixer": "^10.4.20",
+    "autoprefixer": "10.4.20",
     "eslint": "9.17.0",
     "eslint-plugin-react-hooks": "5.0.0",
     "eslint-plugin-react-refresh": "0.4.16",
diff --git a/frontend/pnpm-lock.yaml b/frontend/pnpm-lock.yaml
index 220f773..68d9a12 100644
--- a/frontend/pnpm-lock.yaml
+++ b/frontend/pnpm-lock.yaml
@@ -24,16 +24,16 @@ importers:
         specifier: 1.0.0
         version: 1.0.0(babel-runtime@5.8.38)(react@18.3.1)
       react-icons:
-        specifier: ^5.4.0
+        specifier: 5.4.0
         version: 5.4.0(react@18.3.1)
       react-redux:
-        specifier: ^9.2.0
+        specifier: 9.2.0
         version: 9.2.0(@types/react@18.3.17)(react@18.3.1)(redux@5.0.1)
       react-router-dom:
-        specifier: ^7.1.0
+        specifier: 7.1.0
         version: 7.1.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       slick-carousel:
-        specifier: ^1.8.1
+        specifier: 1.8.1
         version: 1.8.1(jquery@3.7.1)
     devDependencies:
       '@eslint/js':
@@ -49,7 +49,7 @@ importers:
         specifier: 3.5.0
         version: 3.5.0(vite@6.0.3(jiti@1.21.7)(yaml@2.6.1))
       autoprefixer:
-        specifier: ^10.4.20
+        specifier: 10.4.20
         version: 10.4.20(postcss@8.4.49)
       eslint:
         specifier: 9.17.0
diff --git a/frontend/src/containers/public/Home.tsx b/frontend/src/containers/public/Home.tsx
index 0ba80c6..24677fd 100644
--- a/frontend/src/containers/public/Home.tsx
+++ b/frontend/src/containers/public/Home.tsx
@@ -18,7 +18,6 @@ const Home: React.FC = () => {
 				<Contact />
 			</div>
 			<Footer />
-			<div className="h-[500px]"></div>
 		</div>
 	);
 };
diff --git a/frontend/src/containers/public/Navigation.tsx b/frontend/src/containers/public/Navigation.tsx
index 31b5457..d9f99c6 100644
--- a/frontend/src/containers/public/Navigation.tsx
+++ b/frontend/src/containers/public/Navigation.tsx
@@ -52,30 +52,12 @@ const Navigation: React.FC<NavigationProps> = ({ isAdmin = false }) => {
 				>
 					ĐÁM CƯỚI
 				</NavLink>
-				<NavLink
-					to={path.EVENT}
-					className={({ isActive }) => (isActive ? active : notActive)}
-				>
-					SỰ KIỆN
-				</NavLink>
-				<NavLink
-					to={path.ORGANIZE}
-					className={({ isActive }) => (isActive ? active : notActive)}
-				>
-					ĐƠN VỊ TỔ CHỨC
-				</NavLink>
 				<NavLink
 					to={path.INTRO}
 					className={({ isActive }) => (isActive ? active : notActive)}
 				>
 					GIỚI THIỆU
 				</NavLink>
-				<NavLink
-					to={path.CONTACT}
-					className={({ isActive }) => (isActive ? active : notActive)}
-				>
-					LIÊN HỆ
-				</NavLink>
 
 				{/* Dropdown Button for Login */}
 				<div className="relative h-full">
diff --git a/frontend/src/main.tsx b/frontend/src/main.tsx
index 4db8c99..1e187b6 100644
--- a/frontend/src/main.tsx
+++ b/frontend/src/main.tsx
@@ -6,9 +6,8 @@ import 'slick-carousel/slick/slick-theme.css';
 import 'slick-carousel/slick/slick.css';
 
 import App from '@/App';
-
-import './index.css';
-import reduxStore from './redux';
+import '@/index.css';
+import reduxStore from '@/redux';
 
 const { store, persistor } = reduxStore();
 createRoot(document.getElementById('root')!).render(
diff --git a/frontend/src/schemas/booking.schema.ts b/frontend/src/schemas/booking.schema.ts
index 2963e11..57205a0 100644
--- a/frontend/src/schemas/booking.schema.ts
+++ b/frontend/src/schemas/booking.schema.ts
@@ -1,16 +1,16 @@
-import { User } from '@/schemas/user.schema';
-import { Payment } from '@/schemas/payment.schema';
 import { Party } from '@/schemas/party.schema';
+import { Payment } from '@/schemas/payment.schema';
+import { User } from '@/schemas/user.schema';
 
 export interface Booking {
-  _id: string;
-  user: User;
-  party: Party;
-  guestCount: number;
-  status: 'PENDING' | 'APPROVED' | 'CANCELLED';
-  payment?: Payment;
-  organizeDate: Date;
-  organizeAt: string;
-  createdAt?: Date;
-  updatedAt?: Date;
+	_id: string;
+	user: User;
+	party: Party;
+	guestCount: number;
+	status: 'PENDING' | 'APPROVED' | 'CANCELLED';
+	payment?: Payment;
+	organizeDate: Date;
+	organizeAt: string;
+	createdAt?: Date;
+	updatedAt?: Date;
 }
diff --git a/frontend/src/schemas/notify.schema.ts b/frontend/src/schemas/notify.schema.ts
index 1059fca..8f4d514 100644
--- a/frontend/src/schemas/notify.schema.ts
+++ b/frontend/src/schemas/notify.schema.ts
@@ -6,5 +6,5 @@ export interface Notify {
 	title: string;
 	message: string;
 	createdAt?: Date;
-  updatedAt?: Date;
+	updatedAt?: Date;
 }
diff --git a/frontend/src/schemas/payment.schema.ts b/frontend/src/schemas/payment.schema.ts
index bcfe128..9135e98 100644
--- a/frontend/src/schemas/payment.schema.ts
+++ b/frontend/src/schemas/payment.schema.ts
@@ -1,5 +1,5 @@
-import { Voucher } from '@/schemas/voucher.schema';
 import { Booking } from '@/schemas/booking.schema';
+import { Voucher } from '@/schemas/voucher.schema';
 
 export interface Payment {
 	_id: string;
diff --git a/frontend/src/schemas/review.schema.ts b/frontend/src/schemas/review.schema.ts
index adfebb2..0772cae 100644
--- a/frontend/src/schemas/review.schema.ts
+++ b/frontend/src/schemas/review.schema.ts
@@ -1,5 +1,4 @@
-import { Booking } from "@/schemas/booking.schema";
-
+import { Booking } from '@/schemas/booking.schema';
 
 export interface Review {
 	_id: string;
diff --git a/frontend/vite.config.ts b/frontend/vite.config.ts
index 44ab307..baaa2b8 100644
--- a/frontend/vite.config.ts
+++ b/frontend/vite.config.ts
@@ -11,10 +11,7 @@ export default defineConfig({
 	},
 	build: {
 		rollupOptions: {
-			external: [
-				'slick-carousel/slick/slick-theme.css',
-				'slick-carousel/slick/slick.css',
-			],
+			external: [],
 		},
 	},
 });

From 14cd3290fc6af2d3fede0b278122bda1ba386311 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Qu=E1=BB=91c=20Ch=C6=B0=C6=A1ng?= <quocchuong2609@gmail.com>
Date: Mon, 30 Dec 2024 19:01:14 +0700
Subject: [PATCH 2/5] update: api version to 1.4.4

---
 backend/package.json                              | 2 +-
 backend/src/domains/parties/parties.controller.ts | 3 +--
 backend/src/domains/reviews/reviews.controller.ts | 5 +----
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/backend/package.json b/backend/package.json
index ca184b2..976a113 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "evora-backend",
-	"version": "1.4.3",
+	"version": "1.4.4",
 	"description": "Evora connects customers with event organizers quickly through detailed online booking.",
 	"repository": "https://github.com/bakaqc/evora-17c",
 	"author": "Quốc Chương",
diff --git a/backend/src/domains/parties/parties.controller.ts b/backend/src/domains/parties/parties.controller.ts
index da6be84..e34d27f 100644
--- a/backend/src/domains/parties/parties.controller.ts
+++ b/backend/src/domains/parties/parties.controller.ts
@@ -29,9 +29,8 @@ export class PartiesController {
 		return await this.partiesService.create(createPartyDto);
 	}
 
-	@Roles(Role.SUPER_ADMIN)
 	@Public()
-	@ApiOperation({ summary: 'Fetch all parties - Super Admin only' })
+	@ApiOperation({ summary: 'Fetch all parties' })
 	@Get()
 	async getAll() {
 		return await this.partiesService.getAll();
diff --git a/backend/src/domains/reviews/reviews.controller.ts b/backend/src/domains/reviews/reviews.controller.ts
index d982d64..665c0f8 100644
--- a/backend/src/domains/reviews/reviews.controller.ts
+++ b/backend/src/domains/reviews/reviews.controller.ts
@@ -10,8 +10,6 @@ import {
 import { ApiBearerAuth, ApiOperation, ApiTags } from '@nestjs/swagger';
 
 import { Public } from '@/domains/auth/decorators/public.decorator';
-import { Roles } from '@/domains/auth/decorators/roles.decorator';
-import { Role } from '@/domains/auth/enums/role.enum';
 import { CreateReviewDto } from '@/domains/reviews/dto/createReview.dto';
 import { UpdateReviewDto } from '@/domains/reviews/dto/updateReview.dto';
 import { ReviewsService } from '@/domains/reviews/reviews.service';
@@ -28,9 +26,8 @@ export class ReviewsController {
 		return await this.reviewsService.create(createReviewDto);
 	}
 
-	@Roles(Role.SUPER_ADMIN)
 	@Public()
-	@ApiOperation({ summary: 'Fetch all reviews - Super Admin only' })
+	@ApiOperation({ summary: 'Fetch all reviews' })
 	@Get()
 	async getAll() {
 		return await this.reviewsService.getAll();

From 05729edf94a75a1dd33d94e27553eb523ecfd817 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Qu=E1=BB=91c=20Ch=C6=B0=C6=A1ng?= <quocchuong2609@gmail.com>
Date: Mon, 30 Dec 2024 19:50:05 +0700
Subject: [PATCH 3/5] update: user update dto

---
 backend/src/domains/users/dto/updateUser.dto.ts | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/backend/src/domains/users/dto/updateUser.dto.ts b/backend/src/domains/users/dto/updateUser.dto.ts
index 015f77b..0d6ae46 100644
--- a/backend/src/domains/users/dto/updateUser.dto.ts
+++ b/backend/src/domains/users/dto/updateUser.dto.ts
@@ -36,20 +36,4 @@ export class UpdateUserDto {
 
 	@ApiPropertyOptional({ description: 'User avatar' })
 	avatar?: string;
-
-	@ApiPropertyOptional({ description: 'User role' })
-	@ValidateIf((o) => o.role !== undefined)
-	@IsIn(['user', 'admin', 'super-admin'], {
-		message: 'Role must be user, admin or super-admin',
-	})
-	role?: string;
-
-	@ApiPropertyOptional({ description: 'User verification code' })
-	verificationCode?: string;
-
-	@ApiPropertyOptional({ description: 'User verification code expires' })
-	verificationCodeExpires?: Date;
-
-	@ApiPropertyOptional({ description: 'User is verified' })
-	isVerified?: boolean;
 }

From e3bb0af58381edf4e7d91cbe863115084bd61668 Mon Sep 17 00:00:00 2001
From: theqi106 <phkhhulolmb1@gmail.com>
Date: Tue, 31 Dec 2024 10:28:53 +0700
Subject: [PATCH 4/5] update: remove Contact component

---
 frontend/src/components/Contact.tsx     | 43 -------------------------
 frontend/src/components/index.ts        |  1 -
 frontend/src/containers/public/Home.tsx |  3 +-
 frontend/src/ultils/dataContact.ts      | 21 ------------
 4 files changed, 1 insertion(+), 67 deletions(-)
 delete mode 100644 frontend/src/components/Contact.tsx
 delete mode 100644 frontend/src/ultils/dataContact.ts

diff --git a/frontend/src/components/Contact.tsx b/frontend/src/components/Contact.tsx
deleted file mode 100644
index 866aca8..0000000
--- a/frontend/src/components/Contact.tsx
+++ /dev/null
@@ -1,43 +0,0 @@
-import { text } from '../ultils/dataContact';
-import React from 'react';
-
-interface Contact {
-	text: string;
-	phone: string;
-	zalo: string;
-}
-
-const Contacts: React.FC = () => {
-	return (
-		<div className=" bg-[#FAF3EB] rounded-md shadow-md p-4 w-4/5 flex flex-col justify-center items-center gap-6">
-			<img
-				className="w-full h-48 object-contain"
-				src={text.image}
-				alt="thumbnail"
-			/>
-			<p className="">{text.content}</p>
-			<div className="flex items-center justify-around w-full">
-				{text.contact.map((item: Contact) => {
-					return (
-						<div
-							key={item.text}
-							className="flex flex-col items-center justify-center"
-						>
-							<span className="text-orange-600 text-[15px] font-bold ">
-								{item.text}
-							</span>
-							<span className="text-blue-900 text-[15px] font-bold">
-								{item.phone}
-							</span>
-							<span className="text-blue-900 text-[15px] font-bold">
-								{item.zalo}
-							</span>
-						</div>
-					);
-				})}
-			</div>
-		</div>
-	);
-};
-
-export default Contacts;
diff --git a/frontend/src/components/index.ts b/frontend/src/components/index.ts
index 0f32271..5a67721 100644
--- a/frontend/src/components/index.ts
+++ b/frontend/src/components/index.ts
@@ -1,6 +1,5 @@
 export { default as Button } from './Button';
 export { default as Intro } from './Intro';
-export { default as Contact } from './Contact';
 export { default as List } from './List';
 export { default as Item } from './Item';
 export { default as TopBar } from './TopBar';
diff --git a/frontend/src/containers/public/Home.tsx b/frontend/src/containers/public/Home.tsx
index 24677fd..340d593 100644
--- a/frontend/src/containers/public/Home.tsx
+++ b/frontend/src/containers/public/Home.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { Outlet } from 'react-router-dom';
 
-import { Banner, Contact, Intro, TopBar } from '@/components';
+import { Banner, Intro, TopBar } from '@/components';
 import { Footer, Navigation } from '@/containers/public';
 
 const Home: React.FC = () => {
@@ -15,7 +15,6 @@ const Home: React.FC = () => {
 					<Outlet />
 				</div>
 				<Intro />
-				<Contact />
 			</div>
 			<Footer />
 		</div>
diff --git a/frontend/src/ultils/dataContact.ts b/frontend/src/ultils/dataContact.ts
deleted file mode 100644
index 5e4872f..0000000
--- a/frontend/src/ultils/dataContact.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-export const text = {
-	image: 'https://phongtro123.com/images/support-bg.jpg',
-	content: 'Liên hệ với chúng tôi nếu bạn cần hỗ trợ:',
-	contact: [
-		{
-			text: 'Hỗ trợ đăng tin',
-			phone: 'Điện thoại: 0867438577',
-			zalo: 'Zalo: 0867438577',
-		},
-		{
-			text: 'Hỗ trợ đăng tin',
-			phone: 'Điện thoại: 0867438577',
-			zalo: 'Zalo: 0867438577',
-		},
-		{
-			text: 'Phản ánh/khiếu nại',
-			phone: 'Điện thoại: 0867438577',
-			zalo: 'Zalo: 0867438577',
-		},
-	],
-};

From 669a98e4fe408f863598a937738708af0a8b7908 Mon Sep 17 00:00:00 2001
From: theqi106 <phkhhulolmb1@gmail.com>
Date: Tue, 31 Dec 2024 10:29:23 +0700
Subject: [PATCH 5/5] add: add Verify OTP screen

---
 frontend/src/App.tsx                         |  2 +
 frontend/src/containers/public/VerifyOTP.tsx | 70 ++++++++++++++++++++
 frontend/src/containers/public/index.ts      |  1 +
 frontend/src/ultils/constant.ts              |  1 +
 4 files changed, 74 insertions(+)
 create mode 100644 frontend/src/containers/public/VerifyOTP.tsx

diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
index 5e44e0b..05888a1 100644
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -7,6 +7,7 @@ import {
 	LoginAdmin,
 	LoginUser,
 	RegisterUser,
+	VerifyOTP,
 } from '@/containers/public';
 import { path } from '@/ultils/constant';
 
@@ -20,6 +21,7 @@ const App: React.FC = () => {
 				<Route path={path.LOGIN_USER} element={<LoginUser />} />
 				<Route path={path.LOGIN_ADMIN} element={<LoginAdmin />} />
 				<Route path={path.REGISTER_USER} element={<RegisterUser />} />
+				<Route path={path.VERIFY_OTP} element={<VerifyOTP />} />
 			</Routes>
 		</div>
 	);
diff --git a/frontend/src/containers/public/VerifyOTP.tsx b/frontend/src/containers/public/VerifyOTP.tsx
new file mode 100644
index 0000000..aea84e8
--- /dev/null
+++ b/frontend/src/containers/public/VerifyOTP.tsx
@@ -0,0 +1,70 @@
+import React from 'react';
+import { NavLink } from 'react-router-dom';
+
+import logo1 from '@/assets/logo1.png';
+import { ButtonForLogin, InputField } from '@/components';
+import { path } from '@/ultils/constant';
+
+const VerifyOTP: React.FC = () => {
+	return (
+		<section className="gradient-form h-screen bg-neutral-200 dark:bg-neutral-700 flex items-center justify-center">
+			<div className="container max-w-5xl p-6">
+				<div className="flex flex-wrap items-center justify-center text-neutral-800 dark:text-neutral-200">
+					<div className="w-full">
+						<div className="block rounded-lg bg-white shadow-lg dark:bg-neutral-800">
+							<div className="g-0 lg:flex lg:flex-wrap">
+								{/* Left Column */}
+								<div className="px-6 py-8 md:px-8 lg:w-6/12">
+									<div className="text-center">
+										<img className="mx-auto w-36" src={logo1} alt="logo" />
+										<h4 className="mb-6 mt-4 text-xl font-semibold">
+											Verify Your OTP
+										</h4>
+									</div>
+									<InputField id="otp" label="OTP" type="text" />
+
+									{/* Verify Button */}
+									<div className="mb-6 text-center">
+										<ButtonForLogin label="Verify OTP" />
+										<a
+											href="#!"
+											className="mt-2 inline-block text-sm text-primary"
+										>
+											Resend OTP
+										</a>
+									</div>
+
+									{/* Login Section */}
+									<div className="flex items-center justify-between">
+										<p className="text-sm">Back to Login?</p>
+										<NavLink
+											to={path.LOGIN_USER}
+											className="rounded border border-blue-500 px-4 py-2 text-sm text-blue-500 hover:bg-blue-50"
+										>
+											Log in
+										</NavLink>
+									</div>
+								</div>
+
+								{/* Right Column */}
+								<div className="flex items-center justify-center rounded-b-lg bg-gradient-to-r from-yellow-500 via-orange-500 to-amber-700 lg:w-6/12 lg:rounded-e-lg lg:rounded-bl-none">
+									<div className="px-6 py-8 text-white md:px-8">
+										<h4 className="mb-6 text-xl font-semibold">
+											Secure Your Account
+										</h4>
+										<p className="text-sm">
+											To ensure your account's security, please verify the OTP
+											sent to your email.
+										</p>
+									</div>
+								</div>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</section>
+	);
+};
+
+export default VerifyOTP;
diff --git a/frontend/src/containers/public/index.ts b/frontend/src/containers/public/index.ts
index 4efd14f..031ea26 100644
--- a/frontend/src/containers/public/index.ts
+++ b/frontend/src/containers/public/index.ts
@@ -3,6 +3,7 @@ export { default as Footer } from './Footer';
 export { default as LoginUser } from './LoginUser';
 export { default as LoginAdmin } from './LoginAdmin';
 export { default as RegisterUser } from './RegisterUser';
+export { default as VerifyOTP } from './VerifyOTP';
 export { default as Home } from './Home';
 export { default as Navigation } from './Navigation';
 export { default as HomePage } from './HomePage';
diff --git a/frontend/src/ultils/constant.ts b/frontend/src/ultils/constant.ts
index e1ad258..fc55caf 100644
--- a/frontend/src/ultils/constant.ts
+++ b/frontend/src/ultils/constant.ts
@@ -11,6 +11,7 @@ export const path = {
 	ORGANIZE: '/don-vi-to-chuc',
 	INTRO: '/gioi-thieu',
 	CONTACT: '/lien-he',
+	VERIFY_OTP: '/otp',
 };
 
 export const text = {