Skip to content

Commit

Permalink
Split into different pages (#17)
Browse files Browse the repository at this point in the history
* Split into different pages

No longer a vertical page. Split into
- "/" which contains home and apply
- "/about" which contains about pages
- "/gallery" which contains photos page
- "archive" which contains past projects

Plus there are some minor CSS changes to accommodate

* Navbar fixes and headers for pages

- combined home and apply pages
- fixed dates and links for home page
- added appropriate headers and styles

* Text updates and fixed navbar rainbow
  • Loading branch information
Neniflight authored Jan 6, 2024
1 parent 66187d6 commit a4ba9a6
Show file tree
Hide file tree
Showing 11 changed files with 73 additions and 15 deletions.
18 changes: 18 additions & 0 deletions app/about/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
"use client"
import type { NextPage } from 'next';
import '@/src/styles/reset.scss';

import About from '@/src/sections/About-Projects';
import NavigationBar from '@/src/components/navbar';
// here we will compile all the sections of the website together

const AboutPage: NextPage = () => {
return (
<main>
<NavigationBar />
<About />
</main>
);
};

export default AboutPage;
18 changes: 18 additions & 0 deletions app/archive/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
"use client"
import type { NextPage } from 'next';
import '@/src/styles/reset.scss';

import NavigationBar from '@/src/components/navbar';
import Archive from '@/src/sections/Archive';
// here we will compile all the sections of the website together

const ArchivePage: NextPage = () => {
return (
<main>
<NavigationBar />
<Archive />
</main>
);
};

export default ArchivePage;
18 changes: 18 additions & 0 deletions app/gallery/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
"use client"
import type { NextPage } from 'next';
import '@/src/styles/reset.scss';

import PhotoGallery from '@/src/sections/Photo-Gallery';
import NavigationBar from '@/src/components/navbar';
// here we will compile all the sections of the website together

const GalleryPage: NextPage = () => {
return (
<main>
<NavigationBar />
<PhotoGallery />
</main>
);
};

export default GalleryPage;
4 changes: 2 additions & 2 deletions app/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ const Home: NextPage = () => {
<main>
<NavigationBar />
<TimerHero />
<About />
{/* <About />
<Archive/>
<PhotoGallery />
<PhotoGallery /> */}
</main>
);
};
Expand Down
3 changes: 2 additions & 1 deletion src/components/navbar/Navbar.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,8 @@
line-height: 300%;
transition: 0.3s ease-in-out;
// mobile menu is hidden by positioning under fixed navbar, we open it by sliding it out
margin-top: -22rem;
// if you want to add or remove nav options, change this
margin-top: -17.5rem;
&.open {
margin-top: 0;
}
Expand Down
10 changes: 5 additions & 5 deletions src/components/navbar/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ import { Size, useWindowSize } from "../../utils/general";


const navLinks = [
{ href: "/#home", label: "Home" },
{ href: "/#apply", label: "Apply" },
{ href: "/#about", label: "About" },
{ href: "/#archive", label: "Archive" },
{ href: "/#gallery", label: "Gallery" },
{ href: "/", label: "Home" },
// { href: "/", label: "Apply" },
{ href: "/about", label: "About" },
{ href: "/archive", label: "Archive" },
{ href: "/gallery", label: "Gallery" },
];

const NavigationBar: React.FC = () => {
Expand Down
1 change: 1 addition & 0 deletions src/sections/Archive/style.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@
flex-direction: column;
align-items: center;
margin-top: 2rem;
padding-top: 3rem;
}
2 changes: 1 addition & 1 deletion src/sections/Photo-Gallery/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ const PhotoGallery: React.FC = () => {
{ viewport: "(max-width: 1199px)", size: "calc(90vw - 30px)" },
],
}}
/>
/>
</>
);
}
Expand Down
2 changes: 2 additions & 0 deletions src/sections/Photo-Gallery/style.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
flex-direction: column;
justify-content: center;
align-items: center;
padding-top: 5rem;
padding-bottom: 1.5rem;

select {
border-radius: 0.25rem;
Expand Down
10 changes: 5 additions & 5 deletions src/sections/Timer/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { useState, useEffect } from "react";
import s from "../Timer/style.module.scss";
import ACMLogo from "../../../public/assets/acm_logo.png"

const projects_app = "https://acmurl.com/fall-project-apps";
const projects_app = "https://acmurl.com/winter-project-apps";


const TimerHero: React.FC = () => {
Expand All @@ -17,7 +17,7 @@ const TimerHero: React.FC = () => {

useEffect(() => {

const target = new Date("9/25/2023 08:00:00")
const target = new Date("01/21/2024 23:59:59")

const interval = setInterval(() =>{
const now = new Date()
Expand Down Expand Up @@ -60,7 +60,7 @@ const TimerHero: React.FC = () => {
<div className={s.hero__timer__header}>
<div className={s.hero__timer__header}>
{/* <p>Countdown To</p> */}
<h1>Fall 2023 Project Application Closed</h1>
<h1>Winter 2023 Project Application Closes In</h1>
</div>

<div className={s.hero__timer__time}>
Expand Down Expand Up @@ -93,9 +93,9 @@ const TimerHero: React.FC = () => {
<div className={s.description} id="apply">
<div className={s.description__info}>
<a href={projects_app} target="_blank"><button>
Closed
Open
</button></a>
<p>The application for ACM Projects is now closed. Applications will reopen in Fall 2023.</p>
{/* <p>The application for ACM Projects is now closed. Applications will reopen in Spring 2024.</p> */}
<div className={s.description__info__logo}>
<img src={ACMLogo.src} alt="ACM Logo" />

Expand Down
2 changes: 1 addition & 1 deletion src/sections/Timer/style.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@
font-size: 32px;
color: v.$darker-white;
// background-color: v.$blue-ap; for when it is open
background-color: v.$red-warning;
background-color: v.$green-success;
cursor: pointer;
}
button:hover {
Expand Down

0 comments on commit a4ba9a6

Please sign in to comment.