From 260ea88a873c10738643b6f82ff00bd854246ec4 Mon Sep 17 00:00:00 2001 From: Andrew Lee Date: Wed, 19 Jul 2023 00:58:38 -0400 Subject: Sorting out files --- app/Header.js | 12 ------------ app/Navbar.js | 46 -------------------------------------------- app/PSA.js | 47 --------------------------------------------- app/components/Header.js | 12 ++++++++++++ app/components/Navbar.js | 46 ++++++++++++++++++++++++++++++++++++++++++++ app/components/PSA.js | 47 +++++++++++++++++++++++++++++++++++++++++++++ app/components/psa.json | 5 +++++ app/layout.js | 4 ++-- app/page.js | 4 ++-- app/psa.json | 5 ----- app/services/page.js | 2 +- app/travel-advisory/page.js | 4 ++-- app/updates/PostPreview.js | 2 +- app/updates/[slug]/page.js | 4 ++-- app/updates/page.js | 6 +++--- 15 files changed, 123 insertions(+), 123 deletions(-) delete mode 100644 app/Header.js delete mode 100644 app/Navbar.js delete mode 100644 app/PSA.js create mode 100644 app/components/Header.js create mode 100644 app/components/Navbar.js create mode 100644 app/components/PSA.js create mode 100644 app/components/psa.json delete mode 100644 app/psa.json diff --git a/app/Header.js b/app/Header.js deleted file mode 100644 index bd70dd0..0000000 --- a/app/Header.js +++ /dev/null @@ -1,12 +0,0 @@ -const Header = ({title, description}) => { - return ( -
-
-

{title}

-

{description}

-
-
- ) -} - -export default Header; diff --git a/app/Navbar.js b/app/Navbar.js deleted file mode 100644 index 1555eb9..0000000 --- a/app/Navbar.js +++ /dev/null @@ -1,46 +0,0 @@ -"use client"; -import Image from "next/image"; -import Link from "next/link"; -import { useState } from "react"; - -const Navbar = () => { - const [navbar, setNavbar] = useState(false); - return ( - - ) -} - -export default Navbar; diff --git a/app/PSA.js b/app/PSA.js deleted file mode 100644 index 06bf9ba..0000000 --- a/app/PSA.js +++ /dev/null @@ -1,47 +0,0 @@ -import psaMessage from './psa.json' assert { type: 'json' }; -import Link from "next/link"; - -const PSA = () => { - let defaultStyle = "flex flex-row md:px-40 px-30 py-0.5 space-x-2"; - let styleImportant; - let important; - switch (psaMessage.important) { - case 0: - styleImportant = "hidden" - defaultStyle += ' ' + styleImportant - break; - case 1: - important = "Latest News:" - styleImportant = "bg-zinc-700" - defaultStyle += ' ' + styleImportant - break; - case 2: - important = "WARNING!" - styleImportant = "bg-yellow-700" - defaultStyle += ' ' + styleImportant - break; - case 3: - important = "EMERGENCY!" - styleImportant = "bg-red-800" - defaultStyle += ' ' + styleImportant - break; - - } - - return ( -
-

{important}

-
-

{psaMessage.announcement}

-

- {psaMessage.link && ( - - Learn more ↗ - - )}

-
-
- ) -} - -export default PSA; diff --git a/app/components/Header.js b/app/components/Header.js new file mode 100644 index 0000000..bd70dd0 --- /dev/null +++ b/app/components/Header.js @@ -0,0 +1,12 @@ +const Header = ({title, description}) => { + return ( +
+
+

{title}

+

{description}

+
+
+ ) +} + +export default Header; diff --git a/app/components/Navbar.js b/app/components/Navbar.js new file mode 100644 index 0000000..1555eb9 --- /dev/null +++ b/app/components/Navbar.js @@ -0,0 +1,46 @@ +"use client"; +import Image from "next/image"; +import Link from "next/link"; +import { useState } from "react"; + +const Navbar = () => { + const [navbar, setNavbar] = useState(false); + return ( + + ) +} + +export default Navbar; diff --git a/app/components/PSA.js b/app/components/PSA.js new file mode 100644 index 0000000..06bf9ba --- /dev/null +++ b/app/components/PSA.js @@ -0,0 +1,47 @@ +import psaMessage from './psa.json' assert { type: 'json' }; +import Link from "next/link"; + +const PSA = () => { + let defaultStyle = "flex flex-row md:px-40 px-30 py-0.5 space-x-2"; + let styleImportant; + let important; + switch (psaMessage.important) { + case 0: + styleImportant = "hidden" + defaultStyle += ' ' + styleImportant + break; + case 1: + important = "Latest News:" + styleImportant = "bg-zinc-700" + defaultStyle += ' ' + styleImportant + break; + case 2: + important = "WARNING!" + styleImportant = "bg-yellow-700" + defaultStyle += ' ' + styleImportant + break; + case 3: + important = "EMERGENCY!" + styleImportant = "bg-red-800" + defaultStyle += ' ' + styleImportant + break; + + } + + return ( +
+

{important}

+
+

{psaMessage.announcement}

+

+ {psaMessage.link && ( + + Learn more ↗ + + )}

+
+
+ ) +} + +export default PSA; diff --git a/app/components/psa.json b/app/components/psa.json new file mode 100644 index 0000000..df9869f --- /dev/null +++ b/app/components/psa.json @@ -0,0 +1,5 @@ +{ + "important": 0, + "announcement": "No important announcements", + "link": "https://google.ca" +} diff --git a/app/layout.js b/app/layout.js index 50dad73..c20b36d 100644 --- a/app/layout.js +++ b/app/layout.js @@ -1,7 +1,7 @@ import './globals.css' import { Exo } from 'next/font/google' -import Navbar from "@/app/Navbar"; -import PSA from "@/app/PSA"; +import Navbar from "./components/Navbar"; +import PSA from "./components/PSA"; const exo = Exo({ subsets: ['latin'] }) diff --git a/app/page.js b/app/page.js index 5a089df..9f35ed2 100644 --- a/app/page.js +++ b/app/page.js @@ -1,5 +1,5 @@ -import getPostMetadata from "@/app/updates/getPostMetadata"; -import PostPreview from "@/app/updates/PostPreview"; +import getPostMetadata from "./updates/getPostMetadata"; +import PostPreview from "./updates/PostPreview"; import Link from "next/link"; export const metadata = { diff --git a/app/psa.json b/app/psa.json deleted file mode 100644 index df9869f..0000000 --- a/app/psa.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "important": 0, - "announcement": "No important announcements", - "link": "https://google.ca" -} diff --git a/app/services/page.js b/app/services/page.js index 3acd69f..827a652 100644 --- a/app/services/page.js +++ b/app/services/page.js @@ -1,4 +1,4 @@ -import Header from "@/app/Header"; +import Header from "../components/Header"; export const metadata = { title: 'Services', diff --git a/app/travel-advisory/page.js b/app/travel-advisory/page.js index 259aaa4..a9e94c0 100644 --- a/app/travel-advisory/page.js +++ b/app/travel-advisory/page.js @@ -1,5 +1,5 @@ -import { Countries, getDangerLevel } from "@/app/travel-advisory/ListCountries"; -import Header from "@/app/Header"; +import { Countries } from "./ListCountries"; +import Header from "../components/Header"; export const metadata = { title: 'Travel Advisory', diff --git a/app/updates/PostPreview.js b/app/updates/PostPreview.js index 23e2176..a81197d 100644 --- a/app/updates/PostPreview.js +++ b/app/updates/PostPreview.js @@ -1,5 +1,5 @@ import Link from "next/link"; -import DateFormatter from '@/app/updates/DateFormatter' +import DateFormatter from './DateFormatter' export default function PostPreview(props) { return ( diff --git a/app/updates/[slug]/page.js b/app/updates/[slug]/page.js index 102a98a..555caa7 100644 --- a/app/updates/[slug]/page.js +++ b/app/updates/[slug]/page.js @@ -1,8 +1,8 @@ import {readFileSync} from "fs"; import Markdown from "markdown-to-jsx" import matter from "gray-matter"; -import getPostMetadata from "@/app/updates/getPostMetadata"; -import DateFormatter from "@/app/updates/DateFormatter"; +import getPostMetadata from "../getPostMetadata"; +import DateFormatter from "../DateFormatter"; const getPostContent = (slug) => { const folder = "posts/"; diff --git a/app/updates/page.js b/app/updates/page.js index 148c135..cbc94e2 100644 --- a/app/updates/page.js +++ b/app/updates/page.js @@ -1,6 +1,6 @@ -import getPostMetadata from "@/app/updates/getPostMetadata"; -import PostPreview from "@/app/updates/PostPreview"; -import Header from "@/app/Header"; +import getPostMetadata from "./getPostMetadata"; +import PostPreview from "./PostPreview"; +import Header from "../components/Header"; export const metadata = { title: 'Updates', -- cgit v1.2.3