From 3ca903cf4f3092c0d90e1bf0dae03b4d925d27e2 Mon Sep 17 00:00:00 2001 From: Darren Clarke Date: Thu, 25 May 2023 14:36:08 +0000 Subject: [PATCH] Fix more conflicting dependencies --- apps/link/next.config.js | 1 + apps/link/pages/admin/metamigo.tsx | 53 +- .../components/MetamigoAdmin.tsx | 10 +- .../components/accounts/AccountEdit.tsx | 3 +- .../components/layout/AppBar.tsx | 3 +- .../components/layout/Menu.tsx | 5 +- .../components/layout/SubMenu.tsx | 7 +- .../components/users/UserEdit.tsx | 3 +- .../components/voice/voicelines/MicInput.tsx | 3 +- apps/metamigo-frontend/package.json | 1 + package-lock.json | 575 ++++++++---------- 11 files changed, 300 insertions(+), 364 deletions(-) diff --git a/apps/link/next.config.js b/apps/link/next.config.js index ea2105d..2308721 100644 --- a/apps/link/next.config.js +++ b/apps/link/next.config.js @@ -3,6 +3,7 @@ const nextConfig = { reactStrictMode: true, publicRuntimeConfig: { leafcutterURL: process.env.LEAFCUTTER_URL, + metamigoURL: process.env.METAMIGO_URL, }, rewrites: async () => ({ fallback: [ diff --git a/apps/link/pages/admin/metamigo.tsx b/apps/link/pages/admin/metamigo.tsx index 8bae024..84271b0 100644 --- a/apps/link/pages/admin/metamigo.tsx +++ b/apps/link/pages/admin/metamigo.tsx @@ -1,31 +1,38 @@ -import { FC } from "react"; +import { NextPage } from "next"; +import getConfig from "next/config"; import Head from "next/head"; import { Grid } from "@mui/material"; import { Layout } from "components/Layout"; import Iframe from "react-iframe"; -const Metamigo: FC = () => ( - - - Link Shell - - - -