From 32e5f4b884072c93382fe961f2eed76705bc1e36 Mon Sep 17 00:00:00 2001 From: Drew Volz Date: Sat, 9 Jul 2022 19:25:54 -0700 Subject: [PATCH 1/7] add the-events-calendar endpoint --- .../@frogpond/ccc-the-events-calendar/index.js | 6 ++++++ .../@frogpond/ccc-the-events-calendar/package.json | 4 ++++ .../@frogpond/ccci-stolaf-college/v1/calendar/index.js | 9 +++++++++ .../@frogpond/ccci-stolaf-college/v1/index.js | 1 + 4 files changed, 20 insertions(+) create mode 100644 modules/node_modules/@frogpond/ccc-the-events-calendar/index.js create mode 100644 modules/node_modules/@frogpond/ccc-the-events-calendar/package.json diff --git a/modules/node_modules/@frogpond/ccc-the-events-calendar/index.js b/modules/node_modules/@frogpond/ccc-the-events-calendar/index.js new file mode 100644 index 00000000..96328bf5 --- /dev/null +++ b/modules/node_modules/@frogpond/ccc-the-events-calendar/index.js @@ -0,0 +1,6 @@ +import {get} from '@frogpond/ccc-lib' + +export async function theEventsCalendar(calendarUrl) { + let resp = await get(calendarUrl, {json: true}) + return resp.body +} diff --git a/modules/node_modules/@frogpond/ccc-the-events-calendar/package.json b/modules/node_modules/@frogpond/ccc-the-events-calendar/package.json new file mode 100644 index 00000000..3d53430f --- /dev/null +++ b/modules/node_modules/@frogpond/ccc-the-events-calendar/package.json @@ -0,0 +1,4 @@ +{ + "name": "@frogpond/ccc-the-events-calendar", + "version": "1.0.0" +} diff --git a/modules/node_modules/@frogpond/ccci-stolaf-college/v1/calendar/index.js b/modules/node_modules/@frogpond/ccci-stolaf-college/v1/calendar/index.js index 243a8d48..d05d6789 100644 --- a/modules/node_modules/@frogpond/ccci-stolaf-college/v1/calendar/index.js +++ b/modules/node_modules/@frogpond/ccci-stolaf-college/v1/calendar/index.js @@ -1,10 +1,12 @@ import {googleCalendar} from '@frogpond/ccc-google-calendar' import {reasonCalendar} from '@frogpond/ccc-reason-calendar' +import {theEventsCalendar} from '@frogpond/ccc-the-events-calendar' import {ONE_MINUTE} from '@frogpond/ccc-lib' import mem from 'mem' export const getGoogleCalendar = mem(googleCalendar, {maxAge: ONE_MINUTE}) export const getReasonCalendar = mem(reasonCalendar, {maxAge: ONE_MINUTE}) +export const getTheEventsCalendar = mem(theEventsCalendar, {maxAge: ONE_MINUTE}) export async function google(ctx) { ctx.cacheControl(ONE_MINUTE) @@ -31,6 +33,13 @@ export async function stolaf(ctx) { ctx.body = await getGoogleCalendar(id) } +export async function eventsCalendar(ctx) { + ctx.cacheControl(ONE_MINUTE) + + let calendarUrl = 'https://wp.stolaf.edu/calendar/wp-json/tribe/events/v1/events' + ctx.body = await getTheEventsCalendar(calendarUrl) +} + export async function oleville(ctx) { ctx.cacheControl(ONE_MINUTE) diff --git a/modules/node_modules/@frogpond/ccci-stolaf-college/v1/index.js b/modules/node_modules/@frogpond/ccci-stolaf-college/v1/index.js index b40be6ef..082c170b 100644 --- a/modules/node_modules/@frogpond/ccci-stolaf-college/v1/index.js +++ b/modules/node_modules/@frogpond/ccci-stolaf-college/v1/index.js @@ -54,6 +54,7 @@ api.get('/calendar/google', calendar.google) api.get('/calendar/reason', calendar.reason) api.get('/calendar/ics', calendar.ics) api.get('/calendar/named/stolaf', calendar.stolaf) +api.get('/calendar/named/stolaf-the-events-calendar', calendar.eventsCalendar) api.get('/calendar/named/oleville', calendar.oleville) api.get('/calendar/named/northfield', calendar.northfield) api.get('/calendar/named/krlx-schedule', calendar.krlx) From eb90feb28d2c759e75c8d0f9072b913679aab4b8 Mon Sep 17 00:00:00 2001 From: Drew Volz Date: Sun, 23 Oct 2022 16:27:09 -0700 Subject: [PATCH 2/7] shorten name to tec --- .../node_modules/@frogpond/ccc-the-events-calendar/package.json | 2 +- .../@frogpond/ccci-stolaf-college/v1/calendar/index.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/node_modules/@frogpond/ccc-the-events-calendar/package.json b/modules/node_modules/@frogpond/ccc-the-events-calendar/package.json index 3d53430f..6bf90e1e 100644 --- a/modules/node_modules/@frogpond/ccc-the-events-calendar/package.json +++ b/modules/node_modules/@frogpond/ccc-the-events-calendar/package.json @@ -1,4 +1,4 @@ { - "name": "@frogpond/ccc-the-events-calendar", + "name": "@frogpond/ccc-tec", "version": "1.0.0" } diff --git a/modules/node_modules/@frogpond/ccci-stolaf-college/v1/calendar/index.js b/modules/node_modules/@frogpond/ccci-stolaf-college/v1/calendar/index.js index d05d6789..7699e1e6 100644 --- a/modules/node_modules/@frogpond/ccci-stolaf-college/v1/calendar/index.js +++ b/modules/node_modules/@frogpond/ccci-stolaf-college/v1/calendar/index.js @@ -1,6 +1,6 @@ import {googleCalendar} from '@frogpond/ccc-google-calendar' import {reasonCalendar} from '@frogpond/ccc-reason-calendar' -import {theEventsCalendar} from '@frogpond/ccc-the-events-calendar' +import {theEventsCalendar} from '@frogpond/ccc-tec"' import {ONE_MINUTE} from '@frogpond/ccc-lib' import mem from 'mem' From 78a2f93aceca30650fe1009407bc2e6d3c9c86a7 Mon Sep 17 00:00:00 2001 From: Drew Volz Date: Sun, 23 Oct 2022 16:29:48 -0700 Subject: [PATCH 3/7] shorten url endpoint --- modules/node_modules/@frogpond/ccci-stolaf-college/v1/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/node_modules/@frogpond/ccci-stolaf-college/v1/index.js b/modules/node_modules/@frogpond/ccci-stolaf-college/v1/index.js index d908ad90..bffc6351 100644 --- a/modules/node_modules/@frogpond/ccci-stolaf-college/v1/index.js +++ b/modules/node_modules/@frogpond/ccci-stolaf-college/v1/index.js @@ -55,7 +55,7 @@ api.get('/calendar/google', calendar.google) api.get('/calendar/reason', calendar.reason) api.get('/calendar/ics', calendar.ics) api.get('/calendar/named/stolaf', calendar.stolaf) -api.get('/calendar/named/stolaf-the-events-calendar', calendar.eventsCalendar) +api.get('/calendar/named/stolaf-tec', calendar.eventsCalendar) api.get('/calendar/named/oleville', calendar.oleville) api.get('/calendar/named/northfield', calendar.northfield) api.get('/calendar/named/krlx-schedule', calendar.krlx) From 761187ad1d5b3e8224d3caf6609a807984cdc88e Mon Sep 17 00:00:00 2001 From: Drew Volz Date: Sun, 23 Oct 2022 17:53:04 -0700 Subject: [PATCH 4/7] rename all the-events-calendar files to tec --- .../@frogpond/{ccc-the-events-calendar => ccc-tec}/index.js | 0 .../@frogpond/{ccc-the-events-calendar => ccc-tec}/package.json | 0 .../@frogpond/ccci-stolaf-college/v1/calendar/index.js | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) rename modules/node_modules/@frogpond/{ccc-the-events-calendar => ccc-tec}/index.js (100%) rename modules/node_modules/@frogpond/{ccc-the-events-calendar => ccc-tec}/package.json (100%) diff --git a/modules/node_modules/@frogpond/ccc-the-events-calendar/index.js b/modules/node_modules/@frogpond/ccc-tec/index.js similarity index 100% rename from modules/node_modules/@frogpond/ccc-the-events-calendar/index.js rename to modules/node_modules/@frogpond/ccc-tec/index.js diff --git a/modules/node_modules/@frogpond/ccc-the-events-calendar/package.json b/modules/node_modules/@frogpond/ccc-tec/package.json similarity index 100% rename from modules/node_modules/@frogpond/ccc-the-events-calendar/package.json rename to modules/node_modules/@frogpond/ccc-tec/package.json diff --git a/modules/node_modules/@frogpond/ccci-stolaf-college/v1/calendar/index.js b/modules/node_modules/@frogpond/ccci-stolaf-college/v1/calendar/index.js index a92151f2..cc9554fe 100644 --- a/modules/node_modules/@frogpond/ccci-stolaf-college/v1/calendar/index.js +++ b/modules/node_modules/@frogpond/ccci-stolaf-college/v1/calendar/index.js @@ -1,6 +1,6 @@ import {googleCalendar} from '@frogpond/ccc-google-calendar' import {reasonCalendar} from '@frogpond/ccc-reason-calendar' -import {theEventsCalendar} from '@frogpond/ccc-tec"' +import {theEventsCalendar} from '@frogpond/ccc-tec' import {ONE_MINUTE} from '@frogpond/ccc-lib' import mem from 'mem' From 692cf7b4eed62660d3eeaf851b533749d763d834 Mon Sep 17 00:00:00 2001 From: Drew Volz Date: Fri, 24 May 2024 22:05:48 -0700 Subject: [PATCH 5/7] remove reason calendar addition --- source/ccci-stolaf-college/v1/calendar.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/source/ccci-stolaf-college/v1/calendar.js b/source/ccci-stolaf-college/v1/calendar.js index 5a27c209..dd57737c 100644 --- a/source/ccci-stolaf-college/v1/calendar.js +++ b/source/ccci-stolaf-college/v1/calendar.js @@ -1,12 +1,10 @@ import {googleCalendar} from '../../calendar/google.js' -import {reasonCalendar} from '../../calendar/reason.js' import {ical} from '../../calendar/ical.js' import {theEventsCalendar} from '@frogpond/ccc-tec' import {ONE_MINUTE} from '../../ccc-lib/constants.js' import mem from 'memoize' export const getGoogleCalendar = mem(googleCalendar, {maxAge: ONE_MINUTE}) -export const getReasonCalendar = mem(reasonCalendar, {maxAge: ONE_MINUTE}) export const getInternetCalendar = mem(ical, {maxAge: ONE_MINUTE}) export const getTheEventsCalendar = mem(theEventsCalendar, {maxAge: ONE_MINUTE}) From 007c8865ff7e0693c82da74f95ef037895dfb65d Mon Sep 17 00:00:00 2001 From: Drew Volz Date: Fri, 24 May 2024 22:27:32 -0700 Subject: [PATCH 6/7] remove old module format --- modules/node_modules/@frogpond/ccc-tec/index.js | 6 ------ modules/node_modules/@frogpond/ccc-tec/package.json | 4 ---- source/calendar/tec.js | 6 ++++++ source/ccci-stolaf-college/v1/calendar.js | 2 +- 4 files changed, 7 insertions(+), 11 deletions(-) delete mode 100644 modules/node_modules/@frogpond/ccc-tec/index.js delete mode 100644 modules/node_modules/@frogpond/ccc-tec/package.json create mode 100644 source/calendar/tec.js diff --git a/modules/node_modules/@frogpond/ccc-tec/index.js b/modules/node_modules/@frogpond/ccc-tec/index.js deleted file mode 100644 index 96328bf5..00000000 --- a/modules/node_modules/@frogpond/ccc-tec/index.js +++ /dev/null @@ -1,6 +0,0 @@ -import {get} from '@frogpond/ccc-lib' - -export async function theEventsCalendar(calendarUrl) { - let resp = await get(calendarUrl, {json: true}) - return resp.body -} diff --git a/modules/node_modules/@frogpond/ccc-tec/package.json b/modules/node_modules/@frogpond/ccc-tec/package.json deleted file mode 100644 index 6bf90e1e..00000000 --- a/modules/node_modules/@frogpond/ccc-tec/package.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "name": "@frogpond/ccc-tec", - "version": "1.0.0" -} diff --git a/source/calendar/tec.js b/source/calendar/tec.js new file mode 100644 index 00000000..ad0ed160 --- /dev/null +++ b/source/calendar/tec.js @@ -0,0 +1,6 @@ +import {get} from '../ccc-lib/http.js' + +export async function theEventsCalendar(calendarUrl) { + let body = await get(calendarUrl).json() + return body.events +} diff --git a/source/ccci-stolaf-college/v1/calendar.js b/source/ccci-stolaf-college/v1/calendar.js index dd57737c..8db9ff6b 100644 --- a/source/ccci-stolaf-college/v1/calendar.js +++ b/source/ccci-stolaf-college/v1/calendar.js @@ -1,6 +1,6 @@ import {googleCalendar} from '../../calendar/google.js' import {ical} from '../../calendar/ical.js' -import {theEventsCalendar} from '@frogpond/ccc-tec' +import {theEventsCalendar} from '../../calendar/tec.js' import {ONE_MINUTE} from '../../ccc-lib/constants.js' import mem from 'memoize' From a2985a273711e22883fb5d8d14537be75531b9ca Mon Sep 17 00:00:00 2001 From: Drew Volz Date: Fri, 24 May 2024 22:27:46 -0700 Subject: [PATCH 7/7] prettier change to url --- source/ccci-stolaf-college/v1/calendar.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source/ccci-stolaf-college/v1/calendar.js b/source/ccci-stolaf-college/v1/calendar.js index 8db9ff6b..575245d2 100644 --- a/source/ccci-stolaf-college/v1/calendar.js +++ b/source/ccci-stolaf-college/v1/calendar.js @@ -32,7 +32,8 @@ export async function stolaf(ctx) { export async function eventsCalendar(ctx) { ctx.cacheControl(ONE_MINUTE) - let calendarUrl = 'https://wp.stolaf.edu/calendar/wp-json/tribe/events/v1/events' + let calendarUrl = + 'https://wp.stolaf.edu/calendar/wp-json/tribe/events/v1/events' ctx.body = await getTheEventsCalendar(calendarUrl) }