From 8fabcbaba2a47ddb28c61f2a5792c131a5305154 Mon Sep 17 00:00:00 2001 From: Darren Clarke Date: Fri, 26 May 2023 08:06:16 +0000 Subject: [PATCH] Add missing theme functions for metamigo-frontend --- .gitignore | 1 + apps/leafcutter/middleware.ts | 47 +++++++++++-------- .../components/layout/Menu.tsx | 4 +- .../components/layout/themes.ts | 26 ++++++++++ 4 files changed, 56 insertions(+), 22 deletions(-) diff --git a/.gitignore b/.gitignore index 00bb887..6215e3a 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ docker-compose.yml coverage .pgpass **/dist/** +.metamigo.local.json diff --git a/apps/leafcutter/middleware.ts b/apps/leafcutter/middleware.ts index 78d3f35..383e669 100644 --- a/apps/leafcutter/middleware.ts +++ b/apps/leafcutter/middleware.ts @@ -1,4 +1,5 @@ import { withAuth } from "next-auth/middleware"; +import getConfig from "next/config"; export default withAuth( () => { }, @@ -13,26 +14,32 @@ export default withAuth( headers, } = req; - const embedded = process.env.LINK_EMBEDDED === "true"; - if (embedded) { - return true; - } - - // check login page - const parsedURL = new URL(url); - if (parsedURL.pathname.startsWith('/login')) { - return true; - } - - // check session auth - const authorizedDomains = ["redaranj.com", "digiresilience.org"]; - const userDomain = token?.email?.toLowerCase().split("@").pop() ?? "unauthorized.net"; - - if (authorizedDomains.includes(userDomain)) { - return true; - } - - return false; + return true; + /* + const { + publicRuntimeConfig: { embedded }, + } = getConfig(); + + if (embedded) { + return true; + } + + // check login page + const parsedURL = new URL(url); + if (parsedURL.pathname.startsWith('/login')) { + return true; + } + + // check session auth + const authorizedDomains = ["redaranj.com", "digiresilience.org"]; + const userDomain = token?.email?.toLowerCase().split("@").pop() ?? "unauthorized.net"; + + if (authorizedDomains.includes(userDomain)) { + return true; + } + + return false; + */ }, } } diff --git a/apps/metamigo-frontend/components/layout/Menu.tsx b/apps/metamigo-frontend/components/layout/Menu.tsx index de95487..5ddf3fd 100644 --- a/apps/metamigo-frontend/components/layout/Menu.tsx +++ b/apps/metamigo-frontend/components/layout/Menu.tsx @@ -27,8 +27,8 @@ export const Menu: FC = ({ onMenuClick, logout, dense = false }: any) => { const theme = useTheme(); // @ts-ignore const isXSmall = useMediaQuery(theme.breakpoints.down("xs")); - const open = useSelector((state: any) => state.admin.ui.sidebarOpen); - useSelector((state: any) => state.theme); // force rerender on theme change + const open = true; // useSelector((state: any) => state.admin.ui.sidebarOpen); + // useSelector((state: any) => state.theme); // force rerender on theme change const handleToggle = (menu: MenuName) => { setState((state: any) => ({ ...state, [menu]: !state[menu] })); diff --git a/apps/metamigo-frontend/components/layout/themes.ts b/apps/metamigo-frontend/components/layout/themes.ts index 6e5352c..0099f72 100644 --- a/apps/metamigo-frontend/components/layout/themes.ts +++ b/apps/metamigo-frontend/components/layout/themes.ts @@ -1,4 +1,5 @@ export const theme = { + spacing: () => 8, palette: { primary: { main: "#337799", @@ -12,10 +13,35 @@ export const theme = { background: { default: "#fff", }, + getContrastText(color: string) { return color === "#ffffff" ? "#000" : "#fff"; }, }, shape: { borderRadius: 5, }, + breakpoints: { + up: (key: any) => `@media (min-width:${key})`, + down: (key: any) => `@media (max-width:${key})`, + }, + transitions: { + create(props: any) { + return `all ${props.duration}ms ${props.easing}`; + }, + easing: { + easeInOut: "cubic-bezier(0.4, 0, 0.2, 1)", + easeOut: "cubic-bezier(0.0, 0, 0.2, 1)", + easeIn: "cubic-bezier(0.4, 0, 1, 1)", + sharp: "cubic-bezier(0.4, 0, 0.6, 1)", + }, + duration: { + shortest: 150, + shorter: 200, + short: 250, + standard: 300, + complex: 375, + enteringScreen: 225, + leavingScreen: 195, + }, + }, typography: { h6: { fontSize: 16, fontWeight: 600, color: "#1bb1bb" }, },