From 4a6c9cec18a035ada6619c5b3fd903190ddb3cac Mon Sep 17 00:00:00 2001
From: AndyOoh <andy.oeee@gmail.com>
Date: Sun, 28 Jan 2024 19:20:48 +0700
Subject: [PATCH 01/15] fix dropdown

---
 apps/landing/src/components/Header/NavBar.tsx | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/apps/landing/src/components/Header/NavBar.tsx b/apps/landing/src/components/Header/NavBar.tsx
index 9c83851..734b249 100644
--- a/apps/landing/src/components/Header/NavBar.tsx
+++ b/apps/landing/src/components/Header/NavBar.tsx
@@ -13,11 +13,13 @@ function NavBar({}: Props) {
       <ul className='menu menu-horizontal px-1'>
         {menuItems.map(item =>
           item.subItems ? (
-            <li tabIndex={0} key={item.title}>
-              <a>
+            <li tabIndex={0} key={item.title} className='dropdown dropdown-hover'>
+              <a tabIndex={0} role='button' className='btn m-1'>
                 {item.title} <RiArrowDropDownLine />
               </a>
-              <ul className='p-2 bg-base-100'>
+              <ul
+                tabIndex={0}
+                className='dropdown-content z-[1] menu p-2 shadow bg-base-100 rounded-box w-52'>
                 {item.subItems.map(subItem => (
                   <li key={subItem.title}>
                     <Link href={subItem.link}>{subItem.title}</Link>

From 780a1b0f20339bbe227771ace083168da97f1390 Mon Sep 17 00:00:00 2001
From: AndyOoh <andy.oeee@gmail.com>
Date: Sun, 28 Jan 2024 19:21:19 +0700
Subject: [PATCH 02/15] cleanup

---
 apps/landing/src/components/Header/NavBar.tsx | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/apps/landing/src/components/Header/NavBar.tsx b/apps/landing/src/components/Header/NavBar.tsx
index 734b249..adaaf1e 100644
--- a/apps/landing/src/components/Header/NavBar.tsx
+++ b/apps/landing/src/components/Header/NavBar.tsx
@@ -1,9 +1,7 @@
-import React from 'react';
-
+import Link from 'next/link';
 import { RiArrowDropDownLine } from 'react-icons/ri';
+
 import { menuItems } from './menuItems';
-import Link from 'next/link';
-import { appUrl } from '../../consts';
 
 type Props = {};
 

From a649ffcb9f4ba6c3b3f7c67eec61abe453ffae09 Mon Sep 17 00:00:00 2001
From: AndyOoh <andy.oeee@gmail.com>
Date: Sun, 28 Jan 2024 19:22:01 +0700
Subject: [PATCH 03/15] fix button color

---
 apps/landing/src/components/Header/HeaderRight.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/landing/src/components/Header/HeaderRight.tsx b/apps/landing/src/components/Header/HeaderRight.tsx
index d803fe1..9f94b0d 100644
--- a/apps/landing/src/components/Header/HeaderRight.tsx
+++ b/apps/landing/src/components/Header/HeaderRight.tsx
@@ -10,7 +10,7 @@ function HeaderRight({}: Props) {
     <>
       <div className='flex gap-2 navbar-end'>
         {/* <Link role='button' href={'signup/business'} className='btn btn-sm rounded-3xl normal-case'> */}
-        <Link role='button' href={appUrl} target='_blank'  className='btn btn-sm rounded-3xl normal-case'>
+        <Link role='button' href={appUrl} target='_blank'  className='btn btn-neutral btn-sm rounded-3xl normal-case'>
           Hire Talent
         </Link>
       </div>

From c5a9e60872981fd89fd08bf71cbf1b4f4feafe4c Mon Sep 17 00:00:00 2001
From: AndyOoh <andy.oeee@gmail.com>
Date: Sun, 28 Jan 2024 19:28:21 +0700
Subject: [PATCH 04/15] style navbar

---
 apps/landing/src/components/Header/NavBar.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/landing/src/components/Header/NavBar.tsx b/apps/landing/src/components/Header/NavBar.tsx
index adaaf1e..082caf3 100644
--- a/apps/landing/src/components/Header/NavBar.tsx
+++ b/apps/landing/src/components/Header/NavBar.tsx
@@ -8,11 +8,11 @@ type Props = {};
 function NavBar({}: Props) {
   return (
     <nav className='navbar-center hidden md:flex'>
-      <ul className='menu menu-horizontal px-1'>
+      <ul className='menu menu-horizontal items-center  px-1'>
         {menuItems.map(item =>
           item.subItems ? (
             <li tabIndex={0} key={item.title} className='dropdown dropdown-hover'>
-              <a tabIndex={0} role='button' className='btn m-1'>
+              <a tabIndex={0} role='button'>
                 {item.title} <RiArrowDropDownLine />
               </a>
               <ul

From c2b9804c3dabb38d2b57dd6e0258a5709da14170 Mon Sep 17 00:00:00 2001
From: AndyOoh <andy.oeee@gmail.com>
Date: Sun, 28 Jan 2024 19:31:46 +0700
Subject: [PATCH 05/15] delete head.tsx in landing

---
 apps/landing/src/app/head.tsx | 15 ---------------
 1 file changed, 15 deletions(-)
 delete mode 100644 apps/landing/src/app/head.tsx

diff --git a/apps/landing/src/app/head.tsx b/apps/landing/src/app/head.tsx
deleted file mode 100644
index b279cbc..0000000
--- a/apps/landing/src/app/head.tsx
+++ /dev/null
@@ -1,15 +0,0 @@
-export default function Head() {
-  return (
-    <>
-      <title>Event Dee</title>
-      <meta content='width=device-width, initial-scale=1' name='viewport' />
-      <meta name='description' content='Generated by create next app' />
-      {/* <link rel='icon' type='image/png' sizes='16x16' href='/images/old-favicon.ico' /> */}
-      {/* <link rel='icon' type='image/png' sizes='16x16' href='/logo/favicon2.ico' /> */}
-      {/* <link rel='icon' type='image/png' sizes='16x16' href='/logo/favicon.ico' /> */}
-      <link rel='icon' type='image/png' sizes='16x16' href='/logo/logo-d-trans.png' />
-      {/* <link rel="icon" type="image/png" sizes="16x16" href="../favicon.ico" /> */}
-      {/* <link rel="icon" href="../../public/favicon.ico" /> */}
-    </>
-  );
-}

From 2188df31e44e6aa146e278fd9391882dbf2390a9 Mon Sep 17 00:00:00 2001
From: AndyOoh <andy.oeee@gmail.com>
Date: Sun, 28 Jan 2024 19:37:18 +0700
Subject: [PATCH 06/15] metadata login page

---
 .../src/app/(public)/(auth)/login/page.tsx    |  9 +++---
 apps/app/src/app/head.tsx                     | 30 +++++++++----------
 apps/app/src/app/layout.tsx                   |  3 +-
 3 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/apps/app/src/app/(public)/(auth)/login/page.tsx b/apps/app/src/app/(public)/(auth)/login/page.tsx
index f678188..90560aa 100644
--- a/apps/app/src/app/(public)/(auth)/login/page.tsx
+++ b/apps/app/src/app/(public)/(auth)/login/page.tsx
@@ -1,12 +1,13 @@
-'use client';
-
 import LoginLeft from './left/LoginLeft';
 import LoginRight from './LoginRight';
 import { DividedPage } from '../components/DividedPage';
+import { Metadata } from 'next';
 
-type Props = {};
+export const metadata: Metadata = {
+  title: 'Event Dee - Login',
+};
 
-function Login({}: Props) {
+function Login() {
   return (
     <>
       <DividedPage left={<LoginLeft />} right={<LoginRight />} leftColor='secondary' />
diff --git a/apps/app/src/app/head.tsx b/apps/app/src/app/head.tsx
index 0f76bde..bf15b26 100644
--- a/apps/app/src/app/head.tsx
+++ b/apps/app/src/app/head.tsx
@@ -1,15 +1,15 @@
-export default function Head() {
-  return (
-    <>
-      <title>Home</title>
-      <meta content='width=device-width, initial-scale=1' name='viewport' />
-      <meta name='description' content='Generated by create next app' />
-      {/* <link rel='icon' type='image/png' sizes='16x16' href='/images/old-favicon.ico' /> */}
-      {/* <link rel='icon' type='image/png' sizes='16x16' href='/logo/favicon2.ico' /> */}
-      {/* <link rel='icon' type='image/png' sizes='16x16' href='/logo/favicon.ico' /> */}
-      <link rel='icon' type='image/png' sizes='16x16' href='/logo/logo-d-trans.png' />
-      {/* <link rel="icon" type="image/png" sizes="16x16" href="../favicon.ico" /> */}
-      {/* <link rel="icon" href="../../public/favicon.ico" /> */}
-    </>
-  );
-}
+// export default function Head() {
+//   return (
+//     <>
+//       <title>Home</title>
+//       <meta content='width=device-width, initial-scale=1' name='viewport' />
+//       <meta name='description' content='Generated by create next app' />
+//       {/* <link rel='icon' type='image/png' sizes='16x16' href='/images/old-favicon.ico' /> */}
+//       {/* <link rel='icon' type='image/png' sizes='16x16' href='/logo/favicon2.ico' /> */}
+//       {/* <link rel='icon' type='image/png' sizes='16x16' href='/logo/favicon.ico' /> */}
+//       <link rel='icon' type='image/png' sizes='16x16' href='/logo/logo-d-trans.png' />
+//       {/* <link rel="icon" type="image/png" sizes="16x16" href="../favicon.ico" /> */}
+//       {/* <link rel="icon" href="../../public/favicon.ico" /> */}
+//     </>
+//   );
+// }
diff --git a/apps/app/src/app/layout.tsx b/apps/app/src/app/layout.tsx
index e206435..60c7564 100644
--- a/apps/app/src/app/layout.tsx
+++ b/apps/app/src/app/layout.tsx
@@ -2,13 +2,14 @@ import { Varela } from 'next/font/google';
 
 import { RecoilProvider } from '../components/RecoilProvider';
 import '../styles/globals.scss';
+import { Metadata } from 'next';
 
 const varela = Varela({
   weight: ['400'],
   subsets: ['latin'],
 });
 
-export const metadata = {
+export const metadata: Metadata = {
   title: 'Event Dee - App',
   description: 'Connecting events',
   icons: {

From 8b6d7b20bc407920d8b988e229999ef119b8498d Mon Sep 17 00:00:00 2001
From: AndyOoh <andy.oeee@gmail.com>
Date: Sun, 28 Jan 2024 19:38:05 +0700
Subject: [PATCH 07/15] cleanup

---
 apps/app/src/app/(public)/layout.tsx | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/apps/app/src/app/(public)/layout.tsx b/apps/app/src/app/(public)/layout.tsx
index 8339849..6ebb088 100644
--- a/apps/app/src/app/(public)/layout.tsx
+++ b/apps/app/src/app/(public)/layout.tsx
@@ -1,10 +1,5 @@
-import { CurrentUserProvider } from 'app/(protected)/components/Providers/CurrentUserProvider';
 import { PublicRoutes } from './PublicRoutes';
 
 export default function PublicLayout({ children }: { children: React.ReactNode }) {
-  return (
-    // <CurrentUserProvider>
-      <PublicRoutes>{children}</PublicRoutes>
-    // </CurrentUserProvider>
-  );
+  return <PublicRoutes>{children}</PublicRoutes>;
 }

From 2bc4fee7caab9effcef8b6646b95d9fee5bf79c3 Mon Sep 17 00:00:00 2001
From: AndyOoh <andy.oeee@gmail.com>
Date: Sun, 28 Jan 2024 19:41:46 +0700
Subject: [PATCH 08/15] fix btn-neutral

---
 apps/app/src/app/(public)/(auth)/login/LoginForm.tsx | 2 +-
 apps/app/src/app/(public)/(auth)/login/page.tsx      | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/apps/app/src/app/(public)/(auth)/login/LoginForm.tsx b/apps/app/src/app/(public)/(auth)/login/LoginForm.tsx
index 9c3099e..f7b544a 100644
--- a/apps/app/src/app/(public)/(auth)/login/LoginForm.tsx
+++ b/apps/app/src/app/(public)/(auth)/login/LoginForm.tsx
@@ -68,7 +68,7 @@ export const LoginForm = (props: Props) => {
             }
           />
         ) : null}
-        <button className='btn w-full max-w-xs' type='submit'>
+        <button className='btn btn-neutral w-full max-w-xs' type='submit'>
           Log in
         </button>
       </div>
diff --git a/apps/app/src/app/(public)/(auth)/login/page.tsx b/apps/app/src/app/(public)/(auth)/login/page.tsx
index 90560aa..a9463a3 100644
--- a/apps/app/src/app/(public)/(auth)/login/page.tsx
+++ b/apps/app/src/app/(public)/(auth)/login/page.tsx
@@ -8,11 +8,7 @@ export const metadata: Metadata = {
 };
 
 function Login() {
-  return (
-    <>
-      <DividedPage left={<LoginLeft />} right={<LoginRight />} leftColor='secondary' />
-    </>
-  );
+  return <DividedPage left={<LoginLeft />} right={<LoginRight />} leftColor='secondary' />;
 }
 
 export default Login;

From 648d026fb31b48ecd0dd6b88a4f6fa408f76a2bd Mon Sep 17 00:00:00 2001
From: AndyOoh <andy.oeee@gmail.com>
Date: Sun, 28 Jan 2024 19:43:43 +0700
Subject: [PATCH 09/15] style button

---
 .../app/(protected)/events/components/create-event-button.tsx | 2 +-
 apps/app/src/app/(public)/(auth)/login/LoginForm.tsx          | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/apps/app/src/app/(protected)/events/components/create-event-button.tsx b/apps/app/src/app/(protected)/events/components/create-event-button.tsx
index 12538d2..07c7ae9 100644
--- a/apps/app/src/app/(protected)/events/components/create-event-button.tsx
+++ b/apps/app/src/app/(protected)/events/components/create-event-button.tsx
@@ -7,7 +7,7 @@ import React, { useContext } from 'react';
 export const CreateEventButton = () => {
   const { currentUser } = useContext(CurrUserContext);
   return currentUser?.customClaims.type === 'business' ? (
-    <Link href={'/events/create'} className='btn'>
+    <Link href={'/events/create'} className='btn btn-neutral'>
       Create Event
     </Link>
   ) : null;
diff --git a/apps/app/src/app/(public)/(auth)/login/LoginForm.tsx b/apps/app/src/app/(public)/(auth)/login/LoginForm.tsx
index f7b544a..0441929 100644
--- a/apps/app/src/app/(public)/(auth)/login/LoginForm.tsx
+++ b/apps/app/src/app/(public)/(auth)/login/LoginForm.tsx
@@ -9,9 +9,7 @@ import { auth } from '__firebase/clientApp';
 import { styles } from '__styles/styles';
 import { FormError } from 'ui';
 
-type Props = {};
-
-export const LoginForm = (props: Props) => {
+export const LoginForm = () => {
   const [form, setForm] = useState({
     email: '',
     password: '',

From c33bf9f506fbf33e4e0c58b849b8db02ea2618b3 Mon Sep 17 00:00:00 2001
From: AndyOoh <andy.oeee@gmail.com>
Date: Sun, 28 Jan 2024 19:46:01 +0700
Subject: [PATCH 10/15] metadata signup freelancer

---
 apps/app/src/app/(public)/(auth)/signup/page.tsx | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/apps/app/src/app/(public)/(auth)/signup/page.tsx b/apps/app/src/app/(public)/(auth)/signup/page.tsx
index 4c2d09b..eac4a16 100644
--- a/apps/app/src/app/(public)/(auth)/signup/page.tsx
+++ b/apps/app/src/app/(public)/(auth)/signup/page.tsx
@@ -1,11 +1,14 @@
+import { Metadata } from 'next';
 import Link from 'next/link';
 import React from 'react';
 
-type Props = {};
+export const metadata: Metadata = {
+  title: 'Event Dee - Login',
+};
 
 // Th9is page could ask if user wants to signuo as freelancer or company and procide links. Or it ciuld be deleted.
 
-function Signup({}: Props) {
+function Signup() {
   return (
     <section className='min-h-screen flex-center bg-primary/20 text-3xl'>
       <p>

From 348355aaf347c2de8262fdbd4d524ad3f23e3145 Mon Sep 17 00:00:00 2001
From: AndyOoh <andy.oeee@gmail.com>
Date: Sun, 28 Jan 2024 19:52:24 +0700
Subject: [PATCH 11/15] add metadata

---
 .../src/app/(public)/(auth)/signup/business/page.tsx  | 11 +++++++----
 .../app/(public)/(auth)/signup/freelancer/page.tsx    |  4 +---
 apps/app/src/app/(public)/(auth)/signup/layout.tsx    |  9 +++++++++
 apps/app/src/app/(public)/(auth)/signup/page.tsx      |  4 ----
 packages/ui/src/forms/ActionButton.tsx                |  2 +-
 5 files changed, 18 insertions(+), 12 deletions(-)
 create mode 100644 apps/app/src/app/(public)/(auth)/signup/layout.tsx

diff --git a/apps/app/src/app/(public)/(auth)/signup/business/page.tsx b/apps/app/src/app/(public)/(auth)/signup/business/page.tsx
index 51b069e..22be2a1 100644
--- a/apps/app/src/app/(public)/(auth)/signup/business/page.tsx
+++ b/apps/app/src/app/(public)/(auth)/signup/business/page.tsx
@@ -1,9 +1,12 @@
+import { Metadata } from 'next';
 import { SignupBusinessLeft } from './SignupBusinessLeft/SignupBusinessLeft';
-import {SignupBusinessRight} from './SignupBusinessRight/SignupBusinessRight';
+import { SignupBusinessRight } from './SignupBusinessRight/SignupBusinessRight';
 
-type Props = {};
+export const metadata: Metadata = {
+  title: 'Event Dee - Signup',
+};
 
-function SignupBusiness({}: Props) {
+function SignupBusiness() {
   return (
     // <DividedPage left={<SignupMemberLeft />} right={<SignupMemberRight />} leftColor='secondary' />
     <div className='flex min-h-screen'>
@@ -13,4 +16,4 @@ function SignupBusiness({}: Props) {
   );
 }
 
-export default SignupBusiness;
\ No newline at end of file
+export default SignupBusiness;
diff --git a/apps/app/src/app/(public)/(auth)/signup/freelancer/page.tsx b/apps/app/src/app/(public)/(auth)/signup/freelancer/page.tsx
index f7f78c2..ce4b487 100644
--- a/apps/app/src/app/(public)/(auth)/signup/freelancer/page.tsx
+++ b/apps/app/src/app/(public)/(auth)/signup/freelancer/page.tsx
@@ -2,9 +2,7 @@ import { SignupMemberLeft } from './signup-member-left/SignupMemberLeft';
 import { SignupMemberRight } from './signup-member-right/SignupMemberRight';
 import { DividedPage } from '../../components/DividedPage';
 
-type Props = {};
-
-function SignupFreelancer({}: Props) {
+function SignupFreelancer() {
   return (
     // <DividedPage left={<SignupMemberLeft />} right={<SignupMemberRight />} leftColor='secondary' />
     <div className='flex min-h-screen'>
diff --git a/apps/app/src/app/(public)/(auth)/signup/layout.tsx b/apps/app/src/app/(public)/(auth)/signup/layout.tsx
new file mode 100644
index 0000000..3300eec
--- /dev/null
+++ b/apps/app/src/app/(public)/(auth)/signup/layout.tsx
@@ -0,0 +1,9 @@
+import { Metadata } from 'next';
+
+export const metadata: Metadata = {
+  title: 'Event Dee - Signup',
+};
+
+export default function SignupLayout({ children }: { children: React.ReactNode }) {
+  return <>{children}</>;
+}
diff --git a/apps/app/src/app/(public)/(auth)/signup/page.tsx b/apps/app/src/app/(public)/(auth)/signup/page.tsx
index eac4a16..cd43564 100644
--- a/apps/app/src/app/(public)/(auth)/signup/page.tsx
+++ b/apps/app/src/app/(public)/(auth)/signup/page.tsx
@@ -2,10 +2,6 @@ import { Metadata } from 'next';
 import Link from 'next/link';
 import React from 'react';
 
-export const metadata: Metadata = {
-  title: 'Event Dee - Login',
-};
-
 // Th9is page could ask if user wants to signuo as freelancer or company and procide links. Or it ciuld be deleted.
 
 function Signup() {
diff --git a/packages/ui/src/forms/ActionButton.tsx b/packages/ui/src/forms/ActionButton.tsx
index f2cf338..ff9f1d4 100644
--- a/packages/ui/src/forms/ActionButton.tsx
+++ b/packages/ui/src/forms/ActionButton.tsx
@@ -20,7 +20,7 @@ export const ActionButton = ({ text, onClick, loading, disabled = false, classNa
 
   return (
     <button
-      className={`btn w-full max-w-xs mx-auto flex-center ${className}`}
+      className={`btn btn-neutral w-full max-w-xs mx-auto flex-center ${className}`}
       {...buttonProps}
       disabled={disabled}>
       {loading ? <PulseLoader color={colorMap.white} size={8} speedMultiplier={0.5} /> : text}

From 0d3cca2cdca96aa5ebe1447e9ea6994d87ac4b02 Mon Sep 17 00:00:00 2001
From: AndyOoh <andy.oeee@gmail.com>
Date: Sun, 28 Jan 2024 19:56:00 +0700
Subject: [PATCH 12/15] fix all metadata

---
 .../app/(public)/(auth)/signup/business/page.tsx  |  4 ----
 .../app/src/app/(public)/(auth)/signup/layout.tsx |  9 ---------
 apps/app/src/app/(public)/(auth)/signup/page.tsx  |  4 ++++
 apps/app/src/app/head.tsx                         | 15 ---------------
 4 files changed, 4 insertions(+), 28 deletions(-)
 delete mode 100644 apps/app/src/app/(public)/(auth)/signup/layout.tsx
 delete mode 100644 apps/app/src/app/head.tsx

diff --git a/apps/app/src/app/(public)/(auth)/signup/business/page.tsx b/apps/app/src/app/(public)/(auth)/signup/business/page.tsx
index 22be2a1..7caab00 100644
--- a/apps/app/src/app/(public)/(auth)/signup/business/page.tsx
+++ b/apps/app/src/app/(public)/(auth)/signup/business/page.tsx
@@ -2,10 +2,6 @@ import { Metadata } from 'next';
 import { SignupBusinessLeft } from './SignupBusinessLeft/SignupBusinessLeft';
 import { SignupBusinessRight } from './SignupBusinessRight/SignupBusinessRight';
 
-export const metadata: Metadata = {
-  title: 'Event Dee - Signup',
-};
-
 function SignupBusiness() {
   return (
     // <DividedPage left={<SignupMemberLeft />} right={<SignupMemberRight />} leftColor='secondary' />
diff --git a/apps/app/src/app/(public)/(auth)/signup/layout.tsx b/apps/app/src/app/(public)/(auth)/signup/layout.tsx
deleted file mode 100644
index 3300eec..0000000
--- a/apps/app/src/app/(public)/(auth)/signup/layout.tsx
+++ /dev/null
@@ -1,9 +0,0 @@
-import { Metadata } from 'next';
-
-export const metadata: Metadata = {
-  title: 'Event Dee - Signup',
-};
-
-export default function SignupLayout({ children }: { children: React.ReactNode }) {
-  return <>{children}</>;
-}
diff --git a/apps/app/src/app/(public)/(auth)/signup/page.tsx b/apps/app/src/app/(public)/(auth)/signup/page.tsx
index cd43564..cc05c3f 100644
--- a/apps/app/src/app/(public)/(auth)/signup/page.tsx
+++ b/apps/app/src/app/(public)/(auth)/signup/page.tsx
@@ -2,6 +2,10 @@ import { Metadata } from 'next';
 import Link from 'next/link';
 import React from 'react';
 
+export const metadata: Metadata = {
+  title: 'Event Dee - Signup',
+};
+
 // Th9is page could ask if user wants to signuo as freelancer or company and procide links. Or it ciuld be deleted.
 
 function Signup() {
diff --git a/apps/app/src/app/head.tsx b/apps/app/src/app/head.tsx
deleted file mode 100644
index bf15b26..0000000
--- a/apps/app/src/app/head.tsx
+++ /dev/null
@@ -1,15 +0,0 @@
-// export default function Head() {
-//   return (
-//     <>
-//       <title>Home</title>
-//       <meta content='width=device-width, initial-scale=1' name='viewport' />
-//       <meta name='description' content='Generated by create next app' />
-//       {/* <link rel='icon' type='image/png' sizes='16x16' href='/images/old-favicon.ico' /> */}
-//       {/* <link rel='icon' type='image/png' sizes='16x16' href='/logo/favicon2.ico' /> */}
-//       {/* <link rel='icon' type='image/png' sizes='16x16' href='/logo/favicon.ico' /> */}
-//       <link rel='icon' type='image/png' sizes='16x16' href='/logo/logo-d-trans.png' />
-//       {/* <link rel="icon" type="image/png" sizes="16x16" href="../favicon.ico" /> */}
-//       {/* <link rel="icon" href="../../public/favicon.ico" /> */}
-//     </>
-//   );
-// }

From e73e38305cfa48b7315ef9acd5893c547817ecaa Mon Sep 17 00:00:00 2001
From: AndyOoh <andy.oeee@gmail.com>
Date: Sun, 28 Jan 2024 19:56:50 +0700
Subject: [PATCH 13/15] Events metadata

---
 apps/app/src/app/(protected)/events/layout.tsx | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/apps/app/src/app/(protected)/events/layout.tsx b/apps/app/src/app/(protected)/events/layout.tsx
index 66c9d35..3a60681 100644
--- a/apps/app/src/app/(protected)/events/layout.tsx
+++ b/apps/app/src/app/(protected)/events/layout.tsx
@@ -1,3 +1,9 @@
+import { Metadata } from 'next';
+
+export const metadata: Metadata = {
+  title: 'Event Dee - Events',
+};
+
 export default function EventsLayout({ children }: { children: React.ReactNode }) {
   return <div className='w-full'>{children}</div>;
 }

From 03f11308b45b50cc2d34157c762a1905061852f0 Mon Sep 17 00:00:00 2001
From: AndyOoh <andy.oeee@gmail.com>
Date: Sun, 28 Jan 2024 19:58:51 +0700
Subject: [PATCH 14/15] metadata multiple pages

---
 .../src/app/(combo)/(legal)/terms-and-conditions/page.tsx  | 7 +++++--
 apps/app/src/app/(protected)/events/create/page.tsx        | 5 +++++
 apps/app/src/app/(protected)/profile/page.tsx              | 5 +++++
 apps/app/src/app/(protected)/search/page.tsx               | 7 +++++--
 apps/app/src/app/(protected)/settings/page.tsx             | 7 +++++--
 5 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/apps/app/src/app/(combo)/(legal)/terms-and-conditions/page.tsx b/apps/app/src/app/(combo)/(legal)/terms-and-conditions/page.tsx
index 2746b87..f951284 100644
--- a/apps/app/src/app/(combo)/(legal)/terms-and-conditions/page.tsx
+++ b/apps/app/src/app/(combo)/(legal)/terms-and-conditions/page.tsx
@@ -1,9 +1,12 @@
 import React from 'react';
 import { termsAndConditions } from './termsAndConditions';
+import { Metadata } from 'next';
 
-type Props = {};
+export const metadata: Metadata = {
+  title: 'Event Dee - terms and conditions',
+};
 
-export default function TermsAndCoonditions({}: Props) {
+export default function TermsAndCoonditions() {
   return (
     <>
       <h1>TermsAndCoonditions</h1>
diff --git a/apps/app/src/app/(protected)/events/create/page.tsx b/apps/app/src/app/(protected)/events/create/page.tsx
index 34f79c4..97461d3 100644
--- a/apps/app/src/app/(protected)/events/create/page.tsx
+++ b/apps/app/src/app/(protected)/events/create/page.tsx
@@ -1,5 +1,10 @@
+import { Metadata } from 'next';
 import { CreateEventForm } from './form';
 
+export const metadata: Metadata = {
+  title: 'Event Dee - Create Event',
+};
+
 export default function CreateEvent() {
   return (
     <div className='flex flex-col gap-4 w-full'>
diff --git a/apps/app/src/app/(protected)/profile/page.tsx b/apps/app/src/app/(protected)/profile/page.tsx
index aac96a2..da18242 100644
--- a/apps/app/src/app/(protected)/profile/page.tsx
+++ b/apps/app/src/app/(protected)/profile/page.tsx
@@ -1,5 +1,10 @@
 import { PhotoForm } from './components/photo-form';
 import { EditProfileForm } from './components/form';
+import { Metadata } from 'next';
+
+export const metadata: Metadata = {
+  title: 'Event Dee - Profile',
+};
 
 /*
  * This is the Profile page as seen from the user's perspective with edittable fields
diff --git a/apps/app/src/app/(protected)/search/page.tsx b/apps/app/src/app/(protected)/search/page.tsx
index f5ff915..d3a0f0e 100644
--- a/apps/app/src/app/(protected)/search/page.tsx
+++ b/apps/app/src/app/(protected)/search/page.tsx
@@ -1,7 +1,10 @@
+import { Metadata } from 'next';
 import React from 'react';
 
-type Props = {};
+export const metadata: Metadata = {
+  title: 'Event Dee - Search',
+};
 
-export default function SearchPage(props: Props) {
+export default function SearchPage() {
   return <div>SearchPage</div>;
 }
diff --git a/apps/app/src/app/(protected)/settings/page.tsx b/apps/app/src/app/(protected)/settings/page.tsx
index 5b6b3ed..5623072 100644
--- a/apps/app/src/app/(protected)/settings/page.tsx
+++ b/apps/app/src/app/(protected)/settings/page.tsx
@@ -1,10 +1,13 @@
 import React from 'react';
 import { ChangePasswordForm } from './components/change-pw-form';
 import { DeleteAccountForm } from './components/delete-acc-form';
+import { Metadata } from 'next';
 
-type Props = {};
+export const metadata: Metadata = {
+  title: 'Event Dee - Settings',
+};
 
-export default function SettingsPage(props: Props) {
+export default function SettingsPage() {
   return (
     <div className='flex flex-col gap-4 w-full'>
       <h1 className='text-3xl'>Account Settings</h1>

From b58dca6c5ddbb2fb5c3f5f91c0cfc997790fe5d5 Mon Sep 17 00:00:00 2001
From: AndyOoh <andy.oeee@gmail.com>
Date: Sun, 28 Jan 2024 19:59:55 +0700
Subject: [PATCH 15/15] priv pol metadata

---
 apps/app/src/app/(combo)/(legal)/privacy-policy/page.tsx | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/apps/app/src/app/(combo)/(legal)/privacy-policy/page.tsx b/apps/app/src/app/(combo)/(legal)/privacy-policy/page.tsx
index 7edfab7..d09d493 100644
--- a/apps/app/src/app/(combo)/(legal)/privacy-policy/page.tsx
+++ b/apps/app/src/app/(combo)/(legal)/privacy-policy/page.tsx
@@ -1,9 +1,12 @@
 import React from 'react';
 import { privacyPolicy } from './privacyPolicy';
+import { Metadata } from 'next';
 
-type Props = {};
+export const metadata: Metadata = {
+  title: 'Event Dee - Privacy Policy',
+};
 
-export default function PrivacyPolicy({}: Props) {
+export default function PrivacyPolicy() {
   return (
     <>
       <h1>PrivacyPolicy</h1>