Deployment 120623 (#199)

- #179
uofa-cmput404 · Dec 7, 2023 · 394d7b0 · 394d7b0
2 parents 10634de + 4b56d8d
commit 394d7b0
Show file tree

Hide file tree

Showing 4 changed files with 67 additions and 28 deletions.
diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/package.json b/client/package.json
@@ -16,7 +16,9 @@
     "@types/react": "^18.2.31",
     "@types/react-dom": "^18.2.14",
     "@types/uuid": "^9.0.7",
+    "@types/mui-image": "^1.0.5",
     "axios": "^1.5.1",
+    "mui-image": "^1.0.7",
     "mui-markdown": "^1.1.11",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",

diff --git a/client/src/components/template/AppBar.tsx b/client/src/components/template/AppBar.tsx
@@ -1,8 +1,7 @@
 import { useContext } from "react";
-
 import AppBar from "@mui/material/AppBar";
 import Typography from "@mui/material/Typography";
-import { Button } from "@mui/material";
+import { Box, Button, Paper } from "@mui/material";
 import { toast } from "react-toastify";
 
 import {
@@ -46,25 +45,25 @@ const HeadBar = () => {
         borderBottom: "1px solid #dbd9d9",
       }}
     >
-      <Link to="/home-page" 
-        style={{ 
-          textDecoration: "none" ,
+      <Link
+        to="/home-page"
+        style={{
+          textDecoration: "none",
           marginLeft: "calc(15vw - 16px)",
         }}
       >
-        <Typography
-          variant="h4"
-          align="left"
-          color="primary"
-          style={{
-            marginTop: 10,
-            marginBottom: 10,
+        <Box
+          component="img"
+          sx={{
+            height: 55,
+            width: "auto",
+            maxHeight: 55,
+            maxWidth: "auto",
           }}
-        >
-          distributed
-        </Typography>
+          alt="App Logo"
+          src="https://i.postimg.cc/Kvg7sSNK/logo-distributed.jpg"
+        />
       </Link>
-
       <Button
         size="small"
         sx={{
@@ -73,7 +72,7 @@ const HeadBar = () => {
           alignSelf: "center",
           marginRight: 1,
           borderRadius: 20,
-          paddingX: 2
+          paddingX: 2,
         }}
         onClick={handleSignOut}
         endIcon={<LogoutIcon />}

diff --git a/client/src/components/template/NotFoundAppBar.tsx b/client/src/components/template/NotFoundAppBar.tsx
@@ -1,6 +1,6 @@
+import { Box } from "@mui/material";
 import AppBar from "@mui/material/AppBar";
 import { Link } from "react-router-dom";
-import Typography from "@mui/material/Typography";
 
 const NotFoundHeadBar = () => {
   return (
@@ -24,17 +24,17 @@ const NotFoundHeadBar = () => {
           marginLeft: "calc(15vw - 16px)",
         }}
       >
-        <Typography
-          variant="h4"
-          align="left"
-          color="primary"
-          style={{
-            marginTop: 10,
-            marginBottom: 10,
+        <Box
+          component="img"
+          sx={{
+            height: 55,
+            width: "auto",
+            maxHeight: 55,
+            maxWidth: "auto",
           }}
-        >
-          distributed
-        </Typography>
+          alt="App Logo"
+          src="https://i.postimg.cc/Kvg7sSNK/logo-distributed.jpg"
+        />
       </Link>
     </AppBar>
   );