Merge pull request #1478 from ThatConference/next/feature

Promote Next/feature to production

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",

src/_utils/config.public.js

@@ -124,3 +124,8 @@ export const kalahari = {
 		}
 	}
 };
+
+export const thatConferenceRedirect = {
+	baseUrl: `https://thatconference.com`,
+	defaultStatus: 308
+};

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`);
 }

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`);
 }

src/routes/events/(online)/[event]/[date]/+layout.js

@@ -1,13 +1,18 @@
+import { error } from '@sveltejs/kit';
 import eventsApi from '$dataSources/api.that.tech/events/queries';
 
 export async function load({ params, fetch }) {
 	const { event, date } = params;
 	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
 	};
 }

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`);
+}

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}/`);
+}

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
+	// };
 }

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
+	// };
 }

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/`);
+}

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/`);
 }

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/`);
+}

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}/`);
+}

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
+	// };
 }

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
+	// };
 }

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/`);
+}

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/`);
 }

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`);
 }

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`);
 }

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}/`);
 }

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`);
 }

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`);
 }