Skip to content

Commit

Permalink
Merge branch 'master' into mr-graph-node-info
Browse files Browse the repository at this point in the history
  • Loading branch information
MartinRyan authored Oct 30, 2019
2 parents f820aef + 4f0cc4a commit 3e82f12
Show file tree
Hide file tree
Showing 24 changed files with 440 additions and 167 deletions.
2 changes: 1 addition & 1 deletion .nycrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"include": ["src/**/*.js"],
"include": ["src/**/*.js", "src/**/*.vue"],
"exclude": [
"node_modules",
"docs",
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
language: node_js
os:
- linux
node_js: 8
node_js: 10

install:
- npm install
Expand Down
12 changes: 12 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,23 @@ None or N/A.
[#257](https://github.com/cylc/cylc-ui/pull/257) - Display toolbar for
workflows only.

[#283](https://github.com/cylc/cylc-ui/pull/283) - Load user information
on application startup.

[#283](https://github.com/cylc/cylc-ui/pull/285) - Update Vuetify to 2.1,
along with other dependencies with updates available.

### Fixes

[#275](https://github.com/cylc/cylc-ui/pull/275) - Fix size of dashboard
links on hover.

[#254](https://github.com/cylc/cylc-ui/pull/254) - Keep cache in sync,
and use a global event bus.

[#284](https://github.com/cylc/cylc-ui/pull/284) - Use data from
JupyterHub to create the Hub URL (handling base_url).

### Documentation

[#215](https://github.com/cylc/cylc-ui/pull/215) - guide: add beginnings
Expand Down
167 changes: 152 additions & 15 deletions package-lock.json

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

30 changes: 15 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"cytoscape-undo-redo": "^1.3.1",
"dotparser": "^0.4.0",
"enumify": "^1.0.4",
"graphql": "^14.5.3",
"graphql": "^14.5.8",
"graphql-tag": "^2.10.1",
"jshint": "^2.10.2",
"nprogress": "^0.2.0",
Expand All @@ -48,36 +48,36 @@
"vuex-router-sync": "^5.0.0"
},
"devDependencies": {
"@mdi/font": "^4.1.95",
"@vue/cli-plugin-babel": "^3.11.0",
"@vue/cli-plugin-e2e-cypress": "^3.11.0",
"@vue/cli-plugin-eslint": "^3.11.0",
"@vue/cli-plugin-unit-mocha": "^3.11.0",
"@vue/cli-service": "^3.11.0",
"@mdi/font": "^4.5.95",
"@vue/cli-plugin-babel": "^3.12.0",
"@vue/cli-plugin-e2e-cypress": "^3.12.0",
"@vue/cli-plugin-eslint": "^3.12.0",
"@vue/cli-plugin-unit-mocha": "^3.12.0",
"@vue/cli-service": "^3.12.0",
"@vue/test-utils": "^1.0.0-beta.29",
"axios": "^0.19.0",
"babel-eslint": "^10.0.3",
"chai": "^4.2.0",
"cross-env": "^5.2.0",
"eslint": "^6.2.2",
"cross-env": "^6.0.3",
"eslint": "^6.5.1",
"eslint-config-vuetify": "*",
"eslint-plugin-vue": "^5.2.3",
"istanbul-instrumenter-loader": "^3.0.1",
"lodash": "^4.17.15",
"node-sass": "^4.12.0",
"null-loader": "^3.0.0",
"nyc": "^14.1.1",
"sass": "^1.22.10",
"sass": "^1.23.0",
"sass-loader": "^7.3.1",
"sinon": "^7.4.1",
"standard": "^14.0.2",
"vue-cli-plugin-apollo": "^0.21.0",
"sinon": "^7.5.0",
"standard": "^14.3.1",
"vue-cli-plugin-apollo": "^0.21.1",
"vue-cli-plugin-eslint-config-vuetify": "latest",
"vue-cli-plugin-vuetify": "latest",
"vue-cli-plugin-vuetify-essentials": "latest",
"vue-template-compiler": "^2.6.10",
"vuetify-loader": "^1.2.2",
"webpack": "^4.39.2"
"vuetify-loader": "^1.3.0",
"webpack": "^4.41.0"
},
"bugs": {
"url": "https://github.com/cylc/cylc-ui/issues"
Expand Down
18 changes: 10 additions & 8 deletions src/components/cylc/Drawer.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<template>
<v-navigation-drawer
id="app-drawer"
v-model="inputValue"
v-model="drawer"
app
floating
mobile-break-point="991"
Expand All @@ -12,7 +11,7 @@
<v-layout
tag="v-list"
column
style="padding: 0"
class="pa-0"
>
<c-header />
<v-list-item
Expand Down Expand Up @@ -55,10 +54,6 @@
</template>

<script>
// Utilities
import {
mapMutations
} from 'vuex'
// because we use `tag=v-list` and not `v-list`
// eslint-disable-next-line no-unused-vars
import { VList } from 'vuetify/lib/components/VList'
Expand Down Expand Up @@ -89,6 +84,14 @@ export default {
responsive: false
}),
computed: {
drawer: {
get: function () {
return this.$store.state.app.drawer
},
set: function (val) {
this.$store.commit('app/setDrawer', val)
}
},
inputValue: {
get () {
return this.$store.state.app.drawer
Expand All @@ -108,7 +111,6 @@ export default {
}
},
methods: {
...mapMutations('app', ['setDrawer', 'toggleDrawer']),
isView (bool) {
// return links to views for true argument, non-views for false argument
return this.links.filter(function (u) {
Expand Down
Loading

0 comments on commit 3e82f12

Please sign in to comment.