Merge branch 'release/4.1.0'

* release/4.1.0: refactoring public assets wip Adds instructions on default setups fix for the route not being defined yet wip wip wip Apply fixes from StyleCI (#430) wip Apply fixes from StyleCI (#429) initial wip of a default setup update the base route wip
austintoddj · Feb 10, 2019 · 50aba11 · 50aba11
2 parents 651ccdf + fadbccc
commit 50aba11
Show file tree

Hide file tree

Showing 67 changed files with 528 additions and 3,624 deletions.
diff --git a/config/canvas.php b/config/canvas.php
@@ -2,25 +2,12 @@
 
 return [
 
-    /*
-    |--------------------------------------------------------------------------
-    | Public Path
-    |--------------------------------------------------------------------------
-    |
-    | You are free to expose the public-facing blog to any route you wish.
-    | If no change is made then it will default to the /blog path of
-    | your application.
-    |
-    */
-
-    'public_path' => env('CANVAS_PUBLIC_PATH', 'blog'),
-
     /*
     |--------------------------------------------------------------------------
     | Route Middleware
     |--------------------------------------------------------------------------
     |
-    | You may assign any custom middleware that you choose to the /canvas
+    | You may assign any custom middleware that you choose to the Canvas
     | routes in your application. They will be protected by basic
     | user authentication by default.
     |

diff --git a/public/.gitkeep b/public/.gitkeep
diff --git a/public/css/app.css → public/app.css b/public/css/app.css → public/app.css
diff --git a/public/app.js b/public/app.js
diff --git a/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-brands-400.eot b/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-brands-400.eot
diff --git a/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-brands-400.svg b/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-brands-400.svg
diff --git a/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-brands-400.ttf b/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-brands-400.ttf
diff --git a/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-brands-400.woff b/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-brands-400.woff
diff --git a/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-brands-400.woff2 b/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-brands-400.woff2
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,5 @@
 {
-    "/js/app.js": "/js/app.js?id=5cfc7a4f0f793a07286c",
-    "/css/app.css": "/css/app.css?id=da72bd8307ebced7bed8",
-    "/js/app.js.map": "/js/app.js.map?id=d31f3f9515a010708d4e",
+    "/app.js": "/app.js?id=a1bbfa8127d35ee1a71b",
+    "/app.css": "/app.css?id=bda34711dea8821a4299",
     "/favicon.png": "/favicon.png?id=39d853e8c2bdbc38fde3"
 }
diff --git a/readme.md b/readme.md
@@ -41,63 +41,17 @@ Create a symbolic link to ensure file uploads are publicly accessible from the w
 php artisan storage:link
 ```
 
-If you choose to design your own theme instead of the default, you can publish the views with:
+## Configuration
 
-```bash
-php artisan vendor:publish --provider="Canvas\CanvasServiceProvider" --tag="canvas-views"
-```
-
-If you publish your own views, review the API specifications below to see available data for the public-facing endpoints:
-
-<details>
-<summary><b>API Specifications</b></summary>
-<ul>
-<li><b>GET </b><code>/blog</code> Returns a paginated index of posts</li>
-
-<br>
-
-```php
-"data": [
-    "posts": "Illuminate\Pagination\Paginator"
-]
-```
-
-<li><b>GET </b><code>/blog/{slug}</code> Returns a single blog post</li>
+> **Note:** You are not required to complete the following steps. You have total design freedom when integrating blog content into your application.
 
-<br>
+Generate a default blog controller with routes and views to get up and running as quickly as possible:
 
-```php
-"data": [
-    "author": "App\User",
-    "post": "App\Canvas\Post",
-    "meta": [
-        "og_title": "string"
-        "twitter_title": "string"
-        "og_description": "string"
-        "meta_description": "string"
-        "twitter_description": "string"
-	],
-    "next": "App\Canvas\Post",
-    "random": "App\Canvas\Post"
-]
-```
-
-<li><b>GET </b><code>/blog/tag/{slug}</code> Returns a paginated index of posts for a single tag</li>
-
-<br>
-
-```php
-"data": [
-    "topic": "Canvas\Tag",
-    "posts": "Illuminate\Pagination\Paginator"
-]
+```bash
+php artisan canvas:setup
 ```
-</ul>
-</details>
-
-<br>
 
-If you want to integrate Unsplash images into your content, set up a new application at [https://unsplash.com/oauth/applications](https://unsplash.com/oauth/applications). Grab your access key and update `config/canvas.php`:
+If you want to include [Unsplash](https://unsplash.com) images in your posts, set up a new application at [https://unsplash.com/oauth/applications](https://unsplash.com/oauth/applications). Grab your access key and update `config/canvas.php`:
 
 ```php
 'unsplash' => [

diff --git a/resources/js/components/Editor.vue b/resources/js/components/Editor.vue
@@ -308,18 +308,14 @@
         margin-bottom: 20px;
     }
 
-    .ql-editor a {
-        text-decoration: underline !important;
-    }
-
     .ql-editor.ql-blank::before {
         left: 0;
         font-style: normal;
     }
 
     .ql-bubble .ql-editor a {
         color: #3490dc;
-        text-decoration: none;
+        text-decoration: none !important;
     }
 
     .ql-container hr {

diff --git a/resources/js/components/ImagePicker.vue b/resources/js/components/ImagePicker.vue
@@ -139,7 +139,7 @@
                        v-if="this.unsplash"
                        v-model="unsplashSearchTerm"
                        ref="unsplashSearch"
-                       placeholder="search Unsplash">
+                       placeholder="Search free high-resolution photos">
 
                 <div v-if="!searchingUnsplash && unsplashImages.length">
                     <div class="card-columns">
@@ -170,7 +170,7 @@
                 </div>
 
                 <div v-if="!searchingUnsplash && !unsplashImages.length">
-                    <h4 class="text-center">We couldn't find any matches.</h4>
+                    <h4 class="text-center py-4">We couldn't find any matches.</h4>
                 </div>
             </div>
         </div>

diff --git a/resources/sass/app.scss b/resources/sass/app.scss
@@ -1,7 +1,6 @@
 
 // Fonts
 @import url("https://fonts.googleapis.com/css?family=Nunito|Merriweather:300,400,700");
-@import "~@fortawesome/fontawesome-free/scss/brands";
 @import "~@fortawesome/fontawesome-free/scss/regular";
 @import "~@fortawesome/fontawesome-free/scss/solid";
 @import "~@fortawesome/fontawesome-free/scss/fontawesome";
@@ -50,13 +49,4 @@ a, .btn-link {
 input, textarea, select {
   box-shadow: none !important;
   outline: none !important;
-}
-
-.fab {
-  &.fa-facebook-square {
-    color: $fa-facebook-square;
-  }
-  &.fa-twitter {
-    color: $fa-twitter;
-  }
 }
diff --git a/resources/sass/variables.scss b/resources/sass/variables.scss
@@ -18,8 +18,4 @@ $green: #38c172;
 $teal: #4dc0b5;
 $cyan: #6cb2eb;
 $dark-grey: #444;
-$light-grey: #9ba3aa;
-
-// Brand Colors
-$fa-facebook-square: #3b5998;
-$fa-twitter: #55acee;
+$light-grey: #9ba3aa;
diff --git a/resources/views/canvas/components/modals/post/edit/share.blade.php b/resources/views/canvas/components/modals/post/edit/share.blade.php
diff --git a/...as/components/forms/post/create.blade.php → ...ws/components/forms/post/create.blade.php b/...as/components/forms/post/create.blade.php → ...ws/components/forms/post/create.blade.php
@@ -12,8 +12,8 @@
 
     <editor :unsplash="'{{ config('canvas.unsplash.access_key') }}'"></editor>
 
-    @include('canvas::canvas.components.modals.post.create.settings')
-    @include('canvas::canvas.components.modals.post.create.publish')
-    @include('canvas::canvas.components.modals.post.create.image')
-    @include('canvas::canvas.components.modals.post.create.seo')
+    @include('canvas::components.modals.post.create.settings')
+    @include('canvas::components.modals.post.create.publish')
+    @include('canvas::components.modals.post.create.image')
+    @include('canvas::components.modals.post.create.seo')
 </form>
diff --git a/...nvas/components/forms/post/edit.blade.php → ...iews/components/forms/post/edit.blade.php b/...nvas/components/forms/post/edit.blade.php → ...iews/components/forms/post/edit.blade.php
@@ -12,9 +12,8 @@
 
     <editor value="{{ $data['post']->body }}" :unsplash="'{{ config('canvas.unsplash.access_key') }}'"></editor>
 
-    @include('canvas::canvas.components.modals.post.edit.share')
-    @include('canvas::canvas.components.modals.post.edit.settings')
-    @include('canvas::canvas.components.modals.post.edit.publish')
-    @include('canvas::canvas.components.modals.post.edit.image')
-    @include('canvas::canvas.components.modals.post.edit.seo')
+    @include('canvas::components.modals.post.edit.settings')
+    @include('canvas::components.modals.post.edit.publish')
+    @include('canvas::components.modals.post.edit.image')
+    @include('canvas::components.modals.post.edit.seo')
 </form>
diff --git a/...vas/components/forms/tag/create.blade.php → ...ews/components/forms/tag/create.blade.php b/...vas/components/forms/tag/create.blade.php → ...ews/components/forms/tag/create.blade.php
@@ -18,7 +18,7 @@ class="form-control-lg form-control border-0 px-0"
             </div>
             <div class="form-group row">
                 <div class="col-lg-12">
-                    <p class="lead text-muted" style="cursor: default">{{ sprintf('%s/%s', config('app.url'), config('canvas.public_path')) }}/tag/<span class="text-primary">@{{ slug }}</span></p>
+                    <p class="lead text-muted" style="cursor: default"><span class="text-primary">@{{ slug }}</span></p>
                     <input type="hidden" name="slug" v-model="slug" readonly>
                 </div>
             </div>

diff --git a/...anvas/components/forms/tag/edit.blade.php → ...views/components/forms/tag/edit.blade.php b/...anvas/components/forms/tag/edit.blade.php → ...views/components/forms/tag/edit.blade.php
@@ -18,7 +18,7 @@ class="form-control-lg form-control border-0 px-0"
             </div>
             <div class="form-group row">
                 <div class="col-lg-12">
-                    <p class="lead text-muted" style="cursor: default">{{ sprintf('%s/%s', config('app.url'), config('canvas.public_path')) }}/tag/<span class="text-primary">@{{ slug }}</span></p>
+                    <p class="lead text-muted" style="cursor: default"><span class="text-primary">@{{ slug }}</span></p>
                     <input type="hidden" name="slug" v-model="slug" readonly>
                     @if ($errors->has('slug'))
                         <div class="invalid-feedback d-block">

diff --git a/...onents/modals/post/create/image.blade.php → ...onents/modals/post/create/image.blade.php b/...onents/modals/post/create/image.blade.php → ...onents/modals/post/create/image.blade.php
diff --git a/...ents/modals/post/create/publish.blade.php → ...ents/modals/post/create/publish.blade.php b/...ents/modals/post/create/publish.blade.php → ...ents/modals/post/create/publish.blade.php
diff --git a/...mponents/modals/post/create/seo.blade.php → ...mponents/modals/post/create/seo.blade.php b/...mponents/modals/post/create/seo.blade.php → ...mponents/modals/post/create/seo.blade.php
diff --git a/...nts/modals/post/create/settings.blade.php → ...nts/modals/post/create/settings.blade.php b/...nts/modals/post/create/settings.blade.php → ...nts/modals/post/create/settings.blade.php
diff --git a/...s/components/modals/post/delete.blade.php → ...s/components/modals/post/delete.blade.php b/...s/components/modals/post/delete.blade.php → ...s/components/modals/post/delete.blade.php
diff --git a/...mponents/modals/post/edit/image.blade.php → ...mponents/modals/post/edit/image.blade.php b/...mponents/modals/post/edit/image.blade.php → ...mponents/modals/post/edit/image.blade.php
diff --git a/...onents/modals/post/edit/publish.blade.php → ...onents/modals/post/edit/publish.blade.php b/...onents/modals/post/edit/publish.blade.php → ...onents/modals/post/edit/publish.blade.php
diff --git a/...components/modals/post/edit/seo.blade.php → ...components/modals/post/edit/seo.blade.php b/...components/modals/post/edit/seo.blade.php → ...components/modals/post/edit/seo.blade.php
diff --git a/...nents/modals/post/edit/settings.blade.php → ...nents/modals/post/edit/settings.blade.php b/...nents/modals/post/edit/settings.blade.php → ...nents/modals/post/edit/settings.blade.php
diff --git a/...as/components/modals/tag/delete.blade.php → ...ws/components/modals/tag/delete.blade.php b/...as/components/modals/tag/delete.blade.php → ...ws/components/modals/tag/delete.blade.php
diff --git a/...ws/canvas/components/nav/navbar.blade.php → ...ces/views/components/nav/navbar.blade.php b/...ws/canvas/components/nav/navbar.blade.php → ...ces/views/components/nav/navbar.blade.php
@@ -4,7 +4,7 @@
             <nav class="navbar navbar-light justify-content-between flex-nowrap flex-row py-1">
                 <!-- Left Side Of Navbar -->
                 <a class="navbar-brand logo mr-4 font-weight-bold py-0 @hasSection('status') d-none d-md-block @endif"
-                   href="{{ route('blog.index') }}"><span>C</span>anvas</a>
+                   href="{{ route('canvas.index') }}"><span>C</span>anvas</a>
 
                 <ul class="navbar-nav mr-auto flex-row float-right">
                     <li class="text-muted font-weight-bold">

diff --git a/resources/views/canvas/index.blade.php → resources/views/index.blade.php b/resources/views/canvas/index.blade.php → resources/views/index.blade.php
@@ -8,7 +8,7 @@
 @endpush
 
 @section('body')
-    @include('canvas::canvas.components.nav.navbar')
+    @include('canvas::components.nav.navbar')
     <main class="py-4">
         @yield('content')
     </main>

diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
@@ -18,7 +18,7 @@
     <link rel="stylesheet" href="{{ url('https://cdn.jsdelivr.net/gh/highlightjs/[email protected]/build/styles/github.min.css') }}">
 
     <!-- Style sheets -->
-    <link rel="stylesheet" type="text/css" href="{{ mix('css/app.css', 'vendor/canvas') }}">
+    <link rel="stylesheet" type="text/css" href="{{ mix('app.css', 'vendor/canvas') }}">
 
     <!-- Additional style sheets -->
     @stack('styles')
@@ -29,7 +29,7 @@
     </div>
 
     <!-- Application scripts -->
-    <script type="text/javascript" src="{{ mix('js/app.js', 'vendor/canvas') }}"></script>
+    <script type="text/javascript" src="{{ mix('app.js', 'vendor/canvas') }}"></script>
 
     <!-- Additional scripts -->
     @stack('scripts')

diff --git a/...urces/views/canvas/posts/create.blade.php → resources/views/posts/create.blade.php b/...urces/views/canvas/posts/create.blade.php → resources/views/posts/create.blade.php
@@ -1,4 +1,4 @@
-@extends('canvas::canvas.index')
+@extends('canvas::index')
 
 @section('status', 'Draft')
 
@@ -23,7 +23,7 @@
     <div class="container">
         <div class="row justify-content-center">
             <div class="col-md-8">
-                @include('canvas::canvas.components.forms.post.create')
+                @include('canvas::components.forms.post.create')
             </div>
         </div>
     </div>

diff --git a/resources/views/canvas/posts/edit.blade.php → resources/views/posts/edit.blade.php b/resources/views/canvas/posts/edit.blade.php → resources/views/posts/edit.blade.php
@@ -1,4 +1,4 @@
-@extends('canvas::canvas.index')
+@extends('canvas::index')
 
 @section('status', $data['post']->published ? 'Published' : 'Draft')
 
@@ -12,7 +12,6 @@
         </a>
         <div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenuButton">
             @if($data['post']->published)
-                <a href="#" class="dropdown-item" data-toggle="modal" data-target="#modal-share">Share post</a>
                 <a href="{{ route('canvas.stats.show', $data['post']->id) }}" class="dropdown-item">View stats</a>
                 <div class="dropdown-divider"></div>
             @endif
@@ -28,8 +27,8 @@
     <div class="container">
         <div class="row justify-content-center">
             <div class="col-md-8">
-                @include('canvas::canvas.components.forms.post.edit')
-                @include('canvas::canvas.components.modals.post.delete')
+                @include('canvas::components.forms.post.edit')
+                @include('canvas::components.modals.post.delete')
             </div>
         </div>
     </div>

diff --git a/resources/views/canvas/posts/index.blade.php → resources/views/posts/index.blade.php b/resources/views/canvas/posts/index.blade.php → resources/views/posts/index.blade.php
@@ -1,4 +1,4 @@
-@extends('canvas::canvas.index')
+@extends('canvas::index')
 
 @section('actions')
     <a href="{{ route('canvas.post.create') }}" class="btn btn-sm btn-outline-primary my-auto mx-3">

diff --git a/resources/views/canvas/stats/index.blade.php → resources/views/stats/index.blade.php b/resources/views/canvas/stats/index.blade.php → resources/views/stats/index.blade.php
@@ -1,4 +1,4 @@
-@extends('canvas::canvas.index')
+@extends('canvas::index')
 
 @section('actions')
     <a href="{{ route('canvas.post.create') }}" class="btn btn-sm btn-outline-primary my-auto mx-3">
@@ -51,7 +51,7 @@ class="font-weight-bold lead">{{ $post->title }}</a>
                                     </p>
                                     <p class="text-muted mb-2">
                                             {{ $post->readTime }} ― <a
-                                                href="{{ route('blog.post.show', $post->slug) }}">View
+                                                href="{{ route('canvas.post.edit', $post->id) }}">Edit
                                                 post</a> ― <a
                                                 href="{{ route('canvas.stats.show', $post->id) }}">Details</a>
                                         </p>

diff --git a/resources/views/canvas/stats/show.blade.php → resources/views/stats/show.blade.php b/resources/views/canvas/stats/show.blade.php → resources/views/stats/show.blade.php
@@ -1,4 +1,4 @@
-@extends('canvas::canvas.index')
+@extends('canvas::index')
 
 @section('actions')
     <a href="{{ route('canvas.index') }}" class="btn btn-sm btn-outline-primary my-auto mx-3">

diff --git a/resources/views/canvas/tags/create.blade.php → resources/views/tags/create.blade.php b/resources/views/canvas/tags/create.blade.php → resources/views/tags/create.blade.php
@@ -1,4 +1,4 @@
-@extends('canvas::canvas.index')
+@extends('canvas::index')
 
 @section('actions')
     <a href="#" class="btn btn-sm btn-outline-primary my-auto mx-3"
@@ -10,7 +10,7 @@
     <div class="container">
         <div class="row justify-content-center">
             <div class="col-md-8">
-                @include('canvas::canvas.components.forms.tag.create')
+                @include('canvas::components.forms.tag.create')
             </div>
         </div>
     </div>

diff --git a/resources/views/canvas/tags/edit.blade.php → resources/views/tags/edit.blade.php b/resources/views/canvas/tags/edit.blade.php → resources/views/tags/edit.blade.php
@@ -1,4 +1,4 @@
-@extends('canvas::canvas.index')
+@extends('canvas::index')
 
 @section('actions')
     <a href="#" class="btn btn-sm btn-outline-primary my-auto"
@@ -19,8 +19,8 @@
     <div class="container">
         <div class="row justify-content-center">
             <div class="col-md-8">
-                @include('canvas::canvas.components.forms.tag.edit')
-                @include('canvas::canvas.components.modals.tag.delete')
+                @include('canvas::components.forms.tag.edit')
+                @include('canvas::components.modals.tag.delete')
             </div>
         </div>
     </div>

diff --git a/resources/views/canvas/tags/index.blade.php → resources/views/tags/index.blade.php b/resources/views/canvas/tags/index.blade.php → resources/views/tags/index.blade.php
@@ -1,4 +1,4 @@
-@extends('canvas::canvas.index')
+@extends('canvas::index')
 
 @section('actions')
     <a href="{{ route('canvas.tag.create') }}" class="btn btn-sm btn-outline-primary my-auto mx-3">