Luigi / wrapper-demo

Commit c5d726bb67c743e1b0de2905548e45c124a545e0

Authored by Pablo Marco del Pont 2018-11-02 15:13:38 -0300

Exists in master

Merge branch 'master' into 'master'

Master ( pmarco)

See merge request Wrappers/wrapper-demo!28

Showing 4 changed files Show diff stats

gulpfile.js

Diff comments View file @ c5d726b

 const gulp    = require('gulp');
 const sass    = require('gulp-sass');
 const concat  = require('gulp-concat');
 const rename  = require('gulp-rename');
 const uglify  = require('gulp-uglify');
 const pump    = require('pump');
 const jshint  = require('gulp-jshint');
 const replace = require('gulp-replace');
 const connect = require('gulp-connect');
 const watch   = require('gulp-watch');
 var paths = {
     srcHTML  : 'src/views/*.html',
     srcJS    : 'src/js/*.js',
+    confJS   : 'src/etc/develop.js',
     dist     : 'dist/',
     distHTML : 'dist/views/'
 };
 gulp.task('uglify', function() {
     pump(
         [
-            gulp.src(paths.srcJS),
+            gulp.src([paths.srcJS, paths.confJS]),
             concat('wrapper-demo.js'),
             replace('/src/', '/dist/'),
             gulp.dest(paths.dist),
             rename('wrapper-demo.min.js'),
             uglify(),
             gulp.dest(paths.dist)
         ]
     );
 });
 gulp.task('html', function() {
     pump([
         gulp.src('index.html'),
         replace(/\<!\-\- BUILD \-\-\>.*\<!\-\- \/BUILD \-\-\>/sgm, '<script src="wrapper-demo.min.js"></script>'),
         gulp.dest(paths.dist)
     ]);
     pump([
         gulp.src(paths.srcHTML),
         gulp.dest(paths.distHTML)
     ]);
 })
 gulp.task('sass', function() {
         return gulp.src('src/sass/*.scss')
         .pipe(sass({outputStyle: 'compressed'}).on('error', sass.logError))
         .pipe(gulp.dest('css'));
 });
 gulp.task('pre-commit', function() {
     pump(
         [
             gulp.src(paths.srcJS),
             jshint('.jshintrc'),
             jshint.reporter('default'),
             jshint.reporter('fail')
         ]
     );
     gulp.start('uglify');
     gulp.start('sass');
 });
 gulp.task('webserver', function() {
     pump [
         connect.server(
             {
                 port: 3000,
                 host: '0.0.0.0',
                 livereload: true
             }
         )
     ]
 });
 gulp.task('watch', function() {
     gulp.watch([paths.srcJS], ['uglify']);
     gulp.watch('src/sass/*.scss', ['sass']);
 })
 gulp.task('reload'), function() {
     connect.reload();
 }
 gulp.task('livereload', function() {
     gulp.watch('css/*.css', ['reload']);
     gulp.watch('js/dist/*.js', ['reload']);
     gulp.watch('vistas/**/*.html', ['reload']);
 });
 gulp.task('default', ['webserver', 'livereload', 'watch']);

index.html

Diff comments View file @ c5d726b

 <html ng-app="appWrapperDemo">
     <head>
         <meta charset="UTF-8"/>
         <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
         <base href="./">
         <!--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"/>
         <link rel="stylesheet" href="node_modules/angular-ui-swiper/dist/angular-ui-swiper.css">
         <link href="./node_modules/ladda/dist/ladda-themeless.min.css" rel="stylesheet">
         <link href="css/general.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/angular-route/angular-route.min.js"></script>
         <script src="./node_modules/angular-cookies/angular-cookies.min.js"></script>
         <script src="./node_modules/ui-bootstrap4/dist/ui-bootstrap-tpls.js"></script>
         <script src="./node_modules/angular-on-screen-keyboard/dist/angular-on-screen-keyboard.min.js"></script>
         <script src="./node_modules/angular-sanitize/angular-sanitize.min.js"></script>
         <script src="./node_modules/angular-i18n/angular-locale_es-ar.js"></script>
         <script src="./node_modules/angular-ui-swiper/dist/angular-ui-swiper.js"></script>
         <script src="./node_modules/ladda/dist/spin.min.js"></script>
         <script src="./node_modules/ladda/dist/ladda.min.js"></script>
         <script src="./node_modules/angular-ladda/dist/angular-ladda.min.js"></script>
+        <script src="./vendor/cordovaGeolocationModule.min.js"></script>
         <script src="./node_modules/foca-directivas/dist/foca-directivas.min.js"></script>
         <script src="./node_modules/foca-botonera-principal/dist/foca-botonera-principal.min.js"></script>
         <script src="./node_modules/foca-turno-apertura/dist/foca-turno-apertura.min.js"></script>
         <script src="./node_modules/foca-abm-plazo-pago/dist/foca-abm-plazo-pago.min.js"></script>
         <script src="./node_modules/foca-abm-precios-condiciones/dist/foca-abm-precios-condiciones.min.js"></script>
         <script src="./node_modules/foca-abm-sectores/dist/foca-abm-sectores.min.js"></script>
         <script src="./node_modules/foca-crear-nota-pedido/dist/foca-crear-nota-pedido.min.js"></script>
         <script src="./node_modules/foca-login/dist/foca-login.min.js"></script>
         <script src="./node_modules/foca-modal/dist/foca-modal.min.js"></script>
         <script src="./node_modules/foca-modal-busqueda-productos/dist/foca-busqueda-productos.min.js"></script>
         <script src="./node_modules/foca-modal-cotizacion/dist/foca-modal-cotizacion.min.js"></script>
         <script src="./node_modules/foca-modal-flete/dist/foca-modal-flete.min.js"></script>
         <script src="./node_modules/foca-modal-moneda/dist/foca-modal-moneda.min.js"></script>
         <script src="./node_modules/foca-modal-precio-condiciones/dist/foca-modal-precio-condiciones.min.js"></script>
         <script src="./node_modules/foca-modal-proveedor/dist/foca-modal-proveedor.min.js"></script>
         <script src="./node_modules/foca-modal-vendedores/dist/foca-modal-vendedores.min.js"></script>
         <script src="./node_modules/foca-busqueda-cliente/dist/foca-busqueda-cliente.min.js"></script>
         <script src="./node_modules/foca-teclado/dist/foca-teclado.min.js"></script>
         <script src="./node_modules/foca-modal-domicilio/dist/foca-modal-domicilios.min.js"></script>
+        <script src="./node_modules/foca-seguimiento/dist/foca-seguimiento.min.js"></script>
+        <!-- <script src="cordova.js"></script> -->
-        <!-- BUILD -->
+        <!-- <script src="./dist/wrapper-demo.min.js"></script> -->
         <script src="./src/js/app.js"></script>
         <script src="./src/js/controller.js"></script>
         <script src="./src/etc/develop.js"></script>
-        <!-- /BUILD -->
     </head>
     <body>
         <style>
         </style>
         <botonera-horizontal></botonera-horizontal>
         <div ng-view class="container contenedor"></div>
         <div ng-controller="appWrapperDemoController" class="container d-none d-md-block">
             <div
                 class="btn-group-toggle"
                 data-toggle="buttons"
                 ng-click="mostrarTeclado = !mostrarTeclado">
                 <label
                     class="btn btn-secondary active boton-activar-teclado"
                     ng-class="{'teclado-activar': mostrarTeclado}">
                     <input
                         type="checkbox"
                         autocomplete="off"
                         >
                         <i class="fa fa-keyboard-o fa-3x" aria-hidden="true"></i>
                 </label>
             </div>
             <foca-teclado
                 ng-show="mostrarTeclado && hasFocus"
                 alfanumeric="true"
                 numeric="true"
                 >
             </foca-teclado>
         </div>
     </body>

src/js/app.js

Diff comments View file @ c5d726b

 angular.module('appWrapperDemo', [
     'angular-ladda',
     'ngCookies',
     'ngRoute',
     'ui.bootstrap',
     'ui.swiper',
     'focaAbmPlazoPago',
     'focaAbmPreciosCondiciones',
     'focaAbmSectores',
     'focaBotoneraPrincipal',
     'focaBusquedaCliente',
     'focaBusquedaProductos',
     'focaCrearNotaPedido',
     'focaDirectivas',
     'focaLogin',
     'focaModal',
     'focaModalCotizacion',
     'focaModalFlete',
     'focaModalMoneda',
     'focaModalPrecioCondicion',
     'focaModalProveedor',
     'focaModalVendedores',
     'focaTeclado',
     'focaTurnoApertura',
     'ngSanitize',
     'onScreenKeyboard',
-    'focaModalDomicilio'
+    'focaModalDomicilio',
+    'cordovaGeolocationModule',
+    'focaSeguimiento'
 ]);

vendor/cordovaGeolocationModule.min.js

Diff comments View file @ c5d726b

File was created