Merge pull request #6 from rshewitt/develop

Develop
rshewitt · May 5, 2024 · 42c44d3 · 42c44d3
2 parents 9727f28 + 91b0eac
commit 42c44d3
Show file tree

Hide file tree

Showing 12 changed files with 212 additions and 226 deletions.
diff --git a/.github/workflows/test-deploy.yml b/.github/workflows/test-deploy.yml
@@ -10,9 +10,8 @@ jobs:
     test:
         runs-on: ubuntu-latest
         steps:
-        - name: 'Checkout'
+        - name: Checkout
           uses: actions/checkout@v4
-
         - name: Cypress Run
           uses: cypress-io/github-action@v6
           with:
@@ -22,20 +21,21 @@ jobs:
             start: npm run dev
             wait-on: "http://localhost:3000"
     deploy:
-        runs-on: ubuntu-22.04
+        runs-on: ubuntu:latest
         needs: test
         steps:
-            - name: 'Checkout'
+            - name: Checkout
               uses: actions/checkout@v4
-            - uses: actions/setup-node@v4
+            - name: Setup Node
+              uses: actions/setup-node@v4
               with:
-                node-version: "20.x"
-                cache: "npm"
-            - name: Install dependencies
+                node-version: 20.x
+                cache: npm
+            - name: Install Dependencies
               run: npm i
-            - name: Build
+            - name: Build App
               run: npm run build
-            - name: Configure AWS
+            - name: Sync to S3
               uses: aws-actions/configure-aws-credentials@v1
               with:
                 aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}

diff --git a/src/app/components/Agenda.tsx b/src/app/components/Agenda.tsx
@@ -0,0 +1,71 @@
+const CALENDAR_URL =
+    "https://calendar.google.com/calendar/event?action=TEMPLATE&tmeid=NXM5c2RnN2k4NTlnNWxlMDEzbWluM29hZnQgc2FtLmhldy5yQG0&tmsrc=sam.hew.r%40gmail.com";
+
+interface AgendaProps {
+    title?: string;
+    date?: string;
+    idx?: number;
+}
+
+const AgendaItem = ({ title, date, idx }: AgendaProps) => {
+    return (
+        <div
+            key={idx}
+            className="grid grid-cols-2 gap-4 text-center text-2xl px-4 py-4 md:py-16 md:px-0"
+        >
+            <div className="col-span-1 text-gray-400 text-left text-xl-wel font-normalBold">
+                {title}
+            </div>
+            <div className="col-span-1 text-gray-700 text-right text-xl-wel font-normalBold">
+                {date}
+            </div>
+        </div>
+    );
+};
+
+const agendaItems = [
+    {
+        title: "Mardi Gras",
+        date: "Feb 28 - March 4",
+    },
+    {
+        title: "Ceremony & Reception",
+        date: "March 8",
+    },
+    {
+        title: "Farewell Brunch",
+        date: "March 9",
+    },
+];
+const Agenda = () => {
+    return (
+        <div id="agenda_div" className="max-w-3xl mx-auto text-center">
+            <div className="mb-4 text-gray-500 font-normal">
+                Our wedding will be held on:
+            </div>
+            <h3 className="font-normalBold font-black mb-6 text-center text-gray-700">
+                March 8, 2025
+            </h3>
+            <div className="px-12 flex max-w-md mx-auto mb-10">
+                <a
+                    href={CALENDAR_URL}
+                    target={"_blank"}
+                    className="px-8 py-4 transition-all font-normal w-full rounded-lg bg-[#354834] outline-contrast-3 text-white outline-4 disabled:opacity-50 disabled:pointer-events-none cursor-pointer"
+                    rel="noreferrer"
+                >
+                    Save to calender
+                </a>
+            </div>
+
+            <div className="text-3xl-wel lg:text-5xl-wel font-squiggly text-center mb-10 pt-10 text-gray-700 px-2">
+                <h4 className="mb-1">Festivities</h4>
+            </div>
+
+            {agendaItems.map((item, idx) => (
+                <AgendaItem title={item.title} date={item.date} key={idx} />
+            ))}
+        </div>
+    );
+};
+
+export default Agenda;
diff --git a/src/app/components/Agendas.tsx b/src/app/components/Agendas.tsx
diff --git a/src/app/components/BridalParty.tsx b/src/app/components/BridalParty.tsx
@@ -1,10 +1,9 @@
 import Maddy from "../images/maddy.jpg";
 import Dima from "../images/dima.jpg";
 import Laynnae from "../images/lynnae.jpg";
-import Profile from "./Utils/Profile";
-import TextWithLine from "./Utils/TextWithLine";
+import Profile, { ProfileMinor } from "./Utils/Profile";
 
-const people = [
+const peopleMain = [
     {
         pic: Maddy,
         altVal: "maid_of_honor",
@@ -28,14 +27,36 @@ const people = [
     },
 ];
 
+const peopleMinorBride = [
+    {
+        name: "Christina Zechmeister",
+        role: "Bridesmaid",
+    },
+    {
+        name: "Laura Barnick",
+        role: "Bridesmaid",
+    },
+];
+
+const peopleMinorGroom = [
+    {
+        name: "Azeo Plescia",
+        role: "Groomsman",
+    },
+    {
+        name: "Ryan Thalken",
+        role: "Groomsman",
+    },
+];
+
 const BridalParty = () => {
     return (
         <div id="bridal_party_div" className="pt-10 pb-4">
             <div className="text-3xl-wel lg:text-5xl-wel font-squiggly text-center pt-10 text-gray-700 px-2">
                 <h4 className="mb-1">Bridal Party</h4>
             </div>
             <div className="w-full flex flex-wrap justify-center pb-10">
-                {people.map((person, idx) => (
+                {peopleMain.map((person, idx) => (
                     <Profile
                         pic={person.pic}
                         altVal={person.altVal}
@@ -48,33 +69,23 @@ const BridalParty = () => {
             </div>
             <div className="max-w-3xl mx-auto text-center">
                 <div className="grid grid-cols-1 gap-4 text-center text-2xl px-4 py-8 md:px-0 md:text-3xl font-black">
-                    <div className="col-span-1 text-center md:text-center text-xl-wel font-normalBold text-gray-800">
-                        Christina Zechmeister
-                        <div className="mb-4">
-                            <TextWithLine>Bridesmaid</TextWithLine>
-                        </div>
-                    </div>
-                    <div className="col-span-1 text-center md:text-center text-xl-wel font-normalBold text-gray-800">
-                        Laura Barnick
-                        <div className="mb-4">
-                            <TextWithLine>Bridesmaid</TextWithLine>
-                        </div>
-                    </div>
+                    {peopleMinorBride.map((person, idx) => (
+                        <ProfileMinor
+                            name={person.name}
+                            role={person.role}
+                            key={idx}
+                        />
+                    ))}
                 </div>
                 <div className="text-xl text-black">~ ~</div>
                 <div className="grid grid-cols-1 gap-4 text-center text-2xl px-4 py-8 md:py-10 md:px-0 md:text-3xl font-black">
-                    <div className="col-span-1 text-center md:text-center text-xl-wel font-normalBold text-gray-800">
-                        Azeo Plescia
-                        <div className="mb-4">
-                            <TextWithLine>Groomsman</TextWithLine>
-                        </div>
-                    </div>
-                    <div className="col-span-1 text-center md:text-center text-xl-wel font-normalBold text-gray-800">
-                        Ryan Thalken
-                        <div className="mb-4">
-                            <TextWithLine>Groomsman</TextWithLine>
-                        </div>
-                    </div>
+                    {peopleMinorGroom.map((person, idx) => (
+                        <ProfileMinor
+                            name={person.name}
+                            role={person.role}
+                            key={idx}
+                        />
+                    ))}
                 </div>
             </div>
         </div>

diff --git a/src/app/components/BrideAndGroom.tsx b/src/app/components/BrideAndGroom.tsx
@@ -1,4 +1,3 @@
-// import TextWithLine from "./Utils/TextWithLine";
 import bride from "../images/bride.jpg";
 import groom from "../images/groom.jpg";
 import Profile from "./Utils/Profile";

diff --git a/src/app/components/GalleryCarousel.tsx b/src/app/components/GalleryCarousel.tsx
@@ -8,9 +8,7 @@ import photo3 from "../images/DSC_1849.jpg";
 import photo4 from "../images/DSC_1912.jpg";
 import photo5 from "../images/DSC_1954.jpg";
 import photo6 from "../images/DSC_1931.jpg";
-import photo7 from "../images/DSC_1937.jpg";
 import photo8 from "../images/DSC_1946.jpg";
-import photo9 from "../images/DSC_1954.jpg";
 import photo10 from "../images/DSC_2005.jpg";
 import photo11 from "../images/IMG_5773.jpg";
 import photo12 from "../images/IMG_5776.jpg";
@@ -22,9 +20,7 @@ const photos = [
     photo4,
     photo5,
     photo6,
-    photo7,
     photo8,
-    photo9,
     photo10,
     photo11,
     photo12,