From 845b87b21f49e11738a0f38540d8432cc295f72f Mon Sep 17 00:00:00 2001 From: Rotimi Best Date: Thu, 14 Dec 2023 22:41:16 +0300 Subject: [PATCH] chore: update posthug and change all 301 to 307 --- .../classroomio-com/src/routes/demo/+page.server.ts | 7 +++---- .../src/routes/discord/+page.server.ts | 2 +- .../src/routes/github/+page.server.ts | 7 +++---- .../src/routes/privacy/+page.server.ts | 7 +++---- .../src/routes/signup/+page.server.ts | 2 +- apps/classroomio-com/src/routes/tos/+page.server.ts | 10 +++------- apps/dashboard/package.json | 2 +- .../src/lib/utils/services/courses/index.ts | 2 +- apps/dashboard/src/routes/+layout.server.ts | 13 ++----------- .../src/routes/invite/s/[hash]/+layout.server.ts | 2 +- .../src/routes/invite/t/[hash]/+layout.server.ts | 2 +- pnpm-lock.yaml | 8 ++++---- 12 files changed, 24 insertions(+), 40 deletions(-) diff --git a/apps/classroomio-com/src/routes/demo/+page.server.ts b/apps/classroomio-com/src/routes/demo/+page.server.ts index 429167f0..2ee58fc7 100644 --- a/apps/classroomio-com/src/routes/demo/+page.server.ts +++ b/apps/classroomio-com/src/routes/demo/+page.server.ts @@ -3,10 +3,9 @@ import { client } from '$lib/utils/posthog'; export const load = ({ request }) => { client.capture({ - distinctId: - request.headers.get('x-forwarded-for') || new Date().getTime().toString(), - event: 'cal.com page visited', + distinctId: request.headers.get('x-forwarded-for') || new Date().getTime().toString(), + event: 'cal.com page visited' }); - throw redirect(301, 'https://cal.com/classroomio/demo'); + throw redirect(307, 'https://cal.com/classroomio/demo'); }; diff --git a/apps/classroomio-com/src/routes/discord/+page.server.ts b/apps/classroomio-com/src/routes/discord/+page.server.ts index a8f73e36..0c535b01 100644 --- a/apps/classroomio-com/src/routes/discord/+page.server.ts +++ b/apps/classroomio-com/src/routes/discord/+page.server.ts @@ -7,5 +7,5 @@ export const load = ({ request }) => { event: 'discord page visited' }); - throw redirect(301, 'https://discord.gg/dRmxBpJw59'); + throw redirect(307, 'https://discord.gg/dRmxBpJw59'); }; diff --git a/apps/classroomio-com/src/routes/github/+page.server.ts b/apps/classroomio-com/src/routes/github/+page.server.ts index 00f1a1eb..9f0a2bb4 100644 --- a/apps/classroomio-com/src/routes/github/+page.server.ts +++ b/apps/classroomio-com/src/routes/github/+page.server.ts @@ -3,10 +3,9 @@ import { client } from '$lib/utils/posthog'; export const load = async ({ request }) => { client.capture({ - distinctId: - request.headers.get('x-forwarded-for') || new Date().getTime().toString(), - event: 'github page visited', + distinctId: request.headers.get('x-forwarded-for') || new Date().getTime().toString(), + event: 'github page visited' }); - throw redirect(301, 'https://github.com/rotimi-best/classroomio'); + throw redirect(307, 'https://github.com/rotimi-best/classroomio'); }; diff --git a/apps/classroomio-com/src/routes/privacy/+page.server.ts b/apps/classroomio-com/src/routes/privacy/+page.server.ts index 2c963eeb..e7eed430 100644 --- a/apps/classroomio-com/src/routes/privacy/+page.server.ts +++ b/apps/classroomio-com/src/routes/privacy/+page.server.ts @@ -3,13 +3,12 @@ import { client } from '$lib/utils/posthog'; export const load = async ({ request }) => { client.capture({ - distinctId: - request.headers.get('x-forwarded-for') || new Date().getTime().toString(), - event: 'privacy page visited', + distinctId: request.headers.get('x-forwarded-for') || new Date().getTime().toString(), + event: 'privacy page visited' }); throw redirect( - 301, + 307, 'https://app.enzuzo.com/policies/privacy/958fc978-5477-11ee-a03b-7b111830c594' ); }; diff --git a/apps/classroomio-com/src/routes/signup/+page.server.ts b/apps/classroomio-com/src/routes/signup/+page.server.ts index 7b939c84..80fb0df3 100644 --- a/apps/classroomio-com/src/routes/signup/+page.server.ts +++ b/apps/classroomio-com/src/routes/signup/+page.server.ts @@ -7,5 +7,5 @@ export const load = ({ request }) => { event: 'signup' }); - throw redirect(301, 'https://app.classroomio.com/signup'); + throw redirect(307, 'https://app.classroomio.com/signup'); }; diff --git a/apps/classroomio-com/src/routes/tos/+page.server.ts b/apps/classroomio-com/src/routes/tos/+page.server.ts index 54fd756c..9be734a0 100644 --- a/apps/classroomio-com/src/routes/tos/+page.server.ts +++ b/apps/classroomio-com/src/routes/tos/+page.server.ts @@ -3,13 +3,9 @@ import { client } from '$lib/utils/posthog'; export const load = async ({ request }) => { client.capture({ - distinctId: - request.headers.get('x-forwarded-for') || new Date().getTime().toString(), - event: 'privacy page visited', + distinctId: request.headers.get('x-forwarded-for') || new Date().getTime().toString(), + event: 'privacy page visited' }); - throw redirect( - 301, - 'https://app.enzuzo.com/policies/tos/958fc978-5477-11ee-a03b-7b111830c594' - ); + throw redirect(307, 'https://app.enzuzo.com/policies/tos/958fc978-5477-11ee-a03b-7b111830c594'); }; diff --git a/apps/dashboard/package.json b/apps/dashboard/package.json index 9b09feb3..8eba87fd 100644 --- a/apps/dashboard/package.json +++ b/apps/dashboard/package.json @@ -45,7 +45,7 @@ "nodemailer": "^6.9.5", "openai-edge": "^1.2.2", "pluralize": "^8.0.0", - "posthog-js": "^1.87.2", + "posthog-js": "^1.96.0", "sirv": "^2.0.3", "svelte-email": "^0.0.4", "svelte-ui": "workspace:*", diff --git a/apps/dashboard/src/lib/utils/services/courses/index.ts b/apps/dashboard/src/lib/utils/services/courses/index.ts index c312a413..bda78fa2 100644 --- a/apps/dashboard/src/lib/utils/services/courses/index.ts +++ b/apps/dashboard/src/lib/utils/services/courses/index.ts @@ -64,7 +64,7 @@ export async function fetchCourse(courseId?: Course['id'], slug?: Course['slug'] if (!data || error) { console.log(`data`, data); console.log(`fetchCourse => error`, error); - // return this.redirect(301, '/courses'); + // return this.redirect(307, '/courses'); return { data, error }; } diff --git a/apps/dashboard/src/routes/+layout.server.ts b/apps/dashboard/src/routes/+layout.server.ts index 93baca55..13679606 100644 --- a/apps/dashboard/src/routes/+layout.server.ts +++ b/apps/dashboard/src/routes/+layout.server.ts @@ -31,15 +31,6 @@ export const load = async ({ url, cookies }): Promise => { const matches = url.host.match(/([a-z 0-9 -]+).*classroomio[.]com/); const subdomain = matches?.[1] ?? ''; - if (subdomain === 'app' && url.search && url.search?.includes('forwardTo')) { - const params = new URLSearchParams(url.search); - const forwardToURL = params.get('forwardTo'); - - if (forwardToURL) { - throw redirect(307, forwardToURL); - } - } - if (!blockedSubdomain.includes(subdomain)) { const answer = Array.isArray(matches) ? !!subdomain && subdomain !== 'www' : false; @@ -48,12 +39,12 @@ export const load = async ({ url, cookies }): Promise => { response.org = (await getCurrentOrg(response.orgSiteName, true)) || null; if (!response.org && !dev) { - throw redirect(301, 'https://app.classroomio.com/404?type=org'); + throw redirect(307, 'https://app.classroomio.com/404?type=org'); } } else if (subdomain === 'play' || debugPlay === 'true') { response.skipAuth = true; } else if (subdomain !== 'app' && !dev) { - throw redirect(301, 'https://app.classroomio.com'); + throw redirect(307, 'https://app.classroomio.com'); } return response; diff --git a/apps/dashboard/src/routes/invite/s/[hash]/+layout.server.ts b/apps/dashboard/src/routes/invite/s/[hash]/+layout.server.ts index 73439ae0..86d3cd65 100644 --- a/apps/dashboard/src/routes/invite/s/[hash]/+layout.server.ts +++ b/apps/dashboard/src/routes/invite/s/[hash]/+layout.server.ts @@ -26,6 +26,6 @@ export const load = async ({ params = { hash: '' } }) => { }; } catch (error) { console.error('Error decoding course invite params.hash', error); - throw redirect(301, '/404'); + throw redirect(307, '/404'); } }; diff --git a/apps/dashboard/src/routes/invite/t/[hash]/+layout.server.ts b/apps/dashboard/src/routes/invite/t/[hash]/+layout.server.ts index 743bb377..c9c57ab5 100644 --- a/apps/dashboard/src/routes/invite/t/[hash]/+layout.server.ts +++ b/apps/dashboard/src/routes/invite/t/[hash]/+layout.server.ts @@ -29,6 +29,6 @@ export const load = async ({ params = { hash: '' } }) => { }; } catch (error) { console.error('Error decoding invite params.hash', error); - throw redirect(301, '/404'); + throw redirect(307, '/404'); } }; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f2ffdefd..cb17bc58 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -169,8 +169,8 @@ importers: specifier: ^8.0.0 version: 8.0.0 posthog-js: - specifier: ^1.87.2 - version: 1.87.2 + specifier: ^1.96.0 + version: 1.96.0 sirv: specifier: ^2.0.3 version: 2.0.3 @@ -9242,8 +9242,8 @@ packages: picocolors: 1.0.0 source-map-js: 1.0.2 - /posthog-js@1.87.2: - resolution: {integrity: sha512-pdxEylfxwEDwwz7g5dunPucvAN51RAOWWQmkcqHsLNHlV5o5bTaTwcAXaWB1IUn3xKPuKYE2lqbdB3vC4H4rFQ==} + /posthog-js@1.96.0: + resolution: {integrity: sha512-nutEP3UbwjPt1a78KwBbdNBMhAY30lLjYXbBOPZ/juB9NDklmSqLF+lWImPcf6+rlXEhIboSr5sdTAF/R+Dasg==} dependencies: fflate: 0.4.8 dev: false