From 67502d7ea2d7825fb8c0b10f49029a0fa0f26e8e Mon Sep 17 00:00:00 2001
From: unknown <saawalkhn@googlemail.com>
Date: Sat, 11 Jan 2020 14:55:20 +0000
Subject: [PATCH] increased avatar upload size to 8mb

---
 .../Popouts/SettingsPanels/EditProfile.vue    |  4 +-
 .../Popouts/SettingsPanels/MyProfile.vue      | 56 -------------------
 src/components/app/ServerList.vue             |  2 +
 src/utils/changelog.js                        |  2 +-
 4 files changed, 5 insertions(+), 59 deletions(-)

diff --git a/src/components/app/Popouts/Popouts/SettingsPanels/EditProfile.vue b/src/components/app/Popouts/Popouts/SettingsPanels/EditProfile.vue
index e4b0bfd..9bd6dea 100644
--- a/src/components/app/Popouts/Popouts/SettingsPanels/EditProfile.vue
+++ b/src/components/app/Popouts/Popouts/SettingsPanels/EditProfile.vue
@@ -122,11 +122,11 @@ export default {
       }
       const file = event.target.files[0];
       const _this = this;
-      const maxSize = 2092000;
+      const maxSize = 8092000;
       if (file.size > maxSize) {
         return this.$store.dispatch(
           "setGenericMessage",
-          "Image is larger than 2MB"
+          "Image is larger than 8MB"
         );
       }
       event.target.value = "";
diff --git a/src/components/app/Popouts/Popouts/SettingsPanels/MyProfile.vue b/src/components/app/Popouts/Popouts/SettingsPanels/MyProfile.vue
index ba7d852..8ae716a 100644
--- a/src/components/app/Popouts/Popouts/SettingsPanels/MyProfile.vue
+++ b/src/components/app/Popouts/Popouts/SettingsPanels/MyProfile.vue
@@ -34,11 +34,6 @@
 const Survey = () => import("./survey.vue");
 const EditProfile = () => import("./EditProfile.vue");
 
-import AvatarUpload from "@/services/AvatarUpload.js";
-import config from "@/config.js";
-import path from "path";
-import { mapState } from "vuex";
-
 export default {
   components: {
     Survey,
@@ -52,57 +47,6 @@ export default {
         show: false
       }
     };
-  },
-  methods: {
-    onProgress(percent) {
-      //update vue
-      console.log("Avatar upload progress: ", percent);
-    },
-    async avatarBrowse(event) {
-      const file = event.target.files[0];
-      event.target.value = "";
-      const allowedFormats = [".png", ".jpeg", ".gif", ".jpg"];
-
-      if (!allowedFormats.includes(path.extname(file.name).toLowerCase())) {
-        this.alert.content = "Upload failed - Unsupported image file.";
-        return (this.alert.show = true);
-      } else if (file.size >= 2092000) {
-        // 2092000 = 2mb
-        this.alert.content =
-          "Upload failed - Image size must be less than 2 megabytes.";
-        return (this.alert.show = true);
-      }
-      const formData = new FormData();
-      formData.append("avatar", file);
-      const { ok } = await AvatarUpload.uploadAvatar(formData, this.onProgress);
-      if (!ok) {
-        this.alert.content =
-          "Upload failed - Something went wrong. Try again later.";
-        return (this.alert.show = true);
-      }
-    },
-    changePassword() {
-      this.alert.content = "Not implemented yet.";
-      return (this.alert.show = true);
-    },
-    editAvatarBtn() {
-      if (!this.GDriveLinked) {
-        return this.$store.dispatch("setPopoutVisibility", {
-          name: "GDLinkMenu",
-          visibility: true
-        });
-      }
-      this.$refs.avatarBrowser.click();
-    }
-  },
-  computed: {
-    ...mapState("settingsModule", ["GDriveLinked"]),
-    user() {
-      return this.$store.getters.user;
-    },
-    avatar() {
-      return config.domain + "/avatars/" + this.$store.getters.user.avatar;
-    }
   }
 };
 </script>
diff --git a/src/components/app/ServerList.vue b/src/components/app/ServerList.vue
index 1174396..949657a 100644
--- a/src/components/app/ServerList.vue
+++ b/src/components/app/ServerList.vue
@@ -144,6 +144,7 @@ export default {
   display: flex;
   flex: 1;
   height: 100%;
+  overflow: auto;
 }
 .right {
   display: flex;
@@ -166,6 +167,7 @@ export default {
   border-radius: 4px;
   margin: 10px;
   box-shadow: 0px 2px 12px rgba(0, 0, 0, 0.13);
+  flex-shrink: 0;
 }
 .extendBanner {
   height: 130px;
diff --git a/src/utils/changelog.js b/src/utils/changelog.js
index 8d5627c..3b19aa0 100644
--- a/src/utils/changelog.js
+++ b/src/utils/changelog.js
@@ -3,7 +3,7 @@ const config = [
     version: 9.2,
     title: "Image cache, more role permissions!",
     shortTitle: "",
-    date: "08/01/2019",
+    date: "09/01/2019",
     headColor: "#007792",
     new: [
       "Image cache has been implimented.",