Skip to content

Commit

Permalink
πŸ”€ Merge pull request #10 from NMSCD/develop
Browse files Browse the repository at this point in the history
πŸ”– 0.0.14
  • Loading branch information
Khaoz-Topsy authored Aug 27, 2024
2 parents 23fee41 + ebcd915 commit 3dbb127
Show file tree
Hide file tree
Showing 27 changed files with 142 additions and 14 deletions.
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "nmscd.meetup",
"version": "0.0.12",
"version": "0.0.14",
"scripts": {
"build": "npm-run-all --sequential setup:* sass:* template:*",
"setup": "npm i && npm-run-all --sequential setup:*",
Expand Down
1 change: 1 addition & 0 deletions public/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ opensearch.xml
manifest.json
site.webmanifest
sitemap.xml
2025.html
2024.html
2023.html
2022.html
Binary file added public/assets/img/event/2024/001.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/img/event/2024/001.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/img/event/2024/002.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/img/event/2024/003.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/img/event/2024/004.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/img/event/2024/005.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/img/event/2024/006.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/img/event/2024/007.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/img/event/2024/008.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/img/event/2024/009.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/img/event/2024/010.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/img/event/2024/011.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/img/event/2024/012.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/img/event/2024/013.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/img/event/2024/014.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/img/event/2024/014.mp4
Binary file not shown.
Binary file added public/assets/img/event/2024/014.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/img/event/2024/015.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/img/event/2024/016.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/img/event/2024/016.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
105 changes: 105 additions & 0 deletions template/data/eventMedia.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,109 @@
[
{
"date": "25 Aug 2024 18:00:00 GMT",
"shortDate": "25th August",
"year": "2024",
"hashtag": "NMSMeetup2023",
"images": [
{
"id": "001",
"ext": "jpg",
"caption": "Stickers that were available for attendees",
"link": "https://x.com/Ynys/status/1827312704857460973"
},
{
"id": "002",
"ext": "jpg",
"caption": "Stickers and Tarot cards that were available for attendees",
"link": "https://x.com/AssistantNMS/status/1827217785329537153"
},
{
"id": "003",
"ext": "jpg",
"caption": "The prize table of the meetup",
"link": "https://x.com/FranCobasGC/status/1827781595228463588"
},
{
"id": "004",
"ext": "jpg",
"caption": "Banners on display at the meetup",
"link": "https://x.com/FranCobasGC/status/1828042896420880565"
},
{
"id": "005",
"ext": "jpg",
"caption": "The cake supplied by Hello Games",
"link": "https://x.com/5tarman7/status/1827989511436984389"
},
{
"id": "006",
"ext": "jpg",
"caption": "A shot of the bar with many of the attendees",
"link": "https://x.com/5tarman7/status/1827989511436984389"
},
{
"id": "014",
"ext": "gif",
"type": "video",
"caption": "A video by TheRedOrb",
"link": "https://x.com/the_redOrb/status/1827765102625337491"
},
{
"id": "007",
"ext": "jpg",
"caption": "A collage of the Three Pigeons pub and the goodies available",
"link": "https://x.com/MrJordanMurphy/status/1828116519169249479/photo/1"
},
{
"id": "008",
"ext": "jpg",
"caption": "Xaine, Sombra, Jordan, GoldenGek",
"link": "https://x.com/xxdarksombraxx/status/1828153901427589540"
},
{
"id": "009",
"ext": "png",
"caption": "The shirt that Hello Games provided for all the meetup attendees",
"link": "https://x.com/RazorMouse/status/1827754052819509502"
},
{
"id": "010",
"ext": "jpg",
"caption": "The meetup from the online virtual meetup's perspective",
"link": "https://x.com/RazorMouse/status/1827744598476701769"
},
{
"id": "011",
"ext": "jpg",
"caption": "3d prints available to raffle winners",
"link": "https://x.com/RazorMouse/status/1827753729958765034"
},
{
"id": "013",
"ext": "jpg",
"caption": "Starman's Vykeen mask",
"link": "https://x.com/FranCobasGC/status/1828042896420880565"
},
{
"id": "012",
"ext": "jpg",
"caption": "Starman's Vykeen mask",
"link": "https://x.com/RazorMouse/status/1827753729958765034"
},
{
"id": "015",
"ext": "jpg",
"caption": "After party at Solar Sisters",
"link": "https://x.com/RazorMouse/status/1828017200730386722"
},
{
"id": "016",
"ext": "png",
"caption": "The winning quiz team",
"link": "https://www.youtube.com/watch?v=wyo_QC-9yg8&t=337s"
}
]
},
{
"date": "28 Aug 2022 18:00:00 GMT",
"shortDate": "28th August",
Expand Down
26 changes: 23 additions & 3 deletions template/data/site.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
},
"event": {
"current": {
"date": "25 Aug 2024 18:00:00 GMT",
"shortDate": "25th August",
"year": "2024",
"date": "24 Aug 2024 18:00:00 GMT",
"shortDate": "24th August",
"year": "2025",
"time": "6PM (GMT)",
"discordInviteUrl": "https://discord.gg/wGNjTjxacX",
"locationUrl": "https://goo.gl/maps/VcDBMRhMVhJhucfB6",
Expand All @@ -43,6 +43,26 @@
"bannerCaption": "Banner by Captain Steve"
},
"previous": [
{
"date": "25 Aug 2024 18:00:00 GMT",
"shortDate": "25th August",
"year": "2024",
"time": "6PM (GMT)",
"discordInviteUrl": "https://discord.gg/wGNjTjxacX",
"locationUrl": "https://goo.gl/maps/VcDBMRhMVhJhucfB6",
"locationAddress": [
"Three Pigeons pub (Up Stairs)",
"169 High St",
"Guildford",
"GU1 3AJ"
],
"hasVirtualMeetup": true,
"hasNmsSocialHashtag": true,
"hasTwitterHashtag": true,
"foodNotice": "Food and drink can be purchased at the venue, not supplied by the event organisers. Kitchen Closes normally around 7pm, they may keep it open to 8pm We suggest that you order food when you arrive.",
"bannerImg": "/assets/img/captSteveBanner2024.jpg",
"bannerCaption": "Banner by Captain Steve"
},
{
"date": "27 Aug 2023 18:00:00 GMT",
"shortDate": "27th August",
Expand Down
9 changes: 5 additions & 4 deletions template/handlebar/components/eventMedia.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,11 @@
</div> --}}
<div class="col-12 event-media noselect">
{{#each event.images}}
<a href="{{this.link}}" id="{{this.id}}" class="media" title="{{this.caption}}" target="_blank" rel="noopener noreferrer">
<a href="{{this.link}}" id="{{this.id}}" class="media" title="{{this.caption}}" target="_blank"
rel="noopener noreferrer">
<figure>
<img src="/assets/img/event/{{../event.year}}/{{this.id}}.{{this.ext}}" loading="lazy" alt="{{this.caption}}"
width="{{minWidth}}" height="{{minHeight}}" />
<img src="/assets/img/event/{{../event.year}}/{{this.id}}.{{this.ext}}" loading="lazy"
alt="{{this.caption}}" width="{{minWidth}}" height="{{minHeight}}" />
<figcaption>{{this.caption}}</figcaption>

{{#if type}}
Expand All @@ -30,6 +31,6 @@
<div class="col-12 ta-center noselect">
{{#if viewMore}}
<a href="/{{event.year}}.html" title="{{event.year}} images" role="button">View more
media from the {{event.year}} meetup 👺</a>
media from the last meetup 👺</a>
{{/if}}
</div>
9 changes: 5 additions & 4 deletions template/handlebar/index.html.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<div class="container">
<div class="row">
<div class="col-12 text-shadow ta-center">
<h1>No Man's Sky <span class="primary">{{event.current.year}}</span>&nbsp;meetup
<h1>No Man's Sky <span class="primary">2024</span>&nbsp;meetup
<small class="hidden for seo">Guildford meetup</small>
</h1>
<i>
Expand Down Expand Up @@ -73,10 +73,11 @@
<section id="event-media">
<div class="container">
<div class="row">
{{> components/eventMedia event=previousEventMedia customEventHeading="Images & videos from the
previous year"
viewMore="true"}}
{{> components/eventMedia event=previousEventMedia viewMore="true"}}

<div class="col-12 ta-center noselect">
<a href="/2023.html" title="2023 images" role="button">View media from the 2023 meetup 👺</a>
</div>
<div class="col-12 ta-center noselect">
<a href="/2022.html" title="2022 images" role="button">View media from the 2022 meetup 👺</a>
</div>
Expand Down

0 comments on commit 3dbb127

Please sign in to comment.