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
-
-
-
-
+const Metamigo: NextPage = () => {
+ const {
+ publicRuntimeConfig: { metamigoURL },
+ } = getConfig();
+
+ return (
+
+
+ Link Shell
+
+
+
+
+
-
-
-);
+
+ );
+};
export default Metamigo;
diff --git a/apps/metamigo-frontend/components/MetamigoAdmin.tsx b/apps/metamigo-frontend/components/MetamigoAdmin.tsx
index 947dcf8..d04ea97 100644
--- a/apps/metamigo-frontend/components/MetamigoAdmin.tsx
+++ b/apps/metamigo-frontend/components/MetamigoAdmin.tsx
@@ -2,7 +2,7 @@ import { FC, useEffect, useState } from "react";
import { Admin, Resource } from "react-admin";
import { useApolloClient } from "@apollo/client";
import polyglotI18nProvider from "ra-i18n-polyglot";
-import { ThemeProvider, createMuiTheme } from "@mui/material/styles";
+import { ThemeProvider, createTheme } from "@mui/material";
import { metamigoDataProvider } from "../lib/dataprovider";
import { theme } from "./layout/themes";
import { Layout } from "./layout";
@@ -18,12 +18,16 @@ import voiceProviders from "./voice/providers";
import webhooks from "./webhooks";
import { AdminLogin, authProvider } from "./AdminLogin";
-const i18nProvider = polyglotI18nProvider((_locale) => englishMessages, "en");
+const i18nProvider = polyglotI18nProvider(
+ (_locale: any) => englishMessages,
+ "en"
+);
const MetamigoAdmin: FC = () => {
// eslint-disable-next-line unicorn/no-null
const [dataProvider, setDataProvider] = useState(null);
const client = useApolloClient();
+ const muiTheme = createTheme(theme);
useEffect(() => {
(async () => {
@@ -34,7 +38,7 @@ const MetamigoAdmin: FC = () => {
}, [client]);
return (
dataProvider && (
-
+
= (props: any) => {
const { data: session } = useSession();
- // @ts-expect-error
const classes = useStyles(props);
return (
diff --git a/apps/metamigo-frontend/components/layout/AppBar.tsx b/apps/metamigo-frontend/components/layout/AppBar.tsx
index d3c187a..07cc0e3 100644
--- a/apps/metamigo-frontend/components/layout/AppBar.tsx
+++ b/apps/metamigo-frontend/components/layout/AppBar.tsx
@@ -2,7 +2,7 @@ import { forwardRef } from "react";
import { AppBar, UserMenu, MenuItemLink, useTranslate } from "react-admin";
import Typography from "@mui/material/Typography";
import SettingsIcon from "@mui/icons-material/Settings";
-import { makeStyles } from "@mui/material/styles";
+import { makeStyles } from "@mui/styles";
const useStyles = makeStyles({
title: {
@@ -38,7 +38,6 @@ const CustomUserMenu = (props: any) => (
);
const CustomAppBar = (props: any) => {
- // @ts-expect-error
const classes = useStyles();
return (
}>
diff --git a/apps/metamigo-frontend/components/layout/Menu.tsx b/apps/metamigo-frontend/components/layout/Menu.tsx
index 4e510dd..de95487 100644
--- a/apps/metamigo-frontend/components/layout/Menu.tsx
+++ b/apps/metamigo-frontend/components/layout/Menu.tsx
@@ -4,7 +4,7 @@ import { useSelector } from "react-redux";
import SecurityIcon from "@mui/icons-material/Security";
import VoiceIcon from "@mui/icons-material/PhoneInTalk";
import { Box } from "@mui/material";
-import { useTheme } from "@mui/material/styles";
+import { useTheme } from "@mui/styles";
import useMediaQuery from "@mui/material/useMediaQuery";
import { useTranslate, MenuItemLink } from "react-admin";
import users from "../users";
@@ -25,12 +25,13 @@ export const Menu: FC = ({ onMenuClick, logout, dense = false }: any) => {
});
const translate = useTranslate();
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 handleToggle = (menu: MenuName) => {
- setState((state) => ({ ...state, [menu]: !state[menu] }));
+ setState((state: any) => ({ ...state, [menu]: !state[menu] }));
};
return (
diff --git a/apps/metamigo-frontend/components/layout/SubMenu.tsx b/apps/metamigo-frontend/components/layout/SubMenu.tsx
index 5a22053..f9feae7 100644
--- a/apps/metamigo-frontend/components/layout/SubMenu.tsx
+++ b/apps/metamigo-frontend/components/layout/SubMenu.tsx
@@ -6,7 +6,7 @@ import ListItemIcon from "@mui/material/ListItemIcon";
import Typography from "@mui/material/Typography";
import Collapse from "@mui/material/Collapse";
import Tooltip from "@mui/material/Tooltip";
-import { makeStyles } from "@mui/material/styles";
+import { makeStyles } from "@mui/styles";
import { useTranslate } from "react-admin";
const useStyles = makeStyles((theme: any) => ({
@@ -42,13 +42,12 @@ export const SubMenu: FC = ({
icon,
children,
dense,
-}) => {
+}: any) => {
const translate = useTranslate();
- // @ts-expect-error
const classes = useStyles();
const header = (
- // @ts-expect-error
+ // @ts-ignore