fix: validation usage; saving settings, dependencies updated.

uatrend · Sep 19, 2019 · 089ae3e · 089ae3e
1 parent a5df73e
commit 089ae3e
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 21 deletions.
diff --git a/app/system/modules/settings/app/components/misc.vue b/app/system/modules/settings/app/components/misc.vue
@@ -1,8 +1,19 @@
 <template>
     <div>
+        <div class="uk-margin uk-flex uk-flex-middle uk-flex-between uk-flex-wrap">
+            <div>
+                <h2 class="uk-margin-remove">
+                    {{ 'Misc' | trans }}
+                </h2>
+            </div>
+            <div class="uk-margin-small">
+                <button class="uk-button uk-button-primary" type="submit">
+                    {{ 'Save' | trans }}
+                </button>
+            </div>
+        </div>
 
-        <h2 class="uk-h4 uk-margin-remove">{{ 'Editor Settings' | trans }}</h2>
-        <hr class="uk-margin-small-top">
+        <h3 class="uk-h4 uk-margin-small">{{ 'Editor Settings' | trans }}</h3>
 
         <div class="uk-margin-small">
             <label for="form-user-editor" class="uk-form-label">{{ 'Default editor' | trans }}</label>

diff --git a/app/system/modules/site/views/admin/edit.php b/app/system/modules/site/views/admin/edit.php
@@ -1,6 +1,6 @@
 <?php $view->script('site-edit', 'system/site:app/bundle/edit.js', ['vue', 'editor', 'uikit']); ?>
 
-<validation-observer id="site-edit" ref="observer" @submit.prevent="submit" v-cloak>
+<validation-observer tag="form" id="site-edit" ref="observer" @submit.prevent="submit" v-cloak>
 
     <div class="uk-flex uk-flex-middle uk-flex-between uk-flex-wrap">
         <div class="">

diff --git a/app/system/modules/theme/less/theme.less b/app/system/modules/theme/less/theme.less
@@ -19,10 +19,15 @@
 @global-large-font-size: 1.5rem;
 @theme-border-content: #e1e4e5;
 @search-default-width: 200px;
+@logo-font-size: 1.25rem;
 
 /* Theme
  ============================================================================================== */
 
+.uk-logo {
+    line-height: 1.4;
+}
+
 .uk-logo, .uk-logo:hover {
     color: @theme-primary-color;
 }

diff --git a/package.json b/package.json
@@ -7,21 +7,21 @@
         "lint": "./node_modules/.bin/eslint ."
     },
     "devDependencies": {
-        "@babel/core": "^7.5.5",
-        "@babel/plugin-transform-runtime": "^7.5.5",
-        "@babel/preset-env": "^7.5.5",
-        "@babel/runtime": "^7.5.5",
+        "@babel/core": "^7.6.0",
+        "@babel/plugin-transform-runtime": "^7.6.0",
+        "@babel/preset-env": "^7.6.0",
+        "@babel/runtime": "^7.6.0",
         "babel-eslint": "^10.0.3",
         "babel-loader": "^8.0.6",
-        "cldr-core": "^35.0.0",
-        "cldr-localenames-modern": "^35.0.0",
-        "css-loader": "^2.1.1",
-        "eslint": "^6.3.0",
+        "cldr-core": "^35.1.0",
+        "cldr-localenames-modern": "^35.1.0",
+        "css-loader": "^3.2.0",
+        "eslint": "^6.4.0",
         "eslint-config-airbnb-base": "^14.0.0",
         "eslint-loader": "^3.0.0",
         "eslint-plugin-import": "^2.18.2",
         "eslint-plugin-vue": "^5.2.3",
-        "file-loader": "^2.0.0",
+        "file-loader": "^4.2.0",
         "glob": "^7.1.4",
         "gulp": "^4.0.2",
         "gulp-eslint": "^6.0.0",
@@ -32,29 +32,31 @@
         "html-loader": "^1.0.0-alpha.0",
         "json-loader": "^0.5.7",
         "less": "^3.10.3",
-        "less-loader": "^4.1.0",
+        "less-loader": "^5.0.0",
         "lodash": "^4.17.15",
         "merge-stream": "^2.0.0",
-        "style-loader": "^0.23.1",
+        "style-loader": "^1.0.0",
         "vue": "^2.6.10",
         "vue-eslint-parser": "^6.0.4",
-        "vue-hot-reload-api": "^2.3.3",
+        "vue-hot-reload-api": "^2.3.4",
         "vue-loader": "^15.7.1",
         "vue-style-loader": "^4.1.2",
         "vue-template-compiler": "^2.6.10",
-        "webpack": "^4.39.3",
-        "webpack-cli": "^3.3.8"
+        "webpack": "^4.40.2",
+        "webpack-cli": "^3.3.9"
     },
     "dependencies": {
-        "JSONStorage": "uatrend/JSONStorage#master",
+        "Codemirror": "github:uatrend/codemirror#master",
+        "JSONStorage": "github:uatrend/JSONStorage#master",
+        "blueimp-md5": "github:blueimp/JavaScript-MD5#1.1.1",
         "codemirror": "uatrend/codemirror#master",
         "flatpickr": "^4.6.2",
-        "ismobilejs": "^1.0.2",
+        "ismobilejs": "^1.0.3",
         "marked": "^0.7.0",
         "md5": "blueimp/JavaScript-MD5#1.1.1",
         "tinymce": "^5.0.15",
         "uikit": "^3.2.0",
-        "vee-validate": "^3.0.4",
+        "vee-validate": "^3.0.6",
         "vue-event-manager": "^2.1.2",
         "vue-intl": "github:uatrend/vue-intl#master",
         "vue-nestable": "^2.4.4",

diff --git a/packages/pagekit/blog/views/admin/post-edit.php b/packages/pagekit/blog/views/admin/post-edit.php
@@ -1,6 +1,6 @@
 <?php $view->script('post-edit', 'blog:app/bundle/post-edit.js', ['vue', 'editor', 'uikit']) ?>
 
-<validation-observer tag="form" id="post" ref="observer" v-cloak>
+<validation-observer tag="form" id="post" ref="observer" @submit.prevent="submit" v-cloak>
 
     <div class="uk-margin uk-flex uk-flex-middle uk-flex-between uk-flex-wrap">
         <div>