From 2e2442bb7a99026921826e370dacae501d233a56 Mon Sep 17 00:00:00 2001 From: memeriau Date: Sun, 26 Dec 2021 18:33:12 +0100 Subject: [PATCH] Rename home route to wish and create an empty home route --- src/pages/Home/HomePage.tsx | 27 ++++++++++++++++++++++ src/pages/Home/index.tsx | 4 ++-- src/pages/Home/styles.module.scss | 10 ++++++-- src/pages/{Home/Home.tsx => Wish/Wish.tsx} | 12 +++++----- src/pages/Wish/index.tsx | 15 ++++++++++++ src/pages/Wish/styles.module.scss | 3 +++ src/routes/index.ts | 8 ++++++- 7 files changed, 68 insertions(+), 11 deletions(-) create mode 100755 src/pages/Home/HomePage.tsx rename src/pages/{Home/Home.tsx => Wish/Wish.tsx} (86%) create mode 100755 src/pages/Wish/index.tsx create mode 100755 src/pages/Wish/styles.module.scss diff --git a/src/pages/Home/HomePage.tsx b/src/pages/Home/HomePage.tsx new file mode 100755 index 0000000..9e95112 --- /dev/null +++ b/src/pages/Home/HomePage.tsx @@ -0,0 +1,27 @@ +import { FC, memo } from "react" +import { RouteComponentProps } from "react-router-dom" +import { Helmet } from "react-helmet" + +import { AppThunk } from "../../store" +import styles from "./styles.module.scss" + +export type Props = RouteComponentProps + +const fetchUserData = () => () => Promise.resolve() + +const HomePage: FC = (): JSX.Element => ( +
+
+ +
Tableau de bord
+
+
+) + +// Fetch server-side data here +export const loadData = (): AppThunk[] => [ + fetchUserData(), + // More pre-fetched actions... +] + +export default memo(HomePage) diff --git a/src/pages/Home/index.tsx b/src/pages/Home/index.tsx index b7158ba..0e32223 100755 --- a/src/pages/Home/index.tsx +++ b/src/pages/Home/index.tsx @@ -1,9 +1,9 @@ import loadable from "@loadable/component" import { Loading, ErrorBoundary } from "../../components" -import { Props, loadData } from "./Home" +import { Props, loadData } from "./HomePage" -const Home = loadable(() => import("./Home"), { +const Home = loadable(() => import("./HomePage"), { fallback: , }) diff --git a/src/pages/Home/styles.module.scss b/src/pages/Home/styles.module.scss index a38c8cf..1423793 100755 --- a/src/pages/Home/styles.module.scss +++ b/src/pages/Home/styles.module.scss @@ -1,3 +1,9 @@ -.home { - padding: 0 15px; +@import "../../theme/mixins"; + +.homePage { + @include page-wrapper-center; +} + +.homeContent { + @include page-content-wrapper(600px); } diff --git a/src/pages/Home/Home.tsx b/src/pages/Wish/Wish.tsx similarity index 86% rename from src/pages/Home/Home.tsx rename to src/pages/Wish/Wish.tsx index 0b261cc..2789e78 100755 --- a/src/pages/Home/Home.tsx +++ b/src/pages/Wish/Wish.tsx @@ -3,7 +3,7 @@ import { RouteComponentProps } from "react-router-dom" import { useDispatch, useSelector, shallowEqual } from "react-redux" import { Helmet } from "react-helmet" -import { AppState, AppThunk, EntitiesRequest } from "../../store" +import { AppDispatch, AppState, AppThunk, EntitiesRequest } from "../../store" import { fetchJavGameListIfNeed } from "../../store/javGameList" import { fetchWishListIfNeed } from "../../store/wishList" import { JavGameList, WishAdd } from "../../components" @@ -34,11 +34,11 @@ function useList( } } -const Home: FC = (): JSX.Element => { - const dispatch = useDispatch() +const Wish: FC = (): JSX.Element => { + const dispatch = useDispatch() return ( -
- +
+ {/* {useList((state: AppState) => state.wishList, fetchWishListifNeed)()} */} {useList((state: AppState) => state.javGameList, fetchJavGameListIfNeed)()} @@ -56,4 +56,4 @@ export const loadData = (): AppThunk[] => [ // More pre-fetched actions... ] -export default memo(Home) +export default memo(Wish) diff --git a/src/pages/Wish/index.tsx b/src/pages/Wish/index.tsx new file mode 100755 index 0000000..85dbbbe --- /dev/null +++ b/src/pages/Wish/index.tsx @@ -0,0 +1,15 @@ +import loadable from "@loadable/component" + +import { Loading, ErrorBoundary } from "../../components" +import { Props, loadData } from "./Wish" + +const Wish = loadable(() => import("./Wish"), { + fallback: , +}) + +export default (props: Props): JSX.Element => ( + + + +) +export { loadData } diff --git a/src/pages/Wish/styles.module.scss b/src/pages/Wish/styles.module.scss new file mode 100755 index 0000000..bed7620 --- /dev/null +++ b/src/pages/Wish/styles.module.scss @@ -0,0 +1,3 @@ +.wish { + padding: 0 15px; +} diff --git a/src/routes/index.ts b/src/routes/index.ts index 021b702..10c9f7b 100755 --- a/src/routes/index.ts +++ b/src/routes/index.ts @@ -2,6 +2,7 @@ import { RouteConfig } from "react-router-config" import App from "../app" import AsyncHome, { loadData as loadHomeData } from "../pages/Home" +import AsyncWish, { loadData as loadWishData } from "../pages/Wish" import AsyncVolunteerPage, { loadData as loadVolunteerPageData } from "../pages/VolunteerPage" import Login from "../pages/Login" import Register from "../pages/Register" @@ -26,10 +27,15 @@ export default [ component: Login, }, { - path: "/register", + path: "/home", component: AsyncHome, loadData: loadHomeData, }, + { + path: "/wish", + component: AsyncWish, + loadData: loadWishData, + }, { component: NotFound, },