From 174aac0af54d2fac8a84fe7a67d8685811208f33 Mon Sep 17 00:00:00 2001 From: Martin Carrera Date: Mon, 30 May 2016 13:01:28 -0300 Subject: [PATCH] Added log-in view --- public/index.html | 20 ++----------- public/js/controllers/LoginController.js | 36 +++++++++++++++++++---- public/js/services/LoginService.js | 12 ++------ public/style/styles.css | 7 +++++ public/views/genericTemplate.html | 37 +++++++++++++++++------- public/views/login.html | 7 +++++ src/router.js | 2 +- 7 files changed, 77 insertions(+), 44 deletions(-) create mode 100644 public/style/styles.css diff --git a/public/index.html b/public/index.html index abff2f3..0057a07 100644 --- a/public/index.html +++ b/public/index.html @@ -5,6 +5,7 @@ Clash Royale CMS + @@ -28,23 +29,6 @@ -
- -
-
+
diff --git a/public/js/controllers/LoginController.js b/public/js/controllers/LoginController.js index 5768749..4e21101 100644 --- a/public/js/controllers/LoginController.js +++ b/public/js/controllers/LoginController.js @@ -1,12 +1,38 @@ (function () { - function LoginController() { + angular + .module('clash-royale-api') + .controller('LoginController', LoginController); + + LoginController.$inject = ['LoginService']; + + function LoginController(LoginService) { var vm = this; vm.title = 'Log In'; - } + vm.model = {}; + vm.fields = [ + { + key: 'user', + type: 'input', + templateOptions: { + label: 'User', + required: true + } + }, + { + key: 'password', + type: 'input', + templateOptions: { + label: 'Password', + required: true, + type: 'password', + } + }, + ]; - angular - .module('clash-royale-api') - .controller('LoginController', LoginController); + vm.submit = function(model) { + LoginService.authenticate(model); + } + } })(); diff --git a/public/js/services/LoginService.js b/public/js/services/LoginService.js index aaf133c..71ba09d 100644 --- a/public/js/services/LoginService.js +++ b/public/js/services/LoginService.js @@ -1,16 +1,8 @@ angular.module('clash-royale-api').factory('LoginService', function($http) { return { - get : function() { - return $http.get('/api/authentication'); - }, - - create : function(userData) { - return $http.post('/api/authentication', cardData); - }, - - delete : function(id) { - return $http.delete('/api/authentication/' + id); + authenticate : function(userData) { + return $http.post('/api/authenticate', userData); } } diff --git a/public/style/styles.css b/public/style/styles.css new file mode 100644 index 0000000..a4585c4 --- /dev/null +++ b/public/style/styles.css @@ -0,0 +1,7 @@ +.form-signin { + min-height: 100vh; + padding: 15px; + display: flex; + align-items: center; + justify-content: center; +} diff --git a/public/views/genericTemplate.html b/public/views/genericTemplate.html index 6a8dc6e..0a2fdad 100644 --- a/public/views/genericTemplate.html +++ b/public/views/genericTemplate.html @@ -1,12 +1,29 @@ -
-
-

{{ vm.title }}

+
+ +
+
+

{{ vm.title }}

+
+
+ + + +
+

{{ vm.previewTitle }}

+ 
{{ vm.model | json }}
-
- - - -
-

{{ vm.previewTitle }}

- 
{{ vm.model | json }}
diff --git a/public/views/login.html b/public/views/login.html index e69de29..4d406b8 100644 --- a/public/views/login.html +++ b/public/views/login.html @@ -0,0 +1,7 @@ +
+ +
diff --git a/src/router.js b/src/router.js index 9e90de9..160d44a 100644 --- a/src/router.js +++ b/src/router.js @@ -12,10 +12,10 @@ const authMiddleware = require('./middlewares/auth-middleware'); module.exports = (req, res, next) => { req.app.use('/', mainRoute); req.app.use('/api/authenticate', authRoute); + req.app.use('/cms/', cmsRoute); if (!config.DISABLE_AUTH) { req.app.use(authMiddleware); } - req.app.use('/cms', cmsRoute); req.app.use('/api/arenas', arenaRoute); req.app.use('/api/cards', cardRoute); req.app.use('/api/chests', chestRoute);