Merge pull request #40 from ThatConference/chore/bring-tc-up-to-date

Chore/bring tc up to date

.all-contributorsrc

@@ -1,7 +1,5 @@
 {
-	"files": [
-		"README.md"
-	],
+	"files": ["README.md"],
 	"imageSize": 100,
 	"commit": false,
 	"contributors": [
@@ -10,26 +8,18 @@
 			"name": "Clark Sell",
 			"avatar_url": "https://avatars1.githubusercontent.com/u/772569?v=4",
 			"profile": "http://unspecified.io",
-			"contributions": [
-				"code",
-				"content",
-				"design"
-			]
+			"contributions": ["code", "content", "design"]
 		},
 		{
 			"login": "brettski",
 			"name": "Brett Slaski",
 			"avatar_url": "https://avatars3.githubusercontent.com/u/473633?v=4",
 			"profile": "http://blog.brettski.com",
-			"contributions": [
-				"code",
-				"infra",
-				"maintenance"
-			]
+			"contributions": ["code", "infra", "maintenance"]
 		}
 	],
 	"contributorsPerLine": 7,
-	"projectName": "that.us",
+	"projectName": "thatconference.com",
 	"projectOwner": "ThatConference",
 	"repoType": "github",
 	"repoHost": "https://github.com",

README.md

@@ -1,6 +1,6 @@
-# THAT.US
+# THAT CONFERENCE.COM
 
-[![GitHub issues open](https://img.shields.io/github/issues/thatconference/that.us.svg)](https://github.com/thatconference/that.us/issues) [![release](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/thatconference/that.us/issues) <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
+[![GitHub issues open](https://img.shields.io/github/issues/thatconference/that.us.svg)](https://github.com/thatconference/thatconference.com/issues) [![release](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/thatconference/thatconference.com/issues) <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
 [![All Contributors](https://img.shields.io/badge/all_contributors-49-orange.svg?style=flat-square)](#contributors-)
 
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
@@ -69,8 +69,8 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
 <table>
   <tbody>
     <tr>
-      <td align="center" valign="top" width="14.28%"><a href="http://unspecified.io"><img src="https://avatars1.githubusercontent.com/u/772569?v=4?s=100" width="100px;" alt="Clark Sell"/><br /><sub><b>Clark Sell</b></sub></a><br /><a href="https://github.com/ThatConference/that.us/commits?author=csell5" title="Code">💻</a> <a href="#content-csell5" title="Content">🖋</a> <a href="#design-csell5" title="Design">🎨</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://blog.brettski.com"><img src="https://avatars3.githubusercontent.com/u/473633?v=4?s=100" width="100px;" alt="Brett Slaski"/><br /><sub><b>Brett Slaski</b></sub></a><br /><a href="https://github.com/ThatConference/that.us/commits?author=brettski" title="Code">💻</a> <a href="#infra-brettski" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#maintenance-brettski" title="Maintenance">🚧</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="http://unspecified.io"><img src="https://avatars1.githubusercontent.com/u/772569?v=4?s=100" width="100px;" alt="Clark Sell"/><br /><sub><b>Clark Sell</b></sub></a><br /><a href="https://github.com/ThatConference/thatconference.com/commits?author=csell5" title="Code">💻</a> <a href="#content-csell5" title="Content">🖋</a> <a href="#design-csell5" title="Design">🎨</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="http://blog.brettski.com"><img src="https://avatars3.githubusercontent.com/u/473633?v=4?s=100" width="100px;" alt="Brett Slaski"/><br /><sub><b>Brett Slaski</b></sub></a><br /><a href="https://github.com/ThatConference/thatconference.com/commits?author=brettski" title="Code">💻</a> <a href="#infra-brettski" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#maintenance-brettski" title="Maintenance">🚧</a></td>
     </tr>
   </tbody>
 </table>

src/_components/SponsorSimple.svelte

@@ -76,7 +76,7 @@
 								<div class="flex flex-wrap items-center justify-center">
 									{#each partners as p}
 										<div
-											class="w-1/3 transform p-4 transition duration-500 ease-in-out hover:scale-105">
+											class="w-1/2 transform p-2 transition duration-500 ease-in-out hover:scale-105">
 											<a href="/partners/{p.slug}/">
 												<img class="lazyload h-24 w-full" src={p.companyLogo} alt={p.companyName} />
 											</a>

src/_components/activities/elements/CalendarButton.svelte

@@ -27,7 +27,7 @@
 
 <a
 	href={url}
-	download={`${slug}@that.us.ics`}
+	download={`${slug}@thatconference.com.ics`}
 	on:click={createICal}
 	class="inline-flex items-center justify-center px-4 py-2">
 	<Icon data={calendarCheckO} class="-ml-1 mr-2 h-4 w-4" />

src/_components/events/FAQ.svelte

@@ -4,23 +4,23 @@
 	const faqs = [
 		{
 			q: 'Can I buy on behalf of someone else?',
-			a: 'Yes. Once the ticket is purchased you can visit your order history and assign it to any member of THAT. https://that.us/my/settings/order-history'
+			a: 'Yes. Once the ticket is purchased you can visit your order history and assign it to any member of THAT. https://thatconference.com/my/settings/order-history'
 		},
 		{
 			q: 'Can I transfer my ticket?',
-			a: 'Yes, visit your order history and assign it to any member of THAT. https://that.us/my/settings/order-history'
+			a: 'Yes, visit your order history and assign it to any member of THAT. https://thatconference.com/my/settings/order-history'
 		},
 		{
 			q: 'Can I buy bulk tickets?',
 			a: 'Yes, although if you would like a bulk discount please email us @ hello@that.us.'
 		},
 		{
 			q: 'Where do I find my annual membership discount code?',
-			a: 'https://that.us/my/settings/membership'
+			a: 'https://thatconference.com/my/settings/membership'
 		},
 		{
 			q: 'Do you have a discounted rate on room and board?',
-			a: 'Yes, more information can be found here: https://that.us/support/travel'
+			a: 'Yes, more information can be found here: https://thatconference.com/support/travel'
 		},
 		{
 			q: "I'm interested in becoming a sponsor.",

src/_components/events/thatconference/_components/EventCard.svelte

@@ -29,8 +29,7 @@
 				<div class="divide-y divide-gray-200">
 					<div class="space-y-4 py-8 text-base leading-6 text-gray-700 sm:text-lg sm:leading-7">
 						<div>
-							Keynotes, Workshops, Sessions, Open Spaces, a pig roast, and even a Waterpark party.
-							Hurry camp starts soon!
+							{event.description}
 						</div>
 
 						<div class="pt-2 text-base font-bold leading-6 sm:text-lg sm:leading-7">

src/_components/navigation/thatConference/MobileNavHat.svelte

@@ -3,11 +3,11 @@
 </script>
 
 <div class="relative col-span-1 grid h-14 place-self-center bg-that-navy text-white">
-	<div class="mx-8 flex items-center justify-between  ">
+	<div class="mx-8 flex items-center justify-between">
 		<div class="font-semibold antialiased">
-			<a href="/" class="flex items-center space-x-2 ">
+			<a href="/" class="flex items-center space-x-2">
 				<LeftArrow />
-				<span>Back to THAT.us</span>
+				<span>Back to thatconference.com</span>
 			</a>
 		</div>
 	</div>

src/app.html

@@ -8,7 +8,7 @@
 		<meta name="theme-color" content="#16215A" media="(prefers-color-scheme: dark)" />
 
 		<link rel="preconnect" href="https://that.imgix.net" />
-		<link rel="canonical" href="https://www.that.us/" />
+		<link rel="canonical" href="https://thatconference.com/" />
 		<link rel="shortcut icon" type="image/png" href="/favicon.png" />
 		<link rel="icon" href="/favicon.ico" />
 		<link rel="icon" type="image/png" href="/favicon.png" />
@@ -30,9 +30,9 @@
 			{
 				"@context": "http://schema.org",
 				"@type": "Organization",
-				"url": "https://that.us/",
+				"url": "https://thatconference.com/",
 				"name": "THAT Logo",
-				"logo": "https://that.us/that-logo.png",
+				"logo": "https://thatconference.com/that-logo.png",
 				"sameAs": [
 					"https://thatconference.com",
 					"https://www.facebook.com/THATconference/",

src/hooks.client.js

@@ -1,7 +1,7 @@
 import * as Sentry from '@sentry/sveltekit';
 
 Sentry.init({
-	dsn: 'https://15d4b436dc0a4366a0ac388c65772926@o235190.ingest.sentry.io/5357492',
+	dsn: 'https://857800ed593d481bb0da2843516d7845@o235190.ingest.sentry.io/4504617287417856',
 	tracesSampleRate: 1,
 	replaysSessionSampleRate: 0.1,
 	replaysOnErrorSampleRate: 1,

src/hooks.server.js

@@ -2,7 +2,7 @@ import { sequence } from '@sveltejs/kit/hooks';
 import * as Sentry from '@sentry/sveltekit';
 
 Sentry.init({
-	dsn: 'https://15d4b436dc0a4366a0ac388c65772926@o235190.ingest.sentry.io/5357492',
+	dsn: 'https://857800ed593d481bb0da2843516d7845@o235190.ingest.sentry.io/4504617287417856',
 	tracesSampleRate: 1
 });
 

src/lib/config.private.js

@@ -7,7 +7,7 @@ function configMissing(configKey) {
 
 export const securityConfig = () => {
 	const config = {
-		baseURL: env.AUTH0_BASE_URL || 'https://that.us',
+		baseURL: env.AUTH0_BASE_URL || 'https://thatconference.com',
 		clientSecret: env.AUTH0_CLIENT_SECRET || configMissing('AUTH0_CLIENT_SECRET'),
 		secret: env.AUTH0_SECRET || configMissing('AUTH0_CLIENT_SECRET')
 	};

src/lib/config.public.js

@@ -25,7 +25,7 @@ export default {
 export const securityConfig = () => {
 	const config = {
 		clientID: env.PUBLIC_AUTH0_CLIENT_ID || configMissing('PUBLIC_AUTH0_CLIENT_ID'),
-		baseURL: env.PUBLIC_AUTH0_BASE_URL || `https://that.us`,
+		baseURL: env.PUBLIC_AUTH0_BASE_URL || `https://thatconference.com`,
 		issuerBaseURL: `https://auth.that.tech`,
 
 		authorizationParams: {
@@ -69,7 +69,7 @@ export const imageCrops = {
 
 export const claimCodes = [
 	{
-		72924: {
+		73024: {
 			eventSlug: 'wi/2024',
 			eventTitle: 'THAT Conference Wisconsin'
 		}
@@ -101,7 +101,7 @@ export const kalahari = {
 			url: 'https://book.passkey.com/e/50528959'
 		},
 		tx: {
-			opens: '09/13/2023',
+			opens: '09/19/2023',
 			closes: '01/08/2024',
 			url: 'https://book.passkey.com/e/50671911'
 		}
@@ -116,7 +116,7 @@ export const kalahari = {
 		},
 		'tx/2024': {
 			bookingUrl: 'https://book.passkey.com/e/50671918',
-			start: '09/13/2023',
+			start: '09/19/2023',
 			end: '01/08/2024',
 			blockCloseDate: '01/08/2023',
 			accessCode: 'THATSPEAK'

src/lib/gfetch.js

@@ -13,7 +13,7 @@ function init(fetch) {
 	let headers = {
 		credentials: 'include',
 		'Content-Type': 'application/json',
-		'that-site': 'that.us'
+		'that-site': 'thatconference.com'
 		// 'that-correlation-id': createCorrelationId()
 	};
 

src/lib/ical.js

@@ -1,21 +1,21 @@
 import ical from 'ical-generator'; // https://github.com/sebbo2002/ical-generator
 import dayjs from 'dayjs';
 
-const domain = 'that.us';
+const domain = 'thatconference.com/';
 
 function icalWrapper(title) {
 	const cal = ical({ domain, name: title });
 
 	function create(activity) {
 		cal.createEvent({
-			prodId: '//THAT Conference//THAT.us//EN',
+			prodId: '//THAT Conference//thatconference.com//EN',
 			uid: `that-${activity.id}`,
 			start: dayjs(activity.startTime).toDate(),
 			end: dayjs(activity.startTime).add(activity.durationInMinutes, 'minutes').toDate(),
 			summary: activity.title,
 			description: activity.shortDescription,
-			location: 'THAT.us',
-			url: `https://that.us/activities/${activity.id}`
+			location: 'THAT Conference',
+			url: `https://thatconference.com/activities/${activity.id}`
 		});
 
 		return cal.toURL();

src/lib/seo/metaTags.js

@@ -88,10 +88,16 @@ const create = (metaData) => {
 		content: ogimages.twitter
 	});
 
-	results.push({ property: 'twitter:site', content: metaData.twitter?.site || 'https://that.us/' });
+	results.push({
+		property: 'twitter:site',
+		content: metaData.twitter?.site || 'https://thatconference.com/'
+	});
 
 	// open graph components
-	results.push({ property: 'og:url', content: metaData.openGraph?.url || 'https://that.us/' });
+	results.push({
+		property: 'og:url',
+		content: metaData.openGraph?.url || 'https://thatconference.com/'
+	});
 	results.push({ property: 'og:site_property', content: 'THAT' });
 	results.push({
 		property: 'og:type',

src/routes/(admin my)/my/favorites/+page.svelte

@@ -21,7 +21,7 @@
 			description: "You're list of favorited activities.",
 			openGraph: {
 				type: 'website',
-				url: `https://that.us/my/favorites`
+				url: `https://thatconference.com/my/favorites`
 			},
 			noindex: true,
 			nofollow: true
@@ -40,7 +40,7 @@
 			title: a.title ? a.title : '',
 			speakers: a.speakers.map((s) => `${s.firstName} ${s.lastName}`).join(';'),
 			priCategory: a.priCategory ? a.priCategory : '',
-			sessionLink: `https://that.us/activites/${a.id}/`,
+			sessionLink: `https://thatconference.com/activites/${a.id}/`,
 			sessionType: a.type
 		}));
 

src/routes/(admin my)/my/network/+layout.svelte

@@ -14,7 +14,7 @@
 			description: 'Your Network.',
 			openGraph: {
 				type: 'website',
-				url: `https://that.us/my/network`
+				url: `https://thatconference.com/my/network`
 			},
 			nofollow: true,
 			noindex: true

src/routes/(admin my)/my/profiles/primary/+page.svelte

@@ -14,7 +14,7 @@
 			description: 'Create or update your system profile.',
 			openGraph: {
 				type: 'website',
-				url: `https://that.us/my/profiles/primary/`
+				url: `https://thatconference.com/my/profiles/primary/`
 			},
 			nofollow: true,
 			noindex: true

src/routes/(admin my)/my/profiles/primary/profileForm.svelte

@@ -123,7 +123,7 @@
 				<span
 					class="form-input inline-flex items-center rounded-l-md border border-r-0
                 border-gray-300 bg-gray-50 px-3 text-gray-500">
-					https://that.us/members/
+					https://thatconference.com/members/
 				</span>
 
 				<input

src/routes/(admin my)/my/profiles/public/+page.svelte

@@ -60,7 +60,7 @@
 			description: 'Create or update your THAT profile.',
 			openGraph: {
 				type: 'website',
-				url: `https://that.us/my/profiles/primary/`
+				url: `https://thatconference.com/my/profiles/primary/`
 			},
 			nofollow: true,
 			noindex: true

src/routes/(admin my)/my/profiles/slack/+page.svelte

@@ -18,7 +18,7 @@
 			description: 'Joing THAT Slack.',
 			openGraph: {
 				type: 'website',
-				url: `https://that.us/my/profiles/slack/`
+				url: `https://thatconference.com/my/profiles/slack/`
 			},
 			nofollow: true,
 			noindex: true

src/routes/(admin my)/my/settings/badges/+page.svelte

@@ -19,7 +19,7 @@
 			description: "You've worked hard to earn some awesome merit badges.",
 			openGraph: {
 				type: 'website',
-				url: `https://that.us/my/settings/badges/`
+				url: `https://thatconference.com/my/settings/badges/`
 			},
 			nofollow: true,
 			noindex: true

src/routes/(admin my)/my/settings/membership/+page.svelte

@@ -21,7 +21,7 @@
 			description: 'View your membership settings.',
 			openGraph: {
 				type: 'website',
-				url: `https://that.us/my/settings/membership/`
+				url: `https://thatconference.com/my/settings/membership/`
 			},
 			nofollow: true,
 			noindex: true

src/routes/(admin my)/my/submissions/+page.svelte

@@ -20,7 +20,7 @@
 			description: 'Your activities.',
 			openGraph: {
 				type: 'website',
-				url: `https://that.us/my/submissions`
+				url: `https://thatconference.com/my/submissions`
 			},
 			nofollow: true,
 			noindex: true

src/routes/(admin sponsor)/sponsor-admin/leads/[eventId]/+page.svelte

@@ -19,7 +19,7 @@
 			description: '',
 			openGraph: {
 				type: 'website',
-				url: `https://that.us/partners/leads`
+				url: `https://thatconference.com/partners/leads`
 			},
 			noindex: true,
 			nofollow: true

src/routes/(admin sponsor)/sponsor-admin/my-network/+page.svelte

@@ -16,7 +16,7 @@
 			description: '',
 			openGraph: {
 				type: 'website',
-				url: 'https://that.us/my/partners/my-network'
+				url: 'https://thatconference.com/my/partners/my-network'
 			},
 			noindex: true,
 			nofollow: true

src/routes/(admin)/admin/check-in/[eventName]/[year]/+page.svelte

@@ -14,7 +14,7 @@
 			description: 'Event check-in',
 			openGraph: {
 				type: 'website',
-				url: 'https://that.us/'
+				url: 'https://thatconference.com/'
 			},
 			noindex: true,
 			nofollow: true

src/routes/(root)/+error.svelte

@@ -13,7 +13,7 @@
 			description: "Well THAT's No Good.",
 			openGraph: {
 				type: 'website',
-				url: `https://that.us/`
+				url: `https://thatconference.com/`
 			},
 			noindex: true,
 			nofollow: true