Merge pull request #9 from Zenfulcode/webshop-rework

Webshop rework and auth implementation
Zenfulcode · Dec 1, 2024 · 49217b1 · 49217b1
2 parents a8ab615 + e740b07
commit 49217b1
Show file tree

Hide file tree

Showing 23 changed files with 1,234 additions and 245 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -24,6 +24,7 @@
     "react": "^18",
     "react-dom": "^18",
     "react-hook-form": "^7.53.2",
+    "sharp": "^0.33.5",
     "tailwind-merge": "^2.5.5",
     "tailwindcss-animate": "^1.0.7",
     "zod": "^3.23.8"

diff --git a/src/app/(client)/auth/login/page.tsx b/src/app/(client)/auth/login/page.tsx
@@ -0,0 +1,9 @@
+import { LoginForm } from "@/components/authentication/AuthForms";
+
+export default function LoginPage() {
+  return (
+    <div className="container mx-auto py-8">
+      <LoginForm />
+    </div>
+  );
+}
diff --git a/src/app/(client)/auth/register/page.tsx b/src/app/(client)/auth/register/page.tsx
@@ -0,0 +1,9 @@
+import { RegisterForm } from "@/components/authentication/AuthForms";
+
+export default function RegisterPage() {
+  return (
+    <div className="container mx-auto py-8">
+      <RegisterForm />
+    </div>
+  );
+}
diff --git a/src/app/(client)/layout.tsx b/src/app/(client)/layout.tsx
@@ -3,6 +3,7 @@ import type { Metadata } from 'next'
 import { CartProvider } from '@/context/CartContext'
 import { CartSheet } from '@/components/webshop/CartSheet'
 import { Toaster } from '@/components/ui/toaster'
+import { AuthProvider } from '@/context/AuthContext'
 
 export const metadata: Metadata = {
   title: 'Commercify Demo Store',
@@ -17,18 +18,20 @@ export default function RootLayout({
   return (
     <html lang="en">
       <body>
-        <CartProvider>
-          <div className="relative">
-            <header className="sticky top-0 z-50 bg-background border-b">
-              <div className="container mx-auto px-4 h-16 flex items-center justify-between">
-                <nav>{/* Your navigation items */}</nav>
-                <CartSheet />
-              </div>
-            </header>
-            <Toaster />
-            <main>{children}</main>
-          </div>
-        </CartProvider>
+        <AuthProvider>
+          <CartProvider>
+            <div className="relative">
+              <header className="sticky top-0 z-50 bg-background border-b">
+                <div className="container mx-auto px-4 h-16 flex items-center justify-between">
+                  <nav>{/* Your navigation items */}</nav>
+                  <CartSheet />
+                </div>
+              </header>
+              <Toaster />
+              <main>{children}</main>
+            </div>
+          </CartProvider>
+        </AuthProvider>
       </body>
     </html>
   )

diff --git a/src/app/(client)/page.tsx b/src/app/(client)/page.tsx
@@ -8,6 +8,7 @@ import ProductCard from '@/components/products/ProductCard';
 
 const ProductsPage: React.FC = () => {
   const [products, setProducts] = React.useState<Product[]>([]);
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   const [pageInfo, setPageInfo] = React.useState<PageInfo | null>(null);
   const [loading, setLoading] = React.useState(true);
   const [error, setError] = React.useState<string | null>(null);
@@ -24,8 +25,9 @@ const ProductsPage: React.FC = () => {
         setProducts(response._embedded.productViewModels);
         setPageInfo(response.page);
       } catch (err) {
-
-        setError(err);
+        if(err instanceof Error) {
+          setError(err.message);
+        }
       } finally {
         setLoading(false);
       }

diff --git a/src/app/admin/layout.tsx b/src/app/admin/layout.tsx
diff --git a/src/app/admin/login/page.tsx b/src/app/admin/login/page.tsx
diff --git a/src/app/admin/orders/page.tsx b/src/app/admin/orders/page.tsx
diff --git a/src/app/admin/page.tsx b/src/app/admin/page.tsx
diff --git a/src/app/admin/products/page.tsx b/src/app/admin/products/page.tsx
diff --git a/src/app/admin/users/page.tsx b/src/app/admin/users/page.tsx