From a0c7530b3b66bb9916c9038bf3f7c91eb256cd79 Mon Sep 17 00:00:00 2001 From: Matthew Grove Date: Thu, 25 Nov 2021 09:20:24 +0000 Subject: [PATCH] Downgrade MUI icons --- package.json | 6 ++---- src/App.js | 2 +- src/ClassicTestStart.js | 2 +- src/CreateSet.js | 2 +- src/EditSet.js | 2 +- src/Error404.js | 2 +- src/GroupPage.js | 6 +++--- src/GroupStats.js | 2 +- src/History.js | 2 +- src/Home.js | 2 +- src/LivesTestStart.js | 2 +- src/LoggedInHome.js | 2 +- src/Login.js | 2 +- src/MistakesHistory.js | 2 +- src/PrivacyPolicy.js | 2 +- src/Progress.js | 2 +- src/SetPage.js | 2 +- src/Settings.js | 2 +- src/SettingsContent.js | 2 +- src/TermsOfService.js | 2 +- src/UserGroups.js | 2 +- src/UserSets.js | 2 +- 22 files changed, 25 insertions(+), 27 deletions(-) diff --git a/package.json b/package.json index aa3bbf9..164327a 100644 --- a/package.json +++ b/package.json @@ -6,10 +6,8 @@ "@babel/core": "^7.15.5", "@emotion/styled": "^11.6.0", "@firebase/app": "^0.6.20", - "@mui/icons-material": "^5.2.0", - "@mui/material": "^5.2.0", - "apexcharts": "^3.28.1", - "css-what": "^5.0.1", + "@material-ui/core": "^4.12.3", + "@material-ui/icons": "^4.11.2", "firebase": "^8.10.0", "firebase-admin": "^9.11.0", "firebase-functions": "^3.14.1", diff --git a/src/App.js b/src/App.js index ddecb06..62ffbcb 100644 --- a/src/App.js +++ b/src/App.js @@ -19,7 +19,7 @@ import MistakesHistory from "./MistakesHistory"; import TermsOfService from "./TermsOfService"; import PrivacyPolicy from "./PrivacyPolicy"; import Button from "./Button"; -import { CheckRounded as CheckRoundedIcon } from "@mui/icons-material"; +import { CheckRounded as CheckRoundedIcon } from "@material-ui/icons"; import Loader from "./puff-loader.svg"; import RouteChangeTracker from './RouteChangeTracker'; diff --git a/src/ClassicTestStart.js b/src/ClassicTestStart.js index d1bcbd3..41172f7 100644 --- a/src/ClassicTestStart.js +++ b/src/ClassicTestStart.js @@ -1,5 +1,5 @@ import React from "react"; -import { CloseRounded as CloseRoundedIcon, ArrowForwardRounded as ArrowForwardRoundedIcon } from "@mui/icons-material"; +import { CloseRounded as CloseRoundedIcon, ArrowForwardRounded as ArrowForwardRoundedIcon } from "@material-ui/icons"; import Button from "./Button"; import Checkbox from '@material-ui/core/Checkbox'; diff --git a/src/CreateSet.js b/src/CreateSet.js index 8fda709..06aaefd 100644 --- a/src/CreateSet.js +++ b/src/CreateSet.js @@ -3,7 +3,7 @@ import { withRouter } from 'react-router-dom'; import NavBar from "./NavBar"; import Button from "./Button"; import Footer from "./Footer"; -import { HomeRounded as HomeRoundedIcon, CheckCircleOutlineRounded as CheckCircleOutlineRoundedIcon } from "@mui/icons-material"; +import { HomeRounded as HomeRoundedIcon, CheckCircleOutlineRounded as CheckCircleOutlineRoundedIcon } from "@material-ui/icons"; import Checkbox from '@material-ui/core/Checkbox'; // import { doc, collection, setDoc, writeBatch } from "firebase/firestore"; diff --git a/src/EditSet.js b/src/EditSet.js index 72ae635..d706aaa 100644 --- a/src/EditSet.js +++ b/src/EditSet.js @@ -1,6 +1,6 @@ import React, { Component } from 'react'; import { withRouter, Prompt } from "react-router-dom"; -import { HomeRounded as HomeRoundedIcon } from "@mui/icons-material"; +import { HomeRounded as HomeRoundedIcon } from "@material-ui/icons"; import NavBar from "./NavBar"; import Button from "./Button"; import Error404 from "./Error404"; diff --git a/src/Error404.js b/src/Error404.js index c67740f..0196db5 100644 --- a/src/Error404.js +++ b/src/Error404.js @@ -1,7 +1,7 @@ import React, { useEffect } from 'react'; import NavBar from './NavBar'; import Footer from "./Footer"; -import { HomeRounded as HomeRoundedIcon } from "@mui/icons-material"; +import { HomeRounded as HomeRoundedIcon } from "@material-ui/icons"; export default function PageNotFound(props) { const navbarItems = [ diff --git a/src/GroupPage.js b/src/GroupPage.js index 2c57362..63fa0d1 100644 --- a/src/GroupPage.js +++ b/src/GroupPage.js @@ -6,8 +6,8 @@ import { EditRounded as EditRoundedIcon, ArrowForwardRounded as ArrowForwardRoundedIcon, DeleteRounded as DeleteRoundedIcon, - GroupRemoveRounded as GroupRemoveRoundedIcon -} from "@mui/icons-material"; + ExitToAppRounded as ExitToAppRoundedIcon +} from "@material-ui/icons"; import NavBar from "./NavBar"; import Button from "./Button"; import LinkButton from "./LinkButton"; @@ -486,7 +486,7 @@ export default withRouter(
diff --git a/src/GroupStats.js b/src/GroupStats.js index f89afbc..a22c588 100644 --- a/src/GroupStats.js +++ b/src/GroupStats.js @@ -1,5 +1,5 @@ import React, { Component } from 'react'; -import { ArrowDropDownRounded as ArrowDropDownRoundedIcon, GroupRounded as GroupRoundedIcon, HomeRounded as HomeRoundedIcon } from "@mui/icons-material"; +import { ArrowDropDownRounded as ArrowDropDownRoundedIcon, GroupRounded as GroupRoundedIcon, HomeRounded as HomeRoundedIcon } from "@material-ui/icons"; import { withRouter } from 'react-router-dom'; import Select from "react-select"; import NavBar from "./NavBar"; diff --git a/src/History.js b/src/History.js index baaeb9c..1edcdb6 100644 --- a/src/History.js +++ b/src/History.js @@ -1,5 +1,5 @@ import React, { Component } from 'react'; -import { TimelineRounded as TimelineRoundedIcon, HomeRounded as HomeRoundedIcon, QuestionAnswerRounded as QuestionAnswerRoundedIcon, PeopleRounded as PeopleRoundedIcon, SwapHorizRounded as SwapHorizRoundedIcon, DeleteRounded as DeleteRoundedIcon } from "@mui/icons-material"; +import { TimelineRounded as TimelineRoundedIcon, HomeRounded as HomeRoundedIcon, QuestionAnswerRounded as QuestionAnswerRoundedIcon, PeopleRounded as PeopleRoundedIcon, SwapHorizRounded as SwapHorizRoundedIcon, DeleteRounded as DeleteRoundedIcon } from "@material-ui/icons"; import NavBar from "./NavBar"; import Button from "./Button"; import Footer from "./Footer"; diff --git a/src/Home.js b/src/Home.js index 98efcbf..7a19656 100644 --- a/src/Home.js +++ b/src/Home.js @@ -1,6 +1,6 @@ import React, { useEffect } from "react"; import "@material-ui/core"; -import { AccountCircleRounded as AccountCircleIcon } from "@mui/icons-material"; +import { AccountCircleRounded as AccountCircleIcon } from "@material-ui/icons"; import "./css/Home.css"; import NavBar from './NavBar'; import Footer from "./Footer"; diff --git a/src/LivesTestStart.js b/src/LivesTestStart.js index 474268d..81a260d 100644 --- a/src/LivesTestStart.js +++ b/src/LivesTestStart.js @@ -1,5 +1,5 @@ import React from "react"; -import { CloseRounded as CloseRoundedIcon, ArrowForwardRounded as ArrowForwardRoundedIcon } from "@mui/icons-material"; +import { CloseRounded as CloseRoundedIcon, ArrowForwardRounded as ArrowForwardRoundedIcon } from "@material-ui/icons"; import Button from "./Button"; import Checkbox from '@material-ui/core/Checkbox'; diff --git a/src/LoggedInHome.js b/src/LoggedInHome.js index 9c6c667..891c82b 100644 --- a/src/LoggedInHome.js +++ b/src/LoggedInHome.js @@ -1,7 +1,7 @@ import React from 'react'; import NavBar from "./NavBar"; import { Link } from "react-router-dom"; -import { TimelineRounded as TimelineRoundedIcon, ExitToAppRounded as ExitToAppRoundedIcon, HistoryRounded as HistoryRoundedIcon, SettingsRounded as SettingsRoundedIcon, PersonRounded as PersonRoundedIcon, PublicRounded as PublicRoundedIcon, GroupRounded as GroupRoundedIcon, AddRounded as AddRoundedIcon, SwapHorizRounded as SwapHorizRoundedIcon, PeopleRounded as PeopleRoundedIcon, DeleteRounded as DeleteRoundedIcon, QuestionAnswerRounded as QuestionAnswerRoundedIcon } from "@mui/icons-material"; +import { TimelineRounded as TimelineRoundedIcon, ExitToAppRounded as ExitToAppRoundedIcon, HistoryRounded as HistoryRoundedIcon, SettingsRounded as SettingsRoundedIcon, PersonRounded as PersonRoundedIcon, PublicRounded as PublicRoundedIcon, GroupRounded as GroupRoundedIcon, AddRounded as AddRoundedIcon, SwapHorizRounded as SwapHorizRoundedIcon, PeopleRounded as PeopleRoundedIcon, DeleteRounded as DeleteRoundedIcon, QuestionAnswerRounded as QuestionAnswerRoundedIcon } from "@material-ui/icons"; import Checkbox from '@material-ui/core/Checkbox'; import Xarrow from 'react-xarrows'; diff --git a/src/Login.js b/src/Login.js index 2c52b59..7810d8b 100644 --- a/src/Login.js +++ b/src/Login.js @@ -5,7 +5,7 @@ import "./css/Login.css"; import "./css/PopUp.css"; import { Link } from 'react-router-dom'; import "@material-ui/core"; -import { CloseRounded as CloseRoundedIcon } from "@mui/icons-material"; +import { CloseRounded as CloseRoundedIcon } from "@material-ui/icons"; import "firebase/auth"; diff --git a/src/MistakesHistory.js b/src/MistakesHistory.js index 2e9bc13..ba03b34 100644 --- a/src/MistakesHistory.js +++ b/src/MistakesHistory.js @@ -1,5 +1,5 @@ import React, { Component } from 'react'; -import { ArrowDropDownRounded as ArrowDropDownRoundedIcon, HistoryRounded as HistoryRoundedIcon, HomeRounded as HomeRoundedIcon } from "@mui/icons-material"; +import { ArrowDropDownRounded as ArrowDropDownRoundedIcon, HistoryRounded as HistoryRoundedIcon, HomeRounded as HomeRoundedIcon } from "@material-ui/icons"; import NavBar from "./NavBar"; import Footer from "./Footer"; import "./css/History.css"; diff --git a/src/PrivacyPolicy.js b/src/PrivacyPolicy.js index 89bb0a1..a02dbb8 100644 --- a/src/PrivacyPolicy.js +++ b/src/PrivacyPolicy.js @@ -1,5 +1,5 @@ import React, { useEffect } from "react"; -import { HomeRounded as HomeRoundedIcon } from "@mui/icons-material"; +import { HomeRounded as HomeRoundedIcon } from "@material-ui/icons"; import NavBar from "./NavBar"; import Footer from "./Footer"; diff --git a/src/Progress.js b/src/Progress.js index 6ff0239..2809f9a 100644 --- a/src/Progress.js +++ b/src/Progress.js @@ -1,6 +1,6 @@ import React from 'react'; import { withRouter } from "react-router-dom"; -import { HomeRounded as HomeRoundedIcon, ArrowForwardRounded as ArrowForwardRoundedIcon, SettingsRounded as SettingsRoundedIcon, CloseRounded as CloseRoundedIcon, PeopleRounded as PeopleRoundedIcon, QuestionAnswerRounded as QuestionAnswerRoundedIcon } from "@mui/icons-material"; +import { HomeRounded as HomeRoundedIcon, ArrowForwardRounded as ArrowForwardRoundedIcon, SettingsRounded as SettingsRoundedIcon, CloseRounded as CloseRoundedIcon, PeopleRounded as PeopleRoundedIcon, QuestionAnswerRounded as QuestionAnswerRoundedIcon } from "@material-ui/icons"; import NavBar from "./NavBar"; import Button from "./Button"; import Error404 from "./Error404"; diff --git a/src/SetPage.js b/src/SetPage.js index c163c5b..86af3c2 100644 --- a/src/SetPage.js +++ b/src/SetPage.js @@ -1,6 +1,6 @@ import React from 'react'; import { withRouter } from "react-router-dom"; -import { HomeRounded as HomeRoundedIcon, PlayArrowRounded as PlayArrowRoundedIcon, EditRounded as EditRoundedIcon, CloudQueueRounded as CloudQueueRoundedIcon, GroupAddRounded as GroupAddRoundedIcon, CloseRounded as CloseRoundedIcon, DeleteRounded as DeleteRoundedIcon } from "@mui/icons-material"; +import { HomeRounded as HomeRoundedIcon, PlayArrowRounded as PlayArrowRoundedIcon, EditRounded as EditRoundedIcon, CloudQueueRounded as CloudQueueRoundedIcon, GroupAddRounded as GroupAddRoundedIcon, CloseRounded as CloseRoundedIcon, DeleteRounded as DeleteRoundedIcon } from "@material-ui/icons"; import NavBar from "./NavBar"; import Button from "./Button"; import LinkButton from "./LinkButton"; diff --git a/src/Settings.js b/src/Settings.js index 56db592..cd91892 100644 --- a/src/Settings.js +++ b/src/Settings.js @@ -1,5 +1,5 @@ import React, { Component } from 'react'; -import { HomeRounded as HomeRoundedIcon } from "@mui/icons-material"; +import { HomeRounded as HomeRoundedIcon } from "@material-ui/icons"; import NavBar from "./NavBar"; import Button from "./Button"; import { withRouter } from "react-router-dom"; diff --git a/src/SettingsContent.js b/src/SettingsContent.js index 0fae96a..ac62080 100644 --- a/src/SettingsContent.js +++ b/src/SettingsContent.js @@ -1,6 +1,6 @@ import React from 'react'; import Checkbox from '@material-ui/core/Checkbox'; -import { CheckRounded as CheckRoundedIcon } from "@mui/icons-material"; +import { CheckRounded as CheckRoundedIcon } from "@material-ui/icons"; import Button from "./Button"; import "./css/SettingsContent.css"; diff --git a/src/TermsOfService.js b/src/TermsOfService.js index d9f051d..afa53e9 100644 --- a/src/TermsOfService.js +++ b/src/TermsOfService.js @@ -1,5 +1,5 @@ import React, { useEffect } from "react"; -import { HomeRounded as HomeRoundedIcon } from "@mui/icons-material"; +import { HomeRounded as HomeRoundedIcon } from "@material-ui/icons"; import NavBar from "./NavBar"; import Footer from "./Footer"; import { Link } from "react-router-dom"; diff --git a/src/UserGroups.js b/src/UserGroups.js index 6aa7e4a..ee72036 100644 --- a/src/UserGroups.js +++ b/src/UserGroups.js @@ -1,5 +1,5 @@ import React, { Component } from 'react'; -import { HomeRounded as HomeRoundedIcon, GroupAddRounded as GroupAddRoundedIcon, GroupRounded as GroupRoundedIcon, CloseRounded as CloseRoundedIcon, ArrowForwardRounded as ArrowForwardRoundedIcon, PersonRounded as PersonRoundedIcon, EditRounded as EditRoundedIcon, VisibilityRounded as VisibilityRoundedIcon } from "@mui/icons-material"; +import { HomeRounded as HomeRoundedIcon, GroupAddRounded as GroupAddRoundedIcon, GroupRounded as GroupRoundedIcon, CloseRounded as CloseRoundedIcon, ArrowForwardRounded as ArrowForwardRoundedIcon, PersonRounded as PersonRoundedIcon, EditRounded as EditRoundedIcon, VisibilityRounded as VisibilityRoundedIcon } from "@material-ui/icons"; import NavBar from "./NavBar"; import Button from "./Button"; import Footer from "./Footer"; diff --git a/src/UserSets.js b/src/UserSets.js index b1d828c..83e8af9 100644 --- a/src/UserSets.js +++ b/src/UserSets.js @@ -1,6 +1,6 @@ import React, { Component } from 'react'; import { withRouter, Link } from 'react-router-dom'; -import { HomeRounded as HomeRoundedIcon, EditRounded as EditRoundedIcon } from "@mui/icons-material"; +import { HomeRounded as HomeRoundedIcon, EditRounded as EditRoundedIcon } from "@material-ui/icons"; import NavBar from "./NavBar"; import Footer from "./Footer";