From 54621e55ecede02f20ba55f8f7f96dd338233d12 Mon Sep 17 00:00:00 2001 From: Matt DiMeglio Date: Tue, 27 May 2025 14:19:40 -0400 Subject: [PATCH] Footer Changes | Nav Bar Changes | Cell Adds | Local Store Add --- components/core/Shell/Footer/Footer.jsx | 19 ++++--- components/core/Shell/NavBar/NavBar.jsx | 1 - components/core/Shell/Shell.jsx | 51 ++++++++++++------ components/stores/useLocalStore.js | 2 + src/pages/Settings/Settings.jsx | 70 +++++++++++++++++++++---- src/router/AppRouter.jsx | 50 +++++++++++++++--- 6 files changed, 151 insertions(+), 42 deletions(-) diff --git a/components/core/Shell/Footer/Footer.jsx b/components/core/Shell/Footer/Footer.jsx index d938c49..be39b71 100644 --- a/components/core/Shell/Footer/Footer.jsx +++ b/components/core/Shell/Footer/Footer.jsx @@ -1,24 +1,27 @@ import React from 'react'; import styled from '@emotion/styled'; +import { useLocalStore } from '@components'; const FooterContainer = styled('div')` - padding-left: 10px; - position: absolute; - left: 0; - bottom: 0; - right: 0; - flex-shrink: 0; + display: flex; + justify-content: space-between; + align-items: center; + padding: 6px 20px; height: 30px; - padding-top: 6px; background: #585858; +`; + +const FooterText = styled('p')` color: white; font-family: "WDXL Lubrifont TC"; `; export const Footer = () => { + const { department } = useLocalStore(); return ( -

{`© ${new Date().getFullYear()} ShiftSync`}

+ {`© ${new Date().getFullYear()} ShiftSync`} + {department?.name} ) } \ No newline at end of file diff --git a/components/core/Shell/NavBar/NavBar.jsx b/components/core/Shell/NavBar/NavBar.jsx index 65a0a72..f045e74 100644 --- a/components/core/Shell/NavBar/NavBar.jsx +++ b/components/core/Shell/NavBar/NavBar.jsx @@ -186,7 +186,6 @@ export const NavBar = ({ notifications, disableNav, settings }) => { ref={(el) => { tabRefs.current['profile'] = el; }} > onUserIconClick()} > {`${user?.firstName[0]}${user?.lastName[0]}`} diff --git a/components/core/Shell/Shell.jsx b/components/core/Shell/Shell.jsx index 494505a..f37f9fb 100644 --- a/components/core/Shell/Shell.jsx +++ b/components/core/Shell/Shell.jsx @@ -2,6 +2,8 @@ import React, { useEffect, useState, useRef } from 'react'; import styled from '@emotion/styled'; import { NavBar } from './NavBar'; import { Footer } from './Footer'; +import { CircularProgress } from '@mui/material'; +import { useLocalStore } from '@components'; const minHeight = 'calc(100vh - 30px)'; @@ -43,28 +45,43 @@ export const Shell = ({ children }) => { const bannerRef = useRef(); const nonContentHeight = 92 + (bannerRef?.current?.offsetHeight || 0); const minHeightMain = `calc(100vh - ${nonContentHeight}px)`; + const { user, department } = useLocalStore(); useEffect(() => { window.scrollTo(0,0); }, []); return ( - - -
- -
- - {children} - -
- -