Skip to content
Closed
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
18 changes: 18 additions & 0 deletions app/archive/[slug]/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
"use client"
import '@/src/styles/reset.scss';

import NavigationBar from '@/src/components/navbar';
import ProjectDetail from '@/src/sections/ProjectDetail';
import Footer from '@/src/components/footer';

const ProjectPage = ({ params }: { params: { slug: string } }) => {
return (
<main>
<NavigationBar />
<ProjectDetail slug={params.slug} />
<Footer />
</main>
);
};

export default ProjectPage;
2 changes: 1 addition & 1 deletion app/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import "./globals.css";
import type { Metadata } from "next";
import { DM_Sans } from "next/font/google";

const dm_sans = DM_Sans({ subsets: ["latin"], weight: "400" });
const dm_sans = DM_Sans({ subsets: ["latin"], weight: ["200", "400", "500", "600", "700", "800"] });

export const metadata: Metadata = {
title: "ACM at UC San Diego Projects Website",
Expand Down
6 changes: 6 additions & 0 deletions app/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,18 @@ import "../src/styles/reset.scss";
import NavigationBar from "@/src/components/navbar";
import Footer from "@/src/components/footer";
import Hero from "@/src/sections/Hero";
import FAQ from "@/src/sections/FAQ";
import Timeline from "@/src/sections/Timeline";
import HomePastProjects from "@/src/sections/Home-Past-Projects";
// here we will compile all the sections of the website together
const Home: NextPage = () => {
return (
<main>
<NavigationBar />
<Hero />
<HomePastProjects />
<Timeline />
<FAQ />
<Footer />
</main>
);
Expand Down
3 changes: 3 additions & 0 deletions public/assets/chevron-down.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 public/assets/countdown_image.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions public/assets/embeds/figma-icon.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 public/assets/embeds/github-icon.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 public/assets/hero-gradient-mobile.png
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 public/assets/hero-gradient.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions public/assets/navbar_proj_logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 3 additions & 4 deletions public/assets/proj_logo.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 public/assets/robo.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 public/assets/timeline_component_image.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
58 changes: 0 additions & 58 deletions src/components/banner/index.tsx

This file was deleted.

18 changes: 0 additions & 18 deletions src/components/banner/style.module.scss

This file was deleted.

66 changes: 66 additions & 0 deletions src/components/countdown/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
"use client";

import { useState, useEffect } from "react";
import styles from "./style.module.scss";

type CountdownProps = {
className?: string;
};

const Countdown = ({ className = "" }: CountdownProps) => {
const [days, setDays] = useState(0);
const [hours, setHours] = useState(0);
const [minutes, setMinutes] = useState(0);
const [seconds, setSeconds] = useState(0);
let countdownComponents : number[] = [days, hours, minutes, seconds];

useEffect(() => {
const target = new Date("10/02/2026 23:59:59");

const interval = setInterval(() => {
const now = new Date();
const difference = target.getTime() - now.getTime();

if (difference <= 0) {
setDays(0);
setHours(0);
setMinutes(0);
setSeconds(0);
countdownComponents = [days, hours, minutes, seconds];
clearInterval(interval);
} else {
setDays(Math.floor(difference / (1000 * 60 * 60 * 24)));
setHours(
Math.floor(
(difference % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60)
)
);
setMinutes(
Math.floor((difference % (1000 * 60 * 60)) / (1000 * 60))
);
setSeconds(Math.floor((difference % (1000 * 60)) / 1000));
countdownComponents = [days, hours, minutes, seconds];
}
}, 1000);

return () => clearInterval(interval);
}, []);

return (
<div className={`${styles.date} ${className}`}>
{countdownComponents.map((comp, key) => {
const digits = String(comp).padStart(2, '0').split('');

return (
<span key={key}>
<span className={styles.digit}>{digits[0]}</span>
<span className={styles.digit}>{digits[1]}</span>
{key < 3 ? <span>:</span> : null}
</span>
);
})}
</div>
);
};

export default Countdown;
13 changes: 13 additions & 0 deletions src/components/countdown/style.module.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
@use "../../styles/vars.scss" as v; // allows you to use pre-defined colors

.date {
color: black;
font-size: 1.25rem;
font-weight: 700;

.digit {
display: inline-block;
width: 1ch;
text-align: center;
}
}
4 changes: 2 additions & 2 deletions src/components/footer/styles.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ $mmmw: 375px; // medium mobile max width
.footer {
width: 100%;
height: 100%;
background-color: vars.$footer-blue;
background-color: vars.$proj-blue;
color: vars.$white;
z-index: 0;
position: relative;
Expand Down Expand Up @@ -224,4 +224,4 @@ $mmmw: 375px; // medium mobile max width
}
}
}
}
}
Loading
Loading