From c6fb1528ea0bfeaf3a73207951bfdcbc864df37b Mon Sep 17 00:00:00 2001
From: Jack Hadrill <jack@hadrill.co.uk>
Date: Sun, 20 Mar 2022 00:12:03 +0000
Subject: [PATCH] Refactor sidebar

---
 src/App.vue                                   | 32 +------------
 src/components/Content.vue                    | 45 ++++++++++++++++++
 src/components/Sidebar.vue                    | 30 ++++++++++++
 src/components/{ => common}/Key.vue           |  9 +++-
 src/components/{ => conversation}/Message.vue |  2 +-
 .../MessageInput.vue}                         |  6 +--
 src/components/{sidebar => userlist}/User.vue |  2 +-
 .../Users.vue => userlist/UserList.vue}       |  9 ++--
 src/router/index.js                           |  6 +++
 src/views/ConversationView.vue                | 46 ++++++++++---------
 src/views/HomeView.vue                        | 35 ++++++++++++++
 src/views/SettingsView.vue                    | 18 ++++----
 12 files changed, 167 insertions(+), 73 deletions(-)
 create mode 100644 src/components/Content.vue
 create mode 100644 src/components/Sidebar.vue
 rename src/components/{ => common}/Key.vue (66%)
 rename src/components/{ => conversation}/Message.vue (89%)
 rename src/components/{Input.vue => conversation/MessageInput.vue} (87%)
 rename src/components/{sidebar => userlist}/User.vue (73%)
 rename src/components/{sidebar/Users.vue => userlist/UserList.vue} (73%)
 create mode 100644 src/views/HomeView.vue

diff --git a/src/App.vue b/src/App.vue
index 9a7085d..7fbbef6 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,42 +1,12 @@
 <template>
 <div class="container-fluid vh-100">
   <div class="row vh-100">
-    <div class="col-2 bg-dark">
-      <div class="d-flex flex-column vh-100">
-        <div class="d-flex flex-row logo align-items-center py-2">
-          <img src="./assets/logo-dark.png" class="me-2" />
-          <span class="fs-3 text-light">Mercury</span>
-        </div>
-        <div>
-          <h5 class="text-muted">Channels</h5>
-          <Channels />
-        </div>
-        <div>
-          <h5 class="text-muted mt-3">Users</h5>
-          <Users />
-        </div>
-        <div class="d-flex flex-column mt-auto mb-3">
-          <span v-if="connected" class="text-light"><i class="bi bi-circle-fill text-success"></i> Connected</span>
-          <span v-else class="text-light"><i class="bi bi-circle-fill text-warning"></i> Connecting...</span>
-          <router-link :to="{ name: 'Settings' }" class="text-muted"><i class="bi bi-gear-fill"></i> Settings</router-link>
-        </div>
-      </div>
-    </div>
-    <div class="col g-0">
-      <router-view />
-    </div>
+    <router-view />
   </div>
 </div>
 </template>
 
 <script setup>
-import { computed } from 'vue'
-import { useMercuryStore } from './stores/mercuryStore'
-import Channels from './components/sidebar/Channels.vue'
-import Users from './components/sidebar/Users.vue'
-
-const mercuryStore = useMercuryStore()
-const connected = computed(() => { return mercuryStore.connected })
 </script>
 
 <style>
diff --git a/src/components/Content.vue b/src/components/Content.vue
new file mode 100644
index 0000000..bc75750
--- /dev/null
+++ b/src/components/Content.vue
@@ -0,0 +1,45 @@
+<template>
+<div class="col g-0">
+  <div class="d-flex flex-column vh-100">
+    <header class="bg-light px-3 py-2 d-flex flex-row align-items-center">
+      <span class="me-3 fs-3">
+        <slot name="title"></slot>
+      </span>
+      <slot name="header"></slot>
+      <span v-if="!home" class="ms-auto fs-4">
+        <router-link :to="{ name: 'Home' }"><i class="text-dark bi bi-house-fill"></i></router-link>
+      </span>
+    </header>
+    <div class="px-3 py-2 overflow-auto">
+      <slot name="content"></slot>
+      <div ref="bottom"></div>
+    </div>
+    <div class="px-3 py-2 mt-auto">
+      <slot name="footer"></slot>
+    </div>
+  </div>
+</div>
+</template>
+
+<script setup>
+import { computed, onMounted, onUpdated, ref } from 'vue'
+import { useRoute } from 'vue-router'
+
+const props = defineProps({ autoScroll: Boolean })
+
+const route = useRoute()
+const home = computed(() => { return route.name == 'Home' })
+
+// Scroll to bottom.
+const bottom = ref(null)
+onUpdated(() => {
+  if (props.autoScroll) { 
+    bottom.value.scrollIntoView({ behavior: "smooth", block: "center" })
+  }
+})
+onMounted(() => {
+  if (props.autoScroll) { 
+    bottom.value.scrollIntoView({ block: "center" })
+  }
+})
+</script>
diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
new file mode 100644
index 0000000..c7b863b
--- /dev/null
+++ b/src/components/Sidebar.vue
@@ -0,0 +1,30 @@
+<template>
+<div class="col-2 bg-dark">
+  <div class="d-flex flex-column vh-100">
+    <div class="d-flex flex-row logo align-items-center py-2">
+      <img src="../assets/logo-dark.png" class="me-2" />
+      <span class="fs-3 text-light">Mercury</span>
+    </div>
+    <div>
+      <h5 class="text-muted">Channels</h5>
+      <Channels />
+      <slot name="top"></slot>
+    </div>
+    <div class="d-flex flex-column mt-auto mb-3">
+      <span v-if="connected" class="text-light"><i class="bi bi-circle-fill text-success"></i> Connected</span>
+      <span v-else class="text-light"><i class="bi bi-circle-fill text-warning"></i> Connecting...</span>
+      <router-link :to="{ name: 'Settings' }" class="text-muted"><i class="bi bi-gear-fill"></i> Settings</router-link>
+      <slot name="bottom"></slot>
+    </div>
+  </div>
+</div>
+</template>
+
+<script setup>
+import { computed } from 'vue'
+import { useMercuryStore } from '../stores/mercuryStore'
+import Channels from './sidebar/Channels.vue'
+
+const mercuryStore = useMercuryStore()
+const connected = computed (() => { return mercuryStore.connected })
+</script>
\ No newline at end of file
diff --git a/src/components/Key.vue b/src/components/common/Key.vue
similarity index 66%
rename from src/components/Key.vue
rename to src/components/common/Key.vue
index cf001b1..09e17a0 100644
--- a/src/components/Key.vue
+++ b/src/components/common/Key.vue
@@ -4,12 +4,17 @@
 </template>
 
 <script setup>
-import { ref } from 'vue'
+import { computed, ref } from 'vue'
+import { onBeforeRouteUpdate } from 'vue-router'
 
 const props = defineProps(['channel'])
-const key = props.channel.key.base64
+const key = computed(() => { return props.channel.key.base64 }) 
 
 const locked = ref(true)
+
+onBeforeRouteUpdate(() => {
+  locked.value = true
+})
 </script>
 
 <style scoped>
diff --git a/src/components/Message.vue b/src/components/conversation/Message.vue
similarity index 89%
rename from src/components/Message.vue
rename to src/components/conversation/Message.vue
index 916eadd..a3a8d8a 100644
--- a/src/components/Message.vue
+++ b/src/components/conversation/Message.vue
@@ -8,7 +8,7 @@
 
 <script setup>
 import { computed } from 'vue'
-import { useUserStore } from '../stores/userStore'
+import { useUserStore } from '../../stores/userStore'
 
 const props = defineProps(['message'])
 const message = props.message
diff --git a/src/components/Input.vue b/src/components/conversation/MessageInput.vue
similarity index 87%
rename from src/components/Input.vue
rename to src/components/conversation/MessageInput.vue
index f0fa14c..aa6a0d4 100644
--- a/src/components/Input.vue
+++ b/src/components/conversation/MessageInput.vue
@@ -7,10 +7,10 @@
 
 <script setup>
 import { computed, inject, ref } from 'vue'
+import { onBeforeRouteUpdate } from 'vue-router'
 import { MessageTypes, packers } from 'bennc-js'
-import { useMessageStore } from '../stores/messageStore'
-import { animateCSS } from '../common/animate'
-import { onBeforeRouteUpdate } from 'vue-router';
+import { useMessageStore } from '../../stores/messageStore'
+import { animateCSS } from '../../common/animate'
 
 const encoder = new TextEncoder()
 
diff --git a/src/components/sidebar/User.vue b/src/components/userlist/User.vue
similarity index 73%
rename from src/components/sidebar/User.vue
rename to src/components/userlist/User.vue
index eb5d565..a1807eb 100644
--- a/src/components/sidebar/User.vue
+++ b/src/components/userlist/User.vue
@@ -8,5 +8,5 @@ import { computed } from 'vue'
 const props = defineProps(['user'])
 const user = props.user
 
-const color = computed(() => { return user.color?.hex() ?? '#000000' })
+const color = computed(() => { return user.color?.hex() ?? '#6c757d' })
 </script>
diff --git a/src/components/sidebar/Users.vue b/src/components/userlist/UserList.vue
similarity index 73%
rename from src/components/sidebar/Users.vue
rename to src/components/userlist/UserList.vue
index eafbb57..c98fbc6 100644
--- a/src/components/sidebar/Users.vue
+++ b/src/components/userlist/UserList.vue
@@ -8,16 +8,15 @@
 </template>
 
 <script setup>
-import { computed, watch } from 'vue'
-import { useRoute } from 'vue-router'
+import { computed } from 'vue'
 import { useUserStore } from '../../stores/userStore'
 import User from './User.vue'
 
-const route = useRoute()
+const props = defineProps(['channel'])
+const channelId = computed(() => { return props.channel.id })
 
 const userStore = useUserStore()
-
-const channelId = computed(() => { return route.params.channelId })
 const users = computed(() => { return userStore.getUsersByChannelId(channelId.value) })
+
 const self = userStore.getSelf()
 </script>
diff --git a/src/router/index.js b/src/router/index.js
index a9af7d2..6e67451 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1,11 +1,17 @@
 import { createRouter, createWebHistory } from 'vue-router'
 
+import HomeView from '../views/HomeView.vue'
 import ConversationView from '../views/ConversationView.vue'
 import SettingsView from '../views/SettingsView.vue'
 
 export default createRouter({
   history: createWebHistory(),
   routes: [
+    {
+      name: 'Home',
+      path: '/', 
+      component: HomeView
+    },
     {
       name: 'Channel',
       path: '/channel/:channelId', 
diff --git a/src/views/ConversationView.vue b/src/views/ConversationView.vue
index 29c905b..14e48d6 100644
--- a/src/views/ConversationView.vue
+++ b/src/views/ConversationView.vue
@@ -1,25 +1,35 @@
 <template>
-<div class="d-flex flex-column vh-100">
-  <header class="bg-light px-3 py-2 d-flex flex-row align-items-center">
-    <span class="mb-0 me-3 fs-3">{{ channel.name }}</span>
+<Sidebar>
+  <template v-slot:top>
+    <h5 class="text-muted mt-3">Users</h5>
+    <UserList :channel="channel" />
+  </template>
+</Sidebar>
+<Content autoScroll>
+  <template v-slot:title>{{ channel.name }}</template>
+  <template v-slot:header>
     <Key :channel="channel" />
-  </header>
-  <div class="messages overflow-auto p-3">
+  </template>
+  <template v-slot:content>
     <Message v-for="message in messages" :key="message.id" :message="message" />
-    <div ref="bottom"></div>
-  </div>
-  <Input :channel="channel" class="mt-auto px-3" />
-</div>
+  </template>
+  <template v-slot:footer>
+    <MessageInput :channel="channel" />
+  </template>
+</Content>
 </template>
 
 <script setup>
-import { computed, onMounted, onUpdated, ref } from 'vue'
+import { computed, ref } from 'vue'
 import { onBeforeRouteUpdate, useRoute } from 'vue-router'
 import { useChannelStore } from '../stores/channelStore'
 import { useMessageStore } from '../stores/messageStore'
-import Input from '../components/Input.vue'
-import Message from '../components/Message.vue'
-import Key from '../components/Key.vue'
+import Sidebar from '../components/Sidebar.vue'
+import Content from '../components/Content.vue'
+import Key from '../components/common/Key.vue'
+import UserList from '../components/userlist/UserList.vue'
+import Message from '../components/conversation/Message.vue'
+import MessageInput from '../components/conversation/MessageInput.vue'
 
 const route = useRoute()
 const channelStore = useChannelStore()
@@ -31,13 +41,5 @@ const messages = computed(() => { return messageStore.getMessagesByChannelId(rou
 // Show the key.
 const locked = ref(false)
 onBeforeRouteUpdate(async (to, from) => { locked.value = false })
-
-// Scroll to bottom.
-const bottom = ref(null)
-onUpdated(() => {
-  bottom.value.scrollIntoView({ behavior: "smooth", block: "center" })
-})
-onMounted(() => {
-  bottom.value.scrollIntoView({ block: "center" })
-})
+const abcdef = ref(null)
 </script>
diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
new file mode 100644
index 0000000..d3e3f2a
--- /dev/null
+++ b/src/views/HomeView.vue
@@ -0,0 +1,35 @@
+<template>
+<Sidebar>
+</Sidebar>
+<Content>
+  <template v-slot:title>Welcome to Mercury!</template>
+  <template v-slot:content>
+    <div class="d-flex flex-column text-center align-items-center px-5 overflow-hidden">
+      <img class="animate__animated animate__rotateIn py-5 w-25" id="logo" src="../assets/logo-light.png" />
+      <h1 class="animate__animated animate__fadeInDown animate__delay-1s">
+        Mercury is a web-based BENNC client.
+      </h1>
+      <h2 class="animate__animated animate__fadeInDown animate__delay-2s">
+        Go to <router-link :to="{ name: 'Settings' }" class="text-muted"><i class="bi bi-gear-fill"></i> Settings</router-link> to configure your client.
+      </h2>
+    </div>
+  </template>
+</Content>
+</template>
+
+<script setup>
+import Sidebar from '../components/Sidebar.vue'
+import Content from '../components/Content.vue'
+</script>
+
+<style scoped>
+#logo {
+  filter: invert(80%);
+}
+h1 {
+  --animate-delay: 0.5s;
+}
+h2 {
+  --animate-delay: 0.5s;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/SettingsView.vue b/src/views/SettingsView.vue
index d83c75a..8dbd358 100644
--- a/src/views/SettingsView.vue
+++ b/src/views/SettingsView.vue
@@ -1,9 +1,8 @@
 <template>
-<div class="d-flex flex-column vh-100">
-  <header class="bg-light px-3 py-2 d-flex flex-row align-items-center">
-    <h2 class="mb-0 me-3">Settings</h2>
-  </header>
-  <div class="px-3 py-2">
+<Sidebar />
+<Content>
+  <template v-slot:title>Settings</template>
+  <template v-slot:content>
     <h3>Channels</h3>
     <table class="table">
       <thead>
@@ -29,13 +28,16 @@
       </div>
     </div>
     <button type="submit" class="btn btn-primary float-end">Add channel</button>
-  </div>
-</div>
+  </template>
+</Content>
+
 </template>
 
 <script setup>
 import { useChannelStore } from '../stores/channelStore'
-import Key from '../components/Key.vue'
+import Key from '../components/common/Key.vue'
+import Sidebar from '../components/Sidebar.vue'
+import Content from '../components/Content.vue'
 
 const channelStore = useChannelStore()
 </script>