Skip to content

Commit

Permalink
Split into different pages
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Neniflight committed Dec 27, 2023
1 parent 66187d6 commit cfa70ef
Show file tree
Hide file tree
Showing 7 changed files with 64 additions and 7 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
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/Photo-Gallery/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ const PhotoGallery: React.FC = () => {

return (
<>
<div></div>
<div className={s.container} id="gallery">
<h1>Photo Gallery</h1>
<select name="project_select" onChange={handleChange}>
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: 2rem;
padding-bottom: 1.5rem;

select {
border-radius: 0.25rem;
Expand Down

0 comments on commit cfa70ef

Please sign in to comment.