diff --git a/Pottery-website/.gitignore b/Pottery-website/.gitignore index a547bf3..4108b33 100644 --- a/Pottery-website/.gitignore +++ b/Pottery-website/.gitignore @@ -1,24 +1,24 @@ -# Logs -logs -*.log -npm-debug.log* -yarn-debug.log* -yarn-error.log* -pnpm-debug.log* -lerna-debug.log* - -node_modules -dist -dist-ssr -*.local - -# Editor directories and files -.vscode/* -!.vscode/extensions.json -.idea -.DS_Store -*.suo -*.ntvs* -*.njsproj -*.sln -*.sw? +# Logs +logs +*.log +npm-debug.log* +yarn-debug.log* +yarn-error.log* +pnpm-debug.log* +lerna-debug.log* + +node_modules +dist +dist-ssr +*.local + +# Editor directories and files +.vscode/* +!.vscode/extensions.json +.idea +.DS_Store +*.suo +*.ntvs* +*.njsproj +*.sln +*.sw? diff --git a/Pottery-website/App.tsx b/Pottery-website/App.tsx index 1ec7a52..65910c2 100644 --- a/Pottery-website/App.tsx +++ b/Pottery-website/App.tsx @@ -1,66 +1,68 @@ -import React, { Suspense, lazy } from 'react'; -import { BrowserRouter as Router, Routes, Route } from 'react-router-dom'; -import Header from './components/Header'; -import Footer from './components/Footer'; -import Cart from './components/Cart'; -import ScrollToTop from './components/ScrollToTop'; -import RouteTransition from './components/RouteTransition'; -import { StoreProvider } from './src/context/StoreContext'; - -// Lazy load pages for better performance -const Home = lazy(() => import('./pages/Home')); -const Collections = lazy(() => import('./pages/Collections')); -const Atelier = lazy(() => import('./pages/Atelier')); -const Editorial = lazy(() => import('./pages/Editorial')); -const ProductPhotography = lazy(() => import('./pages/Journal/ProductPhotography')); -const PackagingGuide = lazy(() => import('./pages/Journal/PackagingGuide')); -const MotivationInClay = lazy(() => import('./pages/Journal/MotivationInClay')); -const ProductDetail = lazy(() => import('./pages/ProductDetail')); -const ArticleDetail = lazy(() => import('./pages/ArticleDetail')); -const Checkout = lazy(() => import('./pages/Checkout')); -const MockPayment = lazy(() => import('./pages/MockPayment')); -const Success = lazy(() => import('./pages/Success')); -const Admin = lazy(() => import('./pages/Admin')); -const FAQ = lazy(() => import('./pages/FAQ')); -const Shipping = lazy(() => import('./pages/Shipping')); -const Returns = lazy(() => import('./pages/Returns')); -const Contact = lazy(() => import('./pages/Contact')); -const Privacy = lazy(() => import('./pages/Privacy')); -const Cookies = lazy(() => import('./pages/Cookies')); - -function App() { - return ( - - - -
- - - - - } /> - } /> +import React, { Suspense, lazy } from 'react'; +import { BrowserRouter as Router, Routes, Route, Navigate } from 'react-router-dom'; +import Header from './components/Header'; +import Footer from './components/Footer'; +import Cart from './components/Cart'; +import ScrollToTop from './components/ScrollToTop'; +import RouteTransition from './components/RouteTransition'; +import { StoreProvider } from './src/context/StoreContext'; + +// Lazy load pages for better performance +const Home = lazy(() => import('./pages/Home')); +const Collections = lazy(() => import('./pages/Collections')); +const Atelier = lazy(() => import('./pages/Atelier')); +const Editorial = lazy(() => import('./pages/Editorial')); +const ProductPhotography = lazy(() => import('./pages/Journal/ProductPhotography')); +const PackagingGuide = lazy(() => import('./pages/Journal/PackagingGuide')); +const MotivationInClay = lazy(() => import('./pages/Journal/MotivationInClay')); +const ProductDetail = lazy(() => import('./pages/ProductDetail')); +const ArticleDetail = lazy(() => import('./pages/ArticleDetail')); +const Checkout = lazy(() => import('./pages/Checkout')); +const MockPayment = lazy(() => import('./pages/MockPayment')); +const Success = lazy(() => import('./pages/Success')); +const FAQ = lazy(() => import('./pages/FAQ')); +const Shipping = lazy(() => import('./pages/Shipping')); +const Returns = lazy(() => import('./pages/Returns')); +const Contact = lazy(() => import('./pages/Contact')); +const Privacy = lazy(() => import('./pages/Privacy')); +const Cookies = lazy(() => import('./pages/Cookies')); + +function App() { + return ( + + + +
+ + + + + } /> + } /> } /> } /> } /> + } /> + } /> + } /> } /> - } /> - } /> - } /> - } /> - } /> - } /> - } /> - } /> - } /> - } /> - - - -