Merge pull request #35 from InternPulse/feature-base

Feature base

Author: musiphaS

package-lock.json

@@ -24,6 +24,7 @@
     "@radix-ui/react-slot": "^1.1.0",
     "@radix-ui/react-switch": "^1.1.1",
     "@radix-ui/react-tabs": "^1.1.1",
+    "@radix-ui/react-toast": "^1.2.3",
     "admin-controls": "file:",
     "axios": "^1.7.8",
     "class-variance-authority": "^0.7.0",
@@ -33,6 +34,7 @@
     "lucide": "^0.468.0",
     "lucide-react": "^0.460.0",
     "motion": "^11.11.17",
+    "next-themes": "^0.4.4",
     "react": "^18.3.1",
     "react-custom-scrollbars-2": "^4.5.0",
     "react-dom": "^18.3.1",
@@ -42,6 +44,7 @@
     "react-toastify": "^10.0.6",
     "react-world-flags": "^1.6.0",
     "recharts": "^2.14.1",
+    "sonner": "^1.7.1",
     "swiper": "^11.1.15",
     "tailwind-merge": "^2.5.4",
     "tailwindcss-animate": "^1.0.7",

package.json

@@ -17,18 +17,20 @@ import ContactUs from "./pages/ContactUs";
 import RenergyBlog from "./pages/RenergyBlog";
 import BlogDetail from "./pages/BlogDetail";
 import ProductList from "./shoppingcart/ProductList";
-import BuyerDashboard from "./buyer-dashboard/BuyerDashboard";
 //import AdminDashboard from "./components/AdminDashboard/AdminDashboard"; // From oo-branch
-
+import { Toaster } from "sonner";
+import BuyerDashboard from "./buyer-dashboard/BuyerDashboard";
 function App() {
   return (
     <div className="overflow-x-hidden w-full max-w-full">
       <Routes>
+        
         <Route path="/" element={<LandingPage />} />
         <Route path="/about" element={<AboutUs />} />
         <Route path="/contact_us" element={<ContactUs />} />
         <Route path="/blog" element={<RenergyBlog />} />
         <Route path="/blog-detail" element={<BlogDetail />} />
+        
         <Route path="/vendor-dashboard/*" element={<VendorDashboard />} />
         {/* <Route path="/admin-dashboard" element={<AdminDashboard />} /> */}
 
@@ -40,6 +42,7 @@ function App() {
         <Route path="/authentication/*" element={<Auth />} />
         <Route path="/*" element={<Vendor />} />
         <Route path="/product/*" element={<Product />} />
+        
         <Route path="/settings/*" element={<SettingsRoutes />} />
         <Route
           path="/security-compliance"
@@ -55,7 +58,9 @@ function App() {
         <Route path="/shopping-cart" element={<ProductList />} />
         <Route path="/admin/*" element={<AdminDashboardRoutes />} />{" "}
         {/* From oo-branch */}
+       
       </Routes>
+      <Toaster/>
     </div>
   );
 }

pnpm-lock.yaml

@@ -170,10 +170,7 @@ const BuyerSignup: React.FC = () => {
         <div className="flex flex-col items-center space-y-4 lg:space-y-0 lg:space-x-4">
           <button
             className="flex items-center justify-center w-full px-6 py-2 border-2 border-gray-100 rounded-md hover:bg-green-800 transition"
-            onClick={() =>
-              (window.location.href =
-                "https://renergy-hub-express-backend.onrender.com/api/v1/auth/google")
-            }
+            
           >
             <img src={google} alt="google" className="mr-2" />
             Google

public/greenpanel.png

@@ -36,7 +36,8 @@ const Login = () => {
         response.headers["access-token"] || response.headers["Authorization"];
       console.log("Token received from API:", token);
       const user = response.data?.data;
-
+      const cookies = response.headers['set-cookie'];
+      console.log('Cookies from response header:', cookies);
       if (token) {
         localStorage.setItem("authToken", token);
         console.log("Token saved to Local Storage:", token);
@@ -49,7 +50,7 @@ const Login = () => {
       setUserId(user.id);
 
       if (user.userType === "CUSTOMER") {
-        navigate("/userprofile", { state: { userId: user.id } });
+        navigate("/buyer-dashboard", { state: { userId: user.id } });
       } else if (user.userType === "VENDOR") {
 
         navigate("/vendor-dashboard", { state: { userId: user.id } });

public/panel.png

@@ -158,10 +158,8 @@ const VendorSignup: React.FC = () => {
         <div className="flex flex-col items-center space-y-4 lg:space-y-0 lg:space-x-4">
           <button
             className="flex items-center justify-center w-full px-6 py-2 border-2 border-gray-100 rounded-md hover:bg-green-800 transition"
-            onClick={() =>
-              (window.location.href =
-                "https://renergy-hub-express-backend.onrender.com/api/v1/auth/google")
-            }
+            
+            
           >
             <img src={google} alt="google" className="mr-2" />
             Google

src/App.tsx

@@ -1,25 +1,46 @@
-
-import { Routes, Route } from 'react-router-dom';
+import { Routes, Route, Outlet } from 'react-router-dom';
 import BuyerOverview from "./pages/BuyerOverview";
 import BuyerSideBar from "../components/BuyerSideBar";
 import SavedProducts from './pages/SavedProducts';
 import BuyerNavbar from './components/BuyerNavbar';
+import BuyerOrders from './pages/BuyerOrders';
+import CancelledOrders from './pages/CancelledOrders';
 
-
-function BuyerDashboard() {
+function BuyerLayout() {
   return (
-      <div className="flex h-screen">
-        <BuyerSideBar/>
-        <div className='flex flex-col h-screen'>
-          <BuyerNavbar/>
-        <Routes>
-          <Route path="/" element={<BuyerOverview />} />
-          <Route path="/saved-products" element={<SavedProducts />} />
-        </Routes>
+    <div className="flex h-screen">
+      {/* Sidebar */}
+      <BuyerSideBar />
+
+      {/* Main Content */}
+      <div className="bg-[#E6E6E6] flex flex-col h-screen w-full">
+        {/* Navbar and Header */}
+        <BuyerNavbar />
+
+        {/* Outlet for page-specific content */}
+        <div className="bg-[#E6E6E6]  flex-grow">
+          <Outlet />
         </div>
       </div>
+    </div>
+  );
+}
+
+function BuyerDashboard() {
+  return (
+    <Routes>
+      {/* Parent Route */}
+      <Route path="/" element={<BuyerLayout />}>
+        {/* Default Route (Overview) */}
+        <Route index element={<BuyerOverview />} />
 
-  )
+        {/* Saved Products Route */}
+        <Route path="/saved-products" element={<SavedProducts />} />
+        <Route path="/ordered-products" element={<BuyerOrders/>} />
+        <Route path="/orders-cancelled" element={<CancelledOrders/>} />
+      </Route>
+    </Routes>
+  );
 }
 
-export default BuyerDashboard
+export default BuyerDashboard;