From 68c5c38c4027d4aab32421628bb97623db2f51d3 Mon Sep 17 00:00:00 2001 From: Gil Ferreira Date: Thu, 8 Feb 2018 13:12:45 -0500 Subject: [PATCH 01/21] Adjustments to login page to simplify it. --- .eslintrc.js | 10 +-- src/components/Login.vue | 159 +++++++++++++++++++++------------------ 2 files changed, 92 insertions(+), 77 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index 67c085d6..b3a0b5d8 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -7,20 +7,20 @@ module.exports = { sourceType: 'module' }, env: { - browser: true, + browser: true }, // https://github.com/feross/standard/blob/master/RULES.md#javascript-standard-style extends: 'standard', // required to lint *.vue files - plugins: [ - 'html' - ], + plugins: ['html'], // add your custom rules here - 'rules': { + rules: { // allow paren-less arrow functions 'arrow-parens': 0, // allow async-await 'generator-star-spacing': 0, + // disable space before func paren + 'space-before-function-paren': 0, // allow debugger during development 'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0 } diff --git a/src/components/Login.vue b/src/components/Login.vue index d418161e..8c66cc7e 100644 --- a/src/components/Login.vue +++ b/src/components/Login.vue @@ -1,29 +1,25 @@ @@ -32,7 +28,7 @@ import api from '../api' export default { name: 'Login', - data (router) { + data(router) { return { section: 'Login', loading: '', @@ -42,60 +38,62 @@ export default { } }, methods: { - checkCreds () { - const {username, password} = this + checkCreds() { + const { username, password } = this this.toggleLoading() this.resetResponse() this.$store.commit('TOGGLE_LOADING') /* Making API call to authenticate a user */ - api.request('post', '/login', {username, password}) - .then(response => { - this.toggleLoading() - - var data = response.data - /* Checking if error object was returned from the server */ - if (data.error) { - var errorName = data.error.name - if (errorName) { - this.response = errorName === 'InvalidCredentialsError' - ? 'Username/Password incorrect. Please try again.' - : errorName - } else { - this.response = data.error + api + .request('post', '/login', { username, password }) + .then(response => { + this.toggleLoading() + + var data = response.data + /* Checking if error object was returned from the server */ + if (data.error) { + var errorName = data.error.name + if (errorName) { + this.response = + errorName === 'InvalidCredentialsError' + ? 'Username/Password incorrect. Please try again.' + : errorName + } else { + this.response = data.error + } + + return } - return - } + /* Setting user in the state and caching record to the localStorage */ + if (data.user) { + var token = 'Bearer ' + data.token - /* Setting user in the state and caching record to the localStorage */ - if (data.user) { - var token = 'Bearer ' + data.token + this.$store.commit('SET_USER', data.user) + this.$store.commit('SET_TOKEN', token) - this.$store.commit('SET_USER', data.user) - this.$store.commit('SET_TOKEN', token) + if (window.localStorage) { + window.localStorage.setItem('user', JSON.stringify(data.user)) + window.localStorage.setItem('token', token) + } - if (window.localStorage) { - window.localStorage.setItem('user', JSON.stringify(data.user)) - window.localStorage.setItem('token', token) + this.$router.push(data.redirect ? data.redirect : '/') } + }) + .catch(error => { + this.$store.commit('TOGGLE_LOADING') + console.log(error) - this.$router.push(data.redirect ? data.redirect : '/') - } - }) - .catch(error => { - this.$store.commit('TOGGLE_LOADING') - console.log(error) - - this.response = 'Server appears to be offline' - this.toggleLoading() - }) + this.response = 'Server appears to be offline' + this.toggleLoading() + }) }, - toggleLoading () { - this.loading = (this.loading === '') ? 'loading' : '' + toggleLoading() { + this.loading = this.loading === '' ? 'loading' : '' }, - resetResponse () { + resetResponse() { this.response = '' } } @@ -103,17 +101,23 @@ export default { diff --git a/src/components/Login.vue b/src/components/Login.vue index 8c66cc7e..cfc57627 100644 --- a/src/components/Login.vue +++ b/src/components/Login.vue @@ -147,4 +147,9 @@ body, .input-group input { height: 4em; } + +.input-group-addon i { + height: 15px; + width: 15px; +} From b2f18d778db6ae1b205d120afaa4cb7d324a88cf Mon Sep 17 00:00:00 2001 From: Gil Ferreira Date: Thu, 8 Feb 2018 13:44:10 -0500 Subject: [PATCH 03/21] Adjustment to larger screen for login page --- src/components/Login.vue | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/components/Login.vue b/src/components/Login.vue index cfc57627..80bac6b8 100644 --- a/src/components/Login.vue +++ b/src/components/Login.vue @@ -144,8 +144,20 @@ body, height: 4em; } -.input-group input { - height: 4em; +@media (max-width: 1241px) { + .input-group input { + height: 4em; + } +} +@media (min-width: 1242px) { + form { + padding-left: 20em; + padding-right: 20em; + } + + .input-group input { + height: 6em; + } } .input-group-addon i { From 26aac81cf707242c41b8a55878b337cfdc310aa7 Mon Sep 17 00:00:00 2001 From: Gil Ferreira Date: Tue, 27 Feb 2018 10:18:45 -0500 Subject: [PATCH 04/21] Fixed bad node-sass version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a08df4a4..4abfb657 100644 --- a/package.json +++ b/package.json @@ -80,7 +80,7 @@ "lolex": "^1.5.2", "mocha": "^3.2.0", "nightwatch": "^0.9.12", - "node-sass": "^4.7.2", + "node-sass": "^4.5.0", "opn": "^4.0.2", "optimize-css-assets-webpack-plugin": "^1.3.0", "ora": "^1.1.0", From baebe07f91e780a9cf861ed08c4a694a9cbae931 Mon Sep 17 00:00:00 2001 From: Gil Ferreira Date: Tue, 27 Feb 2018 11:35:47 -0500 Subject: [PATCH 05/21] Some fixes to search container --- package.json | 14 ++++++-------- src/components/Sidebar.vue | 34 +++++++++++++++++++++++++--------- 2 files changed, 31 insertions(+), 17 deletions(-) diff --git a/package.json b/package.json index 4abfb657..97a07170 100644 --- a/package.json +++ b/package.json @@ -1,14 +1,16 @@ { "name": "copilot", "version": "0.5.0", - "description": "A fully responsive admin template based on AdminLTE with vue.js integration", + "description": + "A fully responsive admin template based on AdminLTE with vue.js integration", "author": "Gil Ferreira ", "repository": "https://github.com/misterGF/CoPilot", "license": "MIT", "scripts": { "dev": "node build/dev-server.js", "build": "node build/build.js", - "unit": "cross-env BABEL_ENV=test karma start test/unit/karma.conf.js --single-run", + "unit": + "cross-env BABEL_ENV=test karma start test/unit/karma.conf.js --single-run", "e2e": "node test/e2e/runner.js", "test": "npm run unit && npm run e2e", "deploy": "netlify deploy dist", @@ -23,7 +25,7 @@ "faker": "^3.1.0", "hideseek": "^0.7.0", "http-server": "^0.9.0", - "jquery": "^3.3.1", + "jquery": "^2.2.2", "moment": "^2.12.0", "vue": "^2.2.2", "vue-date-picker": "^1.0.2", @@ -106,9 +108,5 @@ "node": ">= 4.0.0", "npm": ">= 3.0.0" }, - "browserslist": [ - "> 1%", - "last 2 versions", - "not ie <= 8" - ] + "browserslist": ["> 1%", "last 2 versions", "not ie <= 8"] } diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue index 9fbdc509..5fcebc58 100644 --- a/src/components/Sidebar.vue +++ b/src/components/Sidebar.vue @@ -21,15 +21,15 @@