diff --git a/assets/style/components/_footer.scss b/assets/style/components/_footer.scss index dc9e7d8..e364b64 100644 --- a/assets/style/components/_footer.scss +++ b/assets/style/components/_footer.scss @@ -58,7 +58,7 @@ @media only screen and (max-width: 600px) { .footer { height: unset; - padding: 0 2.5rem; + padding: 0 2rem; margin: 1rem 0; .who, diff --git a/assets/style/components/_header.scss b/assets/style/components/_header.scss index b62ffe6..ba5c40d 100644 --- a/assets/style/components/_header.scss +++ b/assets/style/components/_header.scss @@ -65,7 +65,7 @@ header { @media only screen and (max-width: 600px) { header { grid-template-columns: 5.5rem calc(100% - 5.5rem); - padding: 2.5rem 2.5rem 1rem 2.5rem; + padding: 2.5rem 2rem 1rem 2rem; .logo h1 { font-size: 1rem; diff --git a/assets/style/main.scss b/assets/style/main.scss index bd24253..01b12b3 100644 --- a/assets/style/main.scss +++ b/assets/style/main.scss @@ -14,7 +14,7 @@ main { } @media only screen and (max-width: 600px) { - main { padding: 2rem } + main { padding: 2rem 1.5rem } } html { diff --git a/components/index/Events.vue b/components/index/Events.vue index 06011b9..6dda2aa 100644 --- a/components/index/Events.vue +++ b/components/index/Events.vue @@ -2,16 +2,18 @@ const events = await queryContent('event') .sort({ date: -1 }) - .only(['title', 'slug', 'location', 'date', 'time', 'meetup']) + .only(['title', 'slug', 'location', 'date', 'day', 'time', 'meetup']) .limit(3) .find() - import { format, isBefore, parseISO } from "date-fns"; + import { format, parseISO, addDays, isPast } from "date-fns"; for (let i = 0; i < events.length; i++) { - let date = parseISO(events[i].date) - events[i].past = isBefore(date, new Date()) - events[i].date = format(date, 'EEE, MMM d') + let date = addDays(parseISO(events[i].date), 1) + events[i].past = isPast(date) + + // issue with 1 day ahead + // events[i].date = format(date, 'EEE, MMM d') } @@ -23,7 +25,7 @@
{{ event.title }}

{{ event.location }}

-

{{ event.date }} · {{ event.time }}

+

{{ event.day }} · {{ event.time }}

Attend event diff --git a/content/event/.!.template.md b/content/event/.!.template.md index 495b67d..e3d3d8e 100644 --- a/content/event/.!.template.md +++ b/content/event/.!.template.md @@ -2,6 +2,7 @@ title: slug: date: MM-DD-YYYY +day: published: MMM D, YYYY location: address: diff --git a/content/event/monthly-meetup-5-11-2023.md b/content/event/monthly-meetup-5-11-2023.md index 8acfa16..d2ea0ed 100644 --- a/content/event/monthly-meetup-5-11-2023.md +++ b/content/event/monthly-meetup-5-11-2023.md @@ -2,6 +2,7 @@ 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 diff --git a/content/event/monthly-meetup-6-28-2023.md b/content/event/monthly-meetup-6-28-2023.md index 1d2d5f0..3639171 100644 --- a/content/event/monthly-meetup-6-28-2023.md +++ b/content/event/monthly-meetup-6-28-2023.md @@ -2,6 +2,7 @@ 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 diff --git a/content/event/monthly-meetup-7-26-2023.md b/content/event/monthly-meetup-7-26-2023.md index 6f0ab7c..bef42ab 100644 --- a/content/event/monthly-meetup-7-26-2023.md +++ b/content/event/monthly-meetup-7-26-2023.md @@ -2,6 +2,7 @@ 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 diff --git a/content/event/monthly-meetup-8-23-2023.md b/content/event/monthly-meetup-8-23-2023.md index 5345aeb..a95c87c 100644 --- a/content/event/monthly-meetup-8-23-2023.md +++ b/content/event/monthly-meetup-8-23-2023.md @@ -2,6 +2,7 @@ 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 diff --git a/nuxt.config.ts b/nuxt.config.ts index 23809ac..ef4811f 100644 --- a/nuxt.config.ts +++ b/nuxt.config.ts @@ -6,7 +6,6 @@ export default defineNuxtConfig({ '@nuxt/content', '@nuxtjs/device', 'nuxt-directus', - 'nuxt-time', ], directus: { diff --git a/package-lock.json b/package-lock.json index fe12968..656ba05 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,6 +8,7 @@ "hasInstallScript": true, "dependencies": { "date-fns": "^2.30.0", + "date-fns-tz": "^2.0.0", "sass": "^1.63.6", "vee-validate": "^4.10.8" }, @@ -17,8 +18,7 @@ "@nuxtjs/device": "^3.1.0", "@types/node": "^18.16.19", "nuxt": "^3.6.2", - "nuxt-directus": "^5.5.0", - "nuxt-time": "^0.1.0" + "nuxt-directus": "^5.5.0" } }, "node_modules/@ampproject/remapping": { @@ -4904,6 +4904,14 @@ "url": "https://opencollective.com/date-fns" } }, + "node_modules/date-fns-tz": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/date-fns-tz/-/date-fns-tz-2.0.0.tgz", + "integrity": "sha512-OAtcLdB9vxSXTWHdT8b398ARImVwQMyjfYGkKD2zaGpHseG2UPHbHjXELReErZFxWdSLph3c2zOaaTyHfOhERQ==", + "peerDependencies": { + "date-fns": ">=2.0.0" + } + }, "node_modules/debug": { "version": "4.3.4", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", @@ -9477,17 +9485,6 @@ "@nuxt/kit": "^3.0.0" } }, - "node_modules/nuxt-time": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/nuxt-time/-/nuxt-time-0.1.0.tgz", - "integrity": "sha512-kWk17FWL6fnIQO2kTvpkABFRn8MDzoabIOAjMpL3SVwbeKVQbdTRt20BJs2o4nCldZxUVXoGj4ClK0RDASuSLg==", - "dev": true, - "dependencies": { - "@nuxt/kit": "^3.2.0", - "defu": "^6.1.1", - "pathe": "^1.0.0" - } - }, "node_modules/nypm": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/nypm/-/nypm-0.2.2.tgz", @@ -17030,6 +17027,12 @@ "@babel/runtime": "^7.21.0" } }, + "date-fns-tz": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/date-fns-tz/-/date-fns-tz-2.0.0.tgz", + "integrity": "sha512-OAtcLdB9vxSXTWHdT8b398ARImVwQMyjfYGkKD2zaGpHseG2UPHbHjXELReErZFxWdSLph3c2zOaaTyHfOhERQ==", + "requires": {} + }, "debug": { "version": "4.3.4", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", @@ -20362,17 +20365,6 @@ "@nuxt/kit": "^3.0.0" } }, - "nuxt-time": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/nuxt-time/-/nuxt-time-0.1.0.tgz", - "integrity": "sha512-kWk17FWL6fnIQO2kTvpkABFRn8MDzoabIOAjMpL3SVwbeKVQbdTRt20BJs2o4nCldZxUVXoGj4ClK0RDASuSLg==", - "dev": true, - "requires": { - "@nuxt/kit": "^3.2.0", - "defu": "^6.1.1", - "pathe": "^1.0.0" - } - }, "nypm": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/nypm/-/nypm-0.2.2.tgz", diff --git a/package.json b/package.json index f635fbf..e4ee1b7 100644 --- a/package.json +++ b/package.json @@ -14,11 +14,11 @@ "@nuxtjs/device": "^3.1.0", "@types/node": "^18.16.19", "nuxt": "^3.6.2", - "nuxt-directus": "^5.5.0", - "nuxt-time": "^0.1.0" + "nuxt-directus": "^5.5.0" }, "dependencies": { "date-fns": "^2.30.0", + "date-fns-tz": "^2.0.0", "sass": "^1.63.6", "vee-validate": "^4.10.8" } diff --git a/pages/register.vue b/pages/register.vue index 598f4f8..5a8c705 100644 --- a/pages/register.vue +++ b/pages/register.vue @@ -26,6 +26,7 @@ email: values.email, password: values.password, external_identifier: slug, + role: process.env.DIRECTUS_ROLE, }) } catch (e) {} }