Updates and fixes (#1718)

* Update packages * Prettified Code! * Update frontend packages * Fixes * Prettified Code! * Update backend * Update lockfile Co-authored-by: timmo001 <timmo001@users.noreply.github.com>
timmo001 · Nov 9, 2021 · d2555ef · d2555ef
1 parent 6a1645e
commit d2555ef
Show file tree

Hide file tree

Showing 58 changed files with 2,808 additions and 2,629 deletions.
diff --git a/backend/package.json b/backend/package.json
@@ -48,19 +48,19 @@
     "winston": "3.3.3"
   },
   "devDependencies": {
-    "@types/compression": "1.7.1",
+    "@types/compression": "1.7.2",
     "@types/cors": "2.8.12",
     "@types/helmet": "4.0.0",
-    "@types/jest": "27.0.1",
+    "@types/jest": "27.0.2",
     "@types/jsonwebtoken": "8.5.5",
     "@types/nedb": "1.8.12",
     "@types/serve-favicon": "2.5.3",
-    "jest": "27.0.6",
-    "jest-junit": "12.2.0",
-    "nodemon": "2.0.12",
+    "jest": "27.3.1",
+    "jest-junit": "13.0.0",
+    "nodemon": "2.0.14",
     "shx": "0.3.3",
-    "ts-jest": "27.0.5",
+    "ts-jest": "27.0.7",
     "ts-node-dev": "1.1.8",
-    "typescript": "4.3.5"
+    "typescript": "4.4.4"
   }
 }
diff --git a/backend/yarn.lock b/backend/yarn.lock
diff --git a/frontend/package.json b/frontend/package.json
@@ -18,33 +18,33 @@
     "@material-ui/icons": "4.11.2",
     "@material-ui/lab": "4.0.0-alpha.60",
     "@material-ui/styles": "4.11.4",
-    "@mdi/font": "5.9.55",
+    "@mdi/font": "6.4.95",
     "array-move": "4.0.0",
     "clsx": "1.1.1",
-    "history": "5.0.1",
-    "home-assistant-js-websocket": "5.11.1",
+    "history": "5.1.0",
+    "home-assistant-js-websocket": "5.11.2",
     "moment": "2.29.1",
     "query-string": "7.0.1",
     "react": "17.0.2",
     "react-color": "2.19.3",
     "react-dom": "17.0.2",
-    "react-markdown": "7.0.0",
+    "react-markdown": "7.1.0",
     "react-refresh": "0.10.0",
     "react-scripts": "4.0.3",
-    "recharts": "2.1.0",
+    "recharts": "2.1.6",
     "rss-parser": "3.12.0",
     "socket.io-client": "2.3.1",
     "superagent": "6.1.0",
     "typeface-roboto": "1.1.13"
   },
   "devDependencies": {
-    "@types/node": "16.6.2",
-    "@types/react": "17.0.19",
-    "@types/react-color": "3.0.5",
-    "@types/react-dom": "17.0.9",
-    "@types/superagent": "4.1.12",
-    "jest-junit": "12.2.0",
-    "typescript": "4.3.5"
+    "@types/node": "16.11.7",
+    "@types/react": "17.0.34",
+    "@types/react-color": "3.0.6",
+    "@types/react-dom": "17.0.11",
+    "@types/superagent": "4.1.13",
+    "jest-junit": "13.0.0",
+    "typescript": "4.4.4"
   },
   "scripts": {
     "start": "react-scripts start",

diff --git a/frontend/src/Components/Cards/AddCard.tsx b/frontend/src/Components/Cards/AddCard.tsx
@@ -46,7 +46,8 @@ function AddCard(props: AddCardProps): ReactElement {
       <ButtonBase
         className={classes.buttonCardContainer}
         focusRipple
-        onClick={props.handleAdd}>
+        onClick={props.handleAdd}
+      >
         <Card className={classes.card} elevation={1}>
           <CardContent
             className={classes.cardContent}
@@ -57,12 +58,14 @@ function AddCard(props: AddCardProps): ReactElement {
               minWidth: cardSize,
               maxHeight: cardSize,
               maxWidth: cardSize,
-            }}>
+            }}
+          >
             <Grid
               className={classes.grid}
               container
               alignContent="center"
-              justifyContent="center">
+              justifyContent="center"
+            >
               <span className={clsx("mdi", "mdi-plus", classes.icon)} />
             </Grid>
           </CardContent>

diff --git a/frontend/src/Components/Cards/AddGroup.tsx b/frontend/src/Components/Cards/AddGroup.tsx
@@ -38,11 +38,13 @@ function AddGroup(props: AddGroupProps): ReactElement {
       style={{
         height: cardSize,
         width: cardSize * 2,
-      }}>
+      }}
+    >
       <ButtonBase
         className={classes.buttonCardContainer}
         focusRipple
-        onClick={props.handleAdd}>
+        onClick={props.handleAdd}
+      >
         <CardContent>
           <span className={clsx("mdi", "mdi-plus", classes.icon)} />
         </CardContent>

diff --git a/frontend/src/Components/Cards/Base.tsx b/frontend/src/Components/Cards/Base.tsx
@@ -315,14 +315,16 @@ function Base(props: BaseProps): ReactElement {
       onTouchCancel={handleHoldCancel}
       onTouchEnd={handleHoldCancel}
       onMouseUp={handleHoldCancel}
-      onMouseLeave={handleHoldCancel}>
+      onMouseLeave={handleHoldCancel}
+    >
       <Card
         className={classes.card}
         square={props.card.square}
         elevation={elevation}
         style={{
           background: background,
-        }}>
+        }}
+      >
         <CardContent
           className={classes.cardContent}
           style={{
@@ -333,7 +335,8 @@ function Base(props: BaseProps): ReactElement {
             maxHeight: height,
             maxWidth: width,
             padding: props.card.padding ? props.card.padding : 12,
-          }}>
+          }}
+        >
           <Grid container direction="row">
             <Grid item xs>
               {props.card.title && (
@@ -347,7 +350,8 @@ function Base(props: BaseProps): ReactElement {
                   component="h3"
                   gutterBottom
                   noWrap
-                  style={{ fontSize: props.card.title_size }}>
+                  style={{ fontSize: props.card.title_size }}
+                >
                   {props.card.title}
                 </Typography>
               )}
@@ -357,7 +361,8 @@ function Base(props: BaseProps): ReactElement {
                 <IconButton
                   aria-label="close"
                   size="small"
-                  onClick={props.handleCloseExpand}>
+                  onClick={props.handleCloseExpand}
+                >
                   <CloseIcon fontSize="small" />
                 </IconButton>
               )}
@@ -371,7 +376,8 @@ function Base(props: BaseProps): ReactElement {
         <Dialog
           PaperProps={{ style: { background: "transparent" } }}
           open={expandCard}
-          onClose={handleCloseExpand}>
+          onClose={handleCloseExpand}
+        >
           <Grid container justifyContent="center">
             <Base
               {...props}

diff --git a/frontend/src/Components/Cards/Checklist/Checklist.tsx b/frontend/src/Components/Cards/Checklist/Checklist.tsx
@@ -71,7 +71,8 @@ function Checklist(props: BaseProps): ReactElement | null {
       direction="row"
       justifyContent="center"
       alignContent="flex-start"
-      alignItems="center">
+      alignItems="center"
+    >
       {useMemo(() => {
         if (
           props.card.checklist_items !== undefined &&

diff --git a/frontend/src/Components/Cards/Checklist/Item.tsx b/frontend/src/Components/Cards/Checklist/Item.tsx
@@ -103,7 +103,8 @@ function Checklist(props: ItemProps): ReactElement | null {
         direction="row"
         justifyContent="center"
         alignContent="flex-start"
-        alignItems="center">
+        alignItems="center"
+      >
         <Grid item>
           <Checkbox
             checked={item.checked}
@@ -129,7 +130,8 @@ function Checklist(props: ItemProps): ReactElement | null {
             aria-label="more"
             aria-controls="long-menu"
             aria-haspopup="true"
-            onClick={handleOpenMenu}>
+            onClick={handleOpenMenu}
+          >
             <MoreVertIcon />
           </IconButton>
         </Grid>
@@ -144,7 +146,8 @@ function Checklist(props: ItemProps): ReactElement | null {
           style: {
             minWidth: "20ch",
           },
-        }}>
+        }}
+      >
         {props.position > 0 && (
           <MenuItem onClick={handleMoveUp}>Move Up</MenuItem>
         )}

diff --git a/frontend/src/Components/Cards/Markdown.tsx b/frontend/src/Components/Cards/Markdown.tsx
@@ -31,13 +31,15 @@ function Markdown(props: BaseProps): ReactElement | null {
       className={classes.text}
       color="textPrimary"
       variant="body1"
-      component="span">
+      component="span"
+    >
       <ReactMarkdown
         skipHtml={false}
         components={{
           a: Link,
           code: Code,
-        }}>
+        }}
+      >
         {props.card.content}
       </ReactMarkdown>
     </Typography>

diff --git a/frontend/src/Components/Cards/News.tsx b/frontend/src/Components/Cards/News.tsx
@@ -123,7 +123,8 @@ function News(props: BaseProps): ReactElement {
               direction="row"
               justifyContent="center"
               alignContent="center"
-              alignItems="center">
+              alignItems="center"
+            >
               {props.card.width && props.card.width > 2 && item.imageURL && (
                 <Grid className={classes.mediaContainer} item xs={3}>
                   <a href={item.url} target="_blank" rel="noopener noreferrer">
@@ -144,7 +145,8 @@ function News(props: BaseProps): ReactElement {
                     variant="caption"
                     component="h5"
                     gutterBottom
-                    noWrap>
+                    noWrap
+                  >
                     <ReactMarkdown skipHtml={false}>{item.meta}</ReactMarkdown>
                   </Typography>
                 )}

diff --git a/frontend/src/Components/Cards/Overlay.tsx b/frontend/src/Components/Cards/Overlay.tsx
@@ -60,7 +60,8 @@ function Overlay(props: BaseProps): ReactElement {
         container
         alignContent="center"
         alignItems="center"
-        justifyContent="center">
+        justifyContent="center"
+      >
         <IconButton color="primary" onClick={handleEdit}>
           <EditIcon fontSize="small" />
         </IconButton>
@@ -73,13 +74,15 @@ function Overlay(props: BaseProps): ReactElement {
         <IconButton
           disabled={props.position === 0}
           color="primary"
-          onClick={props.handleMoveUp}>
+          onClick={props.handleMoveUp}
+        >
           <ArrowLeftIcon fontSize="small" />
         </IconButton>
         <IconButton
           disabled={props.position === props.maxPosition}
           color="primary"
-          onClick={props.handleMoveDown}>
+          onClick={props.handleMoveDown}
+        >
           <ArrowRightIcon fontSize="small" />
         </IconButton>
         {deleteConfirm && (

diff --git a/frontend/src/Components/Cards/RSS.tsx b/frontend/src/Components/Cards/RSS.tsx
@@ -112,7 +112,8 @@ function RSS(props: BaseProps): ReactElement {
               direction="row"
               justifyContent="center"
               alignContent="center"
-              alignItems="center">
+              alignItems="center"
+            >
               <Grid item xs>
                 <Typography variant="subtitle1" component="h3">
                   <ReactMarkdown skipHtml={false}>{item.heading}</ReactMarkdown>
@@ -122,7 +123,8 @@ function RSS(props: BaseProps): ReactElement {
                     variant="caption"
                     component="h5"
                     gutterBottom
-                    noWrap>
+                    noWrap
+                  >
                     <ReactMarkdown skipHtml={false}>{item.meta}</ReactMarkdown>
                   </Typography>
                 )}

diff --git a/frontend/src/Components/Configuration/Configuration.tsx b/frontend/src/Components/Configuration/Configuration.tsx
@@ -45,7 +45,8 @@ function Configuration(props: ConfigurationBaseProps): ReactElement {
       direction="column"
       justifyContent="center"
       alignContent="center"
-      spacing={1}>
+      spacing={1}
+    >
       {sections.map((section: ConfigSection, key: number) => (
         <Grid
           className={classes.section}
@@ -56,7 +57,8 @@ function Configuration(props: ConfigurationBaseProps): ReactElement {
           lg={4}
           md={8}
           sm={10}
-          xs={12}>
+          xs={12}
+        >
           <Grid item xs container>
             {section.title && (
               <Grid item xs>