Skip to content

Homepage fixes #42

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

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

Homepage fixes #42

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
23 changes: 12 additions & 11 deletions src/components/layout/Navbar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,18 +95,19 @@ const Navbar = () => {
{
name: "editorials",
buttonVariant: "text",
link: "/what-we-do/editorials",
},
{
name: "research",
buttonVariant: "text",
link: "/what-we-do/research",
},
{
name: "external events",
buttonVariant: "text",
link: "/what-we-do/external-events",
// link: "/what-we-do/editorials",
link: "https://medium.com/@pcsberkeley"
},
// {
// name: "research",
// buttonVariant: "text",
// link: "/what-we-do/research",
// },
// {
// name: "external events",
// buttonVariant: "text",
// link: "/what-we-do/external-events",
// },
],
},
{
Expand Down
61 changes: 42 additions & 19 deletions src/pages/Home.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,11 @@ import applePhoto from "/images/icons/billy.png";
import googlePhoto from "/images/icons/google.png";
import visaPhoto from "/images/icons/visa.png";
import linkhealthPhoto from "/images/icons/linkhealthHome.png";
import friendshipPhoto from "/images/friends.png"
import friendshipPhoto from "/images/friends.png";
import workshopPhoto from "/images/workshop.jpg";
import hikePhoto from "/images/hike.png";
import retreatPhoto from "/images/retreat.jpeg";
import projectPhoto from "/images/project.png";

import useMediaQuery from "@mui/material/useMediaQuery";
import {
Expand Down Expand Up @@ -109,6 +113,9 @@ const Home = () => {
gap: "2rem",
};


const bigscreen = useMediaQuery(theme.breakpoints.up("sm"));

const heroImage = (
<Box sx={heroImageStyles}>
<Box sx={{ ...defaultOverlayStyles, borderRadius: 5 }}>
Expand Down Expand Up @@ -173,34 +180,50 @@ const Home = () => {
const ourCommunity = (
<Stack
component={Paper}
sx={{overflow:'auto', backgroundImage: purpleMeshStyles, my:2, p:2 }}
direction="row"
sx={{ overflow: "auto", backgroundImage: purpleMeshStyles, my: 2, p: 2 }}
direction={bigscreen ? "row": "column"}
spacing={5}

>
<Card raised={true} sx={{ borderRadius: "10px", width: "13%", p:2 }}>
<Stack direction="column" spacing={2}>
<Typography variant="h2">
Our{" "}
{
<Typography variant="h2" sx={purpleInlineText}>
Community
</Typography>
}
:
</Typography>
<Typography>retreat, socials, speaker events and more!</Typography>
<CardMedia sx={{height: 160}} image={friendshipPhoto}></CardMedia>
</Stack>
<Card raised={true} sx={{ borderRadius: "10px", minWidth: '15rem', p: 2 }}>
<Stack direction="column" spacing={2}>
<Typography variant="h2">
Our{" "}
{
<Typography variant="h2" sx={purpleInlineText}>
Community
</Typography>
}
:
</Typography>
<Typography>retreat, socials, speaker events and more!</Typography>
<CardMedia sx={{ height: 160 }} image={friendshipPhoto}></CardMedia>
</Stack>
</Card>
<Box component={"img"} sx={{ height: "350px", pt: 1 }} src={hikePhoto} />
<Box
component={"img"}
sx={{ height: "350px", pt: 1 }}
src={projectPhoto}
/>

<Box
component={"img"}
sx={{ height: "350px", pt: 1 }}
src={retreatPhoto}
/>
<Box
component={"img"}
sx={{ height: "350px", pt: 1 }}
src={workshopPhoto}
/>

</Stack>
);

const clubImage = (src) => (
<Box component={"img"} sx={{ height: "7em" }} src={src} />
);

const bigscreen = useMediaQuery(theme.breakpoints.up("sm"));

const bragging = (
<Stack direction={bigscreen ? "row" : "column"} spacing={3}>
Expand Down