Merge branch 'dev-main' into feature-2025-frontend

hacksu · Dec 29, 2024 · 4bc8931 · 4bc8931
2 parents 7ae40aa + e668ba2
commit 4bc8931
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 80 deletions.
diff --git a/public-frontend/src/components/faq.vue b/public-frontend/src/components/faq.vue
@@ -25,50 +25,45 @@ export default {
         {
           id: 0,
           question: "What is a hackathon?",
-          answer:
-            `A hackathon is a weekend-long event to meet smart creative people, make connections, learn, and build something awesome! 
+          answer: `A hackathon is a weekend-long event to meet smart creative people, make connections, learn, and build something awesome!
 
-            Attendees meet on Saturday, make a team, and have 24 hours to build a tech-related project. 
-            There will be optional lessons and talks, sponsors looking to hire smart, motivated people, and tons of free stuff!`
+            Attendees meet on Saturday, make a team, and have 24 hours to build a tech-related project.
+            There will be optional lessons and talks, sponsors looking to hire smart, motivated people, and tons of free stuff!`,
         },
         {
           id: 1,
           question: "Can I participate?",
-          answer:
-            `If you're a college student of any kind, then yes! 
-            KHE is attended by people of all skill levels and backgrounds. 
-            You'll fit right in and hopefully, learn something!`
+          answer: `If you're a college student of any kind, then yes!
+            KHE is attended by people of all skill levels and backgrounds.
+            You'll fit right in and hopefully, learn something!`,
         },
         {
           id: 2,
           question: "Sounds cool, but how much does it cost?",
-          answer:
-            `$0.00!
-            
-            Thanks to the generosity of our sponsors, we're able to put on events like this for <i>free</i>.  
-            We even pay for your meals for the weekend!  
-            Make sure to thank our sponsors - we couldn't do it without them!`
+          answer: `$0.00!
+
+            Thanks to the generosity of our sponsors, we're able to put on events like this for <i>free</i>.
+            We even pay for your meals for the weekend!
+            Make sure to thank our sponsors - we couldn't do it without them!`,
         },
         {
           id: 3,
           question: "What should I bring?",
-          answer:
-            `Bring a laptop/something to hack on, a change of clothes, deodorant, a blanket/pillow, toiletries, 
-            and anything else you think you might use to complete your project.`
+          answer: `Bring a laptop/something to hack on, a change of clothes, deodorant, a blanket/pillow, toiletries,
+            and anything else you think you might use to complete your project.`,
         },
         {
           id: 4,
           question: "Do I need to come with a team?",
           answer:
-            "You can, but you don't have to! We'll have team building at the event."
+            "You can, but you don't have to! We'll have team building at the event.",
         },
         {
           id: 5,
           question: "How many people per team?",
-          answer:
-            "There's no hard limit, but the prizes are meant for teams of 4, so that's what we recommend."
-        }
-      ]
+          answer: "There's a hard limit of 4 participants per team.",
+        },
+      ],
     };
   },
 };

diff --git a/public-frontend/src/components/landing.vue b/public-frontend/src/components/landing.vue
@@ -8,16 +8,10 @@
       <div class="date-container">
         <p id="date">KHE returns February 15-16, 2025</p>
       </div>
-      <div id="email-input-container">
-        <span id="email-input-label">Sign up to get registration information:</span>
-        <div id="email-input">
-          <span id="thank-you-message" v-if="updatesEmailSubmitted">Thank you 💖</span>
-          <input @keyup.enter="submitEmail" type="email" :disabled="updatesEmailSubmitted"
-            :placeholder="updatesEmailPlaceholder || '[email protected]'" v-model="updatesEmail" />
-          <button @click="submitEmail" :disabled="updatesEmailSubmitted">
-            <span :class="{ rocketing: updatesEmailSubmitted }">🚀</span>
-          </button>
-        </div>
+      <div id="register-container">
+        <a id="register-input" href="https://forms.gle/gmfLRrDMnvbSk9dZA" target="_blank">
+          But you can apply now 🚀
+        </a>
         <span v-if="updatesEmailError" style="font-size: small; color: red">{{ updatesEmailError }}</span>
       </div>
     </div>
@@ -40,7 +34,7 @@ export default {
   },
   data: () => ({
     updatesEmail: "",
-    updatesEmailSubmitted: false,
+    updatesRegistrationSubmitted: false,
     updatesEmailError: "",
     updatesEmailPlaceholder: "",
     //the boolean below determines whether the page displays email input or a register button
@@ -169,7 +163,7 @@ $text-color: #bdbdbd;
   animation-duration: 0.5s;
 }
 
-#email-input-container {
+#register-container {
   & * {
     box-sizing: border-box;
   }
@@ -182,62 +176,26 @@ $text-color: #bdbdbd;
   margin: 1.5vh auto;
   font-size: 1.25em;
 
-  #email-input-label {
-    display: block;
-    margin: 14px 8px;
-    color: $text-color;
-    font-size: 1.2em;
-  }
-
-  #email-input {
+  #register-input {
     display: flex;
     height: 40px;
     border-radius: 5px;
     overflow: clip;
     position: relative;
+    justify-content: center;
+    align-items: center;
 
-    #thank-you-message {
-      position: absolute;
-      left: 0;
-      top: 0;
-      font-size: 20px;
-      padding: 5px;
-      color: $text-color;
-      height: 40px;
-      width: 100%;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-    }
+    color: black;
+    text-decoration: none;
+    transition: background-color 0.25s;
+    background-color: lightgray;
 
-    input {
-      width: 100%;
-      height: 100%;
-      border-radius: 0;
-      border: none;
-      font-size: 20px;
-      padding: 5px;
+    &:disabled {
       background-color: white;
-
-      &:disabled {
-        color: white;
-        @include fadeOutInput;
-      }
+      @include fadeOutInput;
     }
 
-    button {
-      width: 45px;
-      height: 100%;
-      border-radius: 0;
-      border: none;
-      transition: background-color 0.25s;
-      background-color: lightgray;
-
-      &:disabled {
-        background-color: white;
-        @include fadeOutInput;
-      }
-    }
+
   }
 }
 

diff --git a/public-frontend/src/components/map.vue b/public-frontend/src/components/map.vue
@@ -31,6 +31,11 @@
         <iframe id="mapIframe" src="https://map.concept3d.com/?id=568&tbh&sbh#!m/613809?lh/?ct/44418,5603" scrolling="no"
           frameborder="0" style="border: 0" @load="reset"></iframe>
       </div>
+      <div style="text-align: center;">
+        <a id="small-mlh-logo" href="https://github.com/MLH/mlh-policies/blob/main/code-of-conduct.md" style="text-align: center;">
+          <span id="code-of-conduct-text" style="text-align: center;">MLH Code of Conduct</span>
+        </a>
+      </div>
     </div>
   </div>
 </template>