From 5b0038cff48b6943e111cdc94dc4648c728474bb Mon Sep 17 00:00:00 2001 From: Clark Sell Date: Fri, 8 Dec 2023 08:52:50 -0600 Subject: [PATCH] refactor: updating language around activities vs open spaces --- .vscode/settings.json | 2 +- package.json | 2 +- .../activities/DiscordLinksModal.svelte | 8 +-- src/_components/activities/List.svelte | 21 ++++---- src/_components/nav/interiorNav/Large.svelte | 54 ++++--------------- src/_components/nav/interiorNav/Mobile.svelte | 21 ++++---- src/_components/nav/mainNav/links.js | 30 +++++------ src/_elements/ActionHeader.svelte | 2 +- src/app.html | 2 +- src/routes/activities/+page.svelte | 2 +- 10 files changed, 57 insertions(+), 87 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 79f65fd9b..561ed11a6 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -6,7 +6,7 @@ "editor.tabSize": 2, "editor.snippetSuggestions": "top", "editor.codeActionsOnSave": { - "source.fixAll": true + "source.fixAll": "explicit" }, "workbench.colorCustomizations": { "titleBar.activeForeground": "#000", diff --git a/package.json b/package.json index aa6bf8ec1..17bf1ed0e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "that-us", - "version": "3.16.4", + "version": "3.16.5", "description": "THAT.us website", "main": "index.js", "type": "module", diff --git a/src/_components/activities/DiscordLinksModal.svelte b/src/_components/activities/DiscordLinksModal.svelte index 18270a483..af529aac0 100644 --- a/src/_components/activities/DiscordLinksModal.svelte +++ b/src/_components/activities/DiscordLinksModal.svelte @@ -9,15 +9,15 @@ + text="THAT Open Spaces are now hosted in Discord as dedicated voice channels. Please use the +appropriate link below to get started and join. Please note: you have to be a member of THAT Discord to join.">
(showModal = false)}> (showModal = false)} - >Go as Discord Member + >Join Channel (showModal = false)} - >Go using Discord Invite + >I need a Discord invite.
diff --git a/src/_components/activities/List.svelte b/src/_components/activities/List.svelte index 934b13988..e75b0a75c 100644 --- a/src/_components/activities/List.svelte +++ b/src/_components/activities/List.svelte @@ -51,12 +51,14 @@ let activitiesTaggedFiltered = []; let family = true; let professional = filterForFamily ? false : true; - let regular = true; - let keynote = true; - let workshop = true; + let regular = false; + let keynote = false; + let workshop = false; let openSpace = true; let dense = false; + console.log('activities', activities); + $: { const tagsSet = new Set(); const communitiesSet = new Set(); @@ -92,12 +94,13 @@ activity.category === null ); - $: activitiesLocationCategoryFiltered = primaryCategorySort.filter( - (activity) => - (activity.type === 'REGULAR' ? regular : false) || - (activity.type === 'KEYNOTE' ? keynote : false) || - (activity.type === 'WORKSHOP' ? workshop : false) || - (activity.type === 'OPEN_SPACE' ? openSpace : false) + $: activitiesLocationCategoryFiltered = primaryCategorySort.filter((activity) => + (activity.type === 'REGULAR' ? regular : false) || + (activity.type === 'KEYNOTE' ? keynote : false) || + (activity.type === 'WORKSHOP' ? workshop : false) || + activity.type === 'OPEN_SPACE' + ? openSpace + : false ); $: activitiesTaggedFiltered = diff --git a/src/_components/nav/interiorNav/Large.svelte b/src/_components/nav/interiorNav/Large.svelte index ec5313397..1f555ebe1 100644 --- a/src/_components/nav/interiorNav/Large.svelte +++ b/src/_components/nav/interiorNav/Large.svelte @@ -3,10 +3,6 @@ import Icon from 'svelte-awesome'; import { plus } from '$components/svelte-awesome-icons'; - import { Activity } from '$elements/svgs'; - import { hasNotifications } from '$stores/notificationCenter'; - - import ActivitySlideOver from '../../activityCenter/ActivitySlideOver.svelte'; import DesktopLink from './_DesktopLink.svelte'; import UserProfile from '../UserProfile.svelte'; import { clickOutside } from '$elements/actions'; @@ -14,12 +10,7 @@ import Cart from '../Cart.svelte'; import ClaimCart from '../ClaimCart.svelte'; - let activityVisible; let helpVisible; - - function handleCloseActivityCenter() { - activityVisible = !activityVisible; - }
@@ -33,20 +24,18 @@
- Events + hover:bg-that-blue hover:text-white focus:bg-that-blue + focus:text-white focus:outline-none"> + Upcoming Open Spaces - - Activities + THAT Conference Communities - Blog - + -->
- Events + hover:bg-that-blue hover:text-white focus:bg-that-blue focus:text-white + focus:outline-none"> + Upcoming Open Spaces - Activities + THAT Conference Communities - Partners - - --> +
-

+

{title}

diff --git a/src/app.html b/src/app.html index 425aabd11..407959715 100644 --- a/src/app.html +++ b/src/app.html @@ -1,4 +1,4 @@ - + diff --git a/src/routes/activities/+page.svelte b/src/routes/activities/+page.svelte index aba6e6e8f..f8dc45ee1 100644 --- a/src/routes/activities/+page.svelte +++ b/src/routes/activities/+page.svelte @@ -73,7 +73,7 @@