Merge branch 'release/4.1.16'

* release/4.1.16: updated the changelog updated the dark mode for better readability fixed the validation messages on tags/topics bumped font awesome to 5.8 added query scopes to the BlogController stub to reduce the query load matrix build cleaned up tests and added publish command test Apply fixes from StyleCI (#450) added unit tests for the StoreViewData listener asset compiling refactored the model attributes to us snake case updated the Model::all() usages in the post controller to specify columns
austintoddj · Mar 29, 2019 · 7976a33 · 7976a33
2 parents 084acaa + 7c69027
commit 7976a33
Show file tree

Hide file tree

Showing 25 changed files with 320 additions and 172 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,19 +1,30 @@
 language: php
 
+sudo: false
+
+php:
+  - 7.1
+  - 7.2
+  - 7.3
+
+env:
+  matrix:
+    - LARAVEL=5.8.*
+    - LARAVEL=dev-master
+
 matrix:
   fast_finish: true
-  include:
+  exclude:
     - php: 7.1
-    - php: 7.2
-    - php: 7.3
-
-sudo: false
+      env: LARAVEL=dev-master
+  allow_failures:
+    - env: LARAVEL=dev-master
 
 before_install:
   - phpenv config-rm xdebug.ini || true
   - travis_retry composer self-update
 
 install:
-  - travis_retry composer update --prefer-dist --no-interaction --prefer-stable --no-suggest
+  - travis_retry composer require "illuminate/contracts=${LARAVEL}" --dev --prefer-dist --no-interaction --no-suggest
 
-script: vendor/bin/phpunit --verbose
+script: vendor/bin/phpunit --verbose
diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,20 @@
 # Release Notes
 
+## [v4.1.16](https://github.com/cnvs/canvas/compare/v4.1.15...v4.1.16)
+
+### Added
+- Added unit tests for the StoreViewData listener ([2e3aeb5](https://github.com/cnvs/canvas/commit/2e3aeb518aee9141fdec6485ca2c3844a7f98d24))
+- Added unit tests for the Publish command ([637dd3f](https://github.com/cnvs/canvas/commit/637dd3fb2b1a1efd6a2c67fbeb77038737e8d725))
+
+### Fixed
+- Fixed the missing validation messages on Topics/Tags ([4d4231b](https://github.com/cnvs/canvas/commit/4d4231bd7da898e7ee28c38864944ede281cbb8d))
+
+### Changed
+- Updated the `Model::all()` usages to reduce the query sizes ([6655ecb](https://github.com/cnvs/canvas/commit/6655ecb78123e1a179c8514d85e02f9aa5d77c87), [0df1ba5](https://github.com/cnvs/canvas/commit/0df1ba52b8a972fcdc6d01f78c0af2c0a5c72c54))
+- Refactored model attributes to use snake case ([d2f4784](https://github.com/cnvs/canvas/commit/d2f47840d75386f496ea9ff81a9baeb44841dd4c))
+- Updated the Font Awesome library to 5.8 ([47af5b8](https://github.com/cnvs/canvas/commit/47af5b8bf11f3d62d7a189a6fc9bfb201a9fdac4))
+- Updated the dark mode contrast ratios for increased readability ([a718b1b](https://github.com/cnvs/canvas/commit/a718b1bfa13223a9e73d233d336340978ea84f68))
+
 ## [v4.1.15](https://github.com/cnvs/canvas/compare/v4.1.14...v4.1.15)
 
 ### Added
@@ -19,4 +34,4 @@
 ### Changed
 - Refactored the test suite to be more concise and accurate ([573b6e8](https://github.com/cnvs/canvas/commit/573b6e877933fc4e0d2ef46a0686650304b5a9f8))
 - Refactored the migrations into a root `database` directory ([573b6e8](https://github.com/cnvs/canvas/commit/573b6e877933fc4e0d2ef46a0686650304b5a9f8))
-- Updated the `.gitignore` ([a83978b](https://github.com/cnvs/canvas/commit/a83978b63fe2d1e4b25551cd9bf81a3f9ecbb908))
+- Updated the `.gitignore` ([a83978b](https://github.com/cnvs/canvas/commit/a83978b63fe2d1e4b25551cd9bf81a3f9ecbb908))
diff --git a/composer.json b/composer.json
@@ -16,12 +16,13 @@
 	],
 	"require": {
 		"php": "^7.1.3",
-		"laravel/framework": "~5.7.7|~5.8.0"
+		"ext-json": "*",
+		"laravel/framework": "~5.8.0|~5.9.0"
 	},
 	"require-dev": {
 		"mockery/mockery": "^1.1",
 		"orchestra/testbench": "~3.7",
-		"phpunit/phpunit": "^7.4"
+		"phpunit/phpunit": "^7.5"
 	},
 	"autoload": {
 		"psr-4": {

diff --git a/package.json b/package.json
@@ -1,17 +1,17 @@
 {
   "private": true,
   "scripts": {
-    "dev": "yarn development",
+    "dev": "npm run development",
     "development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
-    "watch": "yarn development --watch",
-    "watch-poll": "yarn watch --watch-poll",
+    "watch": "npm run development -- --watch",
+    "watch-poll": "npm run watch -- --watch-poll",
     "hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js",
-    "prod": "yarn production",
+    "prod": "npm run production",
     "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
     "test": "cross-env vendor/bin/phpunit"
   },
   "devDependencies": {
-    "@fortawesome/fontawesome-free": "^5.7",
+    "@fortawesome/fontawesome-free": "^5.8",
     "autosize": "^4.0.2",
     "axios": "^0.18",
     "bootstrap": "^4.0.0",

diff --git a/public/css/app-dark.css b/public/css/app-dark.css
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
@@ -1,7 +1,7 @@
 {
     "/js/app.js": "/js/app.js?id=e14eab4148aca57fd14d",
     "/css/app.css": "/css/app.css?id=30702a620a23ba741c32",
-    "/css/app-dark.css": "/css/app-dark.css?id=1fb783dd9139fe579906",
+    "/css/app-dark.css": "/css/app-dark.css?id=54414bb89e8d56761826",
     "/js/app.js.map": "/js/app.js.map?id=cac20b4e6af75f105d50",
     "/favicon.png": "/favicon.png?id=39d853e8c2bdbc38fde3"
 }
diff --git a/resources/sass/app-dark.scss b/resources/sass/app-dark.scss
@@ -12,163 +12,184 @@ $fa-font-path: "../fonts" !default;
 $font-size-base: 0.9rem;
 $line-height-base: 1.6;
 
+// Color Palette
+$color-text-default: rgb(195,211,222);
+$color-accent: rgba(67, 72, 87, .5);
+$color-border: rgba(67, 72, 87, 1);
+$color-background: rgb(38, 50, 56);
+$green: rgb(195,232,141);
+$blue: rgb(130,170,255);
+$red: rgb(247,140,108);
+$light-grey: #9ba3aa;
+$orange: #f6993f;
+$indigo: #6574cd;
+$dark-grey: #444;
+$yellow: #ffed4a;
+$purple: #9561e2;
+$pink: #f66D9b;
+$teal: #4dc0b5;
+$cyan: #6cb2eb;
+
+// Base
 @import "base";
 
 body {
-  background-color: #252830;
-  color: #cfd2da;
+  background-color: $color-background;
+  color: $color-text-default;
 }
 
-a {
-  color: #cfd2da;
+a.nav-link {
+  color: $color-text-default !important;
 }
 
-a.nav-link {
-  color: #cfd2da !important;
+a.nav-link:hover {
+  color: $color-text-default !important;
 }
 
-a:hover {
-  color: #434857 !important;
+a:hover,
+a.text-primary:hover {
+  color: $blue !important;
 }
 
 blockquote {
-  border-left: 4px solid #434857 !important;
+  border-left: 4px solid $color-border !important;
 
   span {
-    color: #cfd2da !important;
+    color: $color-text-default !important;
   }
 }
 
-.btn-outline-primary {
-  color: #cfd2da;
-  border-color: #cfd2da;
-}
-
-.btn-outline-primary:hover {
-  color: #252830 !important;
-  background-color: #cfd2da;
-  border-color: #cfd2da;
-}
-
-.btn-primary,
-.btn-danger {
-  color: #cfd2da !important;
-}
-
+.btn-outline-primary:hover,
 .btn-primary:hover,
 .btn-danger:hover {
-  color: #252830 !important;
+  color: $color-background !important;
 }
 
 .border-bottom {
-  border-bottom: 1px solid #434857 !important;
+  border-bottom: 1px solid $color-border !important;
 }
 
 .border-top {
-  border-top: 1px solid #434857 !important;
+  border-top: 1px solid $color-border !important;
 }
 
 .card {
   background: transparent;
-  border: 1px solid #434857;
+  border: 1px solid $color-border;
 }
 
 .custom-select {
   background-color: transparent !important;
-  color: #cfd2da !important;
+  color: $color-text-default !important;
 }
 
 .dropdown-menu {
-  background-color: #252830 !important;
-  border: 1px solid #434857 !important;
+  background-color: $color-background !important;
+  border: 1px solid $color-border !important;
 }
 
 .dropdown-menu a {
-  color: #cfd2da !important;
+  color: $color-text-default !important;
 }
 
 .dropdown-menu a:hover {
-  color: #252830 !important;
-  background-color: #cfd2da;
+  color: $color-background !important;
+  background-color: $color-text-default;
 }
 
 .dropdown-divider {
-  border-top: 1px solid #434857 !important;
+  border-top: 1px solid $color-border !important;
 }
 
 div.controls {
-  background-color: #252830 !important;
+  background-color: $color-background !important;
 }
 
 input, textarea {
   background: transparent !important;
-  color: #cfd2da !important;
+  color: $color-text-default !important;
 }
 
 .line-chart {
   line.line-horizontal,
   line.line-vertical {
-    stroke: #434857 !important;
+    stroke: $color-border !important;
   }
 }
 
 .logo i {
   font-size: 20px;
-  color: #cfd2da;
+  color: $color-text-default;
 }
 
 .modal-content {
-  background-color: #252830 !important;
-  border: 1px solid #434857 !important;
+  background-color: $color-background !important;
+  border: 1px solid $color-border !important;
 }
 
 .modal-footer {
-  border-top: 1px solid #434857 !important;
+  border-top: 1px solid $color-border !important;
 }
 
 .multiselect__content-wrapper {
-  background-color: #252830 !important;
-  border: 1px solid #434857 !important;
+  background-color: $color-background !important;
+  border: 1px solid $color-border !important;
 }
 
 .multiselect__element {
-  color: #cfd2da !important;
+  color: $color-text-default !important;
 }
 
 .multiselect__option--selected, .multiselect__option--selected::after {
-  color: #252830 !important;
-  background-color: #cfd2da !important;
+  color: $color-background !important;
+  background-color: $color-text-default !important;
 }
 
 .multiselect__single {
   background: none !important;
-  color: #cfd2da !important;
+  color: $color-text-default !important;
 }
 
 .multiselect__tags {
   background: none !important;
 }
 
 .ql-editor {
-  color: #cfd2da !important;
+  color: $color-text-default !important;
 
   .bg-white {
     background-color: transparent !important;
   }
 
   hr {
-    color: #434857 !important;
+    color: $color-border !important;
   }
 }
 
 .ql-editor.ql-blank::before {
   color: #59616A !important;
 }
 
+#sidebar-controls {
+  .controls {
+    button {
+      i {
+        color: rgb(108,117,125) !important;
+      }
+    }
+
+    button:hover {
+      i {
+        color: rgb(108,117,125) !important;
+      }
+    }
+  }
+}
+
 select.input {
-  color: #cfd2da !important;
+  color: $color-text-default !important;
 }
 
 text {
-  fill: #cfd2da !important;
-}
+  fill: $color-text-default !important;
+}
diff --git a/resources/sass/app.scss b/resources/sass/app.scss
@@ -12,9 +12,24 @@ $fa-font-path: "../fonts" !default;
 $font-size-base: 0.9rem;
 $line-height-base: 1.6;
 
+// Color Palette
+$light-grey: #9ba3aa;
+$indigo: #6574cd;
+$purple: #9561e2;
+$orange: #f6993f;
+$dark-grey: #444;
+$yellow: #ffed4a;
+$green: #38c172;
+$blue: #3490dc;
+$pink: #f66D9b;
+$teal: #4dc0b5;
+$cyan: #6cb2eb;
+$red: #e3342f;
+
+// Base
 @import "base";
 
 .logo i {
   font-size: 20px;
   color: rgb(33, 37, 41) !important;
-}
+}