Jose Pinto / wrapper-demo

Download as
Browse Code ยป

Commit ab2041e230a70082716a92ff68d1927530099a6c

Authored by Jose Pinto
2 parents fe820fb59b 24fd023ca6
Exists in master

Merge branch 'develop' into 'master' 

Develop

See merge request !91
Showing 9 changed files   Show diff stats
1   -const gulp = require('gulp');
2   -const sass = require('gulp-sass');
3   -const concat = require('gulp-concat');
4   -const rename = require('gulp-rename');
5   -const uglify = require('gulp-uglify');
6   -const pump = require('pump');
7   -const jshint = require('gulp-jshint');
8   -const replace = require('gulp-replace');
9   -const connect = require('gulp-connect');
10   -const watch = require('gulp-watch');
11   -
  1 +const gulp = require('gulp');
  2 +const sass = require('gulp-sass');
  3 +const concat = require('gulp-concat');
  4 +const rename = require('gulp-rename');
  5 +const uglify = require('gulp-uglify');
  6 +const pump = require('pump');
  7 +const jshint = require('gulp-jshint');
  8 +const replace = require('gulp-replace');
  9 +const connect = require('gulp-connect');
  10 +const watch = require('gulp-watch');
  11 +const gulpSequence = require('gulp-sequence')
12 12 var paths = {
13 13 srcHTML : 'src/views/*.html',
14 14 srcJS : 'src/js/*.js',
... ... @@ -53,6 +53,7 @@ gulp.task('pre-install', function() {
53 53 pump([
54 54 gulp.src('package.json'),
55 55 replace('ssh://git@debonline.dyndns.org:', 'http://git.focasoftware.com/'),
  56 + replace('.git', '.git#develop'),
56 57 gulp.dest('')
57 58 ]);
58 59 });
... ... @@ -61,6 +62,7 @@ gulp.task('post-install', function() {
61 62 pump([
62 63 gulp.src('package.json'),
63 64 replace('http://git.focasoftware.com/', 'ssh://git@debonline.dyndns.org:'),
  65 + replace('#develop', ''),
64 66 gulp.dest('')
65 67 ]);
66 68 });
... ... @@ -74,8 +76,6 @@ gulp.task('pre-commit', function() {
74 76 jshint.reporter('fail')
75 77 ]
76 78 );
77   - gulp.start('uglify');
78   - gulp.start('sass');
79 79 });
80 80  
81 81 gulp.task('webserver', function() {
... ... @@ -107,4 +107,4 @@ gulp.task('livereload', function() {
107 107 gulp.watch('index.html', ['reload']);
108 108 });
109 109  
110   -gulp.task('default', ['sass', 'webserver', 'livereload', 'watch']);
  110 +gulp.task('default', gulpSequence(['sass', 'webserver', 'livereload', 'watch']));
img/abmVendedorCobrador.png
Diff comments   View file @ ab2041e

5.6 KB
img/agendarVisita.png
Diff comments   View file @ ab2041e

4.07 KB
img/botonObservaciones.png
Diff comments   View file @ ab2041e

11.8 KB

4.82 KB
... ... @@ -38,6 +38,7 @@
38 38 <script src="./node_modules/chart.js/dist/Chart.min.js"></script>
39 39 <script src="./node_modules/angular-chart.js/dist/angular-chart.min.js"></script>
40 40 <script src="./node_modules/angular-file-saver/dist/angular-file-saver.bundle.js"></script>
  41 + <script src="./node_modules/angular-md5/angular-md5.min.js"></script>
41 42  
42 43 <script src="./node_modules/foca-abm-chofer/dist/foca-abm-chofer.min.js"></script>
43 44 <script src="./node_modules/foca-abm-precios-condiciones/dist/foca-abm-precios-condiciones.min.js"></script>
... ... @@ -87,6 +88,7 @@
87 88 <script src="./node_modules/foca-modal-precio-condiciones/dist/foca-modal-precio-condiciones.min.js"></script>
88 89 <script src="./node_modules/foca-modal-punto-descarga/dist/foca-modal-punto-descarga.min.js"></script>
89 90 <script src="./node_modules/foca-modal-remito/dist/foca-modal-remito.min.js"></script>
  91 + <script src="./node_modules/foca-modal-resumen-cuenta/dist/foca-modal-resumen-cuenta.min.js"></script>
90 92 <script src="./node_modules/foca-modal-tarifa-flete/dist/foca-modal-tarifa-flete.min.js"></script>
91 93 <script src="./node_modules/foca-modal-unidad-medida/dist/foca-modal-unidad-medida.min.js"></script>
92 94 <script src="./node_modules/foca-nombre-empresa/dist/foca-nombre-empresa.min.js"></script>
... ... @@ -21,18 +21,19 @@
21 21 "author": "Foca Software",
22 22 "license": "ISC",
23 23 "dependencies": {
24   - "angular": "^1.7.7",
  24 + "angular": "^1.7.8",
25 25 "angular-chart.js": "1.1.1",
26   - "angular-cookies": "^1.7.7",
  26 + "angular-cookies": "^1.7.8",
27 27 "angular-file-saver": "^1.1.3",
28   - "angular-i18n": "^1.7.7",
  28 + "angular-i18n": "^1.7.8",
29 29 "angular-ladda": "^0.4.3",
30   - "angular-mocks": "^1.7.7",
31   - "angular-route": "^1.7.7",
32   - "angular-sanitize": "^1.7.7",
  30 + "angular-md5": "^0.1.10",
  31 + "angular-mocks": "^1.7.8",
  32 + "angular-route": "^1.7.8",
  33 + "angular-sanitize": "^1.7.8",
33 34 "angular-ui-grid": "4.6.6",
34 35 "angular-ui-swiper": "^2.3.8",
35   - "bootstrap": "^4.2.1",
  36 + "bootstrap": "^4.3.1",
36 37 "chart.js": "2.7.3",
37 38 "excel-builder": "2.0.3",
38 39 "foca-abm-chofer": "git+ssh://git@debonline.dyndns.org:npm/foca-abm-chofer.git",
... ... @@ -84,6 +85,7 @@
84 85 "foca-modal-precio-condiciones": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-precio-condiciones.git",
85 86 "foca-modal-punto-descarga": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-punto-descarga.git",
86 87 "foca-modal-remito": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-remito.git",
  88 + "foca-modal-resumen-cuenta": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-resumen-cuenta.git",
87 89 "foca-modal-tarifa-flete": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-tarifa-flete.git",
88 90 "foca-modal-unidad-medida": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-unidad-medida.git",
89 91 "foca-nombre-empresa": "git+ssh://git@debonline.dyndns.org:npm/foca-nombre-empresa.git",
... ... @@ -92,7 +94,7 @@
92 94 "font-awesome": "^4.7.0",
93 95 "gulp-angular-templatecache": "^2.2.6",
94 96 "gulp-htmlmin": "^5.0.1",
95   - "gulp-uglify": "^3.0.1",
  97 + "gulp-sequence": "^1.0.0",
96 98 "gulp-uglify-es": "^1.0.4",
97 99 "jquery": "^3.3.1",
98 100 "jszip": "2.6.1",
... ... @@ -115,10 +117,10 @@
115 117 "gulp-rename": "^1.4.0",
116 118 "gulp-replace": "^1.0.0",
117 119 "gulp-sass": "^4.0.1",
118   - "gulp-uglify": "^1.0.4",
  120 + "gulp-uglify": "^3.0.2",
119 121 "gulp-watch": "^5.0.1",
120 122 "jasmine-core": "^3.3.0",
121   - "jshint": "^2.10.1",
  123 + "jshint": "^2.10.2",
122 124 "pre-commit": "^1.2.2",
123 125 "pump": "^3.0.0"
124 126 }
... ... @@ -12,6 +12,7 @@ angular.module(&#39;appWrapperDemo&#39;, [
12 12 'ui.grid',
13 13 'ui.grid.exporter',
14 14 'ngFileSaver',
  15 + 'angular-md5',
15 16  
16 17 // MODULOS FOCA
17 18 'focaAbmPreciosCondiciones',
... ... @@ -61,6 +62,7 @@ angular.module(&#39;appWrapperDemo&#39;, [
61 62 'focaModalPrecioCondicion',
62 63 'focaModalPuntoDescarga',
63 64 'focaModalRemito',
  65 + 'focaModalResumenCuenta',
64 66 'focaModalTarifaFlete',
65 67 'focaModalUnidadMedida',
66 68 'focaNombreEmpresa',
src/sass/_botonera-principal.scss
Diff comments   View file @ ab2041e
... ... @@ -180,6 +180,33 @@
180 180 }
181 181 }
182 182 }
  183 + &-agendar-visita {
  184 + & button {
  185 + background-image: url('../img/agendarVisita.png');
  186 + background-size: 90px 90px;
  187 + &:hover {
  188 + background-color: rgb(250,250,250);
  189 + }
  190 + }
  191 + }
  192 + &-informes {
  193 + & button {
  194 + background-image: url('../img/informes.png');
  195 + background-size: 90px 90px;
  196 + &:hover {
  197 + background-color: rgb(250,250,250);
  198 + }
  199 + }
  200 + }
  201 + &-vendedor-cobrador {
  202 + & button {
  203 + background-image: url('../img/abmVendedorCobrador.png');
  204 + background-size: 90px 90px;
  205 + &:hover {
  206 + background-color: rgb(250,250,250);
  207 + }
  208 + }
  209 + }
183 210 .swiper-pagination {
184 211 bottom: 0px !important;
185 212 }