From 3e16584dcf70dc844d806f5f487bf94c171f91ad Mon Sep 17 00:00:00 2001
From: negue <eugen.bolz@gmail.com>
Date: Tue, 29 Aug 2023 21:22:06 +0200
Subject: [PATCH] fix PR comments

---
 .../settings/components/saveCancelButtons.vue | 21 ++++++++++++++++++-
 .../client/src/pages/settings/promoCode.vue   | 12 +++--------
 .../settings/settingRows/fixValuesSetting.vue |  6 +-----
 .../settings/settingRows/passwordSetting.vue  |  4 ----
 .../settings/settingRows/userNameSetting.vue  |  1 -
 .../settings/siteDataRows/userDataRow.vue     |  8 +++----
 website/common/locales/en/settings.json       |  1 +
 .../common/script/content/constants/index.js  |  4 ----
 8 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/website/client/src/pages/settings/components/saveCancelButtons.vue b/website/client/src/pages/settings/components/saveCancelButtons.vue
index 73d2bdf0f5..e6f4732e86 100644
--- a/website/client/src/pages/settings/components/saveCancelButtons.vue
+++ b/website/client/src/pages/settings/components/saveCancelButtons.vue
@@ -27,7 +27,26 @@
 <script>
 export default {
   name: 'SaveCancelButtons',
-  props: ['hideSave', 'hideCancel', 'disableSave', 'primaryButtonLabel', 'primaryButtonColor', 'noPadding'],
+  props: {
+    hideSave: {
+      type: Boolean,
+    },
+    hideCancel: {
+      type: Boolean,
+    },
+    disableSave: {
+      type: Boolean,
+    },
+    noPadding: {
+      type: Boolean,
+    },
+    primaryButtonLabel: {
+      type: String,
+    },
+    primaryButtonColor: {
+      type: String,
+    },
+  },
 };
 </script>
 
diff --git a/website/client/src/pages/settings/promoCode.vue b/website/client/src/pages/settings/promoCode.vue
index 16fcca1923..7f5561895a 100644
--- a/website/client/src/pages/settings/promoCode.vue
+++ b/website/client/src/pages/settings/promoCode.vue
@@ -15,7 +15,7 @@
         >
           <input
             v-model="couponCode"
-            class="form-control"
+            class="form-control w-100"
             type="text"
             :placeholder="$t('promoPlaceholder')"
           >
@@ -41,7 +41,7 @@
             <div class="form-group">
               <input
                 v-model="codes.event"
-                class="form-control"
+                class="form-control w-100"
                 type="text"
                 placeholder="Event code (eg, 'wondercon')"
               >
@@ -49,7 +49,7 @@
             <div class="form-group">
               <input
                 v-model="codes.count"
-                class="form-control"
+                class="form-control w-100"
                 type="number"
                 placeholder="Number of codes to generate (eg, 250)"
               >
@@ -74,12 +74,6 @@
   </div>
 </template>
 
-<style scoped>
-  .form-control {
-    width: 100%;
-  }
-</style>
-
 <script>
 import axios from 'axios';
 import { mapState } from '@/libs/store';
diff --git a/website/client/src/pages/settings/settingRows/fixValuesSetting.vue b/website/client/src/pages/settings/settingRows/fixValuesSetting.vue
index 9465bfe3f8..ef63f77058 100644
--- a/website/client/src/pages/settings/settingRows/fixValuesSetting.vue
+++ b/website/client/src/pages/settings/settingRows/fixValuesSetting.vue
@@ -76,7 +76,7 @@
         </div>
 
         <save-cancel-buttons
-          :disable-save="!sharedState.inlineSettingUnsavedValues"
+          :disable-save="!mixinData.inlineSettingMixin.sharedState.inlineSettingUnsavedValues"
           class="mt-4"
           @saveClicked="save()"
           @cancelClicked="requestCloseModal()"
@@ -241,10 +241,6 @@ export default {
         this.restoreValues.exp = 0;
       }
 
-      // todo
-      // this.user.stats = clone(this.restoreValues.stats);
-      // this.user.achievements.streak = clone(this.restoreValues.achievements.streak);
-
       const settings = {
         'stats.hp': Number(this.restoreValues.hp),
         'stats.exp': Number(this.restoreValues.exp),
diff --git a/website/client/src/pages/settings/settingRows/passwordSetting.vue b/website/client/src/pages/settings/settingRows/passwordSetting.vue
index bdbe11e967..0c42b67a9f 100644
--- a/website/client/src/pages/settings/settingRows/passwordSetting.vue
+++ b/website/client/src/pages/settings/settingRows/passwordSetting.vue
@@ -111,10 +111,6 @@ input {
   color: $green-50;
 }
 
-.form-group {
-  margin-bottom: 1.5rem;
-}
-
 </style>
 
 <script>
diff --git a/website/client/src/pages/settings/settingRows/userNameSetting.vue b/website/client/src/pages/settings/settingRows/userNameSetting.vue
index 38fec510f3..3ac79d737e 100644
--- a/website/client/src/pages/settings/settingRows/userNameSetting.vue
+++ b/website/client/src/pages/settings/settingRows/userNameSetting.vue
@@ -137,7 +137,6 @@ export default {
       });
 
       this.user.auth.local.username = newUsername;
-      // this.localAuth.username = this.user.auth.local.username;
       this.user.flags.verifiedUsername = true;
 
       this.text(this.$t('userNameSuccess'));
diff --git a/website/client/src/pages/settings/siteDataRows/userDataRow.vue b/website/client/src/pages/settings/siteDataRows/userDataRow.vue
index c1356ee41f..79e114291c 100644
--- a/website/client/src/pages/settings/siteDataRows/userDataRow.vue
+++ b/website/client/src/pages/settings/siteDataRows/userDataRow.vue
@@ -36,20 +36,20 @@
         </div>
 
         <div class="d-flex justify-content-center data-download-selection">
-          <table>
+          <table v-once>
             <tr>
-              <td>Task History</td>
+              <td>{{ $t('taskHistory') }}</td>
               <td>
                 <a
                   href="/export/history.csv"
                   class="btn btn-secondary"
                 >
-                  Download CSV
+                  {{ $t('downloadCSV') }}
                 </a>
               </td>
             </tr>
             <tr>
-              <td>User Data</td>
+              <td>{{ $t('userData') }}</td>
               <td>
                 <b-dropdown
                   :text="$t('downloadAs')"
diff --git a/website/common/locales/en/settings.json b/website/common/locales/en/settings.json
index a90c7f7b58..8852243ff5 100644
--- a/website/common/locales/en/settings.json
+++ b/website/common/locales/en/settings.json
@@ -44,6 +44,7 @@
     "downloadAs": "Download as",
     "userData": "User Data",
     "yourUserData": "Your User Data",
+    "taskHistory": "Task History",
     "yourUserDataDisclaimer": "Here you can download a copy of your task history or your full user data.",
     "exportUserData": "Export User Data:",
     "useridCopied": "User ID copied to clipboard.",
diff --git a/website/common/script/content/constants/index.js b/website/common/script/content/constants/index.js
index f661e03f8c..358edb82b1 100644
--- a/website/common/script/content/constants/index.js
+++ b/website/common/script/content/constants/index.js
@@ -1,7 +1,3 @@
-import moment from 'moment';
-
-export const CURRENT_SEASON = moment().isBefore('2020-08-02') ? 'summer' : '_NONE_';
-
 // sorting this also changes the class selection
 export const CLASSES = [
   'healer',