Luigi / wrapper-demo

Commit f2d49ad0090e2514e11237fb65fbcedd10224e0b

Authored by Eric Fernandez 2018-10-18 13:48:31 -0300

Exists in master

Merge branch 'master' into 'master'

Master (pmarco)

See merge request Wrappers/wrapper-demo!2

Showing 3 changed files Show diff stats

index.html

Diff comments View file @ f2d49ad

 <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 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/foca-directivas/dist/foca-directivas.min.js"></script>
         <script src="./node_modules/foca-botonera-horizontal/dist/botonera-horizontal.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-petroleras/dist/foca-modal-petroleras.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>
         <!-- BUILD -->
         <script src="./src/js/app.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>
     </body>
 </html>

package.json

Diff comments View file @ f2d49ad

 {
     "name": "wrapper-demo",
     "version": "0.0.1",
     "description": "",
     "main": "main.js",
     "scripts": {
         "initdev": "npm install gulp --global && npm install && npm install -g jshint",
         "gulp-pre-commit": "gulp pre-commit",
         "compile": "gulp uglify && gulp sass",
         "electron": "electron .",
         "electron-build": "gulp uglify && gulp html && gulp sass && electron ."
     },
     "pre-commit": [
         "gulp-pre-commit"
     ],
     "repository": {
         "type": "git",
-        "url": "https://192.168.0.11/Wrappers/wrapper-demo.git"
+        "url": "https://debo.suite.repo/Wrappers/wrapper-demo.git"
     },
     "author": "Foca Software",
     "license": "ISC",
     "dependencies": {
-        "angular": "^1.7.4",
+        "angular": "^1.7.5",
-        "angular-route": "1.7.3",
+        "angular-cookies": "^1.7.5",
-        "bootstrap": "4.1.3",
+        "angular-route": "^1.7.5",
-        "foca-abm-plazo-pago": "git+https://192.168.0.11/modulos-npm/foca-abm-plazo-pago.git",
+        "bootstrap": "^4.1.3",
-        "foca-abm-precios-condiciones": "git+https://192.168.0.11/modulos-npm/foca-abm-precios-condiciones.git",
+        "foca-abm-plazo-pago": "git+https://debo.suite.repo/modulos-npm/foca-abm-plazo-pago.git",
-        "foca-abm-sectores": "git+https://192.168.0.11/modulos-npm/foca-abm-sectores",
+        "foca-abm-precios-condiciones": "git+https://debo.suite.repo/modulos-npm/foca-abm-precios-condiciones.git",
-        "foca-botonera-horizontal": "git+https://192.168.0.11/modulos-npm/foca-botonera-horizontal.git",
+        "foca-abm-sectores": "git+https://debo.suite.repo/modulos-npm/foca-abm-sectores",
-        "foca-busqueda-cliente": "git+https://192.168.0.11/modulos-npm/foca-busqueda-cliente.git",
+        "foca-botonera-horizontal": "git+https://debo.suite.repo/modulos-npm/foca-botonera-horizontal.git",
-        "foca-crear-nota-pedido": "git+https://192.168.0.11/modulos-npm/foca-crear-nota-pedido.git",
+        "foca-busqueda-cliente": "git+https://debo.suite.repo/modulos-npm/foca-busqueda-cliente.git",
-        "foca-directivas": "git+https://192.168.0.11/modulos-npm/foca-directivas.git",
+        "foca-crear-nota-pedido": "git+https://debo.suite.repo/modulos-npm/foca-crear-nota-pedido.git",
-        "foca-modal": "git+https://192.168.0.11/modulos-npm/foca-modal",
+        "foca-directivas": "git+https://debo.suite.repo/modulos-npm/foca-directivas.git",
-        "foca-modal-busqueda-productos": "git+https://192.168.0.11/nguarnieri/foca-modal-busqueda-productos",
+        "foca-login": "git+https://debo.suite.repo/modulos-npm/foca-login.git",
-        "foca-modal-petroleras": "git+https://192.168.0.11/modulos-npm/foca-modal-petroleras.git",
+        "foca-modal": "git+https://debo.suite.repo/modulos-npm/foca-modal",
-        "foca-modal-vendedores": "git+https://192.168.0.11/modulos-npm/foca-modal-vendedores.git",
+        "foca-modal-busqueda-productos": "git+https://debo.suite.repo/nguarnieri/foca-modal-busqueda-productos",
-        "foca-turno-apertura": "git+https://192.168.0.11/modulos-npm/foca-turno-apertura.git",
+        "foca-modal-petroleras": "git+https://debo.suite.repo/modulos-npm/foca-modal-petroleras.git",
-        "font-awesome": "4.7.0",
+        "foca-modal-vendedores": "git+https://debo.suite.repo/modulos-npm/foca-modal-vendedores.git",
+        "foca-turno-apertura": "git+https://debo.suite.repo/modulos-npm/foca-turno-apertura.git",
+        "font-awesome": "^4.7.0",
         "gulp-angular-templatecache": "^2.2.1",
         "gulp-htmlmin": "^5.0.1",
         "gulp-uglify": "^3.0.1",
-        "jquery": "3.3.1",
+        "jquery": "^3.3.1",
-        "node-sass": "4.9.4",
+        "node-sass": "^4.9.4",
         "uglify": "^0.1.5",
         "ui-bootstrap4": "^3.0.5"
     },
     "devDependencies": {
         "electron": "^3.0.2",
         "gulp": "^3.9.1",
         "gulp-clean": "^0.4.0",
         "gulp-concat": "^2.6.1",
         "gulp-connect": "^5.6.1",
         "gulp-jshint": "^2.1.0",
         "gulp-rename": "^1.4.0",
         "gulp-replace": "^1.0.0",
         "gulp-sass": "^4.0.1",
         "gulp-uglify-es": "^1.0.4",
         "gulp-watch": "^5.0.1",
         "jasmine-core": "^3.2.1",
         "jshint": "^2.9.6",
         "pre-commit": "^1.2.2",
         "pump": "^3.0.0"
     }
 }

src/js/app.js

Diff comments View file @ f2d49ad

 angular.module('appWrapperDemo', [
+    'ngCookies',
     'ngRoute',
     'ui.bootstrap',
     'focaBotoneraHorizontal',
     'focaTurnoApertura',
     'focaAbmPreciosCondiciones',
     'focaAbmPlazoPago',
     'focaAbmSectores',
     'focaBusquedaCliente',
     'focaCrearNotaPedido',
+    'focaLogin',
     'focaModal'
 ]);