Merge pull request #1 from oslabs-beta/old-state

Dereknyren · web-flow · commit e7592725fee8 · 2023-06-24T08:29:14.000-07:00
page weight reduction
diff --git a/index-csp.html b/index-csp.html
@@ -1,13 +1,10 @@
 <!DOCTYPE html>
 <html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Swell</title>
+  </head>
 
-<head>
-  <meta charset="UTF-8" />
-  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <!-- <link rel="stylesheet" href="./node_modules/chart.js/dist/Chart.min.css" /> -->
-  <title>Swell</title>
-</head>
-
-<body></body>
-
-</html>
+  <body></body>
+</html>
diff --git a/package.json b/package.json
@@ -96,8 +96,6 @@
   "dependencies": {
     "@apollo/client": "^3.5.0",
     "@apollo/server": "^4.6.0",
-    "@emotion/react": "^11.10.8",
-    "@emotion/styled": "^11.10.8",
     "@graphql-tools/schema": "^8.3.10",
     "@grpc/grpc-js": "^1.6.7",
     "@grpc/proto-loader": "^0.6.9",
@@ -110,13 +108,11 @@
     "@uiw/codemirror-extensions-langs": "^4.19.9",
     "@uiw/codemirror-theme-vscode": "^4.19.9",
     "@uiw/react-codemirror": "^4.19.9",
-    "axios": "^0.27.1",
     "body-parser": "^1.20.0",
     "bulma": "^0.9.3",
     "bulma-checkradio": "^2.1.3",
     "bulma-switch": "^2.0.4",
     "chai": "^4.3.7",
-    "chart.js": "^3.7.1",
     "classnames": "^2.3.1",
     "cookie-parser": "^1.4.6",
     "cors": "^2.8.5",
@@ -137,7 +133,6 @@
     "graphql-tag": "^2.12.6",
     "graphql-ws": "^5.8.1",
     "highland": "^2.13.5",
-    "js-beautify": "^1.14.3",
     "mali": "^0.46.1",
     "ngrok": "^4.3.1",
     "node-fetch": "^3.3.0",
@@ -154,7 +149,6 @@
     "react-router-dom": "^6.3.0",
     "react-split": "^2.0.14",
     "redux": "^4.2.0",
-    "resize-observer-polyfill": "^1.5.1",
     "sass": "^1.51.0",
     "set-cookie-parser": "^2.4.8",
     "socket.io": "^4.5.0",
diff --git a/src/assets/img/swell-logo-faded.avif b/src/assets/img/swell-logo-faded.avif
diff --git a/src/client/components/main/WebRTC-composer/WebRTCServerEntryForm.tsx b/src/client/components/main/WebRTC-composer/WebRTCServerEntryForm.tsx
@@ -5,8 +5,7 @@ import { EditorView } from '@codemirror/view';
 import { javascript } from '@codemirror/lang-javascript';
 import { vscodeDark } from '@uiw/codemirror-theme-vscode';
 
-
-const jBeautify = require('js-beautify').js;
+// const jBeautify = require('js-beautify').js;
 
 interface Props {
   warningMessage: {
@@ -15,7 +14,9 @@ interface Props {
 }
 
 const WebRTCServerEntryForm: React.FC<Props> = ({ warningMessage }) => {
-  const requestBody = useSelector((state: any) => state.newRequest.newRequestBody);
+  const requestBody = useSelector(
+    (state: any) => state.newRequest.newRequestBody
+  );
   const { bodyIsNew } = requestBody;
   const [cmValue, setValue] = useState<string>('');
   const isDark = useSelector((state: any) => state.ui.isDark);
@@ -28,14 +29,14 @@ const WebRTCServerEntryForm: React.FC<Props> = ({ warningMessage }) => {
       /**
        * @todo This code randomly causes parts of the app to crash. As in, it
        * will randomly decide to start or stop working without you changing
-       * anything. Need to investigate 
-       * 
+       * anything. Need to investigate
+       *
        * (OR needs to be re-built....
        *          - another iteration group)
        */
-      setValue(
-        jBeautify(JSON.stringify(bodyContent?.iceConfiguration?.iceServers))
-      );
+      // setValue(
+      //   jBeautify(JSON.stringify(bodyContent?.iceConfiguration?.iceServers))
+      // );
     }
   }, [bodyContent, bodyIsNew]);
 
@@ -64,7 +65,6 @@ const WebRTCServerEntryForm: React.FC<Props> = ({ warningMessage }) => {
 
 export default WebRTCServerEntryForm;
 
-
 // const WebRTCServerEntryForm = (props) => {
 //   const { warningMessage } = props;
 //   const requestBody = useSelector((state) => state.newRequest.newRequestBody);
diff --git a/src/client/components/main/response-composer/EmptyState.tsx b/src/client/components/main/response-composer/EmptyState.tsx
@@ -1,6 +1,5 @@
 import React from 'react';
-import logofaded from '../../../../assets/img/swell-logo-faded.png';
-
+import logofaded from '../../../../assets/img/swell-logo-faded.avif';
 
 interface EmptyStateProps {
   connection?: any;
diff --git a/webpack.config.js b/webpack.config.js
@@ -73,7 +73,7 @@ module.exports = {
         },
       },
       {
-        test: /\.(eot|woff|woff2|ttf|svg|png|jpg|gif)$/,
+        test: /\.(eot|woff|woff2|ttf|svg|png|jpg|gif|avif)$/,
         use: 'url-loader',
       },
     ],

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ module.exports = {`
`73`	`73`	`},`
`74`	`74`	`},`
`75`	`75`	`{`
`76`		`- test: /\.(eot\|woff\|woff2\|ttf\|svg\|png\|jpg\|gif)$/,`
	`76`	`+ test: /\.(eot\|woff\|woff2\|ttf\|svg\|png\|jpg\|gif\|avif)$/,`
`77`	`77`	`use: 'url-loader',`
`78`	`78`	`},`
`79`	`79`	`],`