Merge branch 'release/6.0.10'

* release/6.0.10: fixes #867 Apply fixes from StyleCI (#865)
austintoddj · Oct 18, 2020 · 2c78621 · 2c78621
2 parents 6d8b876 + 5efbf8a
commit 2c78621
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 14 deletions.
diff --git a/public/js/app.js b/public/js/app.js
diff --git a/public/js/app.js.map b/public/js/app.js.map
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
@@ -1,6 +1,6 @@
 {
-    "/js/app.js": "/js/app.js?id=c0acc0e71985702efadd",
+    "/js/app.js": "/js/app.js?id=fc1f9fe42208ba1e531c",
     "/css/app.css": "/css/app.css?id=08bd22e9b4628a5ecd91",
-    "/js/app.js.map": "/js/app.js.map?id=24b940d7f7b37c5a7ef0",
+    "/js/app.js.map": "/js/app.js.map?id=6a77c441a99d1ce312a3",
     "/css/app.css.map": "/css/app.css.map?id=a26e3f2697987381b236"
 }
diff --git a/resources/js/components/PageHeader.vue b/resources/js/components/PageHeader.vue
@@ -108,8 +108,8 @@ export default {
 
     methods: {
         logout() {
-            axios.get(`${this.baseDomain}/logout`).then(() => {
-                window.location.href = `${this.baseDomain}/login`;
+            axios.get(`${this.settings.path}/logout`).then(() => {
+                window.location.href = `${this.settings.path}/login`;
             });
         },
 

diff --git a/resources/js/components/editor/EmbedImageModal.vue b/resources/js/components/editor/EmbedImageModal.vue
@@ -233,7 +233,7 @@ export default {
 
         getServerOptions() {
             return {
-                url: `${this.baseDomain}/api/uploads`,
+                url: `${this.settings.path}/api/uploads`,
                 headers: {
                     'X-CSRF-TOKEN': document.head.querySelector('meta[name="csrf-token"]').content,
                 },

diff --git a/resources/js/components/modals/AvatarModal.vue b/resources/js/components/modals/AvatarModal.vue
@@ -106,7 +106,7 @@ export default {
 
         getServerOptions() {
             return {
-                url: `${this.baseDomain}/api/uploads`,
+                url: `${this.settings.path}/api/uploads`,
                 headers: {
                     'X-CSRF-TOKEN': document.head.querySelector('meta[name="csrf-token"]').content,
                 },

diff --git a/resources/js/components/modals/FeaturedImageModal.vue b/resources/js/components/modals/FeaturedImageModal.vue
@@ -227,7 +227,7 @@ export default {
 
         getServerOptions() {
             return {
-                url: `${this.baseDomain}/api/uploads`,
+                url: `${this.settings.path}/api/uploads`,
                 headers: {
                     'X-CSRF-TOKEN': document.head.querySelector('meta[name="csrf-token"]').content,
                 },

diff --git a/yarn.lock b/yarn.lock
@@ -2904,14 +2904,14 @@ eslint-plugin-sort-imports-es6-autofix@^0.5.0:
     eslint "^6.2.2"
 
 eslint-plugin-vue@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-7.0.1.tgz#8e69a9041bb9719c018f154fdcacbb17713e0240"
-  integrity sha512-Pzl88S8Gue9BPcvSg+K/Av2V5UlwGeBxiZW5cLYbDngHm7vLnSuO/q2n54kIyCqfPmuD5PKlJrNSzoN+Ur9HRg==
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-7.1.0.tgz#832d83e4e1e480c7285b2bc3ff1076cd0dca7a5b"
+  integrity sha512-9dW7kj8/d2IkDdgNpvIhJdJ3XzU3x4PThXYMzWt49taktYnGyrTY6/bXCYZ/VtQKU9kXPntPrZ41+8Pw0Nxblg==
   dependencies:
     eslint-utils "^2.1.0"
     natural-compare "^1.4.0"
     semver "^7.3.2"
-    vue-eslint-parser "^7.1.0"
+    vue-eslint-parser "^7.1.1"
 
 eslint-scope@^4.0.3:
   version "4.0.3"
@@ -7467,7 +7467,7 @@ vm-browserify@^1.0.1:
   resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"
   integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==
 
-vue-eslint-parser@^7.1.0:
+vue-eslint-parser@^7.1.1:
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-7.1.1.tgz#c43c1c715ff50778b9a7e9a4e16921185f3425d3"
   integrity sha512-8FdXi0gieEwh1IprIBafpiJWcApwrU+l2FEj8c1HtHFdNXMd0+2jUSjBVmcQYohf/E72irwAXEXLga6TQcB3FA==