From 001424d7ada69390fd7ebea8e585fb0408e147ac Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Sat, 3 Oct 2015 13:39:53 +1300 Subject: More clean up for web interface --- web/app/view/login/Login.js | 95 ---------------------------- web/app/view/login/LoginController.js | 105 ------------------------------- web/app/view/login/Register.js | 64 ------------------- web/app/view/login/RegisterController.js | 40 ------------ 4 files changed, 304 deletions(-) delete mode 100644 web/app/view/login/Login.js delete mode 100644 web/app/view/login/LoginController.js delete mode 100644 web/app/view/login/Register.js delete mode 100644 web/app/view/login/RegisterController.js (limited to 'web/app/view/login') diff --git a/web/app/view/login/Login.js b/web/app/view/login/Login.js deleted file mode 100644 index a2d53fdf1..000000000 --- a/web/app/view/login/Login.js +++ /dev/null @@ -1,95 +0,0 @@ -/* - * Copyright 2015 Anton Tananaev (anton.tananaev@gmail.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -Ext.define('Traccar.view.login.Login', { - extend: 'Ext.window.Window', - alias: 'widget.login', - - requires: [ - 'Traccar.view.login.LoginController' - ], - - controller: 'login', - - bodyPadding: styles.panelPadding, - title: strings.loginTitle, - closable: false, - resizable: false, - - items: { - xtype: 'form', - reference: 'form', - - autoEl: { - tag: 'form', - method: 'POST', - action: 'blank', - target: 'submitTarget' - }, - - items: [{ - xtype: 'combobox', - name: 'language', - fieldLabel: strings.loginLanguage, - store: 'Languages', - displayField: 'name', - valueField: 'code', - submitValue: false, - listeners: { - select: 'onSelectLanguage' - }, - reference: 'languageField' - }, { - xtype: 'textfield', - name: 'email', - fieldLabel: strings.userEmail, - allowBlank: false, - enableKeyEvents: true, - listeners: { - specialKey: 'onSpecialKey', - afterrender: 'onAfterRender' - }, - inputAttrTpl: ['autocomplete="on"'] - }, { - xtype: 'textfield', - name: 'password', - fieldLabel: strings.userPassword, - inputType: 'password', - allowBlank: false, - enableKeyEvents: true, - listeners: { - specialKey: 'onSpecialKey' - }, - inputAttrTpl: ['autocomplete="on"'] - }, { - xtype: 'component', - html: '' - }, { - xtype: 'component', - html: '' - }] - }, - - buttons: [{ - text: strings.loginRegister, - handler: 'onRegisterClick', - reference: 'registerButton' - }, { - text: strings.loginLogin, - handler: 'onLoginClick' - }] - -}); diff --git a/web/app/view/login/LoginController.js b/web/app/view/login/LoginController.js deleted file mode 100644 index 0344f5542..000000000 --- a/web/app/view/login/LoginController.js +++ /dev/null @@ -1,105 +0,0 @@ -/* - * Copyright 2015 Anton Tananaev (anton.tananaev@gmail.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -Ext.define('Traccar.view.login.LoginController', { - extend: 'Ext.app.ViewController', - alias: 'controller.login', - - requires: [ - 'Traccar.view.login.Register' - ], - - init: function() { - this.lookupReference('registerButton').setDisabled( - !Traccar.app.getServer().get('registration')); - this.lookupReference('languageField').setValue(language); - }, - - login: function() { - var form = this.lookupReference('form'); - if (form.isValid()) { - Ext.getBody().mask(strings.sharedLoading); - Ext.Ajax.request({ - scope: this, - url: '/api/login', - params: form.getValues(), - callback: function(options, success, response) { - Ext.getBody().unmask(); - if (Traccar.ErrorManager.check(success, response)) { - var result = Ext.decode(response.responseText); - if (result.success) { - Traccar.app.setUser(result.data); - this.fireViewEvent('login'); - } else { - Traccar.ErrorManager.error(strings.loginFailed); - } - } - - } - }); - } - }, - - logout: function() { - Ext.Ajax.request({ - scope: this, - url: '/api/logout', - callback: function() { - window.location.reload(); - } - }); - }, - - onSelectLanguage: function(selected) { - var paramName = 'locale'; - var paramValue = selected.getValue(); - var url = window.location.href; - if (url.indexOf(paramName + '=') >= 0) { - var prefix = url.substring(0, url.indexOf(paramName)); - var suffix = url.substring(url.indexOf(paramName)); - suffix = suffix.substring(suffix.indexOf("=") + 1); - suffix = (suffix.indexOf('&') >= 0) ? suffix.substring(suffix.indexOf('&')) : ''; - url = prefix + paramName + "=" + paramValue + suffix; - } else { - if (url.indexOf('?') < 0) { - url += '?' + paramName + '=' + paramValue; - } else { - url += '&' + paramName + '=' + paramValue; - } - } - window.location.href = url; - }, - - onAfterRender: function(field) { - field.focus(); - }, - - onSpecialKey: function(field, e) { - if (e.getKey() === e.ENTER) { - this.login(); - } - }, - - onLoginClick: function() { - Ext.getElementById('submitButton').click(); - this.login(); - }, - - onRegisterClick: function() { - Ext.create('Traccar.view.login.Register').show(); - } - -}); diff --git a/web/app/view/login/Register.js b/web/app/view/login/Register.js deleted file mode 100644 index 91a5775a1..000000000 --- a/web/app/view/login/Register.js +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright 2015 Anton Tananaev (anton.tananaev@gmail.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -Ext.define('Traccar.view.login.Register', { - extend: 'Ext.window.Window', - - requires: [ - 'Traccar.view.login.RegisterController' - ], - - controller: 'register', - - bodyPadding: styles.panelPadding, - title: strings.loginRegister, - resizable: false, - modal: true, - - items: { - xtype: 'form', - reference: 'form', - jsonSubmit: true, - - items: [{ - xtype: 'textfield', - name: 'name', - fieldLabel: strings.userName, - allowBlank: false - }, { - xtype: 'textfield', - name: 'email', - fieldLabel: strings.userEmail, - vtype: 'email', - allowBlank: false - }, { - xtype: 'textfield', - name: 'password', - fieldLabel: strings.userPassword, - inputType: 'password', - allowBlank: false - }] - }, - - buttons: [{ - text: strings.sharedSave, - handler: 'onCreateClick' - }, { - text: strings.sharedCancel, - handler: 'closeView' - }] - -}); diff --git a/web/app/view/login/RegisterController.js b/web/app/view/login/RegisterController.js deleted file mode 100644 index b1957ba8f..000000000 --- a/web/app/view/login/RegisterController.js +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright 2015 Anton Tananaev (anton.tananaev@gmail.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -Ext.define('Traccar.view.login.RegisterController', { - extend: 'Ext.app.ViewController', - alias: 'controller.register', - - onCreateClick: function() { - var form = this.lookupReference('form'); - if (form.isValid()) { - Ext.Ajax.request({ - scope: this, - url: '/api/register', - jsonData: form.getValues(), - callback: this.onCreateReturn - }); - } - }, - - onCreateReturn: function(options, success, response) { - if (Traccar.ErrorManager.check(success, response)) { - this.closeView(); - Ext.toast(strings.loginCreated); - } - } - -}); -- cgit v1.2.3