Merge pull request #363 from penguin-statistics/dev

Release v3.2.2

cypress.json

@@ -0,0 +1,9 @@
+{
+  "baseUrl": "http://localhost:8080",
+  "video": false,
+  "pluginsFile": "tests/e2e/plugins/index.js",
+  "watchForFileChanges": false,
+  "env": {
+    "PENGUIN_FRONTEND_ENV": "testing"
+  }
+}

package.json

@@ -1,29 +1,19 @@
 {
   "name": "penguin-stats-frontend",
-  "version": "3.2.1",
+  "version": "3.2.2",
   "private": true,
-  "homepage": "https://github.com/penguin-statistics/frontend-v2#readme",
-  "bugs": {
-    "url": "https://github.com/penguin-statistics/frontend-v2/issues"
-  },
-  "license": "MIT",
-  "author": "All Contributors <*@*.*> (https://github.com/*)",
-  "contributors": [
-    "AlvISs_Reimu <alvissreimu@gmail.com> (https://github.com/AlvISsReimu)",
-    "Galvin Gao <me@galvingao.com> (https://github.com/GalvinGao)",
-    "Asahi <asahi@alpgo.cc> (https://github.com/AsahiLuna)",
-    "Blealtan <blealtan@outlook.com> (https://github.com/Blealtan)"
-  ],
+  "author": "Penguin Statistics Contributors <contributors@penguin-stats.io> (https://github.com/orgs/penguin-statistics/people)",
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "npx --max_old_space_size=4096 vue-cli-service build --modern",
-    "build:single": "npx --max_old_space_size=4096 vue-cli-service build",
+    "test:e2e": "vue-cli-service test:e2e",
     "lint": "vue-cli-service lint",
+    "build:single": "npx --max_old_space_size=4096 vue-cli-service build",
     "i18n:report": "vue-cli-service i18n:report --src './src/**/*.?(js|vue)' --locales './src/locales/**/*.json'",
-    "serveDist": "serve -c build/serve.json",
     "preview": "yarn build && yarn serveDist",
     "preview:single": "yarn build:single && yarn serveDist",
-    "release": "standard-version"
+    "release": "standard-version",
+    "serveDist": "serve -c build/serve.json"
   },
   "dependencies": {
     "@babel/plugin-transform-modules-commonjs": "^7.8.3",
@@ -54,7 +44,7 @@
     "@mdi/font": "4.9.95",
     "@vue/cli-plugin-babel": "^3.9.0",
     "@vue/cli-plugin-eslint": "^3.9.0",
-    "@vue/cli-service": "^3.9.0",
+    "@vue/cli-service": "^4.4.6",
     "axios": "^0.19.0",
     "babel-eslint": "^10.0.1",
     "browserslist-ga-export": "^2.0.0",
@@ -86,14 +76,25 @@
     "last 5 versions",
     "defaults"
   ],
+  "bugs": {
+    "url": "https://github.com/penguin-statistics/frontend-v2/issues"
+  },
   "config": {
     "commitizen": {
       "path": "./node_modules/cz-conventional-changelog"
     }
   },
+  "contributors": [
+    "AlvISs_Reimu <alvissreimu@gmail.com> (https://github.com/AlvISsReimu)",
+    "Galvin Gao <me@galvingao.com> (https://github.com/GalvinGao)",
+    "Asahi <asahi@alpgo.cc> (https://github.com/AsahiLuna)",
+    "Blealtan <blealtan@outlook.com> (https://github.com/Blealtan)"
+  ],
+  "homepage": "https://github.com/penguin-statistics/frontend-v2#readme",
   "husky": {
     "hooks": {
       "pre-commit": "npm run lint"
     }
-  }
+  },
+  "license": "MIT"
 }

src/App.vue

@@ -130,6 +130,7 @@
 
   import './styles/global.css'
   import './styles/fonts.css'
+  import './styles/theme-adapt.scss'
   import Footer from "@/components/global/Footer";
   import CDN from "@/mixins/CDN";
   import Mirror from "@/mixins/Mirror";

src/components/drawer/Navigation.vue

@@ -3,7 +3,7 @@
     v-if="!route.children || route.meta.forceSingle"
     :key="route.name"
     :class="route.path === $route.path ? activeClass : ''"
-    :two-line="route.meta.twoLine"
+    :two-line="!!route.meta.twoLine"
     @click="navigate(route)"
   >
     <v-list-item-icon>
@@ -19,7 +19,7 @@
         </v-icon>
       </v-list-item-title>
       <v-list-item-subtitle
-        v-if="route.meta.twoLine"
+        v-if="!!route.meta.twoLine"
         class="overline"
       >
         {{ $t(route.meta.twoLine) }}

src/components/global/GlobalSnackbar.vue

@@ -77,7 +77,10 @@
     :timeout="snackbar.timeout"
     :color="snackbar.color"
   >
-    <v-icon class="mr-4">
+    <v-icon
+      class="mr-4"
+      color="white"
+    >
       {{ snackbar.icon }}
     </v-icon>
     {{ $t(snackbar.text, snackbar.extra) }}

src/components/stats/SiteStatsOverview.vue

@@ -46,7 +46,6 @@
         return stats["totalStageTimes_24h"]
           .map(el => el.times)
           .reduce((a, b) => a + b, 0)
-          .toLocaleString()
       }
     },
     watch: {
@@ -67,7 +66,10 @@
           duration: 1500,
           round: 1,
           easing: 'easeOutQuint',
-          delay: 1500
+          delay: 1500,
+          complete: function () {
+            self.$refs["totalReportsNum"].innerText = newValue.toLocaleString();
+          }
         })
       }
     },

src/components/stats/StageSelector.vue

@@ -196,6 +196,7 @@
           "act7d5_zone1": this.cdnResource('/backgrounds/zones/act7d5_zone1.jpg'),
           "act9d0_zone1": this.cdnResource('/backgrounds/zones/act9d0_zone1.jpg'),
           "act10d5_zone1": this.cdnResource('/backgrounds/zones/act10d5_zone1.jpg'),
+          "act11d0_zone1": this.cdnResource('/backgrounds/zones/act11d0_zone1.jpg'),
           "A001_zone1": this.cdnResource('/backgrounds/zones/A001_zone1.jpg'),
           "A003_zone1": this.cdnResource('/backgrounds/zones/A003_zone1.jpg'),
           "main_0": this.cdnResource('/backgrounds/zones/main_0.jpg'),

src/components/toolbar/ServerSelector.vue

@@ -17,7 +17,7 @@
         >
           mdi-server
         </v-icon>
-        <span class="monospace">
+        <span>
           {{ $t("server.servers." + activeServerId) }}
         </span>
       </v-btn>
@@ -46,7 +46,7 @@
           :key="i"
           :disabled="pending"
         >
-          <v-list-item-title class="mr-2 monospace">
+          <v-list-item-title class="mr-2">
             {{ $t("server.servers." + server) }}
           </v-list-item-title>
           <v-list-item-action v-if="activeServerId === server">

src/config/index.js

@@ -1,4 +1,4 @@
-const version = "v3.2.1";
+const version = "v3.2.2";
 
 module.exports = {
   version,

src/locales/ja.json

@@ -173,16 +173,16 @@
       "item": {
         "_name": "アイテム数量",
         "now": "選択された {item} ×{quantity}",
-        "gte": "入力をした“{item}”の数がこのステージのドロップ最大数である {quantity} 個以上に設定されています",
-        "lte": "“{item}”の数を　{quantity}　個以下の数値で再入力して下さい",
-        "not": "“{item}”はこのステージでは1回のドロップ数が {quantity} 個になることはありません"
+        "gte": "入力をした“{item}”の数がこのステージのドロップ最大数である {should} 個以上に設定されています",
+        "lte": "“{item}”の数を　{should}　個以下の数値で再入力して下さい",
+        "not": "“{item}”はこのステージでは1回のドロップ数が {should} 個になることはありません"
       },
       "type": {
         "_name": "アイテム種類数",
         "now": "選択されたアイテムは {quantity} 種類です",
-        "gte": "最少 {quantity} 種類のアイテムが必要です",
-        "lte": "最大 {quantity} 種類のアイテムが必要です",
-        "not": "{quantity}種類のアイテムであってはなりません"
+        "gte": "最少 {should} 種類のアイテムが必要です",
+        "lte": "最大 {should} 種類のアイテムが必要です",
+        "not": "{should}種類のアイテムであってはなりません"
       }
     },
     "clear": "クリア",

src/locales/ko.json

@@ -127,16 +127,16 @@
       "item": {
         "_name": "아이템 수",
         "now": "{item} ×{quantity}개가 선택되었습니다",
-        "gte": "\"{item}\" ≥ {quantity}개 여야 합니다",
-        "lte": "\"{item}\" ≤ {quantity}개 여야 합니다",
-        "not": "\"{item}\" ≠ {quantity}개 여야 합니다"
+        "gte": "\"{item}\" ≥ {should}개 여야 합니다",
+        "lte": "\"{item}\" ≤ {should}개 여야 합니다",
+        "not": "\"{item}\" ≠ {should}개 여야 합니다"
       },
       "type": {
         "_name": "아이템 종류",
         "now": "{quantity}가지의 아이템이 선택되었습니다.",
-        "gte": "최소 {quantity}가지의 아이템이 드랍되어야 합니다",
-        "lte": "최대 {quantity}가지의 아이템만이 드랍될 수 있습니다",
-        "not": "{quantity}가지의 아이템이 드랍될 수 없습니다"
+        "gte": "최소 {should}가지의 아이템이 드랍되어야 합니다",
+        "lte": "최대 {should}가지의 아이템만이 드랍될 수 있습니다",
+        "not": "{should}가지의 아이템이 드랍될 수 없습니다"
       }
     },
     "clear": "초기화",

src/main.js

@@ -15,14 +15,15 @@ import * as Integrations from '@sentry/integrations';
 import { Integrations as ApmIntegrations } from '@sentry/apm';
 import mirror from "@/utils/mirror";
 import '@/components/functional'
+import debugConditioner from "@/utils/debugConditioner";
 
 if (!window.Intl) require("intl-collator")
 
 Vue.config.productionTip = false;
 
 const production = process.env.NODE_ENV === 'production';
 
-if (production) {
+if (production && !debugConditioner.disableSentry) {
   Sentry.init({
     dsn: 'https://9636aaa824a744f98a619df0aaabba00@sentry.io/1536764',
     integrations: [
@@ -83,10 +84,11 @@ if (production) {
       /metrics\.itunes\.apple\.com\.edgesuite\.net\//i
     ]
   });
-} else {
-  Vue.config.performance = true;
 }
 
+Vue.config.performance = debugConditioner.performance;
+Vue.config.devtools = debugConditioner.devtools;
+
 const googleAnalyticsID = mirror.cn.isCurrent() ? 'UA-142226262-4' : 'UA-142226262-1'
 
 Vue.use(VueAnalytics, {

src/mixins/hooks/Theme.js

@@ -13,10 +13,13 @@ export default {
   },
   methods: {
     themeToggle (isDark) {
+      const windowsIndicator = navigator.platform.indexOf('Win') > -1 ? "platform--windows" : "platform--not-windows";
       this.$vuetify.theme.dark = isDark
       if (isDark) {
+        document.documentElement.classList.add("vuetify-theme--dark", windowsIndicator)
         document.body.style.backgroundColor = "#121212"
       } else {
+        document.documentElement.classList.add("vuetify-theme--light", windowsIndicator)
         document.body.style.backgroundColor = "#ffffff"
       }
     },

src/models/managers/_common.js

@@ -1,4 +1,5 @@
 import store from '@/store'
+import validator from "@/utils/validator";
 
 export default {
   defaultAjaxHooks: {
@@ -15,5 +16,11 @@ export default {
         }
       )
     }
-  }
+  },
+  defaultValidator (data) {
+    return validator.all(
+      validator.isArray(data),
+      validator.notEmptyArray(data)
+    )
+  },
 }

src/models/managers/items.js

@@ -14,6 +14,7 @@ const items = new ObjectManager({
       return filtered
     },
   ],
+  validator: commons.defaultValidator,
   ttl: 1000 * 60 * 60 * 1, // 1 hour
   ajaxHooks: commons.defaultAjaxHooks
 });

src/models/managers/matrices/_base.js

@@ -2,7 +2,7 @@ import ObjectManager from '@/utils/objectManager'
 
 class MatrixObjectManager extends ObjectManager {
   /** Creates a matrix object manager */
-  constructor({ name, api, ttl, ajaxHooks }) {
+  constructor({ name, api, validator, ttl, ajaxHooks }) {
     super({
       name,
       api,
@@ -12,6 +12,7 @@ class MatrixObjectManager extends ObjectManager {
           return object
         },
       ],
+      validator,
       ttl,
       ajaxHooks
     });

src/models/managers/matrices/globalMatrix.js

@@ -11,6 +11,7 @@ const globalMatrix = new MatrixObjectManager({
       "show_closed_zones": true
     }
   },
+  validator: commons.defaultValidator,
   ttl: 1000 * 60 * 60 * 1, // 1 hour
   ajaxHooks: commons.defaultAjaxHooks
 });

src/models/managers/matrices/personalMatrix.js

@@ -5,6 +5,7 @@ const personalMatrix = new MatrixObjectManager({
   name: 'personalMatrix',
   api: {
     serverSensitive: true,
+    requireAuthorization: true,
 
     url: '/result/matrix',
     extraParams: {

src/models/managers/period.js

@@ -9,6 +9,7 @@ const period = new ObjectManager({
   transform: [
     (object) => object,
   ],
+  validator: commons.defaultValidator,
   ttl: 1000 * 60 * 60 * 1, // 1 hour
   ajaxHooks: commons.defaultAjaxHooks
 });

src/models/managers/stages.js

@@ -15,6 +15,7 @@ const stages = new ObjectManager({
       return object
     }
   ],
+  validator: commons.defaultValidator,
   ttl: 1000 * 60 * 60 * 1, // 1 hour
   ajaxHooks: commons.defaultAjaxHooks
 });

src/models/managers/zones.js

@@ -19,7 +19,7 @@ const zones = new ObjectManager({
     (object) => {
       // object.push({"zoneId":"test01","zoneIndex":0,"type":"ACTIVITY","zoneName":"测试活动","openTime":1577174400000,"closeTime":1598340799000,"stages":["test01_001","test01_002"],"zoneName_i18n":{"ja":"测试活动 ja","en":"测试活动 en","zh":"测试活动 zh"}})
       object.map((el) => {
-        el.icon = getIcon(el.type);
+        el.icon = getIcon(el.type) || "mdi-help-circle";
 
         el.isActivity = el.type === "ACTIVITY";
 
@@ -28,6 +28,7 @@ const zones = new ObjectManager({
       return object
     }
   ],
+  validator: commons.defaultValidator,
   ttl: 1000 * 60 * 60 * 1, // 1 hour
   ajaxHooks: commons.defaultAjaxHooks
 });

src/styles/global.css

@@ -164,10 +164,11 @@
 
 .lang-ja .force-lang-font, .lang-ja {
     /*font-family : 'ヒラギノ角ゴ ProN' , 'Hiragino Kaku Gothic ProN' , '游ゴシック' , '游ゴシック体' , YuGothic , 'Yu Gothic' , 'メイリオ' , Meiryo , 'ＭＳ ゴシック' , 'MS Gothic' , HiraKakuProN-W3 , 'TakaoExゴシック' , TakaoExGothic , 'MotoyaLCedar' , 'Droid Sans Japanese' , sans-serif !important;*/
-    font-family : 'ヒラギノ角ゴ ProN' , 'Hiragino Kaku Gothic ProN' , 'ヒラギノ明朝 ProN' , 'Hiragino Mincho ProN' , '游明朝','游明朝体',YuMincho,'Yu Mincho' , 'Meiryo', 'ＭＳ 明朝' , 'MS Mincho' , HiraMinProN-W3 , 'TakaoEx明朝' , TakaoExMincho , 'MotoyaLCedar' , 'Droid Sans Japanese' , serif !important;
+    /*font-family : 'ヒラギノ角ゴ ProN' , 'Hiragino Kaku Gothic ProN' , 'ヒラギノ明朝 ProN' , 'Hiragino Mincho ProN' , '游明朝','游明朝体',YuMincho,'Yu Mincho' , 'Meiryo', 'ＭＳ 明朝' , 'MS Mincho' , HiraMinProN-W3 , 'TakaoEx明朝' , TakaoExMincho , 'MotoyaLCedar' , 'Droid Sans Japanese' , sans-serif !important;*/
+    font-family: 'ヒラギノ角ゴ ProN' , 'Hiragino Kaku Gothic ProN' , 'ヒラギノ明朝 ProN', 'ヒラギノ角ゴ Pro W3', 'Hiragino Kaku Gothic Pro', 'Osaka', 'メイリオ', 'Meiryo', 'ＭＳ Ｐゴシック', 'MS PGothic', 'Helvetica Neue', 'Helvetica', Arial, sans-serif;
 }
 .lang-ko .force-lang-font, .lang-ko {
-    font-family: 'Malgun Gothic', Gulim, 'Roboto', Tahoma, Arial, sans-serif !important
+    font-family: 'Apple SD Gothic Neo', 'NanumBarunGothic', '맑은 고딕', 'Malgun Gothic', '굴림', 'Gulim', '돋움', 'Dotum', 'Helvetica Neue', 'Helvetica', Arial, sans-serif;
 }
 .force-not-lang-font {
     font-family: Roboto, sans-serif!important