definecoder · nafi-ullah · Mar 31, 2024 · Mar 30, 2024 · Mar 30, 2024 · Mar 30, 2024
diff --git a/.DS_Store b/.DS_Store
diff --git a/client/app/auth/change-password/page.tsx b/client/app/auth/change-password/page.tsx
@@ -13,6 +13,7 @@ import { Input } from "@/components/ui/input";
 import { Label } from "@/components/ui/label";
 import useChangePass from "@/hooks/auth/useChangePass";
 import { setCookie } from "@/lib/cookieFunctions";
+import { message } from "antd";
 import Link from "next/link";
 import { useRouter } from "next/navigation";
 import { useEffect, useState } from "react";
@@ -34,7 +35,7 @@ export default function ChangePassword() {
       setTime((time) => {
         if (time === 0) {
           clearInterval(timer);
-          alert("Time Expired!");
+          message.error("Time Expired!");
           router.push("/dashboard");
           return 0;
         } else return time - 0.5;
@@ -45,7 +46,7 @@ export default function ChangePassword() {
   async function submitForm() {
 
     isVerified && (await changePass()) && router.push("/dashboard");
-    !isVerified && alert("Invalid Captcha!");
+    !isVerified && message.error("Invalid Captcha!");
   }
 
   return (

diff --git a/client/app/auth/reset-password/initiate/forgetPasswordInitiate.tsx b/client/app/auth/reset-password/initiate/forgetPasswordInitiate.tsx
@@ -9,6 +9,7 @@ import { useRouter } from "next/navigation";
 import useForgetPassInitiate from "@/hooks/auth/useForgetPassInitiate";
 import { useContext, useState } from "react";
 import ReCAPTCHA from "react-google-recaptcha";
+import { message } from "antd";
 
 function ForgetPassInitiateForm() {
   const { userEmail, setUserEmail, initiate } = useForgetPassInitiate();
@@ -18,7 +19,7 @@ function ForgetPassInitiateForm() {
   async function handleFormSubmit(e: React.FormEvent<HTMLFormElement>) {
     e.preventDefault();
     if (!isCaptchaVerified) {
-      alert("Please verify that you are not a robot.");
+      message.warning("Please verify that you are not a robot.");
       return;
     }
     const success = await initiate();

diff --git a/client/app/auth/signup/leftImage.tsx b/client/app/auth/signup/leftImage.tsx
diff --git a/client/app/auth/signup/page.tsx b/client/app/auth/signup/page.tsx
diff --git a/client/app/auth/signup/rightForm.tsx b/client/app/auth/signup/rightForm.tsx
diff --git a/client/app/layout.tsx b/client/app/layout.tsx
@@ -3,6 +3,7 @@ import { Inter } from "next/font/google";
 import "./globals.css";
 import '@mantine/core/styles.css';
 import '@mantine/charts/styles.css';
+import { AntdRegistry } from '@ant-design/nextjs-registry';
 
 import { ColorSchemeScript, MantineProvider } from '@mantine/core';
 
@@ -26,7 +27,7 @@ export default function RootLayout({
       <head>
         <ColorSchemeScript />
       </head>
-      <body className={inter.className}><MantineProvider>{children}</MantineProvider></body>
+      <body className={inter.className}><AntdRegistry><MantineProvider>{children}</MantineProvider></AntdRegistry></body>
     </html>
   );
 }
diff --git a/client/app/page.tsx b/client/app/page.tsx
@@ -1,10 +1,28 @@
+import Hero from "@/components/Homepage/Hero";
+import Navbar from "@/components/Homepage/Navbar";
 import Image from "next/image";
+import SectionTitle from "@/components/Homepage/SectionTitle";import Benifit from "@/components/Homepage/Benifit";
+import Deliverable from "@/components/Homepage/Deliverables";
+import Teamintro from "@/components/Homepage/Teamintro";
+;
 
 export default function Home() {
   return (
-    <main>
-      <h1>Welcome to EcoSync</h1>
-      <Image src="/logo.png" alt="EcoSync" width={200} height={200} />
+    <main className="bg-[#EEF7FC]">
+      <Navbar/>
+      <Hero />
+      <SectionTitle
+        pretitle="EcoSync Benefits"
+        title=" Why should you use this EcoSync Software">
+        Our dashboard empowers Dhaka South City Corporation to allocate resources more effectively, 
+        optimizing manpower and equipment utilization for waste management tasks, thus fostering operational efficiency, reducing operational costs, 
+        and ultimately leading to a cleaner, more sustainable urban environment.
+      </SectionTitle>
+      <Benifit/>
+      <Deliverable/>
+      <Teamintro/>
+
     </main>
   );
 }
+// /<Image src="/logo.png" alt="EcoSync" width={200} height={200} />
diff --git a/client/app/profile/[userId]/page.tsx b/client/app/profile/[userId]/page.tsx