From ded15152c4147fac4efc1ae8268d7125a0f6fd1c Mon Sep 17 00:00:00 2001 From: swve Date: Thu, 23 Jun 2022 21:11:30 +0200 Subject: [PATCH 1/3] =?UTF-8?q?=F0=9F=90=9B=20fix=20sessions=20issue?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/Header/Header.tsx | 15 ++++++--------- next.config.js | 1 + 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/components/Header/Header.tsx b/components/Header/Header.tsx index 1d8d161..6d2145a 100644 --- a/components/Header/Header.tsx +++ b/components/Header/Header.tsx @@ -2,7 +2,7 @@ import React, { useState } from "react"; import styled from "styled-components"; import Head from "next/head"; import { useRouter } from "next/router"; -import { useSession, signIn, signOut, getSession } from "next-auth/react"; +import { useSession, signIn, signOut } from "next-auth/react"; import Cookies from "js-cookie"; import LogoutIcon from "@mui/icons-material/Logout"; import { GitSt } from "@services/gitstory"; @@ -17,7 +17,6 @@ export default function Header({ withLeftPart = true, withPaddings = false, ...p const [openApiPopup, setOpenApiPopup] = React.useState(false); const router = useRouter(); - const slug = router.query.slug || []; const handleHeaderSearchTextChange = (e) => { let parsedValues = e.target.value.split("/"); @@ -41,8 +40,7 @@ export default function Header({ withLeftPart = true, withPaddings = false, ...p } async function saveGitHubSessionToCookie() { - const sessionInfo = await getSession(); - sessionInfo ? Cookies.set("github_at", sessionInfo.accessToken) : Cookies.remove("github_at"); + session ? Cookies.set("github_at", session.accessToken) : Cookies.remove("github_at"); } const keyPress = (e) => { @@ -95,20 +93,20 @@ export default function Header({ withLeftPart = true, withPaddings = false, ...p {/* SEO */} - + - + - + - + @@ -216,4 +214,3 @@ const LeftWrapper: any = styled.div` margin-top: 5px; } `; - diff --git a/next.config.js b/next.config.js index d1c4169..2249ddb 100644 --- a/next.config.js +++ b/next.config.js @@ -7,5 +7,6 @@ module.exports = { // This is the default value, but we want to be explicit GITHUB_SECRET: process.env.GITHUB_SECRET, GITHUB_ID: process.env.GITHUB_ID, + WEBSITE_HOST: process.env.WEBSITE_HOST, }, }; From c8fa57fddff912c41bb765e3c9734051541a48da Mon Sep 17 00:00:00 2001 From: swve Date: Thu, 23 Jun 2022 21:18:41 +0200 Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=94=8D=20improve=20seo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/Header/Header.tsx | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/components/Header/Header.tsx b/components/Header/Header.tsx index 6d2145a..13d44d1 100644 --- a/components/Header/Header.tsx +++ b/components/Header/Header.tsx @@ -94,24 +94,25 @@ export default function Header({ withLeftPart = true, withPaddings = false, ...p + + - + - + - - + + - {/* SEO */} From e1d270c52484465b21d101233c4780fd4c885604 Mon Sep 17 00:00:00 2001 From: swve Date: Thu, 23 Jun 2022 21:24:06 +0200 Subject: [PATCH 3/3] =?UTF-8?q?=F0=9F=90=9B=20=F0=9F=92=84=20fix=20styles?= =?UTF-8?q?=20loading=20issue?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/_document.tsx | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 pages/_document.tsx diff --git a/pages/_document.tsx b/pages/_document.tsx new file mode 100644 index 0000000..8cbf096 --- /dev/null +++ b/pages/_document.tsx @@ -0,0 +1,24 @@ +import Document, { DocumentContext } from "next/document"; +import { ServerStyleSheet } from "styled-components"; + +export default class MyDocument extends Document { + static async getInitialProps(ctx: DocumentContext) { + const sheet = new ServerStyleSheet(); + const originalRenderPage = ctx.renderPage; + + try { + ctx.renderPage = () => + originalRenderPage({ + enhanceApp: (App) => (props) => sheet.collectStyles(), + }); + + const initialProps = await Document.getInitialProps(ctx); + return { + ...initialProps, + styles: [initialProps.styles, sheet.getStyleElement()], + }; + } finally { + sheet.seal(); + } + } +}