Refactoring files

src/lib/components/main-content.svelte

@@ -13,12 +13,12 @@
   import { dateTimeFormat, longFormatDate } from "$lib/modules/utilities.js"
 
   // __ COMPONENTS
-  import Blocks from "$lib/components/blocks/blocks.svelte"
-  import SeeAlso from "$lib/components/see-also.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"
 
   // __ GRAPHICS
-  import ExternalLink from "$lib/components/graphics/external-link.svelte"
+  import ExternalLink from "$lib/components/ui/graphics/external-link.svelte"
 
   // *** PROPS
   export let page

src/lib/components/blocks/applicationButton.svelte → 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 "../content-parser/blocks.svelte"
 
   // *** PROPS
   export let b = {}

src/lib/components/blocks/blocks.svelte → src/lib/components/ui/content-parser/blocks.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"
 

src/lib/components/blocks/faq.svelte → 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 = {}

src/lib/components/blocks/logoBlock.svelte → src/lib/components/ui/content-parser/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/ui/graphics/block-beam.svelte"
 
   // *** PROPS
   export let b = {}

src/lib/components/qa.svelte → src/lib/components/ui/content-parser/qa.svelte

@@ -9,11 +9,11 @@
   import has from "lodash/has.js"
 
   // __ COMPONENTS
-  import Blocks from "$lib/components/blocks/blocks.svelte"
+  import Blocks from "$lib/components/ui/content-parser/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/ui/graphics/arrow-down.svelte"
+  import ArrowLeft from "$lib/components/ui/graphics/arrow-left.svelte"
 
   // *** PROPS
   export let item = {}

src/lib/components/blocks/text.svelte → src/lib/components/ui/content-parser/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/ui/graphics/external-link.svelte"
 
   // *** PROPS
   export let b = {}

src/lib/components/blocks/video.svelte → src/lib/components/ui/content-parser/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/ui/graphics/play-arrow.svelte"
 
   // *** PROPS
   export let b = {}

src/lib/components/ArticleBox.svelte → src/lib/components/ui/content/ArticleBox.svelte

@@ -12,9 +12,9 @@
   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 BulletinBoardEvent from "$lib/components/bulletin-board-event.svelte"
+  import VideoPlayer from "$lib/components/ui/media/VideoPlayer.svelte"
+  import Blocks from "$lib/components/ui/content-parser/blocks.svelte"
+  import BulletinBoardEvent from "$lib/components/ui/content/bulletin-board-event.svelte"
 
   // *** PROPS
   export let article = {}

src/lib/components/bulletin-board-event.svelte → src/lib/components/ui/content/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/content-parser/blocks.svelte"
   import { dateTimeFormat, isUpcoming } from "$lib/modules/utilities.js"
   export let event = {}
 

src/lib/components/see-also.svelte → src/lib/components/ui/content/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/ui/graphics/external-link.svelte"
 
   // *** PROPS
   export let externalLinks = []

src/lib/components/StreamPlayer.svelte → src/lib/components/ui/media/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/ui/graphics/play-arrow.svelte"
+  import PauseBars from "$lib/components/ui/graphics/pause-bars.svelte"
 
   // *** PROPS
   export let streamUrl = ""

src/lib/components/menubar.svelte → src/lib/components/ui/navigation/menubar.svelte

@@ -6,17 +6,17 @@
   // # # # # # # # # # # # # #
 
   // __ 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/content-parser/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/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"

src/lib/components/overlays/LoadingScreen.svelte → src/lib/components/ui/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/ui/graphics/animated-beam.svelte"
 </script>
 
 <div class="loading-screen" transition:fade={{ delay: 500 }}>

src/lib/components/overlays/Onboarding.svelte → 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()

src/lib/components/text-components/Caption.svelte → src/lib/components/ui/text/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/ui/graphics/triangle-down.svelte"
   const dispatch = createEventDispatcher()
   const transitionSettings = { duration: 500 }
 

src/lib/components/world-layers/Players.svelte → 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 = {}

src/lib/components/world-layers/feed/Feed.svelte → src/lib/components/world/feed/Feed.svelte

@@ -2,8 +2,8 @@
   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 FeedItem from "$lib/components/world-layers/feed/FeedItem.svelte"
+  import Blocks from "$lib/components/ui/content-parser/blocks.svelte"
+  import FeedItem from "$lib/components/world/feed/FeedItem.svelte"
   export let feedItems = []
   export let isActive = false
   export let artistImageUrl

src/lib/components/world-layers/feed/FeedItem.svelte → src/lib/components/world/feed/FeedItem.svelte

@@ -1,5 +1,5 @@
 <script>
-  import Blocks from "$lib/components/blocks/blocks.svelte"
+  import Blocks from "$lib/components/ui/content-parser/blocks.svelte"
   export let feedItem = {}
 </script>
 

src/lib/components/world-layers/objects/Object.svelte → src/lib/components/world/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/content-parser/blocks.svelte"
 
 
   //   *** PROPS

src/lib/components/world-layers/schedule/Schedule.svelte → src/lib/components/world/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)

src/routes/__layout.svelte

@@ -8,15 +8,14 @@
   // * * * * * * * * * * * * * * * * * * * * * * * * * * *
 
   // *** 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"
+  import Menubar from "$lib/components/ui/navigation/menubar.svelte"
   // *** GRAPHICS
-  import SoundOn from "$lib/components/graphics/SoundOn.svelte"
-  import SoundOff from "$lib/components/graphics/SoundOff.svelte"
+  import SoundOn from "$lib/components/ui/graphics/SoundOn.svelte"
+  import SoundOff from "$lib/components/ui/graphics/SoundOff.svelte"
   import {
     STATE,
     uiState,
@@ -54,10 +53,7 @@
 <!-- Content from index.svelte -->
 <slot />
 
-<!-- AUTH TEST BOX -->
-{#if $uiState == STATE.READY && !$activeArticle}
-  <!--  <AuthenticationBox /> -->
-{/if}
+
 
 <!-- LOADING -->
 {#if $uiState == STATE.LOADING}

src/routes/index.svelte

@@ -15,27 +15,27 @@
   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"
-  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 StreamPlayer from "$lib/components/StreamPlayer.svelte"
-  import ArticleBox from "$lib/components/ArticleBox.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
-  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
-//  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"
+  import PhoneNavigation from "$lib/components/ui/navigation/PhoneNavigation.svelte"
 
   import {
     connectToGameServer,
@@ -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 = {}