diff --git a/client/index.html b/client/index.html index 46e89d6d..5ec53286 100644 --- a/client/index.html +++ b/client/index.html @@ -2,7 +2,7 @@ - + Dojo Project diff --git a/client/src/assets/HYF.png b/client/src/assets/HYF.png deleted file mode 100644 index b694fa97..00000000 Binary files a/client/src/assets/HYF.png and /dev/null differ diff --git a/client/src/assets/HYF_icon.jpeg b/client/src/assets/HYF_icon.jpeg deleted file mode 100644 index ab1eddd3..00000000 Binary files a/client/src/assets/HYF_icon.jpeg and /dev/null differ diff --git a/client/src/assets/favicon.png b/client/src/assets/favicon.png new file mode 100644 index 00000000..8fe6a527 Binary files /dev/null and b/client/src/assets/favicon.png differ diff --git a/client/src/assets/hyf-logo-beige.png b/client/src/assets/hyf-logo-beige.png new file mode 100644 index 00000000..09fda00c Binary files /dev/null and b/client/src/assets/hyf-logo-beige.png differ diff --git a/client/src/assets/hyf-logo-red.png b/client/src/assets/hyf-logo-red.png new file mode 100644 index 00000000..ddc6249c Binary files /dev/null and b/client/src/assets/hyf-logo-red.png differ diff --git a/client/src/components/ProfileSidebar.tsx b/client/src/components/ProfileSidebar.tsx index c93bf3a6..e1e1b888 100644 --- a/client/src/components/ProfileSidebar.tsx +++ b/client/src/components/ProfileSidebar.tsx @@ -31,7 +31,7 @@ export const ProfileSidebar = ({ traineeId }: ProfileSidebarProps) => { alignItems="center" gap={2} color="black" - bgcolor="#d1fbe6" + bgcolor="var(--hyf-beige)" height="100vh" paddingX={4} paddingY={4} diff --git a/client/src/components/ResponsiveNavBar.tsx b/client/src/components/ResponsiveNavBar.tsx index 5b75fd68..0890877f 100644 --- a/client/src/components/ResponsiveNavBar.tsx +++ b/client/src/components/ResponsiveNavBar.tsx @@ -1,5 +1,5 @@ import * as React from 'react'; -import HYFLogo from '../assets/HYF_logo.svg'; +import HYFLogo from '../assets/hyf-logo-beige.png'; import SearchIcon from '@mui/icons-material/Search'; import MenuIcon from '@mui/icons-material/Menu'; import { useAuth } from '../hooks'; @@ -64,12 +64,12 @@ export const ResponsiveNavBar = () => { return ( - + - HYF navbar logo + HYF navbar logo diff --git a/client/src/components/SidebarJobPath.tsx b/client/src/components/SidebarJobPath.tsx index fa4b7539..04eda2b6 100644 --- a/client/src/components/SidebarJobPath.tsx +++ b/client/src/components/SidebarJobPath.tsx @@ -18,7 +18,7 @@ export const SidebarJobPath = ({ jobPath }: JobPathProps) => { const jobChipColor = (status: JobPath | string) => { switch (status) { case JobPath.Searching: - return 'primary'; + return 'info'; case JobPath.Internship: case JobPath.TechJob: return 'success'; diff --git a/client/src/components/SidebarLearningStatus.tsx b/client/src/components/SidebarLearningStatus.tsx index 33a1c19f..7f9e0612 100644 --- a/client/src/components/SidebarLearningStatus.tsx +++ b/client/src/components/SidebarLearningStatus.tsx @@ -17,7 +17,7 @@ export const SidebarLearningStatus = ({ learningStatus }: LearningStatusProps) = const chipColor = (status: LearningStatus | undefined) => { switch (status) { case LearningStatus.Studying: - return 'primary'; + return 'info'; case LearningStatus.Graduated: return 'success'; case LearningStatus.OnHold: diff --git a/client/src/main.tsx b/client/src/main.tsx index a96d562d..a5f0c4a6 100644 --- a/client/src/main.tsx +++ b/client/src/main.tsx @@ -12,6 +12,15 @@ import { RouterProvider } from 'react-router-dom'; import { router } from './routes'; const theme = createTheme({ + palette: { + mode: 'light', + primary: { + main: '#B12900', + }, + background: { + default: '#ffffff', + }, + }, typography: { button: { textTransform: 'none', diff --git a/client/src/pages/LoginPage.tsx b/client/src/pages/LoginPage.tsx index 524e4086..8333f761 100644 --- a/client/src/pages/LoginPage.tsx +++ b/client/src/pages/LoginPage.tsx @@ -1,4 +1,4 @@ -import HYFLogo from '../assets/HYF_logo.svg'; +import HYFLogo from '../assets/hyf-logo-red.png'; import { useAuth } from '../hooks'; import { ErrorBox } from '../components'; import { Button, Stack } from '@mui/material'; diff --git a/client/src/pages/SearchPage.tsx b/client/src/pages/SearchPage.tsx index f8be39a0..927dc68e 100644 --- a/client/src/pages/SearchPage.tsx +++ b/client/src/pages/SearchPage.tsx @@ -2,7 +2,7 @@ import { ErrorBox, SearchBar, SearchResultsList } from '../components'; import { useCallback, useEffect, useState } from 'react'; import { Box } from '@mui/material'; -import HYFLogo from '../assets/HYF_logo.svg'; +import HYFLogo from '../assets/hyf-logo-red.png'; import { useTraineeSearchData } from '../hooks/useTraineeSearchData'; /** diff --git a/client/src/styles/index.css b/client/src/styles/index.css index f22c734d..0b9fc33a 100644 --- a/client/src/styles/index.css +++ b/client/src/styles/index.css @@ -15,6 +15,7 @@ body { text-rendering: optimizeLegibility; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; + --hyf-beige: #faf5d9; } @media (prefers-color-scheme: light) { @@ -27,8 +28,10 @@ body { .hyf-navbar-logo-img { max-width: 100%; + height: 20px; vertical-align: middle; - padding: 8px 0; + padding: 0; + margin-right: 15px; display: inline-block; border: 0; box-sizing: border-box; @@ -45,8 +48,7 @@ body { } .hyf-logo-img { - height: 100px; - background-color: black; + height: 70px; padding: 10px; margin-bottom: 50px; } @@ -72,13 +74,6 @@ body { min-width: 200px; } -.hyf-logo-img { - height: 100px; - background-color: black; - padding: 10px; - margin-bottom: 50px; -} - .input-wrapper { background-color: white; width: 100%; diff --git a/docs/assets/dojo-screen-cohorts.png b/docs/assets/dojo-screen-cohorts.png index 8b73d7e8..53bf7ca6 100644 Binary files a/docs/assets/dojo-screen-cohorts.png and b/docs/assets/dojo-screen-cohorts.png differ diff --git a/docs/assets/dojo-screen-dashboard.png b/docs/assets/dojo-screen-dashboard.png index 6c6eefac..a221e33d 100644 Binary files a/docs/assets/dojo-screen-dashboard.png and b/docs/assets/dojo-screen-dashboard.png differ diff --git a/docs/assets/dojo-screen-profile.png b/docs/assets/dojo-screen-profile.png index bd7f44c6..5dc0b574 100644 Binary files a/docs/assets/dojo-screen-profile.png and b/docs/assets/dojo-screen-profile.png differ diff --git a/docs/assets/dojo-screen-search.png b/docs/assets/dojo-screen-search.png index fdfed7d6..93c62766 100644 Binary files a/docs/assets/dojo-screen-search.png and b/docs/assets/dojo-screen-search.png differ