From cfa70ef7b4e55567f607104db94327e3ac3282a1 Mon Sep 17 00:00:00 2001 From: Calvin Nguyen Date: Wed, 27 Dec 2023 13:31:45 -0800 Subject: [PATCH] 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 --- app/about/page.tsx | 18 ++++++++++++++++++ app/archive/page.tsx | 18 ++++++++++++++++++ app/gallery/page.tsx | 18 ++++++++++++++++++ app/page.tsx | 4 ++-- src/components/navbar/index.tsx | 10 +++++----- src/sections/Photo-Gallery/index.tsx | 1 + src/sections/Photo-Gallery/style.module.scss | 2 ++ 7 files changed, 64 insertions(+), 7 deletions(-) create mode 100644 app/about/page.tsx create mode 100644 app/archive/page.tsx create mode 100644 app/gallery/page.tsx 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/index.tsx b/src/components/navbar/index.tsx index 9707f81..2880c84 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/Photo-Gallery/index.tsx b/src/sections/Photo-Gallery/index.tsx index b528cb4..6f9b43d 100644 --- a/src/sections/Photo-Gallery/index.tsx +++ b/src/sections/Photo-Gallery/index.tsx @@ -81,6 +81,7 @@ const PhotoGallery: React.FC = () => { return ( <> +