From 2ce5fc1964ca8e5c19eb0f60958a696939fa1c52 Mon Sep 17 00:00:00 2001 From: "riho.takagi" Date: Mon, 22 Apr 2024 13:28:43 -0400 Subject: [PATCH 01/10] Update graphics files path --- src/lib/components/StreamPlayer.svelte | 4 ++-- src/lib/components/blocks/logoBlock.svelte | 2 +- src/lib/components/blocks/text.svelte | 2 +- src/lib/components/blocks/video.svelte | 2 +- src/lib/components/{ => common}/graphics/EyebeamLogo.svelte | 0 src/lib/components/{ => common}/graphics/SoundOff.svelte | 0 src/lib/components/{ => common}/graphics/SoundOn.svelte | 0 src/lib/components/{ => common}/graphics/animated-beam.svelte | 0 src/lib/components/{ => common}/graphics/arrow-down.svelte | 0 src/lib/components/{ => common}/graphics/arrow-left.svelte | 0 src/lib/components/{ => common}/graphics/arrow-up.svelte | 0 src/lib/components/{ => common}/graphics/big-beam.svelte | 0 src/lib/components/{ => common}/graphics/block-beam.svelte | 0 src/lib/components/{ => common}/graphics/external-link.svelte | 0 src/lib/components/{ => common}/graphics/full-beam.svelte | 0 src/lib/components/{ => common}/graphics/half-beam.svelte | 0 src/lib/components/{ => common}/graphics/hamburger.svelte | 0 src/lib/components/{ => common}/graphics/instagram.svelte | 0 src/lib/components/{ => common}/graphics/logo.svelte | 0 src/lib/components/{ => common}/graphics/menu-x.svelte | 0 src/lib/components/{ => common}/graphics/newsletter.svelte | 0 src/lib/components/{ => common}/graphics/pause-bars.svelte | 0 src/lib/components/{ => common}/graphics/play-arrow.svelte | 0 src/lib/components/{ => common}/graphics/search.svelte | 0 src/lib/components/{ => common}/graphics/triangle-down.svelte | 0 .../components/{ => common}/graphics/triangle-right.svelte | 0 src/lib/components/{ => common}/graphics/twitter.svelte | 0 src/lib/components/{ => common}/graphics/x.svelte | 0 src/lib/components/{ => common}/graphics/youtube.svelte | 0 src/lib/components/main-content.svelte | 2 +- src/lib/components/menubar.svelte | 4 ++-- src/lib/components/overlays/LoadingScreen.svelte | 2 +- src/lib/components/qa.svelte | 4 ++-- src/lib/components/see-also.svelte | 2 +- src/lib/components/text-components/Caption.svelte | 2 +- 35 files changed, 13 insertions(+), 13 deletions(-) rename src/lib/components/{ => common}/graphics/EyebeamLogo.svelte (100%) rename src/lib/components/{ => common}/graphics/SoundOff.svelte (100%) rename src/lib/components/{ => common}/graphics/SoundOn.svelte (100%) rename src/lib/components/{ => common}/graphics/animated-beam.svelte (100%) rename src/lib/components/{ => common}/graphics/arrow-down.svelte (100%) rename src/lib/components/{ => common}/graphics/arrow-left.svelte (100%) rename src/lib/components/{ => common}/graphics/arrow-up.svelte (100%) rename src/lib/components/{ => common}/graphics/big-beam.svelte (100%) rename src/lib/components/{ => common}/graphics/block-beam.svelte (100%) rename src/lib/components/{ => common}/graphics/external-link.svelte (100%) rename src/lib/components/{ => common}/graphics/full-beam.svelte (100%) rename src/lib/components/{ => common}/graphics/half-beam.svelte (100%) rename src/lib/components/{ => common}/graphics/hamburger.svelte (100%) rename src/lib/components/{ => common}/graphics/instagram.svelte (100%) rename src/lib/components/{ => common}/graphics/logo.svelte (100%) rename src/lib/components/{ => common}/graphics/menu-x.svelte (100%) rename src/lib/components/{ => common}/graphics/newsletter.svelte (100%) rename src/lib/components/{ => common}/graphics/pause-bars.svelte (100%) rename src/lib/components/{ => common}/graphics/play-arrow.svelte (100%) rename src/lib/components/{ => common}/graphics/search.svelte (100%) rename src/lib/components/{ => common}/graphics/triangle-down.svelte (100%) rename src/lib/components/{ => common}/graphics/triangle-right.svelte (100%) rename src/lib/components/{ => common}/graphics/twitter.svelte (100%) rename src/lib/components/{ => common}/graphics/x.svelte (100%) rename src/lib/components/{ => common}/graphics/youtube.svelte (100%) diff --git a/src/lib/components/StreamPlayer.svelte b/src/lib/components/StreamPlayer.svelte index 20759f9..613857f 100644 --- a/src/lib/components/StreamPlayer.svelte +++ b/src/lib/components/StreamPlayer.svelte @@ -13,8 +13,8 @@ import { quartOut } from "svelte/easing" import { isPhone } from "$lib/modules/ui.js" import getVideoId from "get-video-id" - import PlayArrow from "$lib/components/graphics/play-arrow.svelte" - import PauseBars from "$lib/components/graphics/pause-bars.svelte" + import PlayArrow from "$lib/components/common/graphics/play-arrow.svelte" + import PauseBars from "$lib/components/common/graphics/pause-bars.svelte" // *** PROPS export let streamUrl = "" diff --git a/src/lib/components/blocks/logoBlock.svelte b/src/lib/components/blocks/logoBlock.svelte index 81a0e81..d250f73 100644 --- a/src/lib/components/blocks/logoBlock.svelte +++ b/src/lib/components/blocks/logoBlock.svelte @@ -8,7 +8,7 @@ import Text from "./text.svelte" // __ GRAPHICS - import BlockBeam from "$lib/components/graphics/block-beam.svelte" + import BlockBeam from "$lib/components/common/graphics/block-beam.svelte" // *** PROPS export let b = {} diff --git a/src/lib/components/blocks/text.svelte b/src/lib/components/blocks/text.svelte index fce0333..43545b7 100644 --- a/src/lib/components/blocks/text.svelte +++ b/src/lib/components/blocks/text.svelte @@ -11,7 +11,7 @@ import PersonLink from "$lib/components/person-link.svelte" // __ GRAPHICS - import ExternalLink from "$lib/components/graphics/external-link.svelte" + import ExternalLink from "$lib/components/common/graphics/external-link.svelte" // *** PROPS export let b = {} diff --git a/src/lib/components/blocks/video.svelte b/src/lib/components/blocks/video.svelte index 536f8b0..1ca053c 100644 --- a/src/lib/components/blocks/video.svelte +++ b/src/lib/components/blocks/video.svelte @@ -10,7 +10,7 @@ import get from "lodash/get.js" // __ GRAPHICS - import PlayArrow from "$lib/components/graphics/play-arrow.svelte" + import PlayArrow from "$lib/components/common/graphics/play-arrow.svelte" // *** PROPS export let b = {} diff --git a/src/lib/components/graphics/EyebeamLogo.svelte b/src/lib/components/common/graphics/EyebeamLogo.svelte similarity index 100% rename from src/lib/components/graphics/EyebeamLogo.svelte rename to src/lib/components/common/graphics/EyebeamLogo.svelte diff --git a/src/lib/components/graphics/SoundOff.svelte b/src/lib/components/common/graphics/SoundOff.svelte similarity index 100% rename from src/lib/components/graphics/SoundOff.svelte rename to src/lib/components/common/graphics/SoundOff.svelte diff --git a/src/lib/components/graphics/SoundOn.svelte b/src/lib/components/common/graphics/SoundOn.svelte similarity index 100% rename from src/lib/components/graphics/SoundOn.svelte rename to src/lib/components/common/graphics/SoundOn.svelte diff --git a/src/lib/components/graphics/animated-beam.svelte b/src/lib/components/common/graphics/animated-beam.svelte similarity index 100% rename from src/lib/components/graphics/animated-beam.svelte rename to src/lib/components/common/graphics/animated-beam.svelte diff --git a/src/lib/components/graphics/arrow-down.svelte b/src/lib/components/common/graphics/arrow-down.svelte similarity index 100% rename from src/lib/components/graphics/arrow-down.svelte rename to src/lib/components/common/graphics/arrow-down.svelte diff --git a/src/lib/components/graphics/arrow-left.svelte b/src/lib/components/common/graphics/arrow-left.svelte similarity index 100% rename from src/lib/components/graphics/arrow-left.svelte rename to src/lib/components/common/graphics/arrow-left.svelte diff --git a/src/lib/components/graphics/arrow-up.svelte b/src/lib/components/common/graphics/arrow-up.svelte similarity index 100% rename from src/lib/components/graphics/arrow-up.svelte rename to src/lib/components/common/graphics/arrow-up.svelte diff --git a/src/lib/components/graphics/big-beam.svelte b/src/lib/components/common/graphics/big-beam.svelte similarity index 100% rename from src/lib/components/graphics/big-beam.svelte rename to src/lib/components/common/graphics/big-beam.svelte diff --git a/src/lib/components/graphics/block-beam.svelte b/src/lib/components/common/graphics/block-beam.svelte similarity index 100% rename from src/lib/components/graphics/block-beam.svelte rename to src/lib/components/common/graphics/block-beam.svelte diff --git a/src/lib/components/graphics/external-link.svelte b/src/lib/components/common/graphics/external-link.svelte similarity index 100% rename from src/lib/components/graphics/external-link.svelte rename to src/lib/components/common/graphics/external-link.svelte diff --git a/src/lib/components/graphics/full-beam.svelte b/src/lib/components/common/graphics/full-beam.svelte similarity index 100% rename from src/lib/components/graphics/full-beam.svelte rename to src/lib/components/common/graphics/full-beam.svelte diff --git a/src/lib/components/graphics/half-beam.svelte b/src/lib/components/common/graphics/half-beam.svelte similarity index 100% rename from src/lib/components/graphics/half-beam.svelte rename to src/lib/components/common/graphics/half-beam.svelte diff --git a/src/lib/components/graphics/hamburger.svelte b/src/lib/components/common/graphics/hamburger.svelte similarity index 100% rename from src/lib/components/graphics/hamburger.svelte rename to src/lib/components/common/graphics/hamburger.svelte diff --git a/src/lib/components/graphics/instagram.svelte b/src/lib/components/common/graphics/instagram.svelte similarity index 100% rename from src/lib/components/graphics/instagram.svelte rename to src/lib/components/common/graphics/instagram.svelte diff --git a/src/lib/components/graphics/logo.svelte b/src/lib/components/common/graphics/logo.svelte similarity index 100% rename from src/lib/components/graphics/logo.svelte rename to src/lib/components/common/graphics/logo.svelte diff --git a/src/lib/components/graphics/menu-x.svelte b/src/lib/components/common/graphics/menu-x.svelte similarity index 100% rename from src/lib/components/graphics/menu-x.svelte rename to src/lib/components/common/graphics/menu-x.svelte diff --git a/src/lib/components/graphics/newsletter.svelte b/src/lib/components/common/graphics/newsletter.svelte similarity index 100% rename from src/lib/components/graphics/newsletter.svelte rename to src/lib/components/common/graphics/newsletter.svelte diff --git a/src/lib/components/graphics/pause-bars.svelte b/src/lib/components/common/graphics/pause-bars.svelte similarity index 100% rename from src/lib/components/graphics/pause-bars.svelte rename to src/lib/components/common/graphics/pause-bars.svelte diff --git a/src/lib/components/graphics/play-arrow.svelte b/src/lib/components/common/graphics/play-arrow.svelte similarity index 100% rename from src/lib/components/graphics/play-arrow.svelte rename to src/lib/components/common/graphics/play-arrow.svelte diff --git a/src/lib/components/graphics/search.svelte b/src/lib/components/common/graphics/search.svelte similarity index 100% rename from src/lib/components/graphics/search.svelte rename to src/lib/components/common/graphics/search.svelte diff --git a/src/lib/components/graphics/triangle-down.svelte b/src/lib/components/common/graphics/triangle-down.svelte similarity index 100% rename from src/lib/components/graphics/triangle-down.svelte rename to src/lib/components/common/graphics/triangle-down.svelte diff --git a/src/lib/components/graphics/triangle-right.svelte b/src/lib/components/common/graphics/triangle-right.svelte similarity index 100% rename from src/lib/components/graphics/triangle-right.svelte rename to src/lib/components/common/graphics/triangle-right.svelte diff --git a/src/lib/components/graphics/twitter.svelte b/src/lib/components/common/graphics/twitter.svelte similarity index 100% rename from src/lib/components/graphics/twitter.svelte rename to src/lib/components/common/graphics/twitter.svelte diff --git a/src/lib/components/graphics/x.svelte b/src/lib/components/common/graphics/x.svelte similarity index 100% rename from src/lib/components/graphics/x.svelte rename to src/lib/components/common/graphics/x.svelte diff --git a/src/lib/components/graphics/youtube.svelte b/src/lib/components/common/graphics/youtube.svelte similarity index 100% rename from src/lib/components/graphics/youtube.svelte rename to src/lib/components/common/graphics/youtube.svelte diff --git a/src/lib/components/main-content.svelte b/src/lib/components/main-content.svelte index d86e58a..7884f34 100644 --- a/src/lib/components/main-content.svelte +++ b/src/lib/components/main-content.svelte @@ -18,7 +18,7 @@ import PersonLink from "$lib/components/person-link.svelte" // __ GRAPHICS - import ExternalLink from "$lib/components/graphics/external-link.svelte" + import ExternalLink from "$lib/components/common/graphics/external-link.svelte" // *** PROPS export let page diff --git a/src/lib/components/menubar.svelte b/src/lib/components/menubar.svelte index 3a8d2c3..ac66143 100644 --- a/src/lib/components/menubar.svelte +++ b/src/lib/components/menubar.svelte @@ -15,8 +15,8 @@ import Blocks from "$lib/components/blocks/blocks.svelte" // __ GRAPHICS - import FullBeam from "$lib/components/graphics/full-beam.svelte" - import ArrowDown from "$lib/components/graphics/arrow-down.svelte" + import FullBeam from "$lib/components/common/graphics/full-beam.svelte" + import ArrowDown from "$lib/components/common/graphics/arrow-down.svelte" // __ STORES import { trayOpen, activeCity,activeMouse, activeVideoLibrary,VIDEO_LIBRARY_SLUG, urlHash } from "$lib/modules/ui.js" diff --git a/src/lib/components/overlays/LoadingScreen.svelte b/src/lib/components/overlays/LoadingScreen.svelte index ee6ba97..1f310e4 100644 --- a/src/lib/components/overlays/LoadingScreen.svelte +++ b/src/lib/components/overlays/LoadingScreen.svelte @@ -5,7 +5,7 @@ // // # # # # # # # # # # # # # import { fade } from "svelte/transition" - import AnimatedBeam from "$lib/components/graphics/animated-beam.svelte" + import AnimatedBeam from "$lib/components/common/graphics/animated-beam.svelte"
diff --git a/src/lib/components/qa.svelte b/src/lib/components/qa.svelte index c955be0..275f89d 100644 --- a/src/lib/components/qa.svelte +++ b/src/lib/components/qa.svelte @@ -12,8 +12,8 @@ import Blocks from "$lib/components/blocks/blocks.svelte" // __ GRAPHICS - import ArrowDown from "$lib/components/graphics/arrow-down.svelte" - import ArrowLeft from "$lib/components/graphics/arrow-left.svelte" + import ArrowDown from "$lib/components/common/graphics/arrow-down.svelte" + import ArrowLeft from "$lib/components/common/graphics/arrow-left.svelte" // *** PROPS export let item = {} diff --git a/src/lib/components/see-also.svelte b/src/lib/components/see-also.svelte index 5143af4..7d0dff9 100644 --- a/src/lib/components/see-also.svelte +++ b/src/lib/components/see-also.svelte @@ -10,7 +10,7 @@ import get from "lodash/get.js" // __ GRAPHICS - import ExternalLink from "$lib/components/graphics/external-link.svelte" + import ExternalLink from "$lib/components/common/graphics/external-link.svelte" // *** PROPS export let externalLinks = [] diff --git a/src/lib/components/text-components/Caption.svelte b/src/lib/components/text-components/Caption.svelte index 1cbed2d..de5bf77 100644 --- a/src/lib/components/text-components/Caption.svelte +++ b/src/lib/components/text-components/Caption.svelte @@ -12,7 +12,7 @@ import { isPhone } from "$lib/modules/ui.js" // *** GRAPHICS - import TriangleDown from "$lib/components/graphics/triangle-down.svelte" + import TriangleDown from "$lib/components/common/graphics/triangle-down.svelte" const dispatch = createEventDispatcher() const transitionSettings = { duration: 500 } From 86c3809d44ed1902f8e991119b5e61bb458e9a5c Mon Sep 17 00:00:00 2001 From: "riho.takagi" Date: Mon, 22 Apr 2024 13:39:08 -0400 Subject: [PATCH 02/10] Refactoring ui components --- src/lib/components/blocks/blocks.svelte | 4 ++-- src/lib/components/blocks/invertedBlock.svelte | 2 +- src/lib/components/blocks/logoBlock.svelte | 2 +- .../{blocks => ui/buttons}/applicationButton.svelte | 2 +- src/lib/components/{ => ui}/overlays/Error.svelte | 0 .../components/{ => ui}/overlays/LoadingScreen.svelte | 0 src/lib/components/{ => ui}/overlays/Onboarding.svelte | 0 .../components/{ => ui}/overlays/Reconnection.svelte | 0 .../{text-components => ui/text}/Caption.svelte | 0 .../{text-components => ui/text}/ObjectDialog.svelte | 0 .../text}/ObjectInspectionBox.svelte | 0 .../{text-components => ui/text}/RoomDialog.svelte | 0 .../{text-components => ui/text}/RoomEntryBox.svelte | 0 src/lib/components/{blocks => ui/text}/text.svelte | 0 src/routes/__layout.svelte | 10 +++++----- src/routes/index.svelte | 8 ++++---- 16 files changed, 14 insertions(+), 14 deletions(-) rename src/lib/components/{blocks => ui/buttons}/applicationButton.svelte (98%) rename src/lib/components/{ => ui}/overlays/Error.svelte (100%) rename src/lib/components/{ => ui}/overlays/LoadingScreen.svelte (100%) rename src/lib/components/{ => ui}/overlays/Onboarding.svelte (100%) rename src/lib/components/{ => ui}/overlays/Reconnection.svelte (100%) rename src/lib/components/{text-components => ui/text}/Caption.svelte (100%) rename src/lib/components/{text-components => ui/text}/ObjectDialog.svelte (100%) rename src/lib/components/{text-components => ui/text}/ObjectInspectionBox.svelte (100%) rename src/lib/components/{text-components => ui/text}/RoomDialog.svelte (100%) rename src/lib/components/{text-components => ui/text}/RoomEntryBox.svelte (100%) rename src/lib/components/{blocks => ui/text}/text.svelte (100%) diff --git a/src/lib/components/blocks/blocks.svelte b/src/lib/components/blocks/blocks.svelte index 4b1601b..242950e 100644 --- a/src/lib/components/blocks/blocks.svelte +++ b/src/lib/components/blocks/blocks.svelte @@ -6,7 +6,7 @@ // # # # # # # # # # # # # # // __ BLOCKS - import Text from "./text.svelte" + import Text from "../ui/text/text.svelte" import Image from "./image.svelte" import ImageFromMainSite from "./imageFromMainSite.svelte" import InvertedBlock from "./invertedBlock.svelte" @@ -16,7 +16,7 @@ import Divider from "./divider.svelte" import Columns from "./columns.svelte" import DonationWidget from "./donationWidget.svelte" - import ApplicationButton from "./applicationButton.svelte" + import ApplicationButton from "../ui/buttons/applicationButton.svelte" import Faq from "./faq.svelte" import Video from "./video.svelte" diff --git a/src/lib/components/blocks/invertedBlock.svelte b/src/lib/components/blocks/invertedBlock.svelte index f69d1cf..78f39d3 100644 --- a/src/lib/components/blocks/invertedBlock.svelte +++ b/src/lib/components/blocks/invertedBlock.svelte @@ -6,7 +6,7 @@ // # # # # # # # # # # # # # // __ BLOCKS - import Text from "./text.svelte" + import Text from "../ui/text/text.svelte" // *** PROPS export let b = {} diff --git a/src/lib/components/blocks/logoBlock.svelte b/src/lib/components/blocks/logoBlock.svelte index d250f73..7b6d462 100644 --- a/src/lib/components/blocks/logoBlock.svelte +++ b/src/lib/components/blocks/logoBlock.svelte @@ -5,7 +5,7 @@ // // # # # # # # # # # # # # # // __ BLOCKS - import Text from "./text.svelte" + import Text from "../ui/text/text.svelte" // __ GRAPHICS import BlockBeam from "$lib/components/common/graphics/block-beam.svelte" diff --git a/src/lib/components/blocks/applicationButton.svelte b/src/lib/components/ui/buttons/applicationButton.svelte similarity index 98% rename from src/lib/components/blocks/applicationButton.svelte rename to src/lib/components/ui/buttons/applicationButton.svelte index bcffde3..6965505 100644 --- a/src/lib/components/blocks/applicationButton.svelte +++ b/src/lib/components/ui/buttons/applicationButton.svelte @@ -10,7 +10,7 @@ import has from "lodash/has.js" // __ COMPONENTS - import Blocks from "./blocks.svelte" + import Blocks from "../../blocks/blocks.svelte" // *** PROPS export let b = {} diff --git a/src/lib/components/overlays/Error.svelte b/src/lib/components/ui/overlays/Error.svelte similarity index 100% rename from src/lib/components/overlays/Error.svelte rename to src/lib/components/ui/overlays/Error.svelte diff --git a/src/lib/components/overlays/LoadingScreen.svelte b/src/lib/components/ui/overlays/LoadingScreen.svelte similarity index 100% rename from src/lib/components/overlays/LoadingScreen.svelte rename to src/lib/components/ui/overlays/LoadingScreen.svelte diff --git a/src/lib/components/overlays/Onboarding.svelte b/src/lib/components/ui/overlays/Onboarding.svelte similarity index 100% rename from src/lib/components/overlays/Onboarding.svelte rename to src/lib/components/ui/overlays/Onboarding.svelte diff --git a/src/lib/components/overlays/Reconnection.svelte b/src/lib/components/ui/overlays/Reconnection.svelte similarity index 100% rename from src/lib/components/overlays/Reconnection.svelte rename to src/lib/components/ui/overlays/Reconnection.svelte diff --git a/src/lib/components/text-components/Caption.svelte b/src/lib/components/ui/text/Caption.svelte similarity index 100% rename from src/lib/components/text-components/Caption.svelte rename to src/lib/components/ui/text/Caption.svelte diff --git a/src/lib/components/text-components/ObjectDialog.svelte b/src/lib/components/ui/text/ObjectDialog.svelte similarity index 100% rename from src/lib/components/text-components/ObjectDialog.svelte rename to src/lib/components/ui/text/ObjectDialog.svelte diff --git a/src/lib/components/text-components/ObjectInspectionBox.svelte b/src/lib/components/ui/text/ObjectInspectionBox.svelte similarity index 100% rename from src/lib/components/text-components/ObjectInspectionBox.svelte rename to src/lib/components/ui/text/ObjectInspectionBox.svelte diff --git a/src/lib/components/text-components/RoomDialog.svelte b/src/lib/components/ui/text/RoomDialog.svelte similarity index 100% rename from src/lib/components/text-components/RoomDialog.svelte rename to src/lib/components/ui/text/RoomDialog.svelte diff --git a/src/lib/components/text-components/RoomEntryBox.svelte b/src/lib/components/ui/text/RoomEntryBox.svelte similarity index 100% rename from src/lib/components/text-components/RoomEntryBox.svelte rename to src/lib/components/ui/text/RoomEntryBox.svelte diff --git a/src/lib/components/blocks/text.svelte b/src/lib/components/ui/text/text.svelte similarity index 100% rename from src/lib/components/blocks/text.svelte rename to src/lib/components/ui/text/text.svelte diff --git a/src/routes/__layout.svelte b/src/routes/__layout.svelte index a490988..9a0cd84 100644 --- a/src/routes/__layout.svelte +++ b/src/routes/__layout.svelte @@ -8,15 +8,15 @@ // * * * * * * * * * * * * * * * * * * * * * * * * * * * // *** OVERLAYS - import LoadingScreen from "$lib/components/overlays/LoadingScreen.svelte" - import Error from "$lib/components/overlays/Error.svelte" - import Reconnection from "$lib/components/overlays/Reconnection.svelte" + import LoadingScreen from "$lib/components/ui/overlays/LoadingScreen.svelte" + import Error from "$lib/components/ui/overlays/Error.svelte" + import Reconnection from "$lib/components/ui/overlays/Reconnection.svelte" // *** UI COMPONENTS import Menubar from "$lib/components/menubar.svelte" import AuthenticationBox from "$lib/components/AuthenticationBox.svelte" // *** GRAPHICS - import SoundOn from "$lib/components/graphics/SoundOn.svelte" - import SoundOff from "$lib/components/graphics/SoundOff.svelte" + import SoundOn from "$lib/components/common/graphics/SoundOn.svelte" + import SoundOff from "$lib/components/common/graphics/SoundOff.svelte" import { STATE, uiState, diff --git a/src/routes/index.svelte b/src/routes/index.svelte index 803cf23..53cc004 100644 --- a/src/routes/index.svelte +++ b/src/routes/index.svelte @@ -15,7 +15,7 @@ import { isMobileOrTablet} from "$lib/modules/utilities.js" // *** OVERLAYS - import Onboarding from "$lib/components/overlays/Onboarding.svelte" + import Onboarding from "$lib/components/ui/overlays/Onboarding.svelte" // *** WORLD LAYERS import Room from "$lib/components/world-layers/Room.svelte" import Players from "$lib/components/world-layers/Players.svelte" @@ -27,9 +27,9 @@ import StreamPlayer from "$lib/components/StreamPlayer.svelte" import ArticleBox from "$lib/components/ArticleBox.svelte" // *** TEXT COMPONENTS - import RoomEntryBox from "$lib/components/text-components/RoomEntryBox.svelte" - import ObjectInspectionBox from "$lib/components/text-components/ObjectInspectionBox.svelte" - import Caption from "$lib/components/text-components/Caption.svelte" + import RoomEntryBox from "$lib/components/ui/text/RoomEntryBox.svelte" + import ObjectInspectionBox from "$lib/components/ui/text/ObjectInspectionBox.svelte" + import Caption from "$lib/components/ui/text/Caption.svelte" // *** CHAT import Chat from "$lib/components/chat/Chat.svelte" // *** SCHEDULE From f6a431a21201fe76db635279a2cc07ed1cebe962 Mon Sep 17 00:00:00 2001 From: "riho.takagi" Date: Mon, 22 Apr 2024 13:43:55 -0400 Subject: [PATCH 03/10] Update graphics paths --- src/lib/components/StreamPlayer.svelte | 4 ++-- src/lib/components/blocks/logoBlock.svelte | 2 +- src/lib/components/blocks/video.svelte | 2 +- src/lib/components/main-content.svelte | 2 +- src/lib/components/menubar.svelte | 4 ++-- src/lib/components/qa.svelte | 4 ++-- src/lib/components/see-also.svelte | 2 +- src/lib/components/{common => ui}/graphics/EyebeamLogo.svelte | 0 src/lib/components/{common => ui}/graphics/SoundOff.svelte | 0 src/lib/components/{common => ui}/graphics/SoundOn.svelte | 0 .../components/{common => ui}/graphics/animated-beam.svelte | 0 src/lib/components/{common => ui}/graphics/arrow-down.svelte | 0 src/lib/components/{common => ui}/graphics/arrow-left.svelte | 0 src/lib/components/{common => ui}/graphics/arrow-up.svelte | 0 src/lib/components/{common => ui}/graphics/big-beam.svelte | 0 src/lib/components/{common => ui}/graphics/block-beam.svelte | 0 .../components/{common => ui}/graphics/external-link.svelte | 0 src/lib/components/{common => ui}/graphics/full-beam.svelte | 0 src/lib/components/{common => ui}/graphics/half-beam.svelte | 0 src/lib/components/{common => ui}/graphics/hamburger.svelte | 0 src/lib/components/{common => ui}/graphics/instagram.svelte | 0 src/lib/components/{common => ui}/graphics/logo.svelte | 0 src/lib/components/{common => ui}/graphics/menu-x.svelte | 0 src/lib/components/{common => ui}/graphics/newsletter.svelte | 0 src/lib/components/{common => ui}/graphics/pause-bars.svelte | 0 src/lib/components/{common => ui}/graphics/play-arrow.svelte | 0 src/lib/components/{common => ui}/graphics/search.svelte | 0 .../components/{common => ui}/graphics/triangle-down.svelte | 0 .../components/{common => ui}/graphics/triangle-right.svelte | 0 src/lib/components/{common => ui}/graphics/twitter.svelte | 0 src/lib/components/{common => ui}/graphics/x.svelte | 0 src/lib/components/{common => ui}/graphics/youtube.svelte | 0 src/lib/components/ui/overlays/LoadingScreen.svelte | 2 +- src/lib/components/ui/text/Caption.svelte | 2 +- src/lib/components/ui/text/text.svelte | 2 +- src/routes/__layout.svelte | 4 ++-- 36 files changed, 15 insertions(+), 15 deletions(-) rename src/lib/components/{common => ui}/graphics/EyebeamLogo.svelte (100%) rename src/lib/components/{common => ui}/graphics/SoundOff.svelte (100%) rename src/lib/components/{common => ui}/graphics/SoundOn.svelte (100%) rename src/lib/components/{common => ui}/graphics/animated-beam.svelte (100%) rename src/lib/components/{common => ui}/graphics/arrow-down.svelte (100%) rename src/lib/components/{common => ui}/graphics/arrow-left.svelte (100%) rename src/lib/components/{common => ui}/graphics/arrow-up.svelte (100%) rename src/lib/components/{common => ui}/graphics/big-beam.svelte (100%) rename src/lib/components/{common => ui}/graphics/block-beam.svelte (100%) rename src/lib/components/{common => ui}/graphics/external-link.svelte (100%) rename src/lib/components/{common => ui}/graphics/full-beam.svelte (100%) rename src/lib/components/{common => ui}/graphics/half-beam.svelte (100%) rename src/lib/components/{common => ui}/graphics/hamburger.svelte (100%) rename src/lib/components/{common => ui}/graphics/instagram.svelte (100%) rename src/lib/components/{common => ui}/graphics/logo.svelte (100%) rename src/lib/components/{common => ui}/graphics/menu-x.svelte (100%) rename src/lib/components/{common => ui}/graphics/newsletter.svelte (100%) rename src/lib/components/{common => ui}/graphics/pause-bars.svelte (100%) rename src/lib/components/{common => ui}/graphics/play-arrow.svelte (100%) rename src/lib/components/{common => ui}/graphics/search.svelte (100%) rename src/lib/components/{common => ui}/graphics/triangle-down.svelte (100%) rename src/lib/components/{common => ui}/graphics/triangle-right.svelte (100%) rename src/lib/components/{common => ui}/graphics/twitter.svelte (100%) rename src/lib/components/{common => ui}/graphics/x.svelte (100%) rename src/lib/components/{common => ui}/graphics/youtube.svelte (100%) diff --git a/src/lib/components/StreamPlayer.svelte b/src/lib/components/StreamPlayer.svelte index 613857f..f482ff4 100644 --- a/src/lib/components/StreamPlayer.svelte +++ b/src/lib/components/StreamPlayer.svelte @@ -13,8 +13,8 @@ import { quartOut } from "svelte/easing" import { isPhone } from "$lib/modules/ui.js" import getVideoId from "get-video-id" - import PlayArrow from "$lib/components/common/graphics/play-arrow.svelte" - import PauseBars from "$lib/components/common/graphics/pause-bars.svelte" + import PlayArrow from "$lib/components/ui/graphics/play-arrow.svelte" + import PauseBars from "$lib/components/ui/graphics/pause-bars.svelte" // *** PROPS export let streamUrl = "" diff --git a/src/lib/components/blocks/logoBlock.svelte b/src/lib/components/blocks/logoBlock.svelte index 7b6d462..a6560ad 100644 --- a/src/lib/components/blocks/logoBlock.svelte +++ b/src/lib/components/blocks/logoBlock.svelte @@ -8,7 +8,7 @@ import Text from "../ui/text/text.svelte" // __ GRAPHICS - import BlockBeam from "$lib/components/common/graphics/block-beam.svelte" + import BlockBeam from "$lib/components/ui/graphics/block-beam.svelte" // *** PROPS export let b = {} diff --git a/src/lib/components/blocks/video.svelte b/src/lib/components/blocks/video.svelte index 1ca053c..0c59a3a 100644 --- a/src/lib/components/blocks/video.svelte +++ b/src/lib/components/blocks/video.svelte @@ -10,7 +10,7 @@ import get from "lodash/get.js" // __ GRAPHICS - import PlayArrow from "$lib/components/common/graphics/play-arrow.svelte" + import PlayArrow from "$lib/components/ui/graphics/play-arrow.svelte" // *** PROPS export let b = {} diff --git a/src/lib/components/main-content.svelte b/src/lib/components/main-content.svelte index 7884f34..ce826ba 100644 --- a/src/lib/components/main-content.svelte +++ b/src/lib/components/main-content.svelte @@ -18,7 +18,7 @@ import PersonLink from "$lib/components/person-link.svelte" // __ GRAPHICS - import ExternalLink from "$lib/components/common/graphics/external-link.svelte" + import ExternalLink from "$lib/components/ui/graphics/external-link.svelte" // *** PROPS export let page diff --git a/src/lib/components/menubar.svelte b/src/lib/components/menubar.svelte index ac66143..005e068 100644 --- a/src/lib/components/menubar.svelte +++ b/src/lib/components/menubar.svelte @@ -15,8 +15,8 @@ import Blocks from "$lib/components/blocks/blocks.svelte" // __ GRAPHICS - import FullBeam from "$lib/components/common/graphics/full-beam.svelte" - import ArrowDown from "$lib/components/common/graphics/arrow-down.svelte" + import FullBeam from "$lib/components/ui/graphics/full-beam.svelte" + import ArrowDown from "$lib/components/ui/graphics/arrow-down.svelte" // __ STORES import { trayOpen, activeCity,activeMouse, activeVideoLibrary,VIDEO_LIBRARY_SLUG, urlHash } from "$lib/modules/ui.js" diff --git a/src/lib/components/qa.svelte b/src/lib/components/qa.svelte index 275f89d..70a507f 100644 --- a/src/lib/components/qa.svelte +++ b/src/lib/components/qa.svelte @@ -12,8 +12,8 @@ import Blocks from "$lib/components/blocks/blocks.svelte" // __ GRAPHICS - import ArrowDown from "$lib/components/common/graphics/arrow-down.svelte" - import ArrowLeft from "$lib/components/common/graphics/arrow-left.svelte" + import ArrowDown from "$lib/components/ui/graphics/arrow-down.svelte" + import ArrowLeft from "$lib/components/ui/graphics/arrow-left.svelte" // *** PROPS export let item = {} diff --git a/src/lib/components/see-also.svelte b/src/lib/components/see-also.svelte index 7d0dff9..a47225f 100644 --- a/src/lib/components/see-also.svelte +++ b/src/lib/components/see-also.svelte @@ -10,7 +10,7 @@ import get from "lodash/get.js" // __ GRAPHICS - import ExternalLink from "$lib/components/common/graphics/external-link.svelte" + import ExternalLink from "$lib/components/ui/graphics/external-link.svelte" // *** PROPS export let externalLinks = [] diff --git a/src/lib/components/common/graphics/EyebeamLogo.svelte b/src/lib/components/ui/graphics/EyebeamLogo.svelte similarity index 100% rename from src/lib/components/common/graphics/EyebeamLogo.svelte rename to src/lib/components/ui/graphics/EyebeamLogo.svelte diff --git a/src/lib/components/common/graphics/SoundOff.svelte b/src/lib/components/ui/graphics/SoundOff.svelte similarity index 100% rename from src/lib/components/common/graphics/SoundOff.svelte rename to src/lib/components/ui/graphics/SoundOff.svelte diff --git a/src/lib/components/common/graphics/SoundOn.svelte b/src/lib/components/ui/graphics/SoundOn.svelte similarity index 100% rename from src/lib/components/common/graphics/SoundOn.svelte rename to src/lib/components/ui/graphics/SoundOn.svelte diff --git a/src/lib/components/common/graphics/animated-beam.svelte b/src/lib/components/ui/graphics/animated-beam.svelte similarity index 100% rename from src/lib/components/common/graphics/animated-beam.svelte rename to src/lib/components/ui/graphics/animated-beam.svelte diff --git a/src/lib/components/common/graphics/arrow-down.svelte b/src/lib/components/ui/graphics/arrow-down.svelte similarity index 100% rename from src/lib/components/common/graphics/arrow-down.svelte rename to src/lib/components/ui/graphics/arrow-down.svelte diff --git a/src/lib/components/common/graphics/arrow-left.svelte b/src/lib/components/ui/graphics/arrow-left.svelte similarity index 100% rename from src/lib/components/common/graphics/arrow-left.svelte rename to src/lib/components/ui/graphics/arrow-left.svelte diff --git a/src/lib/components/common/graphics/arrow-up.svelte b/src/lib/components/ui/graphics/arrow-up.svelte similarity index 100% rename from src/lib/components/common/graphics/arrow-up.svelte rename to src/lib/components/ui/graphics/arrow-up.svelte diff --git a/src/lib/components/common/graphics/big-beam.svelte b/src/lib/components/ui/graphics/big-beam.svelte similarity index 100% rename from src/lib/components/common/graphics/big-beam.svelte rename to src/lib/components/ui/graphics/big-beam.svelte diff --git a/src/lib/components/common/graphics/block-beam.svelte b/src/lib/components/ui/graphics/block-beam.svelte similarity index 100% rename from src/lib/components/common/graphics/block-beam.svelte rename to src/lib/components/ui/graphics/block-beam.svelte diff --git a/src/lib/components/common/graphics/external-link.svelte b/src/lib/components/ui/graphics/external-link.svelte similarity index 100% rename from src/lib/components/common/graphics/external-link.svelte rename to src/lib/components/ui/graphics/external-link.svelte diff --git a/src/lib/components/common/graphics/full-beam.svelte b/src/lib/components/ui/graphics/full-beam.svelte similarity index 100% rename from src/lib/components/common/graphics/full-beam.svelte rename to src/lib/components/ui/graphics/full-beam.svelte diff --git a/src/lib/components/common/graphics/half-beam.svelte b/src/lib/components/ui/graphics/half-beam.svelte similarity index 100% rename from src/lib/components/common/graphics/half-beam.svelte rename to src/lib/components/ui/graphics/half-beam.svelte diff --git a/src/lib/components/common/graphics/hamburger.svelte b/src/lib/components/ui/graphics/hamburger.svelte similarity index 100% rename from src/lib/components/common/graphics/hamburger.svelte rename to src/lib/components/ui/graphics/hamburger.svelte diff --git a/src/lib/components/common/graphics/instagram.svelte b/src/lib/components/ui/graphics/instagram.svelte similarity index 100% rename from src/lib/components/common/graphics/instagram.svelte rename to src/lib/components/ui/graphics/instagram.svelte diff --git a/src/lib/components/common/graphics/logo.svelte b/src/lib/components/ui/graphics/logo.svelte similarity index 100% rename from src/lib/components/common/graphics/logo.svelte rename to src/lib/components/ui/graphics/logo.svelte diff --git a/src/lib/components/common/graphics/menu-x.svelte b/src/lib/components/ui/graphics/menu-x.svelte similarity index 100% rename from src/lib/components/common/graphics/menu-x.svelte rename to src/lib/components/ui/graphics/menu-x.svelte diff --git a/src/lib/components/common/graphics/newsletter.svelte b/src/lib/components/ui/graphics/newsletter.svelte similarity index 100% rename from src/lib/components/common/graphics/newsletter.svelte rename to src/lib/components/ui/graphics/newsletter.svelte diff --git a/src/lib/components/common/graphics/pause-bars.svelte b/src/lib/components/ui/graphics/pause-bars.svelte similarity index 100% rename from src/lib/components/common/graphics/pause-bars.svelte rename to src/lib/components/ui/graphics/pause-bars.svelte diff --git a/src/lib/components/common/graphics/play-arrow.svelte b/src/lib/components/ui/graphics/play-arrow.svelte similarity index 100% rename from src/lib/components/common/graphics/play-arrow.svelte rename to src/lib/components/ui/graphics/play-arrow.svelte diff --git a/src/lib/components/common/graphics/search.svelte b/src/lib/components/ui/graphics/search.svelte similarity index 100% rename from src/lib/components/common/graphics/search.svelte rename to src/lib/components/ui/graphics/search.svelte diff --git a/src/lib/components/common/graphics/triangle-down.svelte b/src/lib/components/ui/graphics/triangle-down.svelte similarity index 100% rename from src/lib/components/common/graphics/triangle-down.svelte rename to src/lib/components/ui/graphics/triangle-down.svelte diff --git a/src/lib/components/common/graphics/triangle-right.svelte b/src/lib/components/ui/graphics/triangle-right.svelte similarity index 100% rename from src/lib/components/common/graphics/triangle-right.svelte rename to src/lib/components/ui/graphics/triangle-right.svelte diff --git a/src/lib/components/common/graphics/twitter.svelte b/src/lib/components/ui/graphics/twitter.svelte similarity index 100% rename from src/lib/components/common/graphics/twitter.svelte rename to src/lib/components/ui/graphics/twitter.svelte diff --git a/src/lib/components/common/graphics/x.svelte b/src/lib/components/ui/graphics/x.svelte similarity index 100% rename from src/lib/components/common/graphics/x.svelte rename to src/lib/components/ui/graphics/x.svelte diff --git a/src/lib/components/common/graphics/youtube.svelte b/src/lib/components/ui/graphics/youtube.svelte similarity index 100% rename from src/lib/components/common/graphics/youtube.svelte rename to src/lib/components/ui/graphics/youtube.svelte diff --git a/src/lib/components/ui/overlays/LoadingScreen.svelte b/src/lib/components/ui/overlays/LoadingScreen.svelte index 1f310e4..19b9742 100644 --- a/src/lib/components/ui/overlays/LoadingScreen.svelte +++ b/src/lib/components/ui/overlays/LoadingScreen.svelte @@ -5,7 +5,7 @@ // // # # # # # # # # # # # # # import { fade } from "svelte/transition" - import AnimatedBeam from "$lib/components/common/graphics/animated-beam.svelte" + import AnimatedBeam from "$lib/components/ui/graphics/animated-beam.svelte"
diff --git a/src/lib/components/ui/text/Caption.svelte b/src/lib/components/ui/text/Caption.svelte index de5bf77..cb4b560 100644 --- a/src/lib/components/ui/text/Caption.svelte +++ b/src/lib/components/ui/text/Caption.svelte @@ -12,7 +12,7 @@ import { isPhone } from "$lib/modules/ui.js" // *** GRAPHICS - import TriangleDown from "$lib/components/common/graphics/triangle-down.svelte" + import TriangleDown from "$lib/components/ui/graphics/triangle-down.svelte" const dispatch = createEventDispatcher() const transitionSettings = { duration: 500 } diff --git a/src/lib/components/ui/text/text.svelte b/src/lib/components/ui/text/text.svelte index 43545b7..3f71450 100644 --- a/src/lib/components/ui/text/text.svelte +++ b/src/lib/components/ui/text/text.svelte @@ -11,7 +11,7 @@ import PersonLink from "$lib/components/person-link.svelte" // __ GRAPHICS - import ExternalLink from "$lib/components/common/graphics/external-link.svelte" + import ExternalLink from "$lib/components/ui/graphics/external-link.svelte" // *** PROPS export let b = {} diff --git a/src/routes/__layout.svelte b/src/routes/__layout.svelte index 9a0cd84..71f27e7 100644 --- a/src/routes/__layout.svelte +++ b/src/routes/__layout.svelte @@ -15,8 +15,8 @@ import Menubar from "$lib/components/menubar.svelte" import AuthenticationBox from "$lib/components/AuthenticationBox.svelte" // *** GRAPHICS - import SoundOn from "$lib/components/common/graphics/SoundOn.svelte" - import SoundOff from "$lib/components/common/graphics/SoundOff.svelte" + import SoundOn from "$lib/components/ui/graphics/SoundOn.svelte" + import SoundOff from "$lib/components/ui/graphics/SoundOff.svelte" import { STATE, uiState, From 37503a05c53bcc2b0b63c7506afec77f74dc2976 Mon Sep 17 00:00:00 2001 From: "riho.takagi" Date: Mon, 22 Apr 2024 13:53:13 -0400 Subject: [PATCH 04/10] Change blocks directory path --- src/lib/components/ArticleBox.svelte | 4 ++-- src/lib/components/bulletin-board-event.svelte | 2 +- src/lib/components/main-content.svelte | 2 +- src/lib/components/menubar.svelte | 4 ++-- src/lib/components/qa.svelte | 2 +- src/lib/components/{ => ui}/Clock.svelte | 0 src/lib/components/{ => ui}/blocks/blocks.svelte | 4 ++-- src/lib/components/{ => ui}/blocks/columns.svelte | 0 src/lib/components/{ => ui}/blocks/donationWidget.svelte | 0 src/lib/components/{ => ui}/blocks/embed.svelte | 0 src/lib/components/{ => ui}/blocks/faq.svelte | 0 src/lib/components/{ => ui}/blocks/html.svelte | 0 src/lib/components/{ => ui}/blocks/image.svelte | 0 src/lib/components/{ => ui}/blocks/imageFromMainSite.svelte | 0 src/lib/components/{ => ui}/blocks/invertedBlock.svelte | 2 +- src/lib/components/{ => ui}/blocks/logoBlock.svelte | 2 +- src/lib/components/ui/{text => blocks}/text.svelte | 0 src/lib/components/{ => ui}/blocks/video.svelte | 0 src/lib/components/{world-layers => ui/layout}/Grid.svelte | 0 src/lib/components/{blocks => ui/layout}/divider.svelte | 0 src/lib/components/{ => ui/media}/StreamPlayer.svelte | 0 src/lib/components/{ => ui/media}/VideoPlayer.svelte | 0 .../media}/videoLibraries/VideoLibrary.svelte | 0 .../media}/videoLibraries/VideoLibraryComponent.svelte | 0 .../media}/videoLibraries/VideoLibraryComponentMobile.svelte | 0 src/lib/components/world-layers/feed/FeedItem.svelte | 2 +- src/lib/components/world-layers/objects/Object.svelte | 2 +- src/lib/components/world-layers/schedule/Schedule.svelte | 2 -- src/routes/index.svelte | 4 ++-- 29 files changed, 15 insertions(+), 17 deletions(-) rename src/lib/components/{ => ui}/Clock.svelte (100%) rename src/lib/components/{ => ui}/blocks/blocks.svelte (94%) rename src/lib/components/{ => ui}/blocks/columns.svelte (100%) rename src/lib/components/{ => ui}/blocks/donationWidget.svelte (100%) rename src/lib/components/{ => ui}/blocks/embed.svelte (100%) rename src/lib/components/{ => ui}/blocks/faq.svelte (100%) rename src/lib/components/{ => ui}/blocks/html.svelte (100%) rename src/lib/components/{ => ui}/blocks/image.svelte (100%) rename src/lib/components/{ => ui}/blocks/imageFromMainSite.svelte (100%) rename src/lib/components/{ => ui}/blocks/invertedBlock.svelte (90%) rename src/lib/components/{ => ui}/blocks/logoBlock.svelte (96%) rename src/lib/components/ui/{text => blocks}/text.svelte (100%) rename src/lib/components/{ => ui}/blocks/video.svelte (100%) rename src/lib/components/{world-layers => ui/layout}/Grid.svelte (100%) rename src/lib/components/{blocks => ui/layout}/divider.svelte (100%) rename src/lib/components/{ => ui/media}/StreamPlayer.svelte (100%) rename src/lib/components/{ => ui/media}/VideoPlayer.svelte (100%) rename src/lib/components/{world-layers => ui/media}/videoLibraries/VideoLibrary.svelte (100%) rename src/lib/components/{world-layers => ui/media}/videoLibraries/VideoLibraryComponent.svelte (100%) rename src/lib/components/{world-layers => ui/media}/videoLibraries/VideoLibraryComponentMobile.svelte (100%) diff --git a/src/lib/components/ArticleBox.svelte b/src/lib/components/ArticleBox.svelte index 72f3469..d7cda5e 100644 --- a/src/lib/components/ArticleBox.svelte +++ b/src/lib/components/ArticleBox.svelte @@ -12,8 +12,8 @@ import { enterArticle, leaveArticle, players } from "$lib/modules/engine.js" import { dateTimeFormat, isUpcoming } from "$lib/modules/utilities.js" import { checkObjectOverlap } from "$lib/modules/movement.js" - import VideoPlayer from "$lib/components/VideoPlayer.svelte" - import Blocks from "$lib/components/blocks/blocks.svelte" + import VideoPlayer from "$lib/components/ui/media/VideoPlayer.svelte" + import Blocks from "$lib/components/ui/blocks/blocks.svelte" import BulletinBoardEvent from "$lib/components/bulletin-board-event.svelte" // *** PROPS diff --git a/src/lib/components/bulletin-board-event.svelte b/src/lib/components/bulletin-board-event.svelte index d17d8d6..b7171db 100644 --- a/src/lib/components/bulletin-board-event.svelte +++ b/src/lib/components/bulletin-board-event.svelte @@ -10,7 +10,7 @@ renderBlockText, renderBlockTextFromMainSite, } from "$lib/modules/sanity.js" - import Blocks from "$lib/components/blocks/blocks.svelte" + import Blocks from "$lib/components/ui/blocks/blocks.svelte" import { dateTimeFormat, isUpcoming } from "$lib/modules/utilities.js" export let event = {} diff --git a/src/lib/components/main-content.svelte b/src/lib/components/main-content.svelte index ce826ba..4f08b77 100644 --- a/src/lib/components/main-content.svelte +++ b/src/lib/components/main-content.svelte @@ -13,7 +13,7 @@ import { dateTimeFormat, longFormatDate } from "$lib/modules/utilities.js" // __ COMPONENTS - import Blocks from "$lib/components/blocks/blocks.svelte" + import Blocks from "$lib/components/ui/blocks/blocks.svelte" import SeeAlso from "$lib/components/see-also.svelte" import PersonLink from "$lib/components/person-link.svelte" diff --git a/src/lib/components/menubar.svelte b/src/lib/components/menubar.svelte index 005e068..69f989c 100644 --- a/src/lib/components/menubar.svelte +++ b/src/lib/components/menubar.svelte @@ -6,13 +6,13 @@ // # # # # # # # # # # # # # // __ IMPORT - import Clock from "$lib/components/Clock.svelte" + import Clock from "$lib/components/ui/Clock.svelte" import sample from "lodash/sample.js" import { loadDataFromMainSite } from "$lib/modules/sanity.js" import has from "lodash/has.js" // __ COMPONENTS - import Blocks from "$lib/components/blocks/blocks.svelte" + import Blocks from "$lib/components/ui/blocks/blocks.svelte" // __ GRAPHICS import FullBeam from "$lib/components/ui/graphics/full-beam.svelte" diff --git a/src/lib/components/qa.svelte b/src/lib/components/qa.svelte index 70a507f..f33a19a 100644 --- a/src/lib/components/qa.svelte +++ b/src/lib/components/qa.svelte @@ -9,7 +9,7 @@ import has from "lodash/has.js" // __ COMPONENTS - import Blocks from "$lib/components/blocks/blocks.svelte" + import Blocks from "$lib/components/ui/blocks/blocks.svelte" // __ GRAPHICS import ArrowDown from "$lib/components/ui/graphics/arrow-down.svelte" diff --git a/src/lib/components/Clock.svelte b/src/lib/components/ui/Clock.svelte similarity index 100% rename from src/lib/components/Clock.svelte rename to src/lib/components/ui/Clock.svelte diff --git a/src/lib/components/blocks/blocks.svelte b/src/lib/components/ui/blocks/blocks.svelte similarity index 94% rename from src/lib/components/blocks/blocks.svelte rename to src/lib/components/ui/blocks/blocks.svelte index 242950e..add9acf 100644 --- a/src/lib/components/blocks/blocks.svelte +++ b/src/lib/components/ui/blocks/blocks.svelte @@ -6,14 +6,14 @@ // # # # # # # # # # # # # # // __ BLOCKS - import Text from "../ui/text/text.svelte" + import Text from "./text.svelte" import Image from "./image.svelte" import ImageFromMainSite from "./imageFromMainSite.svelte" import InvertedBlock from "./invertedBlock.svelte" import LogoBlock from "./logoBlock.svelte" import Embed from "./embed.svelte" import HTML from "./html.svelte" - import Divider from "./divider.svelte" + import Divider from "../ui/layout/divider.svelte" import Columns from "./columns.svelte" import DonationWidget from "./donationWidget.svelte" import ApplicationButton from "../ui/buttons/applicationButton.svelte" diff --git a/src/lib/components/blocks/columns.svelte b/src/lib/components/ui/blocks/columns.svelte similarity index 100% rename from src/lib/components/blocks/columns.svelte rename to src/lib/components/ui/blocks/columns.svelte diff --git a/src/lib/components/blocks/donationWidget.svelte b/src/lib/components/ui/blocks/donationWidget.svelte similarity index 100% rename from src/lib/components/blocks/donationWidget.svelte rename to src/lib/components/ui/blocks/donationWidget.svelte diff --git a/src/lib/components/blocks/embed.svelte b/src/lib/components/ui/blocks/embed.svelte similarity index 100% rename from src/lib/components/blocks/embed.svelte rename to src/lib/components/ui/blocks/embed.svelte diff --git a/src/lib/components/blocks/faq.svelte b/src/lib/components/ui/blocks/faq.svelte similarity index 100% rename from src/lib/components/blocks/faq.svelte rename to src/lib/components/ui/blocks/faq.svelte diff --git a/src/lib/components/blocks/html.svelte b/src/lib/components/ui/blocks/html.svelte similarity index 100% rename from src/lib/components/blocks/html.svelte rename to src/lib/components/ui/blocks/html.svelte diff --git a/src/lib/components/blocks/image.svelte b/src/lib/components/ui/blocks/image.svelte similarity index 100% rename from src/lib/components/blocks/image.svelte rename to src/lib/components/ui/blocks/image.svelte diff --git a/src/lib/components/blocks/imageFromMainSite.svelte b/src/lib/components/ui/blocks/imageFromMainSite.svelte similarity index 100% rename from src/lib/components/blocks/imageFromMainSite.svelte rename to src/lib/components/ui/blocks/imageFromMainSite.svelte diff --git a/src/lib/components/blocks/invertedBlock.svelte b/src/lib/components/ui/blocks/invertedBlock.svelte similarity index 90% rename from src/lib/components/blocks/invertedBlock.svelte rename to src/lib/components/ui/blocks/invertedBlock.svelte index 78f39d3..f69d1cf 100644 --- a/src/lib/components/blocks/invertedBlock.svelte +++ b/src/lib/components/ui/blocks/invertedBlock.svelte @@ -6,7 +6,7 @@ // # # # # # # # # # # # # # // __ BLOCKS - import Text from "../ui/text/text.svelte" + import Text from "./text.svelte" // *** PROPS export let b = {} diff --git a/src/lib/components/blocks/logoBlock.svelte b/src/lib/components/ui/blocks/logoBlock.svelte similarity index 96% rename from src/lib/components/blocks/logoBlock.svelte rename to src/lib/components/ui/blocks/logoBlock.svelte index a6560ad..9246a86 100644 --- a/src/lib/components/blocks/logoBlock.svelte +++ b/src/lib/components/ui/blocks/logoBlock.svelte @@ -5,7 +5,7 @@ // // # # # # # # # # # # # # # // __ BLOCKS - import Text from "../ui/text/text.svelte" + import Text from "./text.svelte" // __ GRAPHICS import BlockBeam from "$lib/components/ui/graphics/block-beam.svelte" diff --git a/src/lib/components/ui/text/text.svelte b/src/lib/components/ui/blocks/text.svelte similarity index 100% rename from src/lib/components/ui/text/text.svelte rename to src/lib/components/ui/blocks/text.svelte diff --git a/src/lib/components/blocks/video.svelte b/src/lib/components/ui/blocks/video.svelte similarity index 100% rename from src/lib/components/blocks/video.svelte rename to src/lib/components/ui/blocks/video.svelte diff --git a/src/lib/components/world-layers/Grid.svelte b/src/lib/components/ui/layout/Grid.svelte similarity index 100% rename from src/lib/components/world-layers/Grid.svelte rename to src/lib/components/ui/layout/Grid.svelte diff --git a/src/lib/components/blocks/divider.svelte b/src/lib/components/ui/layout/divider.svelte similarity index 100% rename from src/lib/components/blocks/divider.svelte rename to src/lib/components/ui/layout/divider.svelte diff --git a/src/lib/components/StreamPlayer.svelte b/src/lib/components/ui/media/StreamPlayer.svelte similarity index 100% rename from src/lib/components/StreamPlayer.svelte rename to src/lib/components/ui/media/StreamPlayer.svelte diff --git a/src/lib/components/VideoPlayer.svelte b/src/lib/components/ui/media/VideoPlayer.svelte similarity index 100% rename from src/lib/components/VideoPlayer.svelte rename to src/lib/components/ui/media/VideoPlayer.svelte diff --git a/src/lib/components/world-layers/videoLibraries/VideoLibrary.svelte b/src/lib/components/ui/media/videoLibraries/VideoLibrary.svelte similarity index 100% rename from src/lib/components/world-layers/videoLibraries/VideoLibrary.svelte rename to src/lib/components/ui/media/videoLibraries/VideoLibrary.svelte diff --git a/src/lib/components/world-layers/videoLibraries/VideoLibraryComponent.svelte b/src/lib/components/ui/media/videoLibraries/VideoLibraryComponent.svelte similarity index 100% rename from src/lib/components/world-layers/videoLibraries/VideoLibraryComponent.svelte rename to src/lib/components/ui/media/videoLibraries/VideoLibraryComponent.svelte diff --git a/src/lib/components/world-layers/videoLibraries/VideoLibraryComponentMobile.svelte b/src/lib/components/ui/media/videoLibraries/VideoLibraryComponentMobile.svelte similarity index 100% rename from src/lib/components/world-layers/videoLibraries/VideoLibraryComponentMobile.svelte rename to src/lib/components/ui/media/videoLibraries/VideoLibraryComponentMobile.svelte diff --git a/src/lib/components/world-layers/feed/FeedItem.svelte b/src/lib/components/world-layers/feed/FeedItem.svelte index 8edf966..8a4a4ea 100644 --- a/src/lib/components/world-layers/feed/FeedItem.svelte +++ b/src/lib/components/world-layers/feed/FeedItem.svelte @@ -1,5 +1,5 @@ diff --git a/src/lib/components/world-layers/objects/Object.svelte b/src/lib/components/world-layers/objects/Object.svelte index b79231c..4389d77 100644 --- a/src/lib/components/world-layers/objects/Object.svelte +++ b/src/lib/components/world-layers/objects/Object.svelte @@ -11,7 +11,7 @@ import { showLabels, toolTipConfig } from "$lib/modules/ui.js" import { GRID_SIZE } from "$lib/modules/world.js" // IMPORTS - import Blocks from "$lib/components/blocks/blocks.svelte" + import Blocks from "$lib/components/ui/blocks/blocks.svelte" // *** PROPS diff --git a/src/lib/components/world-layers/schedule/Schedule.svelte b/src/lib/components/world-layers/schedule/Schedule.svelte index a6688e2..b4e0041 100644 --- a/src/lib/components/world-layers/schedule/Schedule.svelte +++ b/src/lib/components/world-layers/schedule/Schedule.svelte @@ -6,10 +6,8 @@ export let vLib = [] import { videoLibrary } from "$lib/modules/world.js" import { dateTimeFormat, isUpcoming, isOngoing, sortByDate } from "$lib/modules/utilities.js" - import Embed from "$lib/components/blocks/embed.svelte" import {STATE, uiState, isPhone} from '$lib/modules/ui.js' console.log('is phone: ', isPhone) - import { activeArticle } from "$lib/modules/ui.js" let selected = null; $: console.log('video library: ', videoLibrary) diff --git a/src/routes/index.svelte b/src/routes/index.svelte index 53cc004..4feff8e 100644 --- a/src/routes/index.svelte +++ b/src/routes/index.svelte @@ -24,7 +24,7 @@ import Zones from "$lib/components/world-layers/zones/Zones.svelte" import AmbientAudio from "$lib/components/world-layers/AmbientAudio.svelte" import Portals from "$lib/components/world-layers/portals/Portals.svelte" - import StreamPlayer from "$lib/components/StreamPlayer.svelte" + import StreamPlayer from "$lib/components/ui/media/StreamPlayer.svelte" import ArticleBox from "$lib/components/ArticleBox.svelte" // *** TEXT COMPONENTS import RoomEntryBox from "$lib/components/ui/text/RoomEntryBox.svelte" @@ -93,7 +93,7 @@ infoLogger, errorLogger, } from "$lib/modules/utilities.js" - import VideoLibrary from "../lib/components/world-layers/videoLibraries/VideoLibrary.svelte"; + import VideoLibrary from "../lib/components/ui/media/videoLibraries/VideoLibrary.svelte"; // *** VARIABLES let viewportElement = {} From e35ea59fcecdcb3e54e04d23509297452e76c549 Mon Sep 17 00:00:00 2001 From: "riho.takagi" Date: Mon, 22 Apr 2024 14:16:32 -0400 Subject: [PATCH 05/10] update --- src/lib/components/main-content.svelte | 2 +- src/lib/components/ui/{blocks => content-parser}/blocks.svelte | 0 src/lib/components/ui/{blocks => content-parser}/columns.svelte | 0 .../ui/{blocks => content-parser}/donationWidget.svelte | 0 src/lib/components/ui/{blocks => content-parser}/embed.svelte | 0 src/lib/components/ui/{blocks => content-parser}/faq.svelte | 2 +- src/lib/components/ui/{blocks => content-parser}/html.svelte | 0 src/lib/components/ui/{blocks => content-parser}/image.svelte | 0 .../ui/{blocks => content-parser}/imageFromMainSite.svelte | 0 .../ui/{blocks => content-parser}/invertedBlock.svelte | 0 .../components/ui/{blocks => content-parser}/logoBlock.svelte | 0 src/lib/components/{ => ui/content-parser}/qa.svelte | 0 src/lib/components/ui/{blocks => content-parser}/text.svelte | 0 src/lib/components/ui/{blocks => content-parser}/video.svelte | 0 src/lib/components/{ => ui/content}/ArticleBox.svelte | 0 src/lib/components/{ => ui/content}/see-also.svelte | 0 src/routes/index.svelte | 2 +- 17 files changed, 3 insertions(+), 3 deletions(-) rename src/lib/components/ui/{blocks => content-parser}/blocks.svelte (100%) rename src/lib/components/ui/{blocks => content-parser}/columns.svelte (100%) rename src/lib/components/ui/{blocks => content-parser}/donationWidget.svelte (100%) rename src/lib/components/ui/{blocks => content-parser}/embed.svelte (100%) rename src/lib/components/ui/{blocks => content-parser}/faq.svelte (94%) rename src/lib/components/ui/{blocks => content-parser}/html.svelte (100%) rename src/lib/components/ui/{blocks => content-parser}/image.svelte (100%) rename src/lib/components/ui/{blocks => content-parser}/imageFromMainSite.svelte (100%) rename src/lib/components/ui/{blocks => content-parser}/invertedBlock.svelte (100%) rename src/lib/components/ui/{blocks => content-parser}/logoBlock.svelte (100%) rename src/lib/components/{ => ui/content-parser}/qa.svelte (100%) rename src/lib/components/ui/{blocks => content-parser}/text.svelte (100%) rename src/lib/components/ui/{blocks => content-parser}/video.svelte (100%) rename src/lib/components/{ => ui/content}/ArticleBox.svelte (100%) rename src/lib/components/{ => ui/content}/see-also.svelte (100%) diff --git a/src/lib/components/main-content.svelte b/src/lib/components/main-content.svelte index 4f08b77..8bd9440 100644 --- a/src/lib/components/main-content.svelte +++ b/src/lib/components/main-content.svelte @@ -14,7 +14,7 @@ // __ COMPONENTS import Blocks from "$lib/components/ui/blocks/blocks.svelte" - import SeeAlso from "$lib/components/see-also.svelte" + import SeeAlso from "$lib/components/ui/content/see-also.svelte" import PersonLink from "$lib/components/person-link.svelte" // __ GRAPHICS diff --git a/src/lib/components/ui/blocks/blocks.svelte b/src/lib/components/ui/content-parser/blocks.svelte similarity index 100% rename from src/lib/components/ui/blocks/blocks.svelte rename to src/lib/components/ui/content-parser/blocks.svelte diff --git a/src/lib/components/ui/blocks/columns.svelte b/src/lib/components/ui/content-parser/columns.svelte similarity index 100% rename from src/lib/components/ui/blocks/columns.svelte rename to src/lib/components/ui/content-parser/columns.svelte diff --git a/src/lib/components/ui/blocks/donationWidget.svelte b/src/lib/components/ui/content-parser/donationWidget.svelte similarity index 100% rename from src/lib/components/ui/blocks/donationWidget.svelte rename to src/lib/components/ui/content-parser/donationWidget.svelte diff --git a/src/lib/components/ui/blocks/embed.svelte b/src/lib/components/ui/content-parser/embed.svelte similarity index 100% rename from src/lib/components/ui/blocks/embed.svelte rename to src/lib/components/ui/content-parser/embed.svelte diff --git a/src/lib/components/ui/blocks/faq.svelte b/src/lib/components/ui/content-parser/faq.svelte similarity index 94% rename from src/lib/components/ui/blocks/faq.svelte rename to src/lib/components/ui/content-parser/faq.svelte index ce33154..05f6da5 100644 --- a/src/lib/components/ui/blocks/faq.svelte +++ b/src/lib/components/ui/content-parser/faq.svelte @@ -9,7 +9,7 @@ import slugify from "slugify" // __ COMPONENTS - import QA from "$lib/components/qa.svelte" + import QA from "./qa.svelte" // *** PROPS export let b = {} diff --git a/src/lib/components/ui/blocks/html.svelte b/src/lib/components/ui/content-parser/html.svelte similarity index 100% rename from src/lib/components/ui/blocks/html.svelte rename to src/lib/components/ui/content-parser/html.svelte diff --git a/src/lib/components/ui/blocks/image.svelte b/src/lib/components/ui/content-parser/image.svelte similarity index 100% rename from src/lib/components/ui/blocks/image.svelte rename to src/lib/components/ui/content-parser/image.svelte diff --git a/src/lib/components/ui/blocks/imageFromMainSite.svelte b/src/lib/components/ui/content-parser/imageFromMainSite.svelte similarity index 100% rename from src/lib/components/ui/blocks/imageFromMainSite.svelte rename to src/lib/components/ui/content-parser/imageFromMainSite.svelte diff --git a/src/lib/components/ui/blocks/invertedBlock.svelte b/src/lib/components/ui/content-parser/invertedBlock.svelte similarity index 100% rename from src/lib/components/ui/blocks/invertedBlock.svelte rename to src/lib/components/ui/content-parser/invertedBlock.svelte diff --git a/src/lib/components/ui/blocks/logoBlock.svelte b/src/lib/components/ui/content-parser/logoBlock.svelte similarity index 100% rename from src/lib/components/ui/blocks/logoBlock.svelte rename to src/lib/components/ui/content-parser/logoBlock.svelte diff --git a/src/lib/components/qa.svelte b/src/lib/components/ui/content-parser/qa.svelte similarity index 100% rename from src/lib/components/qa.svelte rename to src/lib/components/ui/content-parser/qa.svelte diff --git a/src/lib/components/ui/blocks/text.svelte b/src/lib/components/ui/content-parser/text.svelte similarity index 100% rename from src/lib/components/ui/blocks/text.svelte rename to src/lib/components/ui/content-parser/text.svelte diff --git a/src/lib/components/ui/blocks/video.svelte b/src/lib/components/ui/content-parser/video.svelte similarity index 100% rename from src/lib/components/ui/blocks/video.svelte rename to src/lib/components/ui/content-parser/video.svelte diff --git a/src/lib/components/ArticleBox.svelte b/src/lib/components/ui/content/ArticleBox.svelte similarity index 100% rename from src/lib/components/ArticleBox.svelte rename to src/lib/components/ui/content/ArticleBox.svelte diff --git a/src/lib/components/see-also.svelte b/src/lib/components/ui/content/see-also.svelte similarity index 100% rename from src/lib/components/see-also.svelte rename to src/lib/components/ui/content/see-also.svelte diff --git a/src/routes/index.svelte b/src/routes/index.svelte index 4feff8e..51e1781 100644 --- a/src/routes/index.svelte +++ b/src/routes/index.svelte @@ -25,7 +25,7 @@ import AmbientAudio from "$lib/components/world-layers/AmbientAudio.svelte" import Portals from "$lib/components/world-layers/portals/Portals.svelte" import StreamPlayer from "$lib/components/ui/media/StreamPlayer.svelte" - import ArticleBox from "$lib/components/ArticleBox.svelte" + import ArticleBox from "$lib/components/ui/content/ArticleBox.svelte" // *** TEXT COMPONENTS import RoomEntryBox from "$lib/components/ui/text/RoomEntryBox.svelte" import ObjectInspectionBox from "$lib/components/ui/text/ObjectInspectionBox.svelte" From 2abe681cf0a6d316d8b427c879ee7b31a9cb8392 Mon Sep 17 00:00:00 2001 From: "riho.takagi" Date: Mon, 22 Apr 2024 14:36:58 -0400 Subject: [PATCH 06/10] blocks to content-parser --- src/lib/components/bulletin-board-event.svelte | 2 +- src/lib/components/main-content.svelte | 2 +- src/lib/components/menubar.svelte | 2 +- src/lib/components/ui/buttons/applicationButton.svelte | 2 +- src/lib/components/ui/{layout => content-parser}/Grid.svelte | 0 src/lib/components/ui/content-parser/blocks.svelte | 4 ++-- .../components/ui/{layout => content-parser}/divider.svelte | 0 src/lib/components/ui/content-parser/qa.svelte | 2 +- src/lib/components/ui/content/ArticleBox.svelte | 2 +- src/lib/components/world-layers/feed/Feed.svelte | 2 +- src/lib/components/world-layers/feed/FeedItem.svelte | 2 +- src/lib/components/world-layers/objects/Object.svelte | 2 +- 12 files changed, 11 insertions(+), 11 deletions(-) rename src/lib/components/ui/{layout => content-parser}/Grid.svelte (100%) rename src/lib/components/ui/{layout => content-parser}/divider.svelte (100%) diff --git a/src/lib/components/bulletin-board-event.svelte b/src/lib/components/bulletin-board-event.svelte index b7171db..4271038 100644 --- a/src/lib/components/bulletin-board-event.svelte +++ b/src/lib/components/bulletin-board-event.svelte @@ -10,7 +10,7 @@ renderBlockText, renderBlockTextFromMainSite, } from "$lib/modules/sanity.js" - import Blocks from "$lib/components/ui/blocks/blocks.svelte" + import Blocks from "$lib/components/ui/content-parser/blocks.svelte" import { dateTimeFormat, isUpcoming } from "$lib/modules/utilities.js" export let event = {} diff --git a/src/lib/components/main-content.svelte b/src/lib/components/main-content.svelte index 8bd9440..2fce332 100644 --- a/src/lib/components/main-content.svelte +++ b/src/lib/components/main-content.svelte @@ -13,7 +13,7 @@ import { dateTimeFormat, longFormatDate } from "$lib/modules/utilities.js" // __ COMPONENTS - import Blocks from "$lib/components/ui/blocks/blocks.svelte" + import Blocks from "$lib/components/ui/content-parser/blocks.svelte" import SeeAlso from "$lib/components/ui/content/see-also.svelte" import PersonLink from "$lib/components/person-link.svelte" diff --git a/src/lib/components/menubar.svelte b/src/lib/components/menubar.svelte index 69f989c..dc4e7ab 100644 --- a/src/lib/components/menubar.svelte +++ b/src/lib/components/menubar.svelte @@ -12,7 +12,7 @@ import has from "lodash/has.js" // __ COMPONENTS - import Blocks from "$lib/components/ui/blocks/blocks.svelte" + import Blocks from "$lib/components/ui/content-parser/blocks.svelte" // __ GRAPHICS import FullBeam from "$lib/components/ui/graphics/full-beam.svelte" diff --git a/src/lib/components/ui/buttons/applicationButton.svelte b/src/lib/components/ui/buttons/applicationButton.svelte index 6965505..17400df 100644 --- a/src/lib/components/ui/buttons/applicationButton.svelte +++ b/src/lib/components/ui/buttons/applicationButton.svelte @@ -10,7 +10,7 @@ import has from "lodash/has.js" // __ COMPONENTS - import Blocks from "../../blocks/blocks.svelte" + import Blocks from "../content-parser/blocks.svelte" // *** PROPS export let b = {} diff --git a/src/lib/components/ui/layout/Grid.svelte b/src/lib/components/ui/content-parser/Grid.svelte similarity index 100% rename from src/lib/components/ui/layout/Grid.svelte rename to src/lib/components/ui/content-parser/Grid.svelte diff --git a/src/lib/components/ui/content-parser/blocks.svelte b/src/lib/components/ui/content-parser/blocks.svelte index add9acf..cd197d6 100644 --- a/src/lib/components/ui/content-parser/blocks.svelte +++ b/src/lib/components/ui/content-parser/blocks.svelte @@ -13,10 +13,10 @@ import LogoBlock from "./logoBlock.svelte" import Embed from "./embed.svelte" import HTML from "./html.svelte" - import Divider from "../ui/layout/divider.svelte" + import Divider from "./divider.svelte" import Columns from "./columns.svelte" import DonationWidget from "./donationWidget.svelte" - import ApplicationButton from "../ui/buttons/applicationButton.svelte" + import ApplicationButton from "../../ui/buttons/applicationButton.svelte" import Faq from "./faq.svelte" import Video from "./video.svelte" diff --git a/src/lib/components/ui/layout/divider.svelte b/src/lib/components/ui/content-parser/divider.svelte similarity index 100% rename from src/lib/components/ui/layout/divider.svelte rename to src/lib/components/ui/content-parser/divider.svelte diff --git a/src/lib/components/ui/content-parser/qa.svelte b/src/lib/components/ui/content-parser/qa.svelte index f33a19a..6066a01 100644 --- a/src/lib/components/ui/content-parser/qa.svelte +++ b/src/lib/components/ui/content-parser/qa.svelte @@ -9,7 +9,7 @@ import has from "lodash/has.js" // __ COMPONENTS - import Blocks from "$lib/components/ui/blocks/blocks.svelte" + import Blocks from "$lib/components/ui/content-parser/blocks.svelte" // __ GRAPHICS import ArrowDown from "$lib/components/ui/graphics/arrow-down.svelte" diff --git a/src/lib/components/ui/content/ArticleBox.svelte b/src/lib/components/ui/content/ArticleBox.svelte index d7cda5e..2637a60 100644 --- a/src/lib/components/ui/content/ArticleBox.svelte +++ b/src/lib/components/ui/content/ArticleBox.svelte @@ -13,7 +13,7 @@ import { dateTimeFormat, isUpcoming } from "$lib/modules/utilities.js" import { checkObjectOverlap } from "$lib/modules/movement.js" import VideoPlayer from "$lib/components/ui/media/VideoPlayer.svelte" - import Blocks from "$lib/components/ui/blocks/blocks.svelte" + import Blocks from "$lib/components/ui/content-parser/blocks.svelte" import BulletinBoardEvent from "$lib/components/bulletin-board-event.svelte" // *** PROPS diff --git a/src/lib/components/world-layers/feed/Feed.svelte b/src/lib/components/world-layers/feed/Feed.svelte index 869f79b..dfe0705 100644 --- a/src/lib/components/world-layers/feed/Feed.svelte +++ b/src/lib/components/world-layers/feed/Feed.svelte @@ -2,7 +2,7 @@ import { fade } from "svelte/transition" import { quartOut } from "svelte/easing" import { activeFeed } from "$lib/modules//ui.js" - import Blocks from "$lib/components/blocks/blocks.svelte" + import Blocks from "$lib/components/ui/content-parser/blocks.svelte" import FeedItem from "$lib/components/world-layers/feed/FeedItem.svelte" export let feedItems = [] export let isActive = false diff --git a/src/lib/components/world-layers/feed/FeedItem.svelte b/src/lib/components/world-layers/feed/FeedItem.svelte index 8a4a4ea..2791549 100644 --- a/src/lib/components/world-layers/feed/FeedItem.svelte +++ b/src/lib/components/world-layers/feed/FeedItem.svelte @@ -1,5 +1,5 @@ diff --git a/src/lib/components/world-layers/objects/Object.svelte b/src/lib/components/world-layers/objects/Object.svelte index 4389d77..86dc3a5 100644 --- a/src/lib/components/world-layers/objects/Object.svelte +++ b/src/lib/components/world-layers/objects/Object.svelte @@ -11,7 +11,7 @@ import { showLabels, toolTipConfig } from "$lib/modules/ui.js" import { GRID_SIZE } from "$lib/modules/world.js" // IMPORTS - import Blocks from "$lib/components/ui/blocks/blocks.svelte" + import Blocks from "$lib/components/ui/content-parser/blocks.svelte" // *** PROPS From f488cd56ad0e957585a2e09012240ff2305ba649 Mon Sep 17 00:00:00 2001 From: "riho.takagi" Date: Mon, 22 Apr 2024 14:38:59 -0400 Subject: [PATCH 07/10] Rename "world-layers" to "world --- .../{world-layers => world}/AmbientAudio.svelte | 0 .../{world-layers => world}/Players.svelte | 2 +- .../{world-layers => world}/Room.svelte | 0 .../{world-layers => world}/TargetMarker.svelte | 0 .../avatars/Avatar.svelte | 0 .../{world-layers => world}/feed/Feed.svelte | 2 +- .../{world-layers => world}/feed/FeedItem.svelte | 0 .../objects/Object.svelte | 0 .../objects/Objects.svelte | 0 .../portals/Portal.svelte | 0 .../portals/Portals.svelte | 0 .../schedule/Schedule.svelte | 0 .../{world-layers => world}/zones/Zone.svelte | 0 .../{world-layers => world}/zones/Zones.svelte | 0 src/routes/index.svelte | 16 ++++++++-------- 15 files changed, 10 insertions(+), 10 deletions(-) rename src/lib/components/{world-layers => world}/AmbientAudio.svelte (100%) rename src/lib/components/{world-layers => world}/Players.svelte (86%) rename src/lib/components/{world-layers => world}/Room.svelte (100%) rename src/lib/components/{world-layers => world}/TargetMarker.svelte (100%) rename src/lib/components/{world-layers => world}/avatars/Avatar.svelte (100%) rename src/lib/components/{world-layers => world}/feed/Feed.svelte (98%) rename src/lib/components/{world-layers => world}/feed/FeedItem.svelte (100%) rename src/lib/components/{world-layers => world}/objects/Object.svelte (100%) rename src/lib/components/{world-layers => world}/objects/Objects.svelte (100%) rename src/lib/components/{world-layers => world}/portals/Portal.svelte (100%) rename src/lib/components/{world-layers => world}/portals/Portals.svelte (100%) rename src/lib/components/{world-layers => world}/schedule/Schedule.svelte (100%) rename src/lib/components/{world-layers => world}/zones/Zone.svelte (100%) rename src/lib/components/{world-layers => world}/zones/Zones.svelte (100%) diff --git a/src/lib/components/world-layers/AmbientAudio.svelte b/src/lib/components/world/AmbientAudio.svelte similarity index 100% rename from src/lib/components/world-layers/AmbientAudio.svelte rename to src/lib/components/world/AmbientAudio.svelte diff --git a/src/lib/components/world-layers/Players.svelte b/src/lib/components/world/Players.svelte similarity index 86% rename from src/lib/components/world-layers/Players.svelte rename to src/lib/components/world/Players.svelte index 13ae85d..fc24f64 100644 --- a/src/lib/components/world-layers/Players.svelte +++ b/src/lib/components/world/Players.svelte @@ -4,7 +4,7 @@ // Players // // # # # # # # # # # # # # # - import Avatar from "$lib/components/world-layers/avatars/Avatar.svelte" + import Avatar from "$lib/components/world/avatars/Avatar.svelte" // *** PROPS export let players = {} diff --git a/src/lib/components/world-layers/Room.svelte b/src/lib/components/world/Room.svelte similarity index 100% rename from src/lib/components/world-layers/Room.svelte rename to src/lib/components/world/Room.svelte diff --git a/src/lib/components/world-layers/TargetMarker.svelte b/src/lib/components/world/TargetMarker.svelte similarity index 100% rename from src/lib/components/world-layers/TargetMarker.svelte rename to src/lib/components/world/TargetMarker.svelte diff --git a/src/lib/components/world-layers/avatars/Avatar.svelte b/src/lib/components/world/avatars/Avatar.svelte similarity index 100% rename from src/lib/components/world-layers/avatars/Avatar.svelte rename to src/lib/components/world/avatars/Avatar.svelte diff --git a/src/lib/components/world-layers/feed/Feed.svelte b/src/lib/components/world/feed/Feed.svelte similarity index 98% rename from src/lib/components/world-layers/feed/Feed.svelte rename to src/lib/components/world/feed/Feed.svelte index dfe0705..44d820e 100644 --- a/src/lib/components/world-layers/feed/Feed.svelte +++ b/src/lib/components/world/feed/Feed.svelte @@ -3,7 +3,7 @@ import { quartOut } from "svelte/easing" import { activeFeed } from "$lib/modules//ui.js" import Blocks from "$lib/components/ui/content-parser/blocks.svelte" - import FeedItem from "$lib/components/world-layers/feed/FeedItem.svelte" + import FeedItem from "$lib/components/world/feed/FeedItem.svelte" export let feedItems = [] export let isActive = false export let artistImageUrl diff --git a/src/lib/components/world-layers/feed/FeedItem.svelte b/src/lib/components/world/feed/FeedItem.svelte similarity index 100% rename from src/lib/components/world-layers/feed/FeedItem.svelte rename to src/lib/components/world/feed/FeedItem.svelte diff --git a/src/lib/components/world-layers/objects/Object.svelte b/src/lib/components/world/objects/Object.svelte similarity index 100% rename from src/lib/components/world-layers/objects/Object.svelte rename to src/lib/components/world/objects/Object.svelte diff --git a/src/lib/components/world-layers/objects/Objects.svelte b/src/lib/components/world/objects/Objects.svelte similarity index 100% rename from src/lib/components/world-layers/objects/Objects.svelte rename to src/lib/components/world/objects/Objects.svelte diff --git a/src/lib/components/world-layers/portals/Portal.svelte b/src/lib/components/world/portals/Portal.svelte similarity index 100% rename from src/lib/components/world-layers/portals/Portal.svelte rename to src/lib/components/world/portals/Portal.svelte diff --git a/src/lib/components/world-layers/portals/Portals.svelte b/src/lib/components/world/portals/Portals.svelte similarity index 100% rename from src/lib/components/world-layers/portals/Portals.svelte rename to src/lib/components/world/portals/Portals.svelte diff --git a/src/lib/components/world-layers/schedule/Schedule.svelte b/src/lib/components/world/schedule/Schedule.svelte similarity index 100% rename from src/lib/components/world-layers/schedule/Schedule.svelte rename to src/lib/components/world/schedule/Schedule.svelte diff --git a/src/lib/components/world-layers/zones/Zone.svelte b/src/lib/components/world/zones/Zone.svelte similarity index 100% rename from src/lib/components/world-layers/zones/Zone.svelte rename to src/lib/components/world/zones/Zone.svelte diff --git a/src/lib/components/world-layers/zones/Zones.svelte b/src/lib/components/world/zones/Zones.svelte similarity index 100% rename from src/lib/components/world-layers/zones/Zones.svelte rename to src/lib/components/world/zones/Zones.svelte diff --git a/src/routes/index.svelte b/src/routes/index.svelte index 51e1781..0811e30 100644 --- a/src/routes/index.svelte +++ b/src/routes/index.svelte @@ -17,13 +17,13 @@ // *** OVERLAYS import Onboarding from "$lib/components/ui/overlays/Onboarding.svelte" // *** WORLD LAYERS - import Room from "$lib/components/world-layers/Room.svelte" - import Players from "$lib/components/world-layers/Players.svelte" - import Objects from "$lib/components/world-layers/objects/Objects.svelte" - import Feed from "$lib/components/world-layers/feed/Feed.svelte" - import Zones from "$lib/components/world-layers/zones/Zones.svelte" - import AmbientAudio from "$lib/components/world-layers/AmbientAudio.svelte" - import Portals from "$lib/components/world-layers/portals/Portals.svelte" + import Room from "$lib/components/world/Room.svelte" + import Players from "$lib/components/world/Players.svelte" + import Objects from "$lib/components/world/objects/Objects.svelte" + import Feed from "$lib/components/world/feed/Feed.svelte" + import Zones from "$lib/components/world/zones/Zones.svelte" + import AmbientAudio from "$lib/components/world/AmbientAudio.svelte" + import Portals from "$lib/components/world/portals/Portals.svelte" import StreamPlayer from "$lib/components/ui/media/StreamPlayer.svelte" import ArticleBox from "$lib/components/ui/content/ArticleBox.svelte" // *** TEXT COMPONENTS @@ -33,7 +33,7 @@ // *** CHAT import Chat from "$lib/components/chat/Chat.svelte" // *** SCHEDULE -// import Schedule from "$lib/components/world-layers/schedule/Schedule.svelte" +// import Schedule from "$lib/components/world/schedule/Schedule.svelte" // *** PHONE import PhoneNavigation from "$lib/components/PhoneNavigation.svelte" From 10d249b9c70919ac7792c7ec39f9dfa9e20f056a Mon Sep 17 00:00:00 2001 From: "riho.takagi" Date: Mon, 22 Apr 2024 14:43:04 -0400 Subject: [PATCH 08/10] Remove AuthenticationBox --- src/lib/components/AuthenticationBox.svelte | 57 --------------------- src/routes/__layout.svelte | 5 +- 2 files changed, 1 insertion(+), 61 deletions(-) delete mode 100644 src/lib/components/AuthenticationBox.svelte diff --git a/src/lib/components/AuthenticationBox.svelte b/src/lib/components/AuthenticationBox.svelte deleted file mode 100644 index 3930c05..0000000 --- a/src/lib/components/AuthenticationBox.svelte +++ /dev/null @@ -1,57 +0,0 @@ - - -
{ - if (!$isAuthenticated) { - login() - } else { - logout() - } - }} -> - {#if $isAuthenticated} -
- {$profile && $profile.name ? $profile.name + " (Log out)" : "Log out"} -
- {:else}Login{/if} -
- - diff --git a/src/routes/__layout.svelte b/src/routes/__layout.svelte index 71f27e7..5bcd6ee 100644 --- a/src/routes/__layout.svelte +++ b/src/routes/__layout.svelte @@ -54,10 +54,7 @@ - -{#if $uiState == STATE.READY && !$activeArticle} - -{/if} + {#if $uiState == STATE.LOADING} From 455f2a9c125426004cc9b4460e47a84e65fa6a41 Mon Sep 17 00:00:00 2001 From: "riho.takagi" Date: Mon, 22 Apr 2024 14:43:21 -0400 Subject: [PATCH 09/10] Create overlays directory --- src/lib/components/{ => ui/overlays}/AvatarPicker.svelte | 0 src/lib/components/ui/overlays/Onboarding.svelte | 2 +- src/lib/components/{ => ui/overlays}/PhoneNavigation.svelte | 0 src/routes/index.svelte | 2 +- 4 files changed, 2 insertions(+), 2 deletions(-) rename src/lib/components/{ => ui/overlays}/AvatarPicker.svelte (100%) rename src/lib/components/{ => ui/overlays}/PhoneNavigation.svelte (100%) diff --git a/src/lib/components/AvatarPicker.svelte b/src/lib/components/ui/overlays/AvatarPicker.svelte similarity index 100% rename from src/lib/components/AvatarPicker.svelte rename to src/lib/components/ui/overlays/AvatarPicker.svelte diff --git a/src/lib/components/ui/overlays/Onboarding.svelte b/src/lib/components/ui/overlays/Onboarding.svelte index e6bf387..d7553c3 100644 --- a/src/lib/components/ui/overlays/Onboarding.svelte +++ b/src/lib/components/ui/overlays/Onboarding.svelte @@ -9,7 +9,7 @@ import { loadOnboardingTutorial } from "$lib/modules/world.js" import { renderBlockText } from "$lib/modules/sanity.js" import get from "lodash/get.js" - import AvatarPicker from "$lib/components/AvatarPicker.svelte" + import AvatarPicker from "$lib/components/ui/overlays/AvatarPicker.svelte" import { isPhone } from "$lib/modules/ui.js" import { createEventDispatcher } from "svelte" const dispatch = createEventDispatcher() diff --git a/src/lib/components/PhoneNavigation.svelte b/src/lib/components/ui/overlays/PhoneNavigation.svelte similarity index 100% rename from src/lib/components/PhoneNavigation.svelte rename to src/lib/components/ui/overlays/PhoneNavigation.svelte diff --git a/src/routes/index.svelte b/src/routes/index.svelte index 0811e30..ff1745e 100644 --- a/src/routes/index.svelte +++ b/src/routes/index.svelte @@ -35,7 +35,7 @@ // *** SCHEDULE // import Schedule from "$lib/components/world/schedule/Schedule.svelte" // *** PHONE - import PhoneNavigation from "$lib/components/PhoneNavigation.svelte" + import PhoneNavigation from "$lib/components/ui/overlays/PhoneNavigation.svelte" import { connectToGameServer, From 632b79e10bd7ac7de7de2fced82684171beb9f66 Mon Sep 17 00:00:00 2001 From: "riho.takagi" Date: Mon, 22 Apr 2024 14:48:44 -0400 Subject: [PATCH 10/10] Create navigation directory --- src/lib/components/ui/content/ArticleBox.svelte | 2 +- .../components/{ => ui/content}/bulletin-board-event.svelte | 0 .../ui/{overlays => navigation}/PhoneNavigation.svelte | 0 src/lib/components/{ => ui/navigation}/menubar.svelte | 0 src/routes/__layout.svelte | 3 +-- src/routes/index.svelte | 2 +- 6 files changed, 3 insertions(+), 4 deletions(-) rename src/lib/components/{ => ui/content}/bulletin-board-event.svelte (100%) rename src/lib/components/ui/{overlays => navigation}/PhoneNavigation.svelte (100%) rename src/lib/components/{ => ui/navigation}/menubar.svelte (100%) diff --git a/src/lib/components/ui/content/ArticleBox.svelte b/src/lib/components/ui/content/ArticleBox.svelte index 2637a60..392f080 100644 --- a/src/lib/components/ui/content/ArticleBox.svelte +++ b/src/lib/components/ui/content/ArticleBox.svelte @@ -14,7 +14,7 @@ import { checkObjectOverlap } from "$lib/modules/movement.js" import VideoPlayer from "$lib/components/ui/media/VideoPlayer.svelte" import Blocks from "$lib/components/ui/content-parser/blocks.svelte" - import BulletinBoardEvent from "$lib/components/bulletin-board-event.svelte" + import BulletinBoardEvent from "$lib/components/ui/content/bulletin-board-event.svelte" // *** PROPS export let article = {} diff --git a/src/lib/components/bulletin-board-event.svelte b/src/lib/components/ui/content/bulletin-board-event.svelte similarity index 100% rename from src/lib/components/bulletin-board-event.svelte rename to src/lib/components/ui/content/bulletin-board-event.svelte diff --git a/src/lib/components/ui/overlays/PhoneNavigation.svelte b/src/lib/components/ui/navigation/PhoneNavigation.svelte similarity index 100% rename from src/lib/components/ui/overlays/PhoneNavigation.svelte rename to src/lib/components/ui/navigation/PhoneNavigation.svelte diff --git a/src/lib/components/menubar.svelte b/src/lib/components/ui/navigation/menubar.svelte similarity index 100% rename from src/lib/components/menubar.svelte rename to src/lib/components/ui/navigation/menubar.svelte diff --git a/src/routes/__layout.svelte b/src/routes/__layout.svelte index 5bcd6ee..8a452da 100644 --- a/src/routes/__layout.svelte +++ b/src/routes/__layout.svelte @@ -12,8 +12,7 @@ import Error from "$lib/components/ui/overlays/Error.svelte" import Reconnection from "$lib/components/ui/overlays/Reconnection.svelte" // *** UI COMPONENTS - import Menubar from "$lib/components/menubar.svelte" - import AuthenticationBox from "$lib/components/AuthenticationBox.svelte" + import Menubar from "$lib/components/ui/navigation/menubar.svelte" // *** GRAPHICS import SoundOn from "$lib/components/ui/graphics/SoundOn.svelte" import SoundOff from "$lib/components/ui/graphics/SoundOff.svelte" diff --git a/src/routes/index.svelte b/src/routes/index.svelte index ff1745e..fb84e60 100644 --- a/src/routes/index.svelte +++ b/src/routes/index.svelte @@ -35,7 +35,7 @@ // *** SCHEDULE // import Schedule from "$lib/components/world/schedule/Schedule.svelte" // *** PHONE - import PhoneNavigation from "$lib/components/ui/overlays/PhoneNavigation.svelte" + import PhoneNavigation from "$lib/components/ui/navigation/PhoneNavigation.svelte" import { connectToGameServer,