From e487dc68ff06095c4852ec4ef2bdc0c409b70826 Mon Sep 17 00:00:00 2001 From: Aarni Halinen Date: Wed, 30 Dec 2020 00:17:00 +0200 Subject: [PATCH] SWR for Data fetching on Front, Actual & Corporate pages --- package-lock.json | 13 ++++ package.json | 3 +- src/pages/index.tsx | 55 ++++++++++------ src/pages/kilta/toiminta.tsx | 117 +++++++++++----------------------- src/pages/yritysyhteistyo.tsx | 34 ++++++++-- 5 files changed, 116 insertions(+), 106 deletions(-) diff --git a/package-lock.json b/package-lock.json index 26e645b..fb56697 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5545,6 +5545,11 @@ "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=" }, + "dequal": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.2.tgz", + "integrity": "sha512-q9K8BlJVxK7hQYqa6XISGmBZbtQQWVXSrRrWreHC94rMt1QL/Impruc+7p2CYSYuVIUr+YCt6hjrs1kkdJRTug==" + }, "des.js": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz", @@ -14237,6 +14242,14 @@ "integrity": "sha1-WPcc7jvVGbWdSyqEO2x95krAR2Q=", "dev": true }, + "swr": { + "version": "0.3.11", + "resolved": "https://registry.npmjs.org/swr/-/swr-0.3.11.tgz", + "integrity": "sha512-ya30LuRGK2R7eDlttnb7tU5EmJYJ+N6ytIOM2j0Hqs0qauJcDjVLDOGy7KmFeH5ivOwLHalFaIyYl2K+SGa7HQ==", + "requires": { + "dequal": "2.0.2" + } + }, "symbol-observable": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz", diff --git a/package.json b/package.json index ffcd291..ca598c4 100644 --- a/package.json +++ b/package.json @@ -96,6 +96,7 @@ "react-markdown": "4.3.1", "react-mde": "11.0.0", "shortid": "2.2.14", - "styled-components": "5.1.1" + "styled-components": "5.1.1", + "swr": "0.3.11" } } diff --git a/src/pages/index.tsx b/src/pages/index.tsx index e4ebda4..ce63cf8 100644 --- a/src/pages/index.tsx +++ b/src/pages/index.tsx @@ -1,29 +1,46 @@ import React from "react"; import { NextPage, GetServerSideProps } from "next"; -import { getEvents } from "@models/Event"; -import { getFeed } from "@models/Feed"; +import Head from "next/head"; +import useSWR from "swr"; +import { Event, getEvents } from "@models/Event"; +import { Post, getFeed } from "@models/Feed"; import FrontPageView from "@views/FrontPage/FrontPageView"; -import Header from "@components/Header"; -import Footer from "@components/Footer/Footer"; +import PageWrapper from "@views/common/PageWrapper"; -const FrontPage: NextPage> = (props) => ( - <> -
- -