From 0bcb1434b0bd10e7553519c90e62f23d8777fab6 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sun, 25 Oct 2020 09:15:20 +0900
Subject: [PATCH] Refactor

---
 src/client/ui/deck.vue                                      | 4 ++--
 src/client/{components => ui}/deck/antenna-column.vue       | 2 +-
 src/client/{components => ui}/deck/column-core.vue          | 0
 src/client/{components => ui}/deck/column.vue               | 0
 src/client/{components => ui}/deck/direct-column.vue        | 2 +-
 src/client/{components => ui}/deck/list-column.vue          | 2 +-
 src/client/{components => ui}/deck/mentions-column.vue      | 2 +-
 src/client/{components => ui}/deck/notifications-column.vue | 2 +-
 src/client/{components => ui}/deck/tl-column.vue            | 2 +-
 src/client/{components => ui}/deck/widgets-column.vue       | 0
 10 files changed, 8 insertions(+), 8 deletions(-)
 rename src/client/{components => ui}/deck/antenna-column.vue (97%)
 rename src/client/{components => ui}/deck/column-core.vue (100%)
 rename src/client/{components => ui}/deck/column.vue (100%)
 rename src/client/{components => ui}/deck/direct-column.vue (95%)
 rename src/client/{components => ui}/deck/list-column.vue (96%)
 rename src/client/{components => ui}/deck/mentions-column.vue (95%)
 rename src/client/{components => ui}/deck/notifications-column.vue (95%)
 rename src/client/{components => ui}/deck/tl-column.vue (98%)
 rename src/client/{components => ui}/deck/widgets-column.vue (100%)

diff --git a/src/client/ui/deck.vue b/src/client/ui/deck.vue
index 2a5008dc5..b2097be49 100644
--- a/src/client/ui/deck.vue
+++ b/src/client/ui/deck.vue
@@ -40,8 +40,8 @@ import {  } from '@fortawesome/free-regular-svg-icons';
 import { v4 as uuid } from 'uuid';
 import { host } from '@/config';
 import { search } from '@/scripts/search';
-import DeckColumnCore from '@/components/deck/column-core.vue';
-import DeckColumn from '@/components/deck/column.vue';
+import DeckColumnCore from '@/ui/deck/column-core.vue';
+import DeckColumn from '@/ui/deck/column.vue';
 import XSidebar from '@/components/sidebar.vue';
 import XHeader from './_common_/header.vue';
 import { getScrollContainer } from '@/scripts/scroll';
diff --git a/src/client/components/deck/antenna-column.vue b/src/client/ui/deck/antenna-column.vue
similarity index 97%
rename from src/client/components/deck/antenna-column.vue
rename to src/client/ui/deck/antenna-column.vue
index e7cb9d848..87df0fa87 100644
--- a/src/client/components/deck/antenna-column.vue
+++ b/src/client/ui/deck/antenna-column.vue
@@ -12,7 +12,7 @@
 import { defineComponent } from 'vue';
 import { faSatellite, faCog } from '@fortawesome/free-solid-svg-icons';
 import XColumn from './column.vue';
-import XTimeline from '../timeline.vue';
+import XTimeline from '@/components/timeline.vue';
 import * as os from '@/os';
 
 export default defineComponent({
diff --git a/src/client/components/deck/column-core.vue b/src/client/ui/deck/column-core.vue
similarity index 100%
rename from src/client/components/deck/column-core.vue
rename to src/client/ui/deck/column-core.vue
diff --git a/src/client/components/deck/column.vue b/src/client/ui/deck/column.vue
similarity index 100%
rename from src/client/components/deck/column.vue
rename to src/client/ui/deck/column.vue
diff --git a/src/client/components/deck/direct-column.vue b/src/client/ui/deck/direct-column.vue
similarity index 95%
rename from src/client/components/deck/direct-column.vue
rename to src/client/ui/deck/direct-column.vue
index ec598cebc..874a55ba0 100644
--- a/src/client/components/deck/direct-column.vue
+++ b/src/client/ui/deck/direct-column.vue
@@ -11,7 +11,7 @@ import { defineComponent } from 'vue';
 import { faEnvelope } from '@fortawesome/free-solid-svg-icons';
 import Progress from '@/scripts/loading';
 import XColumn from './column.vue';
-import XNotes from '../notes.vue';
+import XNotes from '@/components/notes.vue';
 import * as os from '@/os';
 
 export default defineComponent({
diff --git a/src/client/components/deck/list-column.vue b/src/client/ui/deck/list-column.vue
similarity index 96%
rename from src/client/components/deck/list-column.vue
rename to src/client/ui/deck/list-column.vue
index 4b8fc4a89..ee4bf2bf1 100644
--- a/src/client/components/deck/list-column.vue
+++ b/src/client/ui/deck/list-column.vue
@@ -12,7 +12,7 @@
 import { defineComponent } from 'vue';
 import { faListUl, faCog } from '@fortawesome/free-solid-svg-icons';
 import XColumn from './column.vue';
-import XTimeline from '../timeline.vue';
+import XTimeline from '@/components/timeline.vue';
 import * as os from '@/os';
 
 export default defineComponent({
diff --git a/src/client/components/deck/mentions-column.vue b/src/client/ui/deck/mentions-column.vue
similarity index 95%
rename from src/client/components/deck/mentions-column.vue
rename to src/client/ui/deck/mentions-column.vue
index dfa82af9b..3ba4f4e6a 100644
--- a/src/client/components/deck/mentions-column.vue
+++ b/src/client/ui/deck/mentions-column.vue
@@ -11,7 +11,7 @@ import { defineComponent } from 'vue';
 import { faAt } from '@fortawesome/free-solid-svg-icons';
 import Progress from '@/scripts/loading';
 import XColumn from './column.vue';
-import XNotes from '../notes.vue';
+import XNotes from '@/components/notes.vue';
 import * as os from '@/os';
 
 export default defineComponent({
diff --git a/src/client/components/deck/notifications-column.vue b/src/client/ui/deck/notifications-column.vue
similarity index 95%
rename from src/client/components/deck/notifications-column.vue
rename to src/client/ui/deck/notifications-column.vue
index 23fcb1568..6284cdcd0 100644
--- a/src/client/components/deck/notifications-column.vue
+++ b/src/client/ui/deck/notifications-column.vue
@@ -11,7 +11,7 @@ import { defineComponent } from 'vue';
 import { faCog } from '@fortawesome/free-solid-svg-icons';
 import { faBell } from '@fortawesome/free-regular-svg-icons';
 import XColumn from './column.vue';
-import XNotifications from '../notifications.vue';
+import XNotifications from '@/components/notifications.vue';
 import * as os from '@/os';
 
 export default defineComponent({
diff --git a/src/client/components/deck/tl-column.vue b/src/client/ui/deck/tl-column.vue
similarity index 98%
rename from src/client/components/deck/tl-column.vue
rename to src/client/ui/deck/tl-column.vue
index f75761888..de9585799 100644
--- a/src/client/components/deck/tl-column.vue
+++ b/src/client/ui/deck/tl-column.vue
@@ -23,7 +23,7 @@
 import { defineComponent } from 'vue';
 import { faMinusCircle, faHome, faComments, faShareAlt, faGlobe, faCog } from '@fortawesome/free-solid-svg-icons';
 import XColumn from './column.vue';
-import XTimeline from '../timeline.vue';
+import XTimeline from '@/components/timeline.vue';
 import * as os from '@/os';
 
 export default defineComponent({
diff --git a/src/client/components/deck/widgets-column.vue b/src/client/ui/deck/widgets-column.vue
similarity index 100%
rename from src/client/components/deck/widgets-column.vue
rename to src/client/ui/deck/widgets-column.vue