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

Promote Next/feature to Production #123

Merged
merged 4 commits into from
Oct 20, 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": "thatconference.com",
"version": "5.1.5",
"version": "5.1.7",
"description": "THATConference.com website",
"main": "index.js",
"type": "module",
Expand Down
2 changes: 1 addition & 1 deletion src/_components/activities/ActivityDetails.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -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}
<div class="h-24 w-24">
<a href={`/events/${event.slug}`} class="h-full w-full">
<a href={`/${event.slug}`} class="h-full w-full">
<img class="lazyload" src={event.logo} alt="Event Logo" />
</a>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/_components/cta/_HomePageCFP.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
<div class="relative bg-white px-4 py-6 shadow-lg sm:rounded-3xl sm:p-14">
<div class="mx-auto max-w-md">
<a href={`/events/${event.slug}`}>
<a href={`/${event.slug}`}>
<div
class="flex transform flex-col justify-center transition duration-500 ease-in-out hover:scale-105">
<img src={event.logo} class="h-24" alt="THAT Confernece Logo" />
Expand Down
10 changes: 4 additions & 6 deletions src/_components/cta/_TicketsOnSale.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
<div class="relative bg-white px-4 py-6 shadow-lg sm:rounded-3xl sm:p-14">
<div class="mx-auto max-w-md">
<a href={`/events/${event.slug}`}>
<a href={`/${event.slug}`}>
<div
class="flex transform flex-col justify-center transition duration-500 ease-in-out hover:scale-105">
<img src={event.logo} class="h-24" alt="THAT Confernece Logo" />
<img src={event.logo} class="h-24" alt="THAT Conference Logo" />
</div>
</a>

Expand All @@ -34,7 +34,7 @@
</div>

<div class="space-y-2 text-center">
<div class="p-8 ">
<div class="p-8">
<p class="text-xl font-extrabold tracking-tight text-gray-500">
{dayjs(event.startDate).format('MMMM D, YYYY')} - {dayjs(event.endDate).format(
'MMMM D, YYYY'
Expand All @@ -53,9 +53,7 @@
<div class="pt-6 text-base font-bold leading-6 sm:text-lg sm:leading-7">
<p>Still need a ticket?</p>
<p>
<a
href={`/events/${event.slug}/tickets`}
class="text-that-red hover:text-thatRed-600">
<a href={`/${event.slug}/tickets`} class="text-that-red hover:text-thatRed-600">
Purchase Now &rarr;
</a>
</p>
Expand Down
2 changes: 1 addition & 1 deletion src/_components/navigation/thatConference/NavHat.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

<span>-</span>

<a href={`/events/${event.slug}`}>
<a href={`/${event.slug}`}>
<div class="flex space-x-4 font-semibold uppercase tracking-wide antialiased">
<div class="flex items-center space-x-2 uppercase text-white">
<span>{venue.city}</span>
Expand Down
2 changes: 1 addition & 1 deletion src/routes/(redirects)/family/+page.js
Original file line number Diff line number Diff line change
@@ -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`);
}
5 changes: 5 additions & 0 deletions src/routes/(redirects)/membership/+page.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { redirect } from '@sveltejs/kit';

export async function load() {
throw redirect(302, 'https://that.us/membership/');
}
2 changes: 1 addition & 1 deletion src/routes/(root)/_root/components/ctaMembership.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<div class="mt-8 flex lg:mt-0 lg:flex-shrink-0">
<div class="inline-flex rounded-md shadow">
<a
href="/membership/"
href="/membership"
class="rounded-md border-2 border-transparent bg-thatOrange-400 px-8 py-3
text-base font-medium leading-6 text-white shadow
transition duration-150
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
description: `${event.description} at THAT`,
openGraph: {
type: 'website',
url: `https://thatconference.com/events/${eventSlug}`
url: `https://thatconference.com/${eventSlug}`
}
})
}))();
Expand Down
2 changes: 1 addition & 1 deletion src/routes/(that conferences)/tx/[year]/+page.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -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}`
}
})
}))();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@

<div class="mt-24 flex flex-col items-center">
<div class="animate-pulse">
<HighlightLink href={`/events/${event.slug}/tickets`}>
<HighlightLink href={`/${event.slug}/tickets`}>
<span class="text-xl font-bold uppercase tracking-wider"> View all ticket options </span>
</HighlightLink>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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`
}
})
}))();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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/`
}
})
}))();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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`
}
})
}))();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@

<div class="mt-24 flex flex-col items-center">
<div class="animate-pulse">
<HighlightLink href={`/events/${event.slug}/tickets`}>
<HighlightLink href={`/${event.slug}/tickets`}>
<span class="text-xl font-bold uppercase tracking-wider"> View all ticket options </span>
</HighlightLink>
</div>
Expand Down