From 7631214cfbef78d0a6f55dad38bb87fc254b5688 Mon Sep 17 00:00:00 2001 From: Gil Ferreira Date: Tue, 13 Dec 2016 15:04:00 -0500 Subject: [PATCH 01/85] Adjustments to charts on dashboard to display properly on mobile --- package.json | 6 +++--- src/components/Dash.vue | 6 ++++++ src/components/dash/Dashboard.vue | 9 ++++++--- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 5d33987a..88db4c6d 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ }, "dependencies": { "babel-runtime": "^5.8.0", - "chart.js": "^2.3.0", + "chart.js": "2.3.0", "datatables.net": "^1.10.11", "datatables.net-bs": "^1.10.11", "faker": "^3.1.0", @@ -45,8 +45,8 @@ "eslint-friendly-formatter": "^2.0.5", "eslint-loader": "^1.5.0", "eslint-plugin-html": "^1.3.0", - "eslint-config-standard": "^6.1.0", - "eslint-plugin-promise": "^2.0.1", + "eslint-config-standard": "6.2.1", + "eslint-plugin-promise": "3.3.0", "eslint-plugin-standard": "^2.0.1", "eventsource-polyfill": "^0.9.6", "express": "^4.13.3", diff --git a/src/components/Dash.vue b/src/components/Dash.vue index b7fc597f..8c5c307e 100644 --- a/src/components/Dash.vue +++ b/src/components/Dash.vue @@ -266,4 +266,10 @@ module.exports = { .user-panel { height: 4em; } +hr.visible-xs-block { + width: 100%; + background-color: rgba(0, 0, 0, 0.17); + height: 1px; + border-color: transparent; +} diff --git a/src/components/dash/Dashboard.vue b/src/components/dash/Dashboard.vue index 18cc3733..e323857d 100644 --- a/src/components/dash/Dashboard.vue +++ b/src/components/dash/Dashboard.vue @@ -78,7 +78,7 @@

-
+

Language Overview @@ -193,6 +193,9 @@ module.exports = { }, personalNumbers: function () { return this.generateRandomNumbers(12, 1000000, 10000) + }, + isMobile: function () { + return (window.innerWidth <= 800 && window.innerHeight <= 600) } }, mounted: function () { @@ -219,7 +222,7 @@ module.exports = { }, options: { responsive: true, - maintainAspectRatio: true, + maintainAspectRatio: !this.isMobile, legend: { position: 'bottom', display: true @@ -248,7 +251,7 @@ module.exports = { }, options: { responsive: true, - maintainAspectRatio: true, + maintainAspectRatio: !this.isMobile, legend: { position: 'bottom', display: true From 6fd5cf02022942a8a6eef83371800e1581a68e02 Mon Sep 17 00:00:00 2001 From: RainKolwa Date: Wed, 25 Jan 2017 17:40:02 +0800 Subject: [PATCH 02/85] use commit instead of dispatch --- src/components/App.vue | 4 ++-- src/components/Dash.vue | 2 +- src/components/Login.vue | 10 +++++----- src/main.js | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/components/App.vue b/src/components/App.vue index 36d64c07..b1216ccb 100644 --- a/src/components/App.vue +++ b/src/components/App.vue @@ -28,8 +28,8 @@ }) }, logout: function () { - this.$store.dispatch('SET_USER', null) - this.$store.dispatch('SET_TOKEN', null) + this.$store.commit('SET_USER', null) + this.$store.commit('SET_TOKEN', null) if (window.localStorage) { window.localStorage.setItem('user', null) diff --git a/src/components/Dash.vue b/src/components/Dash.vue index 8c5c307e..53f54e6a 100644 --- a/src/components/Dash.vue +++ b/src/components/Dash.vue @@ -246,7 +246,7 @@ module.exports = { }, methods: { changeloading: function () { - this.store.dispatch('TOGGLE_SEARCHING') + this.store.commit('TOGGLE_SEARCHING') }, toggleMenu: function (event) { // remove active from li diff --git a/src/components/Login.vue b/src/components/Login.vue index dc6ce9e9..b1079fbe 100644 --- a/src/components/Login.vue +++ b/src/components/Login.vue @@ -47,11 +47,11 @@ module.exports = { this.toggleLoading() this.resetResponse() - store.dispatch('TOGGLE_LOADING') + store.commit('TOGGLE_LOADING') // Login this.$parent.callAPI('POST', '/login', { username: this.username, password: this.password }).then(function (response) { - store.dispatch('TOGGLE_LOADING') + store.commit('TOGGLE_LOADING') if (response.data) { var data = response.data @@ -68,9 +68,9 @@ module.exports = { } else { // success. Let's load up the dashboard if (data.user) { - store.dispatch('SET_USER', data.user) + store.commit('SET_USER', data.user) var token = 'Bearer ' + data.token - store.dispatch('SET_TOKEN', token) + store.commit('SET_TOKEN', token) // Save to local storage as well if (window.localStorage) { @@ -88,7 +88,7 @@ module.exports = { self.toggleLoading() }, function (response) { // error - store.dispatch('TOGGLE_LOADING') + store.commit('TOGGLE_LOADING') console.log('Error', response) self.response = 'Server appears to be offline' self.toggleLoading() diff --git a/src/main.js b/src/main.js index add10fd4..6d3e295b 100644 --- a/src/main.js +++ b/src/main.js @@ -74,7 +74,7 @@ new Vue({ // Check local storage to handle refreshes if (window.localStorage) { if (store.state.user !== window.localStorage.getItem('user')) { - store.dispatch('SET_USER', JSON.parse(window.localStorage.getItem('user'))) - store.dispatch('SET_TOKEN', window.localStorage.getItem('token')) + store.commit('SET_USER', JSON.parse(window.localStorage.getItem('user'))) + store.commit('SET_TOKEN', window.localStorage.getItem('token')) } } From c95cb6b04b0b2260bdd3cde49d69d97baff45923 Mon Sep 17 00:00:00 2001 From: ChangJoo Park Date: Mon, 6 Feb 2017 22:09:41 +0900 Subject: [PATCH 03/85] Add meta for header --- src/routes.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/routes.js b/src/routes.js index c6e96cef..253bb0ce 100644 --- a/src/routes.js +++ b/src/routes.js @@ -25,37 +25,37 @@ const routes = [ path: '', component: DashboardView, name: 'Dashboard', - description: 'Overview of environment' + meta: {description: 'Overview of environment'} }, { path: '/tables', component: TablesView, name: 'Tables', - description: 'Simple and advance table in CoPilot' + meta: {description: 'Simple and advance table in CoPilot'} }, { path: '/tasks', component: TasksView, name: 'Tasks', - description: 'Tasks page in the form of a timeline' + meta: {description: 'Tasks page in the form of a timeline'} }, { path: '/setting', component: SettingView, name: 'Settings', - description: 'User settings page' + meta: {description: 'User settings page'} }, { path: '/access', component: AccessView, name: 'Access', - description: 'Example of using maps' + meta: {description: 'Example of using maps'} }, { path: '/server', component: ServerView, name: 'Servers', - description: 'List of our servers' + meta: {description: 'List of our servers'} }, { path: '/repos', component: ReposView, name: 'Repository', - description: 'List of popular javascript repos' + meta: {description: 'List of popular javascript repos'} } ] }, { From a8aa67b62224f072d6acb6a640eb01b212f29d7c Mon Sep 17 00:00:00 2001 From: Bernhard Reiter Date: Wed, 15 Feb 2017 09:19:16 +0100 Subject: [PATCH 04/85] Tables: improves behaviour on smaller devices. * Using http://getbootstrap.com/css/#tables-responsive class that will add a scroll bar in situations where the table would be rendered outside of the screen on smaller screen sizes. Improvement suggested by @hifall. resolves #13 --- src/components/dash/Tables.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/dash/Tables.vue b/src/components/dash/Tables.vue index 6998fa68..b4d123c7 100644 --- a/src/components/dash/Tables.vue +++ b/src/components/dash/Tables.vue @@ -8,7 +8,7 @@

Striped Full Width Table

-
+
@@ -84,7 +84,7 @@
-
+
From 00681e7a68acdf57e9b4c31d222b834823610d65 Mon Sep 17 00:00:00 2001 From: euvl Date: Sat, 11 Mar 2017 11:54:15 +0000 Subject: [PATCH 05/85] Started using sass, added config file --- package.json | 120 ++++++++++++++++++++-------------------- src/components/Dash.vue | 16 +++++- src/config/index.js | 3 + src/main.js | 2 - 4 files changed, 78 insertions(+), 63 deletions(-) create mode 100644 src/config/index.js diff --git a/package.json b/package.json index 88db4c6d..3f41f510 100644 --- a/package.json +++ b/package.json @@ -31,65 +31,67 @@ }, "devDependencies": { "autoprefixer": "^6.4.0", - "babel-core": "^6.0.0", - "babel-eslint": "^7.0.0", - "babel-loader": "^6.0.0", - "babel-plugin-transform-runtime": "^6.0.0", - "babel-preset-es2015": "^6.0.0", - "babel-preset-stage-2": "^6.0.0", - "babel-register": "^6.0.0", - "chalk": "^1.1.3", - "connect-history-api-fallback": "^1.1.0", - "css-loader": "^0.25.0", - "eslint": "^3.7.1", - "eslint-friendly-formatter": "^2.0.5", - "eslint-loader": "^1.5.0", - "eslint-plugin-html": "^1.3.0", - "eslint-config-standard": "6.2.1", - "eslint-plugin-promise": "3.3.0", - "eslint-plugin-standard": "^2.0.1", - "eventsource-polyfill": "^0.9.6", - "express": "^4.13.3", - "extract-text-webpack-plugin": "^1.0.1", - "file-loader": "^0.9.0", - "function-bind": "^1.0.2", - "html-webpack-plugin": "^2.8.1", - "http-proxy-middleware": "^0.17.2", - "json-loader": "^0.5.4", - "karma": "^1.3.0", - "karma-coverage": "^1.1.1", - "karma-mocha": "^1.2.0", - "karma-phantomjs-launcher": "^1.0.0", - "karma-sinon-chai": "^1.2.0", - "karma-sourcemap-loader": "^0.3.7", - "karma-spec-reporter": "0.0.26", - "karma-webpack": "^1.7.0", - "lolex": "^1.4.0", - "mocha": "^3.1.0", - "chai": "^3.5.0", - "sinon": "^1.17.3", - "sinon-chai": "^2.8.0", - "inject-loader": "^2.0.1", - "isparta-loader": "^2.0.0", - "phantomjs-prebuilt": "^2.1.3", - "chromedriver": "^2.21.2", - "cross-spawn": "^4.0.2", - "nightwatch": "^0.9.8", - "selenium-server": "2.53.1", - "semver": "^5.3.0", - "opn": "^4.0.2", - "ora": "^0.3.0", - "shelljs": "^0.7.4", - "url-loader": "^0.5.7", - "vue-loader": "^9.4.0", - "vue-style-loader": "^1.0.0", - "webpack": "^1.13.2", - "webpack-dev-middleware": "^1.8.3", - "webpack-hot-middleware": "^2.12.2", - "webpack-merge": "^0.14.1" + "babel-core": "^6.0.0", + "babel-eslint": "^7.0.0", + "babel-loader": "^6.0.0", + "babel-plugin-transform-runtime": "^6.0.0", + "babel-preset-es2015": "^6.0.0", + "babel-preset-stage-2": "^6.0.0", + "babel-register": "^6.0.0", + "chai": "^3.5.0", + "chalk": "^1.1.3", + "chromedriver": "^2.21.2", + "connect-history-api-fallback": "^1.1.0", + "cross-spawn": "^4.0.2", + "css-loader": "^0.25.0", + "eslint": "^3.7.1", + "eslint-config-standard": "6.2.1", + "eslint-friendly-formatter": "^2.0.5", + "eslint-loader": "^1.5.0", + "eslint-plugin-html": "^1.3.0", + "eslint-plugin-promise": "3.3.0", + "eslint-plugin-standard": "^2.0.1", + "eventsource-polyfill": "^0.9.6", + "express": "^4.13.3", + "extract-text-webpack-plugin": "^1.0.1", + "file-loader": "^0.9.0", + "function-bind": "^1.0.2", + "html-webpack-plugin": "^2.8.1", + "http-proxy-middleware": "^0.17.2", + "inject-loader": "^2.0.1", + "isparta-loader": "^2.0.0", + "json-loader": "^0.5.4", + "karma": "^1.3.0", + "karma-coverage": "^1.1.1", + "karma-mocha": "^1.2.0", + "karma-phantomjs-launcher": "^1.0.0", + "karma-sinon-chai": "^1.2.0", + "karma-sourcemap-loader": "^0.3.7", + "karma-spec-reporter": "0.0.26", + "karma-webpack": "^1.7.0", + "lolex": "^1.4.0", + "mocha": "^3.1.0", + "nightwatch": "^0.9.8", + "node-sass": "^4.5.0", + "opn": "^4.0.2", + "ora": "^0.3.0", + "phantomjs-prebuilt": "^2.1.3", + "sass-loader": "^6.0.3", + "selenium-server": "2.53.1", + "semver": "^5.3.0", + "shelljs": "^0.7.4", + "sinon": "^1.17.3", + "sinon-chai": "^2.8.0", + "url-loader": "^0.5.7", + "vue-loader": "^9.4.0", + "vue-style-loader": "^1.0.0", + "webpack": "^1.13.2", + "webpack-dev-middleware": "^1.8.3", + "webpack-hot-middleware": "^2.12.2", + "webpack-merge": "^0.14.1" }, "engines": { - "node": ">= 4.0.0", - "npm": ">= 3.0.0" -} + "node": ">= 4.0.0", + "npm": ">= 3.0.0" + } } diff --git a/src/components/Dash.vue b/src/components/Dash.vue index 53f54e6a..2e1f57ab 100644 --- a/src/components/Dash.vue +++ b/src/components/Dash.vue @@ -1,5 +1,5 @@