From 49b92232d2451ec5c3c823f99e9b570f141658a3 Mon Sep 17 00:00:00 2001
From: Mehsheed Ahmed Syed Abdul <mehsheed59@gmail.com>
Date: Sun, 3 Dec 2023 22:56:33 -0700
Subject: [PATCH 1/8] feat : logo try

---
 client/package-lock.json                  | 38 +++++++++++++++++++++++
 client/package.json                       |  2 ++
 client/src/components/template/AppBar.tsx | 16 +++-------
 3 files changed, 44 insertions(+), 12 deletions(-)

diff --git a/client/package-lock.json b/client/package-lock.json
index 4b15f22a..da43cbd2 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -21,6 +21,7 @@
         "@types/react": "^18.2.31",
         "@types/react-dom": "^18.2.14",
         "axios": "^1.5.1",
+        "mui-image": "^1.0.7",
         "mui-markdown": "^1.1.11",
         "react": "^18.2.0",
         "react-dom": "^18.2.0",
@@ -33,6 +34,7 @@
         "web-vitals": "^2.1.4"
       },
       "devDependencies": {
+        "@types/mui-image": "^1.0.5",
         "@types/uuid": "^9.0.7"
       }
     },
@@ -4823,6 +4825,15 @@
       "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.3.tgz",
       "integrity": "sha512-Ys+/St+2VF4+xuY6+kDIXGxbNRO0mesVg0bbxEfB97Od1Vjpjx9KD1qxs64Gcb3CWPirk9Xe+PT4YiiHQ9T+eg=="
     },
+    "node_modules/@types/mui-image": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/@types/mui-image/-/mui-image-1.0.5.tgz",
+      "integrity": "sha512-xbOpuowqvMyRiiM3U39AApyVj2xIoNH6egvMCWQ+d9AzILs0cT688x33AfPnQrnMqmJBclo4hRyUzpxGQwTqkQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/react": "*"
+      }
+    },
     "node_modules/@types/node": {
       "version": "20.8.7",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-20.8.7.tgz",
@@ -13134,6 +13145,18 @@
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
     },
+    "node_modules/mui-image": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/mui-image/-/mui-image-1.0.7.tgz",
+      "integrity": "sha512-U79TWMKMfMC1ZiGnv/M+SaVJeUpubEjXOdy7w53RsvidUAMZ+4nW+QmDG9yg5fgWeYy6YJgLHyI9BHSDw76iIg==",
+      "peerDependencies": {
+        "@emotion/react": "^11.4.1",
+        "@emotion/styled": "^11.3.0",
+        "@mui/material": "^5.0.1",
+        "prop-types": "^15.7.2",
+        "react": "^17.0.2 || ^18.0.0"
+      }
+    },
     "node_modules/mui-markdown": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/mui-markdown/-/mui-markdown-1.1.11.tgz",
@@ -21949,6 +21972,15 @@
       "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.3.tgz",
       "integrity": "sha512-Ys+/St+2VF4+xuY6+kDIXGxbNRO0mesVg0bbxEfB97Od1Vjpjx9KD1qxs64Gcb3CWPirk9Xe+PT4YiiHQ9T+eg=="
     },
+    "@types/mui-image": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/@types/mui-image/-/mui-image-1.0.5.tgz",
+      "integrity": "sha512-xbOpuowqvMyRiiM3U39AApyVj2xIoNH6egvMCWQ+d9AzILs0cT688x33AfPnQrnMqmJBclo4hRyUzpxGQwTqkQ==",
+      "dev": true,
+      "requires": {
+        "@types/react": "*"
+      }
+    },
     "@types/node": {
       "version": "20.8.7",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-20.8.7.tgz",
@@ -28047,6 +28079,12 @@
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
     },
+    "mui-image": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/mui-image/-/mui-image-1.0.7.tgz",
+      "integrity": "sha512-U79TWMKMfMC1ZiGnv/M+SaVJeUpubEjXOdy7w53RsvidUAMZ+4nW+QmDG9yg5fgWeYy6YJgLHyI9BHSDw76iIg==",
+      "requires": {}
+    },
     "mui-markdown": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/mui-markdown/-/mui-markdown-1.1.11.tgz",
diff --git a/client/package.json b/client/package.json
index 8707fdee..41df559d 100644
--- a/client/package.json
+++ b/client/package.json
@@ -16,6 +16,7 @@
     "@types/react": "^18.2.31",
     "@types/react-dom": "^18.2.14",
     "axios": "^1.5.1",
+    "mui-image": "^1.0.7",
     "mui-markdown": "^1.1.11",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
@@ -52,6 +53,7 @@
     ]
   },
   "devDependencies": {
+    "@types/mui-image": "^1.0.5",
     "@types/uuid": "^9.0.7"
   }
 }
diff --git a/client/src/components/template/AppBar.tsx b/client/src/components/template/AppBar.tsx
index f4333798..a67f2287 100644
--- a/client/src/components/template/AppBar.tsx
+++ b/client/src/components/template/AppBar.tsx
@@ -2,8 +2,9 @@ import { useContext } from "react";
 
 import AppBar from "@mui/material/AppBar";
 import Typography from "@mui/material/Typography";
-import { Button } from "@mui/material";
+import { Button, Paper } from "@mui/material";
 import { toast } from "react-toastify";
+import Image from 'mui-image';
 
 import {
   removeToken,
@@ -31,6 +32,7 @@ const HeadBar = () => {
       "You have successfuly logged out! Please log in again to use our service!"
     );
   };
+  
 
   return (
     <AppBar
@@ -52,17 +54,7 @@ const HeadBar = () => {
           marginLeft: "calc(15vw - 16px)",
         }}
       >
-        <Typography
-          variant="h4"
-          align="left"
-          color="primary"
-          style={{
-            marginTop: 10,
-            marginBottom: 10,
-          }}
-        >
-          distributed
-        </Typography>
+            <Image src="https://i.postimg.cc/NFTYysSP/logof.png" width={160}/>
       </Link>
 
       <Button

From df6072d54326e5943d0c2ae76788a4f407e8d3e4 Mon Sep 17 00:00:00 2001
From: Mehsheed Ahmed Syed Abdul <mehsheed59@gmail.com>
Date: Sun, 3 Dec 2023 23:22:28 -0700
Subject: [PATCH 2/8] fix : update logo

---
 client/src/components/template/AppBar.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/components/template/AppBar.tsx b/client/src/components/template/AppBar.tsx
index a67f2287..861be4ca 100644
--- a/client/src/components/template/AppBar.tsx
+++ b/client/src/components/template/AppBar.tsx
@@ -54,7 +54,7 @@ const HeadBar = () => {
           marginLeft: "calc(15vw - 16px)",
         }}
       >
-            <Image src="https://i.postimg.cc/NFTYysSP/logof.png" width={160}/>
+            <Image src="https://i.postimg.cc/T2CVdBbG/logo-copy.png" width={160}/>
       </Link>
 
       <Button

From 28532e3732439691bc9ec97dfb91b1755c999c39 Mon Sep 17 00:00:00 2001
From: rmgutierrez <raphael_0810@outlook.com>
Date: Mon, 4 Dec 2023 00:28:47 -0700
Subject: [PATCH 3/8] Resolution test

---
 client/src/components/template/AppBar.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/components/template/AppBar.tsx b/client/src/components/template/AppBar.tsx
index a67f2287..2a9199d8 100644
--- a/client/src/components/template/AppBar.tsx
+++ b/client/src/components/template/AppBar.tsx
@@ -54,7 +54,7 @@ const HeadBar = () => {
           marginLeft: "calc(15vw - 16px)",
         }}
       >
-            <Image src="https://i.postimg.cc/NFTYysSP/logof.png" width={160}/>
+            <Image src="https://i.postimg.cc/wjZxRjXw/Frame-1.png" width={160}/>
       </Link>
 
       <Button

From bee3bc035fdd2962cc6a72d9183c7a9a719d5853 Mon Sep 17 00:00:00 2001
From: Mehsheed Ahmed Syed Abdul <mehsheed59@gmail.com>
Date: Mon, 4 Dec 2023 14:35:33 -0700
Subject: [PATCH 4/8] feat : update favicon.ico

---
 client/public/favicon.ico | Bin 3870 -> 858 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/client/public/favicon.ico b/client/public/favicon.ico
index a11777cc471a4344702741ab1c8a588998b1311a..5895f24dd4a085f266fbe0d6bb9fffbc387121d4 100644
GIT binary patch
literal 858
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGooCO|{#S9GG!XV7ZFl&wk0|PUU
zr;B4q#hkZueZ4~hC652)Xx~s9zhKcbW|>vKjcc3E@MH$BK6H>{k(m0Djs@Y-A*;=n
zGCw+GWN=IJW^0zpks^gymaQ91?yq+{Cu}aULsV*>rSW;o^MC(8$Z5AepMUOu;yc^#
zbJ$L4T+Ha4lDAdrSzQ0-*BJ|Xgd7=IR1(-STm-l~6w;KwFmQM{@LzbrsH4y{qw@l@
zf&!zh!(#Rg4ID{oPW(TnubgQqrRi%WJAe5y#RTP3PmR9X)qDOr!utC5;s4Usvp$zR
zPPErOzIp~@=CntmS(f#C(^~&mzsY*J;QD)er6#ST`C0ozwm%AYdwkDq*QW*jZTEZA
zzc-$FROG|%SAK2pkCzj(Z72IO#_X?oTEL?1;Pf$c1=A9d_*M;vppT&$OiM)LTU8vA
zK89*AEfI@vRd6W!IQ2c#67l$-IuD-Tl9IKmp1RjTYc*5ecOHwsi+1;yT{!x?)wlm`
z`|Zu@3UPlOZ_o0x+8h4)>Fb`WTWjXWuX!08rq9a5C%#vs?w94^xrc&p?OLxZ&6H<X
z^~U$(Ws&3Rna?NgsbM_n`ZMeg*X3gFD>d(=SPDe!Wj)KQ+2^`U+95e%b>YX$d;S`H
z{4Ht7vV?_4^!SQ-HM8fgfAzm>honI7v=#R{qQzMl%N!bx@hG@VU>0yJQ)n_#>JV_`
zb6~mI$Z@Gd!HLC^K`@0~$wRq`L+}ZM%LLgDg<cLNT#60dF9=Lq`hn|2Vxri3hSsH>
zf0#tXo`)S@`%XQSJ0N0S-ucbp%6=>wdln?J#|3_Rpt^S*Q{1K7Iu*X5+&|T06mLqr
zPx!ZKbKL?PnK<qfO)QUhGrSb?;b2nnHdx3pLF-_Pio+rn;aLosLOvZ#DxL-lxh5zb
zY|&9*j25phXyLr>lX2wP-Fh#Jyj`!tYI5TD^D*n+yYMe~?v~W^8)wNq5Lo|!p`CYT
zY{a6Co&J9P29f#V)0Xh>{O2QWRNXUG-+{qc-~bPc0W;$nT+EMLKUjGMB#s$hd~gz&
PSr|NB{an^LB{Ts58kk@}

literal 3870
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
baj7?x%VD!5Cxk2YbYLNVeiXvvpMCWYo=by@


From 21faa22a2a97ae7fad3160b9cbf4831e3a5c02ef Mon Sep 17 00:00:00 2001
From: rmgutierrez <raphael_0810@outlook.com>
Date: Tue, 5 Dec 2023 20:31:45 -0700
Subject: [PATCH 5/8] logo margin

---
 client/src/components/template/AppBar.tsx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/client/src/components/template/AppBar.tsx b/client/src/components/template/AppBar.tsx
index 2a9199d8..3c19113a 100644
--- a/client/src/components/template/AppBar.tsx
+++ b/client/src/components/template/AppBar.tsx
@@ -54,7 +54,11 @@ const HeadBar = () => {
           marginLeft: "calc(15vw - 16px)",
         }}
       >
-            <Image src="https://i.postimg.cc/wjZxRjXw/Frame-1.png" width={160}/>
+            <Image src="https://i.postimg.cc/wjZxRjXw/Frame-1.png" width={160}
+              style={{
+                marginBottom: 10
+              }}
+            />
       </Link>
 
       <Button

From 0b073137d2a44ddaa4a1be45c5b8dc5370a4220e Mon Sep 17 00:00:00 2001
From: Nhat Minh Luu <54903938+nluu175@users.noreply.github.com>
Date: Tue, 5 Dec 2023 21:03:30 -0700
Subject: [PATCH 6/8] Added headbar for the the 404 page

---
 client/src/components/NotFound.tsx            | 16 +-------
 .../components/template/NotFoundAppBar.tsx    | 39 +++++++++++++++++++
 2 files changed, 41 insertions(+), 14 deletions(-)
 create mode 100644 client/src/components/template/NotFoundAppBar.tsx

diff --git a/client/src/components/NotFound.tsx b/client/src/components/NotFound.tsx
index 4af792ea..f12ba5e7 100644
--- a/client/src/components/NotFound.tsx
+++ b/client/src/components/NotFound.tsx
@@ -1,23 +1,11 @@
 import { AppBar, Box, CssBaseline, Typography, Link } from "@mui/material";
+import NotFoundHeadBar from "./template/NotFoundAppBar";
 
 const NotFound = () => {
   return (
     <>
       <CssBaseline />
-      <AppBar position="fixed" style={{ color: "#FFFFFF", height: 60 }}>
-        <Typography
-          variant="h4"
-          align="left"
-          style={{
-            marginLeft: 20,
-            color: "white",
-            marginTop: 10,
-            marginBottom: 10,
-          }}
-        >
-          socialdistribution
-        </Typography>
-      </AppBar>
+      <NotFoundHeadBar />
       <Box
         sx={{
           display: "flex",
diff --git a/client/src/components/template/NotFoundAppBar.tsx b/client/src/components/template/NotFoundAppBar.tsx
new file mode 100644
index 00000000..5c1c0596
--- /dev/null
+++ b/client/src/components/template/NotFoundAppBar.tsx
@@ -0,0 +1,39 @@
+import AppBar from "@mui/material/AppBar";
+import Image from "mui-image";
+import { Link } from "react-router-dom";
+
+const NotFoundHeadBar = () => {
+  return (
+    <AppBar
+      position="fixed"
+      style={{
+        height: 60,
+        display: "flex",
+        flexDirection: "row",
+        justifyContent: "space-between",
+        background: "transparent",
+        backdropFilter: "blur(15px)",
+        boxShadow: "none",
+        borderBottom: "1px solid #dbd9d9",
+      }}
+    >
+      <Link
+        to="/home-page"
+        style={{
+          textDecoration: "none",
+          marginLeft: "calc(15vw - 16px)",
+        }}
+      >
+        <Image
+          src="https://i.postimg.cc/wjZxRjXw/Frame-1.png"
+          width={160}
+          style={{
+            marginBottom: 10,
+          }}
+        />
+      </Link>
+    </AppBar>
+  );
+};
+
+export default NotFoundHeadBar;

From 03975b20fc07dfbd3236a4d20db7357ea2bf422f Mon Sep 17 00:00:00 2001
From: Nhat Minh Luu <54903938+nluu175@users.noreply.github.com>
Date: Wed, 6 Dec 2023 19:04:44 -0700
Subject: [PATCH 7/8] Fixed logo issue

---
 client/src/components/template/AppBar.tsx     | 31 +++++++++++--------
 .../components/template/NotFoundAppBar.tsx    | 15 ++++++---
 2 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/client/src/components/template/AppBar.tsx b/client/src/components/template/AppBar.tsx
index 3c19113a..d3f1370f 100644
--- a/client/src/components/template/AppBar.tsx
+++ b/client/src/components/template/AppBar.tsx
@@ -2,9 +2,9 @@ import { useContext } from "react";
 
 import AppBar from "@mui/material/AppBar";
 import Typography from "@mui/material/Typography";
-import { Button, Paper } from "@mui/material";
+import { Box, Button, Paper } from "@mui/material";
 import { toast } from "react-toastify";
-import Image from 'mui-image';
+import Image from "mui-image";
 
 import {
   removeToken,
@@ -32,7 +32,6 @@ const HeadBar = () => {
       "You have successfuly logged out! Please log in again to use our service!"
     );
   };
-  
 
   return (
     <AppBar
@@ -48,19 +47,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)",
         }}
       >
-            <Image src="https://i.postimg.cc/wjZxRjXw/Frame-1.png" width={160}
-              style={{
-                marginBottom: 10
-              }}
-            />
+        <Box
+          component="img"
+          sx={{
+            height: 55,
+            width: "auto",
+            maxHeight: 55,
+            maxWidth: "auto",
+          }}
+          alt="App Logo"
+          src="https://i.postimg.cc/Kvg7sSNK/logo-distributed.jpg"
+        />
       </Link>
-
       <Button
         size="small"
         sx={{
@@ -69,7 +74,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
index 5c1c0596..55588400 100644
--- a/client/src/components/template/NotFoundAppBar.tsx
+++ b/client/src/components/template/NotFoundAppBar.tsx
@@ -1,3 +1,4 @@
+import { Box } from "@mui/material";
 import AppBar from "@mui/material/AppBar";
 import Image from "mui-image";
 import { Link } from "react-router-dom";
@@ -24,12 +25,16 @@ const NotFoundHeadBar = () => {
           marginLeft: "calc(15vw - 16px)",
         }}
       >
-        <Image
-          src="https://i.postimg.cc/wjZxRjXw/Frame-1.png"
-          width={160}
-          style={{
-            marginBottom: 10,
+        <Box
+          component="img"
+          sx={{
+            height: 55,
+            width: "auto",
+            maxHeight: 55,
+            maxWidth: "auto",
           }}
+          alt="App Logo"
+          src="https://i.postimg.cc/Kvg7sSNK/logo-distributed.jpg"
         />
       </Link>
     </AppBar>

From 5253a46651870d758449f18d6fb70ecb3a5441fe Mon Sep 17 00:00:00 2001
From: Nhat Minh Luu <54903938+nluu175@users.noreply.github.com>
Date: Wed, 6 Dec 2023 21:38:39 -0700
Subject: [PATCH 8/8] Removed unused imports

---
 client/src/components/template/AppBar.tsx         | 2 --
 client/src/components/template/NotFoundAppBar.tsx | 1 -
 2 files changed, 3 deletions(-)

diff --git a/client/src/components/template/AppBar.tsx b/client/src/components/template/AppBar.tsx
index d3f1370f..46717b53 100644
--- a/client/src/components/template/AppBar.tsx
+++ b/client/src/components/template/AppBar.tsx
@@ -1,10 +1,8 @@
 import { useContext } from "react";
-
 import AppBar from "@mui/material/AppBar";
 import Typography from "@mui/material/Typography";
 import { Box, Button, Paper } from "@mui/material";
 import { toast } from "react-toastify";
-import Image from "mui-image";
 
 import {
   removeToken,
diff --git a/client/src/components/template/NotFoundAppBar.tsx b/client/src/components/template/NotFoundAppBar.tsx
index 55588400..db5c9b5d 100644
--- a/client/src/components/template/NotFoundAppBar.tsx
+++ b/client/src/components/template/NotFoundAppBar.tsx
@@ -1,6 +1,5 @@
 import { Box } from "@mui/material";
 import AppBar from "@mui/material/AppBar";
-import Image from "mui-image";
 import { Link } from "react-router-dom";
 
 const NotFoundHeadBar = () => {