Merge branch 'master' into 'master'

Va componente See merge request !1

Merge branch 'master' into 'master'
Va componente See merge request !1
Jose Pinto
2 parents 9a205bf6cb e62f3d0af2
Showing 9 changed files Show diff stats
.gitignore
.jshintrc
gulpfile.js
index.html
package.json
src/js/app.js
src/js/controller.js
src/js/service.js
src/views/nombre-empresa.html
@@ -0,0 +1,6 @@
+/node_modules
+/dist
+/tmp
+package-lock\.json
+src/etc/develop\.js
+/css
@@ -0,0 +1,64 @@
+{
+    /*
+     * ENVIRONMENTS
+     * =================
+     */
+
+    // Define globals exposed by modern browsers.
+    "browser": true,
+
+    // Define globals exposed by jQuery.
+    "jquery": true,
+
+    // Define globals exposed by Node.js.
+    "node": true,
+
+    // Allow ES6.
+    "esversion": 6,
+
+    /*
+     * ENFORCING OPTIONS
+     * =================
+     */
+
+    // Force all variable names to use either camelCase style or UPPER_CASE
+    // with underscores.
+    "camelcase": true,
+
+    // Prohibit use of == and != in favor of === and !==.
+    "eqeqeq": true,
+
+    // Enforce tab width of 2 spaces.
+    "indent": 4,
+
+    // Prohibit use of a variable before it is defined.
+    "latedef": true,
+
+    // Enforce line length to 100 characters
+    "maxlen": 100,
+
+    // Require capitalized names for constructor functions.
+    "newcap": true,
+
+    // Enforce use of single quotation marks for strings.
+    "quotmark": "single",
+
+    // Enforce placing 'use strict' at the top function scope
+    "strict": false,
+
+    // Prohibit use of explicitly undeclared variables.
+    "undef": true,
+
+    // Warn when variables are defined but never used.
+    "unused": true,
+
+    // Para que funcione en angular
+    "predef": ["angular", "alert", "spyOn", "expect", "it", "inject", "beforeEach", "describe"],
+    /*
+     * RELAXING OPTIONS
+     * =================
+     */
+
+    // Suppress warnings about == null comparisons.
+    "eqnull": true
+}
@@ -0,0 +1,95 @@
+const clean         = require('gulp-clean');
+const concat        = require('gulp-concat');
+const connect       = require('gulp-connect');
+const gulp          = require('gulp');
+const htmlmin       = require('gulp-htmlmin');
+const jshint        = require('gulp-jshint');
+const pump          = require('pump');
+const rename        = require('gulp-rename');
+const replace       = require('gulp-replace');
+const templateCache = require('gulp-angular-templatecache');
+const uglify        = require('gulp-uglify-es').default;
+const sass          = require('gulp-sass');
+
+var paths = {
+    dist:     'dist/',
+    srcJS:    'src/js/*.js',
+    srcViews: 'src/views/*.html',
+    tmp:      'tmp'
+};
+
+gulp.task('templates', function() {
+    return pump(
+        [
+            gulp.src(paths.srcViews),
+            htmlmin(),
+            templateCache('views.js', {
+                module: 'focaNombreEmpresa',
+                root: ''
+            }),
+            gulp.dest(paths.tmp)
+        ]
+    );
+});
+
+gulp.task('sass', function() {
+    return gulp.src('src/sass/*.scss')
+    .pipe(sass({outputStyle: 'compressed'}).on('error', sass.logError))
+    .pipe(gulp.dest('css'));
+});
+
+gulp.task('uglify', ['templates'], function() {
+    return pump(
+        [
+            gulp.src([
+                paths.srcJS,
+                'tmp/views.js'
+            ]),
+            concat('foca-nombre-empresa.js'),
+            replace('src/views/', ''),
+            replace("'ngSanitize', 'onScreenKeyboard'", ''),
+            gulp.dest(paths.tmp),
+            rename('foca-nombre-empresa.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('webserver', function() {
+    pump [
+        connect.server(
+            {
+                port: 3000
+            }
+        )
+    ]
+});
+
+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('default', ['webserver']);
+
+gulp.task('watch', function() {
+    gulp.watch([paths.srcJS, paths.srcViews], ['uglify']);
+});
@@ -0,0 +1,25 @@
+<html ng-app="focaModalEmpresa">
+    <head>
+        <meta charset="UTF-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+        
+        <!--CSS-->
+        <link href="node_modules/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet"/>
+        <link href="node_modules/font-awesome/css/font-awesome.min.css" rel="stylesheet"/>
+
+        <!--VENDOR JS-->
+        <script src="node_modules/jquery/dist/jquery.min.js"></script>
+        <script src="node_modules/bootstrap/dist/js/bootstrap.min.js"></script>
+        <script src="node_modules/angular/angular.min.js"></script>
+        <script src="node_modules/ui-bootstrap4/dist/ui-bootstrap-tpls.js"></script>
+
+        <!-- BUILD -->
+        <script src="src/js/app.js"></script>
+        <script src="src/js/controller.js"></script>        
+        <!-- /BUILD -->
+
+    </head>
+    <body>
+        <foca-nombre-empresa>
+    </body>
+</html>
@@ -0,0 +1,52 @@
+{
+  "name": "foca-nombre-empresa",
+  "version": "0.0.1",
+  "description": "Componente de nombre de la empresa",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "compile": "gulp uglify",
+    "gulp-pre-commit": "gulp pre-commit",
+    "postinstall": "npm run compile && gulp clean-post-install",
+    "install-dev": "npm install -D angular bootstrap font-awesome gulp gulp-angular-templatecache gulp-clean gulp-concat gulp-connect gulp-htmlmin gulp-jshint gulp-rename gulp-replace gulp-uglify-es jasmine-core jquery jshint pre-commit pump && npm install angular-sanitize"
+  },
+  "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.5",
+    "angular-route": "^1.7.5",
+    "angular-sanitize": "1.7.5",
+    "bootstrap": "4.1.3",
+    "font-awesome": "4.7.0",
+    "gulp": "3.9.1",
+    "gulp-angular-templatecache": "2.2.5",
+    "gulp-clean": "0.4.0",
+    "gulp-concat": "2.6.1",
+    "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-sass": "4.0.2",
+    "gulp-uglify-es": "1.0.4",
+    "jasmine-core": "3.3.0",
+    "jquery": "3.3.1",
+    "jshint": "2.9.6",
+    "pre-commit": "1.2.2",
+    "pump": "3.0.0"
+  }
+}
@@ -0,0 +1,5 @@
+angular.module('focaNombreEmpresa', [])
+    .component('focaNombreEmpresa', {
+        templateUrl: 'src/views/nombre-empresa.html',
+        controller: 'focaNombreEmpresaController'
+    });
@@ -0,0 +1,19 @@
+angular.module('focaNombreEmpresa')
+    .controller('focaNombreEmpresaController', [
+        '$scope',
+        'focaNombreEmpresaService',
+        function($scope, focaNombreEmpresaService) {
+            $scope.nombre = '';
+            $scope.direccion = '';
+
+            var init = function() {
+                //ID EMPRESA HARDCODEADO
+                focaNombreEmpresaService.getEmpresa(1).then(function(res) {
+                    $scope.nombre = res.data.NOM;
+                    $scope.direccion = res.data.DIR;
+                });
+            };
+
+            init();
+    }]);
+    
 \ No newline at end of file
@@ -0,0 +1,13 @@
+angular.module('focaNombreEmpresa')
+    .service('focaNombreEmpresaService', [
+        '$http',
+        'API_ENDPOINT',
+        function($http, API_ENDPOINT) {
+            return {
+                getEmpresa: function(id) {
+                    return $http.get(API_ENDPOINT.URL + '/empresa/' + id);
+                }
+            };
+        }
+    ]);
+    
 \ No newline at end of file
@@ -0,0 +1,10 @@
+<div class="container">
+    <div class="row">
+        <div class="col-md-6">
+            <h5 class="text-left">{{nombre}}</h5>
+        </div>
+        <div class="col-md-6">
+            <h5 class="text-right">{{direccion}}</h5>
+        </div>
+    </div>
+</div>
...	...	@@ -0,0 +1,6 @@
	1	+/node_modules
	2	+/dist
	3	+/tmp
	4	+package-lock\.json
	5	+src/etc/develop\.js
	6	+/css
...	...	@@ -0,0 +1,64 @@
	1	+{
	2	+ /*
	3	+ * ENVIRONMENTS
	4	+ * =================
	5	+ */
	6	+
	7	+ // Define globals exposed by modern browsers.
	8	+ "browser": true,
	9	+
	10	+ // Define globals exposed by jQuery.
	11	+ "jquery": true,
	12	+
	13	+ // Define globals exposed by Node.js.
	14	+ "node": true,
	15	+
	16	+ // Allow ES6.
	17	+ "esversion": 6,
	18	+
	19	+ /*
	20	+ * ENFORCING OPTIONS
	21	+ * =================
	22	+ */
	23	+
	24	+ // Force all variable names to use either camelCase style or UPPER_CASE
	25	+ // with underscores.
	26	+ "camelcase": true,
	27	+
	28	+ // Prohibit use of == and != in favor of === and !==.
	29	+ "eqeqeq": true,
	30	+
	31	+ // Enforce tab width of 2 spaces.
	32	+ "indent": 4,
	33	+
	34	+ // Prohibit use of a variable before it is defined.
	35	+ "latedef": true,
	36	+
	37	+ // Enforce line length to 100 characters
	38	+ "maxlen": 100,
	39	+
	40	+ // Require capitalized names for constructor functions.
	41	+ "newcap": true,
	42	+
	43	+ // Enforce use of single quotation marks for strings.
	44	+ "quotmark": "single",
	45	+
	46	+ // Enforce placing 'use strict' at the top function scope
	47	+ "strict": false,
	48	+
	49	+ // Prohibit use of explicitly undeclared variables.
	50	+ "undef": true,
	51	+
	52	+ // Warn when variables are defined but never used.
	53	+ "unused": true,
	54	+
	55	+ // Para que funcione en angular
	56	+ "predef": ["angular", "alert", "spyOn", "expect", "it", "inject", "beforeEach", "describe"],
	57	+ /*
	58	+ * RELAXING OPTIONS
	59	+ * =================
	60	+ */
	61	+
	62	+ // Suppress warnings about == null comparisons.
	63	+ "eqnull": true
	64	+}
...	...	@@ -0,0 +1,95 @@
	1	+const clean = require('gulp-clean');
	2	+const concat = require('gulp-concat');
	3	+const connect = require('gulp-connect');
	4	+const gulp = require('gulp');
	5	+const htmlmin = require('gulp-htmlmin');
	6	+const jshint = require('gulp-jshint');
	7	+const pump = require('pump');
	8	+const rename = require('gulp-rename');
	9	+const replace = require('gulp-replace');
	10	+const templateCache = require('gulp-angular-templatecache');
	11	+const uglify = require('gulp-uglify-es').default;
	12	+const sass = require('gulp-sass');
	13	+
	14	+var paths = {
	15	+ dist: 'dist/',
	16	+ srcJS: 'src/js/*.js',
	17	+ srcViews: 'src/views/*.html',
	18	+ tmp: 'tmp'
	19	+};
	20	+
	21	+gulp.task('templates', function() {
	22	+ return pump(
	23	+ [
	24	+ gulp.src(paths.srcViews),
	25	+ htmlmin(),
	26	+ templateCache('views.js', {
	27	+ module: 'focaNombreEmpresa',
	28	+ root: ''
	29	+ }),
	30	+ gulp.dest(paths.tmp)
	31	+ ]
	32	+ );
	33	+});
	34	+
	35	+gulp.task('sass', function() {
	36	+ return gulp.src('src/sass/*.scss')
	37	+ .pipe(sass({outputStyle: 'compressed'}).on('error', sass.logError))
	38	+ .pipe(gulp.dest('css'));
	39	+});
	40	+
	41	+gulp.task('uglify', ['templates'], function() {
	42	+ return pump(
	43	+ [
	44	+ gulp.src([
	45	+ paths.srcJS,
	46	+ 'tmp/views.js'
	47	+ ]),
	48	+ concat('foca-nombre-empresa.js'),
	49	+ replace('src/views/', ''),
	50	+ replace("'ngSanitize', 'onScreenKeyboard'", ''),
	51	+ gulp.dest(paths.tmp),
	52	+ rename('foca-nombre-empresa.min.js'),
	53	+ uglify(),
	54	+ gulp.dest(paths.dist)
	55	+ ]
	56	+ );
	57	+});
	58	+
	59	+gulp.task('clean', function() {
	60	+ return gulp.src(['tmp', 'dist'], {read: false})
	61	+ .pipe(clean());
	62	+});
	63	+
	64	+gulp.task('pre-commit', function() {
	65	+ pump(
	66	+ [
	67	+ gulp.src(paths.srcJS),
	68	+ jshint('.jshintrc'),
	69	+ jshint.reporter('default'),
	70	+ jshint.reporter('fail')
	71	+ ]
	72	+ );
	73	+});
	74	+
	75	+gulp.task('webserver', function() {
	76	+ pump [
	77	+ connect.server(
	78	+ {
	79	+ port: 3000
	80	+ }
	81	+ )
	82	+ ]
	83	+});
	84	+
	85	+gulp.task('clean-post-install', function() {
	86	+ return gulp.src(['src', 'tmp', '.jshintrc','readme.md', '.gitignore', 'gulpfile.js',
	87	+ 'index.html'], {read: false})
	88	+ .pipe(clean());
	89	+});
	90	+
	91	+gulp.task('default', ['webserver']);
	92	+
	93	+gulp.task('watch', function() {
	94	+ gulp.watch([paths.srcJS, paths.srcViews], ['uglify']);
	95	+});
...	...	@@ -0,0 +1,25 @@
	1	+<html ng-app="focaModalEmpresa">
	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/ui-bootstrap4/dist/ui-bootstrap-tpls.js"></script>
	15	+
	16	+ <!-- BUILD -->
	17	+ <script src="src/js/app.js"></script>
	18	+ <script src="src/js/controller.js"></script>
	19	+ <!-- /BUILD -->
	20	+
	21	+ </head>
	22	+ <body>
	23	+ <foca-nombre-empresa>
	24	+ </body>
	25	+</html>
...	...	@@ -0,0 +1,52 @@
	1	+{
	2	+ "name": "foca-nombre-empresa",
	3	+ "version": "0.0.1",
	4	+ "description": "Componente de nombre de la empresa",
	5	+ "main": "index.js",
	6	+ "scripts": {
	7	+ "test": "echo \"Error: no test specified\" && exit 1",
	8	+ "compile": "gulp uglify",
	9	+ "gulp-pre-commit": "gulp pre-commit",
	10	+ "postinstall": "npm run compile && gulp clean-post-install",
	11	+ "install-dev": "npm install -D angular bootstrap font-awesome gulp gulp-angular-templatecache gulp-clean gulp-concat gulp-connect gulp-htmlmin gulp-jshint gulp-rename gulp-replace gulp-uglify-es jasmine-core jquery jshint pre-commit pump && npm install angular-sanitize"
	12	+ },
	13	+ "author": "Foca Software",
	14	+ "license": "ISC",
	15	+ "peerDependencies": {
	16	+ "angular": "^1.7.x",
	17	+ "bootstrap": "^4.1.x",
	18	+ "jquery": "^3.3.x",
	19	+ "font-awesome": "^4.7.x",
	20	+ "gulp": "^3.9.x",
	21	+ "gulp-concat": "2.6.x",
	22	+ "gulp-jshint": "^2.1.x",
	23	+ "gulp-rename": "^1.4.x",
	24	+ "gulp-replace": "^1.0.x",
	25	+ "gulp-uglify-es": "^1.0.x",
	26	+ "jshint": "^2.9.x",
	27	+ "pump": "^3.0.x"
	28	+ },
	29	+ "devDependencies": {
	30	+ "angular": "1.7.5",
	31	+ "angular-route": "^1.7.5",
	32	+ "angular-sanitize": "1.7.5",
	33	+ "bootstrap": "4.1.3",
	34	+ "font-awesome": "4.7.0",
	35	+ "gulp": "3.9.1",
	36	+ "gulp-angular-templatecache": "2.2.5",
	37	+ "gulp-clean": "0.4.0",
	38	+ "gulp-concat": "2.6.1",
	39	+ "gulp-connect": "5.6.1",
	40	+ "gulp-htmlmin": "5.0.1",
	41	+ "gulp-jshint": "2.1.0",
	42	+ "gulp-rename": "1.4.0",
	43	+ "gulp-replace": "1.0.0",
	44	+ "gulp-sass": "4.0.2",
	45	+ "gulp-uglify-es": "1.0.4",
	46	+ "jasmine-core": "3.3.0",
	47	+ "jquery": "3.3.1",
	48	+ "jshint": "2.9.6",
	49	+ "pre-commit": "1.2.2",
	50	+ "pump": "3.0.0"
	51	+ }
	52	+}
...	...	@@ -0,0 +1,5 @@
	1	+angular.module('focaNombreEmpresa', [])
	2	+ .component('focaNombreEmpresa', {
	3	+ templateUrl: 'src/views/nombre-empresa.html',
	4	+ controller: 'focaNombreEmpresaController'
	5	+ });
...	...	@@ -0,0 +1,19 @@
	1	+angular.module('focaNombreEmpresa')
	2	+ .controller('focaNombreEmpresaController', [
	3	+ '$scope',
	4	+ 'focaNombreEmpresaService',
	5	+ function($scope, focaNombreEmpresaService) {
	6	+ $scope.nombre = '';
	7	+ $scope.direccion = '';
	8	+
	9	+ var init = function() {
	10	+ //ID EMPRESA HARDCODEADO
	11	+ focaNombreEmpresaService.getEmpresa(1).then(function(res) {
	12	+ $scope.nombre = res.data.NOM;
	13	+ $scope.direccion = res.data.DIR;
	14	+ });
	15	+ };
	16	+
	17	+ init();
	18	+ }]);
	19	+
0	20	\ No newline at end of file
...	...	@@ -0,0 +1,13 @@
	1	+angular.module('focaNombreEmpresa')
	2	+ .service('focaNombreEmpresaService', [
	3	+ '$http',
	4	+ 'API_ENDPOINT',
	5	+ function($http, API_ENDPOINT) {
	6	+ return {
	7	+ getEmpresa: function(id) {
	8	+ return $http.get(API_ENDPOINT.URL + '/empresa/' + id);
	9	+ }
	10	+ };
	11	+ }
	12	+ ]);
	13	+
0	14	\ No newline at end of file
...	...	@@ -0,0 +1,10 @@
	1	+<div class="container">
	2	+ <div class="row">
	3	+ <div class="col-md-6">
	4	+ <h5 class="text-left">{{nombre}}</h5>
	5	+ </div>
	6	+ <div class="col-md-6">
	7	+ <h5 class="text-right">{{direccion}}</h5>
	8	+ </div>
	9	+ </div>
	10	+</div>