From 55d9dd4016bc8338daad3820425279f1aa632c32 Mon Sep 17 00:00:00 2001 From: Brett Slaski Date: Fri, 20 Oct 2023 10:14:43 -0500 Subject: [PATCH 1/2] fix: references of /events/{slug} to {slug} --- package.json | 2 +- src/_components/activities/ActivityDetails.svelte | 2 +- src/_components/cta/_HomePageCFP.svelte | 2 +- src/_components/cta/_TicketsOnSale.svelte | 10 ++++------ .../navigation/thatConference/NavHat.svelte | 2 +- src/routes/(redirects)/family/+page.js | 2 +- .../[event]/[date]/+page.svelte | 2 +- src/routes/(that conferences)/tx/[year]/+page.svelte | 2 +- .../tx/[year]/_components/CamperTickets.svelte | 2 +- .../(that conferences)/tx/[year]/schedule/+page.svelte | 2 +- .../(that conferences)/tx/[year]/sponsors/+page.svelte | 2 +- .../(that conferences)/tx/[year]/tickets/+page.svelte | 2 +- .../wi/[year]/_components/CamperTickets.svelte | 2 +- 13 files changed, 16 insertions(+), 18 deletions(-) diff --git a/package.json b/package.json index fb44eca..6cba2e7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "thatconference.com", - "version": "5.1.5", + "version": "5.1.6", "description": "THATConference.com website", "main": "index.js", "type": "module", diff --git a/src/_components/activities/ActivityDetails.svelte b/src/_components/activities/ActivityDetails.svelte index 914a0ab..9f43965 100644 --- a/src/_components/activities/ActivityDetails.svelte +++ b/src/_components/activities/ActivityDetails.svelte @@ -369,7 +369,7 @@ class="flex flex-col items-center justify-center space-x-0 space-y-4 py-4 sm:flex-row sm:justify-start sm:space-x-8 sm:space-y-0"> {#if !isDailyActivity}
- + Event Logo
diff --git a/src/_components/cta/_HomePageCFP.svelte b/src/_components/cta/_HomePageCFP.svelte index 9869871..4530ce6 100644 --- a/src/_components/cta/_HomePageCFP.svelte +++ b/src/_components/cta/_HomePageCFP.svelte @@ -10,7 +10,7 @@ class="absolute inset-0 -skew-y-6 transform bg-gradient-to-r from-that-orange to-that-red shadow-lg sm:-rotate-6 sm:skew-y-0 sm:rounded-3xl" />
- +
THAT Confernece Logo diff --git a/src/_components/cta/_TicketsOnSale.svelte b/src/_components/cta/_TicketsOnSale.svelte index 0e3ba10..d71d41f 100644 --- a/src/_components/cta/_TicketsOnSale.svelte +++ b/src/_components/cta/_TicketsOnSale.svelte @@ -10,10 +10,10 @@ class="absolute inset-0 -skew-y-6 transform bg-gradient-to-r from-thatBlue-400 to-thatBlue-700 shadow-lg sm:-rotate-6 sm:skew-y-0 sm:rounded-3xl" />
- +
- THAT Confernece Logo + THAT Conference Logo
@@ -34,7 +34,7 @@
-
+

{dayjs(event.startDate).format('MMMM D, YYYY')} - {dayjs(event.endDate).format( 'MMMM D, YYYY' @@ -53,9 +53,7 @@

Still need a ticket?

- + Purchase Now →

diff --git a/src/_components/navigation/thatConference/NavHat.svelte b/src/_components/navigation/thatConference/NavHat.svelte index 73e7c2b..5321c30 100644 --- a/src/_components/navigation/thatConference/NavHat.svelte +++ b/src/_components/navigation/thatConference/NavHat.svelte @@ -35,7 +35,7 @@ - - +
{venue.city} diff --git a/src/routes/(redirects)/family/+page.js b/src/routes/(redirects)/family/+page.js index f87a92f..9e927c3 100644 --- a/src/routes/(redirects)/family/+page.js +++ b/src/routes/(redirects)/family/+page.js @@ -1,5 +1,5 @@ import { redirect } from '@sveltejs/kit'; export async function load() { - throw redirect(302, `/events/wi/2023/schedule/?family=true`); + throw redirect(302, `/wi/2023/schedule/?family=true`); } diff --git a/src/routes/(that conference online)/[event]/[date]/+page.svelte b/src/routes/(that conference online)/[event]/[date]/+page.svelte index 2f805a8..8b39984 100644 --- a/src/routes/(that conference online)/[event]/[date]/+page.svelte +++ b/src/routes/(that conference online)/[event]/[date]/+page.svelte @@ -35,7 +35,7 @@ description: `${event.description} at THAT`, openGraph: { type: 'website', - url: `https://thatconference.com/events/${eventSlug}` + url: `https://thatconference.com/${eventSlug}` } }) }))(); diff --git a/src/routes/(that conferences)/tx/[year]/+page.svelte b/src/routes/(that conferences)/tx/[year]/+page.svelte index 8b2dbfd..2a22c9d 100644 --- a/src/routes/(that conferences)/tx/[year]/+page.svelte +++ b/src/routes/(that conferences)/tx/[year]/+page.svelte @@ -33,7 +33,7 @@ description: `${event.description} at THAT`, openGraph: { type: 'website', - url: `https://thatconference.com/events/${event.slug}` + url: `https://thatconference.com/${event.slug}` } }) }))(); diff --git a/src/routes/(that conferences)/tx/[year]/_components/CamperTickets.svelte b/src/routes/(that conferences)/tx/[year]/_components/CamperTickets.svelte index a7d7708..3073cbb 100644 --- a/src/routes/(that conferences)/tx/[year]/_components/CamperTickets.svelte +++ b/src/routes/(that conferences)/tx/[year]/_components/CamperTickets.svelte @@ -266,7 +266,7 @@
- + View all ticket options
diff --git a/src/routes/(that conferences)/tx/[year]/schedule/+page.svelte b/src/routes/(that conferences)/tx/[year]/schedule/+page.svelte index 8427c1e..1b632e4 100644 --- a/src/routes/(that conferences)/tx/[year]/schedule/+page.svelte +++ b/src/routes/(that conferences)/tx/[year]/schedule/+page.svelte @@ -16,7 +16,7 @@ description: 'That Conference Texas Speakers and Schedule', openGraph: { type: 'website', - url: `https://thatconference.com/events/tx/${event.slug}/schedule` + url: `https://thatconference.com/tx/${event.slug}/schedule` } }) }))(); diff --git a/src/routes/(that conferences)/tx/[year]/sponsors/+page.svelte b/src/routes/(that conferences)/tx/[year]/sponsors/+page.svelte index aa1df3a..8a322f7 100644 --- a/src/routes/(that conferences)/tx/[year]/sponsors/+page.svelte +++ b/src/routes/(that conferences)/tx/[year]/sponsors/+page.svelte @@ -16,7 +16,7 @@ description: 'Thank you to those who support our great community every day.', openGraph: { type: 'website', - url: `https://thatconference.com/events/tx/${event.slug}/sponsors/` + url: `https://thatconference.com/tx/${event.slug}/sponsors/` } }) }))(); diff --git a/src/routes/(that conferences)/tx/[year]/tickets/+page.svelte b/src/routes/(that conferences)/tx/[year]/tickets/+page.svelte index 91ac08a..34c2553 100644 --- a/src/routes/(that conferences)/tx/[year]/tickets/+page.svelte +++ b/src/routes/(that conferences)/tx/[year]/tickets/+page.svelte @@ -21,7 +21,7 @@ description: 'Ticket Breakdown', openGraph: { type: 'website', - url: `https://thatconference.com/events/${event.slug}/tickets` + url: `https://thatconference.com/${event.slug}/tickets` } }) }))(); diff --git a/src/routes/(that conferences)/wi/[year]/_components/CamperTickets.svelte b/src/routes/(that conferences)/wi/[year]/_components/CamperTickets.svelte index 0d5d54e..6518586 100644 --- a/src/routes/(that conferences)/wi/[year]/_components/CamperTickets.svelte +++ b/src/routes/(that conferences)/wi/[year]/_components/CamperTickets.svelte @@ -275,7 +275,7 @@
- + View all ticket options
From 44d5be1f30bbcad2fe2507d0e45b2ae41e25082b Mon Sep 17 00:00:00 2001 From: Brett Slaski Date: Fri, 20 Oct 2023 10:26:45 -0500 Subject: [PATCH 2/2] refactor: /membership route to that.us in the short term --- package.json | 2 +- src/routes/(redirects)/membership/+page.js | 5 +++++ src/routes/(root)/_root/components/ctaMembership.svelte | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 src/routes/(redirects)/membership/+page.js diff --git a/package.json b/package.json index 6cba2e7..f507f25 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "thatconference.com", - "version": "5.1.6", + "version": "5.1.7", "description": "THATConference.com website", "main": "index.js", "type": "module", diff --git a/src/routes/(redirects)/membership/+page.js b/src/routes/(redirects)/membership/+page.js new file mode 100644 index 0000000..0d0d67c --- /dev/null +++ b/src/routes/(redirects)/membership/+page.js @@ -0,0 +1,5 @@ +import { redirect } from '@sveltejs/kit'; + +export async function load() { + throw redirect(302, 'https://that.us/membership/'); +} diff --git a/src/routes/(root)/_root/components/ctaMembership.svelte b/src/routes/(root)/_root/components/ctaMembership.svelte index 4ebc90b..0b14ed1 100644 --- a/src/routes/(root)/_root/components/ctaMembership.svelte +++ b/src/routes/(root)/_root/components/ctaMembership.svelte @@ -13,7 +13,7 @@