From 3a0ff332918d5475e3eefb3bdeb8a4643a730826 Mon Sep 17 00:00:00 2001 From: Quentin Dequippe Date: Thu, 10 Nov 2016 11:00:38 +0100 Subject: [PATCH] Create login module --- gulp/inject.js | 28 ++++++++++++++++++++++++---- src/app/app.js | 3 ++- src/app/login/LoginPageCtrl.js | 17 +++++++++++++++++ src/app/login/login.module.js | 10 ++++++++++ src/auth.html | 18 +++++++++++++++--- 5 files changed, 68 insertions(+), 8 deletions(-) create mode 100644 src/app/login/LoginPageCtrl.js create mode 100644 src/app/login/login.module.js diff --git a/gulp/inject.js b/gulp/inject.js index 05bf008..7aa3915 100644 --- a/gulp/inject.js +++ b/gulp/inject.js @@ -43,10 +43,30 @@ gulp.task('inject', ['scripts', 'styles', 'injectAuth', 'inject404', 'copyVendor }); gulp.task('injectAuth', ['stylesAuth'], function () { - return injectAlone({ - css: [path.join('!' + conf.paths.tmp, '/serve/app/vendor.css'), path.join(conf.paths.tmp, '/serve/app/auth.css')], - paths: [path.join(conf.paths.src, '/auth.html'), path.join(conf.paths.src, '/reg.html')] - }) + var injectStyles = gulp.src([ + path.join('!' + conf.paths.tmp, '/serve/app/vendor.css'), + path.join(conf.paths.tmp, '/serve/app/auth.css') + ], {read: false}); + + var injectScripts = gulp.src([ + path.join(conf.paths.src, '/assets/js/**/*.js'), + path.join(conf.paths.src, '/app/**/*.module.js'), + path.join(conf.paths.src, '/app/**/*.js'), + path.join('!' + conf.paths.src, '/app/**/*.spec.js'), + path.join('!' + conf.paths.src, '/app/**/*.mock.js'), + ]) + .on('error', conf.errorHandler('AngularFilesort')); + + var injectOptions = { + ignorePath: [conf.paths.src, path.join(conf.paths.tmp, '/serve')], + addRootSlash: false + }; + + return gulp.src(path.join(conf.paths.src, '/auth.html')) + .pipe($.inject(injectStyles, injectOptions)) + .pipe($.inject(injectScripts, injectOptions)) + .pipe(wiredep(_.extend({}, conf.wiredep))) + .pipe(gulp.dest(path.join(conf.paths.tmp, '/serve'))); }); gulp.task('inject404', ['styles404'], function () { diff --git a/src/app/app.js b/src/app/app.js index 4a34c74..f48055c 100644 --- a/src/app/app.js +++ b/src/app/app.js @@ -14,5 +14,6 @@ angular.module('BlurAdmin', [ 'angular-progress-button-styles', 'BlurAdmin.theme', - 'BlurAdmin.pages' + 'BlurAdmin.pages', + 'BlurAdmin.login' ]); \ No newline at end of file diff --git a/src/app/login/LoginPageCtrl.js b/src/app/login/LoginPageCtrl.js new file mode 100644 index 0000000..982100b --- /dev/null +++ b/src/app/login/LoginPageCtrl.js @@ -0,0 +1,17 @@ +/** + * @author qdequippe + * created on 10.11.2016 + */ +(function () { + 'use strict'; + + angular.module('BlurAdmin.login') + .controller('LoginPageCtrl', LoginPageCtrl); + + /** @ngInject */ + function LoginPageCtrl() { + var vm = this; + vm.email = 'me@example.com'; + } + +})(); diff --git a/src/app/login/login.module.js b/src/app/login/login.module.js new file mode 100644 index 0000000..6685ed6 --- /dev/null +++ b/src/app/login/login.module.js @@ -0,0 +1,10 @@ +/** + * @author v.lugovsky + * created on 16.12.2015 + */ +(function () { + 'use strict'; + + angular.module('BlurAdmin.login', []); + +})(); diff --git a/src/auth.html b/src/auth.html index 9a8aef9..7cbdfd4 100644 --- a/src/auth.html +++ b/src/auth.html @@ -1,5 +1,5 @@ - + @@ -26,9 +26,9 @@
-
+

Sign in to Blur Admin

- New to Blur Admin? Sign up! + New to Blur Admin? Sign up! {{vm.email}}
@@ -64,5 +64,17 @@
+ + + + + + + + + + + + \ No newline at end of file