Merge pull request #655 from bluewave-labs/develop

Develop -> Master

Client/src/Components/TabPanels/Account/PasswordPanel.jsx

@@ -104,13 +104,6 @@ const PasswordPanel = () => {
         noValidate
         spellCheck="false"
       >
-        <div className="edit-password-form__wrapper">
-          <Alert
-            variant="info"
-            title="SSO login"
-            body="Since you logged in via SSO, you cannot reset or modify your password."
-          />
-        </div>
         <div className="edit-password-form__wrapper">
           <Stack>
             <Typography component="h1">Current password</Typography>

Client/src/Pages/Account/index.jsx

@@ -29,7 +29,15 @@ const Account = ({ open = "profile" }) => {
   if (!user.role.includes("admin")) tabList = ["Profile", "Password"];
 
   return (
-    <Box className="account" pt={theme.gap.xl}>
+    <Box
+      className="account"
+      px={theme.gap.xl}
+      py={theme.gap.large}
+      border={1}
+      borderColor={theme.palette.otherColors.graishWhite}
+      borderRadius={`${theme.shape.borderRadius}px`}
+      backgroundColor={theme.palette.otherColors.white}
+    >
       <TabContext value={tab}>
         <Box
           sx={{

Client/src/Pages/NotFound/index.jsx

@@ -4,6 +4,7 @@ import React from "react";
 import PropTypes from "prop-types";
 import { Stack, Typography } from "@mui/material";
 import { useNavigate } from "react-router";
+import NotFoundSvg from "../../../src/assets/Images/sushi_404.svg";
 
 /**
  * Support for defaultProps will be removed from function components in a future major release
@@ -32,12 +33,14 @@ const DefaultValue = {
  */
 const NotFound = ({ title = DefaultValue.title, desc = DefaultValue.desc }) => {
   const navigate = useNavigate();
-
+  console.log("NOT FOUND");
   return (
     <Stack className="not-found-page" justifyContent="center">
       <Stack gap="20px" alignItems="center">
         <Typography component="h1">{title}</Typography>
         <Typography>{desc}</Typography>
+        <img src={NotFoundSvg} alt="404" style={{ maxHeight: "25rem" }} />
+        <Typography>Oh no! You dropped your sushi!</Typography>
         <Button
           label="Go to the main dashboard"
           level="primary"