From 1684a2b9d60f3ea9d85c8953869c29d798510a93 Mon Sep 17 00:00:00 2001
From: tmcgroul <safonov.a.r@mail.ru>
Date: Thu, 1 Jul 2021 23:25:02 +0300
Subject: [PATCH] Components restructure

---
 src/components/ServerConfigs.vue                      |  5 +++--
 src/components/ServerModal.vue                        |  1 +
 src/{components => pages/Dashboard}/ServerItem.vue    |  4 ++--
 .../Dashboard.vue => pages/Dashboard/index.vue}       |  2 +-
 src/{components => pages}/NotFound.vue                |  0
 src/{components => pages/Server}/ServerLogs.vue       |  2 +-
 src/{components => pages/Server}/ServerRenameForm.vue |  2 +-
 .../ServerPage.vue => pages/Server/index.vue}         |  7 ++++---
 src/{components => pages}/SignIn.vue                  |  0
 src/{components => pages}/SignUp.vue                  |  0
 src/router.ts                                         | 11 +++++------
 11 files changed, 18 insertions(+), 16 deletions(-)
 rename src/{components => pages/Dashboard}/ServerItem.vue (97%)
 rename src/{components/Dashboard.vue => pages/Dashboard/index.vue} (97%)
 rename src/{components => pages}/NotFound.vue (100%)
 rename src/{components => pages/Server}/ServerLogs.vue (98%)
 rename src/{components => pages/Server}/ServerRenameForm.vue (96%)
 rename src/{components/ServerPage.vue => pages/Server/index.vue} (95%)
 rename src/{components => pages}/SignIn.vue (100%)
 rename src/{components => pages}/SignUp.vue (100%)

diff --git a/src/components/ServerConfigs.vue b/src/components/ServerConfigs.vue
index e0754c9..479972a 100644
--- a/src/components/ServerConfigs.vue
+++ b/src/components/ServerConfigs.vue
@@ -46,6 +46,7 @@
 
 <script lang="ts">
 import { defineComponent } from 'vue'
+
 import { GameConfig, ServerConfig } from '../interfaces'
 
 interface DataType {
@@ -73,8 +74,8 @@ export default defineComponent({
     },
   },
   async created() {
-    const { data } = await this.$http.get(`/games/${this.gameID}/config`);
-    this.rules = data;
+    const { data } = await this.$http.get(`/games/${this.gameID}/config`)
+    this.rules = data
 
     for (const [key, field] of Object.entries(this.rules)) {
       this.config[key] = field.config.default
diff --git a/src/components/ServerModal.vue b/src/components/ServerModal.vue
index 5e2febb..187e6b1 100644
--- a/src/components/ServerModal.vue
+++ b/src/components/ServerModal.vue
@@ -120,6 +120,7 @@
 import { useVuelidate } from '@vuelidate/core'
 import { required } from '@vuelidate/validators'
 import { defineComponent } from 'vue'
+
 import { ServerConfig } from '../interfaces'
 import store from '../store'
 import ServerConfigs from './ServerConfigs.vue'
diff --git a/src/components/ServerItem.vue b/src/pages/Dashboard/ServerItem.vue
similarity index 97%
rename from src/components/ServerItem.vue
rename to src/pages/Dashboard/ServerItem.vue
index 580ec64..509a7a2 100644
--- a/src/components/ServerItem.vue
+++ b/src/pages/Dashboard/ServerItem.vue
@@ -78,8 +78,8 @@
 <script lang="ts">
 import { defineComponent, PropType } from 'vue'
 
-import { Server, ServerStatus } from '../interfaces'
-import settings from '../settings'
+import { Server, ServerStatus } from '../../interfaces'
+import settings from '../../settings'
 
 export default defineComponent({
   props: {
diff --git a/src/components/Dashboard.vue b/src/pages/Dashboard/index.vue
similarity index 97%
rename from src/components/Dashboard.vue
rename to src/pages/Dashboard/index.vue
index 8d03711..95d4462 100644
--- a/src/components/Dashboard.vue
+++ b/src/pages/Dashboard/index.vue
@@ -19,7 +19,7 @@
 <script lang='ts'>
 import { defineComponent } from 'vue'
 
-import store from '../store'
+import store from '../../store'
 import ServerItem from './ServerItem.vue'
 
 export default defineComponent({
diff --git a/src/components/NotFound.vue b/src/pages/NotFound.vue
similarity index 100%
rename from src/components/NotFound.vue
rename to src/pages/NotFound.vue
diff --git a/src/components/ServerLogs.vue b/src/pages/Server/ServerLogs.vue
similarity index 98%
rename from src/components/ServerLogs.vue
rename to src/pages/Server/ServerLogs.vue
index cac1185..cb99575 100644
--- a/src/components/ServerLogs.vue
+++ b/src/pages/Server/ServerLogs.vue
@@ -18,7 +18,7 @@
   /> -->
 </template>
 
-<script lang="ts">
+<script lang='ts'>
 import { defineComponent } from 'vue'
 
 export default defineComponent({
diff --git a/src/components/ServerRenameForm.vue b/src/pages/Server/ServerRenameForm.vue
similarity index 96%
rename from src/components/ServerRenameForm.vue
rename to src/pages/Server/ServerRenameForm.vue
index f87a5f8..f26274e 100644
--- a/src/components/ServerRenameForm.vue
+++ b/src/pages/Server/ServerRenameForm.vue
@@ -19,7 +19,7 @@
 <script lang='ts'>
 import { defineComponent, PropType } from 'vue'
 
-import { Server } from '../interfaces'
+import { Server } from '../../interfaces'
 
 export default defineComponent({
   props: {
diff --git a/src/components/ServerPage.vue b/src/pages/Server/index.vue
similarity index 95%
rename from src/components/ServerPage.vue
rename to src/pages/Server/index.vue
index 8d4b105..10f19a9 100644
--- a/src/components/ServerPage.vue
+++ b/src/pages/Server/index.vue
@@ -49,10 +49,11 @@
   </section>
 </template>
 
-<script lang="ts">
+<script lang='ts'>
 import { defineComponent } from 'vue'
-import { Server, ServerStatus } from '../interfaces'
-import settings from '../settings'
+
+import { Server, ServerStatus } from '../../interfaces'
+import settings from '../../settings'
 import ServerLogs from './ServerLogs.vue'
 import ServerRenameForm from './ServerRenameForm.vue'
 
diff --git a/src/components/SignIn.vue b/src/pages/SignIn.vue
similarity index 100%
rename from src/components/SignIn.vue
rename to src/pages/SignIn.vue
diff --git a/src/components/SignUp.vue b/src/pages/SignUp.vue
similarity index 100%
rename from src/components/SignUp.vue
rename to src/pages/SignUp.vue
diff --git a/src/router.ts b/src/router.ts
index d066144..966b10a 100644
--- a/src/router.ts
+++ b/src/router.ts
@@ -1,11 +1,10 @@
-import { Component } from 'vue'
 import { createRouter, createWebHistory, RouteRecordRaw } from 'vue-router'
 
-import Dashboard from './components/Dashboard.vue'
-import NotFound from './components/NotFound.vue'
-import SignUp from './components/SignUp.vue'
-import SignIn from './components/SignIn.vue'
-import ServerPage from './components/ServerPage.vue'
+import Dashboard from './pages/Dashboard/index.vue'
+import NotFound from './pages/NotFound.vue'
+import SignUp from './pages/SignUp.vue'
+import SignIn from './pages/SignIn.vue'
+import ServerPage from './pages/Server/index.vue'
 import store from './store'