8000 Refactor router by bartek-sek · Pull Request #19 · Sylius/FrontWing · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Refactor router #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 23, 2025
+111 −65
Merged

Refactor router #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 7 additions & 65 deletions src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,75 +1,17 @@
import React from "react";
import { BrowserRouter as Router, Routes, Route } from "react-router";
import 'react-loading-skeleton/dist/skeleton.css';

import ProductPage from "./pages/ProductPage";
import ProductList from "./pages/ProductList";
import Homepage from "./pages/Homepage";
import CartPage from "./pages/CartPage";
import AddressPage from "./pages/Checkout/AddressPage";
import ShippingPage from "./pages/Checkout/ShippingPage";
import PaymentPage from "./pages/Checkout/PaymentPage";
import SummaryPage from "./pages/Checkout/SummaryPage";
import ThankYouPage from "./pages/Checkout/ThankYouPage";
import LoginPage from "./pages/LoginPage";
import DashboardPage from "./pages/account/DashboardPage";
import OrderHistoryPage from "./pages/account/OrderHistoryPage";
import OrderDetailsPage from "./pages/account/OrderDetailsPage";
import ProfilePage from "./pages/account/ProfilePage.tsx";
import AddressBookPage from "./pages/account/AddressBookPage";
import AddAddressPage from "./pages/account/AddAddressPage";
import EditAddressPage from "./pages/account/EditAddressPage";
import AddReviewPage from "./pages/Product/AddReviewPage";
import ReviewsListPage from "./pages/Product/ReviewsListPage";
import { BrowserRouter as Router } from "react-router";
import "react-loading-skeleton/dist/skeleton.css";

< 8000 span class='blob-code-inner blob-code-marker ' data-code-marker=" ">import "./assets/scss/main.scss";
import { OrderProvider } from "./context/OrderContext";
import { CustomerProvider } from "./context/CustomerContext";
import ChangePasswordPage from "./pages/account/ChangePasswordPage.tsx";
import { FlashMessagesProvider } from "./context/FlashMessagesContext.tsx";
import AppProviders from "./providers/AppProvider.tsx";
import AppRoutes from "./routes/AppRoutes.tsx";

const App: React.FC = () => {
return (
<Router>
<CustomerProvider>
<OrderProvider>
<FlashMessagesProvider>
<Routes>
<Route path="/" element={<Homepage />} />
<Route path="/:parentCode" element={<ProductList />} />
<Route path="/:parentCode/:childCode" element={<ProductList />} />
<Route path="/cart" element={<CartPage />} />
<Route path="/checkout/address" element={<AddressPage />} />
<Route
path="/checkout/select-shipping"
element={<ShippingPage />}
/>
<Route
path="/checkout/select-payment"
element={<PaymentPage />}
/>
<Route path="/checkout/complete" element={<SummaryPage />} />
<Route path="/order/thank-you" element={<ThankYouPage />} />
<Route path="/product/:code" element={<ProductPage />} />
<Route path="/login" element={<LoginPage />} />
<Route path="/account/order-history" element={<OrderHistoryPage />} />
<Route path="/account/dashboard" element={<DashboardPage />} />
<Route path="/account/profile/edit" element={<ProfilePage />} />
<Route
path="/account/change-password"
element={<ChangePasswordPage />}
/>
<Route path="/account/order-history" element={<OrderHistoryPage />} />
<Route path="/account/orders/:token" element={<OrderDetailsPage />} />
<Route path="/account/address-book" element={<AddressBookPage />} />
<Route path="/account/address-book/add" element={<AddAddressPage />} />
<Route path="/account/address-book/edit/:id" element={<EditAddressPage />} />
<Route path="/product/:code/review/new" element={<AddReviewPage />} />
<Route path="/product/:code/reviews" element={<ReviewsListPage />} />
</Routes>
</FlashMessagesProvider>
</OrderProvider>
</CustomerProvider>
<AppProviders>
<AppRoutes />
</AppProviders>
</Router>
);
};
Expand Down
20 changes: 20 additions & 0 deletions src/providers/AppProvider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import React from "react";
import { CustomerProvider } from "../context/CustomerContext";
import { OrderProvider } from "../context/OrderContext";
import { FlashMessagesProvider } from "../context/FlashMessagesContext";

interface AppProvidersProps {
children: React.ReactNode;
}

const AppProviders: React.FC<AppProvidersProps> = ({ children }) => {
return (
<CustomerProvider>
<OrderProvider>
<FlashMessagesProvider>{children}</FlashMessagesProvider>
</OrderProvider>
</CustomerProvider>
);
};

export default AppProviders;
17 changes: 17 additions & 0 deletions src/routes/AppRoutes.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import { useRoutes } from "react-router-dom";
import { accountRoutes } from "./accountRoutes";
import { checkoutRoutes, thankYouRoute } from "./checkoutRoutes";
import { coreRoutes } from "./coreRoutes";
import { productRoutes } from "./productRoutes";

const AppRoutes = () => {
return useRoutes([
...coreRoutes,
...productRoutes,
checkoutRoutes,
thankYouRoute,
accountRoutes,
]);
};

export default AppRoutes;
24 changes: 24 additions & 0 deletions src/routes/accountRoutes.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
import { RouteObject } from "react-router-dom";

import DashboardPage from "../pages/account/DashboardPage";
import OrderHistoryPage from "../pages/account/OrderHistoryPage";
import OrderDetailsPage from "../pages/account/OrderDetailsPage";
import ProfilePage from "../pages/account/ProfilePage";
import AddressBookPage from "../pages/account/AddressBookPage";
import AddAddressPage from "../pages/account/AddAddressPage";
import EditAddressPage from "../pages/account/EditAddressPage";
import ChangePasswordPage from "../pages/account/ChangePasswordPage";

export const accountRoutes: RouteObject = {
path: "account",
children: [
{ path: "dashboard", element: <DashboardPage /> },
{ path: "profile/edit", element: <ProfilePage /> },
10000 { path: "change-password", element: <ChangePasswordPage /> },
{ path: "order-history", element: <OrderHistoryPage /> },
{ path: "orders/:token", element: <OrderDetailsPage /> },
{ path: "address-book", element: <AddressBookPage /> },
{ path: "address-book/add", element: <AddAddressPage /> },
{ path: "address-book/edit/:id", element: <EditAddressPage /> },
],
};
21 changes: 21 additions & 0 deletions src/routes/checkoutRoutes.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import { RouteObject } from "react-router-dom";
import AddressPage from "../pages/Checkout/AddressPage";
import ShippingPage from "../pages/Checkout/ShippingPage";
import PaymentPage from "../pages/Checkout/PaymentPage";
import SummaryPage from "../pages/Checkout/SummaryPage";
import ThankYouPage from "../pages/Checkout/ThankYouPage";

export const checkoutRoutes: RouteObject = {
path: "checkout",
children: [
{ path: "address", element: <AddressPage /> },
{ path: "select-shipping", element: <ShippingPage /> },
{ path: "select-payment", element: <PaymentPage /> },
{ path: "complete", element: <SummaryPage /> },
],
};

export const thankYouRoute: RouteObject = {
path: "order/thank-you",
element: <ThankYouPage />,
};
10 changes: 10 additions & 0 deletions src/routes/coreRoutes.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import { RouteObject } from "react-router-dom";
import Homepage from "../pages/Homepage";
import CartPage from "../pages/CartPage";
import LoginPage from "../pages/LoginPage";

export const coreRoutes: RouteObject[] = [
{ path: "/", element: <Homepage /> },
{ path: "cart", element: <CartPage /> },
{ path: "login", element: <LoginPage /> },
];
12 changes: 12 additions & 0 deletions src/routes/productRoutes.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import ProductList from "../pages/ProductList";
import ProductPage from "../pages/ProductPage";
import AddReviewPage from "../pages/Product/AddReviewPage";
import ReviewsListPage from "../pages/Product/ReviewsListPage";

export const productRoutes = [
{ path: "/:parentCode", element: <ProductList /> },
{ path: "/:parentCode/:childCode", element: <ProductList /> },
{ path: "/product/:code", element: <ProductPage /> },
{ path: "/product/:code/review/new", element: <AddReviewPage /> },
{ path: "/product/:code/reviews", element: <ReviewsListPage /> },
];
0