Skip to content

Commit

Permalink
Merge branch 'release/4.1.35'
Browse files Browse the repository at this point in the history
* release/4.1.35:
  updates the changelog
  simplifies the list components
  simplified the post list computed properties
  compiled assets and updated the readme
  • Loading branch information
austintoddj committed May 13, 2019
2 parents 9482530 + f4628b4 commit e48d76c
Show file tree
Hide file tree
Showing 10 changed files with 49 additions and 40 deletions.
5 changes: 5 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Release Notes

## [v4.1.35](https://github.com/cnvs/canvas/compare/v4.1.34...v4.1.35)

### Changed
- Refactored list components and updated prop definitions ([092a0cb](https://github.com/cnvs/canvas/commit/092a0cb085111ef307b3f74302182f4e684a374c), [11f43c0](https://github.com/cnvs/canvas/commit/11f43c0cb07c3162077bcb28a7bf81ee35bf0ae1))

## [v4.1.34](https://github.com/cnvs/canvas/compare/v4.1.33...v4.1.34)

### Changed
Expand Down
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.

4 changes: 2 additions & 2 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=159f59e3d274956c3894",
"/js/app.js": "/js/app.js?id=0560e294baf788c328ac",
"/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=fc726c7fae58998005ae",
"/js/app.js.map": "/js/app.js.map?id=61a6d377e358afbb0cf2",
"/favicon.ico": "/favicon.ico?id=dbb0c05daa3432643753"
}
6 changes: 6 additions & 0 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,3 +85,9 @@ composer test
## License

Canvas is open-sourced software licensed under the [MIT license](https://opensource.org/licenses/MIT).

## Credits

- [The team](https://github.com/orgs/cnvs/people) that continues to support and develop this project
- Thanks to [Mohamed Said](https://themsaid.com/) and his project [Wink](https://github.com/writingink/wink) for inspring much of the design
- Anyone who has [contributed a patch](https://github.com/cnvs/canvas/pulls) or [made a helpful suggestion](https://github.com/cnvs/canvas/issues)
6 changes: 1 addition & 5 deletions resources/js/components/PostList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,7 @@
return post.title.toLowerCase().includes(this.search.toLowerCase())
});
if (Object.keys(filtered).length > this.limit) {
this.load = true;
} else {
this.load = false;
}
this.load = Object.keys(filtered).length > this.limit;
return this.limit ? filtered.slice(0, this.limit) : this.postList;
}
Expand Down
13 changes: 7 additions & 6 deletions resources/js/components/TagList.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
<script>
export default {
props: ['models'],
props: {
models: {
type: Array,
required: false
}
},
data() {
return {
Expand All @@ -22,11 +27,7 @@
return tag.name.toLowerCase().includes(this.search.toLowerCase())
});
if (Object.keys(filtered).length > this.limit) {
this.load = true;
} else {
this.load = false;
}
this.load = Object.keys(filtered).length > this.limit;
return this.limit ? filtered.slice(0, this.limit) : this.tagList;
}
Expand Down
13 changes: 7 additions & 6 deletions resources/js/components/TopicList.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
<script>
export default {
props: ['models'],
props: {
models: {
type: Array,
required: false
}
},
data() {
return {
Expand All @@ -22,11 +27,7 @@
return topic.name.toLowerCase().includes(this.search.toLowerCase())
});
if (Object.keys(filtered).length > this.limit) {
this.load = true;
} else {
this.load = false;
}
this.load = Object.keys(filtered).length > this.limit;
return this.limit ? filtered.slice(0, this.limit) : this.topicList;
}
Expand Down
4 changes: 2 additions & 2 deletions resources/js/components/TopicSelect.vue
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</multiselect>

<div class="topics">
<template v-if="value.length != 0">
<template v-if="value.length !== 0">
<input hidden type="hidden" :name="`topic[name]`" :value="value.name">
<input hidden type="hidden" :name="`topic[slug]`" :value="value.slug">
</template>
Expand All @@ -31,7 +31,7 @@
required: false
},
assigned: {
type: Array,
type: Object,
required: false
}
},
Expand Down
34 changes: 17 additions & 17 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1105,14 +1105,14 @@ babel-code-frame@^6.26.0:
js-tokens "^3.0.2"

babel-loader@^8.0.4:
version "8.0.5"
resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.0.5.tgz#225322d7509c2157655840bba52e46b6c2f2fe33"
integrity sha512-NTnHnVRd2JnRqPC0vW+iOQWU5pchDbYXsG2E6DMXEpMfUcQKclF9gmf3G3ZMhzG7IG9ji4coL0cm+FxeWxDpnw==
version "8.0.6"
resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.0.6.tgz#e33bdb6f362b03f4bb141a0c21ab87c501b70dfb"
integrity sha512-4BmWKtBOBm13uoUwd08UwjZlaw3O9GWf456R9j+5YykFZ6LUIjIKLc0zEZf+hauxPOJs96C8k6FvYD09vWzhYw==
dependencies:
find-cache-dir "^2.0.0"
loader-utils "^1.0.2"
mkdirp "^0.5.1"
util.promisify "^1.0.0"
pify "^4.0.1"

babel-merge@^2.0.1:
version "2.0.1"
Expand Down Expand Up @@ -4195,9 +4195,9 @@ negotiator@0.6.2:
integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==

neo-async@^2.5.0:
version "2.6.0"
resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.0.tgz#b9d15e4d71c6762908654b5183ed38b753340835"
integrity sha512-MFh0d/Wa7vkKO3Y3LlacqAEeHK0mckVqzDieUKTT+KGxi+zIpeVsFxymkIiRpbpDziHc290Xr9A1O4Om7otoRA==
version "2.6.1"
resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c"
integrity sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==

nice-try@^1.0.4:
version "1.0.5"
Expand Down Expand Up @@ -4273,9 +4273,9 @@ node-pre-gyp@^0.12.0:
tar "^4"

node-releases@^1.1.17:
version "1.1.18"
resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.18.tgz#cc98fd75598a324a77188ebddf6650e9cbd8b1d5"
integrity sha512-/mnVgm6u/8OwlIsoyRXtTI0RfQcxZoAZbdwyXap0EeWwcOpDDymyCHM2/aR9XKmHXrvizHoPAOs0pcbiJ6RUaA==
version "1.1.19"
resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.19.tgz#c492d1e381fea0350b338b646c27867e88e91b3d"
integrity sha512-SH/B4WwovHbulIALsQllAVwqZZD1kPmKCqrhGfR29dXjLAVZMHvBjD3S6nL9D/J9QkmZ1R92/0wCMDKXUUvyyA==
dependencies:
semver "^5.3.0"

Expand Down Expand Up @@ -5208,9 +5208,9 @@ randomfill@^1.0.3:
safe-buffer "^5.1.0"

range-parser@^1.0.3, range-parser@~1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e"
integrity sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=
version "1.2.1"
resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==

raw-body@2.3.3:
version "2.3.3"
Expand Down Expand Up @@ -6287,7 +6287,7 @@ util-deprecate@^1.0.1, util-deprecate@~1.0.1:
resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=

util.promisify@^1.0.0, util.promisify@~1.0.0:
util.promisify@~1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.0.tgz#440f7165a459c9a16dc145eb8e72f35687097030"
integrity sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==
Expand Down Expand Up @@ -6320,9 +6320,9 @@ uuid@^3.0.1, uuid@^3.3.2:
integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==

v8-compile-cache@^2.0.2:
version "2.0.2"
resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.0.2.tgz#a428b28bb26790734c4fc8bc9fa106fccebf6a6c"
integrity sha512-1wFuMUIM16MDJRCrpbpuEPTUGmM5QMUg0cr3KFwra2XgOgFcPGDQHDh3CszSCD2Zewc/dh/pamNEW8CbfDebUw==
version "2.0.3"
resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.0.3.tgz#00f7494d2ae2b688cfe2899df6ed2c54bef91dbe"
integrity sha512-CNmdbwQMBjwr9Gsmohvm0pbL954tJrNzf6gWL3K+QMQf00PF7ERGrEiLgjuU3mKreLC2MeGhUsNV9ybTbLgd3w==

vary@~1.1.2:
version "1.1.2"
Expand Down

0 comments on commit e48d76c

Please sign in to comment.