Skip to content

Commit

Permalink
Merge branch 'release/4.2.1'
Browse files Browse the repository at this point in the history
* release/4.2.1:
  updates the changelog
  updates the changelog
  improved font load times with the display swap property
  minor updates to the command output and removed command unit tests
  Patch for the incorrect line widths being applied to the charts
  wip
  compiled assets
  Fixed the missing featured images property on the post index
  • Loading branch information
austintoddj committed May 29, 2019
2 parents f5c49c1 + 7e4548b commit e9c7dfa
Show file tree
Hide file tree
Showing 17 changed files with 74 additions and 123 deletions.
12 changes: 12 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
# Release Notes

## [Unreleased](https://github.com/cnvs/canvas/compare/master...develop)

## [4.2.1](https://github.com/cnvs/canvas/compare/v4.2.0...v4.2.1)

## Changed
- Refactored the command output lines ([94ddef1](https://github.com/cnvs/canvas/commit/94ddef17704843b9efdff50f27669dcbe116b3b5))
- Improved font load times with the display swap property ([43c448a](https://github.com/cnvs/canvas/commit/43c448ab7155dcda2f5643cfb66d0350eab0dccb))

## Fixed
- Fixed the missing featured image property on the posts index ([15c559b](https://github.com/cnvs/canvas/commit/15c559b25e440460ba97e2de7708d72a8ff2fd4d))
- Fixed incorrect line widths being applied to the line chart components ([046211e](https://github.com/cnvs/canvas/commit/046211e3e1fa2f3a9099259c5e74f10dc9980d8a))

## [4.2.0](https://github.com/cnvs/canvas/compare/v4.1.39...v4.2.0)

## Changed
Expand Down
2 changes: 1 addition & 1 deletion public/css/app-dark.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion public/css/app.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion public/js/app.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/js/app.js.map

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions public/mix-manifest.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"/js/app.js": "/js/app.js?id=64c9df40ee5fc36bdfa6",
"/css/app.css": "/css/app.css?id=eb7fb7a5d8ba4b6dd0a4",
"/css/app-dark.css": "/css/app-dark.css?id=799369a3e5ded6772726",
"/js/app.js.map": "/js/app.js.map?id=0b69e0d2520f03c81ac3",
"/js/app.js": "/js/app.js?id=342571a1a82e4b65d324",
"/css/app.css": "/css/app.css?id=bafeafc7e5cd7b9f1014",
"/css/app-dark.css": "/css/app-dark.css?id=2a976d8eadd9cb34f895",
"/js/app.js.map": "/js/app.js.map?id=e165e8de620ee390255a",
"/favicon.ico": "/favicon.ico?id=dbb0c05daa3432643753"
}
6 changes: 6 additions & 0 deletions resources/js/components/LineChart.vue
Original file line number Diff line number Diff line change
Expand Up @@ -60,3 +60,9 @@
}
}
</script>

<style>
#stats > div > svg > g > g.dataset-units.dataset-line.dataset-0 > path.line-graph-path {
stroke-width: 2px !important;
}
</style>
2 changes: 1 addition & 1 deletion resources/sass/app-dark.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

// Fonts
@import url("https://fonts.googleapis.com/css?family=Nunito|Merriweather:300,400,700");
@import url("https://fonts.googleapis.com/css?family=Nunito|Merriweather:300,400,700&display=swap");
@import "~@fortawesome/fontawesome-free/scss/regular";
@import "~@fortawesome/fontawesome-free/scss/solid";
@import "~@fortawesome/fontawesome-free/scss/fontawesome";
Expand Down
2 changes: 1 addition & 1 deletion resources/sass/app.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

// Fonts
@import url("https://fonts.googleapis.com/css?family=Nunito|Merriweather:300,400,700");
@import url("https://fonts.googleapis.com/css?family=Nunito|Merriweather:300,400,700&display=swap");
@import "~@fortawesome/fontawesome-free/scss/regular";
@import "~@fortawesome/fontawesome-free/scss/solid";
@import "~@fortawesome/fontawesome-free/scss/fontawesome";
Expand Down
3 changes: 1 addition & 2 deletions src/Console/InstallCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,7 @@ public function handle()

$this->registerCanvasServiceProvider();

$this->line('');
$this->line('<info>[✔]</info> Canvas is installed and ready to use. Enjoy!');
$this->info('Installation complete.');
}

/**
Expand Down
9 changes: 4 additions & 5 deletions src/Console/PublishCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class PublishCommand extends Command
*
* @var string
*/
protected $description = 'Publish all of the Canvas resources';
protected $description = 'Publish any publishable assets from Canvas';

/**
* Execute the console command.
Expand All @@ -27,17 +27,16 @@ class PublishCommand extends Command
*/
public function handle()
{
$this->call('vendor:publish', [
$this->callSilent('vendor:publish', [
'--tag' => 'canvas-config',
'--force' => $this->option('force'),
]);

$this->call('vendor:publish', [
$this->callSilent('vendor:publish', [
'--tag' => 'canvas-assets',
'--force' => true,
]);

$this->line('');
$this->line('<info>[✔]</info> Canvas assets have published successfully.');
$this->info('Publishing complete.');
}
}
3 changes: 1 addition & 2 deletions src/Console/SetupCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,7 @@ public function handle()
FILE_APPEND
);

$this->line('');
$this->line('<info>[✔]</info> Canvas is setup and ready to use. Enjoy! Head over to '.url('/blog').' to get started.');
$this->info('Setup complete. Head over to <comment>'.url('/blog').'</comment> to get started.');
}

/**
Expand Down
2 changes: 1 addition & 1 deletion src/Http/Controllers/PostController.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class PostController extends Controller
public function index()
{
$posts = Post::orderByDesc('created_at')
->select('id', 'title', 'body', 'published_at', 'created_at')
->select('id', 'title', 'body', 'published_at', 'featured_image', 'created_at')
->get();

$data = [
Expand Down
4 changes: 2 additions & 2 deletions stubs/views/blog/layouts/app.stub
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
<title>@yield('title')</title>

<!-- Fonts -->
<link href="https://fonts.googleapis.com/css?family=Nunito" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=Merriweather:300,400,700,900" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=Nunito&display=swap" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=Merriweather:300,400,700,900&display=swap" rel="stylesheet">

<!-- HighlightJS scripts -->
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.15.6/highlight.min.js"></script>
Expand Down
38 changes: 0 additions & 38 deletions tests/Console/InstallCommandTest.php

This file was deleted.

26 changes: 0 additions & 26 deletions tests/Console/PublishCommandTest.php

This file was deleted.

74 changes: 37 additions & 37 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -673,9 +673,9 @@
integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==

"@types/node@*":
version "12.0.2"
resolved "https://registry.yarnpkg.com/@types/node/-/node-12.0.2.tgz#3452a24edf9fea138b48fad4a0a028a683da1e40"
integrity sha512-5tabW/i+9mhrfEOUcLDu2xBPsHJ+X5Orqy9FKpale3SjDA17j5AEpYq5vfy3oAeAHGcvANRCO3NV3d2D6q3NiA==
version "12.0.3"
resolved "https://registry.yarnpkg.com/@types/node/-/node-12.0.3.tgz#5d8d24e0033fc6393efadc85cb59c1f638095c9a"
integrity sha512-zkOxCS/fA+3SsdA+9Yun0iANxzhQRiNwTvJSr6N95JhuJ/x27z9G2URx1Jpt3zYFfCGUXZGL5UDxt5eyLE7wgw==

"@types/q@^1.5.1":
version "1.5.2"
Expand Down Expand Up @@ -1298,13 +1298,13 @@ browserify-zlib@^0.2.0:
pako "~1.0.5"

browserslist@^4.0.0, browserslist@^4.5.4, browserslist@^4.6.0:
version "4.6.0"
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.6.0.tgz#5274028c26f4d933d5b1323307c1d1da5084c9ff"
integrity sha512-Jk0YFwXBuMOOol8n6FhgkDzn3mY9PYLYGk29zybF05SbRTsMgPqmTNeQQhOghCxq5oFqAXE3u4sYddr4C0uRhg==
version "4.6.1"
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.6.1.tgz#ee5059b1aec18cbec9d055d6cb5e24ae50343a9b"
integrity sha512-1MC18ooMPRG2UuVFJTHFIAkk6mpByJfxCrnUyvSlu/hyQSFHMrlhM02SzNuCV+quTP4CKmqtOMAIjrifrpBJXQ==
dependencies:
caniuse-lite "^1.0.30000967"
electron-to-chromium "^1.3.133"
node-releases "^1.1.19"
caniuse-lite "^1.0.30000971"
electron-to-chromium "^1.3.137"
node-releases "^1.1.21"

buffer-from@^1.0.0:
version "1.1.1"
Expand Down Expand Up @@ -1437,7 +1437,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.30000967:
caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000957, caniuse-lite@^1.0.30000971:
version "1.0.30000971"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000971.tgz#d1000e4546486a6977756547352bc96a4cfd2b13"
integrity sha512-TQFYFhRS0O5rdsmSbF1Wn+16latXYsQJat66f7S7lizXW1PVpWJeZw9wqqVLIjuxDRz7s7xRUj13QCfd8hKn6g==
Expand Down Expand Up @@ -1492,9 +1492,9 @@ chownr@^1.1.1:
integrity sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==

chrome-trace-event@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.0.tgz#45a91bd2c20c9411f0963b5aaeb9a1b95e09cc48"
integrity sha512-xDbVgyfDTT2piup/h8dK/y4QZfJRSa73bw1WZ8b4XM1o7fsFubUVGYcE+1ANtOzJJELGpYoG2961z0Z6OAld9A==
version "1.0.2"
resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz#234090ee97c7d4ad1a2c4beae27505deffc608a4"
integrity sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==
dependencies:
tslib "^1.9.0"

Expand Down Expand Up @@ -1750,18 +1750,18 @@ copy-descriptor@^0.1.0:
integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=

core-js-compat@^3.1.1:
version "3.1.2"
resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.1.2.tgz#c29ab9722517094b98622175e2218c3b7398176d"
integrity sha512-X0Ch5f6itrHxhg5HSJucX6nNLNAGr+jq+biBh6nPGc3YAWz2a8p/ZIZY8cUkDzSRNG54omAuu3hoEF8qZbu/6Q==
version "3.1.3"
resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.1.3.tgz#0cc3ba4c7f62928c2837e1cffbe8dc78b4f1ae14"
integrity sha512-EP018pVhgwsKHz3YoN1hTq49aRe+h017Kjz0NQz3nXV0cCRMvH3fLQl+vEPGr4r4J5sk4sU3tUC7U1aqTCeJeA==
dependencies:
browserslist "^4.6.0"
core-js-pure "3.1.2"
semver "^6.0.0"
core-js-pure "3.1.3"
semver "^6.1.0"

[email protected].2:
version "3.1.2"
resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.1.2.tgz#62fc435f35b7374b9b782013cdcb2f97e9f6dffa"
integrity sha512-5ckIdBF26B3ldK9PM177y2ZcATP2oweam9RskHSoqfZCrJ2As6wVg8zJ1zTriFsZf6clj/N1ThDFRGaomMsh9w==
[email protected].3:
version "3.1.3"
resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.1.3.tgz#4c90752d5b9471f641514f3728f51c1e0783d0b5"
integrity sha512-k3JWTrcQBKqjkjI0bkfXS0lbpWPxYuHWfMMjC1VDmzU4Q58IwSbuXSo99YO/hUHlw/EB4AlfA2PVxOGkrIq6dA==

core-util-is@~1.0.0:
version "1.0.2"
Expand Down Expand Up @@ -2285,7 +2285,7 @@ [email protected]:
resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=

electron-to-chromium@^1.3.133:
electron-to-chromium@^1.3.137:
version "1.3.137"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.137.tgz#ba7c88024984c038a5c5c434529aabcea7b42944"
integrity sha512-kGi32g42a8vS/WnYE7ELJyejRT7hbr3UeOOu0WeuYuQ29gCpg9Lrf6RdcTQVXSt/v0bjCfnlb/EWOOsiKpTmkw==
Expand Down Expand Up @@ -2498,9 +2498,9 @@ expand-tilde@^2.0.0, expand-tilde@^2.0.2:
homedir-polyfill "^1.0.1"

express@^4.17.0:
version "4.17.0"
resolved "https://registry.yarnpkg.com/express/-/express-4.17.0.tgz#288af62228a73f4c8ea2990ba3b791bb87cd4438"
integrity sha512-1Z7/t3Z5ZnBG252gKUPyItc4xdeaA0X934ca2ewckAsVsw9EG71i++ZHZPYnus8g/s5Bty8IMpSVEuRkmwwPRQ==
version "4.17.1"
resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134"
integrity sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==
dependencies:
accepts "~1.3.7"
array-flatten "1.1.1"
Expand Down Expand Up @@ -3609,9 +3609,9 @@ json-schema-traverse@^0.4.1:
integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==

json3@^3.3.2:
version "3.3.2"
resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1"
integrity sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=
version "3.3.3"
resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.3.tgz#7fc10e375fc5ae42c4705a5cc0aa6f62be305b81"
integrity sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA==

json5@^1.0.1:
version "1.0.1"
Expand Down Expand Up @@ -4284,7 +4284,7 @@ node-pre-gyp@^0.12.0:
semver "^5.3.0"
tar "^4"

node-releases@^1.1.19:
node-releases@^1.1.21:
version "1.1.21"
resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.21.tgz#46c86f9adaceae4d63c75d3c2f2e6eee618e55f3"
integrity sha512-TwnURTCjc8a+ElJUjmDqU6+12jhli1Q61xOQmdZ7ECZVBZuQpN/1UnembiIHDM1wCcfLvh5wrWXUF5H6ufX64Q==
Expand Down Expand Up @@ -5258,9 +5258,9 @@ rc@^1.2.7:
util-deprecate "~1.0.1"

readable-stream@^3.0.6:
version "3.3.0"
resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.3.0.tgz#cb8011aad002eb717bf040291feba8569c986fb9"
integrity sha512-EsI+s3k3XsW+fU8fQACLN59ky34AZ14LoeVZpYwmZvldCFo0r0gnelwF2TcMjLor/BTL5aDJVBMkss0dthToPw==
version "3.4.0"
resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.4.0.tgz#a51c26754658e0a3c21dbf59163bd45ba6f447fc"
integrity sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==
dependencies:
inherits "^2.0.3"
string_decoder "^1.1.1"
Expand Down Expand Up @@ -5589,10 +5589,10 @@ semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b"
integrity sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==

semver@^6.0.0:
version "6.1.0"
resolved "https://registry.yarnpkg.com/semver/-/semver-6.1.0.tgz#e95dc415d45ecf03f2f9f83b264a6b11f49c0cca"
integrity sha512-kCqEOOHoBcFs/2Ccuk4Xarm/KiWRSLEX9CAZF8xkJ6ZPlIoTZ8V5f7J16vYLJqDbR7KrxTJpR2lqjIEm2Qx9cQ==
semver@^6.0.0, semver@^6.1.0:
version "6.1.1"
resolved "https://registry.yarnpkg.com/semver/-/semver-6.1.1.tgz#53f53da9b30b2103cd4f15eab3a18ecbcb210c9b"
integrity sha512-rWYq2e5iYW+fFe/oPPtYJxYgjBm8sC4rmoGdUOgBB7VnwKt6HrL793l2voH1UlsyYZpJ4g0wfjnTEO1s1NP2eQ==

[email protected]:
version "0.17.1"
Expand Down

0 comments on commit e9c7dfa

Please sign in to comment.