From 495e8338b9515046ff9f26db2a41aecf50374947 Mon Sep 17 00:00:00 2001 From: Darren Clarke Date: Thu, 25 May 2023 12:37:14 +0000 Subject: [PATCH] Update Link->Leafcutter integration --- apps/leafcutter/components/AboutFeature.tsx | 2 +- apps/leafcutter/components/AccountButton.tsx | 2 +- apps/leafcutter/components/Footer.tsx | 2 +- apps/leafcutter/components/Layout.tsx | 23 ++++-- apps/leafcutter/components/Sidebar.tsx | 2 +- apps/leafcutter/components/TopNav.tsx | 2 +- .../components/VisualizationSelectCard.tsx | 2 +- apps/leafcutter/lib/checkAuth.ts | 21 ------ apps/leafcutter/middleware.ts | 39 +++++++++++ apps/leafcutter/next.config.js | 3 + apps/leafcutter/package.json | 4 +- apps/leafcutter/pages/about.tsx | 7 +- apps/leafcutter/pages/create.tsx | 11 +-- apps/leafcutter/pages/faq.tsx | 6 -- apps/leafcutter/pages/index.tsx | 15 ++-- apps/leafcutter/pages/login.tsx | 2 +- .../pages/preview/[...visualizationID].tsx | 13 ++-- apps/leafcutter/pages/trends.tsx | 10 +-- .../visualizations/[...visualizationID].tsx | 11 +-- apps/link/components/LeafcutterWrapper.tsx | 41 +++++++++++ apps/link/components/Sidebar.tsx | 20 ++++-- apps/link/next.config.js | 3 + apps/link/pages/knowledge.tsx | 31 ++++++++ apps/link/pages/leafcutter/about.tsx | 36 +--------- apps/link/pages/leafcutter/create.tsx | 36 +--------- apps/link/pages/leafcutter/faq.tsx | 36 +--------- apps/link/pages/leafcutter/index.tsx | 38 ++-------- apps/link/pages/leafcutter/trends.tsx | 36 +--------- apps/metamigo-frontend/package.json | 10 +-- package-lock.json | 70 +++++++++---------- turbo.json | 48 +++---------- 31 files changed, 239 insertions(+), 343 deletions(-) delete mode 100644 apps/leafcutter/lib/checkAuth.ts create mode 100644 apps/leafcutter/middleware.ts create mode 100644 apps/link/components/LeafcutterWrapper.tsx create mode 100644 apps/link/pages/knowledge.tsx diff --git a/apps/leafcutter/components/AboutFeature.tsx b/apps/leafcutter/components/AboutFeature.tsx index b8b0949..b8ff04c 100644 --- a/apps/leafcutter/components/AboutFeature.tsx +++ b/apps/leafcutter/components/AboutFeature.tsx @@ -1,5 +1,5 @@ import { FC } from "react"; -import Image from "next/image"; +import Image from "next/legacy/image"; import { Grid, Box, GridSize } from "@mui/material"; import AboutDots from "images/about-dots.png"; import { useAppContext } from "./AppProvider"; diff --git a/apps/leafcutter/components/AccountButton.tsx b/apps/leafcutter/components/AccountButton.tsx index c4311e3..82a324b 100644 --- a/apps/leafcutter/components/AccountButton.tsx +++ b/apps/leafcutter/components/AccountButton.tsx @@ -1,5 +1,5 @@ import { FC } from "react"; -import Image from "next/image"; +import Image from "next/legacy/image"; import { signOut } from "next-auth/react"; import { Button, Box, Menu, MenuItem } from "@mui/material"; import { useTranslate } from "react-polyglot"; diff --git a/apps/leafcutter/components/Footer.tsx b/apps/leafcutter/components/Footer.tsx index 7e2207d..49ec23b 100644 --- a/apps/leafcutter/components/Footer.tsx +++ b/apps/leafcutter/components/Footer.tsx @@ -1,7 +1,7 @@ import { FC } from "react"; import { Container, Grid, Box, Button } from "@mui/material"; import { useTranslate } from "react-polyglot"; -import Image from "next/image"; +import Image from "next/legacy/image"; import Link from "next/link"; import leafcutterLogo from "images/leafcutter-logo.png"; import footerLogo from "images/footer-logo.png"; diff --git a/apps/leafcutter/components/Layout.tsx b/apps/leafcutter/components/Layout.tsx index 5fcc052..0897bdc 100644 --- a/apps/leafcutter/components/Layout.tsx +++ b/apps/leafcutter/components/Layout.tsx @@ -1,4 +1,5 @@ import { FC, PropsWithChildren } from "react"; +import getConfig from "next/config"; import { Grid, Container } from "@mui/material"; import CookieConsent from "react-cookie-consent"; import { useCookies } from "react-cookie"; @@ -10,7 +11,13 @@ import { useAppContext } from "./AppProvider"; export const Layout: FC = ({ children }) => { const [cookies, setCookie] = useCookies(["cookieConsent"]); + const consentGranted = cookies.cookieConsent === "true"; + console.log({ val: process.env.LINK_EMBEDDED }); + const { + publicRuntimeConfig: { embedded }, + } = getConfig(); + const { colors: { white, @@ -24,14 +31,18 @@ export const Layout: FC = ({ children }) => { return ( <> - - - - - + {!embedded && ( + + + + )} + {!embedded && } + {children} - {/*