From b2b0ed63758e90973824460dd2c2685d38dc3c19 Mon Sep 17 00:00:00 2001 From: Aarni Halinen Date: Tue, 29 Jun 2021 16:40:03 +0300 Subject: [PATCH] remove unnecessary SWR hooks --- src/pages/events/[id].tsx | 24 +++++++----------------- src/pages/feed/[id].tsx | 24 +++++++----------------- src/pages/in_english.tsx | 2 +- src/pages/index.tsx | 2 +- src/pages/kilta/toiminta.tsx | 2 +- src/pages/signup/[id].tsx | 1 + src/pages/yritysyhteistyo.tsx | 2 +- 7 files changed, 19 insertions(+), 38 deletions(-) diff --git a/src/pages/events/[id].tsx b/src/pages/events/[id].tsx index a9892d6..bc15082 100644 --- a/src/pages/events/[id].tsx +++ b/src/pages/events/[id].tsx @@ -4,38 +4,27 @@ import Head from "next/head"; import { useRouter } from "next/router"; import Event from "@models/Event"; import EventApi from "@api/eventApi"; -import useFetchEvents from "@hooks/useFetchEvents"; import EventPageView from "@views/EventPage/EventPageView"; import PageWrapper from "@views/common/PageWrapper"; import LoadingView from "@views/common/LoadingView"; -import NotFoundPage from "@pages/404"; interface InitialProps { - initialEvent: Event; + event: Event; } -const EventPage: NextPage = ({ initialEvent }) => { +const EventPage: NextPage = ({ event }) => { const router = useRouter(); const { id } = router.query; - // eslint-disable-next-line @typescript-eslint/no-unused-vars - const { data, error } = useFetchEvents({ initialData: initialEvent, id: id as string }); - if (router.isFallback) return ; - if (!data) { - return ( - - ); - } - return ( <> - + ); @@ -58,16 +47,17 @@ export const getStaticPaths: GetStaticPaths = async () => { export const getStaticProps: GetStaticProps = async ({ params }) => { const { id } = params; let notFound = false; - let initialEvent: Event; + let event: Event; try { - initialEvent = await EventApi.getEvent(Number(id)); + event = await EventApi.getEvent(Number(id)); } catch (err) { notFound = true; } return { props: { - initialEvent, + event, }, + revalidate: 30, // Required for deleting hidden pages notFound, }; }; diff --git a/src/pages/feed/[id].tsx b/src/pages/feed/[id].tsx index e8260b3..e32a1a3 100644 --- a/src/pages/feed/[id].tsx +++ b/src/pages/feed/[id].tsx @@ -4,38 +4,27 @@ import Head from "next/head"; import { useRouter } from "next/router"; import Post from "@models/Feed"; import FeedApi from "@api/feedApi"; -import useFetchFeed from "@hooks/useFetchFeed"; import FeedPageView from "@views/FeedPage/FeedPageView"; import PageWrapper from "@views/common/PageWrapper"; import LoadingView from "@views/common/LoadingView"; -import NotFoundPage from "@pages/404"; interface InitialProps { - initialPost: Post; + post: Post; } -const FeedPage: NextPage = ({ initialPost }) => { +const FeedPage: NextPage = ({ post }) => { const router = useRouter(); const { id } = router.query; - // eslint-disable-next-line @typescript-eslint/no-unused-vars - const { data, error } = useFetchFeed({ initialData: initialPost, id: id as string }); - if (router.isFallback) return ; - if (!data) { - return ( - - ); - } - return ( <> - + ); @@ -58,17 +47,18 @@ export const getStaticPaths: GetStaticPaths = async () => { export const getStaticProps: GetStaticProps = async ({ params }) => { const { id } = params; let notFound = false; - let initialPost: Post; + let post: Post; try { - initialPost = await FeedApi.getPost(Number(id)); + post = await FeedApi.getPost(Number(id)); } catch (err) { notFound = true; } return { props: { - initialPost, + post, }, + revalidate: 30, // Required for deleting hidden pages notFound, }; }; diff --git a/src/pages/in_english.tsx b/src/pages/in_english.tsx index 87fdbbc..bcc5d75 100644 --- a/src/pages/in_english.tsx +++ b/src/pages/in_english.tsx @@ -47,7 +47,7 @@ export const getStaticProps: GetStaticProps = async () => { initialEvents, initialFeed, }, - revalidate: 10, + revalidate: 30, }; }; diff --git a/src/pages/index.tsx b/src/pages/index.tsx index bf7be98..3ae54db 100644 --- a/src/pages/index.tsx +++ b/src/pages/index.tsx @@ -47,7 +47,7 @@ export const getStaticProps: GetStaticProps = async () => { initialEvents, initialFeed, }, - revalidate: 10, + revalidate: 30, }; }; diff --git a/src/pages/kilta/toiminta.tsx b/src/pages/kilta/toiminta.tsx index 5122bf3..603481c 100644 --- a/src/pages/kilta/toiminta.tsx +++ b/src/pages/kilta/toiminta.tsx @@ -39,7 +39,7 @@ export const getStaticProps: GetStaticProps = async () => { initialEvents, initialFeed, }, - revalidate: 10, + revalidate: 30, }; }; diff --git a/src/pages/signup/[id].tsx b/src/pages/signup/[id].tsx index 679e52a..6ed331f 100644 --- a/src/pages/signup/[id].tsx +++ b/src/pages/signup/[id].tsx @@ -97,6 +97,7 @@ export const getStaticProps: GetStaticProps = async ({ params }) = props: { initialForm, }, + revalidate: 30, // Required for deleting hidden pages notFound, }; }; diff --git a/src/pages/yritysyhteistyo.tsx b/src/pages/yritysyhteistyo.tsx index 0c185c2..a0c1a9e 100644 --- a/src/pages/yritysyhteistyo.tsx +++ b/src/pages/yritysyhteistyo.tsx @@ -32,7 +32,7 @@ export const getStaticProps: GetStaticProps = async () => { props: { initialJobAds, }, - revalidate: 10, + revalidate: 30, }; };