Merge branch 'main' into play/style-directive-1

EthanThatOneKid · Mar 26, 2022 · 8a4b66e · 8a4b66e
2 parents 921557f + 3e3d89c
commit 8a4b66e
Show file tree

Hide file tree

Showing 32 changed files with 328 additions and 83 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/lib/components/about/officer-profile.svelte b/src/lib/components/about/officer-profile.svelte
@@ -11,9 +11,9 @@
   const officerPicture = info.picture ?? placeholderPicture;
 
   $: titleHTML = info.positions[VISIBLE_TERMS[$termIndex]].title
-    .replace(/Create/, `<span class="brand-em brand-pink">Create</span>`)
-    .replace(/Algo/, `<span class="brand-em brand-purple">Algo</span>`)
-    .replace(/Dev/, `<span class="brand-em brand-bluer">Dev</span>`)
+    .replace(/Create\s/, `<span class="brand-em brand-pink">Create </span>`)
+    .replace(/Algo\s/, `<span class="brand-em brand-purple">Algo </span>`)
+    .replace(/Dev\s/, `<span class="brand-em brand-bluer">Dev </span>`)
     .replace(
       /NodeBuds/,
       `<span class="headers">node<span class="brand-em brand-red">Buds</span></span>`

diff --git a/src/lib/components/events/event-item.svelte b/src/lib/components/events/event-item.svelte
@@ -293,6 +293,7 @@
     .action-item {
       --size: 40px;
 
+      color: var(--highlights);
       width: var(--size);
       height: var(--size);
       padding: calc(var(--size) * 0.15);

diff --git a/src/lib/components/icons/discord.svelte b/src/lib/components/icons/discord.svelte
@@ -2,12 +2,12 @@
   <g clip-path="url(#clip0)">
     <path
       d="M60.1045 4.8978C55.5792 2.8214 50.7265 1.2916 45.6527 0.41542C45.5603 0.39851 45.468 0.440769 45.4204 0.525289C44.7963 1.6353 44.105 3.0834 43.6209 4.2216C38.1637 3.4046 32.7345 3.4046 27.3892 4.2216C26.905 3.0581 26.1886 1.6353 25.5617 0.525289C25.5141 0.443589 25.4218 0.40133 25.3294 0.41542C20.2584 1.2888 15.4057 2.8186 10.8776 4.8978C10.8384 4.9147 10.8048 4.9429 10.7825 4.9795C1.57795 18.7309 -0.943561 32.1443 0.293408 45.3914C0.299005 45.4562 0.335386 45.5182 0.385761 45.5576C6.45866 50.0174 12.3413 52.7249 18.1147 54.5195C18.2071 54.5477 18.305 54.5139 18.3638 54.4378C19.7295 52.5728 20.9469 50.6063 21.9907 48.5383C22.0523 48.4172 21.9935 48.2735 21.8676 48.2256C19.9366 47.4931 18.0979 46.6 16.3292 45.5858C16.1893 45.5041 16.1781 45.304 16.3068 45.2082C16.679 44.9293 17.0513 44.6391 17.4067 44.3461C17.471 44.2926 17.5606 44.2813 17.6362 44.3151C29.2558 49.6202 41.8354 49.6202 53.3179 44.3151C53.3935 44.2785 53.4831 44.2898 53.5502 44.3433C53.9057 44.6363 54.2779 44.9293 54.6529 45.2082C54.7816 45.304 54.7732 45.5041 54.6333 45.5858C52.8646 46.6197 51.0259 47.4931 49.0921 48.2228C48.9662 48.2707 48.9102 48.4172 48.9718 48.5383C50.038 50.6034 51.2554 52.5699 52.5959 54.435C52.6519 54.5139 52.7526 54.5477 52.845 54.5195C58.6464 52.7249 64.529 50.0174 70.6019 45.5576C70.6551 45.5182 70.6887 45.459 70.6943 45.3942C72.1747 30.0791 68.2147 16.7757 60.1968 4.9823C60.1772 4.9429 60.1437 4.9147 60.1045 4.8978ZM23.7259 37.3253C20.2276 37.3253 17.3451 34.1136 17.3451 30.1693C17.3451 26.225 20.1717 23.0133 23.7259 23.0133C27.308 23.0133 30.1626 26.2532 30.1066 30.1693C30.1066 34.1136 27.28 37.3253 23.7259 37.3253ZM47.3178 37.3253C43.8196 37.3253 40.9371 34.1136 40.9371 30.1693C40.9371 26.225 43.7636 23.0133 47.3178 23.0133C50.9 23.0133 53.7545 26.2532 53.6986 30.1693C53.6986 34.1136 50.9 37.3253 47.3178 37.3253Z"
-      fill="#ffffff"
+      fill="currentColor"
     />
   </g>
   <defs>
     <clipPath id="clip0">
-      <rect width="71" height="55" fill="white" />
+      <rect width="71" height="55" fill="currentColor" />
     </clipPath>
   </defs>
 </svg>
diff --git a/src/lib/components/icons/github.svelte b/src/lib/components/icons/github.svelte
@@ -6,7 +6,7 @@
   fill="none"
   xmlns="http://www.w3.org/2000/svg"
   ><path
-    fill="white"
+    fill="currentColor"
     d="M12 .297c-6.63 0-12 5.373-12 12 0 5.303 3.438 9.8 8.205 11.385.6.113.82-.258.82-.577 0-.285-.01-1.04-.015-2.04-3.338.724-4.042-1.61-4.042-1.61C4.422 18.07 3.633 17.7 3.633 17.7c-1.087-.744.084-.729.084-.729 1.205.084 1.838 1.236 1.838 1.236 1.07 1.835 2.809 1.305 3.495.998.108-.776.417-1.305.76-1.605-2.665-.3-5.466-1.332-5.466-5.93 0-1.31.465-2.38 1.235-3.22-.135-.303-.54-1.523.105-3.176 0 0 1.005-.322 3.3 1.23.96-.267 1.98-.399 3-.405 1.02.006 2.04.138 3 .405 2.28-1.552 3.285-1.23 3.285-1.23.645 1.653.24 2.873.12 3.176.765.84 1.23 1.91 1.23 3.22 0 4.61-2.805 5.625-5.475 5.92.42.36.81 1.096.81 2.22 0 1.606-.015 2.896-.015 3.286 0 .315.21.69.825.57C20.565 22.092 24 17.592 24 12.297c0-6.627-5.373-12-12-12"
   /></svg
 >
diff --git a/src/lib/components/icons/google-calendar.svelte b/src/lib/components/icons/google-calendar.svelte
@@ -1,5 +1,6 @@
 <svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"
   ><path
+    stroke="currentColor"
     d="M18.316 5.684H24v12.632h-5.684V5.684zM5.684 24h12.632v-5.684H5.684V24zM18.316 5.684V0H1.895A1.894 1.894 0 0 0 0 1.895v16.421h5.684V5.684h12.632zm-7.207 6.25v-.065c.272-.144.5-.349.687-.617s.279-.595.279-.982c0-.379-.099-.72-.3-1.025a2.05 2.05 0 0 0-.832-.714 2.703 2.703 0 0 0-1.197-.257c-.6 0-1.094.156-1.481.467-.386.311-.65.671-.793 1.078l1.085.452c.086-.249.224-.461.413-.633.189-.172.445-.257.767-.257.33 0 .602.088.816.264a.86.86 0 0 1 .322.703c0 .33-.12.589-.36.778-.24.19-.535.284-.886.284h-.567v1.085h.633c.407 0 .748.109 1.02.327.272.218.407.499.407.843 0 .336-.129.614-.387.832s-.565.327-.924.327c-.351 0-.651-.103-.897-.311-.248-.208-.422-.502-.521-.881l-1.096.452c.178.616.505 1.082.977 1.401.472.319.984.478 1.538.477a2.84 2.84 0 0 0 1.293-.291c.382-.193.684-.458.902-.794.218-.336.327-.72.327-1.149 0-.429-.115-.797-.344-1.105a2.067 2.067 0 0 0-.881-.689zm2.093-1.931l.602.913L15 10.045v5.744h1.187V8.446h-.827l-2.158 1.557zM22.105 0h-3.289v5.184H24V1.895A1.894 1.894 0 0 0 22.105 0zm-3.289 23.5l4.684-4.684h-4.684V23.5zM0 22.105C0 23.152.848 24 1.895 24h3.289v-5.184H0v3.289z"
   /></svg
 >
diff --git a/src/lib/components/icons/ms-office.svelte b/src/lib/components/icons/ms-office.svelte
@@ -1,5 +1,6 @@
 <svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"
   ><path
+    stroke="currentColor"
     d="M21.53 4.306v15.363q0 .807-.472 1.433-.472.627-1.253.85l-6.888 1.974q-.136.037-.29.055-.156.019-.293.019-.396 0-.72-.105-.321-.106-.656-.292l-4.505-2.544q-.248-.137-.391-.366-.143-.23-.143-.515 0-.434.304-.738.304-.305.739-.305h5.831V4.964l-4.38 1.563q-.533.187-.856.658-.322.472-.322 1.03v8.078q0 .496-.248.912-.25.416-.683.651l-2.072 1.13q-.286.148-.571.148-.497 0-.844-.347-.348-.347-.348-.844V6.563q0-.62.33-1.19.328-.571.874-.881L11.07.285q.248-.136.534-.21.285-.075.57-.075.211 0 .38.031.166.031.364.093l6.888 1.899q.384.11.7.329.317.217.547.52.23.305.353.67.125.367.125.764zm-1.588 15.363V4.306q0-.273-.16-.478-.163-.204-.423-.28l-3.388-.93q-.397-.111-.794-.23-.397-.117-.794-.216v19.68l4.976-1.427q.26-.074.422-.28.161-.204.161-.477z"
   /></svg
 >
diff --git a/src/lib/components/icons/ms-outlook.svelte b/src/lib/components/icons/ms-outlook.svelte
@@ -1,5 +1,6 @@
 <svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"
   ><path
+    stroke="currentColor"
     d="M7.88 12.04q0 .45-.11.87-.1.41-.33.74-.22.33-.58.52-.37.2-.87.2t-.85-.2q-.35-.21-.57-.55-.22-.33-.33-.75-.1-.42-.1-.86t.1-.87q.1-.43.34-.76.22-.34.59-.54.36-.2.87-.2t.86.2q.35.21.57.55.22.34.31.77.1.43.1.88zM24 12v9.38q0 .46-.33.8-.33.32-.8.32H7.13q-.46 0-.8-.33-.32-.33-.32-.8V18H1q-.41 0-.7-.3-.3-.29-.3-.7V7q0-.41.3-.7Q.58 6 1 6h6.5V2.55q0-.44.3-.75.3-.3.75-.3h12.9q.44 0 .75.3.3.3.3.75V10.85l1.24.72h.01q.1.07.18.18.07.12.07.25zm-6-8.25v3h3v-3zm0 4.5v3h3v-3zm0 4.5v1.83l3.05-1.83zm-5.25-9v3h3.75v-3zm0 4.5v3h3.75v-3zm0 4.5v2.03l2.41 1.5 1.34-.8v-2.73zM9 3.75V6h2l.13.01.12.04v-2.3zM5.98 15.98q.9 0 1.6-.3.7-.32 1.19-.86.48-.55.73-1.28.25-.74.25-1.61 0-.83-.25-1.55-.24-.71-.71-1.24t-1.15-.83q-.68-.3-1.55-.3-.92 0-1.64.3-.71.3-1.2.85-.5.54-.75 1.3-.25.74-.25 1.63 0 .85.26 1.56.26.72.74 1.23.48.52 1.17.81.69.3 1.56.3zM7.5 21h12.39L12 16.08V17q0 .41-.3.7-.29.3-.7.3H7.5zm15-.13v-7.24l-5.9 3.54Z"
   /></svg
 >
diff --git a/src/lib/components/icons/yahoo.svelte b/src/lib/components/icons/yahoo.svelte
@@ -1,5 +1,6 @@
 <svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"
   ><path
+    stroke="currentColor"
     d="M18.86 1.56L14.27 11.87H19.4L24 1.56H18.86M0 6.71L5.15 18.27L3.3 22.44H7.83L14.69 6.71H10.19L7.39 13.44L4.62 6.71H0M15.62 12.87C13.95 12.87 12.71 14.12 12.71 15.58C12.71 17 13.91 18.19 15.5 18.19C17.18 18.19 18.43 16.96 18.43 15.5C18.43 14.03 17.23 12.87 15.62 12.87Z"
   /></svg
 >
diff --git a/src/lib/components/icons/youtube.svelte b/src/lib/components/icons/youtube.svelte
@@ -1,6 +1,6 @@
 <svg width="64" height="49" viewBox="0 0 64 49" fill="none" xmlns="http://www.w3.org/2000/svg">
   <path
     d="M63.5798 10.5987C63.5798 4.97375 59.4423 0.44875 54.3298 0.44875C47.4048 0.125 40.3423 0 33.1248 0H30.8748C23.6748 0 16.5998 0.125 9.67478 0.45C4.57478 0.45 0.437284 5 0.437284 10.625C0.124784 15.0737 -0.00771643 19.5238 -0.000216427 23.9737C-0.0127164 28.4237 0.12895 32.8779 0.424784 37.3363C0.424784 42.9613 4.56228 47.5238 9.66228 47.5238C16.9373 47.8613 24.3998 48.0112 31.9873 47.9987C39.5873 48.0238 47.0289 47.8654 54.3123 47.5238C59.4248 47.5238 63.5623 42.9613 63.5623 37.3363C63.8623 32.8737 63.9998 28.4237 63.9873 23.9613C64.0156 19.5112 63.8798 15.0571 63.5798 10.5987ZM25.8748 36.2363V11.6737L43.9998 23.9487L25.8748 36.2363Z"
-    fill="white"
+    fill="currentColor"
   />
 </svg>
diff --git a/src/lib/components/index/hero.svelte b/src/lib/components/index/hero.svelte
@@ -1,11 +1,29 @@
-<script>
+<script lang="ts">
   import AcmButton from '$lib/components/utils/acm-button.svelte';
+
+  let num = 0;
+  export let photo = 'assets/png/hero-illustration.png';
+
+  function click() {
+    num++;
+    if (num == 3) {
+      photo = 'assets/png/hero-new.png';
+      /* There's a better way to do this but I've never read the Svelte docs LOL */
+      document.getElementById('txt').innerHTML = `
+        <div style="display: flex; flex-direction: column;">
+          <h4 class="headers size-md">EVERYONE BOW TO OUR PRESIDENT</h4>
+          <h3 class="brand-em brand-blue">AARON IS 21 YEARS OLD</h3> 
+          <p class="brand-med size-sm">HAPPY BIRTHDAY 👑 - ACM board :)</p>
+        </div>
+      `;
+    }
+  }
 </script>
 
 <section>
   <div class="container">
     <div class="left-content">
-      <div class="main-text headers size-xl">
+      <div class="main-text headers size-xl" id="txt" on:click={click}>
         We are the largest tech community at
         <span class="brand-em brand-blue">CSUF</span>
       </div>
@@ -14,7 +32,8 @@
     </div>
 
     <img
-      src="assets/png/hero-illustration.png"
+      src={photo}
+      id="image"
       alt="Frank the shark (ACM CSUF's mascot) is holding a flag that says 'I ♥ ACM'"
     />
   </div>
@@ -40,7 +59,7 @@
       justify-content: center;
 
       .main-text {
-        max-width: 570px;
+        max-width: 650px;
       }
     }
 

diff --git a/src/lib/components/sections/footer.svelte b/src/lib/components/sections/footer.svelte
@@ -1,14 +1,20 @@
 <script lang="ts">
-  import Instagram from '../icons/instagram.svelte';
-  import Discord from '../icons/discord.svelte';
-  import Youtube from '../icons/youtube.svelte';
-  import Linkedin from '../icons/linkedin.svelte';
+  import { onMount } from 'svelte';
+  import Instagram from '$lib/components/icons/instagram.svelte';
+  import Discord from '$lib/components/icons/discord.svelte';
+  import Youtube from '$lib/components/icons/youtube.svelte';
+  import Linkedin from '$lib/components/icons/linkedin.svelte';
+  import AcmToggle from '$lib/components/utils/acm-toggle.svelte';
+  import { AcmTheme, theme } from '$lib/stores/theme';
+
+  let jsEnabled = false;
+  onMount(() => (jsEnabled = true));
 </script>
 
 <footer>
   <div class="container">
     <div class="left">
-      <h1 class="headers brand-light">Stay connected</h1>
+      <h1 class="headers footer-text">Stay connected</h1>
 
       <div class="socials">
         <span>
@@ -39,30 +45,30 @@
 
     <div class="mid">
       <div class="top">
-        <h1 class="brand-med brand-light">
+        <h1 class="brand-med footer-text">
           &copy; 2022
-          <span class="headers brand-light">
-            acm<span class="brand-em brand-light">CSUF</span>
+          <span class="headers footer-text">
+            acm<span class="brand-em footer-text">CSUF</span>
           </span>
         </h1>
 
-        <div class="links brand-light">
-          <a href="/privacy" class="brand-light" rel="noopener noreferrer"> frankBot Privacy </a>
+        <div class="links footer-text">
+          <a href="/privacy" class="footer-text" rel="noopener noreferrer"> frankBot Privacy </a>
 
           /
 
-          <a href="/bug" class="brand-light" target="_blank" rel="noopener noreferrer">
+          <a href="/bug" class="footer-text" target="_blank" rel="noopener noreferrer">
             Report a Bug
           </a>
         </div>
       </div>
 
       <div class="bottom">
-        <h2 class="headers brand-light">Get in touch</h2>
+        <h2 class="headers footer-text">Get in touch</h2>
 
         <a
           href="mailto:acmcsufullerton@gmail.com"
-          class="brand-light"
+          class="footer-text"
           target="_blank"
           rel="noopener noreferrer"
         >
@@ -72,38 +78,56 @@
     </div>
 
     <div class="right">
-      <h1 class="headers brand-light">More from us</h1>
+      <h1 class="headers footer-text">More from us</h1>
 
       <div class="links">
         <span>
-          <a href="/blog" class="brand-light" rel="noopener noreferrer">Blog</a>
+          <a href="/blog" class="footer-text" rel="noopener noreferrer">Blog</a>
         </span>
 
         <span>
-          <a href="/covid-19" class="brand-light" target="_blank" rel="noopener noreferrer">
+          <a href="/covid-19" class="footer-text" target="_blank" rel="noopener noreferrer">
             COVID-19 Policy
           </a>
         </span>
 
         <span>
-          <a href="/github" class="brand-light" target="_blank" rel="noopener noreferrer">
+          <a href="/github" class="footer-text" target="_blank" rel="noopener noreferrer">
             Source Code
           </a>
         </span>
+
+        {#if jsEnabled}
+          <span>
+            <!-- true is dark -->
+            <AcmToggle
+              checked={$theme === AcmTheme.Dark}
+              on:toggle={(event) => ($theme = event.detail ? AcmTheme.Dark : AcmTheme.Light)}
+            >
+              <span class="footer-text darkmode-label">Darkmode</span>
+            </AcmToggle>
+          </span>
+        {/if}
       </div>
     </div>
   </div>
 </footer>
 
 <style lang="scss">
   footer {
+    --ever-white: #f8f8f8; /* does not change with theme */
+
     display: flex;
     justify-content: center;
     align-items: center;
-    background-color: var(--acm-dark);
+    background-color: var(--footer-bg);
     padding: 24px 0;
     width: 100vw;
 
+    .footer-text {
+      color: var(--ever-white);
+    }
+
     .container {
       display: flex;
       justify-content: space-between;
@@ -135,7 +159,7 @@
             }
 
             & :global(path) {
-              fill: var(--acm-light);
+              fill: var(--ever-white);
               transition: fill 0.25s ease-in-out;
             }
 
@@ -190,13 +214,15 @@
           display: flex;
           flex-direction: column;
 
-          a {
+          a,
+          .darkmode-label {
             text-decoration: none;
             font-size: 14px;
             transition: 0.25s ease-in-out;
 
             &:hover {
               color: var(--acm-blue);
+              cursor: pointer;
             }
           }
         }

diff --git a/src/lib/components/sections/navbar.svelte b/src/lib/components/sections/navbar.svelte
@@ -59,7 +59,7 @@
     z-index: 1000;
     width: 100%;
     justify-content: center;
-    background-color: var(--acm-light);
+    background-color: var(--navbar-bg);
     filter: drop-shadow(0 2px 8px rgba(16, 19, 21, 0.1));
     -webkit-filter: drop-shadow(0 2px 8px rgba(16, 19, 21, 0.1));
   }
@@ -92,12 +92,14 @@
   nav .full-logomark .logo-text {
     font-size: 24px;
     padding-left: 8px;
+    color: var(--acm-dark);
   }
 
   nav .pages a {
     font-size: 18px;
     margin-left: 64px;
     transition: color 0.25s ease-in-out;
+    color: var(--acm-dark);
   }
 
   nav .page-about:hover,

diff --git a/src/lib/components/utils/acm-toggle.svelte b/src/lib/components/utils/acm-toggle.svelte
@@ -0,0 +1,22 @@
+<script lang="ts">
+  import { createEventDispatcher, onMount } from 'svelte';
+
+  export let checked: boolean;
+
+  const dispatch = createEventDispatcher();
+  let input: HTMLInputElement;
+
+  function toggle(event: Event) {
+    dispatch('toggle', (checked = (event.target as typeof input).checked));
+  }
+
+  onMount(() => {
+    input.addEventListener('change', toggle);
+    return () => input.removeEventListener('change', toggle);
+  });
+</script>
+
+<label>
+  <input type="checkbox" bind:this={input} bind:checked />
+  <slot />
+</label>
diff --git a/src/lib/constants/links.ts b/src/lib/constants/links.ts
@@ -13,4 +13,5 @@ export const links = {
     'https://github.com/EthanThatOneKid/acmcsuf.com/issues/new?assignees=&labels=enhancement&template=feature_request.yaml',
   'history-of-rss': 'https://acmcsuf.com/blog/269',
   v2: 'https://acmcsuf.com/blog/262',
+  'create-survey': 'https://forms.gle/19T4sSZiRxqxwSx58',
 } as const;