diff --git a/app/about/education/page.tsx b/app/about/education/page.tsx
deleted file mode 100644
index 41552c2..0000000
--- a/app/about/education/page.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-export default function EducationPage() {
- return <>Education Page>
-}
diff --git a/app/about/music/page.tsx b/app/about/music/page.tsx
deleted file mode 100644
index 4a604af..0000000
--- a/app/about/music/page.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-import Link from 'next/link';
-
-export default function MusicPage() {
- return (
-
-
-
Projects
-
-
-
-
Works
-
-
-
-
Stream
-
-
- )
-}
diff --git a/app/about/music/projects/page.tsx b/app/about/music/projects/page.tsx
deleted file mode 100644
index 465a104..0000000
--- a/app/about/music/projects/page.tsx
+++ /dev/null
@@ -1,9 +0,0 @@
-export default function MusicProjectPage() {
- return (
-
-
Music Project Page
-
-
This is where I'll keep a running list of my projects
-
- )
-}
diff --git a/app/about/music/stream/page.tsx b/app/about/music/stream/page.tsx
deleted file mode 100644
index 90ee54a..0000000
--- a/app/about/music/stream/page.tsx
+++ /dev/null
@@ -1,7 +0,0 @@
-export default function MusicStreamingPage() {
- return (
-
-
Music Streaming Page
-
- )
-}
diff --git a/app/about/music/works/[id]/page.tsx b/app/about/music/works/[id]/page.tsx
deleted file mode 100644
index 7b8ed18..0000000
--- a/app/about/music/works/[id]/page.tsx
+++ /dev/null
@@ -1,16 +0,0 @@
-export default function MusicalWorkPage({ params }: { params: { id: string }}) {
- if (Number.isNaN(parseInt(params.id))) {
- return Fail
- }
-
- return (
-
-
Music Works Page
-
Work No. {params.id}
-
-
-
This page is coming soon!
-
-
- )
-}
diff --git a/app/about/music/works/page.tsx b/app/about/music/works/page.tsx
deleted file mode 100644
index 71b5733..0000000
--- a/app/about/music/works/page.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import Link from 'next/link';
-
-export default function MusicWorksPage() {
- return (
-
-
Music Works Page
-
-
-
First
-
-
-
-
Second
-
-
-
-
Third
-
-
- )
-}
diff --git a/app/about/work/[employer]/page.tsx b/app/about/work/[employer]/page.tsx
deleted file mode 100644
index 86b3b4a..0000000
--- a/app/about/work/[employer]/page.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-'use client';
-import { usePathname } from "next/navigation";
-
-export default function ExperiencePage() {
- const path = usePathname();
-
- return (
-
-
-
Work Page
-
Employer: {path.split('/').at(-1)}
-
-
-
This section is coming soon!
-
-
- )
-}
diff --git a/app/about/work/page.tsx b/app/about/work/page.tsx
deleted file mode 100644
index 8a6df70..0000000
--- a/app/about/work/page.tsx
+++ /dev/null
@@ -1,9 +0,0 @@
-const WorkHistory = () => {
- return (
-
-
Work History
-
- );
-}
-
-export default WorkHistory;
diff --git a/app/layout.tsx b/app/layout.tsx
index e73aaf4..77e3b48 100644
--- a/app/layout.tsx
+++ b/app/layout.tsx
@@ -1,56 +1,14 @@
-'use client'
-
import './globals.css'
import Head from 'next/head'
import Navbar from '@/components/Navbar'
-import SiteTree from '@/components/SiteTree'
import { Inter, Besley, Cabin } from 'next/font/google'
-import { usePathname } from 'next/navigation'
-import { IconContext } from 'react-icons'
-import { useEffect, useState } from 'react'
export const inter = Inter({ subsets: ['latin'] })
export const besley = Besley({ subsets: ['latin'] })
export const cabin = Cabin({ subsets: ['latin'] })
export default function RootLayout({ children }: { children: React.ReactNode }) {
- const pathname = usePathname();
- const [bg, setBg] = useState('bg-slate-400 dark:bg-slate-900');
- const [overlay, setOverlay] = useState(false);
-
- const [pageIsScrolled, setPageIsScrolled] = useState(false);
-
- // useEffect(() => {
- // if (pathname === '/contact') setOverlay(true);
-
- // switch (pathname) {
- // case '/contact':
- // setBg('bg-purple-300 dark:bg-darkPlum');
- // break;
- // case '/about':
- // setBg("bg-blue-100 dark:bg-slate-900");
- // break;
- // case "/links":
- // setBg("bg-sky-100 dark:bg-slate-900");
- // break;
- // case '/':
- // default:
- // setBg('bg-slate-400 dark:bg-slate-900');
- // break;
- // }
- // }, [pathname])
-
- useEffect(() => {
- document.addEventListener('scroll', () => {
- if (window.scrollY > 0) {
- setPageIsScrolled(true);
- } else {
- setPageIsScrolled(false);
- }
- })
- }, [])
-
return (
@@ -60,14 +18,11 @@ export default function RootLayout({ children }: { children: React.ReactNode })
-
-
-
-
-
+
+
)
diff --git a/app/listen/[collectionid]/page.tsx b/app/listen/[collectionid]/page.tsx
index 26baf5d..4ef9a9c 100644
--- a/app/listen/[collectionid]/page.tsx
+++ b/app/listen/[collectionid]/page.tsx
@@ -1,3 +1,7 @@
-export default function ListenByCollectionID() {
- return ListenByCollectionID
;
+import InProgress from "@/components/InProgress";
+
+export default async function ListenByCollectionID() {
+ return <>>
+ // // @ts-ignore server component
+ // return
}
diff --git a/app/listen/layout.tsx b/app/listen/layout.tsx
new file mode 100644
index 0000000..05c7194
--- /dev/null
+++ b/app/listen/layout.tsx
@@ -0,0 +1,7 @@
+export default function ListenLayout({ children }: { children: React.ReactNode}) {
+ return (
+
+ { children }
+
+ )
+}
diff --git a/app/listen/page.tsx b/app/listen/page.tsx
index b32d406..282a403 100644
--- a/app/listen/page.tsx
+++ b/app/listen/page.tsx
@@ -1,3 +1,11 @@
-export default function ListenIndex() {
- return ListenIndex
;
+import InProgress from "@/components/InProgress";
+
+export default async function ListenIndex() {
+ return (
+
+
Listen
+ {/* @ts-ignore server component */}
+ {/* */}
+
+ )
}
diff --git a/app/projects/page.tsx b/app/projects/page.tsx
index 7c11e9d..3983665 100644
--- a/app/projects/page.tsx
+++ b/app/projects/page.tsx
@@ -1,9 +1,11 @@
+import InProgress from "@/components/InProgress";
+
export default async function ProjectsPage() {
return (
Learn more about my work
-
-
Contents of this page coming soon!
+ {/* @ts-ignore server component */}
+ {/*
*/}
)
}
diff --git a/components/InProgress.tsx b/components/InProgress.tsx
new file mode 100644
index 0000000..8427995
--- /dev/null
+++ b/components/InProgress.tsx
@@ -0,0 +1,3 @@
+export default function InProgress() {
+ return Under construction! Come back soon.
;
+}
diff --git a/components/Navbar/index.tsx b/components/Navbar/index.tsx
index 4536f5b..a088c91 100644
--- a/components/Navbar/index.tsx
+++ b/components/Navbar/index.tsx
@@ -1,14 +1,26 @@
+'use client';
import Link from 'next/link'
import { InlineLogo, useColorShift } from './logo'
-import { useState } from 'react';
+import { useEffect, useState } from 'react';
import { RxActivityLog } from "react-icons/rx";
import { NavbarButton } from '../ui/Button';
const SHIFT_INTERVAL = 3000;
-export default function Navbar({ pageIsScrolled = false }) {
+export default function Navbar() {
const navbarColorShift = useColorShift(SHIFT_INTERVAL);
const [mobileMenuOpen, setMobileMenuOpen] = useState(false);
+ const [pageIsScrolled, setPageIsScrolled] = useState(false);
+
+ useEffect(() => {
+ document.addEventListener('scroll', () => {
+ if (window.scrollY > 0) {
+ setPageIsScrolled(true);
+ } else {
+ setPageIsScrolled(false);
+ }
+ })
+ }, [])
return (
<>
diff --git a/public/resume/Mikayla Resume 0623.docx b/public/resume/Mikayla Resume 1023.docx
similarity index 97%
rename from public/resume/Mikayla Resume 0623.docx
rename to public/resume/Mikayla Resume 1023.docx
index 7f55bd7..65922bd 100644
Binary files a/public/resume/Mikayla Resume 0623.docx and b/public/resume/Mikayla Resume 1023.docx differ
diff --git a/public/resume/Mikayla Resume 0623.pdf b/public/resume/Mikayla Resume 1023.pdf
similarity index 58%
rename from public/resume/Mikayla Resume 0623.pdf
rename to public/resume/Mikayla Resume 1023.pdf
index 396fad4..b53de23 100644
Binary files a/public/resume/Mikayla Resume 0623.pdf and b/public/resume/Mikayla Resume 1023.pdf differ