Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updated color scheme and icons #46

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Updated color scheme and icons #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
99 changes: 33 additions & 66 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions src/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,14 @@ import Header from "./components/Header/Header";
import Home from "./views/Home/Home";
import About from "./views/About/About";
import Sponsors from "./views/Sponsors/Sponsors";
import Team from "./views/Team/Team";
import FAQ from "./views/FAQ/FAQ";
import Apply from "./views/Apply/Apply"
import SideNavBar from "./components/SideNavbar/SideNavbar";
import Footer from "./components/Footer/Footer";
import { Route, Routes } from "react-router-dom";


function App() {
return (
<div className="App">
Expand All @@ -16,8 +20,10 @@ function App() {
<Routes>
<Route path="/Home" element={<Home />} />
<Route path="/About" element={<About />} />
<Route path="/Team" element={<Team/>} />
<Route path="/Sponsors" element={<Sponsors />}/>
<Route path="/FAQ" element={<FAQ />} />
<Route path="/Apply" element={<Apply/>} />
{/* <Route path="/Sponsors"component={() => {
window.location.href = "https://www.google.com/";
return null;
Expand All @@ -31,6 +37,7 @@ function App() {
}}
/> */}
</Routes>
<Footer/>
</div>
);
}
Expand Down
3 changes: 2 additions & 1 deletion src/components/Header/Header.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@ img {
}
.Schedule{
height: 30px;
width: 30px;
width: 25px;
align-items: center;
color: white;
}

.MuiButton-text{
Expand Down
99 changes: 46 additions & 53 deletions src/components/Header/Header.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import * as React from 'react';
import "./Header.css";
import Logo from "./assets/bhLogoBrick.png";
import ScheduleIcon from './assets/akar-icons_schedule.svg';
import AboutIcon from './assets/heroicons_information-circle.svg';
import HomeIcon from './assets/clarity_home-line.svg';
import SponsorIcon from './assets/simple-icons_githubsponsors.svg';
import FAQIcon from './assets/akar-icons_chat-question.svg';
import SpotifyIcon from './assets/ph_spotify-logo-light.svg';
import TeamIcon from './assets/fluent_people-team-20-regular.svg';
import ScheduleIcon from './assets/white_schedule_icon.svg';
import AboutIcon from './assets/information_circle_light.svg';
import HomeIcon from './assets/home_icon_light.svg';
import SponsorIcon from './assets/money_icon_light.svg';
import FAQIcon from './assets/FAQ_icon_light.svg';
import SpotifyIcon from './assets/spotify_icon_light.svg';
import TeamIcon from './assets/team_icon_light.svg';
import AppBar from '@mui/material/AppBar';
import Box from '@mui/material/Box';
import Toolbar from '@mui/material/Toolbar';
Expand All @@ -19,13 +19,11 @@ import CssBaseline from '@mui/material/CssBaseline';
import Divider from '@mui/material/Divider';
import Drawer from '@mui/material/Drawer';
import List from '@mui/material/List';
import ListItem from '@mui/material/ListItem';
import ListItemButton from '@mui/material/ListItemButton';
import ListItem from "@material-ui/core/ListItem";
import { styled, useTheme } from '@mui/material/styles';
import { ListItemIcon} from '@mui/material';
import ClearIcon from '@mui/icons-material/Clear';


const drawerWidth = "100%";
const DrawerHeader = styled('div')(({ theme }) => ({
display: 'flex',
Expand All @@ -35,10 +33,14 @@ const DrawerHeader = styled('div')(({ theme }) => ({
...theme.mixins.toolbar,
justifyContent: 'flex-end',
}));

const Header = (props) =>{
const [setAnchorElNav] = React.useState(null);
const [setOpen] = React.useState(false);

const [setOpen] = React.useState(false);
const [selectedIndex, setSelectedIndex] = React.useState(1);



const handleCloseNavMenu = () => {
setAnchorElNav(null);
};
Expand All @@ -49,80 +51,71 @@ const Header = (props) =>{

const { window } = props;
const [mobileOpen, setMobileOpen] = React.useState(false);

const handleDrawerToggle = () => {
setMobileOpen((prevState) => !prevState);
};

//contents inside the drawer
const drawer = (
<Box onClick={handleDrawerToggle} sx={{ textAlign: 'center' }}>
<DrawerHeader>
<IconButton onClick={handleDrawerClose}>
{<ClearIcon sx={{color: 'black'}}/>}
{<ClearIcon sx={{color: 'white'}}/>}
</IconButton>
</DrawerHeader>
{/* Buttons on top half of divider */}
<ListItem sx={{ fontWeight: 'bold' }}>
<ListItemButton>
<List sx={{ fontWeight: 'bold' }}>
<ListItem>
<ListItemIcon>
<img class="Icon"src={HomeIcon}/>
</ListItemIcon>
<Link style={{fontFamily: "Poppins",textDecoration: "none", fontSize: "19px", color: "black", textAlign: "center"}} to={`/Home`} >Home</Link>
</ListItemButton>
<Link className="link" style={{fontFamily: "Poppins",textDecoration: "none", fontSize: "19px", color: "#DFF2FF", textAlign: "center", textDecorationColor:"black"}} to={`/Home`} >Home</Link>
</ListItem>
<ListItem sx={{ fontWeight: 'bold' }}>
<ListItemButton>
<ListItem>
<ListItemIcon>
<img class="Icon"src={AboutIcon}/>
</ListItemIcon>
<Link style={{fontFamily: "Poppins",textDecoration: "none", fontSize: "19px", color: "black", textAlign: "center"}} to={'/About'}>About</Link>
</ListItemButton>
<Link style={{fontFamily: "Poppins",textDecoration: "none", fontSize: "19px", color: "#DFF2FF", textAlign: "center"}} to={'/About'}>About</Link>

</ListItem>
<ListItem sx={{ fontWeight: 'bold' }}>
<ListItemButton>
<ListItem>
<ListItemIcon>
<img className='Icon' src={SponsorIcon}/>
</ListItemIcon>
<a style={{fontFamily: "Poppins",textDecoration: "none", fontSize: "19px", color: "black"}} href="https://www.google.com/" target="_blank">Sponsors</a>
</ListItemButton>
<Link style={{fontFamily: "Poppins",textDecoration: "none", fontSize: "19px", color: "#DFF2FF"}} to={`/Sponsors`}>Sponsors</Link>
</ListItem>
<ListItem sx={{ fontWeight: 'bold' }}>
<ListItemButton>
<ListItem>
<ListItemIcon>
<img class="Icon"src={FAQIcon}/>
</ListItemIcon>
<Link style={{fontFamily: "Poppins",textDecoration: "none", fontSize: "19px", color: "black", textAlign: "center"}} to={'/FAQ'}>FAQ</Link>
</ListItemButton>
<Link style={{fontFamily: "Poppins",textDecoration: "none", fontSize: "19px", color: "#DFF2FF", textAlign: "center"}} to={'/FAQ'}>FAQ</Link>

</ListItem>
<Divider sx={{color:"black"}}/>

<Divider sx={{ bgcolor: "#FFFFFF" }} />

{/* Buttons on bottom half of divider */}
<List sx={{ fontWeight: 'bold' }}>
<ListItem >
<ListItemButton sx={{ textAlign: 'center' }}>
<ListItem>
<ListItemIcon>
<img className='Icon' src={ScheduleIcon}/>
</ListItemIcon>
<a style={{fontFamily: "Poppins",textDecoration: "none", fontSize: "19px", color: "#DFF2FF"}} href="https://www.google.com/" target="_blank">Workshop</a>

</ListItem>
<ListItem>
<ListItemIcon>
<img class="Icon"src={TeamIcon}/>
</ListItemIcon>
<Link style={{fontFamily: "Poppins",textDecoration: "none", fontSize: "19px", color: "black"}} to={`/Team`}>Our Team</Link>
</ListItemButton>
<Link style={{fontFamily: "Poppins",textDecoration: "none", fontSize: "19px", color: "#DFF2FF"}} to={`/Team`}>Our Team</Link>
</ListItem>
<ListItem >
<ListItemButton sx={{ textAlign: 'center' }}>
<ListItem>
<ListItemIcon>
<img class="Icon"src={SpotifyIcon}/>
</ListItemIcon>
<a style={{fontFamily: "Poppins",textDecoration: "none", fontSize: "19px", color: "black"}} href="https://www.google.com/" target="_blank">Spotify</a>
</ListItemButton>
</ListItem>
<ListItem >
<ListItemButton sx={{ textAlign: 'center' }}>
<ListItemIcon>
<img class="Icon"src={ScheduleIcon}/>
</ListItemIcon>
<a style={{fontFamily: "Poppins",textDecoration: "none", fontSize: "19px", color: "black"}} href="https://www.google.com/" target="_blank">Schedule</a>
</ListItemButton>
<a style={{fontFamily: "Poppins",textDecoration: "none", fontSize: "19px", color: "#DFF2FF"}} href="https://www.google.com/" target="_blank">Spotify</a>
</ListItem>
</List>
</List>
</Box>
);

Expand Down Expand Up @@ -206,11 +199,11 @@ const Header = (props) =>{
</Button>
<Button
onClick={handleCloseNavMenu}
sx={{background: "#c7cbd1", fontSize: "16px", textDecoration: "none", marginLeft: "10px"}}
sx={{background: "#2047DD", fontSize: "16px", textDecoration: "none", marginLeft: "10px"}}
variant="contained"
startIcon={<img class="Schedule"src={ScheduleIcon}/>}
>
<a style={{fontFamily: "Poppins",textDecoration: "none", color: "black"}} href="https://www.google.com/" target="_blank">Join Now</a>
<Link style={{fontFamily: "Poppins",textDecoration: "none", color: "white"}} to={`/Apply`}>Join Now</Link>
</Button>
</Box>
</Toolbar>
Expand All @@ -229,7 +222,7 @@ const Header = (props) =>{
}}
sx={{
display: { xs: 'block', md: 'none' },
'& .MuiDrawer-paper': { boxSizing: 'border-box', width: drawerWidth },
'& .MuiDrawer-paper': { boxSizing: 'border-box', width: drawerWidth, backgroundColor: "#04121C"},

}}
>
Expand All @@ -240,4 +233,4 @@ const Header = (props) =>{
</Box>
);
}
export default Header;
export default Header;
4 changes: 2 additions & 2 deletions ...eader/assets/akar-icons_chat-question.svg → ...mponents/Header/assets/FAQ_icon_light.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 0 additions & 11 deletions src/components/Header/assets/akar-icons_schedule.svg
View file
Open in desktop

This file was deleted.

Binary file removed src/components/Header/assets/bhlogo.png
View file
Open in desktop
Binary file not shown.
11 changes: 0 additions & 11 deletions src/components/Header/assets/clarity_home-line.svg
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions src/components/Header/assets/fluent_people-team-20-regular.svg
View file
Open in desktop

This file was deleted.

11 changes: 11 additions & 0 deletions src/components/Header/assets/home_icon_light.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading