From 90b59a3aa7d3051113ce709f949041e793c16e52 Mon Sep 17 00:00:00 2001
From: supertiger1234 <saawalkhn123@googlemail.com>
Date: Sat, 27 Jul 2019 17:57:38 +0100
Subject: [PATCH] notify titlemoved: socketmod, progress on profile

---
 .../Popouts/SettingsPanels/EditProfile.vue    | 128 ++++++++++++------
 .../Popouts/SettingsPanels/MyProfile.vue      |   7 +-
 .../Popouts/Popouts/SettingsPanels/survey.vue |   7 +
 src/store/modules/notificationsModule.js      |   2 -
 src/store/modules/socketIOModule.js           |   1 +
 5 files changed, 94 insertions(+), 51 deletions(-)

diff --git a/src/components/app/Popouts/Popouts/SettingsPanels/EditProfile.vue b/src/components/app/Popouts/Popouts/SettingsPanels/EditProfile.vue
index 3491aab..4e411e8 100644
--- a/src/components/app/Popouts/Popouts/SettingsPanels/EditProfile.vue
+++ b/src/components/app/Popouts/Popouts/SettingsPanels/EditProfile.vue
@@ -1,33 +1,39 @@
 <template>
   <div class="edit-profile">
-    <div class="left">
-      <div class="outer-input">
-        <div class="title">Username</div>
-        <div class="user-tag">
-          <input type="text" class="username" value="Fishie">
-          <input type="text" class="tag" value="#awr3">
+    <div class="inner-content">
+      <div class="left">
+        <div class="outer-input">
+          <div class="title">Username</div>
+          <div class="user-tag">
+            <input type="text" class="username" value="Fishie" />
+            <input type="text" class="tag" value="#awr3" />
+          </div>
+        </div>
+        <div class="outer-input">
+          <div class="title">Email</div>
+          <input type="text" value="Fishie" />
+        </div>
+        <div class="outer-input">
+          <div class="title">Current Password</div>
+          <input type="password" value="fsfsdf" />
         </div>
       </div>
-      <div class="outer-input">
-        <div class="title">Email</div>
-        <input type="text" value="Fishie">
+
+      <div class="change-avatar">
+        <div class="change-avatar-container">
+          <profile-picture
+            class="avatar"
+            :url="avatar"
+            :admin="user.admin"
+            size="100px"
+            emote-size="30px"
+            animation-padding="5px"
+          />
+          <div class="button">Change Avatar</div>
+        </div>
       </div>
     </div>
-
-    <div class="change-avatar">
-      <div class="change-avatar-container">
-        <profile-picture
-          class="avatar"
-          :url="avatar"
-          :admin="user.admin"
-          size="100px"
-          emote-size="30px"
-          animation-padding="5px"
-        />
-        <div class="button">Change Avatar</div>
-      </div>
-    </div>
-
+    <div class="button save-button">Update</div>
   </div>
 </template>
 
@@ -39,16 +45,10 @@ import config from "@/config.js";
 export default {
   components: { ProfilePicture },
   data() {
-    return {
-
-    };
-  },
-  methods: {
-
-  },
-  async mounted() {
-   
+    return {};
   },
+  methods: {},
+  async mounted() {},
   computed: {
     avatar() {
       return config.domain + "/avatars/" + this.$store.getters.user.avatar;
@@ -56,22 +56,30 @@ export default {
     user() {
       return this.$store.getters.user;
     }
-  },
+  }
 };
 </script>
 
 <style scoped>
-
-.edit-profile{
+.edit-profile {
   display: flex;
+  flex-direction: column;
   margin-top: 10px;
-  width: 100%;
+  flex: 1;
+  overflow: hidden;
+  padding-bottom: 40px;
+}
+.inner-content {
+  display: flex;
+  flex: 1;
+  overflow: auto;
+  flex-shrink: 0;
 }
 
 .change-avatar {
   display: flex;
   flex-direction: column;
-  flex: 1
+  flex: 1;
 }
 .change-avatar-container {
   display: flex;
@@ -88,6 +96,7 @@ export default {
   align-self: center;
 }
 
+
 .button {
   background: rgb(0, 119, 255);
   padding: 10px;
@@ -99,7 +108,7 @@ export default {
 }
 
 .left {
-  width: 300px;
+  width: 340px;
   display: flex;
   flex-direction: column;
 }
@@ -111,12 +120,14 @@ export default {
   background: rgb(42, 42, 42);
   padding: 10px;
   border-radius: 10px;
-  margin: 10px;
+  margin: 5px;
+  margin-left: 30px;
+  flex-shrink: 0;
 }
-.outer-input .user-tag .username{ 
-
+.outer-input .user-tag .username {
+  flex: 1;
 }
-.outer-input .user-tag .tag{ 
+.outer-input .user-tag .tag {
   border-left: solid 1px rgb(168, 168, 168);
   width: 50px;
 }
@@ -126,7 +137,36 @@ export default {
 }
 .outer-input input {
   width: initial;
-  border-radius: 5px
+  border-radius: 5px;
+}
+
+.save-button {
+  position: absolute;
+  z-index: 99999;
+  bottom: 0;
+  width: 100%;
+  align-self: initial;
+  display: block;
+  padding: 10px 0px 10px 0px;
+  margin: 0;
+}
+
+
+@media (max-width: 740px) {
+  .inner-content {
+    flex-direction: column;
+  }
+  .change-avatar-container {
+    order: 1;
+  }
+  .left {
+    order: 2;
+    align-self: center;
+    width: 280px;
+  }
+  .outer-input {
+    margin-left: initial;
+  }
 }
 
 </style>
\ No newline at end of file
diff --git a/src/components/app/Popouts/Popouts/SettingsPanels/MyProfile.vue b/src/components/app/Popouts/Popouts/SettingsPanels/MyProfile.vue
index ccea39d..f87e7d4 100644
--- a/src/components/app/Popouts/Popouts/SettingsPanels/MyProfile.vue
+++ b/src/components/app/Popouts/Popouts/SettingsPanels/MyProfile.vue
@@ -123,9 +123,6 @@ export default {
 <style scoped>
 
 .tabs{
-  position: absolute;
-  left: 0;
-  right: 0;
   z-index: 999999;
   display: flex;
   background: rgb(47, 47, 47);
@@ -163,9 +160,9 @@ export default {
 
 .content{
   display: flex;
-  margin-top: 45px;
   width: 100%;
   height: 100%;
+  overflow: hidden;
 }
 
 
@@ -179,7 +176,7 @@ export default {
   width: 100%;
   height: 100%;
   flex-direction: column;
-  overflow: auto;
+  overflow: hidden;
 }
 
 .alert-title {
diff --git a/src/components/app/Popouts/Popouts/SettingsPanels/survey.vue b/src/components/app/Popouts/Popouts/SettingsPanels/survey.vue
index b31c64a..1e94b70 100644
--- a/src/components/app/Popouts/Popouts/SettingsPanels/survey.vue
+++ b/src/components/app/Popouts/Popouts/SettingsPanels/survey.vue
@@ -221,6 +221,13 @@ export default {
   margin-top: 10px;
   user-select: none;
 }
+
+.survey {
+  height: 100%;
+  overflow: auto;
+  align-items: center;
+  width: 100%;
+}
 .survey,
 .survey-inner {
   display: flex;
diff --git a/src/store/modules/notificationsModule.js b/src/store/modules/notificationsModule.js
index eee4aec..c645c0a 100644
--- a/src/store/modules/notificationsModule.js
+++ b/src/store/modules/notificationsModule.js
@@ -19,8 +19,6 @@ const actions = {
   },
   messageCreatedNotification(context, notification) {
     const {guildID, channelID, lastMessageID, sender} = notification;
-    if (!document.hasFocus()) 
-      bus.$emit('title:change', "Someone sent a message.");
     
     // dont display a notification if the channel is selected.
     if (context.rootState.channelModule.selectedChannelID !== channelID || !document.hasFocus()) {
diff --git a/src/store/modules/socketIOModule.js b/src/store/modules/socketIOModule.js
index fb53c11..8867b2e 100644
--- a/src/store/modules/socketIOModule.js
+++ b/src/store/modules/socketIOModule.js
@@ -153,6 +153,7 @@ const actions = {
     if (context.rootState.channelModule.selectedChannelID == data.message.channelID && document.hasFocus()) {
       this._vm.$socket.emit('notification:dismiss', {channelID: data.message.channelID});
     } else {
+      bus.$emit('title:change', data.message.creator.username + " sent a message.");
       desktopNotification();
     }
     // send notification if other users message the recipient