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
3 changes: 3 additions & 0 deletions client/src/assets/about-us/Vector 27.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions client/src/assets/about-us/Vector 36.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions client/src/assets/about-us/Vector 42.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions client/src/assets/about-us/Vector 66.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions client/src/assets/about-us/Vector 67.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions client/src/assets/about-us/Vector 73.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions client/src/assets/about-us/Vector 74.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions client/src/assets/about-us/Vector 78.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions client/src/assets/about-us/Vector 87.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions client/src/assets/about-us/Vector 88.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions client/src/assets/about-us/Vector 89.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions client/src/assets/about-us/Vector 90.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions client/src/assets/about-us/badge.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
17 changes: 17 additions & 0 deletions client/src/assets/about-us/banner.svg
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/about-us/mascot.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 20 additions & 0 deletions client/src/assets/about-us/social-icons.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions client/src/assets/about-us/squiggle.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
56 changes: 56 additions & 0 deletions client/src/components/AboutNavbar.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
import { Link, NavLink } from "react-router-dom";
import mascot from "../assets/about-us/mascot.png";

const BLUE = "#2727DC";
const FONT = "'Sekuya', sans-serif";

const links = [
{ to: "/", label: "home", end: true },
{ to: "/about", label: "about" },
{ to: "/events", label: "events" },
{ to: "/sponsors", label: "sponsors" },
];

export default function AboutNavbar() {
return (
<header
className="relative z-20 flex h-[55px] items-center justify-between px-6 lg:px-16"
style={{ backgroundColor: "#F9F9FB" }}
>
<Link to="/" aria-label="UMSA home" className="shrink-0">
<img src={mascot} alt="UMSA" className="h-10 w-auto" />
</Link>

<nav className="flex flex-1 items-center justify-around gap-2 px-4 md:px-12">
{links.map(({ to, label, end }) => (
<NavLink
key={to}
to={to}
end={end}
className={({ isActive }: { isActive: boolean }) =>
`text-xs md:text-xl ${isActive ? "underline underline-offset-4" : ""}`
}
style={{ fontFamily: FONT, color: BLUE, letterSpacing: "2px" }}
>
{label}
</NavLink>
))}
</nav>

{/* TODO: there is no login page yet, so this points at sign-up */}
<Link
to="/sign-up"
className="flex h-9 w-[136px] shrink-0 items-center justify-center rounded-[15px] text-lg"
style={{
backgroundColor: "#FF5252",
color: "#F9F9FB",
fontFamily: FONT,
letterSpacing: "1.6px",
boxShadow: "4px 4px 0 #990000",
}}
>
login
</Link>
</header>
);
}
1 change: 1 addition & 0 deletions client/src/index.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
@import url('https://fonts.googleapis.com/css2?family=Sekuya&display=swap');
@import "tailwindcss";
@import "./tokens.css";

Expand Down
13 changes: 8 additions & 5 deletions client/src/layouts/RootLayout.tsx
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
import { Outlet, ScrollRestoration } from "react-router-dom";
import { Outlet, ScrollRestoration, useLocation } from "react-router-dom";
import Navbar from "../components/Navbar";
import Footer from "../components/Footer";

export default function RootLayout() {
const { pathname } = useLocation();
const isAbout = pathname.toLowerCase() === "/about";

return (
<div className="min-h-screen bg-gray-950 text-white">
<Navbar />
<main className="w-full px-4 py-8">
{!isAbout && <Navbar />}
<main className={isAbout ? "w-full" : "w-full px-4 py-8"}>
<ScrollRestoration />
<Outlet />
</main>
<Footer />
{!isAbout && <Footer />}
</div>
);
}
}
Loading
Loading