From 7e57346fa1ae368708d0c996e4e8a050da2214b3 Mon Sep 17 00:00:00 2001 From: Brett Slaski Date: Tue, 10 Oct 2023 13:33:32 -0500 Subject: [PATCH] feat: redirect in-person routes to thatconference.com. Doesn't include sessions --- package.json | 2 +- src/_utils/config.public.js | 5 +++ src/routes/call-for-counselors/+page.js | 3 +- src/routes/cfp/+page.js | 3 +- .../events/(online)/[event]/[date]/+layout.js | 7 +++- .../events/(thatConferences)/tx/+page.js | 6 ++++ .../(thatConferences)/tx/[year]/+page.js | 10 ++++++ .../tx/[year]/schedule/+page.js | 24 +++++++++----- .../tx/[year]/sponsors/+page.js | 32 ++++++++++++------- .../tx/[year]/tickets/+page.js | 10 ++++++ .../tx/[year]/travel/+page.js | 13 +++++--- .../events/(thatConferences)/wi/+page.js | 6 ++++ .../(thatConferences)/wi/[year]/+page.js | 10 ++++++ .../wi/[year]/schedule/+page.js | 28 ++++++++++------ .../wi/[year]/sponsors/+page.js | 32 ++++++++++++------- .../wi/[year]/tickets/+page.js | 10 ++++++ .../wi/[year]/travel/+page.js | 13 +++++--- src/routes/family/+page.js | 3 +- src/routes/sponsorships/apply/+page.js | 3 +- src/routes/that-conference/+page.js | 3 +- src/routes/tx/+page.js | 4 +-- src/routes/wi/+page.js | 4 +-- 22 files changed, 168 insertions(+), 63 deletions(-) create mode 100644 src/routes/events/(thatConferences)/tx/+page.js create mode 100644 src/routes/events/(thatConferences)/tx/[year]/+page.js create mode 100644 src/routes/events/(thatConferences)/tx/[year]/tickets/+page.js create mode 100644 src/routes/events/(thatConferences)/wi/+page.js create mode 100644 src/routes/events/(thatConferences)/wi/[year]/+page.js create mode 100644 src/routes/events/(thatConferences)/wi/[year]/tickets/+page.js diff --git a/package.json b/package.json index f455e39b1..e573c4d14 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "that-us", - "version": "3.13.8", + "version": "3.14.0", "description": "THAT.us website", "main": "index.js", "type": "module", diff --git a/src/_utils/config.public.js b/src/_utils/config.public.js index cc3974d78..ba1ed56ff 100644 --- a/src/_utils/config.public.js +++ b/src/_utils/config.public.js @@ -124,3 +124,8 @@ export const kalahari = { } } }; + +export const thatConferenceRedirect = { + baseUrl: `https://thatconference.com`, + defaultStatus: 308 +}; diff --git a/src/routes/call-for-counselors/+page.js b/src/routes/call-for-counselors/+page.js index 31352a2af..395b99a06 100644 --- a/src/routes/call-for-counselors/+page.js +++ b/src/routes/call-for-counselors/+page.js @@ -1,5 +1,6 @@ import { redirect } from '@sveltejs/kit'; +import { thatConferenceRedirect as tcr } from '$utils/config.public.js'; export async function load() { - throw redirect(301, `https://thatconference.com/cfp`); + throw redirect(301, `${tcr.baseUrl}/cfp`); } diff --git a/src/routes/cfp/+page.js b/src/routes/cfp/+page.js index 31352a2af..395b99a06 100644 --- a/src/routes/cfp/+page.js +++ b/src/routes/cfp/+page.js @@ -1,5 +1,6 @@ import { redirect } from '@sveltejs/kit'; +import { thatConferenceRedirect as tcr } from '$utils/config.public.js'; export async function load() { - throw redirect(301, `https://thatconference.com/cfp`); + throw redirect(301, `${tcr.baseUrl}/cfp`); } diff --git a/src/routes/events/(online)/[event]/[date]/+layout.js b/src/routes/events/(online)/[event]/[date]/+layout.js index bf730bfa4..8cf9734e4 100644 --- a/src/routes/events/(online)/[event]/[date]/+layout.js +++ b/src/routes/events/(online)/[event]/[date]/+layout.js @@ -1,3 +1,4 @@ +import { error } from '@sveltejs/kit'; import eventsApi from '$dataSources/api.that.tech/events/queries'; export async function load({ params, fetch }) { @@ -5,9 +6,13 @@ export async function load({ params, fetch }) { const eventSlug = `${event}/${date}`; const { queryEventWithSpeakersBySlug } = eventsApi(fetch); + const fetchedEvent = await queryEventWithSpeakersBySlug(eventSlug); + if (!fetchedEvent) { + throw error(404, 'Event not found'); + } return { eventSlug, - event: await queryEventWithSpeakersBySlug(eventSlug) + event: fetchedEvent }; } diff --git a/src/routes/events/(thatConferences)/tx/+page.js b/src/routes/events/(thatConferences)/tx/+page.js new file mode 100644 index 000000000..6227081f7 --- /dev/null +++ b/src/routes/events/(thatConferences)/tx/+page.js @@ -0,0 +1,6 @@ +import { redirect } from '@sveltejs/kit'; +import { thatConferenceRedirect as tcr } from '$utils/config.public.js'; + +export function load() { + throw redirect(tcr.defaultStatus, `${tcr.baseUrl}/tx`); +} diff --git a/src/routes/events/(thatConferences)/tx/[year]/+page.js b/src/routes/events/(thatConferences)/tx/[year]/+page.js new file mode 100644 index 000000000..c1ed96b70 --- /dev/null +++ b/src/routes/events/(thatConferences)/tx/[year]/+page.js @@ -0,0 +1,10 @@ +import { redirect, error } from '@sveltejs/kit'; +import { thatConferenceRedirect as tcr } from '$utils/config.public.js'; + +export function load({ params }) { + const { year } = params; + if (!Number.isInteger(Number.parseInt(year, 10))) { + throw error(404, 'Event not found'); + } + throw redirect(tcr.defaultStatus, `${tcr.baseUrl}/tx/${year}/`); +} diff --git a/src/routes/events/(thatConferences)/tx/[year]/schedule/+page.js b/src/routes/events/(thatConferences)/tx/[year]/schedule/+page.js index 9fd1b2e80..3592defbd 100644 --- a/src/routes/events/(thatConferences)/tx/[year]/schedule/+page.js +++ b/src/routes/events/(thatConferences)/tx/[year]/schedule/+page.js @@ -1,12 +1,20 @@ -import sessionsApi from '$dataSources/api.that.tech/sessions'; +// import sessionsApi from '$dataSources/api.that.tech/sessions'; +import { redirect, error } from '@sveltejs/kit'; +import { thatConferenceRedirect as tcr } from '$utils/config.public.js'; -export async function load({ parent }) { - const { querySessionsBySlug } = sessionsApi(); +export function load({ params }) { + const { year } = params; + if (!Number.isInteger(Number.parseInt(year, 10))) { + throw error(404, 'Event not found'); + } + throw redirect(tcr.defaultStatus, `${tcr.baseUrl}/tx/${year}/schedule/`); - let { event } = await parent(); - const sessions = await querySessionsBySlug({ slug: event.slug, pageSize: 250 }); + // const { querySessionsBySlug } = sessionsApi(); - return { - sessions - }; + // let { event } = await parent(); + // const sessions = await querySessionsBySlug({ slug: event.slug, pageSize: 250 }); + + // return { + // sessions + // }; } diff --git a/src/routes/events/(thatConferences)/tx/[year]/sponsors/+page.js b/src/routes/events/(thatConferences)/tx/[year]/sponsors/+page.js index 36c632a50..8314a31ec 100644 --- a/src/routes/events/(thatConferences)/tx/[year]/sponsors/+page.js +++ b/src/routes/events/(thatConferences)/tx/[year]/sponsors/+page.js @@ -1,18 +1,26 @@ -import lodash from 'lodash'; -import partnerQueryApi from '$dataSources/api.that.tech/partner/queries'; +// import lodash from 'lodash'; +// import partnerQueryApi from '$dataSources/api.that.tech/partner/queries'; +import { redirect, error } from '@sveltejs/kit'; +import { thatConferenceRedirect as tcr } from '$utils/config.public.js'; -export async function load({ params, fetch }) { - const { groupBy } = lodash; +export function load({ params }) { const { year } = params; - const { getEventPartners } = partnerQueryApi(fetch); + if (!Number.isInteger(Number.parseInt(year, 10))) { + throw error(404, 'Event not found'); + } + throw redirect(tcr.defaultStatus, `${tcr.baseUrl}/tx/${year}/sponsors/`); - const eventSlug = `tx/${year}`; + // const { groupBy } = lodash; + // const { year } = params; + // const { getEventPartners } = partnerQueryApi(fetch); - const event = await getEventPartners(eventSlug); - const levels = groupBy(event.partners, 'level'); + // const eventSlug = `tx/${year}`; - return { - event, - levels - }; + // const event = await getEventPartners(eventSlug); + // const levels = groupBy(event.partners, 'level'); + + // return { + // event, + // levels + // }; } diff --git a/src/routes/events/(thatConferences)/tx/[year]/tickets/+page.js b/src/routes/events/(thatConferences)/tx/[year]/tickets/+page.js new file mode 100644 index 000000000..437b1db8c --- /dev/null +++ b/src/routes/events/(thatConferences)/tx/[year]/tickets/+page.js @@ -0,0 +1,10 @@ +import { redirect, error } from '@sveltejs/kit'; +import { thatConferenceRedirect as tcr } from '$utils/config.public.js'; + +export function load({ params }) { + const { year } = params; + if (!Number.isInteger(Number.parseInt(year, 10))) { + throw error(404, 'Event not found'); + } + throw redirect(tcr.defaultStatus, `${tcr.baseUrl}/tx/${year}/tickets/`); +} diff --git a/src/routes/events/(thatConferences)/tx/[year]/travel/+page.js b/src/routes/events/(thatConferences)/tx/[year]/travel/+page.js index cdf8a32b5..1e230ed8c 100644 --- a/src/routes/events/(thatConferences)/tx/[year]/travel/+page.js +++ b/src/routes/events/(thatConferences)/tx/[year]/travel/+page.js @@ -1,7 +1,10 @@ -import { redirect } from '@sveltejs/kit'; +import { redirect, error } from '@sveltejs/kit'; +import { thatConferenceRedirect as tcr } from '$utils/config.public.js'; -export async function load({ parent }) { - const { eventName } = await parent(); - - throw redirect(302, `/support/travel/${eventName}/`); +export function load({ params }) { + const { year } = params; + if (!Number.isInteger(Number.parseInt(year, 10))) { + throw error(404, 'Event not found'); + } + throw redirect(tcr.defaultStatus, `${tcr.baseUrl}/tx/${year}/travel/`); } diff --git a/src/routes/events/(thatConferences)/wi/+page.js b/src/routes/events/(thatConferences)/wi/+page.js new file mode 100644 index 000000000..a3bb3d994 --- /dev/null +++ b/src/routes/events/(thatConferences)/wi/+page.js @@ -0,0 +1,6 @@ +import { redirect } from '@sveltejs/kit'; +import { thatConferenceRedirect as tcr } from '$utils/config.public.js'; + +export function load() { + throw redirect(tcr.defaultStatus, `${tcr.baseUrl}/wi/`); +} diff --git a/src/routes/events/(thatConferences)/wi/[year]/+page.js b/src/routes/events/(thatConferences)/wi/[year]/+page.js new file mode 100644 index 000000000..9bb81393d --- /dev/null +++ b/src/routes/events/(thatConferences)/wi/[year]/+page.js @@ -0,0 +1,10 @@ +import { redirect, error } from '@sveltejs/kit'; +import { thatConferenceRedirect as tcr } from '$utils/config.public.js'; + +export function load({ params }) { + const { year } = params; + if (!Number.isInteger(Number.parseInt(year, 10))) { + throw error(404, 'Event not found'); + } + throw redirect(tcr.defaultStatus, `${tcr.baseUrl}/wi/${year}/`); +} diff --git a/src/routes/events/(thatConferences)/wi/[year]/schedule/+page.js b/src/routes/events/(thatConferences)/wi/[year]/schedule/+page.js index 6a8346691..fa80b7bef 100644 --- a/src/routes/events/(thatConferences)/wi/[year]/schedule/+page.js +++ b/src/routes/events/(thatConferences)/wi/[year]/schedule/+page.js @@ -1,15 +1,23 @@ -import sessionsApi from '$dataSources/api.that.tech/sessions'; +import { redirect, error } from '@sveltejs/kit'; +import { thatConferenceRedirect as tcr } from '$utils/config.public.js'; +// import sessionsApi from '$dataSources/api.that.tech/sessions'; -export async function load({ parent, url }) { - const { querySessionsBySlug } = sessionsApi(); +export async function load({ params }) { + const { year } = params; + if (!Number.isInteger(Number.parseInt(year, 10))) { + throw error(404, 'Event not found'); + } + throw redirect(tcr.defaultStatus, `${tcr.baseUrl}/wi/${year}/schedule/`); - let filterForFamily = url.searchParams.get('family') === 'true'; + // const { querySessionsBySlug } = sessionsApi(); - let { event } = await parent(); - const sessions = await querySessionsBySlug({ slug: event.slug, pageSize: 250 }); + // let filterForFamily = url.searchParams.get('family') === 'true'; - return { - sessions, - filterForFamily - }; + // let { event } = await parent(); + // const sessions = await querySessionsBySlug({ slug: event.slug, pageSize: 250 }); + + // return { + // sessions, + // filterForFamily + // }; } diff --git a/src/routes/events/(thatConferences)/wi/[year]/sponsors/+page.js b/src/routes/events/(thatConferences)/wi/[year]/sponsors/+page.js index 64988253a..04dd2c1bc 100644 --- a/src/routes/events/(thatConferences)/wi/[year]/sponsors/+page.js +++ b/src/routes/events/(thatConferences)/wi/[year]/sponsors/+page.js @@ -1,18 +1,26 @@ -import lodash from 'lodash'; -import partnerQueryApi from '$dataSources/api.that.tech/partner/queries'; +// import lodash from 'lodash'; +// import partnerQueryApi from '$dataSources/api.that.tech/partner/queries'; +import { redirect, error } from '@sveltejs/kit'; +import { thatConferenceRedirect as tcr } from '$utils/config.public.js'; -export async function load({ params, fetch }) { - const { groupBy } = lodash; +export async function load({ params }) { const { year } = params; - const { getEventPartners } = partnerQueryApi(fetch); + if (!Number.isInteger(Number.parseInt(year, 10))) { + throw error(404, 'Event not found'); + } + throw redirect(tcr.defaultStatus, `${tcr.baseUrl}/wi/${year}/sponsors/`); - const eventSlug = `wi/${year}`; + // const { groupBy } = lodash; + // const { year } = params; + // const { getEventPartners } = partnerQueryApi(fetch); - const event = await getEventPartners(eventSlug); - const levels = groupBy(event.partners, 'level'); + // const eventSlug = `wi/${year}`; - return { - event, - levels - }; + // const event = await getEventPartners(eventSlug); + // const levels = groupBy(event.partners, 'level'); + + // return { + // event, + // levels + // }; } diff --git a/src/routes/events/(thatConferences)/wi/[year]/tickets/+page.js b/src/routes/events/(thatConferences)/wi/[year]/tickets/+page.js new file mode 100644 index 000000000..452357bfc --- /dev/null +++ b/src/routes/events/(thatConferences)/wi/[year]/tickets/+page.js @@ -0,0 +1,10 @@ +import { redirect, error } from '@sveltejs/kit'; +import { thatConferenceRedirect as tcr } from '$utils/config.public.js'; + +export function load({ params }) { + const { year } = params; + if (!Number.isInteger(Number.parseInt(year, 10))) { + throw error(404, 'Event not found'); + } + throw redirect(tcr.defaultStatus, `${tcr.baseUrl}/wi/${year}/tickets/`); +} diff --git a/src/routes/events/(thatConferences)/wi/[year]/travel/+page.js b/src/routes/events/(thatConferences)/wi/[year]/travel/+page.js index cdf8a32b5..80a9e358a 100644 --- a/src/routes/events/(thatConferences)/wi/[year]/travel/+page.js +++ b/src/routes/events/(thatConferences)/wi/[year]/travel/+page.js @@ -1,7 +1,10 @@ -import { redirect } from '@sveltejs/kit'; +import { redirect, error } from '@sveltejs/kit'; +import { thatConferenceRedirect as tcr } from '$utils/config.public.js'; -export async function load({ parent }) { - const { eventName } = await parent(); - - throw redirect(302, `/support/travel/${eventName}/`); +export function load({ params }) { + const { year } = params; + if (!Number.isInteger(Number.parseInt(year, 10))) { + throw error(404, 'Event not found'); + } + throw redirect(tcr.defaultStatus, `${tcr.baseUrl}/wi/${year}/travel/`); } diff --git a/src/routes/family/+page.js b/src/routes/family/+page.js index f87a92fa2..47a7933ff 100644 --- a/src/routes/family/+page.js +++ b/src/routes/family/+page.js @@ -1,5 +1,6 @@ import { redirect } from '@sveltejs/kit'; +import { thatConferenceRedirect as tcr } from '$utils/config.public.js'; export async function load() { - throw redirect(302, `/events/wi/2023/schedule/?family=true`); + throw redirect(301, `${tcr.baseUrl}/family`); } diff --git a/src/routes/sponsorships/apply/+page.js b/src/routes/sponsorships/apply/+page.js index 129417967..a359fc322 100644 --- a/src/routes/sponsorships/apply/+page.js +++ b/src/routes/sponsorships/apply/+page.js @@ -1,5 +1,6 @@ import { redirect } from '@sveltejs/kit'; +import { thatConferenceRedirect as tcr } from '$utils/config.public.js'; export async function load() { - throw redirect(301, `https://thatconference.com/sponsorships/apply`); + throw redirect(301, `${tcr.baseUrl}/sponsorships/apply`); } diff --git a/src/routes/that-conference/+page.js b/src/routes/that-conference/+page.js index 8ee74457b..35ad9b946 100644 --- a/src/routes/that-conference/+page.js +++ b/src/routes/that-conference/+page.js @@ -1,5 +1,6 @@ import { redirect } from '@sveltejs/kit'; +import { thatConferenceRedirect as tcr } from '$utils/config.public.js'; export async function load() { - throw redirect(301, `https://thatconference.com/`); + throw redirect(301, `${tcr.baseUrl}/`); } diff --git a/src/routes/tx/+page.js b/src/routes/tx/+page.js index 3da685691..ed7e78278 100644 --- a/src/routes/tx/+page.js +++ b/src/routes/tx/+page.js @@ -1,6 +1,6 @@ import { redirect } from '@sveltejs/kit'; -import { events } from '$utils/config.public'; +import { thatConferenceRedirect as tcr } from '$utils/config.public.js'; export async function load() { - throw redirect(301, `https://thatconference.com/${events.next.tx.slug}/`); + throw redirect(301, `${tcr.baseUrl}/tx`); } diff --git a/src/routes/wi/+page.js b/src/routes/wi/+page.js index a0e12f098..6d16b697a 100644 --- a/src/routes/wi/+page.js +++ b/src/routes/wi/+page.js @@ -1,6 +1,6 @@ import { redirect } from '@sveltejs/kit'; -import { events } from '$utils/config.public'; +import { thatConferenceRedirect as tcr } from '$utils/config.public.js'; export async function load() { - throw redirect(301, `https://thatconference.com/${events.next.wi.slug}/`); + throw redirect(301, `${tcr.baseUrl}/wi`); }