Răsfoiți Sursa

feat: favicon + manifest update + page selector locale switch fix

NGPixel 5 ani în urmă
părinte
comite
f8c3aef7bd
38 a modificat fișierele cu 69 adăugiri și 70 ștergeri
  1. 2 2
      client/components/admin/admin-locale.vue
  2. 19 1
      client/components/common/page-selector.vue
  3. 2 4
      client/static/browserconfig.xml
  4. BIN
      client/static/favicon.ico
  5. BIN
      client/static/favicons/android-chrome-192x192.png
  6. BIN
      client/static/favicons/android-chrome-256x256.png
  7. BIN
      client/static/favicons/android-icon-144x144.png
  8. BIN
      client/static/favicons/android-icon-192x192.png
  9. BIN
      client/static/favicons/android-icon-36x36.png
  10. BIN
      client/static/favicons/android-icon-48x48.png
  11. BIN
      client/static/favicons/android-icon-72x72.png
  12. BIN
      client/static/favicons/android-icon-96x96.png
  13. BIN
      client/static/favicons/apple-icon-114x114.png
  14. BIN
      client/static/favicons/apple-icon-120x120.png
  15. BIN
      client/static/favicons/apple-icon-144x144.png
  16. BIN
      client/static/favicons/apple-icon-152x152.png
  17. BIN
      client/static/favicons/apple-icon-180x180.png
  18. BIN
      client/static/favicons/apple-icon-57x57.png
  19. BIN
      client/static/favicons/apple-icon-60x60.png
  20. BIN
      client/static/favicons/apple-icon-72x72.png
  21. BIN
      client/static/favicons/apple-icon-76x76.png
  22. BIN
      client/static/favicons/apple-icon-precomposed.png
  23. BIN
      client/static/favicons/apple-icon.png
  24. BIN
      client/static/favicons/apple-touch-icon.png
  25. 9 0
      client/static/favicons/browserconfig.xml
  26. BIN
      client/static/favicons/favicon-16x16.png
  27. BIN
      client/static/favicons/favicon-32x32.png
  28. BIN
      client/static/favicons/favicon-96x96.png
  29. BIN
      client/static/favicons/ms-icon-144x144.png
  30. BIN
      client/static/favicons/ms-icon-150x150.png
  31. BIN
      client/static/favicons/ms-icon-310x310.png
  32. BIN
      client/static/favicons/ms-icon-70x70.png
  33. BIN
      client/static/favicons/mstile-150x150.png
  34. 0 0
      client/static/favicons/safari-pinned-tab.svg
  35. 16 42
      client/static/manifest.json
  36. 7 7
      dev/templates/legacy.pug
  37. 7 7
      dev/templates/master.pug
  38. 7 7
      dev/templates/setup.pug

+ 2 - 2
client/components/admin/admin-locale.vue

@@ -93,9 +93,9 @@
                           v-avatar.blue.white--text(tile, size='40', v-html='data.item.code.toUpperCase()')
                         v-list-item-content
                           v-list-item-title(v-html='data.item.name')
-                          v-list-item-sub-title(v-html='data.item.nativeName')
+                          v-list-item-subtitle(v-html='data.item.nativeName')
                         v-list-item-action
-                          v-checkbox(:input-value='data.tile.props.value', color='primary', value)
+                          v-checkbox(:input-value='data.attrs.inputValue', color='primary', value)
             v-flex(lg6 xs12)
               v-card.animated.fadeInUp.wait-p4s
                 v-toolbar(color='teal', dark, dense, flat)

+ 19 - 1
client/components/common/page-selector.vue

@@ -28,6 +28,7 @@
           div(style='height:400px;')
             vue-scroll(:ops='scrollStyle')
               v-treeview(
+                :key='`pageTree` + treeViewCacheId'
                 :active.sync='currentNode'
                 :open.sync='openNodes'
                 :items='tree'
@@ -55,7 +56,7 @@
                   color='primary'
                   )
                   template(v-for='(page, idx) of currentPages')
-                    v-list-item(:key='page.id', :value='page.path')
+                    v-list-item(:key='`page` + page.id', :value='page.path')
                       v-list-item-icon: v-icon mdi-file-document-box
                       v-list-item-title {{page.title}}
                     v-divider(v-if='idx < pages.length - 1')
@@ -131,6 +132,7 @@ export default {
   },
   data() {
     return {
+      treeViewCacheId: 0,
       searchLoading: false,
       currentLocale: siteConfig.lang,
       currentFolderPath: '',
@@ -234,6 +236,22 @@ export default {
       if (!_.isEmpty(newValue)) {
         this.currentPath = newValue
       }
+    },
+    currentLocale (newValue, oldValue) {
+      this.$nextTick(() => {
+        this.tree = [
+          {
+            id: 0,
+            title: '/ (root',
+            children: []
+          }
+        ]
+        this.currentNode = [0]
+        this.openNodes = [0]
+        this.pages = []
+        this.all = []
+        this.treeViewCacheId += 1
+      })
     }
   },
   methods: {

+ 2 - 4
client/static/browserconfig.xml

@@ -2,10 +2,8 @@
 <browserconfig>
   <msapplication>
     <tile>
-      <square70x70logo src="/favicons/ms-icon-70x70.png"/>
       <square150x150logo src="/favicons/ms-icon-150x150.png"/>
-      <square310x310logo src="/favicons/ms-icon-310x310.png"/>
-      <TileColor>#ffffff</TileColor>
+      <TileColor>#1976d2</TileColor>
     </tile>
   </msapplication>
-</browserconfig>
+</browserconfig>

BIN
client/static/favicon.ico


BIN
client/static/favicons/android-chrome-192x192.png


BIN
client/static/favicons/android-chrome-256x256.png


BIN
client/static/favicons/android-icon-144x144.png


BIN
client/static/favicons/android-icon-192x192.png


BIN
client/static/favicons/android-icon-36x36.png


BIN
client/static/favicons/android-icon-48x48.png


BIN
client/static/favicons/android-icon-72x72.png


BIN
client/static/favicons/android-icon-96x96.png


BIN
client/static/favicons/apple-icon-114x114.png


BIN
client/static/favicons/apple-icon-120x120.png


BIN
client/static/favicons/apple-icon-144x144.png


BIN
client/static/favicons/apple-icon-152x152.png


BIN
client/static/favicons/apple-icon-180x180.png


BIN
client/static/favicons/apple-icon-57x57.png


BIN
client/static/favicons/apple-icon-60x60.png


BIN
client/static/favicons/apple-icon-72x72.png


BIN
client/static/favicons/apple-icon-76x76.png


BIN
client/static/favicons/apple-icon-precomposed.png


BIN
client/static/favicons/apple-icon.png


BIN
client/static/favicons/apple-touch-icon.png


+ 9 - 0
client/static/favicons/browserconfig.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<browserconfig>
+    <msapplication>
+        <tile>
+            <square150x150logo src="/mstile-150x150.png"/>
+            <TileColor>#1976d2</TileColor>
+        </tile>
+    </msapplication>
+</browserconfig>

BIN
client/static/favicons/favicon-16x16.png


BIN
client/static/favicons/favicon-32x32.png


BIN
client/static/favicons/favicon-96x96.png


BIN
client/static/favicons/ms-icon-144x144.png


BIN
client/static/favicons/ms-icon-150x150.png


BIN
client/static/favicons/ms-icon-310x310.png


BIN
client/static/favicons/ms-icon-70x70.png


BIN
client/static/favicons/mstile-150x150.png


Fișier diff suprimat deoarece este prea mare
+ 0 - 0
client/static/favicons/safari-pinned-tab.svg


+ 16 - 42
client/static/manifest.json

@@ -1,46 +1,20 @@
 {
-  "background_color": "#fbfbfc",
-  "display": "standalone",
+  "name": "Wiki.js",
+  "short_name": "Wiki.js",
+  "start_url": "/",
   "icons": [
-    {
-      "src": "\/favicons\/android-icon-36x36.png",
-      "sizes": "36x36",
-      "type": "image\/png",
-      "density": "0.75"
-    },
-    {
-      "src": "\/favicons\/android-icon-48x48.png",
-      "sizes": "48x48",
-      "type": "image\/png",
-      "density": "1.0"
-    },
-    {
-      "src": "\/favicons\/android-icon-72x72.png",
-      "sizes": "72x72",
-      "type": "image\/png",
-      "density": "1.5"
-    },
-    {
-      "src": "\/favicons\/android-icon-96x96.png",
-      "sizes": "96x96",
-      "type": "image\/png",
-      "density": "2.0"
-    },
-    {
-      "src": "\/favicons\/android-icon-144x144.png",
-      "sizes": "144x144",
-      "type": "image\/png",
-      "density": "3.0"
-    },
-    {
-      "src": "\/favicons\/android-icon-192x192.png",
-      "sizes": "192x192",
-      "type": "image\/png",
-      "density": "4.0"
-    }
+      {
+          "src": "/favicons/android-chrome-192x192.png",
+          "sizes": "192x192",
+          "type": "image/png"
+      },
+      {
+          "src": "/favicons/android-chrome-256x256.png",
+          "sizes": "256x256",
+          "type": "image/png"
+      }
   ],
-  "name": "Wiki",
-  "short_name": "Wiki",
-  "start_url": "/",
-  "theme_color": "#0288d1"
+  "theme_color": "#1976d2",
+  "background_color": "#1976d2",
+  "display": "standalone"
 }

+ 7 - 7
dev/templates/legacy.pug

@@ -4,9 +4,9 @@ html
     meta(http-equiv='X-UA-Compatible', content='IE=edge')
     meta(charset='UTF-8')
     meta(name='viewport', content='user-scalable=yes, width=device-width, initial-scale=1, maximum-scale=5')
-    meta(name='theme-color', content='#333333')
-    meta(name='msapplication-TileColor', content='#333333')
-    meta(name='msapplication-TileImage', content='/favicons/ms-icon-144x144.png')
+    meta(name='theme-color', content='#1976d2')
+    meta(name='msapplication-TileColor', content='#1976d2')
+    meta(name='msapplication-TileImage', content='/favicons/mstile-150x150.png')
 
     title= pageMeta.title + ' | ' + config.title
 
@@ -20,11 +20,11 @@ html
     meta(property='og:site_name', content=config.title)
 
     //- Favicon
-    each favsize in [57, 60, 72, 76, 114, 120, 144, 152, 180]
-      link(rel='apple-touch-icon', sizes=favsize + 'x' + favsize, href='/favicons/apple-icon-' + favsize + 'x' + favsize + '.png')
+    link(rel='apple-touch-icon', sizes='180x180', href='/apple-touch-icon.png')
     link(rel='icon', type='image/png', sizes='192x192', href='/favicons/android-icon-192x192.png')
-    each favsize in [32, 96, 16]
-      link(rel='icon', type='image/png', sizes=favsize + 'x' + favsize, href='/favicons/favicon-' + favsize + 'x' + favsize + '.png')
+    link(rel='icon', type='image/png', sizes='32x32', href='/favicons/favicon-32x32.png')
+    link(rel='icon', type='image/png', sizes='16x16', href='/favicons/favicon-16x16.png')
+    link(rel='mask-icon', href='/favicons/safari-pinned-tab.svg', color='#1976d2')
     link(rel='manifest', href='/manifest.json')
 
     //- Icon Set

+ 7 - 7
dev/templates/master.pug

@@ -4,9 +4,9 @@ html(lang=siteConfig.lang)
     meta(http-equiv='X-UA-Compatible', content='IE=edge')
     meta(charset='UTF-8')
     meta(name='viewport', content='user-scalable=yes, width=device-width, initial-scale=1, maximum-scale=5')
-    meta(name='theme-color', content='#333333')
-    meta(name='msapplication-TileColor', content='#333333')
-    meta(name='msapplication-TileImage', content='/favicons/ms-icon-144x144.png')
+    meta(name='theme-color', content='#1976d2')
+    meta(name='msapplication-TileColor', content='#1976d2')
+    meta(name='msapplication-TileImage', content='/favicons/mstile-150x150.png')
 
     title= pageMeta.title + ' | ' + config.title
 
@@ -20,11 +20,11 @@ html(lang=siteConfig.lang)
     meta(property='og:site_name', content=config.title)
 
     //- Favicon
-    each favsize in [57, 60, 72, 76, 114, 120, 144, 152, 180]
-      link(rel='apple-touch-icon', sizes=favsize + 'x' + favsize, href='/favicons/apple-icon-' + favsize + 'x' + favsize + '.png')
+    link(rel='apple-touch-icon', sizes='180x180', href='/apple-touch-icon.png')
     link(rel='icon', type='image/png', sizes='192x192', href='/favicons/android-icon-192x192.png')
-    each favsize in [32, 96, 16]
-      link(rel='icon', type='image/png', sizes=favsize + 'x' + favsize, href='/favicons/favicon-' + favsize + 'x' + favsize + '.png')
+    link(rel='icon', type='image/png', sizes='32x32', href='/favicons/favicon-32x32.png')
+    link(rel='icon', type='image/png', sizes='16x16', href='/favicons/favicon-16x16.png')
+    link(rel='mask-icon', href='/favicons/safari-pinned-tab.svg', color='#1976d2')
     link(rel='manifest', href='/manifest.json')
 
     //- Site Properties

+ 7 - 7
dev/templates/setup.pug

@@ -4,17 +4,17 @@ html
     meta(http-equiv='X-UA-Compatible', content='IE=edge')
     meta(charset='UTF-8')
     meta(name='viewport', content='user-scalable=yes, width=device-width, initial-scale=1, maximum-scale=5')
-    meta(name='theme-color', content='#333333')
-    meta(name='msapplication-TileColor', content='#333333')
-    meta(name='msapplication-TileImage', content='/favicons/ms-icon-144x144.png')
+    meta(name='theme-color', content='#1976d2')
+    meta(name='msapplication-TileColor', content='#1976d2')
+    meta(name='msapplication-TileImage', content='/favicons/mstile-150x150.png')
     title Wiki.js Setup
 
     //- Favicon
-    each favsize in [57, 60, 72, 76, 114, 120, 144, 152, 180]
-      link(rel='apple-touch-icon', sizes=favsize + 'x' + favsize, href='/favicons/apple-icon-' + favsize + 'x' + favsize + '.png')
+    link(rel='apple-touch-icon', sizes='180x180', href='/apple-touch-icon.png')
     link(rel='icon', type='image/png', sizes='192x192', href='/favicons/android-icon-192x192.png')
-    each favsize in [32, 96, 16]
-      link(rel='icon', type='image/png', sizes=favsize + 'x' + favsize, href='/favicons/favicon-' + favsize + 'x' + favsize + '.png')
+    link(rel='icon', type='image/png', sizes='32x32', href='/favicons/favicon-32x32.png')
+    link(rel='icon', type='image/png', sizes='16x16', href='/favicons/favicon-16x16.png')
+    link(rel='mask-icon', href='/favicons/safari-pinned-tab.svg', color='#1976d2')
     link(rel='manifest', href='/manifest.json')
 
     //- Site Lang

Unele fișiere nu au fost afișate deoarece prea multe fișiere au fost modificate în acest diff