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

Testbranch #93

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Testbranch #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
969b6d5
test
manushri-d Nov 3, 2022
b08aed3
init
manushri-d Mar 21, 2023
b08e9d4
Add
manushri-d Mar 21, 2023
8f6a7f4
Merge master
exrlla Apr 4, 2023
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
32 changes: 32 additions & 0 deletions client/components/wecehacksFooter.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,37 @@ import styles from "../styles/Footer.module.css";

export default function WECEHacksFooter() {
return (
<<<<<<< HEAD
<div className={styles["wecehacks-footer"]} >
<div className={styles["wecehacks-footer-content"]}>
<div className={styles["wecehacks-navbar-text-left"]}>
<SocialIcon style={{
width: "4em",
height: "4em",
}}
network="instagram"
url="https://www.instagram.com/wecehac.ks/"
fgColor="white"
bgColor="transparent"
/>
<SocialIcon style={{
width: "4em",
height: "4em",
}}
network="email"
url="mailto:wece.uiuc@gmail.com"
fgColor="white"
bgColor="transparent"
/>
</div>
<div className={styles["wecehacks-navbar-text-right"]}>
<p>© WECEHacks Team 2023</p>
<p>Women in Electrical and Computer Enginerring <br/>
<p>1016 ECEB, 306 North Wright Street, Urbana, IL 61801</p>
</p>
</div>
</div>
=======
<div className={styles["wecehacks-footer"]}>
<div className={styles["wecehacks-footer-content"]}>
<div className={styles["wecehacks-navbar-text-left"]}>
Expand Down Expand Up @@ -46,6 +77,7 @@ export default function WECEHacksFooter() {
</p>
</div>
</div>
>>>>>>> a65bda2757d5d7856c2d8f811b9f2b5424d45a77
</div>
);
}
4 changes: 4 additions & 0 deletions client/components/wecehacksLayout.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ export default function WECEHacksLayout({
<div id="container">
<WECEHacksNav background_color={background_color}></WECEHacksNav>
{children}
<<<<<<< HEAD
=======
</div>
<WECEHacksFooter></WECEHacksFooter>
<a id="mlh-trust-badge" href="https://mlh.io/seasons/2023/events">
Expand All @@ -57,7 +59,9 @@ export default function WECEHacksLayout({
className={styles["wecehacks-bus"]}
src="../imgs/wecehacks/WH_BusStop_Pixel.png"
></img>
>>>>>>> a65bda2757d5d7856c2d8f811b9f2b5424d45a77
</div>
<WECEHacksFooter></WECEHacksFooter>
</div>
</>
);
Expand Down
38 changes: 38 additions & 0 deletions client/components/wecehacksNav.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,11 @@ import React from "react";
import styles from "../styles/WECEHacks.module.css";
import Navbar from "react-bootstrap/Navbar";
import Nav from "react-bootstrap/Nav";
<<<<<<< HEAD
import NavDropdown from "react-bootstrap/NavDropdown";
=======
import { NavDropdown } from "react-bootstrap";
>>>>>>> a65bda2757d5d7856c2d8f811b9f2b5424d45a77

// this changes the color of the navbar
const WECEHacksNav = ({ background_color2 = "transparent" }) => {
Expand All @@ -14,7 +18,11 @@ const WECEHacksNav = ({ background_color2 = "transparent" }) => {
<Navbar
variant="dark"
expand="lg"
<<<<<<< HEAD
fixed="top"
=======
sticky="bottom"
>>>>>>> a65bda2757d5d7856c2d8f811b9f2b5424d45a77
className={styles["nav-wece-hacks"]}
style={{ backgroundColor: background_color2 }}
>
Expand All @@ -32,8 +40,38 @@ const WECEHacksNav = ({ background_color2 = "transparent" }) => {
<Navbar.Collapse className={"justify-content-end"}>
<Nav className={styles["right-navbar"]}>
{/* <Nav.Link href="/events">Events</Nav.Link> */}
<<<<<<< HEAD

{/* <NavDropdown title="Sponsors">
<NavDropdown.Item
className={styles["dropdown-item"]}
href="/sponsors22"
>
2022-23
</NavDropdown.Item>
<NavDropdown.Item
className={styles["dropdown-item"]}
href="/sponsors22"
>
2021-22
</NavDropdown.Item>
<NavDropdown.Item
className={styles["dropdown-item"]}
href="/sponsors21"
>
2020-21
</NavDropdown.Item>
<NavDropdown.Item
className={styles["dropdown-item"]}
href="/sponsors"
>
2018-19
</NavDropdown.Item>
</NavDropdown> */}
=======
<Nav.Link href="/schedule">Schedule</Nav.Link>
<Nav.Link href="/events">Events</Nav.Link>
>>>>>>> a65bda2757d5d7856c2d8f811b9f2b5424d45a77
</Nav>
</Navbar.Collapse>
</Navbar>
Expand Down
Loading