wrapping up launch event

reubenson · Mar 21, 2024 · 8dcf1fa · 8dcf1fa
1 parent a3f4818
commit 8dcf1fa
Show file tree

Hide file tree

Showing 8 changed files with 115 additions and 94 deletions.
diff --git a/docs/assets/index-1ce7aa4d.js b/docs/assets/index-1ce7aa4d.js
diff --git a/docs/assets/index-afc3ece7.js b/docs/assets/index-afc3ece7.js
diff --git a/docs/index.html b/docs/index.html
@@ -12,7 +12,7 @@
     <meta property="og:image" content="/images/frogcomp_riso.jpg" />
     <meta property="og:image:width" content="600" />
     <meta property="og:image:height" content="473" />
-    <script type="module" crossorigin src="/assets/index-afc3ece7.js"></script>
+    <script type="module" crossorigin src="/assets/index-1ce7aa4d.js"></script>
     <link rel="stylesheet" href="/assets/index-decbe5c9.css">
   </head>
   <body>

diff --git a/docs/stg/index-6eebc5b2.js b/docs/stg/index-6eebc5b2.js
diff --git a/docs/stg/index-eb6394c6.js b/docs/stg/index-eb6394c6.js
diff --git a/docs/stg/index.html b/docs/stg/index.html
@@ -12,7 +12,7 @@
     <meta property="og:image" content="/images/frogcomp_riso.jpg" />
     <meta property="og:image:width" content="600" />
     <meta property="og:image:height" content="473" />
-    <script type="module" crossorigin src="/stg/index-6eebc5b2.js"></script>
+    <script type="module" crossorigin src="/stg/index-eb6394c6.js"></script>
     <link rel="stylesheet" href="/stg/index-decbe5c9.css">
   </head>
   <body>

diff --git a/src/Events.svelte b/src/Events.svelte
@@ -6,20 +6,27 @@
   $: {
     mainColor = $hasStarted ? colors.darkMode.main : colors.lightMode.main;
   }
+
+  const currentDate = new Date( (new Date()).toLocaleDateString() )
   
   const upcomingEvents = events
     .filter(event => {
-      console.log('event', event);
-      console.log('new Date(event.date)', new Date(event.date));
-      return true;
-      // return new Date(event.date) >= new Date()
+      return new Date(event.date).getDate() >= currentDate.getDate()
     })
     .map(event => {
       return {
         ...event,
         date: new Date(event.date).toDateString()
       }
     });
+
+  const pastEvents = events.filter(event => new Date(event.date).getDate() < currentDate.getDate())
+    .map(event => {
+      return {
+        ...event,
+        date: new Date(event.date).toDateString()
+      }
+    });
 </script>
 
 <Section>
@@ -37,10 +44,10 @@
       {/each}
     </ul>
   {:else}
-  <p>There are no official upcoming events scheduled! But you can organize your own Frog Chorus event and use the suggestion below.</p>
+    <p>There are no official upcoming events scheduled! But you can organize your own Frog Chorus event and use the suggestion below.</p>
   {/if}
 
-  <h3 class="text-xl mt-5 border-b-2 border-{mainColor}">What to expect for a Frog Chorus event</h3>
+  <h2 class="text-xl mt-5 border-b-2 border-{mainColor}">What to expect for a Frog Chorus event</h2>
   <p>In a gathering of five or more people with smartphones running this app in a browser, consider the following actions.</p>
   <ul>
     <li>
@@ -74,5 +81,20 @@
       After a while, consider leaving the pond, either bringing your phone with you, or not.
     </li> -->
   </ul>
+
+  <h2 class="text-xl mt-5 border-b-2 border-{mainColor}">Past Events</h2>
+  {#if pastEvents.length > 0}
+    <ul class="event-list">
+      {#each pastEvents as event}
+        <li class="event-item">
+          <p>{event.date} at {event.time}</p>
+          <p class="mt-0">{event.location}</p>
+          <p>
+            {@html event.description}
+          </p>
+        </li>
+      {/each}
+    </ul>
+  {/if}
 </Section>
 
diff --git a/src/lib/Frog.ts b/src/lib/Frog.ts
@@ -562,8 +562,7 @@ export class Frog implements FrogPropsExtended {
     if (this.eagerness === 1) {
       return 1
     } else {
-      return this.calculateEagernessFactor(this.eagerness)
-      // return this.calculateEagernessFactor(this.eagerness) * this.calculateShynessFactor(this.shyness)
+      return this.calculateEagernessFactor(this.eagerness) * this.calculateShynessFactor(this.shyness)
     }
   }