Merge pull request #436 from penguin-statistics/release-3.5.0

Release 3.5.0
penguin-statistics · Mar 30, 2021 · bc3136f · bc3136f · vercel · Mar 30, 2021
2 parents 6987a50 + 5d9aa71
commit bc3136f
Show file tree

Hide file tree

Showing 67 changed files with 1,226 additions and 648 deletions.
diff --git a/.gitignore b/.gitignore
@@ -20,7 +20,7 @@ package-lock.json
 *.njsproj
 *.sln
 *.sw?
-/tools/skeleton-html-generator/dist
-/tools/skeleton-html-generator/.cache
+tools/skeleton-html-generator/dist
+tools/skeleton-html-generator/.cache
 src/utils/vendors/
 src/vendors/
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "penguin-stats-frontend",
-  "version": "3.4.2",
+  "version": "3.5.0",
   "private": true,
   "author": "Penguin Statistics Contributors <contributors@penguin-stats.io> (https://github.com/orgs/penguin-statistics/people)",
   "scripts": {

diff --git a/public/items.zip b/public/items.zip
diff --git a/public/penguin.js b/public/penguin.js
diff --git a/public/penguin.wasm b/public/penguin.wasm
diff --git a/src/components/advancedQuery/QueryResultTrend.vue b/src/components/advancedQuery/QueryResultTrend.vue
@@ -35,10 +35,10 @@
 
         :class="{'pt-0': $vuetify.breakpoint.xsOnly}"
       >
-        <template v-slot:item.start="{ item }">
+        <template #item.start="{ item }">
           {{ item.timeRange }}
         </template>
-        <template v-slot:item.percentage="{ item }">
+        <template #item.percentage="{ item }">
           {{ item.percentageText }}
         </template>
       </v-data-table>

diff --git a/src/components/advancedQuery/selectors/QuerySelectorInterval.vue b/src/components/advancedQuery/selectors/QuerySelectorInterval.vue
@@ -13,15 +13,15 @@
 
     @input="update"
   >
-    <template v-slot:item="{item}">
+    <template #item="{item}">
       {{ item.text }}
       <v-spacer />
       <v-icon v-if="item.value === value">
         mdi-check
       </v-icon>
     </template>
 
-    <template v-slot:selection="{item}">
+    <template #selection="{item}">
       {{ item.text }}
     </template>
   </v-select>

diff --git a/src/components/advancedQuery/selectors/QuerySelectorItem.vue b/src/components/advancedQuery/selectors/QuerySelectorItem.vue
@@ -3,15 +3,15 @@
     v-model="dialog"
     max-width="590px"
   >
-    <template v-slot:activator="{ on, attrs }">
+    <template #activator="{ on, attrs }">
       <div class="d-flex flex-row align-center justify-center mt-1">
         <v-tooltip
           content-class="transparent"
           right
           nudge-right="-16"
           transition="slide-x-transition"
         >
-          <template v-slot:activator="{ on, attrs }">
+          <template #activator="{ on, attrs }">
             <v-icon
               class="mr-2"
               v-bind="attrs"

diff --git a/src/components/advancedQuery/selectors/QuerySelectorServer.vue b/src/components/advancedQuery/selectors/QuerySelectorServer.vue
@@ -13,7 +13,7 @@
 
     @input="e => $emit('input', e)"
   >
-    <template v-slot:item="{item}">
+    <template #item="{item}">
       {{ $t('server.servers.' + item) }}
       <span class="monospace ml-2">
         {{ item }}
@@ -24,7 +24,7 @@
       </v-icon>
     </template>
 
-    <template v-slot:selection="{item}">
+    <template #selection="{item}">
       {{ $t('server.servers.' + item) }}
     </template>
   </v-select>

diff --git a/src/components/advancedQuery/selectors/QuerySelectorSource.vue b/src/components/advancedQuery/selectors/QuerySelectorSource.vue
@@ -11,7 +11,7 @@
     transition="slide-y-transition"
     @input="e => $emit('input', e)"
   >
-    <template v-slot:item="{item}">
+    <template #item="{item}">
       {{ $t('dataSource.' + item) }}
       <span class="monospace ml-2">
         {{ item }}
@@ -22,7 +22,7 @@
       </v-icon>
     </template>
 
-    <template v-slot:selection="{item}">
+    <template #selection="{item}">
       {{ $t('dataSource.' + item) }}
     </template>
   </v-select>

diff --git a/src/components/advancedQuery/selectors/QuerySelectorStage.vue b/src/components/advancedQuery/selectors/QuerySelectorStage.vue
@@ -3,15 +3,15 @@
     v-model="dialog"
     max-width="650px"
   >
-    <template v-slot:activator="{ on, attrs }">
+    <template #activator="{ on, attrs }">
       <div class="d-flex flex-row align-center justify-center mt-3">
         <v-tooltip
           content-class="transparent"
           right
           nudge-right="-16"
           transition="slide-x-transition"
         >
-          <template v-slot:activator="{ on, attrs }">
+          <template #activator="{ on, attrs }">
             <v-expand-x-transition>
               <v-icon
                 v-if="value"

diff --git a/src/components/advancedQuery/selectors/QuerySelectorTimeRange.vue b/src/components/advancedQuery/selectors/QuerySelectorTimeRange.vue
@@ -8,7 +8,7 @@
     max-width="700px"
     max-height="600px"
   >
-    <template v-slot:activator="{ on, attrs }">
+    <template #activator="{ on, attrs }">
       <v-text-field
         :value="formattedDate"
         :label="`${$t('query.selector.timeRange.title')} (*${$t('validator.required')})`"

diff --git a/src/components/drawer/DataManager.vue b/src/components/drawer/DataManager.vue
@@ -30,7 +30,7 @@
     </v-btn>
 
     <DataResetter v-if="!$env.isApp">
-      <template v-slot:default="{ on }">
+      <template #default="{ on }">
         <v-btn
           v-haptic.notification="'WARNING'"
           depressed

diff --git a/src/components/drawer/DataResetter.vue b/src/components/drawer/DataResetter.vue
@@ -4,7 +4,7 @@
     max-width="350px"
     persistent
   >
-    <template v-slot:activator="props">
+    <template #activator="props">
       <slot v-bind="props" />
     </template>
     <v-card class="slash-strip--danger">

diff --git a/src/components/drawer/LocaleSwitcher.vue b/src/components/drawer/LocaleSwitcher.vue
@@ -8,7 +8,7 @@
     :label="$t('menu.languages')"
     transition="slide-y-transition"
   >
-    <template v-slot:item="{item}">
+    <template #item="{item}">
       {{ item.text }}
       <v-icon
         v-if="item.beta"

diff --git a/src/components/drawer/Navigation.vue b/src/components/drawer/Navigation.vue
@@ -36,7 +36,7 @@
     :color="`blue ${dark ? 'lighten-1' : 'darken-2'}`"
     no-action
   >
-    <template v-slot:activator>
+    <template #activator>
       <v-list-item-title>{{ $t(route.meta.i18n) }}</v-list-item-title>
     </template>
 

diff --git a/src/components/drawer/NewPushSubscriptionDialog.vue b/src/components/drawer/NewPushSubscriptionDialog.vue
@@ -4,7 +4,7 @@
     max-width="450px"
     v-on="$listeners"
   >
-    <template v-slot:activator="props">
+    <template #activator="props">
       <slot v-bind="props" />
     </template>
 

diff --git a/src/components/drawer/PushNotificationSettings.vue b/src/components/drawer/PushNotificationSettings.vue
@@ -4,7 +4,7 @@
     max-width="475px"
     :persistent="dirty"
   >
-    <template v-slot:activator="props">
+    <template #activator="props">
       <slot v-bind="props" />
     </template>
 
@@ -222,13 +222,13 @@ export default {
     update () {
       penguin.getLastSyncedPushPreferences()
         .then(preferences => {
-          console.log(preferences.preferences, typeof preferences.preferences, preferences[0])
+          // console.log(preferences.preferences, typeof preferences.preferences, preferences[0])
           this.originalPrefs = unmarshaller.pushPreferences(preferences.preferences)
         })
     },
     save () {
       const m = marshaller.pushPreferences(this.originalPrefs)
-      console.log(m)
+      // console.log(m)
       penguin.submitNewPushPreferences(m)
         .then(() => {
           this.dirty = false
@@ -252,7 +252,7 @@ export default {
     },
     add (content) {
       const newKey = this.generateKey(content)
-      console.log('adding', JSON.stringify(content), newKey, this.preferences)
+      // console.log('adding', JSON.stringify(content), newKey, this.preferences)
       if (this.originalPrefs.find(el => this.generateKey(el) === newKey)) {
         snackbar.launch('warning', 15000, '请不要重复添加：拥有相同订阅参数的订阅已存在于订阅列表内', '')
         return

diff --git a/src/components/drawer/SettingsDialog.vue b/src/components/drawer/SettingsDialog.vue
@@ -3,7 +3,7 @@
     v-model="active"
     max-width="500px"
   >
-    <template v-slot:activator="{ on, attrs }">
+    <template #activator="{ on, attrs }">
       <v-btn
         v-haptic
         ripple

diff --git a/src/components/drawer/ThemeSwitcher.vue b/src/components/drawer/ThemeSwitcher.vue
@@ -8,7 +8,7 @@
     :label="$t('menu.settings.themes.name')"
     transition="slide-y-transition"
   >
-    <template v-slot:item="{ item }">
+    <template #item="{ item }">
       <v-icon
         left
       >
@@ -20,7 +20,7 @@
         mdi-check
       </v-icon>
     </template>
-    <template v-slot:selection="{item}">
+    <template #selection="{item}">
       <v-icon
         small
         left

diff --git a/src/components/global/BrowserDeprecated.vue b/src/components/global/BrowserDeprecated.vue
@@ -66,12 +66,26 @@
     <span class="caption">
       通常此问题是由于您当前所使用的浏览器版本过旧而所导致，升级或更换浏览器即可解决。但若您使用的是形如 QQ 浏览器、搜狗浏览器等国产厂商所开发的浏览器，即便版本已是最新，由于这类浏览器通常内核更新缓慢、不遵守 Web 标准、导致了预期外的行为发生，也可能出现此警告。如果您使用了上述浏览器，您将亦需更换您的浏览器以使用此功能。
     </span>
+
+    <span
+      class="monospace mt-2"
+      style="font-size: 12px"
+    >
+      reason:{{ reason }} | ver:{{ env.version }}+{{ env.commit }} | env:{{ env.userAgent }}
+    </span>
   </div>
 </template>
 
 <script>
+import config from '@/config'
 export default {
   name: "BrowserDeprecated",
+  props: {
+    reason: {
+      type: String,
+      default: () => ""
+    },
+  },
   data() {
     return {
       browsers: [
@@ -81,7 +95,6 @@ export default {
             svg: 'M9.27 7.94C9.27 7.94 9.27 7.94 9.27 7.94M6.85 6.74C6.86 6.74 6.86 6.74 6.85 6.74M21.28 8.6C20.85 7.55 19.96 6.42 19.27 6.06C19.83 7.17 20.16 8.28 20.29 9.1L20.29 9.12C19.16 6.3 17.24 5.16 15.67 2.68C15.59 2.56 15.5 2.43 15.43 2.3C15.39 2.23 15.36 2.16 15.32 2.09C15.26 1.96 15.2 1.83 15.17 1.69C15.17 1.68 15.16 1.67 15.15 1.67H15.13L15.12 1.67L15.12 1.67L15.12 1.67C12.9 2.97 11.97 5.26 11.74 6.71C11.05 6.75 10.37 6.92 9.75 7.22C9.63 7.27 9.58 7.41 9.62 7.53C9.67 7.67 9.83 7.74 9.96 7.68C10.5 7.42 11.1 7.27 11.7 7.23L11.75 7.23C11.83 7.22 11.92 7.22 12 7.22C12.5 7.21 12.97 7.28 13.44 7.42L13.5 7.44C13.6 7.46 13.67 7.5 13.75 7.5C13.8 7.54 13.86 7.56 13.91 7.58L14.05 7.64C14.12 7.67 14.19 7.7 14.25 7.73C14.28 7.75 14.31 7.76 14.34 7.78C14.41 7.82 14.5 7.85 14.54 7.89C14.58 7.91 14.62 7.94 14.66 7.96C15.39 8.41 16 9.03 16.41 9.77C15.88 9.4 14.92 9.03 14 9.19C17.6 11 16.63 17.19 11.64 16.95C11.2 16.94 10.76 16.85 10.34 16.7C10.24 16.67 10.14 16.63 10.05 16.58C10 16.56 9.93 16.53 9.88 16.5C8.65 15.87 7.64 14.68 7.5 13.23C7.5 13.23 8 11.5 10.83 11.5C11.14 11.5 12 10.64 12.03 10.4C12.03 10.31 10.29 9.62 9.61 8.95C9.24 8.59 9.07 8.42 8.92 8.29C8.84 8.22 8.75 8.16 8.66 8.1C8.43 7.3 8.42 6.45 8.63 5.65C7.6 6.12 6.8 6.86 6.22 7.5H6.22C5.82 7 5.85 5.35 5.87 5C5.86 5 5.57 5.16 5.54 5.18C5.19 5.43 4.86 5.71 4.56 6C4.21 6.37 3.9 6.74 3.62 7.14C3 8.05 2.5 9.09 2.28 10.18C2.28 10.19 2.18 10.59 2.11 11.1L2.08 11.33C2.06 11.5 2.04 11.65 2 11.91L2 11.94L2 12.27L2 12.32C2 17.85 6.5 22.33 12 22.33C16.97 22.33 21.08 18.74 21.88 14C21.9 13.89 21.91 13.76 21.93 13.63C22.13 11.91 21.91 10.11 21.28 8.6Z'
           },
           title: 'Mozilla Firefox',
-          subtitle: '隐私保护首选',
           url: 'https://mozilla.org/firefox/new/'
         },
         {
@@ -90,7 +103,6 @@ export default {
             svg: 'M10.86 15.37C10.17 14.6 9.7 13.68 9.55 12.65C9.25 13.11 9 13.61 8.82 14.15C7.9 16.9 9.5 20.33 12.22 21.33C14.56 22.11 17.19 20.72 18.92 19.2C19.18 18.85 21.23 17.04 20.21 16.84C17.19 18.39 13.19 17.95 10.86 15.37M11.46 9.56C12.5 9.55 11.5 9.13 11.07 8.81C10.03 8.24 8.81 7.96 7.63 7.96C3.78 8 .995 10.41 2.3 14.4C3.24 18.28 6.61 21.4 10.59 21.9C8.54 20.61 7.3 18.19 7.3 15.78C7.38 13.25 8.94 10.28 11.46 9.56M2.78 8.24C5.82 6 10.66 6.18 13.28 9C14.3 10.11 15 12 14.07 13.37C12.33 15.25 17.15 15.5 18.18 15.22C21.92 14.5 22.91 10.15 21.13 7.15C19.43 3.75 15.66 1.97 11.96 2C7.9 1.93 4.25 4.5 2.78 8.24Z'
           },
           title: 'Microsoft Edge',
-          subtitle: 'Chromium 内核版',
           url: 'https://microsoft.com/edge'
         },
         {
@@ -99,12 +111,20 @@ export default {
             svg: 'M12,20L15.46,14H15.45C15.79,13.4 16,12.73 16,12C16,10.8 15.46,9.73 14.62,9H19.41C19.79,9.93 20,10.94 20,12A8,8 0 0,1 12,20M4,12C4,10.54 4.39,9.18 5.07,8L8.54,14H8.55C9.24,15.19 10.5,16 12,16C12.45,16 12.88,15.91 13.29,15.77L10.89,19.91C7,19.37 4,16.04 4,12M15,12A3,3 0 0,1 12,15A3,3 0 0,1 9,12A3,3 0 0,1 12,9A3,3 0 0,1 15,12M12,4C14.96,4 17.54,5.61 18.92,8H12C10.06,8 8.45,9.38 8.08,11.21L5.7,7.08C7.16,5.21 9.44,4 12,4M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2Z'
           },
           title: 'Google Chrome',
-          subtitle: '全球浏览器装机率第一',
           url: 'https://google.cn/chrome'
         }
       ]
     }
   },
+  computed: {
+    env() {
+      return {
+        version: config.version,
+        commit: GIT_COMMIT.trim() || 'unknown',
+        userAgent: navigator.userAgent || 'unknown'
+      };
+    }
+  },
 }
 </script>
 

diff --git a/src/components/global/Item.vue b/src/components/global/Item.vue
@@ -10,9 +10,10 @@
     v-bind="tooltipOptions"
     content-class="transparent backdrop-blur o-100 pa-0"
   >
-    <template v-slot:activator="{ on }">
+    <template #activator="{ on, attrs }">
       <span
         class="d-flex align-center"
+        v-bind="attrs"
         v-on="on"
       >
         <ItemIcon

diff --git a/src/components/global/ItemStepper.vue b/src/components/global/ItemStepper.vue
@@ -11,7 +11,7 @@
         :value="quantity > 0"
         class="cursor-pointer reduction-badge"
       >
-        <template v-slot:badge>
+        <template #badge>
           <span @click="reduction">
             <v-icon>mdi-minus</v-icon>
           </span>
@@ -25,7 +25,7 @@
         overlap
         class="cursor-pointer monospace"
       >
-        <template v-slot:badge>
+        <template #badge>
           <span class="disabled">
             {{ quantity }}
           </span>

diff --git a/src/components/global/TooltipBtn.vue b/src/components/global/TooltipBtn.vue
@@ -4,7 +4,7 @@
     :open-delay="0"
     transition="slide-y-transition"
   >
-    <template v-slot:activator="{ on, attrs }">
+    <template #activator="{ on, attrs }">
       <v-btn
         v-haptic
         v-bind="{...$attrs, ...attrs}"

diff --git a/src/components/global/UpgradeNotifier.vue b/src/components/global/UpgradeNotifier.vue
@@ -20,7 +20,7 @@
 
       <v-card-actions>
         <DataResetter>
-          <template v-slot:default="{ on }">
+          <template #default="{ on }">
             <v-btn
               v-haptic
               color="white"

diff --git a/src/components/planner/PlannerIO.vue b/src/components/planner/PlannerIO.vue
@@ -34,7 +34,7 @@
       <!--                :class="{'primary': !shortlink.generating, 'slash-strip&#45;&#45;loading': shortlink.generating}"-->
       <!--                @click="generateShortlink"-->
       <!--              >-->
-      <!--                <template v-slot:loader>-->
+      <!--                <template #loader>-->
       <!--                  <v-progress-circular-->
       <!--                    indeterminate-->
       <!--                    :size="16"-->

diff --git a/src/components/recognition/ImageInput.vue b/src/components/recognition/ImageInput.vue
@@ -68,7 +68,7 @@
       color="red darken-2"
     >
       {{ snackbarMessage }}
-      <template v-slot:action="{ attrs }">
+      <template #action="{ attrs }">
         <v-btn
           text
           v-bind="attrs"