Merge branch 'Development' into nextauth-and-magic-poc

2022-05-05 15:56:00 +01:00
parent fba8529417 abc9dbd0cf
commit 96d14a5165
27 changed files with 916 additions and 413 deletions
@@ -26,6 +26,7 @@ const Home = (props) => {
        footerLinks,
        pages,
        showLogin,
+        showMap,
        loggedInUserId,
        hasGGCode,
        loginEmailStr,
@@ -141,6 +142,7 @@ const Home = (props) => {
                                ggLocale={ggLocale}
                                pages={pages}
                                showLogin={showLogin}
+                                showMap={showMap}
                                loggedInUserId={loggedInUserId}
                                GG_REDIRECT_URI={props.GG_REDIRECT_URI}
                                GG_CLIENT_ID={props.GG_CLIENT_ID}
@@ -166,6 +168,7 @@ export const getServerSideProps = wrapper.getServerSideProps(
        console.log("auth sess:", thisSession);

        const showLoginCheck = process.env.SHOWLOGIN || false;
+        const showMapCheck = process.env.SHOWMAPS || false;

        const hasLoginCode = thisSession != null;

@@ -215,6 +218,7 @@ export const getServerSideProps = wrapper.getServerSideProps(
                props: {
                    ggLocale: ggLocale,
                    showLogin: showLoginCheck,
+                    showMap: showMapCheck,
                    hasGGCode: hasLoginCode,
                    loggedInUserId: portalUserObj,
                    loggedInUserEmail: loginEmailStr,