glib-web 0.6.4 → 0.6.5

package/nav/drawer.vue

@@ -7,26 +7,41 @@
     app
     :class="cssClasses"
     :dark="cssClasses.includes('dark')"
-    :expand-on-hover="expandOnHover()"
     :permanent="cssClasses.includes('permanent')"
     :style="style"
+    :expand-on-hover="expandOnHover()"
+    :mini-variant.sync="mini"
     @input="updateState"
   >
+    <template v-slot:prepend>
+      <v-list-item>
+        <v-list-item-icon>
+          <v-icon v-if="!mini">mdi-chevron-left</v-icon>
+          <v-icon v-if="mini">mdi-chevron-right</v-icon>
+        </v-list-item-icon>
+      </v-list-item>
+    </template>
+
     <template v-if="spec.header">
-      <!-- <v-toolbar flat> -->
       <panels-responsive :spec="spec.header" />
-      <!-- </v-toolbar> -->
-      <v-divider></v-divider>
     </template>
 
     <v-list dense class="pt-0">
-      <div v-for="(item, index) in spec.rows" :key="index">
+      <div v-for="(item, index) in spec.rows" :key="index" class="nav-item">
+        <div v-if="item.type == 'button'" class="indicator"></div>
         <v-divider v-if="item.type == 'divider'" />
         <nav-drawerLabel v-else-if="item.type == 'label'" :spec="item" />
         <nav-drawerButton v-else :spec="item" />
-        <!-- <nav-drawerButton :spec="item" :state="state" v-else /> -->
       </div>
     </v-list>
+
+    <template v-if="spec.footer" v-slot:append>
+      <v-list-item>
+        <!-- Display the first line when the drawer is shrunk. Display the second line when the drawer is expanded -->
+        <div style="display: none">Show if expand</div>
+        <panels-responsive :spec="spec.footer" />
+      </v-list-item>
+    </template>
   </v-navigation-drawer>
 </template>
 
@@ -50,7 +65,8 @@ export default {
     return {
       // Using null as the starting value for its v-model will initialize the drawer as closed on mobile and as open on desktop.
       // See https://vuetifyjs.com/en/components/navigation-drawers
-      state: null
+      state: null,
+      mini: true
     };
   },
   computed: {
@@ -102,4 +118,18 @@ export default {
 };
 </script>
 
-<style scoped></style>
+<style scoped>
+.nav-item {
+  position: relative;
+}
+.nav-item:hover .indicator {
+  display: flex;
+  position: absolute;
+  width: 3px;
+  height: 65%;
+  margin: 10px 0;
+  justify-content: center;
+  align-items: center;
+  background-color: white;
+}
+</style>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "glib-web",
-  "version": "0.6.4",
+  "version": "0.6.5",
   "description": "",
   "main": "index.js",
   "scripts": {

package/utils/mime_type.js

@@ -0,0 +1,78 @@
+export default {
+  aac: "audio/aac",
+  abw: "application/x-abiword",
+  ai: "application/postscript",
+  arc: "application/octet-stream",
+  avi: "video/x-msvideo",
+  azw: "application/vnd.amazon.ebook",
+  bin: "application/octet-stream",
+  bz: "application/x-bzip",
+  bz2: "application/x-bzip2",
+  csh: "application/x-csh",
+  css: "text/css",
+  csv: "text/csv",
+  doc: "application/msword",
+  dll: "application/octet-stream",
+  eot: "application/vnd.ms-fontobject",
+  epub: "application/epub+zip",
+  gif: "image/gif",
+  htm: "text/html",
+  html: "text/html",
+  ico: "image/x-icon",
+  ics: "text/calendar",
+  jar: "application/java-archive",
+  jpeg: "image/jpeg",
+  jpg: "image/jpeg",
+  js: "application/javascript",
+  json: "application/json",
+  mid: "audio/midi",
+  midi: "audio/midi",
+  mp2: "audio/mpeg",
+  mp3: "audio/mpeg",
+  mp4: "video/mp4",
+  mpa: "video/mpeg",
+  mpe: "video/mpeg",
+  mpeg: "video/mpeg",
+  mpkg: "application/vnd.apple.installer+xml",
+  odp: "application/vnd.oasis.opendocument.presentation",
+  ods: "application/vnd.oasis.opendocument.spreadsheet",
+  odt: "application/vnd.oasis.opendocument.text",
+  oga: "audio/ogg",
+  ogv: "video/ogg",
+  ogx: "application/ogg",
+  otf: "font/otf",
+  png: "image/png",
+  ppt: "application/vnd.ms-powerpoint",
+  rar: "application/x-rar-compressed",
+  rtf: "application/rtf",
+  sh: "application/x-sh",
+  svg: "image/svg+xml",
+  swf: "application/x-shockwave-flash",
+  tar: "application/x-tar",
+  tif: "image/tiff",
+  tiff: "image/tiff",
+  ts: "application/typescript",
+  ttf: "font/ttf",
+  txt: "text/plain",
+  vsd: "application/vnd.visio",
+  wav: "audio/x-wav",
+  weba: "audio/webm",
+  webm: "video/webm",
+  webp: "image/webp",
+  woff: "font/woff",
+  woff2: "font/woff2",
+  xhtml: "application/xhtml+xml",
+  xls: "application/vnd.ms-excel",
+  xlsx: "application/vnd.ms-excel",
+  xlsx_OLD: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+  xml: "application/xml",
+  xul: "application/vnd.mozilla.xul+xml",
+  "3gp": "video/3gpp",
+  "3gp_DOES_NOT_CONTAIN_VIDEO": "audio/3gpp",
+  "3gp2": "video/3gpp2",
+  "3gp2_DOES_NOT_CONTAIN_VIDEO": "audio/3gpp2",
+  "7z": "application/x-7z-compressed",
+  image: "image/*",
+  pdf: "application/pdf",
+  zip: "application/(zip|x-zip-compressed|octet-stream)"
+};

package/utils/uploader.js

@@ -1,5 +1,6 @@
 import { DirectUpload } from "@rails/activestorage";
 import Type from "../utils/type";
+import mimeType from "../utils/mime_type";
 
 const MB_SIZE = 1000;
 
@@ -67,25 +68,15 @@ export default class Uploader {
 
   validateFileAccordingToRules(spec) {
     if (Type.isObject(spec)) {
-      let mimeType;
-      switch (spec.fileType) {
-        case "image/*": // Legacy
-        case "image":
-          mimeType = "image/*";
-          break;
-        case "pdf":
-          mimeType = "application/pdf";
-          break;
-        case "zip":
-          // See https://stackoverflow.com/questions/856013/mime-type-for-zip-file-in-google-chrome
-          mimeType = "application/(zip|x-zip-compressed|octet-stream)";
-          break;
-        default:
-          return;
-      }
+      let validFileType = false;
+      [spec.fileType].flat().forEach(key => {
+        const acceptsRegex = new RegExp(mimeType[key]);
+        if (acceptsRegex.test(this.file.type)) {
+          validFileType = true;
+        }
+      });
 
-      const acceptsRegex = new RegExp(mimeType);
-      if (!acceptsRegex.test(this.file.type)) {
+      if (!validFileType) {
         alert(spec.fileTypeErrorText || "Invalid file type");
         return false;
       }