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.

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

[MPT-10] Multi-page revamp #599

Merged
merged 37 commits into from
Jan 4, 2024
Merged
Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
723fb1e
Rough outline of FAQ Page with Collapsible Questions (#581)
Hackin7 May 10, 2023
631d5b9
pages/faq: bold questions (#597)
Hackin7 Jun 2, 2023
6521563
[MPT-15] Drawer: add new navigation (#586)
IvanFengJK Jun 2, 2023
41d9236
feat: base structure of application page
Hackin7 Jun 3, 2023
c213908
fix: rename page & tweak resources layout
Hackin7 Jun 3, 2023
fe74906
add homepage
luodan01 Jun 11, 2023
5a51216
drawer: add link to faq
wei2912 Jun 16, 2023
a917eea
Merge branch 'multi-page' into homepage
wei2912 Jun 16, 2023
4db1e1f
add homepage
wei2912 Jun 16, 2023
d40d041
Rough outline of FAQ Page with Collapsible Questions (#581)
Hackin7 May 10, 2023
c6d3caf
pages/faq: bold questions (#597)
Hackin7 Jun 2, 2023
522b914
[MPT-15] Drawer: add new navigation (#586)
IvanFengJK Jun 2, 2023
b920c1e
drawer: add link to faq
wei2912 Jun 16, 2023
d49528e
drawer: add link to mentors
wei2912 Jun 16, 2023
f068e60
Merge branch 'homepage' into multi-page
wei2912 Jun 16, 2023
41c66e3
Header: remove resource links
wei2912 Jun 16, 2023
e7f0466
Merge branch 'application-page' of github.com:Hackin7/mentorship-page…
wei2912 Jun 16, 2023
635049c
drawer: add apply link
wei2912 Jun 16, 2023
ef3549b
Add questions from 2022 Wave
Unknownflow Jun 17, 2023
900f0e2
[MPT-25] FAQ: Add questions from 2022 Wave (#608)
Unknownflow Jun 17, 2023
0007f9d
feat: header on diff pages
Hackin7 Jun 22, 2023
de6e4d1
Merge branch 'multi-page' into multi-page
Unknownflow Jul 1, 2023
7161c32
Merge pull request #613 from Hackin7/standardise-header
Unknownflow Jul 1, 2023
e9baaee
mentors: fix formatting (#617)
Unknownflow Jul 22, 2023
f87fda2
mentors: reset page on tab switch (#631)
IvanFengJK Sep 3, 2023
150c58a
Merge branch 'master' into multi-page
wei2912 Sep 20, 2023
0737b1d
feature: indicate current tab in query params (#633)
Unknownflow Oct 18, 2023
9be05d1
feat: add home link to navigation (#647)
jeffzy15 Oct 20, 2023
0bd9cac
fix: header covers up Mentors search bar (#658)
jeffzy15 Nov 11, 2023
4571e05
fix: highlight `em` in search results (#653)
jeffzy15 Nov 15, 2023
7ce1b1e
feat: revamp homepage (#667)
jeffzy15 Dec 7, 2023
5a8e727
Merge branch 'master' into multi-page
wei2912 Dec 7, 2023
bda298f
fix: upgrade to node v18 (#651)
wei2912 Dec 7, 2023
32c5467
chore: update lockfile
wei2912 Jan 4, 2024
262cb11
fix: remove list/grid buttons
wei2912 Jan 4, 2024
53c3dfc
fix: use next/script
wei2912 Jan 4, 2024
5069015
fix: hydration errors
wei2912 Jan 4, 2024
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
Prev Previous commit
Next Next commit
[MPT-15] Drawer: add new navigation (#586)
Co-authored-by: Ng Wei En <weien1292@gmail.com>
  • Loading branch information
IvanFengJK and wei2912 committed Jun 16, 2023
commit 522b914a4b0951791f5eefe2b060f9c35155c2ba
85 changes: 35 additions & 50 deletions components/Drawer.tsx
Original file line number Diff line number Diff line change
@@ -12,6 +12,7 @@ import MenuIcon from "@mui/icons-material/Menu";
import ListItemButton from "@mui/material/ListItemButton";
import ListItemIcon from "@mui/material/ListItemIcon";
import LaunchIcon from "@mui/icons-material/Launch";
import Button from "@mui/material/Button";

import { advisoryLogo } from "./assets";

@@ -21,6 +22,10 @@ interface Props {
window?: () => Window;
}

const URL_HOME = "https://advisory.sg/";
const URL_TYPEFORM =
"https://advisorysg.typeform.com/to/NQaJmE6j#source=mentorsite";

const ResponsiveDrawer = (props: Props) => {
const { window } = props;
const [mobileOpen, setMobileOpen] = React.useState(false);
@@ -34,57 +39,23 @@ const ResponsiveDrawer = (props: Props) => {
<div>
<List>
<ListItem disablePadding>
<ListItemButton component="a" href="https://advisory.sg">
<ListItemText
primary="Back To Main Site"
style={{ flexGrow: "0", marginRight: "0.5rem" }}
/>
<ListItemIcon>
<LaunchIcon />
</ListItemIcon>
<ListItemButton component="a" onClick={handleDrawerToggle}>
<ListItemText primary="Find A Mentor" />
</ListItemButton>
</ListItem>
<ListItem disablePadding>
<ListItemButton
component="a"
href="#aboutus"
onClick={handleDrawerToggle}
>
<ListItemText primary="About Us" />
<ListItemButton component="a" onClick={handleDrawerToggle}>
<ListItemText primary="FAQ" />
</ListItemButton>
</ListItem>
<ListItem disablePadding>
<ListItemButton
component="a"
href="#partners"
onClick={handleDrawerToggle}
>
<ListItemText primary="Partners" />
</ListItemButton>
</ListItem>
<ListItem disablePadding>
<ListItemButton
component="a"
href="#mentors"
onClick={handleDrawerToggle}
>
<ListItemText primary="Mentors" />
</ListItemButton>
</ListItem>
<ListItem disablePadding>
<ListItemButton
component="a"
href="https://advisorysg.typeform.com/to/HQ8nWq2r#source=mentorsite"
href={URL_TYPEFORM}
target="_blank"
rel="noopener noreferrer"
>
<ListItemText
primary="Apply Now"
style={{ flexGrow: "0", marginRight: "0.5rem" }}
/>
<ListItemIcon>
<LaunchIcon />
</ListItemIcon>
<ListItemText primary="Apply Now" />
</ListItemButton>
</ListItem>
</List>
@@ -95,7 +66,30 @@ const ResponsiveDrawer = (props: Props) => {
return (
<Box sx={{ display: "flex" }}>
<AppBar style={{ background: "white" }} className="toolbar-component">
<Toolbar>
<Toolbar style={{ display: "flex", justifyContent: "space-between" }}>
<Box style={{ display: "flex", justifyContent: "flex-start" }}>
<a href={URL_HOME} target="_blank" rel="noopener noreferrer">
<img className="nav-logo" src={advisoryLogo} alt="Advisory" />
</a>
</Box>
<Box
style={{ justifyContent: "flex-end" }}
sx={{ display: { xs: "none", sm: "flex", md: "flex" } }}
>
<Button>Find A Mentor</Button>
<Button>FAQ</Button>
<Button
component="a"
href={URL_TYPEFORM}
target="_blank"
rel="noopener noreferrer"
>
Apply Now
</Button>
<ListItemIcon>
<LaunchIcon />
</ListItemIcon>
</Box>
<IconButton
color="inherit"
aria-label="open drawer"
@@ -105,15 +99,6 @@ const ResponsiveDrawer = (props: Props) => {
>
<MenuIcon style={{ color: "black" }} />
</IconButton>
<img
className="nav-logo"
src={advisoryLogo}
alt="Advisory"
style={{ alignSelf: "center" }}
/>
<a className="nav-back-to-main-site" href="https://advisory.sg">
&#x3c; back to main site
</a>
</Toolbar>
</AppBar>
<Box
32 changes: 13 additions & 19 deletions styles/Header.css
Original file line number Diff line number Diff line change
@@ -9,27 +9,11 @@
border-color: #cccccc;
}

@media only screen and (min-width: 601px) {
.nav-back-to-main-site {
position: relative;
top: 4%;
color: black;
text-decoration: none;
}

a:hover {
text-decoration: underline;
}
}

@media only screen and (max-width: 600px) {
.nav-logo {
height: auto;
max-height: 40px;
position: relative;
top: 20%;
left: -4%;
margin: auto;
width: 16%;
}

.header-mentorship-logo {
@@ -52,12 +36,22 @@
.nav-logo {
height: 60%;
position: absolute;
right: 0;
left: 0;
left: 3%;
top: 0;
bottom: 0;
margin: auto;
}

.nav-back-to-main-site {
position: relative;
top: 4%;
color: black;
text-decoration: none;
}

a:hover {
text-decoration: underline;
}
}

.header-bottom {