jinql
/
blur-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge 3a0ff33291 into 837cab6ec9

pull/198/merge
Quentin Dequippe 2018-04-13 08:42:52 +00:00 committed by GitHub
parent 837cab6ec9 3a0ff33291
commit efaefa010e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 68 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
gulp/inject.js
View File

@ -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 () {

3
src/app/app.js
View File

@ -14,5 +14,6 @@ angular.module('BlurAdmin', [
'angular-progress-button-styles',
'BlurAdmin.theme',
'BlurAdmin.pages'
'BlurAdmin.pages',
'BlurAdmin.login'
]);

17
src/app/login/LoginPageCtrl.js Normal file
View File

@ -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';
}
})();

10
src/app/login/login.module.js Normal file
View File

@ -0,0 +1,10 @@
/**
* @author v.lugovsky
* created on 16.12.2015
*/
(function () {
'use strict';
angular.module('BlurAdmin.login', []);
})();

18
src/auth.html
View File

@ -1,5 +1,5 @@
<!DOCTYPE html>
<html lang="en">
<html lang="en" ng-app="BlurAdmin.login">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
@ -26,9 +26,9 @@
</head>
<body>
<main class="auth-main">
<div class="auth-block">
<div class="auth-block" ng-controller="LoginPageCtrl as vm">
<h1>Sign in to Blur Admin</h1>
<a href="reg.html" class="auth-link">New to Blur Admin? Sign up!</a>
<a href="reg.html" class="auth-link">New to Blur Admin? Sign up! {{vm.email}}</a>
<form class="form-horizontal">
<div class="form-group">
@ -64,5 +64,17 @@
</div>
</div>
</main>
<!-- build:js(src) scripts/vendor.js -->
<!-- bower:js -->
<!-- run `gulp inject` to automatically populate bower script dependencies -->
<!-- endbower -->
<!-- endbuild -->
<!-- build:js({.tmp/serve,.tmp/partials,src}) scripts/app.js -->
<!-- inject:js -->
<!-- js files will be automatically insert here -->
<!-- endinject -->
</body>
</html>