Revert back to working version

- Upgrading to tauri v1.2 breaks everything so will need to set it aside for later.
steve1316 · Mar 2, 2023 · 553c0e4 · 553c0e4
1 parent 4842b7c
commit 553c0e4
Show file tree

Hide file tree

Showing 4 changed files with 8,482 additions and 6,147 deletions.
diff --git a/package.json b/package.json
@@ -3,24 +3,24 @@
     "version": "1.0.0",
     "private": true,
     "dependencies": {
-        "@emotion/react": "^11.10.6",
-        "@emotion/styled": "^11.10.6",
-        "@iconify/react": "^4.1.0",
-        "@mui/icons-material": "^5.11.11",
-        "@mui/material": "^5.11.11",
-        "@tauri-apps/api": "^1.2.0",
-        "autosuggest-highlight": "^3.3.4",
-        "axios": "^1.3.4",
-        "concurrently": "^7.6.0",
+        "@emotion/react": "^11.4.1",
+        "@emotion/styled": "^11.3.0",
+        "@iconify/react": "^3.0.1",
+        "@mui/icons-material": "^5.0.0",
+        "@mui/material": "^5.0.0",
+        "@tauri-apps/api": "^1.0.0-beta.8",
+        "autosuggest-highlight": "^3.1.1",
+        "axios": "^0.26.1",
+        "concurrently": "^6.2.1",
         "cross-env": "^7.0.3",
-        "dotenv": "^16.0.3",
-        "node-sass": "^8.0.0",
+        "dotenv": "^16.0.1",
+        "node-sass": "^6.0.1",
         "npm-run-all": "^4.1.5",
-        "react": "^18.2.0",
-        "react-dom": "^18.2.0",
-        "react-router-dom": "^6.8.2",
-        "react-scripts": "5.0.1",
-        "sass": "^1.58.3"
+        "react": "^17.0.2",
+        "react-dom": "^17.0.2",
+        "react-router-dom": "^5.3.0",
+        "react-scripts": "4.0.3",
+        "sass": "^1.41.1"
     },
     "scripts": {
         "start": "cross-env BROWSER=none concurrently \"react-scripts start\" \"yarn tauri dev\" --kill-others true",

diff --git a/src/components/NavBar/index.tsx b/src/components/NavBar/index.tsx
@@ -4,12 +4,12 @@ import { Alert, AppBar, Button, ButtonGroup, Divider, Drawer, IconButton, List,
 import * as app from "@tauri-apps/api/app"
 import { appWindow } from "@tauri-apps/api/window"
 import { useContext, useEffect, useState } from "react"
-import { Link as RouterLink, useNavigate } from "react-router-dom"
+import { Link as RouterLink, useHistory } from "react-router-dom"
 import { BotStateContext } from "../../context/BotStateContext"
 import "./index.scss"
 
 const NavBar = () => {
-    const navigate = useNavigate()
+    const history = useHistory()
     const [isDrawerOpen, setIsDrawerOpen] = useState<boolean>(false)
 
     const botStateContext = useContext(BotStateContext)
@@ -108,7 +108,7 @@ const NavBar = () => {
                     variant="h6"
                     className="navTitle"
                     onClick={() => {
-                        navigate("/")
+                        history.push("/")
                     }}
                 >
                     Granblue Automation <Typography variant="caption">v{botStateContext.appVersion}</Typography>

diff --git a/src/components/TransferList/index.tsx b/src/components/TransferList/index.tsx
@@ -1,4 +1,4 @@
-import { Card, CardActionArea, CardMedia, Divider, Grid, Grow, List, ListItemButton, ListItemText, Paper, Tooltip, Typography, Zoom } from "@mui/material"
+import { Card, CardActionArea, CardMedia, Divider, Grid, Grow, List, ListItem, ListItemText, Paper, Tooltip, Typography, Zoom } from "@mui/material"
 import { useContext, useEffect, useState } from "react"
 import { BotStateContext } from "../../context/BotStateContext"
 import summonData from "../../data/summons.json"
@@ -94,14 +94,14 @@ const TransferList = ({ isNightmare }: { isNightmare: boolean }) => {
                     return (
                         <Tooltip key={`${index}-${value}`} title={`${value}`} placement="left" arrow TransitionComponent={Zoom} TransitionProps={{ timeout: 200 }}>
                             <Grow in={true}>
-                                <ListItemButton onClick={handleChecked(value, isLeftList)}>
+                                <ListItem button onClick={handleChecked(value, isLeftList)}>
                                     <Card>
                                         <CardActionArea>
                                             <CardMedia component="img" image={require(`../../images/summons/${fileName}.jpg`).default} />
                                         </CardActionArea>
                                     </Card>
                                     <ListItemText className="transferListItemText" primary={value} />
-                                </ListItemButton>
+                                </ListItem>
                             </Grow>
                         </Tooltip>
                     )