Merge pull request #355 from penguin-statistics/dev

Release v3.2.0

SECURITY.md

@@ -0,0 +1,12 @@
+# Security Policy
+
+## Supported Versions
+
+| Version | Supported          |
+| ------- | ------------------ |
+| 2.x.x   | :white_check_mark: |
+| 1.x.x   | :x:                |
+
+## Reporting a Vulnerability
+
+If you found a vulnerability in our website, please send an email to the webmaster Alviss Reimu (`alvissreimu at gmail`), and we would like to kindly ask you to not disclose about the detail of the vulnerability to the public before we have released a fix. Thanks for making Penguin Statistics a better site ;)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "penguin-stats-frontend",
-  "version": "3.0.1",
+  "version": "3.2.0",
   "private": true,
   "homepage": "https://github.com/penguin-statistics/frontend-v2#readme",
   "bugs": {
@@ -39,15 +39,17 @@
     "intl-collator": "^0.1.6",
     "js-cookie": "^2.2.1",
     "marked": "^1.0.0",
+    "pinyin-engine": "^1.1.0",
     "vue": "^2.6.10",
     "vue-analytics": "^5.22.1",
     "vue-i18n": "^8.0.0",
     "vue-router": "^3.0.3",
-    "vuetify": "^2.2.15",
+    "vuetify": "2.2.34",
     "vuex": "^3.0.1",
     "vuex-persistedstate": "^2.7.1"
   },
   "devDependencies": {
+    "@intlify/vue-i18n-loader": "^1.0.0",
     "@kazupon/vue-i18n-loader": "^0.3.0",
     "@mdi/font": "4.9.95",
     "@vue/cli-plugin-babel": "^3.9.0",
@@ -60,11 +62,12 @@
     "eslint": "^5.16.0",
     "eslint-plugin-vue": "^5.0.0",
     "eslint-plugin-vuetify": "^1.0.0-beta.5",
+    "husky": "^4.2.5",
     "sass": "^1.25.0",
     "sass-loader": "^8.0.2",
     "stylus": "^0.54.5",
     "stylus-loader": "^3.0.1",
-    "vue-cli-plugin-i18n": "^0.6.1",
+    "vue-cli-plugin-i18n": "^1.0.1",
     "vue-cli-plugin-vuetify": "^2.0.5",
     "vue-svg-inline-loader": "^1.5.0",
     "vue-template-compiler": "^2.6.10",
@@ -87,5 +90,10 @@
     "commitizen": {
       "path": "./node_modules/cz-conventional-changelog"
     }
+  },
+  "husky": {
+    "hooks": {
+      "pre-commit": "npm run lint"
+    }
   }
 }

src/components/NumberInput.vue

@@ -6,6 +6,7 @@
       'number-input--center': center,
       'number-input--controls': controls,
       [`number-input--${size}`]: size,
+      'number-input--dense': $vuetify.breakpoint.smAndDown
     }"
     v-on="listeners"
   >
@@ -252,13 +253,33 @@
           this.$refs.input.value = newValue;
         }
 
-        this.$emit('change', newValue, oldValue);
+        this.$emit('change', newValue);
       },
     },
   };
 </script>
 
 <style lang="scss" scoped>
+  ::v-deep .number-input-theme--dense .number-input__button--minus {
+    border-radius: 15px 0 0 15px !important;
+  }
+  ::v-deep .number-input-theme--dense .number-input__button--plus {
+    border-radius: 0 15px 15px 0 !important;
+  }
+  ::v-deep .number-input-theme--dense .number-input__button::before {
+    width: 14px;
+  }
+  ::v-deep .number-input-theme--dense .number-input__button {
+    width: 24px !important;
+  }
+  ::v-deep .number-input-theme--dense .number-input__button:hover {
+    width: 30px !important;
+  }
+  ::v-deep .number-input-theme--dense .number-input__input {
+    padding-left: 20px !important;
+    padding-right: 20px !important;
+  }
+
   .number-input {
     display: block;
     font-size: 0;
@@ -358,7 +379,7 @@
       -moz-appearance: textfield;
       background: rgba(0, 0, 0, .2) !important;
       display: block;
-      line-height: 22px;
+      line-height: 21px;
       max-width: 100%;
       min-height: 32px;
       min-width: 3rem;
@@ -435,8 +456,8 @@
       }
 
       &.number-input--controls > input {
-        padding-left: 2.5rem;
-        padding-right: 2.5rem;
+        padding-left: 2.1rem;
+        padding-right: 2.1rem;
       }
     }
 
@@ -460,5 +481,29 @@
         padding-right: 4rem;
       }
     }
+
+    &--dense {
+      .number-input__input {
+        padding-left: 20px !important;
+        padding-right: 20px !important;
+      }
+      .number-input__button {
+        &--minus {
+          border-radius: 15px 0 0 15px !important;
+        }
+        &--plus {
+          border-radius: 0 15px 15px 0 !important;
+        }
+        &::before {
+          width: 14px;
+        }
+        &:hover {
+          width: 30px !important;
+        }
+        & {
+          width: 24px !important;
+        }
+      }
+    }
   }
 </style>

src/components/drawer/DataResetter.vue

@@ -18,7 +18,7 @@
         {{ $t('settings.data.reset.title') }}
       </v-card-title>
 
-      <v-card-text>
+      <v-card-text class="subtitle-1">
         {{ $t('settings.data.reset.subtitle') }}
       </v-card-text>
 

src/components/drawer/LocaleSwitcher.vue

@@ -10,6 +10,13 @@
   >
     <template v-slot:item="{item}">
       {{ item.text }}
+      <v-icon
+        v-if="item.beta"
+        small
+        class="ml-1"
+      >
+        mdi-beta
+      </v-icon>
       <v-spacer />
       <!--      <span class="monospace ml-2">-->
       <!--        {{ item.value }}-->
@@ -42,14 +49,22 @@
         localizations: [
           {
             value: 'zh',
-            text: '中文'
-          }, {
+            text: '简体中文'
+          },
+          // {
+          //   value: 'zh-TW',
+          //   text: '繁体中文',
+          //   beta: true
+          // },
+          {
             value: 'en',
             text: 'English'
-          }, {
+          },
+          {
             value: 'ja',
             text: '日本語'
-          }, {
+          },
+          {
             value: 'ko',
             text: '한국어'
           }

src/components/drawer/Navigation.vue

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

src/components/global/GlobalSnackbar.vue

@@ -11,35 +11,10 @@
 		"planner": {
 			"calculationError": "Failed to calculate: {error}",
 			"import": {
-				"jsonError": "Failed to import: Data parsing error, please check your input ({error})",
+				"invalidJSON": "Import Failed: Invalid JSON, please check your input",
+				"unrecognized": "Import Failed: Unable to recognize config file",
 				"success": "Successfully imported data for {amount} items"
 			}
-		},
-		"pwaPopup": {
-			"update": {
-				"skipWaitingTimeout": "Failed to apply changes: ServiceWorker timed out. Please refresh page and try again"
-			}
-		}
-	},
-	"ja": {
-		"clipboard": {
-			"error": "",
-			"success": ""
-		},
-		"network": {
-			"error": ""
-		},
-		"planner": {
-			"calculationError": "",
-			"import": {
-				"jsonError": "",
-				"success": ""
-			}
-		},
-		"pwaPopup": {
-			"update": {
-				"skipWaitingTimeout": ""
-			}
 		}
 	},
 	"ko": {
@@ -53,14 +28,9 @@
 		"planner": {
 			"calculationError": "계산오류: {error}",
 			"import": {
-				"jsonError": "가져오지 못했습니다. 데이터 구문 분석 오류입니다. 입력값을 확인해 주세요. ({error})",
+				"invalidJSON": "가져오지 못했습니다. 데이터 구문 분석 오류입니다. 입력값을 확인해 주세요.",
 				"success": "{amount}개 항목에 대한 데이터를 성공적으로 가져왔습니다."
 			}
-		},
-		"pwaPopup": {
-			"update": {
-				"skipWaitingTimeout": "변경 내용을 적용하지 못했습니다. 서비스가 시간 초과되었습니다. 페이지를 새로 고친 후 다시 시도하세요."
-			}
 		}
 	},
 	"zh": {
@@ -74,13 +44,26 @@
 		"planner": {
 			"calculationError": "计算失败：{error}",
 			"import": {
-				"jsonError": "导入失败：数据格式错误，请检查后重试（{error}）",
+				"invalidJSON": "导入失败：JSON 格式错误，请检查后重试",
+				"unrecognized": "导入失败：无法识别此配置文件，请检查后重试",
 				"success": "导入成功：导入了 {amount} 个物品数据"
 			}
+		}
+	},
+	"ja": {
+		"clipboard": {
+			"error": "クリップボードに保存できませんでした。手動でコピーしてください",
+			"success": "クリップボードに保存しました"
+		},
+		"network": {
+			"error": "ネットワークエラー。インターネット接続をご確認の上もう一度お試しください"
 		},
-		"pwaPopup": {
-			"update": {
-				"skipWaitingTimeout": "更新失败：ServiceWorker 超时。请刷新页面重试"
+		"planner": {
+			"calculationError": "計算失敗：{error}",
+			"import": {
+				"invalidJSON": "インポート失敗：無効なJSONです。コードを確認して、もう一度お試しください",
+				"unrecognized": "インポート失敗：このコードは読み取れません。もう一度お試しください。",
+				"success": "インポート成功： {amount} アイテムデータがインポートされます"
 			}
 		}
 	}

src/components/global/ItemById.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="d-flex align-center">
     <Item
-      :ratio="0.4"
+      :ratio="ratio"
       :item="item"
       v-bind="$props"
       class="mr-2"
@@ -25,6 +25,12 @@
         type: String,
         required: true
       },
+      ratio: {
+        type: Number,
+        default () {
+          return 0.4
+        }
+      }
     },
     computed: {
       item() {

src/components/global/PWAPopups.vue

@@ -8,14 +8,14 @@
 	},
 	"ja": {
 		"update": {
-			"refresh": "",
-			"success": ""
+			"refresh": "リロード",
+			"success": "Website Updated!"
 		}
 	},
 	"ko": {
 		"update": {
-			"refresh": "",
-			"success": ""
+			"refresh": "Refresh",
+			"success": "Website Updated!"
 		}
 	},
 	"zh": {

src/components/global/ServerNotifyOverlay.vue

@@ -5,6 +5,9 @@
     },
     "en": {
       "switchedTo": "Server switched to"
+    },
+    "ja": {
+      "switchedTo": "サーバー切り替え中"
     }
   }
 </i18n>

src/components/global/Subheader.vue

@@ -1,5 +1,5 @@
 <template>
-  <v-subheader class="pl-0">
+  <v-subheader class="px-0">
     <slot />
     <v-divider class="ml-4" />
   </v-subheader>