Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

In-person redirect to thatconference.com #1477

Merged
merged 2 commits into from
Oct 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "that-us",
"version": "3.13.8",
"version": "3.14.0",
"description": "THAT.us website",
"main": "index.js",
"type": "module",
Expand Down
5 changes: 5 additions & 0 deletions src/_utils/config.public.js
Original file line number Diff line number Diff line change
Expand Up @@ -124,3 +124,8 @@ export const kalahari = {
}
}
};

export const thatConferenceRedirect = {
baseUrl: `https://thatconference.com`,
defaultStatus: 308
};
3 changes: 2 additions & 1 deletion src/routes/call-for-counselors/+page.js
Original file line number Diff line number Diff line change
@@ -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`);
}
3 changes: 2 additions & 1 deletion src/routes/cfp/+page.js
Original file line number Diff line number Diff line change
@@ -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`);
}
7 changes: 6 additions & 1 deletion src/routes/events/(online)/[event]/[date]/+layout.js
Original file line number Diff line number Diff line change
@@ -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
};
}
6 changes: 6 additions & 0 deletions src/routes/events/(thatConferences)/tx/+page.js
Original file line number Diff line number Diff line change
@@ -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`);
}
10 changes: 10 additions & 0 deletions src/routes/events/(thatConferences)/tx/[year]/+page.js
Original file line number Diff line number Diff line change
@@ -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}/`);
}
24 changes: 16 additions & 8 deletions src/routes/events/(thatConferences)/tx/[year]/schedule/+page.js
Original file line number Diff line number Diff line change
@@ -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
// };
}
32 changes: 20 additions & 12 deletions src/routes/events/(thatConferences)/tx/[year]/sponsors/+page.js
Original file line number Diff line number Diff line change
@@ -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
// };
}
10 changes: 10 additions & 0 deletions src/routes/events/(thatConferences)/tx/[year]/tickets/+page.js
Original file line number Diff line number Diff line change
@@ -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/`);
}
13 changes: 8 additions & 5 deletions src/routes/events/(thatConferences)/tx/[year]/travel/+page.js
Original file line number Diff line number Diff line change
@@ -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/`);
}
6 changes: 6 additions & 0 deletions src/routes/events/(thatConferences)/wi/+page.js
Original file line number Diff line number Diff line change
@@ -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/`);
}
10 changes: 10 additions & 0 deletions src/routes/events/(thatConferences)/wi/[year]/+page.js
Original file line number Diff line number Diff line change
@@ -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}/`);
}
28 changes: 18 additions & 10 deletions src/routes/events/(thatConferences)/wi/[year]/schedule/+page.js
Original file line number Diff line number Diff line change
@@ -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
// };
}
32 changes: 20 additions & 12 deletions src/routes/events/(thatConferences)/wi/[year]/sponsors/+page.js
Original file line number Diff line number Diff line change
@@ -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
// };
}
10 changes: 10 additions & 0 deletions src/routes/events/(thatConferences)/wi/[year]/tickets/+page.js
Original file line number Diff line number Diff line change
@@ -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/`);
}
13 changes: 8 additions & 5 deletions src/routes/events/(thatConferences)/wi/[year]/travel/+page.js
Original file line number Diff line number Diff line change
@@ -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/`);
}
3 changes: 2 additions & 1 deletion src/routes/family/+page.js
Original file line number Diff line number Diff line change
@@ -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`);
}
3 changes: 2 additions & 1 deletion src/routes/sponsorships/apply/+page.js
Original file line number Diff line number Diff line change
@@ -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`);
}
3 changes: 2 additions & 1 deletion src/routes/that-conference/+page.js
Original file line number Diff line number Diff line change
@@ -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}/`);
}
4 changes: 2 additions & 2 deletions src/routes/tx/+page.js
Original file line number Diff line number Diff line change
@@ -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`);
}
4 changes: 2 additions & 2 deletions src/routes/wi/+page.js
Original file line number Diff line number Diff line change
@@ -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`);
}