Luigi / foca-login

Commit c471375bbce220082a1438ece49e5024b939a521

Authored by Pablo Marco del Pont 2018-10-11 15:47:18 -0300

Merge branch 'master' into 'master'

Master(efernandez)

See merge request modulos-npm/foca-login!2

Showing 7 changed files Show diff stats

.gitignore

Diff comments View file @ c471375

1	/node_modules	1	/node_modules
2	/dist	2	/dist
3	/tmp	3	/tmp
4	package-lock\.json	4	package-lock\.json
		5	/src/etc/develop.js
5		6

gulpfile.js

Diff comments View file @ c471375

 const templateCache = require('gulp-angular-templatecache');
 const concat        = require('gulp-concat');
 const clean         = require('gulp-clean');
 const htmlmin       = require('gulp-htmlmin');
 const rename        = require('gulp-rename');
 const uglify        = require('gulp-uglify-es').default;
 const gulp          = require('gulp');
 const pump          = require('pump');
 const jshint        = require('gulp-jshint');
+const replace       = require('gulp-replace');
 var paths = {
     srcJS: 'src/js/*.js',
     srcViews: 'src/views/*.html',
     tmp:   'tmp',
     dist:  'dist/'
 };
 gulp.task('templates', function() {
     return pump(
         [
             gulp.src(paths.srcViews),
             htmlmin(),
             templateCache('views.js', {
                 module: 'focaLogin',
                 root: ''
             }),
             gulp.dest(paths.tmp)
         ]
     );
 });
 gulp.task('uglify', ['templates'], function() {
     return pump(
         [
             gulp.src([
                 paths.srcJS,
                 'tmp/views.js'
             ]),
             concat('foca-login.js'),
+            replace("['ngRoute', 'ngCookies']",'[]'),
+            replace('src/views/', ''),
             gulp.dest(paths.tmp),
             rename('foca-login.min.js'),
             uglify(),
             gulp.dest(paths.dist)
         ]
     );
 });
 gulp.task('clean', function() {
     return gulp.src(['tmp', 'dist'], {read: false})
     .pipe(clean());
 });
 gulp.task('pre-commit', function() {
     pump(
         [
             gulp.src(paths.srcJS),
             jshint('.jshintrc'),
             jshint.reporter('default'),
             jshint.reporter('fail')
         ]
     );
 });
 gulp.task('clean-post-install', function() {
     return gulp.src(['src', 'tmp', '.jshintrc','readme.md', '.gitignore', 'gulpfile.js',
                      'index.html'], {read: false})
     .pipe(clean());
 });
 gulp.task('compile', ['templates', 'uglify']);
 gulp.task('webserver', function() {
     pump [
         connect.server({port: 3000})
     ]
 });
 gulp.task('default', ['webserver']);

index.html

Diff comments View file @ c471375

File was created	1	<html ng-app="focaLogin">
	2	<head>
	3	<meta charset="UTF-8"/>
	4	<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
	5
	6	<!--CSS-->
	7	<link href="node_modules/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet"/>
	8	<link href="node_modules/font-awesome/css/font-awesome.min.css" rel="stylesheet"/>
	9
	10	<!--VENDOR JS-->
	11	<script src="node_modules/jquery/dist/jquery.min.js"></script>
	12	<script src="node_modules/bootstrap/dist/js/bootstrap.min.js"></script>
	13	<script src="node_modules/angular/angular.min.js"></script>
	14	<script src="node_modules/angular-route/angular-route.min.js"></script>
	15	<script src="node_modules/angular-cookies/angular-cookies.min.js"></script>
	16
	17	<script src="src/js/app.js"></script>
	18	<script src="src/js/route.js"></script>
	19	<script src="src/js/controller.js"></script>
	20	<script src="src/js/service.js"></script>
	21	<script src="src/etc/develop.js"></script>
	22	</head>
	23	<body ng-view>
	24
	25	</body>
	26	</html>
	27

package.json

Diff comments View file @ c471375

 {
     "name": "foca-login",
     "version": "0.0.1",
     "description": "Login",
     "main": "dist/foca-login.js",
     "scripts": {
         "test": "echo \"Error: no test specified\" && exit 1",
         "compile": "gulp compile",
         "gulp-pre-commit": "gulp pre-commit",
         "postinstall": "npm run compile && gulp clean-post-install",
-        "install-dev": "npm install -D gulp gulp-connect jasmine-core pre-commit angular bootstrap font-awesome gulp-angular-templatecache gulp-clean gulp-htmlmin gulp-jshint gulp-rename gulp-replace gulp-sequence gulp-uglify-es jquery jshint pump"
+        "install-dev": "npm install -D gulp gulp-connect jasmine-core pre-commit angular angular-route angular-cookies bootstrap font-awesome gulp-angular-templatecache gulp-clean gulp-htmlmin gulp-jshint gulp-rename gulp-replace gulp-sequence gulp-uglify-es gulp-replace jquery jshint pump"
     },
     "pre-commit": [
         "gulp-pre-commit"
     ],
     "repository": {
         "type": "git",
         "url": "https://192.168.0.11/modulos-npm/foca-login.git"
     },
     "author": "Foca Software",
     "license": "ISC",
     "peerDependencies": {
         "angular": "^1.7.x",
         "bootstrap": "^4.1.x",
         "jquery": "^3.3.x",
         "font-awesome": "^4.7.x",
         "gulp": "^3.9.x",
         "gulp-concat": "2.6.x",
         "gulp-jshint": "^2.1.x",
         "gulp-rename": "^1.4.x",
         "gulp-replace": "^1.0.x",
         "gulp-uglify-es": "^1.0.x",
         "jshint": "^2.9.x",
         "pump": "^3.0.x"
     },
     "devDependencies": {
-        "angular": "^1.7.4",
+        "angular": "^1.7.5",
+        "angular-cookies": "^1.7.5",
+        "angular-route": "^1.7.5",
         "bootstrap": "^4.1.3",
         "font-awesome": "^4.7.0",
         "gulp": "^3.9.1",
         "gulp-angular-templatecache": "^2.2.1",
         "gulp-clean": "^0.4.0",
         "gulp-connect": "^5.6.1",
         "gulp-htmlmin": "^5.0.1",
         "gulp-jshint": "^2.1.0",
         "gulp-rename": "^1.4.0",
         "gulp-replace": "^1.0.0",
         "gulp-sequence": "^1.0.0",
         "gulp-uglify-es": "^1.0.4",
         "jasmine-core": "^3.2.1",
         "jquery": "^3.3.1",
         "jshint": "^2.9.6",
         "pre-commit": "^1.2.2",
         "pump": "^3.0.0"
     }
 }

src/etc/develop.js.ejemplo

Diff comments View file @ c471375

File was created	1	angular.module('focaLogin')
	2	.constant("API_ENDPOINT", {
	3	'URL': 'http://192.168.0.23:9900'
	4	});
	5

src/js/app.js

Diff comments View file @ c471375

1	angular.module('focaLogin', [])	1	angular.module('focaLogin', ['ngRoute', 'ngCookies'])
2	.run(['$rootScope', '$cookies', '$location', function($rootScope, $cookies, $location) {	2	.run(['$rootScope', '$cookies', '$location', function($rootScope, $cookies, $location) {
3	$rootScope.$on('$locationChangeStart', function() {	3	$rootScope.$on('$locationChangeStart', function() {
4	var idUsuario = $cookies.get('idUsuario');	4	var idUsuario = $cookies.get('idUsuario');
5	if(!idUsuario) {	5	if(!idUsuario) {
6	if($location.path() !== '/login') {	6	if($location.path() !== '/login') {
7	$location.path('/login');	7	$location.path('/login');
8	}	8	}
9	}	9	}
10	});	10	});
11	}]);	11	}]);
12		12

src/js/route.js

Diff comments View file @ c471375

1	angular.module('focaLogin')	1	angular.module('focaLogin')
2	.config([	2	.config([
3	'$routeProvider',	3	'$routeProvider',
4	function($routeProvider) {	4	function($routeProvider) {
5	$routeProvider	5	$routeProvider
6	.when('/login', {	6	.when('/login', {
7	controller: 'focaLoginController',	7	controller: 'focaLoginController',
8	templateUrl: 'foca-login.html'	8	templateUrl: 'src/views/foca-login.html'
9	})	9	})
10	.when('/logout', {	10	.when('/logout', {
11	controller: 'focaLogoutController',	11	controller: 'focaLogoutController',
12	template: ''	12	template: ''
13	});	13	});
14	}	14	}
15	]);	15	]);
16		16