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.

Sign up for GitHub

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

Jump to bottom

promote next/feature to production #11

Merged
merged 1 commit into from
Mar 21, 2023
Merged

promote next/feature to production #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "thatconference.com",
"version": "4.2.0",
"version": "4.3.0",
"description": "THATConference.com website",
"main": "index.js",
"type": "module",
Expand Down
28 changes: 14 additions & 14 deletions src/_utils/config.public.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,28 +77,28 @@ export const events = {
export const kalahari = {
passkey: {
wi: {
opens: '04/11/2023',
closes: '06/22/2023',
url: 'https://book.passkey.com/'
opens: '03/27/2023',
closes: '06/21/2023',
url: 'https://book.passkey.com/e/50528959'
},
tx: {
opens: '10/21/2023',
closes: '12/26/2023',
url: 'https://book.passkey.com/e/50408131'
opens: '10/21/2022',
closes: '12/26/2022',
url: 'https://book.passkey.com/e/'
}
},
speakerPasskey: {
'wi/2023': {
bookingUrl: 'https://book.passkey.com/',
start: '04/11/2023',
end: '06/22/2023',
blockCloseDate: '06/22/2023'
bookingUrl: 'https://book.passkey.com/e/50528993',
start: '03/27/2023',
end: '06/21/2023',
blockCloseDate: '06/21/2023'
},
'tx/2023': {
bookingUrl: 'https://book.passkey.com/e/50410736',
start: '10/21/2023',
end: '12/26/2023',
blockCloseDate: '12/26/2023'
bookingUrl: 'https://book.passkey.com/e/',
start: '10/21/2022',
end: '12/26/2022',
blockCloseDate: '12/26/2022'
}
}
};
26 changes: 18 additions & 8 deletions src/routes/support/travel/wi/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
description: '',
openGraph: {
type: 'website',
url: `https://thatconference.com/support/travel/wi/`
url: `https://that.us/support/travel/wi/`
}
})
}))();
Expand All @@ -32,6 +32,7 @@
const close = closeTime.format('dddd, MMMM D, YYYY');

const isRoomBlockOpen = dayjs().isBetween(openTime.subtract(1, 'day'), closeTime.add(1, 'day'));
const isNotOpenYet = dayjs().isBefore(openTime);
</script>

<Seo title={metaTags.title} tags={metaTags.tags} />
Expand Down Expand Up @@ -80,13 +81,13 @@
<h3>Room Types</h3>
<div class="flex space-x-4">
<div class="prose-md prose w-full rounded-md border bg-white p-4 shadow-md">
<h4>Double Queen Sofa</h4>
<p class="text-center">$200 + tax and fees</p>
<h4>Run of House</h4>
<p class="text-center">$249 + tax and fees</p>
</div>

<div class="prose-md prose w-full rounded-md border bg-white p-4 shadow-md ">
<h4>2 Bedroom Suite</h4>
<p class="text-center">$324 + tax and fees</p>
<h4>2 Bedroom, 2 Bath Patio</h4>
<p class="text-center">$369 + tax and fees</p>
</div>
</div>

Expand All @@ -102,8 +103,17 @@

<h3>Booking Your Reservation</h3>
<p>A dedicated website is now available for you to book your hotel room online.</p>
<p>
Please note that in addition to our negotiated room rates, all Kalahari available
rooms will show as an option to reserve.
</p>

{#if !isRoomBlockOpen}
{#if !isRoomBlockOpen && isNotOpenYet}
<p class="text-red-500">
Our discount block has not opened yet. Please come back on <span
class="font-semibold text-red-500">{open}</span>
</p>
{:else}
<p class="text-red-500">
Please note that our block discounts have ended, but you can still book your stay at
the Kalahari.
Expand All @@ -117,7 +127,7 @@
</div>
</div>

<div class="rounded-md bg-gray-100 px-12 shadow-md">
<div class="rounded-md bg-gray-100 px-12 shadow-md" hidden>
<div class="prose-md prose text-gray-500">
<div class="flex flex-col pb-12">
<h2>Staybridge Suites</h2>
Expand Down Expand Up @@ -158,7 +168,7 @@
<div class="prose-md prose mb-10 text-gray-500">
<h2>THAT Campsite</h2>

<p>The Kalahari Resort and Convention Center can be located at:</p>
<p>The Kalahari Resort and Convention Center is located at:</p>

<blockquote>
Kalahari Resorts and Convention Center<br />
Expand Down