diff --git a/app/components/BackButton.tsx b/app/components/objects/BackButton.tsx similarity index 100% rename from app/components/BackButton.tsx rename to app/components/objects/BackButton.tsx diff --git a/app/components/LoadingSpinner.tsx b/app/components/objects/LoadingSpinner.tsx similarity index 100% rename from app/components/LoadingSpinner.tsx rename to app/components/objects/LoadingSpinner.tsx diff --git a/app/components/MusicInfo.tsx b/app/components/objects/MusicInfo.tsx similarity index 100% rename from app/components/MusicInfo.tsx rename to app/components/objects/MusicInfo.tsx diff --git a/app/components/MusicInfoButton.tsx b/app/components/objects/MusicInfoButton.tsx similarity index 100% rename from app/components/MusicInfoButton.tsx rename to app/components/objects/MusicInfoButton.tsx diff --git a/app/components/pages/About.tsx b/app/components/pages/About.tsx index dc9c7ed..46698cf 100644 --- a/app/components/pages/About.tsx +++ b/app/components/pages/About.tsx @@ -1,6 +1,6 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome' import { faUser } from '@fortawesome/free-solid-svg-icons' -import GitHubFeatured from '../GitHubFeatured' +import GitHubFeatured from '../widgets/GitHubFeatured' import Image from 'next/image' export default function About() { diff --git a/app/components/pages/time-periods/early-summer-2024/WhatWasGoingOn.tsx b/app/components/pages/time-periods/early-summer-2024/WhatWasGoingOn.tsx index 2560d8e..401852a 100644 --- a/app/components/pages/time-periods/early-summer-2024/WhatWasGoingOn.tsx +++ b/app/components/pages/time-periods/early-summer-2024/WhatWasGoingOn.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import BackButton from '../../../BackButton'; +import BackButton from '../../../objects/BackButton'; const WhatWasGoingOnLateSummer2024: React.FC = () => { return ( diff --git a/app/components/pages/time-periods/late-summer-2024/WhatWasGoingOn.tsx b/app/components/pages/time-periods/late-summer-2024/WhatWasGoingOn.tsx index ccc4258..85d8c99 100644 --- a/app/components/pages/time-periods/late-summer-2024/WhatWasGoingOn.tsx +++ b/app/components/pages/time-periods/late-summer-2024/WhatWasGoingOn.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import BackButton from '../../../BackButton'; +import BackButton from '../../../objects/BackButton'; const WhatWasGoingOnLateSummer2024: React.FC = () => { return ( diff --git a/app/components/GitHubFeatured.tsx b/app/components/widgets/GitHubFeatured.tsx similarity index 96% rename from app/components/GitHubFeatured.tsx rename to app/components/widgets/GitHubFeatured.tsx index 2869fc3..1c2240f 100644 --- a/app/components/GitHubFeatured.tsx +++ b/app/components/widgets/GitHubFeatured.tsx @@ -1,7 +1,7 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome' import { faGithub } from '@fortawesome/free-brands-svg-icons' import { faStar, faCodeBranch } from '@fortawesome/free-solid-svg-icons' -import featuredProjects from '../data/featured.json' +import featuredProjects from '../../data/featured.json' export default function GitHubFeatured() { return ( diff --git a/app/components/Music.tsx b/app/components/widgets/Music.tsx similarity index 98% rename from app/components/Music.tsx rename to app/components/widgets/Music.tsx index 89bb0d6..477f34a 100644 --- a/app/components/Music.tsx +++ b/app/components/widgets/Music.tsx @@ -3,7 +3,7 @@ import { useState, useEffect } from 'react'; import Image from 'next/image'; import { Play, SkipBack, SkipForward, ChevronLeft, ChevronRight } from 'lucide-react'; -import LoadingSpinner from './LoadingSpinner'; +import LoadingSpinner from '../objects/LoadingSpinner'; interface Song { albumArt: string; diff --git a/app/components/NowPlaying.tsx b/app/components/widgets/NowPlaying.tsx similarity index 100% rename from app/components/NowPlaying.tsx rename to app/components/widgets/NowPlaying.tsx diff --git a/app/music/page.tsx b/app/music/page.tsx index 0f75857..5dc5d9f 100644 --- a/app/music/page.tsx +++ b/app/music/page.tsx @@ -1,6 +1,6 @@ import Header from '../components/Header' -import MusicWidget from '../components/Music' -import MusicInfo from '../components/MusicInfo' +import MusicWidget from '../components/widgets/Music' +import MusicInfo from '../components/objects/MusicInfo' import Footer from '../components/Footer' export default function Music() { diff --git a/app/page.tsx b/app/page.tsx index b0b8c05..826101d 100644 --- a/app/page.tsx +++ b/app/page.tsx @@ -1,7 +1,7 @@ import Header from './components/Header'; import HomePg from './components/pages/Home'; import Footer from './components/Footer'; -import NowPlaying from './components/NowPlaying'; +import NowPlaying from './components/widgets/NowPlaying'; export default function Home() { return ( diff --git a/package.json b/package.json index b3e3a1d..0b32044 100644 --- a/package.json +++ b/package.json @@ -22,15 +22,15 @@ "react-dom": "^19.0.0" }, "devDependencies": { - "typescript": "^5", - "@types/node": "^20", - "@types/react": "^19.0.2", - "@types/react-dom": "^19", - "postcss": "^8", - "tailwindcss": "^3.4.1", - "eslint": "^9", + "typescript": "^5.7.2", + "@types/node": "^20.17.12", + "@types/react": "^19.0.3", + "@types/react-dom": "^19.0.2", + "postcss": "^8.4.49", + "tailwindcss": "^3.4.17", + "eslint": "^9.17.0", "eslint-config-next": "15.1.3", - "@eslint/eslintrc": "^3" + "@eslint/eslintrc": "^3.2.0" }, "trustedDependencies": [ "@vercel/speed-insights"