Mauricio Cattafi / foca-botonera-principal

Download as
Browse Code ยป

Commit d7689870ad6ff909f4519a25c96d83be94ed8d80

Authored by Pablo Marco del Pont
2 parents af684be843 e07e2f505b
Exists in master and in 2 other branches demo, develop

Merge branch 'master' of https://debo.suite.repo/modulos-npm/foca-botonera-principal 

# Conflicts:
#	src/js/controller.js
Showing 4 changed files   Show diff stats
... ... @@ -16,13 +16,13 @@
16 16 <!-- BUILD -->
17 17 <script src="src/js/app.js"></script>
18 18 <script src="src/js/controller.js"></script>
19   - <script src="src/js/service.js"></script>
  19 + <!--<script src="src/js/service.js"></script>-->
20 20  
21 21 <!-- /BUILD -->
22 22  
23 23 <!-- CONFIG PARA DEVELOP -->
24   - <script src="src/etc/develop.js"></script>
  24 + <!--<script src="src/etc/develop.js"></script>-->
25 25 </head>
26   - <body ng-controller="controller">
  26 + <body ng-controller="focaBotoneraPrincipalController">
27 27 </body>
28 28 </html>
... ... @@ -32,27 +32,29 @@
32 32 "gulp-replace": "^1.0.0",
33 33 "gulp-uglify": "^3.0.1",
34 34 "jquery": "^3.3.1",
35   - "pump": "^3.0.0"
  35 + "pump": "^3.0.0",
  36 + "foca-modal": "git+https://debo.suite.repo/modulos-npm/foca-modal.git"
36 37 },
37 38 "devDependencies": {
38   - "angular": "^1.7.4",
  39 + "angular": "^1.7.5",
39 40 "bootstrap": "^4.1.3",
40 41 "font-awesome": "^4.7.0",
41   - "gulp": "3.9.1",
42   - "gulp-angular-templatecache": "2.2.2",
43   - "gulp-clean": "0.4.0",
44   - "gulp-concat": "2.6.1",
45   - "gulp-connect": "5.6.1",
46   - "gulp-htmlmin": "5.0.1",
47   - "gulp-jshint": "2.1.0",
48   - "gulp-rename": "1.4.0",
49   - "gulp-replace": "1.0.0",
50   - "gulp-uglify": "3.0.1",
51   - "jasmine-core": "^3.2.1",
  42 + "gulp": "^3.9.1",
  43 + "gulp-angular-templatecache": "^2.2.2",
  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-uglify": "^3.0.1",
  52 + "jasmine-core": "^3.3.0",
52 53 "jquery": "^3.3.1",
53   - "jshint": "2.9.6",
  54 + "jshint": "^2.9.6",
54 55 "pre-commit": "^1.2.2",
55   - "pump": "3.0.0",
56   - "ui-bootstrap4": "^3.0.4"
  56 + "pump": "^3.0.0",
  57 + "ui-bootstrap4": "^3.0.5",
  58 + "foca-modal": "git+https://debo.suite.repo/modulos-npm/foca-modal.git"
57 59 }
58 60 }
src/js/controller.js
Diff comments   View file @ d768987
1 1 angular.module('focaBotoneraPrincipal')
2 2 .controller('focaBotoneraPrincipalController', [
3   - '$scope', '$location',
4   - function($scope, $location) {
  3 + '$scope', '$location', '$cookies', 'focaModalService',
  4 + function($scope, $location, $cookies, focaModalService) {
5 5 // TODO: Tomar estos datos desde el servicio
6 6 $scope.botones = [
7 7 {
... ... @@ -122,5 +122,10 @@ angular.module(&#39;focaBotoneraPrincipal&#39;)
122 122 $scope.logout = function() {
123 123 $location.path('/logout');
124 124 };
  125 +
  126 + $scope.showTerminal = function() {
  127 + var key = $cookies.get('terminalKey');
  128 + focaModalService.alert('SU TERMINAL ES: ' + key);
  129 + };
125 130 }
126 131 ]);
src/views/foca-botonera-principal.html
Diff comments   View file @ d768987
... ... @@ -5,7 +5,7 @@
5 5 </div>
6 6 </div>
7 7 <div class="row">
8   - <div class="col-12">
  8 + <div class="col-12 mb-3">
9 9 <swiper on-init="inicioSwiper">
10 10 <slides>
11 11 <slide ng-repeat="pagina in paginas">
... ... @@ -22,6 +22,19 @@
22 22 <next></next>
23 23 <pagination></pagination>
24 24 </swiper>
  25 + <a
  26 + class="btn btn-outline-dark mt-5 btn-lg"
  27 + href="javascript:void()"
  28 + ng-click="showTerminal()"
  29 + >
  30 + <i class="fa fa-info-circle" aria-hidden="true"></i>
  31 + </a>
  32 + <a class="btn btn-outline-dark mt-5 btn-lg float-right"
  33 + href="javascript:void()"
  34 + ng-click="logout()"
  35 + >
  36 + <i class="fa fa-power-off" aria-hidden="true"></i>
  37 + </a>
25 38 </div>
26 39 </div>
27 40 </div>