fix migration bugs

fourjr · Oct 12, 2024 · faba52e · faba52e
1 parent 3a9be81
commit faba52e
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 25 deletions.
diff --git a/web/backend/manager.py b/web/backend/manager.py
@@ -70,7 +70,10 @@ async def _on_loop(self):
     async def send_diff_events(self, *, force=False):
         if self.ws_connection is not None:
             if force or self.algorithm.tick_count % self.ws_connection.update_rate == 0:
-                flattened_data = [self.algorithm.tick_count, len(self.diff_events)] + [x for event in self.diff_events for x in event.flatten()]
+                flattened_data = (
+                    [self.algorithm.tick_count, len(self.diff_events)] +
+                    [x for event in self.diff_events for x in event.flatten()]
+                )
                 await ServerPacket(OpCode.GAME_UPDATE_STATE, flattened_data).send(self.ws_connection.protocol)
                 self.diff_events = []
         else:

diff --git a/web/frontend/src/app/page.tsx b/web/frontend/src/app/page.tsx
@@ -1,7 +1,6 @@
 'use client';
 import { useMemo, useState } from 'react';
-import { Dialog, DialogTitle, IconButton, Typography } from '@mui/material';
-import Grid from '@mui/material/Unstable_Grid2'; // Grid version 2
+import { Dialog, DialogTitle, IconButton, Typography, Grid2 as Grid } from '@mui/material';
 import { Close, Settings } from '@mui/icons-material';
 
 import ElevatorStatusPanel from '@/components/ElevatorStatusPanel';
@@ -210,10 +209,10 @@ export default function Home() {
                 height: "90vh",
                 width: "100%",
             }}>
-                <Grid container xs={12} sm={6} sx={{
+                <Grid container size={{xs: 12, sm: 6}} sx={{
                     flexDirection: "column"
                 }}>
-                    <Grid xs={8} sx={{
+                    <Grid size={8} sx={{
                         height: "100%",
                         maxHeight: "90vh",
                         overflow: "auto",
@@ -222,14 +221,14 @@ export default function Home() {
                         <ElevatorPanel elevators={elevators} />
                     </Grid>
                 </Grid>
-                <Grid xs={12} sm={2} sx={{
+                <Grid size={{xs: 12, sm: 2}} sx={{
                     maxHeight: "90vh",
                     overflow: "auto"
                 }}>
                     <ElevatorStatusPanel floors={floors} loads={loads} />
                 </Grid>
-                <Grid xs={12} sm={4}>
-                    <Grid xs={8} sx={{
+                <Grid size={{xs: 12, sm: 4}}>
+                    <Grid size={8} sx={{
                         height: "100%",
                     }}>
                         <StatsPanel currentTick={currentTick} />

diff --git a/web/frontend/src/components/ControlPanel.tsx b/web/frontend/src/components/ControlPanel.tsx
@@ -1,6 +1,5 @@
 import React, { useEffect, useState } from "react";
-import { Box, Button, MenuItem, Select, SelectChangeEvent, TextField, Typography } from "@mui/material";
-import Grid from '@mui/material/Unstable_Grid2';
+import { Box, Button, Grid2 as Grid, MenuItem, Select, SelectChangeEvent, TextField, Typography } from "@mui/material";
 
 import { ElevatorAlgorithm, GameState, OpCode } from "@/models/enums";
 import { ClientPacket } from "@/models/Packet";
@@ -140,7 +139,7 @@ export default function ControlPanel(
 
     return <React.Fragment>
         <Grid container m={3} mt={0}>
-            <Grid xs={7}>
+            <Grid size={7}>
                 <Box m={1}>
                     <Typography m={1} display="inline">Elevator</Typography>
                     <FloorsInputField value={newElevatorFloor} setValue={setNewElevatorFloor} />
@@ -190,7 +189,7 @@ export default function ControlPanel(
                     <Button onClick={sendReset}>Reset</Button>
                 </Box>
             </Grid>
-            <Grid xs={5}>
+            <Grid size={5}>
                 <Box m={1}>
                     <Typography m={1} display="inline">Floors</Typography>
                     <TextField sx={{ width: "4ch" }} value={floorInput !== null ? floorInput : ""} onChange={(event: React.ChangeEvent<HTMLInputElement>) => {
@@ -221,7 +220,7 @@ export default function ControlPanel(
                         if (val < 0.01 || val > 100) {
                             setSimulationSpeedInput(clamp(val, 0.01, 100).toString());
                         }
-                        else if (/[A-z]/g.test(event.target.value)) {
+                        else if (/[[A-Za-z]/g.test(event.target.value)) {
                             setSimulationSpeedInput("");
                         }
                         else {
@@ -234,7 +233,7 @@ export default function ControlPanel(
                         if (val < 1 || val > 100) {
                             setUpdateRateInput(clamp(val, 1, 100).toString());
                         }
-                        else if (/[A-z]/g.test(event.target.value)) {
+                        else if (/[A-Za-z]/g.test(event.target.value)) {
                             setUpdateRateInput("");
                         }
                         else {

diff --git a/web/frontend/src/components/ElevatorComponent.tsx b/web/frontend/src/components/ElevatorComponent.tsx
@@ -1,12 +1,11 @@
 import React from "react";
-import { Card, Typography } from "@mui/material";
-import Grid from '@mui/material/Unstable_Grid2';
+import { Card, Grid2 as Grid, Typography } from "@mui/material";
 
 import Elevator from "@/models/Elevator";
 
 
 export default function ElevatorComponent({ elevator }: { elevator: Elevator }) {
-    return <Grid xs={2}>
+    return <Grid size={2}>
         <Card variant="outlined" sx={{padding: 1.5}}>
             <Typography>Elevator {elevator.id}</Typography>
             <Typography>{elevator.currentFloor}

diff --git a/web/frontend/src/components/ElevatorPanel.tsx b/web/frontend/src/components/ElevatorPanel.tsx
@@ -1,4 +1,4 @@
-import Grid from '@mui/material/Unstable_Grid2';
+import { Grid2 as Grid } from "@mui/material";
 
 import ElevatorComponent from "@/components/ElevatorComponent";
 

diff --git a/web/frontend/src/components/ElevatorStatusPanel.tsx b/web/frontend/src/components/ElevatorStatusPanel.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import Grid from '@mui/material/Unstable_Grid2'; // Grid version 2
+import { Grid2 as Grid } from "@mui/material";
 
 import Load from "@/models/Load";
 
@@ -25,14 +25,14 @@ export default function ElevatorStatusPanel({floors, loads}: {floors: number, lo
     }
 
     return <Grid container m={2} rowSpacing={1}>
-        <Grid xs={4}></Grid>
-        <Grid xs={4}>↑</Grid>
-        <Grid xs={4}>↓</Grid>
+        <Grid size={4}></Grid>
+        <Grid size={4}>↑</Grid>
+        <Grid size={4}>↓</Grid>
         {passengersInFloors.map((floor, index) => {
             return <React.Fragment key={index}>
-                <Grid xs={4}>{index + 1}</Grid>
-                <Grid xs={4}>{floor.goingUp}</Grid>
-                <Grid xs={4}>{floor.goingDown}</Grid>
+                <Grid size={4}>{index + 1}</Grid>
+                <Grid size={4}>{floor.goingUp}</Grid>
+                <Grid size={4}>{floor.goingDown}</Grid>
             </React.Fragment>
         })}
     </Grid>