Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion client/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="UTF-8" />
<link href="src/assets/HYF_icon.jpeg" rel="icon" type="image/x-icon">
<link href="src/assets/favicon.png" rel="icon" type="image/x-icon" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Dojo Project</title>
</head>
Expand Down
Binary file removed client/src/assets/HYF.png
Binary file not shown.
Binary file removed client/src/assets/HYF_icon.jpeg
Binary file not shown.
Binary file added client/src/assets/favicon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/src/assets/hyf-logo-beige.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/src/assets/hyf-logo-red.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion client/src/components/ProfileSidebar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
6 changes: 3 additions & 3 deletions client/src/components/ResponsiveNavBar.tsx
Original file line number Diff line number Diff line change
@@ -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';
Expand Down Expand Up @@ -64,12 +64,12 @@ export const ResponsiveNavBar = () => {

return (
<Box sx={{ flexGrow: 1 }}>
<AppBar position="static" sx={{ bgcolor: 'black' }}>
<AppBar position="static" sx={{ backgroundColor: '#5E1600' }}>
<Container maxWidth={false}>
<Toolbar disableGutters>
<Box component="div">
<Link to="/home">
<img src={HYFLogo} height="60" alt="HYF navbar logo" className="hyf-navbar-logo-img" />
<img src={HYFLogo} height="40" alt="HYF navbar logo" className="hyf-navbar-logo-img" />
</Link>
</Box>

Expand Down
2 changes: 1 addition & 1 deletion client/src/components/SidebarJobPath.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/SidebarLearningStatus.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
9 changes: 9 additions & 0 deletions client/src/main.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion client/src/pages/LoginPage.tsx
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion client/src/pages/SearchPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';

/**
Expand Down
15 changes: 5 additions & 10 deletions client/src/styles/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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;
Expand All @@ -45,8 +48,7 @@ body {
}

.hyf-logo-img {
height: 100px;
background-color: black;
height: 70px;
padding: 10px;
margin-bottom: 50px;
}
Expand All @@ -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%;
Expand Down
Binary file modified docs/assets/dojo-screen-cohorts.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/assets/dojo-screen-dashboard.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/assets/dojo-screen-profile.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/assets/dojo-screen-search.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.