Merge branch 'release/6.0.6'

* release/6.0.6: fixes for lint errors compiled assets updated inputs header spacing updated readme Apply fixes from StyleCI (#857) wip controller cleanup
austintoddj · Oct 13, 2020 · a16525b · a16525b
2 parents 3c562a5 + b96a89b
commit a16525b
Show file tree

Hide file tree

Showing 24 changed files with 180 additions and 212 deletions.
diff --git a/.gitpod.yml b/.gitpod.yml
@@ -1,3 +1,4 @@
+# The Docker image to run the workspace in (defaults to gitpod/workspace-full)
 image:
   file: Dockerfile
 
@@ -6,9 +7,9 @@ checkoutLocation: canvas
 
 vscode:
   extensions:
-    - octref.vetur@0.27.0:a+OljFHzmH1YrzbM13sMhQ==
+    - octref.vetur@0.28.0:bW1RGNnmWYQO43JdJgK34w==
     - [email protected]:WIWu3zHU4VPT8r/v866LUw==
-    - esbenp.prettier-vscode@5.5.0:xcEnHt0vYXkhJ8IkBmNAuA==
+    - esbenp.prettier-vscode@5.7.1:GDba64T6G+TUi1qmc6BE3A==
 
 github:
   prebuilds:
@@ -29,21 +30,20 @@ github:
     # Add a label once the prebuild is ready to pull requests (defaults to false)
     addLabel: true
 
+# Command to start on workspace startup (optional)
 tasks:
   - init: |
-      # Initializing the Laravel app
-
-      # Reload the .bash_profile to utilize composer-link()
+      # Reload the .bash_profile to utilize the composer-link() function
       source ~/.bash_profile
 
       cd /workspace
 
-      # Create a new Laravel app
+      # Create a fresh Laravel app
       composer create-project --prefer-dist laravel/laravel laravel
 
       cd /workspace/laravel
 
-      # Create a new database
+      # Create a new in-memory database
       touch database/database.sqlite
 
       # Update the .env database configuration
@@ -54,14 +54,14 @@ tasks:
       composer-link ../canvas/
       composer require austintoddj/canvas @dev
 
-      # Install Canvas
+      # Install Canvas and its resources
       php artisan canvas:install
       php artisan storage:link
 
-      # Remove existing assets from the Laravel app
+      # Remove existing assets if any exist from the Laravel app
       rm -rf public/vendor/canvas/*
 
-      # Create a symlink to the package assets
+      # Create a symlink to the local package assets
       cd public/vendor/canvas
       ln -s ../../../../canvas/public/* .
 
@@ -102,6 +102,7 @@ tasks:
 
     openMode: split-right
 
+# Ports to expose on workspace startup (optional)
 ports:
   - port: 3306
     onOpen: ignore

diff --git a/.styleci.yml b/.styleci.yml
@@ -0,0 +1 @@
+preset: laravel
diff --git a/composer.json b/composer.json
@@ -16,10 +16,10 @@
     ],
     "require": {
         "php": "^7.3",
+        "ext-json": "*",
         "laravel/framework": "^6.0|^7.0|^8.0"
     },
     "require-dev": {
-        "ext-json": "*",
         "laravel/legacy-factories": "^1.0",
         "mockery/mockery": "^1.4",
         "orchestra/testbench": "^4.0|^5.0|^6.0",

diff --git a/package.json b/package.json
@@ -12,46 +12,46 @@
         "bootstrap": "^4.5.2",
         "chart.js": "^2.9.3",
         "cross-env": "^7.0.2",
-        "filepond": "^4.19.2",
+        "filepond": "^4.21.1",
         "filepond-plugin-file-validate-size": "^2.2.1",
         "filepond-plugin-file-validate-type": "^1.2.5",
         "filepond-plugin-image-exif-orientation": "^1.0.9",
         "filepond-plugin-image-preview": "^4.6.4",
         "filepond-plugin-image-validate-size": "^1.2.4",
         "jquery": "^3.5.1",
-        "laravel-mix": "^5.0.4",
+        "laravel-mix": "^5.0.7",
         "lodash": "^4.17.19",
         "md5": "^2.3.0",
-        "moment": "^2.27.0",
+        "moment": "^2.29.1",
         "nprogress": "^0.2.0",
         "numeral": "^2.0.6",
         "parchment": "^1.1.4",
         "popper.js": "^1.16.1",
         "quill": "1.3.7",
         "resolve-url-loader": "^3.1.1",
-        "sass": "^1.26.11",
-        "sass-loader": "^10.0.0",
+        "sass": "^1.27.0",
+        "sass-loader": "^10.0.3",
         "unsplash-js": "^6.0.0",
         "url-parse": "^1.4.7",
         "vue": "^2.6.11",
         "vue-filepond": "^6.0.2",
         "vue-fuse": "^2.2.1",
         "vue-infinite-loading": "^2.4.5",
         "vue-multiselect": "^2.1.6",
-        "vue-router": "^3.4.2",
+        "vue-router": "^3.4.6",
         "vue-template-compiler": "^2.6.11",
         "vue-textarea-autosize": "^1.1.1",
         "vue-toasted": "^1.1.28",
         "vuex": "^3.5.1"
     },
     "devDependencies": {
         "babel-eslint": "^10.1.0",
-        "eslint": "^7.6.0",
+        "eslint": "^7.11.0",
         "eslint-config-prettier": "^6.11.0",
         "eslint-loader": "^4.0.2",
         "eslint-plugin-prettier": "^3.1.4",
         "eslint-plugin-sort-imports-es6-autofix": "^0.5.0",
-        "eslint-plugin-vue": "^6.2.2",
+        "eslint-plugin-vue": "^7.0.1",
         "prettier": "^2.0.5"
     }
 }
diff --git a/public/css/app.css b/public/css/app.css
diff --git a/public/css/app.css.map b/public/css/app.css.map
diff --git a/public/js/app.js b/public/js/app.js
diff --git a/public/js/app.js.LICENSE.txt b/public/js/app.js.LICENSE.txt
@@ -22,7 +22,7 @@
  */
 
 /*!
- * FilePond 4.20.1
+ * FilePond 4.21.1
  * Licensed under MIT, https://opensource.org/licenses/MIT/
  * Please visit https://pqina.nl/filepond/ for details.
  */

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=78fb3c1c3f8e654c6623",
-    "/css/app.css": "/css/app.css?id=275ebb89871e5f9dca7a",
-    "/js/app.js.map": "/js/app.js.map?id=a5de649d315b6e05ba9f",
-    "/css/app.css.map": "/css/app.css.map?id=db11b78da46b5c2c6055"
+    "/js/app.js": "/js/app.js?id=bd3f5dfd2728dd6ed7d4",
+    "/css/app.css": "/css/app.css?id=19ea79a138b52ba255e6",
+    "/js/app.js.map": "/js/app.js.map?id=6a526130f725e6380694",
+    "/css/app.css.map": "/css/app.css.map?id=fb1e43343083b7c71be0"
 }
diff --git a/readme.md b/readme.md
@@ -1,14 +1,14 @@
 <p align="center">
     <a href="https://trycanvas.app">
-        <img src=".github/assets/header.png">
+        <img src=".github/assets/header.png" alt="Canvas">
     </a>
 </p>
 
 <p align="center">
-<a href="https://github.com/austintoddj/canvas/actions"><img src="https://github.com/austintoddj/canvas/workflows/build/badge.svg" alt="Build Status"></a>
-<a href="https://packagist.org/packages/austintoddj/canvas"><img src="https://poser.pugx.org/austintoddj/canvas/downloads"></a>
-<a href="https://packagist.org/packages/austintoddj/canvas"><img src="https://poser.pugx.org/austintoddj/canvas/v/stable"></a>
-<a href="https://packagist.org/packages/austintoddj/canvas"><img src="https://poser.pugx.org/austintoddj/canvas/license"></a>
+    <a href="https://github.com/austintoddj/canvas/actions"><img src="https://github.com/austintoddj/canvas/workflows/build/badge.svg" alt="Build Status"></a>
+    <a href="https://packagist.org/packages/austintoddj/canvas"><img src="https://img.shields.io/packagist/dt/austintoddj/canvas" alt="Total Downloads"></a>
+    <a href="https://packagist.org/packages/austintoddj/canvas"><img src="https://img.shields.io/packagist/v/austintoddj/canvas" alt="Latest Stable Version"></a>
+    <a href="https://packagist.org/packages/austintoddj/canvas"><img src="https://img.shields.io/packagist/l/austintoddj/canvas" alt="License"></a>
 </p>
 
 ## Introduction

diff --git a/resources/js/components/editor/EmbedContentModal.vue b/resources/js/components/editor/EmbedContentModal.vue
@@ -87,7 +87,7 @@ export default {
     methods: {
         clickDone() {
             if (!isEmpty(this.content)) {
-                this.$emit('addingEmbedContent', {
+                this.$emit('adding-embed-content', {
                     content: this.content,
                     existingBlot: this.blot,
                 });

diff --git a/resources/js/components/editor/EmbedImageModal.vue b/resources/js/components/editor/EmbedImageModal.vue
@@ -351,12 +351,12 @@ export default {
         clickDone() {
             if (!this.selectedImageUrl) {
                 if (!isEmpty(this.selectedImageBlot)) {
-                    this.$emit('removingEmbedImage', {
+                    this.$emit('removing-embed-image', {
                         existingBlot: this.selectedImageBlot,
                     });
                 }
             } else {
-                this.$emit('addingEmbedImage', {
+                this.$emit('adding-embed-image', {
                     url: this.selectedImageUrl,
                     caption: this.selectedImageCaption ?? '',
                     existingBlot: this.selectedImageBlot,

diff --git a/resources/js/components/editor/QuillEditor.vue b/resources/js/components/editor/QuillEditor.vue
@@ -273,12 +273,12 @@ export default {
         },
 
         showEmbedImageModal(data = null) {
-            this.$emit('openingEmbedImageModal', data);
+            this.$emit('opening-embed-image-modal', data);
             $(this.$refs.embedImageModal.$el).modal('show');
         },
 
         showEmbedContentModal(data = null) {
-            this.$emit('openingEmbedContentModal', data);
+            this.$emit('opening-embed-content-modal', data);
             $(this.$refs.embedContentModal.$el).modal('show');
         },
 
@@ -326,7 +326,7 @@ export default {
         },
 
         update: debounce(function () {
-            this.$emit('updatePost');
+            this.$emit('update-post');
         }, 3000),
     },
 };

diff --git a/resources/js/components/modals/FeaturedImageModal.vue b/resources/js/components/modals/FeaturedImageModal.vue
@@ -335,7 +335,7 @@ export default {
         },
 
         removeFeaturedImage() {
-            this.$emit('removeFeaturedImage');
+            this.$emit('remove-featured-image');
             this.isReadyToAcceptUploads = true;
             this.update();
         },
@@ -352,7 +352,7 @@ export default {
         },
 
         update: debounce(function () {
-            this.$emit('updatePost');
+            this.$emit('update-post');
         }, 3000),
     },
 };

diff --git a/resources/js/components/modals/SeoModal.vue b/resources/js/components/modals/SeoModal.vue
@@ -154,17 +154,17 @@ export default {
 
     methods: {
         syncTitle() {
-            this.$emit('syncTitle', this.post.title);
+            this.$emit('sync-title', this.post.title);
             this.update();
         },
 
         syncDescription() {
-            this.$emit('syncDescription', this.post.summary);
+            this.$emit('sync-description', this.post.summary);
             this.update();
         },
 
         update: debounce(function () {
-            this.$emit('updatePost');
+            this.$emit('update-post');
         }, 3000),
     },
 };

diff --git a/resources/js/components/modals/SettingsModal.vue b/resources/js/components/modals/SettingsModal.vue
@@ -173,7 +173,7 @@ export default {
 
     methods: {
         syncSlug() {
-            this.$emit('syncSlug', strings.methods.slugify(this.post.title));
+            this.$emit('sync-slug', strings.methods.slugify(this.post.title));
             this.update();
         },
 
@@ -184,8 +184,8 @@ export default {
                 user_id: this.settings.user.id,
             };
 
-            this.$emit('addPostTag', tag);
-            this.$emit('addTag', tag);
+            this.$emit('add-post-tag', tag);
+            this.$emit('add-tag', tag);
             this.update();
         },
 
@@ -196,13 +196,13 @@ export default {
                 user_id: this.settings.user.id,
             };
 
-            this.$emit('addPostTopic', topic);
-            this.$emit('addTopic', topic);
+            this.$emit('add-post-topic', topic);
+            this.$emit('add-topic', topic);
             this.update();
         },
 
         update: debounce(function () {
-            this.$emit('updatePost');
+            this.$emit('update-post');
         }, 3000),
     },
 };

diff --git a/resources/js/store/modules/search.js b/resources/js/store/modules/search.js
@@ -1,4 +1,4 @@
-import request from '../../mixins/request';
+import axios from 'axios';
 
 const initialState = {
     searchIndex: [],
@@ -12,32 +12,25 @@ const actions = {
             context.commit('RESET_STATE');
         }
 
-        request.methods
-            .request()
-            .get('/api/search/posts')
-            .then(({ data }) => {
-                context.commit('UPDATE_INDEX', data);
-            });
+        // The request here was extracted from request.js since a mixin cannot be
+        // pulled into a store module in the same was it is a component. The
+        // tradeoff here is that it will not contain error modifiers.
+        let baseDomain = context.rootState['settings'].domain || `/${context.rootState['settings'].path}`;
+
+        axios.get(`${baseDomain}/api/search/posts`).then(({ data }) => {
+            context.commit('UPDATE_INDEX', data);
+        });
 
         if (context.rootGetters['settings/isAdmin']) {
-            request.methods
-                .request()
-                .get('/api/search/tags')
-                .then(({ data }) => {
-                    context.commit('UPDATE_INDEX', data);
-                });
-            request.methods
-                .request()
-                .get('/api/search/topics')
-                .then(({ data }) => {
-                    context.commit('UPDATE_INDEX', data);
-                });
-            request.methods
-                .request()
-                .get('/api/search/users')
-                .then(({ data }) => {
-                    context.commit('UPDATE_INDEX', data);
-                });
+            axios.get(`${baseDomain}/api/search/tags`).then(({ data }) => {
+                context.commit('UPDATE_INDEX', data);
+            });
+            axios.get(`${baseDomain}/api/search/topics`).then(({ data }) => {
+                context.commit('UPDATE_INDEX', data);
+            });
+            axios.get(`${baseDomain}/api/search/users`).then(({ data }) => {
+                context.commit('UPDATE_INDEX', data);
+            });
         }
     },
 };

diff --git a/resources/js/views/EditUser.vue b/resources/js/views/EditUser.vue
@@ -34,8 +34,8 @@
 
         <main v-if="isReady" class="py-4">
             <div class="col-xl-8 offset-xl-2 col-lg-10 offset-lg-1 col-md-12">
-                <div class="d-flex justify-content-between mt-2 mb-4 align-items-center">
-                    <div>
+                <div class="d-flex justify-content-between align-items-center">
+                    <div class="pb-2">
                         <h3 class="mt-3">
                             <span v-if="isAdmin">
                                 <router-link :to="{ name: 'users' }" class="text-decoration-none text-muted">
@@ -70,7 +70,7 @@
                     </select>
                 </div>
 
-                <div v-if="!creatingUser" class="mt-5 card shadow-lg">
+                <div v-if="!creatingUser" class="mt-4 card shadow-lg">
                     <div class="card-body py-4">
                         <div class="row">
                             <div class="col-12 col-md-3 px-0 text-center">
@@ -162,7 +162,7 @@
                                     id="password"
                                     :required="creatingUser"
                                     name="password"
-                                    type="text"
+                                    type="password"
                                     class="form-control border-0"
                                     :class="invalidPassword.shouldShow ? 'is-invalid' : ''"
                                     title="Password"
@@ -184,7 +184,7 @@
                                     id="password_confirmation"
                                     :required="creatingUser"
                                     name="password_confirmation"
-                                    type="text"
+                                    type="password"
                                     class="form-control border-0"
                                     title="Confirm Password"
                                     placeholder="Confirm Password"

diff --git a/routes/ui.php → resources/stubs/routes/web.stub b/routes/ui.php → resources/stubs/routes/web.stub
diff --git a/resources/stubs/webpack.mix.js → resources/stubs/webpack.mix.stub b/resources/stubs/webpack.mix.js → resources/stubs/webpack.mix.stub