From 5794070e8c560de96281dacda59fa1eb5832c868 Mon Sep 17 00:00:00 2001
From: Unknown <53575465+EndlessEevee@users.noreply.github.com>
Date: Thu, 15 Aug 2024 17:51:05 -0700
Subject: [PATCH 1/8] Update jekyll-gh-pages.yml


From cf5a8dbd77e4884e7d7f3cc1cc94c65d0104ee7a Mon Sep 17 00:00:00 2001
From: Unknown <53575465+EndlessEevee@users.noreply.github.com>
Date: Thu, 15 Aug 2024 17:52:07 -0700
Subject: [PATCH 2/8] Update CNAME

---
 CNAME | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CNAME b/CNAME
index 66641d4..0e89e54 100644
--- a/CNAME
+++ b/CNAME
@@ -1 +1 @@
-https://teamparadise1165.com
+https://teamparadise.masoncucci.com

From 82201f8ef4f0ba562f925696d06aa98ef1247623 Mon Sep 17 00:00:00 2001
From: Unknown <53575465+EndlessEevee@users.noreply.github.com>
Date: Fri, 23 Aug 2024 16:48:19 -0700
Subject: [PATCH 3/8] Update index.html

---
 index.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/index.html b/index.html
index 65cc651..f4cf170 100644
--- a/index.html
+++ b/index.html
@@ -169,13 +169,13 @@
                         <section id="officers">
                             <ul class="leaders-list">
                                 <li>
-                                    <div>Aila Jamakovic</div>
+                                    <div>Aneesa Napoli</div>
                                     <span> President </span>
                                 </li>
-                                <li>
-                                    <div>Aneesa Napoli</div>
+                                <!-- <li>
+                                    <div></div>
                                     <span> Vice President </span>
-                                </li>
+                                </li> -->
                                 <li>
                                     <div>Mason Cucci</div>
                                     <span> Treasurer </span>

From d1ba889726b0df8de8f4506978404215fa37926c Mon Sep 17 00:00:00 2001
From: Unknown <53575465+EndlessEevee@users.noreply.github.com>
Date: Mon, 16 Sep 2024 11:46:35 -0700
Subject: [PATCH 4/8] Shop tetsing

---
 Pages/donate.html | 23 +++++++++++------------
 Pages/shop.html   | 43 +++++++++++++++++++++++++++++--------------
 Pages/style.css   |  2 +-
 3 files changed, 41 insertions(+), 27 deletions(-)

diff --git a/Pages/donate.html b/Pages/donate.html
index 65f94bc..003f826 100644
--- a/Pages/donate.html
+++ b/Pages/donate.html
@@ -26,21 +26,20 @@
         </script>
     </head>
 
-    <body>
+    <body class="flex flex-col min-h-screen">
         <!--Navigation Bar-->
-        <div id="navbar"></div>
+        <header id="navbar" class="mb-16"></header>
 
         <!-- Body -->
-        <div class="Title-Container">
-            <h1 class="page-title" style="width: 100%; text-align: center">
-                Donate
-            </h1>
-            <img
-                src="/Resources/Icons/Pencil-icon.png"
-                id="TeamIcon"
-                alt="Team Icon"
-            />
-        </div>
+        <main class="flex-grow flex flex-col">
+            <div class="flex justify-center items-center">
+                <h1 class="text-3xl font-bold px-4">Donate</h1>
+                <img
+                    src="/Resources/Icons/Pencil-icon.png"
+                    class="w-20"
+                    alt="Team Icon"
+                />
+            </div>
 
         <div class="UnderConstruction">
             This section is under construction...
diff --git a/Pages/shop.html b/Pages/shop.html
index e951b15..f9954cb 100644
--- a/Pages/shop.html
+++ b/Pages/shop.html
@@ -26,24 +26,39 @@
         </script>
     </head>
 
-    <body>
+    <body class="flex flex-col min-h-screen">
         <!--Navigation Bar-->
-        <div id="navbar"></div>
+        <header id="navbar" class="mb-16"></header>
 
         <!-- Body -->
-        <div class="Title-Container">
-            <h1 class="page-title" style="width: 100%; text-align: center">
-                Shop
-            </h1>
-            <img
-                src="/Resources/Icons/team-icon.png"
-                id="TeamIcon"
-                alt="Team Icon"
-            />
-        </div>
+        <main class="flex-grow flex flex-col">
+            <div class="flex justify-center items-center">
+                <h1 class="text-3xl font-bold px-4">Shop</h1>
+                <img
+                    src="/Resources/Icons/team-icon.png"
+                    class="w-20"
+                    alt="Team Icon"
+                />
+            </div>
 
-        <div class="UnderConstruction">
-            This section is under construction...
+        <div
+            style="
+                display: flex;
+                justify-content: center;
+                text-align: center;
+                padding-top: 5%;
+                padding-bottom: 8%;
+            "
+        >
+            <iframe
+                title="Donation form powered by Zeffy"
+                style="border-width: 0"
+                width="800"
+                height="600"
+                src="https://www.zeffy.com/embed/ticketing/78ec0d8d-12a7-4f4a-9b97-7c9beea43fd5"
+                allowpaymentrequest
+                allowTransparency="true"
+            ></iframe>
         </div>
 
         <!-- Footer -->
diff --git a/Pages/style.css b/Pages/style.css
index 59e9393..0aa9017 100644
--- a/Pages/style.css
+++ b/Pages/style.css
@@ -54,7 +54,7 @@ main {
 
 .logo-container #Logo-Image {
     position: fixed;
-    z-index: 0;
+    z-index: 1;
     width: auto;
     height: auto;
     max-width: calc(60vw);

From d03a75ef1614cad4f1017cb54657ba339dc91012 Mon Sep 17 00:00:00 2001
From: Unknown <53575465+EndlessEevee@users.noreply.github.com>
Date: Thu, 19 Sep 2024 09:56:01 -0700
Subject: [PATCH 5/8] Added Shop

---
 Pages/shop.html | 46 ++++++++++++++++++++++++++--------------------
 Pages/style.css |  8 ++++++++
 2 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/Pages/shop.html b/Pages/shop.html
index f9954cb..f6fcfae 100644
--- a/Pages/shop.html
+++ b/Pages/shop.html
@@ -40,26 +40,32 @@
                     alt="Team Icon"
                 />
             </div>
-
-        <div
-            style="
-                display: flex;
-                justify-content: center;
-                text-align: center;
-                padding-top: 5%;
-                padding-bottom: 8%;
-            "
-        >
-            <iframe
-                title="Donation form powered by Zeffy"
-                style="border-width: 0"
-                width="800"
-                height="600"
-                src="https://www.zeffy.com/embed/ticketing/78ec0d8d-12a7-4f4a-9b97-7c9beea43fd5"
-                allowpaymentrequest
-                allowTransparency="true"
-            ></iframe>
-        </div>
+            <div class="flex-grow relative overflow-auto">
+                <iframe
+                    class="w-full p-4"
+                    src="https://www.zeffy.com/embed/ticketing/78ec0d8d-12a7-4f4a-9b97-7c9beea43fd5"
+                    style="border: 0; overflow: hidden"
+                    frameborder="0"
+                    allowpaymentrequest
+                    allowTransparency="true"
+                    id="shopIframe"
+                ></iframe>
+            </div>
+            <script>
+                const iframe = document.getElementById("shopIframe");
+                iframe.onload = function () {
+                    setIframeHeight();
+                    // Optionally, recheck the height every 1 second (1000ms) if the content might change dynamically.
+                    setInterval(setIframeHeight, 1000);
+                };
+                function setIframeHeight() {
+                    const iframeDocument =
+                        iframe.contentDocument || iframe.contentWindow.document;
+                    iframe.style.height =
+                        iframeDocument.documentElement.scrollHeight + "px";
+                }
+            </script>
+        </main>
 
         <!-- Footer -->
         <div id="socials"></div>
diff --git a/Pages/style.css b/Pages/style.css
index 0aa9017..d99ed30 100644
--- a/Pages/style.css
+++ b/Pages/style.css
@@ -266,7 +266,15 @@ main {
     -webkit-background-clip: text;
     -webkit-text-fill-color: transparent;
 }
+#shopIframe {
+    width: 100%;
+    border: none;
+}
 
+#iframeContainer {
+    height: 100%;
+    overflow: auto;
+}
 /*Mobile*/
 @media screen and (max-width: 1000px) {
     /* comes into effect for screens larger than or equal to 481 pixels */

From f568ea8494be5cfa66ec8da93f26b0c2b348c001 Mon Sep 17 00:00:00 2001
From: Unknown <53575465+EndlessEevee@users.noreply.github.com>
Date: Thu, 19 Sep 2024 10:07:02 -0700
Subject: [PATCH 6/8] Shop testing

---
 Pages/shop.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Pages/shop.html b/Pages/shop.html
index f6fcfae..f382d95 100644
--- a/Pages/shop.html
+++ b/Pages/shop.html
@@ -40,7 +40,7 @@
                     alt="Team Icon"
                 />
             </div>
-            <div class="flex-grow relative overflow-auto">
+            <div class="flex-grow relative overflow-auto" id="iframeContainer">
                 <iframe
                     class="w-full p-4"
                     src="https://www.zeffy.com/embed/ticketing/78ec0d8d-12a7-4f4a-9b97-7c9beea43fd5"

From e15fd53ba8a016577c96c67a6915baa414829b10 Mon Sep 17 00:00:00 2001
From: Unknown <53575465+EndlessEevee@users.noreply.github.com>
Date: Thu, 19 Sep 2024 13:40:03 -0700
Subject: [PATCH 7/8] aston please make it work

---
 Pages/shop.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Pages/shop.html b/Pages/shop.html
index f382d95..0843a08 100644
--- a/Pages/shop.html
+++ b/Pages/shop.html
@@ -42,13 +42,13 @@
             </div>
             <div class="flex-grow relative overflow-auto" id="iframeContainer">
                 <iframe
+                    id="zeffyIframe"
                     class="w-full p-4"
                     src="https://www.zeffy.com/embed/ticketing/78ec0d8d-12a7-4f4a-9b97-7c9beea43fd5"
                     style="border: 0; overflow: hidden"
                     frameborder="0"
                     allowpaymentrequest
                     allowTransparency="true"
-                    id="shopIframe"
                 ></iframe>
             </div>
             <script>

From a0d2c529da8fec3c6e124530880b43847eb0e294 Mon Sep 17 00:00:00 2001
From: Unknown <53575465+EndlessEevee@users.noreply.github.com>
Date: Mon, 7 Oct 2024 14:53:15 -0700
Subject: [PATCH 8/8] Updated Officers

---
 index.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/index.html b/index.html
index 850d568..60df1b8 100644
--- a/index.html
+++ b/index.html
@@ -174,16 +174,16 @@
                                     <div>Aneesa Napoli</div>
                                     <span> President </span>
                                 </li>
-                                <!-- <li>
-                                    <div></div>
+                                <li>
+                                    <div>Abby Neil</div>
                                     <span> Vice President </span>
-                                </li> -->
+                                </li>
                                 <li>
                                     <div>Mason Cucci</div>
                                     <span> Treasurer </span>
                                 </li>
                                 <li>
-                                    <div>Abby Neil</div>
+                                    <div>Lucius Tso</div>
                                     <span> Secretary </span>
                                 </li>
                             </ul>
