From 88a89bbe4fb94324a29699c9ac66541c6f6e0d38 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Thu, 25 Jan 2018 13:03:12 +0200
Subject: [PATCH] add a loading animation to button

---
 client/src/index.js                           | 12 +++++
 .../ui/components/BdSettingsWrapper.vue       | 19 +++++++-
 .../templates/BdSettingsWrapper.html          |  2 +-
 .../styles/partials/bdsettings/button.scss    | 18 ++++++-
 .../src/styles/partials/generic/buttons.scss  | 47 -------------------
 5 files changed, 47 insertions(+), 51 deletions(-)

diff --git a/client/src/index.js b/client/src/index.js
index 7d32f077..aabb96f1 100644
--- a/client/src/index.js
+++ b/client/src/index.js
@@ -22,6 +22,7 @@ class BetterDiscord {
         Events.on('global-ready', e => {
             const { UI } = require('./modules/ui/vueui.js');
             this.ui = new UI();
+            this.init();
         });
 
         //Inject styles to head for now
@@ -30,6 +31,17 @@ class BetterDiscord {
         style.type = 'text/css';
         style.appendChild(document.createTextNode(styles));
         document.head.appendChild(style);
+
+        this.init();
+    }
+
+    async init() {
+        try {
+            await PluginManager.loadAllPlugins();
+        } catch (err) {
+        }
+
+        Events.emit('ready');
     }
 
 }
diff --git a/client/src/modules/ui/components/BdSettingsWrapper.vue b/client/src/modules/ui/components/BdSettingsWrapper.vue
index 9aa5a346..9f25ac66 100644
--- a/client/src/modules/ui/components/BdSettingsWrapper.vue
+++ b/client/src/modules/ui/components/BdSettingsWrapper.vue
@@ -1,12 +1,19 @@
 <template src="./templates/BdSettingsWrapper.html"></template>
 <script>
+    const { Events } = require('../../');
+
     /*Imports*/
     import BdSettings from './BdSettings.vue';
     const components = { BdSettings };
 
     /*Methods*/
-    function showSettings() { this.active = true; }
-    function hideSettings() { this.active = false; }
+    function showSettings() {
+        if (!this.loaded) return;
+        this.active = true;
+    }
+    function hideSettings() {
+        this.active = false;
+    }
 
     const methods = { showSettings, hideSettings };
 
@@ -17,11 +24,19 @@
         methods,
         data() {
             return {
+                loaded: false,
                 active: false,
                 platform: global.process.platform
             }
         },
         created: function () {
+
+            Events.on('ready', e => {
+                setTimeout(() => { //Dummy timeout to test loading
+                    this.loaded = true;
+                }, 5000);
+            });
+
             window.addEventListener('keyup', globalKeyListener = e => {
                 if (this.active && e.which === 27) {
                     this.hideSettings();
diff --git a/client/src/modules/ui/components/templates/BdSettingsWrapper.html b/client/src/modules/ui/components/templates/BdSettingsWrapper.html
index 05687f4c..8c55dcff 100644
--- a/client/src/modules/ui/components/templates/BdSettingsWrapper.html
+++ b/client/src/modules/ui/components/templates/BdSettingsWrapper.html
@@ -1,6 +1,6 @@
 <div class="bd-settings-wrapper" :class="[{active: active}, 'platform-' + this.platform]">
     <div class="bd-settings-button" :class="{active: active}" @click="showSettings">
-        <div class="bd-settings-button-btn"></div>
+        <div class="bd-settings-button-btn" :class="{'bd-loading': !loaded}"></div>
     </div>
     <BdSettings :active="active" :close="hideSettings"/>
 </div>
diff --git a/client/src/styles/partials/bdsettings/button.scss b/client/src/styles/partials/bdsettings/button.scss
index e522f20a..ae461fdd 100644
--- a/client/src/styles/partials/bdsettings/button.scss
+++ b/client/src/styles/partials/bdsettings/button.scss
@@ -22,10 +22,14 @@
         opacity: 0.5;
         transition: all 0.4s ease-in-out;
 
-        &:hover {
+        &:not(.bd-loading):hover {
             filter: none;
             opacity: 1;
         }
+
+        &.bd-loading {
+            animation: bd-settings-button-pulse 1.5s infinite;
+        }
     }
 
     &.active {
@@ -47,3 +51,15 @@
     }
 }
 
+@keyframes bd-settings-button-pulse {
+    0% {
+        filter: grayscale(100%);
+    }
+    50% {
+        filter: grayscale(0%);
+        opacity: 1;
+    }
+    100% {
+        filter: grayscale(100%);
+    }
+}
\ No newline at end of file
diff --git a/client/src/styles/partials/generic/buttons.scss b/client/src/styles/partials/generic/buttons.scss
index 7392de51..09ba0e01 100644
--- a/client/src/styles/partials/generic/buttons.scss
+++ b/client/src/styles/partials/generic/buttons.scss
@@ -1,51 +1,4 @@
-.bd-settings-button {
-    position: absolute;
-    z-index: 1;
-    top: 22px;
-    width: 70px;
-    height: 48px;
-    left: 0;
-    background: #202225;
-    box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 2px 0 rgba(0, 0, 0, 0.06);
-    opacity: 1;
 
-    .bd-settings-button-btn {
-        background-image: $logoSmallBw;
-        background-size: 50% 50%;
-        background-repeat: no-repeat;
-        background-position: center;
-        width: 100%;
-        height: 100%;
-        z-index: 3000;
-        cursor: pointer;
-        filter: grayscale(100%);
-        opacity: 0.5;
-        transition: all 0.4s ease-in-out;
-
-        &:hover {
-            filter: none;
-            opacity: 1;
-        }
-    }
-
-    &.active {
-        background: transparent;
-        opacity: 1;
-        box-shadow: none;
-        z-index: 90000;
-
-        .bd-settings-button-btn {
-            background-image: $logoBigBw;
-            filter: none;
-            opacity: 1;
-            width: 130px;
-            height: 80px;
-            background-size: 100% 100%;
-            margin-left: 20px;
-            cursor: default;
-        }
-    }
-}
 
 .bd-button {
     display: flex;