Merge branch 'master' into 'master'

Primera version See merge request !1

Merge branch 'master' into 'master'
Primera version See merge request !1
Nicolás Guarnieri
2 parents 3592ff6034 8095aed574
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/botonera-lateral.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,94 @@
+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: 'focaBotoneraLateral',
+                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-botonera-lateral.js'),
+            replace('src/views/', ''),
+            gulp.dest(paths.tmp),
+            rename('foca-botonera-lateral.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="focaBotoneraLateral">
+    <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-botonera-lateral>
+    </body>
+</html>
@@ -0,0 +1,59 @@
+{
+  "name": "foca-botonera-lateral",
+  "version": "0.0.1",
+  "description": "Componente de botonera lateral",
+  "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"
+  },
+  "pre-commit": [
+    "gulp-pre-commit"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "git+ssh://git@debonline.dyndns.org:npm/foca-botonera-lateral.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.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('focaBotoneraLateral', [])
+    .component('focaBotoneraLateral', {
+        templateUrl: 'src/views/botonera-lateral.html',
+        controller: 'focaBotoneraLateralController'
+    });
@@ -0,0 +1,17 @@
+angular.module('focaBotoneraLateral')
+    .controller('focaBotoneraLateralController', [
+        '$scope',
+        '$location',
+        'focaBotoneraLateralService',
+        function($scope, $location, focaBotoneraLateralService) {
+
+            $scope.service = focaBotoneraLateralService.variables;
+
+            $scope.cambioUsoTeclado = function() {
+                $scope.$parent.cambioUsoTeclado();
+            };
+
+            $scope.salir = function() {
+                $location.path('/');
+            };
+    }]);
@@ -0,0 +1,22 @@
+angular.module('focaBotoneraLateral')
+    .service('focaBotoneraLateralService', function() {
+
+        this.variables = {
+            salir: false,
+            pausar: false,
+            guardar: false,
+            funcionGuardar: undefined
+        };
+
+        this.showSalir = function(value) {
+            this.variables.salir = value;
+        };
+        this.showPausar = function(value) {
+            this.variables.pausar = value;
+        };
+        this.showGuardar = function(value, funcion) {
+            this.variables.guardar = value;
+            if(value) this.variables.funcionGuardar = funcion;
+        };
+
+    });
@@ -0,0 +1,42 @@
+<div class="container botonera-lateral">
+    <div class="row">
+        <button
+            ng-click="service.funcionGuardar()"
+            ng-show="service.guardar"
+            type="button"
+            title="Salir"
+            class="btn btn-block border border-dark">
+            <strong>GUARDAR</strong>
+        </button>
+        <button
+            ng-show="service.pausar"
+            type="button"
+            title="Salir"
+            class="btn btn-block border border-dark">
+            <strong>PAUSAR</strong>
+        </button>
+        <button
+            ng-click="salir()"
+            ng-show="service.salir"
+            type="button"
+            title="Salir"
+            class="btn btn-block border border-dark">
+            <strong>SALIR</strong>
+        </button>
+        <div
+            class="btn-group-toggle btn btn-block btn-default border border-dark"
+            data-toggle="buttons"
+            ng-click="cambioUsoTeclado()"
+            title="Activar/desactivar teclado">
+            <label
+                class=" active boton-activar-teclado mb-0"
+                ng-class="{'teclado-activar': usarTeclado}">
+                <input
+                    type="checkbox"
+                    autocomplete="off"
+                    >
+                    <strong>TECLADO</strong>
+            </label>
+        </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,94 @@
	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: 'focaBotoneraLateral',
	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-botonera-lateral.js'),
	49	+ replace('src/views/', ''),
	50	+ gulp.dest(paths.tmp),
	51	+ rename('foca-botonera-lateral.min.js'),
	52	+ uglify(),
	53	+ gulp.dest(paths.dist)
	54	+ ]
	55	+ );
	56	+});
	57	+
	58	+gulp.task('clean', function() {
	59	+ return gulp.src(['tmp', 'dist'], {read: false})
	60	+ .pipe(clean());
	61	+});
	62	+
	63	+gulp.task('pre-commit', function() {
	64	+ pump(
	65	+ [
	66	+ gulp.src(paths.srcJS),
	67	+ jshint('.jshintrc'),
	68	+ jshint.reporter('default'),
	69	+ jshint.reporter('fail')
	70	+ ]
	71	+ );
	72	+});
	73	+
	74	+gulp.task('webserver', function() {
	75	+ pump [
	76	+ connect.server(
	77	+ {
	78	+ port: 3000
	79	+ }
	80	+ )
	81	+ ]
	82	+});
	83	+
	84	+gulp.task('clean-post-install', function() {
	85	+ return gulp.src(['src', 'tmp', '.jshintrc','readme.md', '.gitignore', 'gulpfile.js',
	86	+ 'index.html'], {read: false})
	87	+ .pipe(clean());
	88	+});
	89	+
	90	+gulp.task('default', ['webserver']);
	91	+
	92	+gulp.task('watch', function() {
	93	+ gulp.watch([paths.srcJS, paths.srcViews], ['uglify']);
	94	+});
...	...	@@ -0,0 +1,25 @@
	1	+<html ng-app="focaBotoneraLateral">
	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-botonera-lateral>
	24	+ </body>
	25	+</html>
...	...	@@ -0,0 +1,59 @@
	1	+{
	2	+ "name": "foca-botonera-lateral",
	3	+ "version": "0.0.1",
	4	+ "description": "Componente de botonera lateral",
	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	+ "pre-commit": [
	14	+ "gulp-pre-commit"
	15	+ ],
	16	+ "repository": {
	17	+ "type": "git",
	18	+ "url": "git+ssh://git@debonline.dyndns.org:npm/foca-botonera-lateral.git"
	19	+ },
	20	+ "author": "Foca Software",
	21	+ "license": "ISC",
	22	+ "peerDependencies": {
	23	+ "angular": "^1.7.x",
	24	+ "bootstrap": "^4.1.x",
	25	+ "jquery": "^3.3.x",
	26	+ "font-awesome": "^4.7.x",
	27	+ "gulp": "^3.9.x",
	28	+ "gulp-concat": "2.6.x",
	29	+ "gulp-jshint": "^2.1.x",
	30	+ "gulp-rename": "^1.4.x",
	31	+ "gulp-replace": "^1.0.x",
	32	+ "gulp-uglify-es": "^1.0.x",
	33	+ "jshint": "^2.9.x",
	34	+ "pump": "^3.0.x"
	35	+ },
	36	+ "devDependencies": {
	37	+ "angular": "1.7.5",
	38	+ "angular-route": "^1.7.5",
	39	+ "angular-sanitize": "1.7.5",
	40	+ "bootstrap": "4.1.3",
	41	+ "font-awesome": "4.7.0",
	42	+ "gulp": "3.9.1",
	43	+ "gulp-angular-templatecache": "2.2.5",
	44	+ "gulp-clean": "0.4.0",
	45	+ "gulp-concat": "2.6.1",
	46	+ "gulp-connect": "5.6.1",
	47	+ "gulp-htmlmin": "5.0.1",
	48	+ "gulp-jshint": "2.1.0",
	49	+ "gulp-rename": "1.4.0",
	50	+ "gulp-replace": "1.0.0",
	51	+ "gulp-sass": "4.0.2",
	52	+ "gulp-uglify-es": "1.0.4",
	53	+ "jasmine-core": "3.3.0",
	54	+ "jquery": "3.3.1",
	55	+ "jshint": "2.9.6",
	56	+ "pre-commit": "1.2.2",
	57	+ "pump": "3.0.0"
	58	+ }
	59	+}
...	...	@@ -0,0 +1,5 @@
	1	+angular.module('focaBotoneraLateral', [])
	2	+ .component('focaBotoneraLateral', {
	3	+ templateUrl: 'src/views/botonera-lateral.html',
	4	+ controller: 'focaBotoneraLateralController'
	5	+ });
...	...	@@ -0,0 +1,17 @@
	1	+angular.module('focaBotoneraLateral')
	2	+ .controller('focaBotoneraLateralController', [
	3	+ '$scope',
	4	+ '$location',
	5	+ 'focaBotoneraLateralService',
	6	+ function($scope, $location, focaBotoneraLateralService) {
	7	+
	8	+ $scope.service = focaBotoneraLateralService.variables;
	9	+
	10	+ $scope.cambioUsoTeclado = function() {
	11	+ $scope.$parent.cambioUsoTeclado();
	12	+ };
	13	+
	14	+ $scope.salir = function() {
	15	+ $location.path('/');
	16	+ };
	17	+ }]);
...	...	@@ -0,0 +1,22 @@
	1	+angular.module('focaBotoneraLateral')
	2	+ .service('focaBotoneraLateralService', function() {
	3	+
	4	+ this.variables = {
	5	+ salir: false,
	6	+ pausar: false,
	7	+ guardar: false,
	8	+ funcionGuardar: undefined
	9	+ };
	10	+
	11	+ this.showSalir = function(value) {
	12	+ this.variables.salir = value;
	13	+ };
	14	+ this.showPausar = function(value) {
	15	+ this.variables.pausar = value;
	16	+ };
	17	+ this.showGuardar = function(value, funcion) {
	18	+ this.variables.guardar = value;
	19	+ if(value) this.variables.funcionGuardar = funcion;
	20	+ };
	21	+
	22	+ });
...	...	@@ -0,0 +1,42 @@
	1	+<div class="container botonera-lateral">
	2	+ <div class="row">
	3	+ <button
	4	+ ng-click="service.funcionGuardar()"
	5	+ ng-show="service.guardar"
	6	+ type="button"
	7	+ title="Salir"
	8	+ class="btn btn-block border border-dark">
	9	+ <strong>GUARDAR</strong>
	10	+ </button>
	11	+ <button
	12	+ ng-show="service.pausar"
	13	+ type="button"
	14	+ title="Salir"
	15	+ class="btn btn-block border border-dark">
	16	+ <strong>PAUSAR</strong>
	17	+ </button>
	18	+ <button
	19	+ ng-click="salir()"
	20	+ ng-show="service.salir"
	21	+ type="button"
	22	+ title="Salir"
	23	+ class="btn btn-block border border-dark">
	24	+ <strong>SALIR</strong>
	25	+ </button>
	26	+ <div
	27	+ class="btn-group-toggle btn btn-block btn-default border border-dark"
	28	+ data-toggle="buttons"
	29	+ ng-click="cambioUsoTeclado()"
	30	+ title="Activar/desactivar teclado">
	31	+ <label
	32	+ class=" active boton-activar-teclado mb-0"
	33	+ ng-class="{'teclado-activar': usarTeclado}">
	34	+ <input
	35	+ type="checkbox"
	36	+ autocomplete="off"
	37	+ >
	38	+ <strong>TECLADO</strong>
	39	+ </label>
	40	+ </div>
	41	+ </div>
	42	+</div>