expressa 1.1.2 → 1.1.3

package/modules/admin/dist/static/js/{chunk-libs.b6f27cfe.js.LICENSE.txt → chunk-libs.06c38828.js.LICENSE.txt}

@@ -8,7 +8,7 @@ object-assign
  * @license MIT */
 
 /*!
-  * Bootstrap v4.6.0 (https://getbootstrap.com/)
+  * Bootstrap v4.6.1 (https://getbootstrap.com/)
   * Copyright 2011-2021 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
   * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
   */

package/modules/admin/package.json

@@ -52,10 +52,10 @@
     "eslint": "^7.0.0",
     "eslint-friendly-formatter": "^4.0.1",
     "eslint-loader": "^4.0.2",
-    "eslint-plugin-vue": "^6.2.2",
+    "eslint-plugin-vue": "^7.0.0",
     "file-loader": "1.1.11",
     "friendly-errors-webpack-plugin": "1.7.0",
-    "html-webpack-plugin": "4.0.0-alpha",
+    "html-webpack-plugin": "^4.0.0",
     "mini-css-extract-plugin": "0.4.1",
     "node-notifier": "5.2.1",
     "node-sass": "^6.0.1",
@@ -68,7 +68,7 @@
     "postcss-url": "7.3.2",
     "rimraf": "2.6.2",
     "sass-loader": "7.0.3",
-    "script-ext-html-webpack-plugin": "2.0.1",
+    "script-ext-html-webpack-plugin": "^2.1.5",
     "semver": "5.5.0",
     "shelljs": "0.8.2",
     "svg-sprite-loader": "3.8.0",

package/modules/admin/src/components/JSONEditor.vue

@@ -1,180 +1,181 @@
-<template>
-  <div>
-    <div class="jsoneditor-vue" />
-  </div>
-</template>
-
-<script>
-const { JSONEditor } = require('@json-editor/json-editor/dist/jsoneditor')
-import 'json-schema-editor'
-export default {
-  props: {
-    value: {
-      type: Object,
-      default: () => {}
-    },
-    schema: {
-      type: Object,
-      default: () => {}
-    }
-  },
-  data() {
-    return {
-      editor: null,
-      error: false,
-      json: this.value,
-      internalChange: false
-    }
-  },
-  watch: {
-    /* value: {
-      handler: 'update'
-    } */
-  },
-  mounted() {
-    this.update()
-  },
-  methods: {
-    update() {
-      var options = {
-        schema: this.schema,
-        startval: this.value,
-        theme: 'bootstrap4',
-        iconlib: 'materialicons',
-        required_by_default: true,
-      }
-      if (this.editor) {
-        this.editor.destroy()
-      }
-      this.editor = new JSONEditor(this.$el.querySelector('.jsoneditor-vue'), options)
-      let first = true
-      this.editor.on('change', () => {
-        if (first) {
-          first = false
-          return
-        }
-        this.$emit('input', this.editor.getValue())
-      })
-
-      const makeEditJsonTextAreaExpandable = () => {
-        const textarea = document.querySelector('.je-modal .je-edit-json--textarea')
-        textarea.classList.remove('je-edit-json--textarea') // INFO: Had to remove this class to remove height and width property
-        textarea.classList.add('expandable-textarea')
-      }
-
-      makeEditJsonTextAreaExpandable()
-    },
-    onSave() {
-      this.$emit('json-save', this.json)
-    }
-  }
-}
-
-if (JSONEditor) {
-  JSONEditor.defaults.resolvers.unshift(function(schema) {
-    if (schema.type === 'object' && schema.format === 'schema') {
-      return 'schema'
-    }
-
-    // If no valid editor is returned, the next resolver function will be used
-  })
-
-  JSONEditor.defaults.editors.schema = class schema extends JSONEditor.AbstractEditor {
-    setValue(value, initial) {
-      this.value = value
-      this.schemaeditor.setValue(value)
-      this.onChange()
-    }
-
-    getValue() {
-      if (typeof this.schemaeditor !== 'undefined') { return this.schemaeditor.getValue() } else { return {} }
-    }
-
-    register() {
-      super.register()
-      if (!this.input) return
-      this.input.setAttribute('name', this.formname)
-    }
-    unregister() {
-      super.unregister()
-      if (!this.input) return
-      this.input.removeAttribute('name')
-    }
-    getNumColumns() {
-      return 12
-    }
-    build() {
-      var self = this
-      if (!this.options.compact) {
-        this.label = this.header = this.theme.getFormInputLabel(this.getTitle())
-      }
-      if (this.schema.description) this.description = this.theme.getFormInputDescription(this.schema.description)
-      if (this.options.compact) this.container.className += ' compact'
-
-      this.input = document.createElement('div')
-      this.control = this.theme.getFormControl(this.label, this.input, this.description)
-
-      if (this.schema.readOnly || this.schema.readonly) {
-        this.always_disabled = true
-        this.input.disabled = true
-      }
-
-      this.container.appendChild(this.control)
-
-      this.schemaeditor = new window.JSONSchemaEditor(this.input, {
-        startval: {}
-      })
-      this.schemaeditor.on('change', function() {
-        self.onChange(true)
-      })
-    }
-    enable() {
-      if (!this.always_disabled) {
-        this.input.disabled = false
-      }
-
-      super.enable()
-    }
-    disable() {
-      this.input.disabled = true
-      super.disable()
-    }
-    destroy() {
-      if (this.label && this.label.parentNode) this.label.parentNode.removeChild(this.label)
-      if (this.description && this.description.parentNode) this.description.parentNode.removeChild(this.description)
-      if (this.input && this.input.parentNode) this.input.parentNode.removeChild(this.input)
-      super.destroy()
-    }
-  }
-}
-
-</script>
-
-<style>
-  .expandable-textarea {
-    display: block;
-    min-height: 250px;
-    min-width: 250px;
-    resize: both !important;
-  }
-  .jsoneditor-vue img {
-    border: 1px solid #ddd;
-    border-radius: 4px;
-    padding: 5px;
-    width: 150px;
-  }
-  .jsoneditor-vue img:hover {
-    box-shadow: 0 0 2px 1px rgba(0, 140, 186, 0.5);
-  }
-  .jsoneditor-vue button.btn {
-    font-size: 14px !important;
-    padding: 3px;
-  }
-  .jsoneditor-vue .form-control-label, label {
-    font-weight: bold;
-  }
-  .jsoneditor-vue input[type="checkbox"] {
-    margin-right: 5px;
-    margin-top: 3px;
-  }
-</style>
+<template>
+  <div>
+    <div class="jsoneditor-vue" />
+  </div>
+</template>
+
+<script>
+const { JSONEditor } = require('@json-editor/json-editor/dist/jsoneditor')
+import 'json-schema-editor'
+export default {
+  props: {
+    value: {
+      type: Object,
+      default: () => {}
+    },
+    schema: {
+      type: Object,
+      default: () => {}
+    }
+  },
+  data() {
+    return {
+      editor: null,
+      error: false,
+      json: this.value,
+      internalChange: false
+    }
+  },
+  watch: {
+    /* value: {
+      handler: 'update'
+    } */
+  },
+  mounted() {
+    this.update()
+  },
+  methods: {
+    update() {
+      var options = {
+        schema: this.schema,
+        startval: this.value,
+        theme: 'bootstrap4',
+        iconlib: 'materialicons',
+        required_by_default: true,
+        show_opt_in: false,
+      }
+      if (this.editor) {
+        this.editor.destroy()
+      }
+      this.editor = new JSONEditor(this.$el.querySelector('.jsoneditor-vue'), options)
+      let first = true
+      this.editor.on('change', () => {
+        if (first) {
+          first = false
+          return
+        }
+        this.$emit('input', this.editor.getValue())
+      })
+
+      const makeEditJsonTextAreaExpandable = () => {
+        const textarea = document.querySelector('.je-modal .je-edit-json--textarea')
+        textarea.classList.remove('je-edit-json--textarea') // INFO: Had to remove this class to remove height and width property
+        textarea.classList.add('expandable-textarea')
+      }
+
+      makeEditJsonTextAreaExpandable()
+    },
+    onSave() {
+      this.$emit('json-save', this.json)
+    }
+  }
+}
+
+if (JSONEditor) {
+  JSONEditor.defaults.resolvers.unshift(function(schema) {
+    if (schema.type === 'object' && schema.format === 'schema') {
+      return 'schema'
+    }
+
+    // If no valid editor is returned, the next resolver function will be used
+  })
+
+  JSONEditor.defaults.editors.schema = class schema extends JSONEditor.AbstractEditor {
+    setValue(value, initial) {
+      this.value = value
+      this.schemaeditor.setValue(value)
+      this.onChange()
+    }
+
+    getValue() {
+      if (typeof this.schemaeditor !== 'undefined') { return this.schemaeditor.getValue() } else { return {} }
+    }
+
+    register() {
+      super.register()
+      if (!this.input) return
+      this.input.setAttribute('name', this.formname)
+    }
+    unregister() {
+      super.unregister()
+      if (!this.input) return
+      this.input.removeAttribute('name')
+    }
+    getNumColumns() {
+      return 12
+    }
+    build() {
+      var self = this
+      if (!this.options.compact) {
+        this.label = this.header = this.theme.getFormInputLabel(this.getTitle())
+      }
+      if (this.schema.description) this.description = this.theme.getFormInputDescription(this.schema.description)
+      if (this.options.compact) this.container.className += ' compact'
+
+      this.input = document.createElement('div')
+      this.control = this.theme.getFormControl(this.label, this.input, this.description)
+
+      if (this.schema.readOnly || this.schema.readonly) {
+        this.always_disabled = true
+        this.input.disabled = true
+      }
+
+      this.container.appendChild(this.control)
+
+      this.schemaeditor = new window.JSONSchemaEditor(this.input, {
+        startval: {}
+      })
+      this.schemaeditor.on('change', function() {
+        self.onChange(true)
+      })
+    }
+    enable() {
+      if (!this.always_disabled) {
+        this.input.disabled = false
+      }
+
+      super.enable()
+    }
+    disable() {
+      this.input.disabled = true
+      super.disable()
+    }
+    destroy() {
+      if (this.label && this.label.parentNode) this.label.parentNode.removeChild(this.label)
+      if (this.description && this.description.parentNode) this.description.parentNode.removeChild(this.description)
+      if (this.input && this.input.parentNode) this.input.parentNode.removeChild(this.input)
+      super.destroy()
+    }
+  }
+}
+
+</script>
+
+<style>
+  .expandable-textarea {
+    display: block;
+    min-height: 250px;
+    min-width: 250px;
+    resize: both !important;
+  }
+  .jsoneditor-vue img {
+    border: 1px solid #ddd;
+    border-radius: 4px;
+    padding: 5px;
+    width: 150px;
+  }
+  .jsoneditor-vue img:hover {
+    box-shadow: 0 0 2px 1px rgba(0, 140, 186, 0.5);
+  }
+  .jsoneditor-vue button.btn {
+    font-size: 14px !important;
+    padding: 3px;
+  }
+  .jsoneditor-vue .form-control-label, label {
+    font-weight: bold;
+  }
+  .jsoneditor-vue input[type="checkbox"] {
+    margin-right: 5px;
+    margin-top: 3px;
+  }
+</style>

package/modules/admin/src/main.js

@@ -23,9 +23,9 @@ import '@/permission' // permission control
 import { VuePlugin } from 'vuera'
 
 import Unicon from 'vue-unicons/dist/vue-unicons-vue2.umd'
-import { uniDatabase, uniHome, uniHomeAlt, uniUsersAlt, uniShieldCheck, uniBookOpen, uniDiary, uniFlask, uniCog, uniPlus } from 'vue-unicons/dist/icons'
+import { uniDatabase, uniHome, uniUsersAlt, uniShieldCheck, uniBookOpen, uniDiary, uniFlask, uniCog, uniPlus, uniLink } from 'vue-unicons/dist/icons'
 
-Unicon.add([uniDatabase, uniHome, uniHomeAlt, uniUsersAlt, uniShieldCheck, uniBookOpen, uniDiary, uniFlask, uniCog, uniPlus])
+Unicon.add([uniDatabase, uniHome, uniUsersAlt, uniShieldCheck, uniBookOpen, uniDiary, uniFlask, uniCog, uniPlus, uniLink])
 Vue.use(Unicon)
 
 Vue.use(ElementUI, { locale })