From 101fea0bf487be3e4d5e734160c9fe3bd6b67510 Mon Sep 17 00:00:00 2001 From: Darren Clarke Date: Thu, 25 May 2023 07:03:57 +0000 Subject: [PATCH] Metamigo frontend build fixes --- apps/metamigo-frontend/components/AdminLogin.tsx | 2 +- apps/metamigo-frontend/components/Auth.tsx | 6 +++--- .../components/MetamigoAdmin.tsx | 2 +- .../components/accounts/AccountEdit.tsx | 5 +++-- .../components/accounts/index.ts | 2 +- .../components/layout/AppBar.tsx | 7 ++++--- .../metamigo-frontend/components/layout/Menu.tsx | 10 +++++----- .../components/layout/SubMenu.tsx | 16 ++++++++-------- .../components/signal/bots/SignalBotShow.tsx | 2 +- .../components/signal/bots/index.ts | 2 +- .../components/users/UserEdit.tsx | 5 +++-- apps/metamigo-frontend/components/users/index.ts | 2 +- .../voice/providers/ProviderCreate.tsx | 2 +- .../components/voice/providers/index.ts | 2 +- .../components/voice/voicelines/MicInput.tsx | 8 ++++---- .../components/voice/voicelines/index.ts | 2 +- .../components/voice/voicelines/shared.tsx | 4 ++-- .../components/webhooks/index.ts | 2 +- .../components/whatsapp/attachments/index.ts | 2 +- .../components/whatsapp/bots/WhatsappBotShow.tsx | 4 ++-- .../components/whatsapp/bots/index.ts | 2 +- .../components/whatsapp/messages/index.ts | 2 +- apps/metamigo-frontend/pages/index.tsx | 2 +- apps/metamigo-frontend/pages/login.tsx | 2 +- 24 files changed, 49 insertions(+), 46 deletions(-) diff --git a/apps/metamigo-frontend/components/AdminLogin.tsx b/apps/metamigo-frontend/components/AdminLogin.tsx index f5d0a7a..0e05efa 100644 --- a/apps/metamigo-frontend/components/AdminLogin.tsx +++ b/apps/metamigo-frontend/components/AdminLogin.tsx @@ -1,5 +1,5 @@ import { FC, useEffect } from "react"; -import { CircularProgress, Typography, Grid } from "@material-ui/core"; +import { CircularProgress, Typography, Grid } from "@mui/material"; import { signIn, signOut, getSession } from "next-auth/react"; import { useLogin, useTranslate } from "react-admin"; diff --git a/apps/metamigo-frontend/components/Auth.tsx b/apps/metamigo-frontend/components/Auth.tsx index 9bcd024..336a43e 100644 --- a/apps/metamigo-frontend/components/Auth.tsx +++ b/apps/metamigo-frontend/components/Auth.tsx @@ -1,9 +1,9 @@ -import { FC, useEffect } from "react"; -import { CircularProgress } from "@material-ui/core"; +import { FC, PropsWithChildren, useEffect } from "react"; +import { CircularProgress } from "@mui/material"; import { useSession } from "next-auth/react"; import { useRouter } from "next/router"; -export const Auth: FC = ({ children }) => { +export const Auth: FC = ({ children }) => { const router = useRouter(); const { data: session, status: loading } = useSession(); useEffect(() => { diff --git a/apps/metamigo-frontend/components/MetamigoAdmin.tsx b/apps/metamigo-frontend/components/MetamigoAdmin.tsx index 441a985..947dcf8 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 "@material-ui/core/styles"; +import { ThemeProvider, createMuiTheme } from "@mui/material/styles"; import { metamigoDataProvider } from "../lib/dataprovider"; import { theme } from "./layout/themes"; import { Layout } from "./layout"; diff --git a/apps/metamigo-frontend/components/accounts/AccountEdit.tsx b/apps/metamigo-frontend/components/accounts/AccountEdit.tsx index df533d5..2ef0b91 100644 --- a/apps/metamigo-frontend/components/accounts/AccountEdit.tsx +++ b/apps/metamigo-frontend/components/accounts/AccountEdit.tsx @@ -1,5 +1,5 @@ import { FC } from "react"; -import { makeStyles } from "@material-ui/core/styles"; +import { makeStyles } from "@mui/material/styles"; import { SimpleForm, TextInput, @@ -13,7 +13,7 @@ import { } from "react-admin"; import { useSession } from "next-auth/react"; -const useStyles = makeStyles((_theme) => ({ +const useStyles = makeStyles((_theme: any) => ({ defaultToolbar: { flex: 1, display: "flex", @@ -27,6 +27,7 @@ type AccountEditToolbarProps = { const AccountEditToolbar: FC = (props: any) => { const { data: session } = useSession(); + // @ts-expect-error const classes = useStyles(props); return ( diff --git a/apps/metamigo-frontend/components/accounts/index.ts b/apps/metamigo-frontend/components/accounts/index.ts index 2a51fbe..5633b61 100644 --- a/apps/metamigo-frontend/components/accounts/index.ts +++ b/apps/metamigo-frontend/components/accounts/index.ts @@ -1,6 +1,6 @@ /* eslint-disable import/no-named-as-default */ /* eslint-disable import/no-anonymous-default-export */ -import AccountIcon from "@material-ui/icons/AccountTree"; +import AccountIcon from "@mui/icons-material/AccountTree"; import AccountList from "./AccountList"; import AccountEdit from "./AccountEdit"; diff --git a/apps/metamigo-frontend/components/layout/AppBar.tsx b/apps/metamigo-frontend/components/layout/AppBar.tsx index dd3229e..d3c187a 100644 --- a/apps/metamigo-frontend/components/layout/AppBar.tsx +++ b/apps/metamigo-frontend/components/layout/AppBar.tsx @@ -1,8 +1,8 @@ import { forwardRef } from "react"; import { AppBar, UserMenu, MenuItemLink, useTranslate } from "react-admin"; -import Typography from "@material-ui/core/Typography"; -import SettingsIcon from "@material-ui/icons/Settings"; -import { makeStyles } from "@material-ui/core/styles"; +import Typography from "@mui/material/Typography"; +import SettingsIcon from "@mui/icons-material/Settings"; +import { makeStyles } from "@mui/material/styles"; const useStyles = makeStyles({ title: { @@ -38,6 +38,7 @@ 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 6e731da..b671298 100644 --- a/apps/metamigo-frontend/components/layout/Menu.tsx +++ b/apps/metamigo-frontend/components/layout/Menu.tsx @@ -2,11 +2,11 @@ /* eslint-disable camelcase */ import { FC, useState } from "react"; import { useSelector } from "react-redux"; -import SecurityIcon from "@material-ui/icons/Security"; -import VoiceIcon from "@material-ui/icons/PhoneInTalk"; -import { Box } from "@material-ui/core"; -import { useTheme } from "@material-ui/core/styles"; -import useMediaQuery from "@material-ui/core/useMediaQuery"; +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 useMediaQuery from "@mui/material/useMediaQuery"; import { useTranslate, MenuItemLink } from "react-admin"; import users from "../users"; import accounts from "../accounts"; diff --git a/apps/metamigo-frontend/components/layout/SubMenu.tsx b/apps/metamigo-frontend/components/layout/SubMenu.tsx index 25fcb79..8884d88 100644 --- a/apps/metamigo-frontend/components/layout/SubMenu.tsx +++ b/apps/metamigo-frontend/components/layout/SubMenu.tsx @@ -1,13 +1,13 @@ // @ts-nocheck import { FC, PropsWithChildren, Fragment, ReactElement } from "react"; -import ExpandMore from "@material-ui/icons/ExpandMore"; -import List from "@material-ui/core/List"; -import MenuItem from "@material-ui/core/MenuItem"; -import ListItemIcon from "@material-ui/core/ListItemIcon"; -import Typography from "@material-ui/core/Typography"; -import Collapse from "@material-ui/core/Collapse"; -import Tooltip from "@material-ui/core/Tooltip"; -import { makeStyles } from "@material-ui/core/styles"; +import ExpandMore from "@mui/icons-material/ExpandMore"; +import List from "@mui/material/List"; +import MenuItem from "@mui/material/MenuItem"; +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 { useTranslate } from "react-admin"; const useStyles = makeStyles((theme) => ({ diff --git a/apps/metamigo-frontend/components/signal/bots/SignalBotShow.tsx b/apps/metamigo-frontend/components/signal/bots/SignalBotShow.tsx index 896b147..61a3d27 100644 --- a/apps/metamigo-frontend/components/signal/bots/SignalBotShow.tsx +++ b/apps/metamigo-frontend/components/signal/bots/SignalBotShow.tsx @@ -24,7 +24,7 @@ import { Typography, Box, CircularProgress, -} from "@material-ui/core"; +} from "@mui/material"; import { SixDigitInput } from "../../DigitInput"; import { sanitizeE164Number, diff --git a/apps/metamigo-frontend/components/signal/bots/index.ts b/apps/metamigo-frontend/components/signal/bots/index.ts index 88df6b3..d1d5f00 100644 --- a/apps/metamigo-frontend/components/signal/bots/index.ts +++ b/apps/metamigo-frontend/components/signal/bots/index.ts @@ -1,4 +1,4 @@ -import SignalBotIcon from "@material-ui/icons/ChatOutlined"; +import SignalBotIcon from "@mui/icons-material/ChatOutlined"; import SignalBotList from "./SignalBotList"; import SignalBotEdit from "./SignalBotEdit"; import SignalBotCreate from "./SignalBotCreate"; diff --git a/apps/metamigo-frontend/components/users/UserEdit.tsx b/apps/metamigo-frontend/components/users/UserEdit.tsx index 7759d92..1e04fe0 100644 --- a/apps/metamigo-frontend/components/users/UserEdit.tsx +++ b/apps/metamigo-frontend/components/users/UserEdit.tsx @@ -1,4 +1,4 @@ -import { makeStyles } from "@material-ui/core/styles"; +import { makeStyles } from "@mui/material/styles"; import { SimpleForm, TextInput, @@ -14,7 +14,7 @@ import { import { useSession } from "next-auth/react"; import { UserRoleInput } from "./shared"; -const useStyles = makeStyles((_theme) => ({ +const useStyles = makeStyles((_theme: any) => ({ defaultToolbar: { flex: 1, display: "flex", @@ -23,6 +23,7 @@ const useStyles = makeStyles((_theme) => ({ })); const UserEditToolbar = (props: any) => { + // @ts-expect-error const classes = useStyles(props); const redirect = useRedirect(); diff --git a/apps/metamigo-frontend/components/users/index.ts b/apps/metamigo-frontend/components/users/index.ts index 15f1b5b..e48dea3 100644 --- a/apps/metamigo-frontend/components/users/index.ts +++ b/apps/metamigo-frontend/components/users/index.ts @@ -1,4 +1,4 @@ -import UserIcon from "@material-ui/icons/People"; +import UserIcon from "@mui/icons-material/People"; import UserList from "./UserList"; import UserEdit from "./UserEdit"; import UserCreate from "./UserCreate"; diff --git a/apps/metamigo-frontend/components/voice/providers/ProviderCreate.tsx b/apps/metamigo-frontend/components/voice/providers/ProviderCreate.tsx index 431bbad..19aef0c 100644 --- a/apps/metamigo-frontend/components/voice/providers/ProviderCreate.tsx +++ b/apps/metamigo-frontend/components/voice/providers/ProviderCreate.tsx @@ -7,7 +7,7 @@ import { } from "react-admin"; import { ProviderKindInput } from "./shared"; -// import TextField from "@material-ui/core/TextField"; +// import TextField from "@mui/material/TextField"; /* const TwilioCredentialsInput = () => ( diff --git a/apps/metamigo-frontend/components/voice/providers/index.ts b/apps/metamigo-frontend/components/voice/providers/index.ts index 0357392..95fbef4 100644 --- a/apps/metamigo-frontend/components/voice/providers/index.ts +++ b/apps/metamigo-frontend/components/voice/providers/index.ts @@ -1,5 +1,5 @@ /* eslint-disable import/no-anonymous-default-export */ -import ProviderIcon from "@material-ui/icons/Business"; +import ProviderIcon from "@mui/icons-material/Business"; import ProviderList from "./ProviderList"; import ProviderEdit from "./ProviderEdit"; import ProviderCreate from "./ProviderCreate"; diff --git a/apps/metamigo-frontend/components/voice/voicelines/MicInput.tsx b/apps/metamigo-frontend/components/voice/voicelines/MicInput.tsx index b0b6872..8e9fcbc 100644 --- a/apps/metamigo-frontend/components/voice/voicelines/MicInput.tsx +++ b/apps/metamigo-frontend/components/voice/voicelines/MicInput.tsx @@ -1,10 +1,10 @@ import { useInput } from "react-admin"; import React, { useState } from "react"; import dynamic from "next/dynamic"; -import MicIcon from "@material-ui/icons/Mic"; -import StopIcon from "@material-ui/icons/Stop"; -import Button from "@material-ui/core/Button"; -import { makeStyles, useTheme } from "@material-ui/core/styles"; +import MicIcon from "@mui/icons-material/Mic"; +import StopIcon from "@mui/icons-material/Stop"; +import Button from "@mui/material/Button"; +import { makeStyles, useTheme } from "@mui/material/styles"; // import AudioPlayer from "material-ui-audio-player"; import { useStopwatch } from "react-timer-hook"; import style from "./MicInput.module.css"; diff --git a/apps/metamigo-frontend/components/voice/voicelines/index.ts b/apps/metamigo-frontend/components/voice/voicelines/index.ts index 272754b..f071e47 100644 --- a/apps/metamigo-frontend/components/voice/voicelines/index.ts +++ b/apps/metamigo-frontend/components/voice/voicelines/index.ts @@ -1,4 +1,4 @@ -import VoiceLineIcon from "@material-ui/icons/PhoneCallback"; +import VoiceLineIcon from "@mui/icons-material/PhoneCallback"; import VoiceLineList from "./VoiceLineList"; import VoiceLineEdit from "./VoiceLineEdit"; import VoiceLineCreate from "./VoiceLineCreate"; diff --git a/apps/metamigo-frontend/components/voice/voicelines/shared.tsx b/apps/metamigo-frontend/components/voice/voicelines/shared.tsx index 31a4575..dfa5b4a 100644 --- a/apps/metamigo-frontend/components/voice/voicelines/shared.tsx +++ b/apps/metamigo-frontend/components/voice/voicelines/shared.tsx @@ -1,6 +1,6 @@ /* eslint-disable react/display-name */ import React, { useState, useEffect } from "react"; -import PlayIcon from "@material-ui/icons/PlayCircleFilled"; +import PlayIcon from "@mui/icons-material/PlayCircleFilled"; import { TextInput, SelectInput, @@ -11,7 +11,7 @@ import { ReferenceField, TextField, } from "react-admin"; -import { IconButton, CircularProgress } from "@material-ui/core"; +import { IconButton, CircularProgress } from "@mui/material"; import absoluteUrl from "../../../lib/absolute-url"; import TwilioLanguages from "./twilio-languages"; diff --git a/apps/metamigo-frontend/components/webhooks/index.ts b/apps/metamigo-frontend/components/webhooks/index.ts index 2fb69da..c826691 100644 --- a/apps/metamigo-frontend/components/webhooks/index.ts +++ b/apps/metamigo-frontend/components/webhooks/index.ts @@ -1,4 +1,4 @@ -import WebhookIcon from "@material-ui/icons/Send"; +import WebhookIcon from "@mui/icons-material/Send"; import WebhookList from "./WebhookList"; import WebhookEdit from "./WebhookEdit"; import WebhookCreate from "./WebhookCreate"; diff --git a/apps/metamigo-frontend/components/whatsapp/attachments/index.ts b/apps/metamigo-frontend/components/whatsapp/attachments/index.ts index 4400a46..5f97734 100644 --- a/apps/metamigo-frontend/components/whatsapp/attachments/index.ts +++ b/apps/metamigo-frontend/components/whatsapp/attachments/index.ts @@ -1,4 +1,4 @@ -import WhatsappAttachmentIcon from "@material-ui/icons/AttachFile"; +import WhatsappAttachmentIcon from "@mui/icons-material/AttachFile"; import WhatsappAttachmentList from "./WhatsappAttachmentList"; import WhatsappAttachmentShow from "./WhatsappAttachmentShow"; diff --git a/apps/metamigo-frontend/components/whatsapp/bots/WhatsappBotShow.tsx b/apps/metamigo-frontend/components/whatsapp/bots/WhatsappBotShow.tsx index d7be9ad..fdd0e93 100644 --- a/apps/metamigo-frontend/components/whatsapp/bots/WhatsappBotShow.tsx +++ b/apps/metamigo-frontend/components/whatsapp/bots/WhatsappBotShow.tsx @@ -6,7 +6,7 @@ import { Button, TextField as MaterialTextField, IconButton, -} from "@material-ui/core"; +} from "@mui/material"; import { Show, SimpleShowLayout, @@ -18,7 +18,7 @@ import { } from "react-admin"; import QRCode from "react-qr-code"; import useSWR from "swr"; -import RefreshIcon from "@material-ui/icons/Refresh"; +import RefreshIcon from "@mui/icons-material/Refresh"; const Sidebar = ({ record }: any) => { const [receivedMessages, setReceivedMessages] = useState([]); diff --git a/apps/metamigo-frontend/components/whatsapp/bots/index.ts b/apps/metamigo-frontend/components/whatsapp/bots/index.ts index 47af4f7..acf105f 100644 --- a/apps/metamigo-frontend/components/whatsapp/bots/index.ts +++ b/apps/metamigo-frontend/components/whatsapp/bots/index.ts @@ -1,4 +1,4 @@ -import WhatsappBotIcon from "@material-ui/icons/WhatsApp"; +import WhatsappBotIcon from "@mui/icons-material/WhatsApp"; import WhatsappBotList from "./WhatsappBotList"; import WhatsappBotEdit from "./WhatsappBotEdit"; import WhatsappBotCreate from "./WhatsappBotCreate"; diff --git a/apps/metamigo-frontend/components/whatsapp/messages/index.ts b/apps/metamigo-frontend/components/whatsapp/messages/index.ts index 62dc28c..ff36493 100644 --- a/apps/metamigo-frontend/components/whatsapp/messages/index.ts +++ b/apps/metamigo-frontend/components/whatsapp/messages/index.ts @@ -1,4 +1,4 @@ -import WhatsappMessageIcon from "@material-ui/icons/Message"; +import WhatsappMessageIcon from "@mui/icons-material/Message"; import WhatsappMessageList from "./WhatsappMessageList"; import WhatsappMessageShow from "./WhatsappMessageShow"; diff --git a/apps/metamigo-frontend/pages/index.tsx b/apps/metamigo-frontend/pages/index.tsx index b4976dd..3672a52 100644 --- a/apps/metamigo-frontend/pages/index.tsx +++ b/apps/metamigo-frontend/pages/index.tsx @@ -1,6 +1,6 @@ // @ts-nocheck import { NextPage } from "next"; -import { Typography, Box, Button, Grid, Link } from "@material-ui/core"; +import { Typography, Box, Button, Grid, Link } from "@mui/material"; import { FC, useEffect } from "react"; import { useRouter } from "next/router"; diff --git a/apps/metamigo-frontend/pages/login.tsx b/apps/metamigo-frontend/pages/login.tsx index b5c441d..bb3db39 100644 --- a/apps/metamigo-frontend/pages/login.tsx +++ b/apps/metamigo-frontend/pages/login.tsx @@ -1,5 +1,5 @@ import { FC } from "react"; -import { Button } from "@material-ui/core"; +import { Button } from "@mui/material"; import { signIn, signOut, useSession } from "next-auth/react"; const MyComponent: FC = () => {