refactor

routes/_components/status/Avatar.html

@@ -18,7 +18,7 @@
   }
 </style>
 <script>
-  import { imgLoadError } from '../_utils/events'
+  import { imgLoadError } from '../../_utils/events'
 
   export default {
     events: {

routes/_components/status/Media.html

@@ -112,8 +112,8 @@
   const DEFAULT_MEDIA_WIDTH = 300
   const DEFAULT_MEDIA_HEIGHT = 200
 
-  import { imgLoad, imgLoadError } from '../_utils/events'
+  import { imgLoad, imgLoadError } from '../../_utils/events'
-  import { showVideoDialog } from '../_utils/showVideoDialog'
+  import { showVideoDialog } from '../../_utils/showVideoDialog'
 
   export default {
     helpers: {

routes/_components/status/Status.html

@@ -288,10 +288,10 @@
   import Avatar from './Avatar.html'
   import Media from './Media.html'
   import Toolbar from './Toolbar.html'
-  import { mark, stop } from '../_utils/marks'
+  import { mark, stop } from '../../_utils/marks'
   import IntlRelativeFormat from 'intl-relativeformat'
-  import { replaceAll } from '../_utils/replaceAll'
+  import { replaceAll } from '../../_utils/replaceAll'
-  import { store } from '../_utils/store'
+  import { store } from '../../_utils/store'
 
   const relativeFormat = new IntlRelativeFormat('en-US');
 

routes/_components/status/VideoDialog.html

@@ -56,7 +56,7 @@
 </style>
 <script>
 
-  import { importDialogPolyfill } from '../_utils/asyncModules'
+  import { importDialogPolyfill } from '../../_utils/asyncModules'
 
   export default {
     oncreate() {

routes/_components/timeline/LazyTimeline.html

@@ -31,10 +31,10 @@
   }
 </style>
 <script>
-  import { importTimeline } from '../_utils/asyncModules'
+  import { importTimeline } from '../../_utils/asyncModules'
-  import LoadingSpinner from './LoadingSpinner.html'
+  import LoadingSpinner from '../LoadingSpinner.html'
   import { fade } from 'svelte-transitions'
-  import { store } from '../_utils/store'
+  import { store } from '../../_utils/store'
 
   export default {
     oncreate() {

routes/_components/timeline/LoadingFooter.html

@@ -17,7 +17,7 @@
   }
 </style>
 <script>
-  import LoadingSpinner from './LoadingSpinner.html'
+  import LoadingSpinner from '../LoadingSpinner.html'
   export default {
     components: {
       LoadingSpinner

routes/_components/timeline/StatusListItem.html

@@ -1,6 +1,6 @@
 <Status status="{{virtualProps}}" index="{{virtualIndex}}" length="{{virtualLength}}" on:recalculateHeight />
 <script>
-  import Status from './Status.html'
+  import Status from '../status/Status.html'
 
   export default {
     components: {

routes/_components/timeline/Timeline.html

@@ -17,19 +17,19 @@
   }
 </style>
 <script>
-  import { store } from '../_utils/store'
+  import { store } from '../../_utils/store'
-  import { getTimeline } from '../_utils/mastodon/timelines'
+  import { getTimeline } from '../../_utils/mastodon/timelines'
-  import { getInstanceInfo } from '../_utils/mastodon/instance'
+  import { getInstanceInfo } from '../../_utils/mastodon/instance'
   import StatusListItem from './StatusListItem.html'
   import LoadingFooter from './LoadingFooter.html'
-  import VirtualList from './virtualList/VirtualList.html'
+  import VirtualList from '../virtualList/VirtualList.html'
   import { splice, push } from 'svelte-extras'
-  import { mergeStatuses } from '../_utils/statuses'
+  import { mergeStatuses } from '../../_utils/statuses'
-  import { mark, stop } from '../_utils/marks'
+  import { mark, stop } from '../../_utils/marks'
-  import { timelines } from '../_static/timelines'
+  import { timelines } from '../../_static/timelines'
-  import { toast } from '../_utils/toast'
+  import { toast } from '../../_utils/toast'
-  import { database } from '../_utils/database/database'
+  import { database } from '../../_utils/database/database'
-  import { StatusStream } from '../_utils/mastodon/StatusStream'
+  import { StatusStream } from '../../_utils/mastodon/StatusStream'
 
   const FETCH_LIMIT = 20
 

routes/_utils/asyncModules.js

@@ -12,7 +12,7 @@ export const importURLSearchParams = () => import(
 })
 
 export const importTimeline = () => import(
-  /* webpackChunkName: 'Timeline' */ '../_components/Timeline.html'
+  /* webpackChunkName: 'Timeline' */ '../_components/timeline/Timeline.html'
   ).then(mod => mod.default)
 
 export const importIntersectionObserver = () => import(

routes/_utils/showVideoDialog.js

@@ -1,4 +1,4 @@
-import VideoDialog from '../_components/VideoDialog.html'
+import VideoDialog from '../_components/status/VideoDialog.html'
 
 export function showVideoDialog(poster, src, width, height, description) {
   let dialog = document.createElement('dialog')

routes/accounts/[accountId].html

@@ -24,7 +24,7 @@
 </Layout>
 <script>
   import Layout from '../_components/Layout.html'
-  import LazyTimeline from '../_components/LazyTimeline.html'
+  import LazyTimeline from '../_components/timeline/LazyTimeline.html'
   import FreeTextLayout from '../_components/FreeTextLayout.html'
   import { store } from '../_utils/store.js'
   import HiddenFromSSR from '../_components/HiddenFromSSR'

routes/federated.html

@@ -18,7 +18,7 @@
 
 <script>
   import Layout from './_components/Layout.html'
-  import LazyTimeline from './_components/LazyTimeline.html'
+  import LazyTimeline from './_components/timeline/LazyTimeline.html'
   import FreeTextLayout from './_components/FreeTextLayout.html'
   import { store } from './_utils/store.js'
   import HiddenFromSSR from './_components/HiddenFromSSR'

routes/index.html

@@ -14,7 +14,7 @@
 <script>
   import Layout from './_components/Layout.html'
   import NotLoggedInHome from './_components/NotLoggedInHome.html'
-  import LazyTimeline from './_components/LazyTimeline.html'
+  import LazyTimeline from './_components/timeline/LazyTimeline.html'
   import { store } from './_utils/store.js'
 
 	export default {

routes/local.html

@@ -18,7 +18,7 @@
 
 <script>
   import Layout from './_components/Layout.html'
-  import LazyTimeline from './_components/LazyTimeline.html'
+  import LazyTimeline from './_components/timeline/LazyTimeline.html'
   import FreeTextLayout from './_components/FreeTextLayout.html'
   import { store } from './_utils/store.js'
   import HiddenFromSSR from './_components/HiddenFromSSR'

routes/tags/[tagName].html

@@ -24,7 +24,7 @@
 </Layout>
 <script>
   import Layout from '../_components/Layout.html'
-  import LazyTimeline from '../_components/LazyTimeline.html'
+  import LazyTimeline from '../_components/timeline/LazyTimeline.html'
   import FreeTextLayout from '../_components/FreeTextLayout.html'
   import { store } from '../_utils/store.js'
   import HiddenFromSSR from '../_components/HiddenFromSSR'