added prep and more

stcalica · May 13, 2024 · ed19288 · ed19288
1 parent c008cc7
commit ed19288
Showing 7 changed files with 94 additions and 214 deletions.
diff --git a/app/layout.tsx b/app/layout.tsx
@@ -25,7 +25,7 @@ const libreBodoni = Libre_Bodoni({
 });
 
 export const metadata: Metadata = {
-  title: "Hidden Oasis",
+  title: "Advance Camp",
   description: "Advance Camp for Scouts of America 2024",
 };
 

diff --git a/app/prep/page.tsx b/app/prep/page.tsx
@@ -1,8 +1,8 @@
 import type { NextPage } from "next";
-import PrepPage from "@/templates/PrepPage";
+import FaqPage from "@/templates/FaqPage";
 
 const Prep: NextPage = () => {
-    return <PrepPage />;
+    return <FaqPage />;
 };
 
 export default Prep;
diff --git a/components/Sidebar/index.tsx b/components/Sidebar/index.tsx
@@ -36,7 +36,7 @@ const Sidebar = ({ className, onClick }: SidebarProps) => (
     {navigation.map((link) =>
                 link.dropdown ? (
                     <div className="" key={link.id}>
-                        <div className="py-1 text-h4-libre text-white font-black lg:text-h5">
+                        <div className="py-1 text-h4-libre text-white font-black">
                             {link.title}
                         </div>
                         <div className="flex flex-col items-start pt-4 pl-4 space-y-6">

diff --git a/constants/navigation.tsx b/constants/navigation.tsx
@@ -6,16 +6,6 @@ export const navigation = [
     },
     {
         id: "2",
-        title: "About Us",
-        url: "/about-us",
-    },
-    {
-        id: "3",
-        title: "Contact Us",
-        url: "/contact-us",
-    },
-    {
-        id: "4",
         title: "Courses",
         url: "/courses",
         dropdown: [
@@ -30,6 +20,22 @@ export const navigation = [
             url: "/merit-badges",
         },
         ]
+    },
+    {
+        id: "3",
+        title: "Prep",
+        url: "/prep",
+    },
+
+    {
+        id: "4",
+        title: "About Us",
+        url: "/about-us",
+    },
+    {
+        id: "5",
+        title: "Contact Us",
+        url: "/contact-us",
     }
 ];
 
@@ -45,17 +51,6 @@ export const menu = [
             },
             {
                 id: "1",
-                title: "Contact Us",
-                url: "/contact-us",
-            },
-
-            {
-                id: "2",
-                title: "Leadership",
-                url: "/about-us",
-            },
-            {
-                id: "4",
                 title: "courses",
                 url: "/courses",
                 dropdown: [
@@ -70,6 +65,23 @@ export const menu = [
                     url: "/merit-badges",
                 },
                 ]
+            },
+            {
+                id: "2",
+                title: "prep",
+                url: "/prep",
+            },
+
+            {
+                id: "3",
+                title: "Contact Us",
+                url: "/contact-us",
+            },
+
+            {
+                id: "4",
+                title: "Leadership",
+                url: "/about-us",
             }
         ],
     },

diff --git a/mocks/faqs.tsx b/mocks/faqs.tsx
diff --git a/templates/FaqPage/index.tsx b/templates/FaqPage/index.tsx
@@ -8,7 +8,7 @@ const FaqPage = () => {
     return (
         <Layout>
             <Hero
-                title="Frequently Asked Questions About Hidden Oasis."
+                title="Frequently Asked Questions About Advance Camp."
                 image="/images/content/hero-pic-4.jpg"
             />
             <Faqs />

diff --git a/templates/MeritBadgePage/Landing/index.tsx b/templates/MeritBadgePage/Landing/index.tsx
@@ -23,7 +23,13 @@ const Landing = ({}: LandingProps) => (
         <h2 className="text-h4 font-bold my-4">Special Requirements</h2>
           <p className="text-16r mb-4">Many Merit Badges require that the scsout have permission slips, special clothes or shoes, extra clothes, etc. </p>
           <p className="text-black font-black">Please check the details of every Merit Badge and make sure that your scouts are prepared to work on that badge.</p>
-        <div className="mt-8 flex flex-row gap-x-4">
+        <div className="mt-8 flex flex-col lg:flex-row gap-x-4 gap-y-4">
+        <Link
+            className="px-16 py-3 bg-transparent hover:bg-orange-500 text-orange-700 font-semibold hover:text-white border border-orange-500 hover:border-transparent"
+            href="http://registration.advancecamp.com"
+          >
+            Register
+        </Link>
         <Link
             className="px-16 py-3 bg-transparent hover:bg-orange-500 text-orange-700 font-semibold hover:text-white border border-orange-500 hover:border-transparent"
             href="http://usscouts.org"