From 29149b1b58c07aedaf8f96e8dce8e7601bca28b2 Mon Sep 17 00:00:00 2001 From: Carlos Date: Mon, 13 Nov 2017 22:15:44 +0100 Subject: [PATCH] corrected some eslint errors and small refactor --- client/auth/src/login/login.html | 24 +++++------ client/auth/src/login/style.scss | 4 ++ client/client/src/card/style.css | 2 +- client/client/src/index/style.css | 2 +- client/client/src/notes/notes.js | 3 ++ client/client/src/notes/style.css | 2 +- .../client/src/search-panel/search-panel.js | 3 ++ .../src/search-panel/search-panel.spec.js | 4 +- client/client/src/web-access/web-access.js | 1 + client/core/src/autocomplete/autocomplete.js | 8 +++- services/loopback/server/middleware.json | 4 +- services/salix/client/index.ejs | 40 +++++++++---------- 12 files changed, 57 insertions(+), 40 deletions(-) diff --git a/client/auth/src/login/login.html b/client/auth/src/login/login.html index 7ca073e72..161ffa732 100644 --- a/client/auth/src/login/login.html +++ b/client/auth/src/login/login.html @@ -1,18 +1,18 @@
-
- -
- - -
- - + +
diff --git a/client/auth/src/login/style.scss b/client/auth/src/login/style.scss index fddd2d14e..8f1df6705 100644 --- a/client/auth/src/login/style.scss +++ b/client/auth/src/login/style.scss @@ -16,6 +16,7 @@ vn-login > div { margin: auto; height: inherit; } + .box { box-sizing: border-box; position: absolute; @@ -27,15 +28,18 @@ vn-login > div { box-shadow: 0 0 1em 0 rgba(1,1,1,.6); border-radius: .5em; } + img { width: 100%; padding-bottom: 1em; } + .footer { margin-top: 1em; text-align: center; position: relative; } + .spinner-wrapper { position: absolute; width: 0; diff --git a/client/client/src/card/style.css b/client/client/src/card/style.css index f788e35c6..195879409 100644 --- a/client/client/src/card/style.css +++ b/client/client/src/card/style.css @@ -1,3 +1,3 @@ -vn-descriptor{ +vn-descriptor { font-family: raleway-bold; } \ No newline at end of file diff --git a/client/client/src/index/style.css b/client/client/src/index/style.css index ba7f75844..b30351f09 100644 --- a/client/client/src/index/style.css +++ b/client/client/src/index/style.css @@ -11,6 +11,6 @@ vn-item-client a:hover { background-color: #424242; } -.vn-item-client-name{ +.vn-item-client-name { font-family: raleway-bold; } diff --git a/client/client/src/notes/notes.js b/client/client/src/notes/notes.js index bd214cf49..7e0ec424a 100644 --- a/client/client/src/notes/notes.js +++ b/client/client/src/notes/notes.js @@ -6,11 +6,13 @@ export default class Controller { this.$http = $http; this.$state = $state; } + $onChanges() { if (this.client) { this.getObservation(this.client.id); } } + getObservation(clientId) { let json = JSON.stringify({where: {clientFk: this.client.id}, order: 'created DESC'}); this.$http.get(`/client/api/clientObservations?filter=${json}`).then( @@ -19,6 +21,7 @@ export default class Controller { } ); } + newObservation() { this.$state.go("clientCard.notes.create", {id: this.client.id}); } diff --git a/client/client/src/notes/style.css b/client/client/src/notes/style.css index b5e17c7a7..4d0f8eba7 100644 --- a/client/client/src/notes/style.css +++ b/client/client/src/notes/style.css @@ -1,3 +1,3 @@ -.notes-date{ +.notes-date { font-family: raleway-bold; } \ No newline at end of file diff --git a/client/client/src/search-panel/search-panel.js b/client/client/src/search-panel/search-panel.js index 87f6308ce..88aa89af3 100644 --- a/client/client/src/search-panel/search-panel.js +++ b/client/client/src/search-panel/search-panel.js @@ -6,15 +6,18 @@ export default class Controller { // onSubmit() is defined by @vnSearchbar this.onSubmit = () => {}; } + onSearch() { this.setStorageValue(); this.onSubmit(this.filter); } + $onChanges() { var value = JSON.parse(this.$window.sessionStorage.getItem('filter')); if (value !== undefined) this.filter = value; } + setStorageValue() { this.$window.sessionStorage.setItem('filter', JSON.stringify(this.filter)); } diff --git a/client/client/src/search-panel/search-panel.spec.js b/client/client/src/search-panel/search-panel.spec.js index 9f7695924..2c3137ff0 100644 --- a/client/client/src/search-panel/search-panel.spec.js +++ b/client/client/src/search-panel/search-panel.spec.js @@ -17,7 +17,7 @@ describe('Client', () => { })); describe('onSearch()', () => { - it(`should call setStorageValue() and onSubmit()`, () => { + it('should call setStorageValue() and onSubmit()', () => { spyOn(controller, 'setStorageValue'); spyOn(controller, 'onSubmit'); controller.setStorageValue(); @@ -29,7 +29,7 @@ describe('Client', () => { }); describe('$onChanges()', () => { - it(`should set filter properties using the search values`, () => { + it('should set filter properties using the search values', () => { expect(controller.filter).not.toBeDefined(); spyOn(JSON, 'parse').and.returnValue({data: 'data'}); controller.$onChanges(); diff --git a/client/client/src/web-access/web-access.js b/client/client/src/web-access/web-access.js index dc61eac82..696d8a0ad 100644 --- a/client/client/src/web-access/web-access.js +++ b/client/client/src/web-access/web-access.js @@ -29,6 +29,7 @@ export default class Controller { this.repeatPassword = ''; this.$.$apply(); } + onPassChange(response) { if (response == 'ACCEPT' && this.canChangePassword) try { diff --git a/client/core/src/autocomplete/autocomplete.js b/client/core/src/autocomplete/autocomplete.js index 0366cece7..8623eccb7 100644 --- a/client/core/src/autocomplete/autocomplete.js +++ b/client/core/src/autocomplete/autocomplete.js @@ -32,6 +32,7 @@ class Autocomplete extends Component { get showDropDown() { return this._showDropDown; } + set showDropDown(value) { if (value && this.url && !this._preLoad) { this._preLoad = true; @@ -77,6 +78,7 @@ class Autocomplete extends Component { get field() { return this.multiple ? this._multiField : this._field; } + set field(value) { if (!angular.equals(value, this.field)) { this.finding = true; @@ -103,7 +105,7 @@ class Autocomplete extends Component { if (value && value.hasOwnProperty(this.valueField)) { this._field = value[this.valueField]; if (this.multiple) { - this._multiField = [value[this.valueField]] + this._multiField = [value[this.valueField]]; } if (value.hasOwnProperty(this.showField)) { this.displayValue = value[this.showField]; @@ -164,6 +166,7 @@ class Autocomplete extends Component { json => this.onItemRequest(null) ); } + onItemRequest(data) { if (data && data.length > 0) this.showItem(data[0]); @@ -222,6 +225,7 @@ class Autocomplete extends Component { this.getItems(); } } + getItems() { if (this.url === undefined) { this.items = copyObject(this.data); @@ -273,6 +277,7 @@ class Autocomplete extends Component { } } } + $onInit() { this.findMore = this.url && this.maxRow; this.mouseFocus = false; @@ -321,7 +326,6 @@ class Autocomplete extends Component { } } - Autocomplete.$inject = ['$element', '$scope', '$http', '$timeout', '$filter']; module.component('vnAutocomplete', { diff --git a/services/loopback/server/middleware.json b/services/loopback/server/middleware.json index 8412781d5..151b6a0e0 100644 --- a/services/loopback/server/middleware.json +++ b/services/loopback/server/middleware.json @@ -1,6 +1,8 @@ { "initial:before": { - "loopback#favicon": {} + "loopback#favicon": { + "params": "$!../favicon.ico" + } }, "initial": { "compression": {}, diff --git a/services/salix/client/index.ejs b/services/salix/client/index.ejs index 9ed38a508..ed1bd1cd8 100644 --- a/services/salix/client/index.ejs +++ b/services/salix/client/index.ejs @@ -1,24 +1,24 @@ - - - Salix - - - - - - - - - + + + Salix + + + + + + + + +