From fb8cd8aa895d2b7ee609bb84f23ab52c37d4a01f Mon Sep 17 00:00:00 2001
From: jdlugosz963 <jdlugosz963@gmail.com>
Date: Tue, 14 Dec 2021 09:06:45 +0100
Subject: clean up project tree

---
 src/components/GroupMaker.vue         |  99 ---------------------
 src/components/GroupView.vue          |  47 ----------
 src/components/Searcher.vue           | 157 ----------------------------------
 src/components/Sugestion.vue          |  32 -------
 src/components/group/GroupMaker.vue   |  99 +++++++++++++++++++++
 src/components/group/GroupView.vue    |  47 ++++++++++
 src/components/searcher/Searcher.vue  | 157 ++++++++++++++++++++++++++++++++++
 src/components/searcher/Sugestion.vue |  32 +++++++
 src/views/Home.vue                    |   9 +-
 9 files changed, 341 insertions(+), 338 deletions(-)
 delete mode 100644 src/components/GroupMaker.vue
 delete mode 100644 src/components/GroupView.vue
 delete mode 100644 src/components/Searcher.vue
 delete mode 100644 src/components/Sugestion.vue
 create mode 100644 src/components/group/GroupMaker.vue
 create mode 100644 src/components/group/GroupView.vue
 create mode 100644 src/components/searcher/Searcher.vue
 create mode 100644 src/components/searcher/Sugestion.vue

diff --git a/src/components/GroupMaker.vue b/src/components/GroupMaker.vue
deleted file mode 100644
index f3da293..0000000
--- a/src/components/GroupMaker.vue
+++ /dev/null
@@ -1,99 +0,0 @@
-<template>
-  <div class="group_maker">
-      Group maker
-      <form @submit="make_group">
-          <input
-              v-model="group_name"
-              ref='input'
-              type="text"
-              placeholder="Type group name..."
-          />
-
-          <select multiple v-model="users_selection">
-
-            <option
-              v-for="user in users"
-              :key="user.id"
-              :value="user.id">
-              {{user.username}}
-            </option>
-
-          </select>
-      </form>
-  </div>
-</template>
-
-<script>
-import ChatService from "@/services/ChatService.js"
-import AuthService from "@/services/AuthService.js"
-
-export default {
-  data() {
-    return {
-      group_name: "",
-      users_selection: [],
-      users: []
-    }
-  },
-
-  methods: {
-      close() {
-        this.$emit('close')
-      },
-
-      async make_group(e) {
-        e.preventDefault()
-        console.log(this.users_selection)
-        const {status} = await ChatService.group_create({
-          "name": this.group_name,
-          "users": this.users_selection
-        })
-
-        if(status === 201) {
-          this.$notify({
-            type: "success",
-            text: "Group created!"
-          })
-
-          this.close()
-        }
-
-      },
-
-    async set_users() {
-      const {status, data} = await AuthService.info("all=true")
-
-      if(status === 200)
-        this.users = data.users
-      else
-        this.close()
-
-      console.log(this.users)
-    }
-  },
-
-  created() {
-    this.$nextTick(function () {
-      this.$refs.input.focus()
-
-      this.set_users()
-    })
-  }
-}
-</script>
-
-<style scoped>
-
-.group_maker {
-    position: absolute;
-    width: 30%;
-    height: 80%;
-    top: 50%;
-    left: 50%;
-    background-color: #202020;
-    padding: 20px;
-    border-radius: 10px;
-    transform: translate(-50%, -50%);
-  }
-
-</style>
diff --git a/src/components/GroupView.vue b/src/components/GroupView.vue
deleted file mode 100644
index 1608cf4..0000000
--- a/src/components/GroupView.vue
+++ /dev/null
@@ -1,47 +0,0 @@
-<template>
-  <div class="group_view">
-      Group maker
-      <form @submit="send_message">
-        <inout type="text" ref="input" />
-      </form>
-  </div>
-</template>
-
-<script>
-import ChatService from "@/services/ChatService.js"
-
-export default {
-  data() {
-    return {
-    }
-  },
-
-  methods: {
-      close() {
-        this.$emit('close')
-      },
-  },
-
-  created() {
-    this.$nextTick(function () {
-      this.$refs.input.focus()
-    })
-  }
-}
-</script>
-
-<style scoped>
-
-.group_view {
-    position: absolute;
-    width: 30%;
-    height: 80%;
-    top: 50%;
-    left: 50%;
-    background-color: #202020;
-    padding: 20px;
-    border-radius: 10px;
-    transform: translate(-50%, -50%);
-  }
-
-</style>
diff --git a/src/components/Searcher.vue b/src/components/Searcher.vue
deleted file mode 100644
index df6dd9e..0000000
--- a/src/components/Searcher.vue
+++ /dev/null
@@ -1,157 +0,0 @@
-<template>
-  <div id="searcher">
-    <input 
-      type="text" 
-      v-model='search' 
-      ref='input' 
-      @keydown="hotkeys" 
-      @blur="close()"
-      placeholder="Search!"
-    />
-
-    <Sugestion 
-      v-for="sugestion in sugestions" 
-      :key="sugestion[0]"
-      :sugestion="sugestion"
-      :class="{selected: sugestion[0] === current[0]}"
-    />
-  </div>
-</template>
-
-<script>
-import CommandsService from '@/services/CommandsService'
-import Sugestion from '@/components/Sugestion.vue'
-
-export default {
-  data() {
-    return {
-      commands: CommandsService,
-      search: '',
-      sugestions: [],
-      current: []
-    }
-  },
-
-  methods: {
-    set_sugestions() {
-      const sugestions = []
-      let is_current_set = false
-
-      Object.entries(this.commands).forEach((element) => {
-        if(element[0].startsWith(this.search) && element[1] instanceof Function) {
-          sugestions.push(element)
-          if(!is_current_set){ 
-            this.current = element
-            is_current_set = true;
-          }
-        }
-      });
-      this.sugestions = sugestions
-    },
-
-    close() {
-      this.$emit('close')
-    },
-
-    change_current(a=1) {
-      let index = this.sugestions.findIndex(element => element===this.current)
-      let new_current = this.sugestions[index+a]
-
-      if (new_current) this.current = new_current 
-      else this.current = this.sugestions[0]
-    },
-
-    async execute_current() {
-      let out = await this.current[1](this)
-
-      if(out instanceof Object) {
-        this.search = ''
-        this.commands = out
-      }
-    },
-
-    hotkeys(e) {
-      switch(e.code) {
-        case 'Escape':
-          e.preventDefault()
-          this.close()
-          break
-        case 'ArrowDown':
-          e.preventDefault()
-          this.change_current(1)
-          break
-        case 'ArrowUp':
-          e.preventDefault()
-          this.change_current(-1)
-          break
-        case 'Tab':
-          e.preventDefault()
-          this.change_current(1)
-          break
-        case 'Enter':
-          e.preventDefault()
-          this.execute_current()
-          break
-        case 'ShiftLeft':
-          e.preventDefault()
-          this.commands = CommandsService
-          break
-      }
-    },
-  },
-
-  watch: {
-    search() {
-      this.set_sugestions()
-    },
-
-    commands() {
-      this.set_sugestions()
-    }
-  },
-
-  computed: {
-    
-  },
-
-  components: {
-    Sugestion
-  },
-
-  created() {
-    this.set_sugestions()
-
-    this.$nextTick(function () {
-      this.$refs.input.focus()
-    })
-  }
-}
-</script>
-
-<style scoped>
-  #searcher {
-    position: absolute;
-    width: 30%;
-    height: 80%;
-    top: 50%;
-    left: 50%;
-    background-color: #202020;
-    padding: 20px;
-    border-radius: 10px;
-    transform: translate(-50%, -50%);
-  }
-
-  #searcher input {
-    width: 100%;
-    margin-bottom: 20px;
-    padding: 10px;
-    padding-right: 0px;
-    height: 20px;
-    border: none;
-    background-color: #303030;
-  }
-
-  .selected {
-    background-color: #505050;
-  }
-</style>
diff --git a/src/components/Sugestion.vue b/src/components/Sugestion.vue
deleted file mode 100644
index 4721ca2..0000000
--- a/src/components/Sugestion.vue
+++ /dev/null
@@ -1,32 +0,0 @@
-<template>
-  <div class="sugestion">
-      <span>{{sugestion[0]}}</span>
-  </div>
-</template>
-
-<script>
-export default {
-    props: {
-        sugestion: Array
-    },
-
-   created() {
-        this.$nextTick(function () {
-        })
-     }
-
-}
-</script>
-
-<style scoped>
-    .sugestion {
-        width: 100%;
-        margin-left: auto;
-        margin-right: auto;
-        background-color: #303030;
-
-        margin-top: 10px;
-        padding: 5px;
-        padding-right: 0px;
-    }
-</style>
diff --git a/src/components/group/GroupMaker.vue b/src/components/group/GroupMaker.vue
new file mode 100644
index 0000000..f3da293
--- /dev/null
+++ b/src/components/group/GroupMaker.vue
@@ -0,0 +1,99 @@
+<template>
+  <div class="group_maker">
+      Group maker
+      <form @submit="make_group">
+          <input
+              v-model="group_name"
+              ref='input'
+              type="text"
+              placeholder="Type group name..."
+          />
+
+          <select multiple v-model="users_selection">
+
+            <option
+              v-for="user in users"
+              :key="user.id"
+              :value="user.id">
+              {{user.username}}
+            </option>
+
+          </select>
+      </form>
+  </div>
+</template>
+
+<script>
+import ChatService from "@/services/ChatService.js"
+import AuthService from "@/services/AuthService.js"
+
+export default {
+  data() {
+    return {
+      group_name: "",
+      users_selection: [],
+      users: []
+    }
+  },
+
+  methods: {
+      close() {
+        this.$emit('close')
+      },
+
+      async make_group(e) {
+        e.preventDefault()
+        console.log(this.users_selection)
+        const {status} = await ChatService.group_create({
+          "name": this.group_name,
+          "users": this.users_selection
+        })
+
+        if(status === 201) {
+          this.$notify({
+            type: "success",
+            text: "Group created!"
+          })
+
+          this.close()
+        }
+
+      },
+
+    async set_users() {
+      const {status, data} = await AuthService.info("all=true")
+
+      if(status === 200)
+        this.users = data.users
+      else
+        this.close()
+
+      console.log(this.users)
+    }
+  },
+
+  created() {
+    this.$nextTick(function () {
+      this.$refs.input.focus()
+
+      this.set_users()
+    })
+  }
+}
+</script>
+
+<style scoped>
+
+.group_maker {
+    position: absolute;
+    width: 30%;
+    height: 80%;
+    top: 50%;
+    left: 50%;
+    background-color: #202020;
+    padding: 20px;
+    border-radius: 10px;
+    transform: translate(-50%, -50%);
+  }
+
+</style>
diff --git a/src/components/group/GroupView.vue b/src/components/group/GroupView.vue
new file mode 100644
index 0000000..1608cf4
--- /dev/null
+++ b/src/components/group/GroupView.vue
@@ -0,0 +1,47 @@
+<template>
+  <div class="group_view">
+      Group maker
+      <form @submit="send_message">
+        <inout type="text" ref="input" />
+      </form>
+  </div>
+</template>
+
+<script>
+import ChatService from "@/services/ChatService.js"
+
+export default {
+  data() {
+    return {
+    }
+  },
+
+  methods: {
+      close() {
+        this.$emit('close')
+      },
+  },
+
+  created() {
+    this.$nextTick(function () {
+      this.$refs.input.focus()
+    })
+  }
+}
+</script>
+
+<style scoped>
+
+.group_view {
+    position: absolute;
+    width: 30%;
+    height: 80%;
+    top: 50%;
+    left: 50%;
+    background-color: #202020;
+    padding: 20px;
+    border-radius: 10px;
+    transform: translate(-50%, -50%);
+  }
+
+</style>
diff --git a/src/components/searcher/Searcher.vue b/src/components/searcher/Searcher.vue
new file mode 100644
index 0000000..f8dd51f
--- /dev/null
+++ b/src/components/searcher/Searcher.vue
@@ -0,0 +1,157 @@
+<template>
+  <div id="searcher">
+    <input 
+      type="text" 
+      v-model='search' 
+      ref='input' 
+      @keydown="hotkeys" 
+      @blur="close()"
+      placeholder="Search!"
+    />
+
+    <Sugestion 
+      v-for="sugestion in sugestions" 
+      :key="sugestion[0]"
+      :sugestion="sugestion"
+      :class="{selected: sugestion[0] === current[0]}"
+    />
+  </div>
+</template>
+
+<script>
+import CommandsService from '@/services/CommandsService'
+import Sugestion from '@/components/searcher/Sugestion.vue'
+
+export default {
+  data() {
+    return {
+      commands: CommandsService,
+      search: '',
+      sugestions: [],
+      current: []
+    }
+  },
+
+  methods: {
+    set_sugestions() {
+      const sugestions = []
+      let is_current_set = false
+
+      Object.entries(this.commands).forEach((element) => {
+        if(element[0].startsWith(this.search) && element[1] instanceof Function) {
+          sugestions.push(element)
+          if(!is_current_set){ 
+            this.current = element
+            is_current_set = true;
+          }
+        }
+      });
+      this.sugestions = sugestions
+    },
+
+    close() {
+      this.$emit('close')
+    },
+
+    change_current(a=1) {
+      let index = this.sugestions.findIndex(element => element===this.current)
+      let new_current = this.sugestions[index+a]
+
+      if (new_current) this.current = new_current 
+      else this.current = this.sugestions[0]
+    },
+
+    async execute_current() {
+      let out = await this.current[1](this)
+
+      if(out instanceof Object) {
+        this.search = ''
+        this.commands = out
+      }
+    },
+
+    hotkeys(e) {
+      switch(e.code) {
+        case 'Escape':
+          e.preventDefault()
+          this.close()
+          break
+        case 'ArrowDown':
+          e.preventDefault()
+          this.change_current(1)
+          break
+        case 'ArrowUp':
+          e.preventDefault()
+          this.change_current(-1)
+          break
+        case 'Tab':
+          e.preventDefault()
+          this.change_current(1)
+          break
+        case 'Enter':
+          e.preventDefault()
+          this.execute_current()
+          break
+        case 'ShiftLeft':
+          e.preventDefault()
+          this.commands = CommandsService
+          break
+      }
+    },
+  },
+
+  watch: {
+    search() {
+      this.set_sugestions()
+    },
+
+    commands() {
+      this.set_sugestions()
+    }
+  },
+
+  computed: {
+    
+  },
+
+  components: {
+    Sugestion
+  },
+
+  created() {
+    this.set_sugestions()
+
+    this.$nextTick(function () {
+      this.$refs.input.focus()
+    })
+  }
+}
+</script>
+
+<style scoped>
+  #searcher {
+    position: absolute;
+    width: 30%;
+    height: 80%;
+    top: 50%;
+    left: 50%;
+    background-color: #202020;
+    padding: 20px;
+    border-radius: 10px;
+    transform: translate(-50%, -50%);
+  }
+
+  #searcher input {
+    width: 100%;
+    margin-bottom: 20px;
+    padding: 10px;
+    padding-right: 0px;
+    height: 20px;
+    border: none;
+    background-color: #303030;
+  }
+
+  .selected {
+    background-color: #505050;
+  }
+</style>
diff --git a/src/components/searcher/Sugestion.vue b/src/components/searcher/Sugestion.vue
new file mode 100644
index 0000000..4721ca2
--- /dev/null
+++ b/src/components/searcher/Sugestion.vue
@@ -0,0 +1,32 @@
+<template>
+  <div class="sugestion">
+      <span>{{sugestion[0]}}</span>
+  </div>
+</template>
+
+<script>
+export default {
+    props: {
+        sugestion: Array
+    },
+
+   created() {
+        this.$nextTick(function () {
+        })
+     }
+
+}
+</script>
+
+<style scoped>
+    .sugestion {
+        width: 100%;
+        margin-left: auto;
+        margin-right: auto;
+        background-color: #303030;
+
+        margin-top: 10px;
+        padding: 5px;
+        padding-right: 0px;
+    }
+</style>
diff --git a/src/views/Home.vue b/src/views/Home.vue
index abf6fc8..1fbbb7f 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -16,8 +16,8 @@
 </template>
 
 <script>
-import Searcher from '@/components/Searcher.vue'
-import GroupMaker from '@/components/GroupMaker.vue'
+import Searcher from '@/components/searcher/Searcher.vue'
+import GroupMaker from '@/components/group/GroupMaker.vue'
 
 const popups = {
     searcher_show: false,
@@ -37,7 +37,10 @@ export default {
       this.$router.push('/login')
     },
     
-    toogleSearcherShow() { this.popups.searcher_show = !this.popups.searcher_show },
+    toogleSearcherShow() {
+      this.popups.searcher_show = !this.popups.searcher_show
+      this.popups.group_maker_show = false
+    },
     hideSearcher() { this.popups.searcher_show = false },
 
     toogleGroupShow() { this.popups.group_maker_show = !this.popups.group_maker_show },
-- 
cgit v1.2.3