From 7eb1b1d1d11c43119ee1f28e8ca185e3c3e3ae14 Mon Sep 17 00:00:00 2001
From: Andrew Lee <alee14498@protonmail.com>
Date: Mon, 11 Sep 2023 23:12:27 -0400
Subject: Travel Advisory and package update

---
 src/components/Navbar.jsx                        |  2 +-
 src/components/travel-advisory/ListCountries.jsx |  1 -
 src/components/travel-advisory/countries.json    | 30 ++++++++++++------------
 src/layouts/Layout.astro                         |  2 +-
 src/pages/travel-advisory.astro                  |  4 ++--
 5 files changed, 19 insertions(+), 20 deletions(-)

(limited to 'src')

diff --git a/src/components/Navbar.jsx b/src/components/Navbar.jsx
index 63b2010..a3d6560 100644
--- a/src/components/Navbar.jsx
+++ b/src/components/Navbar.jsx
@@ -24,7 +24,7 @@ export default function Navbar(){
                         ['Home', '/'],
                         ['Updates', '/updates'],
                         ['Services', '/services'],
-                        ['Travel Advisory', '/travel-advisory'],
+                        ['Travel Advisory', '/travel-advisory']
                     ].map(([title, url]) => (
                         <li>
                             <a href={url} className="transition duration-150 ease-out hover:ease-in block py-2 pl-3 pr-4 rounded md:border-0 md:p-0 text-white md:hover:text-blue-500 hover:bg-gray-700 hover:text-white md:hover:bg-transparent" onClick={() => setNavbar(!navbar)}>
diff --git a/src/components/travel-advisory/ListCountries.jsx b/src/components/travel-advisory/ListCountries.jsx
index 57817af..867482b 100644
--- a/src/components/travel-advisory/ListCountries.jsx
+++ b/src/components/travel-advisory/ListCountries.jsx
@@ -26,7 +26,6 @@ export function getDangerLevel(danger) {
 }
 
 export function Countries(){
-    // eslint-disable-next-line react-hooks/rules-of-hooks
     const [showModal, setShowModal] = useState(false);
     const [selectedCountry, setSelectedCountry] = useState(null);
     const [selectedDangerLevel, setSelectedDangerLevel] = useState(null);
diff --git a/src/components/travel-advisory/countries.json b/src/components/travel-advisory/countries.json
index f50474c..757f5ca 100644
--- a/src/components/travel-advisory/countries.json
+++ b/src/components/travel-advisory/countries.json
@@ -67,12 +67,10 @@
         {
             "name": "Fegal",
             "url": "fegal",
-            "danger": 3,
+            "danger": 0,
             "image": "/countries/fegal.webp",
             "settlements": [],
-            "history": [
-                "May 17th, 2023: Fegal has border security issues and it has not been solved as of now."
-            ]
+            "history": []
         },
         {
             "name": "Halcandra",
@@ -146,6 +144,14 @@
             "settlements": [],
             "history": []
         },
+        {
+            "name": "Ownage",
+            "url": "ownage",
+            "danger": 0,
+            "image": "/countries/youonkazoo.webp",
+            "settlements": [],
+            "history": []
+        },
         {
             "name": "PLC",
             "url": "plc",
@@ -165,10 +171,12 @@
         {
             "name": "The Federal Democracy of Solstice",
             "url": "solstice",
-            "danger": 0,
+            "danger": 3,
             "image": "/countries/solstice.webp",
             "settlements": [],
-            "history": []
+            "history": [
+                "September 9th, 2023: There has been a vote on Solstice to \"recognize\" KR as a prison."
+            ]
         },
         {
             "name": "Southeastern Islands",
@@ -234,20 +242,12 @@
             "history": []
         },
         {
-            "name": "The Federation of Yavno",
+            "name": "Yavno Republic",
             "url": "yavno",
             "danger": 0,
             "image": "/countries/yavno.webp",
             "settlements": [],
             "history": []
-        },
-        {
-            "name": "The Republic of You on Kazoo",
-            "url": "you-on-kazoo",
-            "danger": 0,
-            "image": "/countries/youonkazoo.webp",
-            "settlements": [],
-            "history": []
         }
     ]
 }
diff --git a/src/layouts/Layout.astro b/src/layouts/Layout.astro
index 6aeea4e..57e231f 100644
--- a/src/layouts/Layout.astro
+++ b/src/layouts/Layout.astro
@@ -1,5 +1,5 @@
 ---
-import Navbar from "../components/Navbar";
+import Navbar from "../components/Navbar.jsx";
 import PSA from "../components/PSA.astro";
 
 const { title, description } = Astro.props;
diff --git a/src/pages/travel-advisory.astro b/src/pages/travel-advisory.astro
index 693a4fe..42c238a 100644
--- a/src/pages/travel-advisory.astro
+++ b/src/pages/travel-advisory.astro
@@ -1,8 +1,8 @@
 ---
-import Countries from '../components/travel-advisory/countries.json'
+import Countries from '../components/travel-advisory/ListCountries.jsx'
 import Layout from "../layouts/Layout.astro";
 ---
-<Layout>
+<Layout title="Travel Advisory" description="Information whether its safe to travel to other countries">
     <main class="flex flex-col">
         <div>
             <h1 class="p-5 sm:px-40 px-10 text-3xl" id="legend">Legend</h1>
-- 
cgit v1.2.3