Skip to content

Commit

Permalink
Refractored Headshots
Browse files Browse the repository at this point in the history
Sorry Ryan for committing to Dev
  • Loading branch information
winbow13 committed Apr 26, 2024
1 parent 9920cde commit faf4148
Show file tree
Hide file tree
Showing 11 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion frontend/src/pages/Login/Login.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ function Login() {
<Link to="/graduation" className={styles.btn} style={{marginRight: "8px"}}>
Login with CAS
</Link>
<Link to="/courses" className={styles.btn} style={{marginRight: "8px"}}>
<Link to="/about" className={styles.btn} style={{marginRight: "8px"}}>
About Us
</Link>
<Link to="/majors" className={styles.btn}>
Expand Down
34 changes: 17 additions & 17 deletions frontend/src/pages/OtherPages/About/About.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ import { Card, Row } from "react-bootstrap";
import { TextComponent } from "../../../navbar/Typography";
import "./components/About.scss";

import ld from "../../../commons/images/ld_headshot.jpeg";
import lm from "../../../commons/images/lm_headshot.jpeg";
import rg from "../../../commons/images/rg_headshot.jpeg";
import og from "../../../commons/images/og_headshot.jpeg";
import ah from "../../../commons/images/ah_headshot.jpeg";
import rr from "../../../commons/images/rr_headshot.jpeg";
import bw from "../../../commons/images/bw_headshot.jpeg";
import wy from "../../../commons/images/wy_headshot.jpeg";
import AnnabelleHuang from "../../../commons/images/headshots/annabelle-huang-headshot.jpeg";
import BenWu from "../../../commons/images/headshots/ben-wu-headshot.jpeg";
import LejunDeng from "../../../commons/images/headshots/lejun-deng-headshot.jpeg";
import LorenssMartinsons from "../../../commons/images/headshots/lorenss-martinsons-headshot.jpeg";
import OzGitelson from "../../../commons/images/headshots/oz-gitelson-headshot.jpeg";
import RamyaReddy from "../../../commons/images/headshots/ramya-reddy-headshot.jpeg";
import RyanGumlia from "../../../commons/images/headshots/ryan-gumlia-headshot.jpeg";
import WillYang from "../../../commons/images/headshots/will-yang-headshot.jpeg";

import githubDark from "../../../commons/images/github-light.png";
import github from "../../../commons/images/github.png";
Expand Down Expand Up @@ -49,7 +49,7 @@ function NavBar() {

<div className={nav_styles.row} style={{ marginRight: "20px" }}>
<NavLink
to="/"
to="/graduation"
className={({ isActive }) =>
isActive ? nav_styles.activeLink : nav_styles.dormantLink
}
Expand Down Expand Up @@ -82,7 +82,7 @@ function About() {
const current: Person[] = [
{
name: "Lorenss Martinsons",
image: lm,
image: LorenssMartinsons,
role: "MajorAudit Lead",
links: {
github: "https://github.com/lorenss-m",
Expand All @@ -91,7 +91,7 @@ function About() {
},
{
name: "Ryan Gumlia",
image: rg,
image: RyanGumlia,
role: "Frontend Team Lead",
links: {
linkedin: "https://www.linkedin.com/in/ryanggumlia/",
Expand All @@ -100,7 +100,7 @@ function About() {
},
{
name: "Oz Gitelson",
image: og,
image: OzGitelson,
role: "Backend Team Lead",
links: {
linkedin: "https://www.linkedin.com/in/oz-gitelson-4b606b249/",
Expand All @@ -109,7 +109,7 @@ function About() {
},
{
name: "Darwin Deng",
image: ld,
image: LejunDeng,
role: "Development",
links: {
linkedin: "https://www.linkedin.com/in/lejun-deng-46b437264/",
Expand All @@ -118,7 +118,7 @@ function About() {
},
{
name: "Annabelle Huang",
image: ah,
image: AnnabelleHuang,
role: "Development",
links: {
linkedin: "https://www.linkedin.com/in/annabellehuang/",
Expand All @@ -127,7 +127,7 @@ function About() {
},
{
name: "Ramya Reddy",
image: rr,
image: RamyaReddy,
role: "Development",
links: {
linkedin: "https://www.linkedin.com/in/ramya-n-reddy/",
Expand All @@ -136,7 +136,7 @@ function About() {
},
{
name: "Ben Wu",
image: bw,
image: BenWu,
role: "Development",
links: {
linkedin: "https://www.linkedin.com/in/benjaminwu13/",
Expand All @@ -145,7 +145,7 @@ function About() {
},
{
name: "Will Yang",
image: wy,
image: WillYang,
role: "Development",
links: {
linkedin: "https://www.linkedin.com/in/will-y/",
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/pages/OtherPages/FAQ/FAQ.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ function NavBar() {

<div className={nav_styles.row} style={{ marginRight: "20px" }}>
<NavLink
to="/"
to="/graduation"
className={({ isActive }) =>
isActive ? nav_styles.activeLink : nav_styles.dormantLink
}
Expand Down

0 comments on commit faf4148

Please sign in to comment.