diff --git a/frontend/src/pages/_app.tsx b/frontend/src/pages/_app.tsx index 0f8fc48..3115f8e 100644 --- a/frontend/src/pages/_app.tsx +++ b/frontend/src/pages/_app.tsx @@ -12,6 +12,7 @@ import { getCookie, setCookie } from "cookies-next"; import { GetServerSidePropsContext } from "next"; import type { AppProps } from "next/app"; import getConfig from "next/config"; +import Head from "next/head"; import { useRouter } from "next/router"; import { useEffect, useRef, useState } from "react"; import { IntlProvider } from "react-intl"; @@ -41,7 +42,7 @@ function App({ Component, pageProps }: AppProps) { const [route, setRoute] = useState(pageProps.route); const [configVariables, setConfigVariables] = useState( - pageProps.configVariables, + pageProps.configVariables ); useEffect(() => { @@ -80,57 +81,65 @@ function App({ Component, pageProps }: AppProps) { const language = useRef(pageProps.language); return ( - - + + + + - - - - - { - setConfigVariables(await configService.list()); - }, - }} - > - + + + + { - const user = await userService.getCurrentUser(); - setUser(user); - return user; + configVariables, + refresh: async () => { + setConfigVariables(await configService.list()); }, }} > - {excludeDefaultLayoutRoutes.includes(route) ? ( - - ) : ( - <> -
- - - - - )} - - - - - - + { + const user = await userService.getCurrentUser(); + setUser(user); + return user; + }, + }} + > + {excludeDefaultLayoutRoutes.includes(route) ? ( + + ) : ( + <> +
+ + + + + )} + + + + + + + ); } @@ -165,7 +174,7 @@ App.getInitialProps = async ({ ctx }: { ctx: GetServerSidePropsContext }) => { pageProps.route = ctx.req.url; const requestLanguage = i18nUtil.getLanguageFromAcceptHeader( - ctx.req.headers["accept-language"], + ctx.req.headers["accept-language"] ); pageProps.language = ctx.req.cookies["language"] ?? requestLanguage;