diff --git a/app/about/page.tsx b/app/about/page.tsx
new file mode 100644
index 0000000..7b3df26
--- /dev/null
+++ b/app/about/page.tsx
@@ -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 (
+
+
+
+
+ );
+};
+
+export default AboutPage;
\ No newline at end of file
diff --git a/app/archive/page.tsx b/app/archive/page.tsx
new file mode 100644
index 0000000..3d54b21
--- /dev/null
+++ b/app/archive/page.tsx
@@ -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 (
+
+
+
+
+ );
+};
+
+export default ArchivePage;
\ No newline at end of file
diff --git a/app/gallery/page.tsx b/app/gallery/page.tsx
new file mode 100644
index 0000000..ed9e4cd
--- /dev/null
+++ b/app/gallery/page.tsx
@@ -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 (
+
+
+
+
+ );
+};
+
+export default GalleryPage;
\ No newline at end of file
diff --git a/app/page.tsx b/app/page.tsx
index 1af2ab6..5e8e8b3 100644
--- a/app/page.tsx
+++ b/app/page.tsx
@@ -13,9 +13,9 @@ const Home: NextPage = () => {
-
+ {/*
-
+ */}
);
};
diff --git a/src/components/navbar/Navbar.module.scss b/src/components/navbar/Navbar.module.scss
index 5697585..5b460bf 100644
--- a/src/components/navbar/Navbar.module.scss
+++ b/src/components/navbar/Navbar.module.scss
@@ -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;
}
diff --git a/src/components/navbar/index.tsx b/src/components/navbar/index.tsx
index 9707f81..e70a8d2 100644
--- a/src/components/navbar/index.tsx
+++ b/src/components/navbar/index.tsx
@@ -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 = () => {
diff --git a/src/sections/Archive/style.module.scss b/src/sections/Archive/style.module.scss
index c894050..42e62de 100644
--- a/src/sections/Archive/style.module.scss
+++ b/src/sections/Archive/style.module.scss
@@ -5,4 +5,5 @@
flex-direction: column;
align-items: center;
margin-top: 2rem;
+ padding-top: 3rem;
}
\ No newline at end of file
diff --git a/src/sections/Photo-Gallery/index.tsx b/src/sections/Photo-Gallery/index.tsx
index b528cb4..87552c1 100644
--- a/src/sections/Photo-Gallery/index.tsx
+++ b/src/sections/Photo-Gallery/index.tsx
@@ -100,7 +100,7 @@ const PhotoGallery: React.FC = () => {
{ viewport: "(max-width: 1199px)", size: "calc(90vw - 30px)" },
],
}}
- />
+ />
>
);
}
diff --git a/src/sections/Photo-Gallery/style.module.scss b/src/sections/Photo-Gallery/style.module.scss
index de20721..52d188a 100644
--- a/src/sections/Photo-Gallery/style.module.scss
+++ b/src/sections/Photo-Gallery/style.module.scss
@@ -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;
diff --git a/src/sections/Timer/index.tsx b/src/sections/Timer/index.tsx
index 8465f28..56b28a2 100644
--- a/src/sections/Timer/index.tsx
+++ b/src/sections/Timer/index.tsx
@@ -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 = () => {
@@ -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()
@@ -60,7 +60,7 @@ const TimerHero: React.FC = () => {
{/*
Countdown To
*/}
-
Fall 2023 Project Application Closed
+
Winter 2023 Project Application Closes In
@@ -93,9 +93,9 @@ const TimerHero: React.FC = () => {
-
The application for ACM Projects is now closed. Applications will reopen in Fall 2023.
+ {/*
The application for ACM Projects is now closed. Applications will reopen in Spring 2024.
*/}

diff --git a/src/sections/Timer/style.module.scss b/src/sections/Timer/style.module.scss
index ec187ec..7984274 100644
--- a/src/sections/Timer/style.module.scss
+++ b/src/sections/Timer/style.module.scss
@@ -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 {