added in courses

stcalica · May 13, 2024 · c008cc7 · c008cc7
1 parent 34cac93
commit c008cc7
Show file tree

Hide file tree

Showing 25 changed files with 517 additions and 140 deletions.
diff --git a/app/merit-badges/page.tsx b/app/merit-badges/page.tsx
@@ -0,0 +1,8 @@
+import type { NextPage } from "next";
+import MeritBadgePage from "@/templates/MeritBadgePage";
+
+const MeritBadges: NextPage = () => {
+    return <MeritBadgePage />;
+};
+
+export default MeritBadges;
diff --git a/app/prep/page.tsx b/app/prep/page.tsx
@@ -0,0 +1,8 @@
+import type { NextPage } from "next";
+import PrepPage from "@/templates/PrepPage";
+
+const Prep: NextPage = () => {
+    return <PrepPage />;
+};
+
+export default Prep;
diff --git a/app/trailhead/page.tsx b/app/trailhead/page.tsx
@@ -0,0 +1,8 @@
+import type { NextPage } from "next";
+import TrailheadPage from "@/templates/TrailheadPage";
+
+const Trailhead: NextPage = () => {
+    return <TrailheadPage />;
+};
+
+export default Trailhead;
diff --git a/components/Header/Dropdown/index.tsx b/components/Header/Dropdown/index.tsx
@@ -7,18 +7,43 @@ import { navigation } from "@/constants/navigation";
 type DropdownProps = {};
 
 const Dropdown = ({}: DropdownProps) => (
-  <nav className="flex justify-center space-x-10 border-b border-n-100">
-    {navigation.map((link) => ( 
-        <Link
-          className="relative flex items-center h-11 px-4 pb-1 text-2xl before:absolute before:left-0 before:right-0 before:-bottom-0.25 before:h-0.25 before:bg-n-400 before:opacity-0 before:transition-opacity hover:before:opacity-100"
-          href={link.url}
-          key={link.id}
-        >
-          {link.title}
-        </Link>
-      )
-    )}
-  </nav>
+    <nav className="flex justify-center space-x-10 border-b border-n-100">
+        {navigation.map((link) =>
+            link.dropdown ? (
+                <Menu className="group relative z-2" key={link.id} as="div">
+                    <Menu.Button className="relative flex items-center h-11 px-4 pb-1 text-74r text-white font-black">
+                        {link.title}
+                        <Icon
+                            className="ml-1 fill-primary-500 transition-transform hover-hover:group-hover:rotate-180 xl:ui-open:rotate-180"
+                            name="arrow-down"
+                        />
+                    </Menu.Button>
+                    <Menu.Items
+                        className="absolute top-full -left-4 -mt-1 px-8 py-6 bg-white space-y-4 invisible opacity-0 transition-all hover-hover:group-hover:visible hover-hover:group-hover:opacity-100 xl:ui-open:visible xl:ui-open:opacity-100"
+                        static
+                    >
+                        {link.dropdown.map((item) => (
+                            <Link
+                                className="block text-nowrap text-14r text-n-700 transition-colors hover:text-primary-500"
+                                href={item.url}
+                                key={item.id}
+                            >
+                                {item.title}
+                            </Link>
+                        ))}
+                    </Menu.Items>
+                </Menu>
+            ) : (
+                <Link
+                    className="relative flex items-center h-11 px-4 pb-1 text-74r text-white font-black before:absolute before:left-0 before:right-0 before:-bottom-0.25 before:h-0.25 before:bg-n-400 before:opacity-0 before:transition-opacity hover:before:opacity-100"
+                    href={link.url}
+                    key={link.id}
+                >
+                    {link.title}
+                </Link>
+            )
+        )}
+    </nav>
 );
 
-export default Dropdown;
+export default Dropdown;
diff --git a/components/Sidebar/index.tsx b/components/Sidebar/index.tsx
@@ -22,7 +22,7 @@ const Sidebar = ({ className, onClick }: SidebarProps) => (
           src="images/content/advcamplogo.png"
           width={100}
           height={20}
-          alt=""
+          alt="advance camp logo"
         />
       </Link>
       <button className="group" onClick={onClick}>
@@ -33,9 +33,27 @@ const Sidebar = ({ className, onClick }: SidebarProps) => (
       </button>
     </div>
     <div className="flex flex-col items-start space-y-6">
-      {navigation.map((link) => (
+    {navigation.map((link) =>
+                link.dropdown ? (
+                    <div className="" key={link.id}>
+                        <div className="py-1 text-h4-libre text-white font-black lg:text-h5">
+                            {link.title}
+                        </div>
+                        <div className="flex flex-col items-start pt-4 pl-4 space-y-6">
+                            {link.dropdown.map((item) => (
+                                <Link
+                                    className="text-h6 text-white transition-colors hover:text-primary-600"
+                                    href={item.url}
+                                    key={item.id}
+                                >
+                                    {item.title}
+                                </Link>
+                            ))}
+                        </div>
+                    </div>
+                ) : (
           <Link
-            className="py-1 text-h4-libre text-white transition-colors hover:text-orange-500"
+            className="py-1 text-h4-libre text-white font-black transition-colors hover:text-orange-500 text-bold"
             href={link.url}
             key={link.id}
           >

diff --git a/constants/navigation.tsx b/constants/navigation.tsx
@@ -14,6 +14,23 @@ export const navigation = [
         title: "Contact Us",
         url: "/contact-us",
     },
+    {
+        id: "4",
+        title: "Courses",
+        url: "/courses",
+        dropdown: [
+        {
+            id: "0",
+            title: "Trailhead",
+            url: "/trailhead",
+        },
+        {
+            id: "1",
+            title: "Merit Badges",
+            url: "/merit-badges",
+        },
+        ]
+    }
 ];
 
 export const menu = [
@@ -37,113 +54,24 @@ export const menu = [
                 title: "Leadership",
                 url: "/about-us",
             },
+            {
+                id: "4",
+                title: "courses",
+                url: "/courses",
+                dropdown: [
+                {
+                    id: "0",
+                    title: "Trailhead",
+                    url: "/trailhead",
+                },
+                {
+                    id: "1",
+                    title: "Merit Badges",
+                    url: "/merit-badges",
+                },
+                ]
+            }
         ],
     },
 
-];
-
-
-
-
-// {
-//     id: "3",
-//     title: "Camping",
-//     url: "/accomodation",
-// },
-// {
-//     id: "4",
-//     title: "Courses",
-//     dropdown: [
-//         {
-//             id: "0",
-//             title: "Merit Badge Courses",
-//             url: "/merit-badges",
-//         },
-//         {
-//             id: "1",
-//             title: "Adult Leader Training",
-//             url: "/adult-leader-training",
-//         },
-//     ],
-// },
-
-
-// {
-//     id: "2",
-//     title: "Other Page",
-//     items: [
-//         {
-//             id: "0",
-//             title: "Reservation",
-//             url: "/reservation",
-//         },
-//         {
-//             id: "1",
-//             title: "Image Gallery",
-//             url: "/gallery",
-//         },
-//         {
-//             id: "2",
-//             title: "Cookie Preferences",
-//             url: "/",
-//         },
-//         {
-//             id: "3",
-//             title: "Best Rate Guarantee",
-//             url: "/",
-//         },
-//     ],
-// },
-
-// {
-//     id: "1",
-//     title: "Our Products",
-//     items: [
-//         {
-//             id: "0",
-//             title: "Essentials",
-//             url: "/",
-//         },
-//         {
-//             id: "1",
-//             title: "e-Gifting",
-//             url: "/",
-//         },
-//         {
-//             id: "2",
-//             title: "Accommodation",
-//             url: "/accommodation",
-//         },
-//         {
-//             id: "3",
-//             title: "Dining",
-//             url: "/dining",
-//         },
-//         {
-//             id: "4",
-//             title: "Spa & Fitness",
-//             url: "/wellness",
-//         },
-//         {
-//             id: "5",
-//             title: "Offers",
-//             url: "/special-offers",
-//         },
-//         {
-//             id: "6",
-//             title: "Events",
-//             url: "/wedding-and-events",
-//         },
-//     ],
-// },
-
-// {
-//     id: "3",
-//     title: "Privacy Notice",
-//     url: "/policy",
-// },
-// {
-//     id: "4",
-//     title: "Legal Noice",
-//     url: "/policy",
-// },
+];
diff --git a/public/images/.DS_Store b/public/images/.DS_Store
diff --git a/public/images/content/IMG_5419-2.jpg b/public/images/content/IMG_5419-2.jpg
diff --git a/public/images/content/young-scout.png b/public/images/content/young-scout.png
diff --git a/public/images/icons/first-aid.png b/public/images/icons/first-aid.png
diff --git a/public/images/icons/flags.png b/public/images/icons/flags.png
diff --git a/public/images/icons/knives.png b/public/images/icons/knives.png
diff --git a/public/images/icons/lashings.png b/public/images/icons/lashings.png
diff --git a/tailwind.config.ts b/tailwind.config.ts
@@ -141,7 +141,7 @@ const config: Config = {
                         {},
                 },
                 ".btn-primary": {
-                    "@apply btn bg-primary-500 text-white hover:bg-primary-700":
+                    "@apply btn bg-primary-500 text-white hover:bg-orange-700":
                         {},
                 },
                 ".btn-secondary": {
@@ -169,7 +169,7 @@ const config: Config = {
                         {},
                 },
                 ".text-h4": {
-                    "@apply text-[1.5rem] leading-[1.8rem] font-bold italic text-primary-500":
+                    "@apply text-[1.5rem] leading-[1.8rem] font-bold text-primary-500":
                         {},
                 },
                 ".text-h4-libre": {
@@ -193,27 +193,27 @@ const config: Config = {
                         {},
                 },
                 ".text-16r": {
-                    "@apply text-[1rem] leading-[1.5rem] tracking-normal":
+                    "@apply text-[1rem] leading-[1.5rem] tracking-normal text-black":
                         {},
                 },
                 ".text-16m": {
-                    "@apply text-[1rem] leading-[1.5rem] font-medium tracking-normal":
+                    "@apply text-[1rem] leading-[1.5rem] font-medium tracking-normal text-black":
                         {},
                 },
                 ".text-14r": {
-                    "@apply text-[0.875rem] leading-[1.5rem] tracking-[.03rem]":
+                    "@apply text-[0.875rem] leading-[1.5rem] tracking-[.03rem] text-black":
                         {},
                 },
                 ".text-14m": {
-                    "@apply text-[0.875rem] leading-[1.5rem] font-medium tracking-normal":
+                    "@apply text-[0.875rem] leading-[1.5rem] font-medium tracking-normal text-black":
                         {},
                 },
                 ".text-14b": {
-                    "@apply text-[0.875rem] leading-[1.375rem] font-bold tracking-normal":
+                    "@apply text-[0.875rem] leading-[1.375rem] font-bold tracking-normal text-black":
                         {},
                 },
                 ".text-subtitle": {
-                    "@apply text-[0.75rem] leading-[1.125rem] font-medium tracking-[.24em]":
+                    "@apply text-[0.75rem] leading-[1.125rem] font-medium tracking-[.24em] text-black":
                         {},
                 },
                 ".text-button": {
@@ -224,6 +224,14 @@ const config: Config = {
                     "@apply mb-6 text-subtitle uppercase text-n-500":
                         {},
                 },
+                ".icon-white": {
+                    "@apply invert brightness-200":
+                    {},
+                }, 
+                ".stations": {
+                    "@apply bg-primary-500 flex flex-col items-center justify-center p-4 rounded-lg shadow-lg transition-all hover:shadow-xl w-full xl:min-w-[200px] h-[200px] text-white" :
+                    {}
+                }
             });
             addUtilities({
                 ".tap-highlight-color": {

diff --git a/templates/Events/EventPage/Main/index.tsx b/templates/Events/EventPage/Main/index.tsx
@@ -17,7 +17,7 @@ const Main = ({ id }: MainProps) => {
                     <p>
                         Hidden Oasis Resort is the perfect destination for your
                         dream wedding on the idyllic island of Phu Quoc. Located
-                        on Vinh Hy Bay, one of the world&apos;s top 50 most
+                        on Vinh Hy Bay, one of the world's top 50 most
                         beautiful beaches, our resort offers a serene and
                         breathtaking backdrop for your special day.<br></br>Our
                         team of dedicated wedding planners are experts at

diff --git a/templates/HomePage/AboutUs/index.tsx b/templates/HomePage/AboutUs/index.tsx
@@ -24,6 +24,9 @@ const AboutUs = ({}: AboutUsProps) => (
           <h3>September 27-28, 2024 | Solano County Fairgrounds</h3>
         </div>
         <div className="flex-col gap-2 text-1xl text-black">
+          <div className="mb-8 text-justify">
+          AdvanceCamp provides scouts with the opportunity to complete advancement begun at another scout event, to start and complete advancement with the completion of all requirements during the camp, or to begin work on and make a contact with a counselor to complete a merit badge at a later time.
+          </div>
           <div className="mb-8 text-justify">
           Since its inception in 1998, AdvanceCamp has served over 30,000
             Scouts, providing a platform for them to complete partials for
@@ -33,17 +36,17 @@ const AboutUs = ({}: AboutUsProps) => (
           <div className="mb-8 font-bold text-justify text-font-header">
             Mark your calendars for the 24th AdvanceCamp, taking place on
             September 27-28, 2024 at the Solano County Fairgrounds.  
-            <h2 className={"text-black font-bold"}>Registration opens June 1st.</h2>
+            <h2 className="text-black font-bold">Registration opens June 1st.</h2>
           </div>
-          <div className="mb-8">
+          <div>
+            <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="https://registration.advancecamp.com"
+            >
+              Register
+          </Link>
           </div>
         </div>
-        <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=""
-        >
-          Register
-        </Link>
       </div>
     </div>
   </div>