Merge branch 'release/4.1.33'

* release/4.1.33: updated the changelog compile assets upgraded dependencies on the default templates refactored the view extensions wip updated the branding compile assets updates the readme
austintoddj · May 2, 2019 · 684ccc3 · 684ccc3
2 parents fefe7db + eb65c86
commit 684ccc3
Show file tree

Hide file tree

Showing 24 changed files with 78 additions and 77 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,11 @@
 # Release Notes
 
+## [v4.1.33](https://github.com/cnvs/canvas/compare/v4.1.32...v4.1.33)
+
+### Changed
+- Refactored the blade templates [2d37762](https://github.com/cnvs/canvas/commit/2d377623bbf103d593b326008e898e8f969a31a4)
+- Updated the default template dependencies [8136282](https://github.com/cnvs/canvas/commit/8136282391830d73c38afc12c487e37f10a2a7ca)
+
 ## [v4.1.32](https://github.com/cnvs/canvas/compare/v4.1.31...v4.1.32)
 
 ### Changed

diff --git a/public/favicon.ico b/public/favicon.ico
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,7 +1,7 @@
 {
-    "/js/app.js": "/js/app.js?id=f9fc3114d81c6504c9da",
+    "/js/app.js": "/js/app.js?id=553ba38f897b66033f59",
     "/css/app.css": "/css/app.css?id=f67fa09e4165d6153c77",
     "/css/app-dark.css": "/css/app-dark.css?id=96b402438f4da22bea87",
-    "/js/app.js.map": "/js/app.js.map?id=1435f50cbcc627578cf2",
+    "/js/app.js.map": "/js/app.js.map?id=b7f98d7679604b9b27ff",
     "/favicon.ico": "/favicon.ico?id=dbb0c05daa3432643753"
 }
diff --git a/readme.md b/readme.md
@@ -41,15 +41,12 @@ php artisan storage:link
 
 ## Configuration
 
-> **Note:** You are not required to complete the following steps. You have total design freedom when integrating blog content into your application.
+> **Note:** The following steps are optional configurations, you are not required to complete them.
 
-Generate a default blog controller with routes and views to get up and running as quickly as possible:
+**Want to get started fast?** Just run `php artisan canvas:setup` after installing Canvas. Then, navigate your browser to `http://your-app.test/blog` or any other URL that is assigned to your application. This command scaffolds a default frontend for your entire blog!
 
-```bash
-php artisan canvas:setup
-```
 
-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`:
+If you want to include [Unsplash](https://unsplash.com) images in your post 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`:
 
 ```php
 'unsplash' => [

diff --git a/resources/favicon.ico b/resources/favicon.ico
diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
@@ -9,7 +9,7 @@
     <meta name="csrf-token" content="{{ csrf_token() }}">
 
     <!-- Title -->
-    <title>@yield('title')</title>
+    <title>Canvas</title>
 
     <!-- HighlightJS scripts -->
     <script src="{{ url('https://cdn.jsdelivr.net/gh/highlightjs/[email protected]/build/highlight.min.js') }}"></script>
@@ -20,12 +20,19 @@
     <!-- Style sheets -->
     <link rel="stylesheet" type="text/css" href="{{ asset(mix(\Canvas\Canvas::$useDarkMode ? 'css/app-dark.css' : 'css/app.css', 'vendor/canvas')) }}">
 
+    <!-- Icon -->
+    <link rel="shortcut icon" href="{{ mix('favicon.ico', 'vendor/canvas') }}">
+
     <!-- Additional style sheets -->
     @stack('styles')
 </head>
 <body>
     <div id="app">
-        @yield('body')
+        @include('canvas::components.nav.navbar')
+
+        <main class="py-4">
+            @yield('content')
+        </main>
     </div>
 
     <!-- Localization scripts -->

diff --git a/resources/views/posts/create.blade.php b/resources/views/posts/create.blade.php
@@ -1,4 +1,4 @@
-@extends('canvas::index')
+@extends('canvas::layouts.app')
 
 @section('context', __('canvas::nav.context.draft'))
 

diff --git a/resources/views/posts/edit.blade.php b/resources/views/posts/edit.blade.php
@@ -1,4 +1,4 @@
-@extends('canvas::index')
+@extends('canvas::layouts.app')
 
 @section('context', $data['post']->published ? __('canvas::nav.context.published') : __('canvas::nav.context.draft'))
 

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

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

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

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

diff --git a/resources/views/tags/edit.blade.php b/resources/views/tags/edit.blade.php
@@ -1,4 +1,4 @@
-@extends('canvas::index')
+@extends('canvas::layouts.app')
 
 @section('actions')
     <a href="#" class="btn btn-sm btn-outline-primary my-auto"

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

diff --git a/resources/views/topics/create.blade.php b/resources/views/topics/create.blade.php
@@ -1,4 +1,4 @@
-@extends('canvas::index')
+@extends('canvas::layouts.app')
 
 @section('actions')
     <a href="#" class="btn btn-sm btn-outline-primary my-auto mx-3"

diff --git a/resources/views/topics/edit.blade.php b/resources/views/topics/edit.blade.php
@@ -1,4 +1,4 @@
-@extends('canvas::index')
+@extends('canvas::layouts.app')
 
 @section('actions')
     <a href="#" class="btn btn-sm btn-outline-primary my-auto"

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

diff --git a/stubs/views/blog/index.stub b/stubs/views/blog/index.stub
@@ -6,7 +6,7 @@
     @include('blog.partials.styles')
 @endpush
 
-@section('body')
+@section('content')
     <div class="container">
         @include('blog.partials.navbar')
 

diff --git a/stubs/views/blog/layouts/app.stub b/stubs/views/blog/layouts/app.stub
@@ -16,34 +16,34 @@
     <link href="https://fonts.googleapis.com/css?family=Merriweather:300,400,700,900" rel="stylesheet">
 
     <!-- HighlightJS scripts -->
-    <script src="https://cdn.jsdelivr.net/gh/highlightjs/[email protected]/build/highlight.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.15.6/highlight.min.js"></script>
 
     <!-- HighlightJS sheets -->
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/highlightjs/[email protected]/build/styles/github.min.css">
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.15.6/styles/github.min.css">
 
     <!-- Bootstrap 4 sheets -->
-    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.2.1/css/bootstrap.min.css" integrity="sha384-GJzZqFGwb1QTTN6wy59ffF1BuGJpLSa9DkKMp0DgiMDm4iYMj70gZWKYbI706tWS" crossorigin="anonymous">
+    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
 
     <!-- Medium-Zoom scripts -->
     <script src="https://unpkg.com/medium-zoom@0/dist/medium-zoom.min.js"></script>
 
     <!-- Bootstrap 4 scripts -->
     <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.6/umd/popper.min.js" integrity="sha384-wHAiFfRlMFy6i5SRaxvfOCifBUQy1xHdJ/yoi7FRNXMRBu5WHdZYu1hA6ZOblgut" crossorigin="anonymous"></script>
-    <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.2.1/js/bootstrap.min.js" integrity="sha384-B0UglyR+jN6CkvvICOB2joaf5I4l3gm9GU6Hc1og6Ls7i6U/mkkaduKaBhlAXv9k" crossorigin="anonymous"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js" integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1" crossorigin="anonymous"></script>
+    <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
 
     <!-- FontAwesome scripts -->
-    <script defer src="https://use.fontawesome.com/releases/v5.7.1/js/all.js" integrity="sha384-eVEQC9zshBn0rFj4+TU78eNA19HMNigMviK/PU/FFjLXqa/GKPgX58rvt5Z8PLs7" crossorigin="anonymous"></script>
+    <script defer src="https://use.fontawesome.com/releases/v5.8.1/js/all.js" integrity="sha384-g5uSoOSBd7KkhAMlnQILrecXvzst9TdC09/VM+pjDTCM+1il8RHz5fKANTFFb+gQ" crossorigin="anonymous"></script>
 
     <!-- Additional style sheets -->
     @stack('styles')
 </head>
 <body>
     <div id="app">
-        @yield('body')
+        @yield('content')
     </div>
 
     <!-- Additional scripts -->
     @stack('scripts')
 </body>
-</html>
+</html>
diff --git a/stubs/views/blog/show.stub b/stubs/views/blog/show.stub
@@ -34,7 +34,7 @@
     </div>
 @endsection
 
-@section('body')
+@section('content')
     <div class="container">
         @include('blog.partials.navbar')
 
@@ -113,5 +113,11 @@
         $(function() {
             mediumZoom('.embedded_image img');
         });
+
+        document.addEventListener('DOMContentLoaded', (event) => {
+            document.querySelectorAll('pre').forEach((block) => {
+                hljs.highlightBlock(block);
+            });
+        });
     </script>
 @endpush
diff --git a/yarn.lock b/yarn.lock
@@ -859,12 +859,12 @@ abbrev@1:
   integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
 
 accepts@~1.3.4, accepts@~1.3.5:
-  version "1.3.6"
-  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.6.tgz#27de8682f0833e966dde5c5d7a63ec8523106e4b"
-  integrity sha512-QsaoUD2dpVpjENy8JFpQnXP9vyzoZPmAoKrE3S6HtSB7qzSebkJNnmdY4p004FQUSSiHXPueENpoeuUW/7a8Ig==
+  version "1.3.7"
+  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd"
+  integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==
   dependencies:
     mime-types "~2.1.24"
-    negotiator "0.6.1"
+    negotiator "0.6.2"
 
 acorn-dynamic-import@^4.0.0:
   version "4.0.0"
@@ -1297,13 +1297,13 @@ browserify-zlib@^0.2.0:
     pako "~1.0.5"
 
 browserslist@^4.0.0, browserslist@^4.5.2, browserslist@^4.5.4:
-  version "4.5.5"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.5.5.tgz#fe1a352330d2490d5735574c149a85bc18ef9b82"
-  integrity sha512-0QFO1r/2c792Ohkit5XI8Cm8pDtZxgNl2H6HU4mHrpYz7314pEYcsAVVatM0l/YmxPnEzh9VygXouj4gkFUTKA==
+  version "4.5.6"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.5.6.tgz#ea42e8581ca2513fa7f371d4dd66da763938163d"
+  integrity sha512-o/hPOtbU9oX507lIqon+UvPYqpx3mHc8cV3QemSBTXwkG8gSQSK6UKvXcE/DcleU3+A59XTUHyCvZ5qGy8xVAg==
   dependencies:
-    caniuse-lite "^1.0.30000960"
-    electron-to-chromium "^1.3.124"
-    node-releases "^1.1.14"
+    caniuse-lite "^1.0.30000963"
+    electron-to-chromium "^1.3.127"
+    node-releases "^1.1.17"
 
 buffer-from@^1.0.0:
   version "1.1.1"
@@ -1431,7 +1431,7 @@ caniuse-api@^3.0.0:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000957, caniuse-lite@^1.0.30000960:
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000957, caniuse-lite@^1.0.30000963:
   version "1.0.30000963"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000963.tgz#5be481d5292f22aff5ee0db4a6c049b65b5798b1"
   integrity sha512-n4HUiullc7Lw0LyzpeLa2ffP8KxFBGdxqD/8G3bSL6oB758hZ2UE2CVK+tQN958tJIi0/tfpjAc67aAtoHgnrQ==
@@ -2283,10 +2283,10 @@ [email protected]:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
   integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
-electron-to-chromium@^1.3.124:
-  version "1.3.127"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.127.tgz#9b34d3d63ee0f3747967205b953b25fe7feb0e10"
-  integrity sha512-1o25iFRf/dbgauTWalEzmD1EmRN3a2CzP/K7UVpYLEBduk96LF0FyUdCcf4Ry2mAWJ1VxyblFjC93q6qlLwA2A==
+electron-to-chromium@^1.3.127:
+  version "1.3.129"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.129.tgz#bff32e1840775554aafa301e9dc5002d565aae80"
+  integrity sha512-puirJsgZnedlFEmRa7WEUIaS8ZgHHn7d7inph+RiapCc0x80hdoDyEEpR9z3aRUSZy4fGxOTOFcxnGmySlrmhA==
 
 elliptic@^6.0.0:
   version "6.4.1"
@@ -2438,9 +2438,9 @@ eventemitter3@^2.0.3:
   integrity sha1-teEHm1n7XhuidxwKmTvgYKWMmbo=
 
 eventemitter3@^3.0.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.1.tgz#1ab02a344af74f5cbf528969601bf0fd6aeebf98"
-  integrity sha512-MXmFv3KYbv7MPjPeGlFCTieXB9zNvmHfy4fXzZbrdMeUUk3pxQ8SS0cJ6CcwUDZnIL3ZDa01qQFzhlusB8s51Q==
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.2.tgz#2d3d48f9c346698fce83a85d7d664e98535df6e7"
+  integrity sha512-tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q==
 
 events@^3.0.0:
   version "3.0.0"
@@ -2880,9 +2880,9 @@ global-prefix@^1.0.1:
     which "^1.2.14"
 
 globals@^11.1.0:
-  version "11.11.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-11.11.0.tgz#dcf93757fa2de5486fbeed7118538adf789e9c2e"
-  integrity sha512-WHq43gS+6ufNOEqlrDBxVEbb8ntfXrfAUU2ZOpCxrBdGKW3gyv8mCxAfIBD0DroPKGrJ2eSsXsLtY9MPntsyTw==
+  version "11.12.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
+  integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
 globby@^6.1.0:
   version "6.1.0"
@@ -3555,9 +3555,9 @@ isobject@^3.0.0, isobject@^3.0.1:
   integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
 
 jquery@^3.2:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.4.0.tgz#8de513fa0fa4b2c7d2e48a530e26f0596936efdf"
-  integrity sha512-ggRCXln9zEqv6OqAGXFEcshF5dSBvCkzj6Gm2gzuR5fWawaX8t7cxKVkkygKODrDAzKdoYw3l/e3pm3vlT4IbQ==
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.4.1.tgz#714f1f8d9dde4bdfa55764ba37ef214630d80ef2"
+  integrity sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw==
 
 js-levenshtein@^1.1.3:
   version "1.1.6"
@@ -4188,10 +4188,10 @@ needle@^2.2.1:
     iconv-lite "^0.4.4"
     sax "^1.2.4"
 
-[email protected].1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
-  integrity sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=
+[email protected].2:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
+  integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==
 
 neo-async@^2.5.0:
   version "2.6.0"
@@ -4271,7 +4271,7 @@ node-pre-gyp@^0.12.0:
     semver "^5.3.0"
     tar "^4"
 
-node-releases@^1.1.14:
+node-releases@^1.1.17:
   version "1.1.17"
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.17.tgz#71ea4631f0a97d5cd4f65f7d04ecf9072eac711a"
   integrity sha512-/SCjetyta1m7YXLgtACZGDYJdCSIBAWorDWkGCGZlydP2Ll7J48l7j/JxNYZ+xsgSPbWfdulVS/aY+GdjUsQ7Q==