add events, fix timezone, update styling

app.vue

@@ -9,7 +9,6 @@
       { rel: 'icon', sizes: '16x16', href: '/favicon-16x16.png' },
       { rel: 'manifest', href: '/site.webmanifest' },
       { rel: 'mask-icon', href: '/safari-pinned-tab.svg', color: '#5bbad5' },
-      { rel: 'stylesheet', href: 'https://i.icomoon.io/public/870f1d17ba/crbtcorg/style.css' },
     ],
     meta: [
       { name: 'msapplication-TileColor', content: '#f59428' },

assets/fonts/crbtc/crbtc.svg

@@ -0,0 +1,13 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata>Generated by IcoMoon</metadata>
+<defs>
+<font id="crbtc" horiz-adv-x="1024">
+<font-face units-per-em="1024" ascent="960" descent="-64" />
+<missing-glyph horiz-adv-x="1024" />
+<glyph unicode="&#x20;" horiz-adv-x="512" d="" />
+<glyph unicode="&#xe900;" d="M1024 448c0-282.77-229.23-512-512-512s-512 229.23-512 512c0 282.77 229.23 512 512 512s512-229.23 512-512z" />
+<glyph unicode="&#xe901;" d="M484.771 781.592l-23.031-92.254c-12.226 2.785-24.221 5.536-35.869 8.431l0.061 0.285-77.485 19.346-14.946-60c0 0 41.687-9.548 40.808-10.138 22.755-5.679 26.866-20.742 26.177-32.677l-26.208-105.131c1.569-0.4 3.598-0.981 5.838-1.877-1.873 0.464-3.874 0.981-5.938 1.477l-36.738-147.285c-2.785-6.912-9.841-17.273-25.746-13.338 0.559-0.816-40.838 10.192-40.838 10.192l-27.892-64.308 73.115-18.223c13.601-3.409 26.934-6.972 40.054-10.331l-23.254-93.346 56.115-14 23.031 92.354c-0.134-0.577 14.87-4.575 29.937-8.413l14.832-3.203-22.946-91.923 56.185-14 23.246 93.169c95.802-18.129 167.848-10.816 198.169 75.823 24.436 69.76-1.218 109.998-51.623 136.238 36.707 8.46 64.354 32.604 71.731 82.477h0.008c10.193 68.127-41.688 104.753-112.623 129.185l23.015 92.285-56.185 14-22.4-89.854c-14.77 3.681-29.942 7.153-45.015 10.592l22.562 90.446zM503.217 610.792c31.717-7.903 133.851-22.654 117.354-88.846-15.841-63.455-113.608-31.218-145.323-23.315zM461.133 442.030c38.082-9.503 160.207-28.326 142.062-101.077-17.363-69.76-134.831-32.048-172.915-22.592z" />
+<glyph unicode="&#xe902;" glyph-name="btc-b" d="M483.775 884.721l-30.357-121.602c-16.115 3.671-31.927 7.297-47.28 11.113l0.080 0.375-102.134 25.501-19.701-79.087c0 0 54.949-12.585 53.79-13.364 29.994-7.486 35.413-27.34 34.504-43.072l-34.545-138.575c2.068-0.528 4.743-1.293 7.696-2.474-2.468 0.612-5.106 1.294-7.828 1.947l-48.426-194.139c-3.671-9.111-12.972-22.768-33.937-17.582 0.737-1.075-53.83 13.435-53.83 13.435l-36.766-84.765 96.375-24.020c17.928-4.493 35.502-9.19 52.796-13.617l-30.651-123.042 73.967-18.454 30.357 121.734c-0.177-0.76 19.6-6.030 39.461-11.089l19.551-4.222-30.246-121.166 74.058-18.454 30.641 122.808c126.278-23.896 221.244-14.257 261.211 99.944 32.209 91.952-1.605 144.991-68.046 179.579 48.384 11.152 84.827 42.977 94.55 108.715h0.010c13.435 89.8-54.951 138.078-148.451 170.281l30.337 121.642-74.058 18.454-29.526-118.438c-19.468 4.852-39.468 9.428-59.336 13.962l29.739 119.219zM508.089 659.585c41.807-10.417 176.433-29.86 154.687-117.11-20.88-83.641-149.749-41.15-191.554-30.733zM452.616 437.137c50.197-12.526 211.172-37.337 187.255-133.232-22.886-91.952-177.724-42.243-227.924-29.779z" />
+</font></defs></svg>

assets/style/_fonts.scss

@@ -38,54 +38,43 @@
        url('/assets/fonts/titillium-web/titillium-web-v15-latin-700.ttf') format('truetype');
 }
 
-
-/* public-sans-light 
 @font-face {
-  font-family: 'Public Sans';
+  font-family: 'crbtc';
+  src:  url('/assets/fonts/crbtc/crbtc.eot?ipcjib');
+  src:  url('/assets/fonts/crbtc/crbtc.eot?ipcjib#iefix') format('embedded-opentype'),
+    url('/assets/fonts/crbtc/crbtc.woff2?ipcjib') format('woff2'),
+    url('/assets/fonts/crbtc/crbtc.ttf?ipcjib') format('truetype'),
+    url('/assets/fonts/crbtc/crbtc.woff?ipcjib') format('woff'),
+    url('/assets/fonts/crbtc/crbtc.svg?ipcjib#crbtc') format('svg');
+  font-weight: normal;
   font-style: normal;
-  font-weight: 300;
+  font-display: block;
-  src: local(''),
-    url('/assets/fonts/public-sans/public-sans-light.woff2') format('woff2'),
-    url('/assets/fonts/public-sans/public-sans-light.woff') format('woff');
 }
 
-/* public-sans-regular 
+[class^="icon-"], [class*=" icon-"] {
-@font-face {
+  /* use !important to prevent issues with browser extensions that change fonts */
-  font-family: 'Public Sans';
+  font-family: 'crbtc' !important;
   font-style: normal;
-  font-weight: 400;
+  font-weight: normal;
-  src: local(''),
+  font-variant: normal;
-    url('/assets/fonts/public-sans/public-sans-regular.woff2') format('woff2'),
+  text-transform: none;
-    url('/assets/fonts/public-sans/public-sans-regular.woff') format('woff');
+  line-height: 1;
+
+  /* Better Font Rendering =========== */
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
 }
 
-/* public-sans-medium 
+.icon-btc .path1:before {
-@font-face {
+  content: "\e900";
-  font-family: 'Public Sans';
+  color: rgb(245, 148, 40);
-  font-style: normal;
-  font-weight: 500;
-  src: local(''),
-    url('/assets/fonts/public-sans/public-sans-medium.woff2') format('woff2'),
-    url('/assets/fonts/public-sans/public-sans-medium.woff') format('woff');
 }
-
+.icon-btc .path2:before {
-/* public-sans-semi-bold 
+  content: "\e901";
-@font-face {
+  margin-left: -1em;
-  font-family: 'Public Sans';
+  color: rgb(255, 255, 255);
-  font-style: normal;
-  font-weight: 600;
-  src: local(''),
-    url('/assets/fonts/public-sans/public-sans-semi-bold.woff2') format('woff2'),
-    url('/assets/fonts/public-sans/public-sans-semi-bold.woff') format('woff');
 }
-
+.icon-btc-b:before {
-/* public-sans-bold 
+  content: "\e902";
-@font-face {
+  color: #f59428;
-  font-family: 'Public Sans';
+}
-  font-style: normal;
-  font-weight: 700;
-  src: local(''),
-    url('/assets/fonts/public-sans/public-sans-bold.woff2') format('woff2'),
-    url('/assets/fonts/public-sans/public-sans-bold.woff') format('woff');
-}
-*/

assets/style/components/_footer.scss

@@ -16,11 +16,10 @@
       &:hover { text-decoration: underline }
     }
 
-    .icon-btc {
+    .icon-btc-b {
       position: relative;
-      top: .2rem;
+      top: .25rem;
       font-size: 1.1rem;
-      margin: 0 .1rem;
     }
   }
   

assets/style/pages/index/_banner.scss

@@ -23,9 +23,7 @@
     padding: 3rem 1rem 8rem 1rem;  
 
     .msg .donate {
-      text-overflow: ellipsis;
+      overflow-wrap: break-word;
-      overflow: hidden; 
-      white-space: nowrap;
     }
   }
 }

assets/style/pages/index/_events.scss

@@ -45,10 +45,13 @@
       grid-row: 1/4;
 
       h5 {
-        display: inline-block;
+        width: 95%;
         color: $f-color;
         font-size: 1.2rem;
         line-height: 1.8rem;
+        text-overflow: ellipsis;
+        overflow: hidden; 
+        white-space: nowrap;
 
         &:hover {
           color: $fh-color;
@@ -96,6 +99,7 @@
         min-width: 0;
   
         h5 {
+          width: 90%;
           font-size: 1rem;
           line-height: 1.6rem;
         }

components/Footer.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="footer">
     <div class="who">
-      <p>Made with <span class="icon-btc"><span class="path1"></span><span class="path2"></span></span> by <NuxtLink to="https://ryanmoon.com" target="_blank">Ryan Moon</NuxtLink></p>
+      <p>Made with <span class="icon-btc-b"></span> by <NuxtLink to="https://ryanmoon.com" target="_blank">Ryan Moon</NuxtLink></p>
     </div>
     <ul class="links">
       <li><NuxtLink to="/privacy">Privacy Policy</NuxtLink></li>

components/index/Banner.vue

@@ -4,7 +4,7 @@
       <h4>Get Involved</h4>
       <h6>Come learn and talk about Bitcoin. Meet new people, ask questions, suggest topics, or just come and hang out.</h6>
       <br/>
-      <h6 class="donate">Bitcoin (<a href="/img/btc.png">QR</a>): bc1qtw78x248kzq547w0zkm790u0yhgjkerxahpm9e</h6>
+      <h6 class="donate">Bitcoin (<a href="/img/btc.png" target="_BLANK">QR</a>): bc1qtw78x248kzq547w0zkm790u0yhgjkerxahpm9e</h6>
     </div>
     <div class="social">
       

components/index/Events.vue

@@ -1,20 +1,23 @@
 <script setup>
 
   const events = await queryContent('event')
-    .sort({ date: -1 })
+    .sort({ priority: 1 })
-    .only(['title', 'slug', 'location', 'date', 'day', 'time', 'meetup'])
+    .only(['title', 'slug', 'location', 'date', 'day', 'time', 'meetup', 'priority'])
     .limit(3)
     .find()
 
-  import { parseISO, addDays, isPast } from "date-fns";
+  import { format, isPast, addMinutes, parseISO } from "date-fns";
 
   for (let i = 0; i < events.length; i++) {
-    let date = addDays(parseISO(events[i].date), 1)
+    let date = parseISO(events[i].date)
     events[i].past = isPast(date)
+    events[i].date = format(addMinutes(date, 240), 'EEE, MMM d')
+  }
 
-    // issue with 1 day ahead
+  // peterfisher.me.uk/blog/javascript-sort-by-soonest-date-object/
-    // events[i].date = format(date, 'EEE, MMM d')
+
-  } 
+  // Used for login redirect
+  // ?action=attend&ref=' + event.slug
   
 </script>
 
@@ -25,10 +28,10 @@
       <div class="info">
         <NuxtLink :to="'/event/' + event.slug"><h5>{{ event.title }}</h5></NuxtLink>
         <p class="location">{{ event.location }}</p>
-        <p>{{ event.day }} · {{ event.time }}</p>
+        <p>{{ event.date }} · {{ event.time }}</p>
       </div>
       <div v-bind:class="(event.meetup)?'attend both':'attend bottom'" >
-        <NuxtLink v-if="!event.past" :href="'/login?action=attend&?ref=' + event.slug" >Attend event</NuxtLink>
+        <NuxtLink v-if="!event.past" href="/login" >Attend event</NuxtLink>
       </div>
       <div class="meetup bottom">
         <NuxtLink v-if="event.meetup" target="_BLANK" 

content/event/.!.template.md

@@ -1,13 +1,13 @@
 ---
 title: 
 slug: 
-date: MM-DD-YYYY
+date: YYYY-MM-DD
-day: 
+published: YYYY-MM-DD
-published: MMM D, YYYY
 location: 
 address: 
 time: 
 meetup: 
+priority: 
 ---
 
 ## Heading

content/event/monthly-meetup-10-18-2023.md

@@ -0,0 +1,21 @@
+---
+title: Monthly Meetup W/ Jason Maier
+slug: monthly-meetup-10-18-2023
+date: 2023-10-18
+published: 2023-08-28
+location: Druther's Brewing Company 
+address: 7 Southside Drive, Clifton Park
+time: 6:00 PM
+meetup: 295742661
+priority: 3
+---
+
+## Details
+
+For our October meetup we are excited to welcome Jason Maier! Jason is the author of “A Progressive’s Case for Bitcoin”, a wonderful speaker, wealth of knowledge, and overall amazing person. Jason will speak about his book, we will do a Q&A, and then our usual social meetup!
+
+Looking forward to seeing everyone at the September meetup! Please keep an eye out for announcements as the venue for this event may change due to attendance, but will still be held in Clifton Park.
+
+Our monthly Bitcoin meetup! This is a Bitcoin only event. Whether you are interested in learning about Bitcoin, or are a seasoned pleb, come and hang out! We will have learning materials for those who are just starting out.
+
+This has grown into a great event about meeting new plebs, socializing, and talking all things bitcoin. Hope you all can make it! Feel free to bring a friend or two to orange pill :-). Appetizers and drinks will be provided.

content/event/monthly-meetup-5-11-2023.md

@@ -2,12 +2,12 @@
 title: Monthly Meetup
 slug: monthly-meetup-5-11-2023
 date: 2023-05-11
-day: Tue, May 11
 published: 2023-04-28
 location: Frog Alley Brewing Co
 address: 108 State St, Schenectady
 time: 6:30 PM
 meetup: 292981250
+priority: 9999
 ---
 
 ## Details

content/event/monthly-meetup-6-28-2023.md

@@ -2,12 +2,12 @@
 title: Monthly Meetup
 slug: monthly-meetup-6-28-2023
 date: 2023-06-28
-day: Wed, Jun 28
 published: 2023-06-04
 location: Druther's Brewing Company
 address: 7 Southside Drive, Clifton Park
 time: 6:00 PM
 meetup: 294210792
+priority: 9999
 ---
 
 ## Details

content/event/monthly-meetup-7-26-2023.md

@@ -2,12 +2,12 @@
 title: Monthly Meetup
 slug: monthly-meetup-7-26-2023
 date: 2023-07-26
-day: Wed, Jul 26
 published: 2023-07-16
 location: Druther's Brewing Company 
 address: 221 Harborside Drive, Schenectady
 time: 6:00 PM
 meetup: 294822271
+index: 9999
 ---
 
 ## Details

content/event/monthly-meetup-8-23-2023.md

@@ -2,12 +2,12 @@
 title: Monthly Meetup
 slug: monthly-meetup-8-23-2023
 date: 2023-08-23
-day: Wed, Aug 23
 published: 2023-08-11
 location: Druther's Brewing Company 
 address: 221 Harborside Drive, Schenectady
 time: 6:00 PM
 meetup: 295386867
+priority: 9999
 ---
 
 ## Details

content/event/monthly-meetup-9-20-2023.md

@@ -0,0 +1,21 @@
+---
+title: Monthly Meetup
+slug: monthly-meetup-9-20-2023
+date: 2023-09-20
+published: 2023-08-28
+location: Druther's Brewing Company 
+address: 7 Southside Drive, Clifton Park
+time: 6:00 PM
+meetup: 295741531
+priority: 2
+---
+
+## Details
+
+** Due to scheduling conflicts Jason Maier will now be speaking at our October meetup! **
+
+Looking forward to seeing everyone at the September meetup! Lets give Clifton Park another shot due to the growth of members all around the Capital District.
+
+Our monthly Bitcoin meetup! This is a Bitcoin only event. Whether you are interested in learning about Bitcoin, or are a seasoned pleb, come and hang out! We will have learning materials for those who are just starting out.
+
+This has grown into a great event about meeting new plebs, socializing, and talking all things bitcoin. Hope you all can make it! Feel free to bring a friend or two to orange pill :-). Appetizers and first hour of drinks will be provided.

content/event/movie-game-night-9-6-2023.md

@@ -0,0 +1,17 @@
+---
+title: Movie and Game Night!
+slug: movie-game-night-9-6-2023
+date: 2023-09-06
+published: 2023-08-28
+location: Ballston Lake, NY
+address: Ballston Lake, NY
+time: 6:00 PM
+meetup: 295741625
+priority: 1
+---
+
+## Details
+
+Let’s get together for a movie and game night! I’ll take care of the food and drinks. Fingers crossed for good weather so we can set up the outdoor movie screen. We will play the “HODL 21” game and play one (or two!) Bitcoin themed movies. 
+
+I’ll send out my address to those attending, but I live in Ballston Lake, NY 🧡. Everyone is welcome!

content/workshop.md

@@ -15,4 +15,4 @@ slug: workshop
 - Getting started with Bitcoin
 - Setting up <a href="https://btcpayserver.org/" target="_BLANK">BTCPayServer</a>
 - Accepting Bitcoin for business
-- Bitcoin rewards program
+- Bitcoin rewards (<a href="https://www.oshi.tech/"  target="_BLANK">oshi</a>)

pages/event/[slug].vue

@@ -14,20 +14,10 @@
     )
   }
 
-  import { format, getDay, parseISO } from "date-fns";
+  import { format, addMinutes, parseISO } from "date-fns";
-
-  const nth = function(d) {
-    if (d > 3 && d < 21) return 'th';
-    switch (d % 10) {
-      case 1:  return "st";
-      case 2:  return "nd";
-      case 3:  return "rd";
-      default: return "th";
-    }
-  }
 
   let date = parseISO(data.value.date)
-  data.value.date = format(date, 'EEE, MMMM d')
+  data.value.date = format(addMinutes(date, 240), 'EEE, MMMM do')
 
 </script>