Merge pull request 'mostrar-password' (#12) from mostrar-password into master

Reviewed-on: #12

public/js/app.js

@@ -2203,11 +2203,21 @@ __webpack_require__.r(__webpack_exports__);
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
 /* harmony default export */ __webpack_exports__["default"] = ({
+  name: 'Login',
   data: function data() {
     return {
       visible: false,
-      gdc: null
+      gdc: null,
+      passwordVisible: false,
+      passwordType: "password"
     };
   },
   mounted: function mounted() {
@@ -2217,6 +2227,12 @@ __webpack_require__.r(__webpack_exports__);
       _this.gdc = gdc;
       _this.visible = true;
     });
+  },
+  methods: {
+    togglePassword: function togglePassword() {
+      if (this.passwordVisible) this.passwordType = "password";else this.passwordType = "text";
+      this.passwordVisible = !this.passwordVisible;
+    }
   }
 });
 
@@ -2248,12 +2264,21 @@ __webpack_require__.r(__webpack_exports__);
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
 /* harmony default export */ __webpack_exports__["default"] = ({
-  name: "LoginAdmin.vue",
+  name: "LoginAdmin",
   data: function data() {
     return {
       visible: false,
-      gdc: null
+      gdc: null,
+      passwordVisible: false,
+      passwordType: "password"
     };
   },
   mounted: function mounted() {
@@ -2263,6 +2288,12 @@ __webpack_require__.r(__webpack_exports__);
       _this.gdc = gdc;
       _this.visible = true;
     });
+  },
+  methods: {
+    togglePassword: function togglePassword() {
+      if (this.passwordVisible) this.passwordType = "password";else this.passwordType = "text";
+      this.passwordVisible = !this.passwordVisible;
+    }
   }
 });
 
@@ -2756,8 +2787,6 @@ __webpack_require__.r(__webpack_exports__);
     var _this = this;
 
     Event.$on('sync-aprobacion', function (unSubpedido) {
-      console.log(unSubpedido);
-
       if (_this.pedido.id === unSubpedido.id) {
         _this.pedido = unSubpedido;
       }
@@ -2783,8 +2812,6 @@ __webpack_require__.r(__webpack_exports__);
 //
 //
 //
-//
-//
 /* harmony default export */ __webpack_exports__["default"] = ({
   name: "BotonAdminSubpedidoRow",
   props: {
@@ -2797,7 +2824,7 @@ __webpack_require__.r(__webpack_exports__);
   },
   computed: {
     mensaje: function mensaje() {
-      return this.pedido.aprobado ? "Desaprobar" : "Aprobar";
+      return this.pedido.aprobado ? "Aprobado" : "No aprobado";
     }
   },
   methods: {
@@ -2990,7 +3017,7 @@ __webpack_require__.r(__webpack_exports__);
   },
   data: function data() {
     return {
-      gdc: null,
+      gdc: 0,
       subpedidos: []
     };
   },
@@ -4514,8 +4541,9 @@ var render = function () {
                   [_vm._v("Seleccionar")]
                 ),
                 _vm._v(" "),
-                _vm._l(_vm.gdcs, function (gdc) {
+                _vm._l(_vm.gdcs, function (gdc, index) {
                   return _c("option", {
+                    key: index,
                     attrs: { name: gdc.nombre + (_vm.isAdmin ? "_admin" : "") },
                     domProps: {
                       textContent: _vm._s(
@@ -4844,34 +4872,56 @@ var render = function () {
       ],
       staticClass: "block",
     },
-    [_vm._m(0), _vm._v(" "), _vm._m(1)]
+    [
+      _c("div", { staticClass: "field" }, [
+        _c("label", { staticClass: "label" }, [
+          _vm._v("Contraseña del barrio"),
+        ]),
+        _vm._v(" "),
+        _c("div", { staticClass: "field has-addons" }, [
+          _c("div", { staticClass: "control" }, [
+            _c("input", {
+              staticClass: "input",
+              attrs: {
+                required: "",
+                type: this.passwordType,
+                name: "password",
+                placeholder: "Contraseña del barrio",
+              },
+            }),
+          ]),
+          _vm._v(" "),
+          _c("div", { staticClass: "control" }, [
+            _c(
+              "a",
+              {
+                staticClass: "button is-info",
+                on: { click: _vm.togglePassword },
+              },
+              [
+                _vm._v(
+                  "\n\t\t\t\t\t" +
+                    _vm._s(
+                      (_vm.passwordVisible ? "Ocultar" : "Mostrar") +
+                        " contraseña"
+                    ) +
+                    " \n\t\t\t\t"
+                ),
+              ]
+            ),
+          ]),
+        ]),
+        _vm._v(" "),
+        _c("p", { staticClass: "help" }, [
+          _vm._v("Si no la sabés, consultá a tus compañerxs."),
+        ]),
+      ]),
+      _vm._v(" "),
+      _vm._m(0),
+    ]
   )
 }
 var staticRenderFns = [
-  function () {
-    var _vm = this
-    var _h = _vm.$createElement
-    var _c = _vm._self._c || _h
-    return _c("div", { staticClass: "field" }, [
-      _c("label", { staticClass: "label" }, [_vm._v("Contraseña del barrio")]),
-      _vm._v(" "),
-      _c("p", { staticClass: "control" }, [
-        _c("input", {
-          staticClass: "input",
-          attrs: {
-            required: "",
-            type: "password",
-            name: "password",
-            placeholder: "Contraseña del barrio",
-          },
-        }),
-      ]),
-      _vm._v(" "),
-      _c("p", { staticClass: "help" }, [
-        _vm._v("Si no la sabés, consultá a tus compañerxs."),
-      ]),
-    ])
-  },
   function () {
     var _vm = this
     var _h = _vm.$createElement
@@ -4920,36 +4970,56 @@ var render = function () {
       ],
       staticClass: "block",
     },
-    [_vm._m(0), _vm._v(" "), _vm._m(1)]
+    [
+      _c("div", { staticClass: "field" }, [
+        _c("label", { staticClass: "label has-text-white" }, [
+          _vm._v("Contraseña de administración del barrio"),
+        ]),
+        _vm._v(" "),
+        _c("div", { staticClass: "field has-addons" }, [
+          _c("div", { staticClass: "control" }, [
+            _c("input", {
+              staticClass: "input",
+              attrs: {
+                required: "",
+                type: this.passwordType,
+                name: "password",
+                placeholder: "Contraseña de admin del barrio",
+              },
+            }),
+          ]),
+          _vm._v(" "),
+          _c("div", { staticClass: "control" }, [
+            _c(
+              "a",
+              {
+                staticClass: "button is-warning",
+                on: { click: _vm.togglePassword },
+              },
+              [
+                _vm._v(
+                  "\n\t\t\t\t\t\t" +
+                    _vm._s(
+                      (_vm.passwordVisible ? "Ocultar" : "Mostrar") +
+                        " contraseña"
+                    ) +
+                    " \n\t\t\t\t\t"
+                ),
+              ]
+            ),
+          ]),
+        ]),
+        _vm._v(" "),
+        _c("p", { staticClass: "help has-text-white" }, [
+          _vm._v("Si no la sabés, consultá a la comisión informática."),
+        ]),
+      ]),
+      _vm._v(" "),
+      _vm._m(0),
+    ]
   )
 }
 var staticRenderFns = [
-  function () {
-    var _vm = this
-    var _h = _vm.$createElement
-    var _c = _vm._self._c || _h
-    return _c("div", { staticClass: "field" }, [
-      _c("label", { staticClass: "label has-text-white" }, [
-        _vm._v("Contraseña de administración del barrio"),
-      ]),
-      _vm._v(" "),
-      _c("p", { staticClass: "control" }, [
-        _c("input", {
-          staticClass: "input",
-          attrs: {
-            required: "",
-            type: "password",
-            name: "password",
-            placeholder: "Contraseña de admin del barrio",
-          },
-        }),
-      ]),
-      _vm._v(" "),
-      _c("p", { staticClass: "help has-text-white" }, [
-        _vm._v("Si no la sabés, consultá a la comisión informática."),
-      ]),
-    ])
-  },
   function () {
     var _vm = this
     var _h = _vm.$createElement
@@ -5655,8 +5725,9 @@ var render = function () {
                 [_vm._v("Seleccionar")]
               ),
               _vm._v(" "),
-              _vm._l(_vm.regiones, function (region) {
+              _vm._l(_vm.regiones, function (region, index) {
                 return _c("option", {
+                  key: index,
                   attrs: { name: region },
                   domProps: { textContent: _vm._s(region) },
                 })
@@ -5729,24 +5800,24 @@ var render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
-  return _c(
+  return _c("div", { staticClass: "field" }, [
-    "button",
+    _c("input", {
-    {
+      staticClass: "switch is-rounded is-success",
-      staticClass: "button",
+      attrs: {
-      class: _vm.pedido.aprobado ? "is-danger" : "is-success",
+        id: "switch" + this.pedido.id,
-      on: { click: _vm.toggleAprobacion },
+        type: "checkbox",
-    },
+        name: "switchRoundedSuccess",
-    [
+      },
-      _c("span", { staticClass: "icon is-small" }, [
+      domProps: { checked: _vm.pedido.aprobado },
-        _c("i", {
+      on: { change: _vm.toggleAprobacion },
-          staticClass: "fas",
+    }),
-          class: _vm.pedido.aprobado ? "fa-times" : "fa-check",
+    _vm._v(" "),
-        }),
+    _c("label", { attrs: { for: "switch" + this.pedido.id } }, [
+      _c("span", { staticClass: "is-hidden-mobile" }, [
+        _vm._v(_vm._s(_vm.mensaje)),
       ]),
-      _vm._v(" "),
+    ]),
-      _c("span", [_vm._v(_vm._s(_vm.mensaje))]),
+  ])
-    ]
-  )
 }
 var staticRenderFns = []
 render._withStripped = true
@@ -5855,6 +5926,7 @@ var render = function () {
                 return _c(
                   "div",
                   {
+                    key: index,
                     staticClass: "columns is-mobile",
                     class: { "has-background-grey-lighter": index % 2 },
                   },
@@ -5916,10 +5988,10 @@ render._withStripped = true
 
 /***/ }),
 
-/***/ "./node_modules/vue-loader/lib/loaders/templateLoader.js?!./node_modules/vue-loader/lib/index.js?!./resources/js/components/SubpedidosGdc.vue?vue&type=template&id=652b385d&scoped=true&":
+/***/ "./node_modules/vue-loader/lib/loaders/templateLoader.js?!./node_modules/vue-loader/lib/index.js?!./resources/js/components/SubpedidosGdc.vue?vue&type=template&id=652b385d&":
-/*!****************************************************************************************************************************************************************************************************************************!*\
+/*!****************************************************************************************************************************************************************************************************************!*\
-  !*** ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./resources/js/components/SubpedidosGdc.vue?vue&type=template&id=652b385d&scoped=true& ***!
+  !*** ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./resources/js/components/SubpedidosGdc.vue?vue&type=template&id=652b385d& ***!
-  \****************************************************************************************************************************************************************************************************************************/
+  \****************************************************************************************************************************************************************************************************************/
 /*! exports provided: render, staticRenderFns */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -6071,7 +6143,7 @@ var staticRenderFns = [
           ]),
         ]),
         _vm._v(" "),
-        _c("th", [
+        _c("th", { staticClass: "is-1" }, [
           _c("abbr", { attrs: { title: "Aprobacion" } }, [
             _vm._v("Aprobación"),
           ]),
@@ -19513,7 +19585,7 @@ __webpack_require__.r(__webpack_exports__);
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _SubpedidosGdc_vue_vue_type_template_id_652b385d_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./SubpedidosGdc.vue?vue&type=template&id=652b385d&scoped=true& */ "./resources/js/components/SubpedidosGdc.vue?vue&type=template&id=652b385d&scoped=true&");
+/* harmony import */ var _SubpedidosGdc_vue_vue_type_template_id_652b385d___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./SubpedidosGdc.vue?vue&type=template&id=652b385d& */ "./resources/js/components/SubpedidosGdc.vue?vue&type=template&id=652b385d&");
 /* harmony import */ var _SubpedidosGdc_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./SubpedidosGdc.vue?vue&type=script&lang=js& */ "./resources/js/components/SubpedidosGdc.vue?vue&type=script&lang=js&");
 /* empty/unused harmony star reexport *//* harmony import */ var _node_modules_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../../node_modules/vue-loader/lib/runtime/componentNormalizer.js */ "./node_modules/vue-loader/lib/runtime/componentNormalizer.js");
 
@@ -19525,11 +19597,11 @@ __webpack_require__.r(__webpack_exports__);
 
 var component = Object(_node_modules_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__["default"])(
   _SubpedidosGdc_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__["default"],
-  _SubpedidosGdc_vue_vue_type_template_id_652b385d_scoped_true___WEBPACK_IMPORTED_MODULE_0__["render"],
+  _SubpedidosGdc_vue_vue_type_template_id_652b385d___WEBPACK_IMPORTED_MODULE_0__["render"],
-  _SubpedidosGdc_vue_vue_type_template_id_652b385d_scoped_true___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"],
+  _SubpedidosGdc_vue_vue_type_template_id_652b385d___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"],
   false,
   null,
-  "652b385d",
+  null,
   null
   
 )
@@ -19555,19 +19627,19 @@ __webpack_require__.r(__webpack_exports__);
 
 /***/ }),
 
-/***/ "./resources/js/components/SubpedidosGdc.vue?vue&type=template&id=652b385d&scoped=true&":
+/***/ "./resources/js/components/SubpedidosGdc.vue?vue&type=template&id=652b385d&":
-/*!**********************************************************************************************!*\
+/*!**********************************************************************************!*\
-  !*** ./resources/js/components/SubpedidosGdc.vue?vue&type=template&id=652b385d&scoped=true& ***!
+  !*** ./resources/js/components/SubpedidosGdc.vue?vue&type=template&id=652b385d& ***!
-  \**********************************************************************************************/
+  \**********************************************************************************/
 /*! exports provided: render, staticRenderFns */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _node_modules_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_node_modules_vue_loader_lib_index_js_vue_loader_options_SubpedidosGdc_vue_vue_type_template_id_652b385d_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../node_modules/vue-loader/lib??vue-loader-options!./SubpedidosGdc.vue?vue&type=template&id=652b385d&scoped=true& */ "./node_modules/vue-loader/lib/loaders/templateLoader.js?!./node_modules/vue-loader/lib/index.js?!./resources/js/components/SubpedidosGdc.vue?vue&type=template&id=652b385d&scoped=true&");
+/* harmony import */ var _node_modules_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_node_modules_vue_loader_lib_index_js_vue_loader_options_SubpedidosGdc_vue_vue_type_template_id_652b385d___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../node_modules/vue-loader/lib??vue-loader-options!./SubpedidosGdc.vue?vue&type=template&id=652b385d& */ "./node_modules/vue-loader/lib/loaders/templateLoader.js?!./node_modules/vue-loader/lib/index.js?!./resources/js/components/SubpedidosGdc.vue?vue&type=template&id=652b385d&");
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _node_modules_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_node_modules_vue_loader_lib_index_js_vue_loader_options_SubpedidosGdc_vue_vue_type_template_id_652b385d_scoped_true___WEBPACK_IMPORTED_MODULE_0__["render"]; });
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _node_modules_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_node_modules_vue_loader_lib_index_js_vue_loader_options_SubpedidosGdc_vue_vue_type_template_id_652b385d___WEBPACK_IMPORTED_MODULE_0__["render"]; });
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return _node_modules_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_node_modules_vue_loader_lib_index_js_vue_loader_options_SubpedidosGdc_vue_vue_type_template_id_652b385d_scoped_true___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return _node_modules_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_node_modules_vue_loader_lib_index_js_vue_loader_options_SubpedidosGdc_vue_vue_type_template_id_652b385d___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
 
 
 

resources/js/components/BarrioSelect.vue

@@ -6,7 +6,7 @@
 				<div class="select">
 		        	<select @change="onGDCSelected" v-model="gdc" name="name">
 				    	<option :disabled="isDefaultDisabled==1" value=null>Seleccionar</option>
-						<option v-for="gdc in gdcs" v-text="gdc.nombre + (isAdmin ? '_admin' : '')"
+						<option v-for="(gdc, index) in gdcs" :key="index" v-text="gdc.nombre + (isAdmin ? '_admin' : '')"
                                 :name="gdc.nombre + (isAdmin ? '_admin' : '')">
                         </option>
 					</select>

resources/js/components/Login.vue

@@ -2,9 +2,16 @@
 	<div v-show="visible" class="block">
 		<div class="field">
 			<label class="label">Contraseña del barrio</label>
-			<p class="control">
+			<div class="field has-addons">
-			    <input required class="input" type="password" name="password" placeholder="Contraseña del barrio">
+				<div class="control">
-			</p>
+					<input required class="input" :type="this.passwordType" name="password"  placeholder="Contraseña del barrio">
+				</div>
+				<div class="control">
+					<a class="button is-info" @click="togglePassword">
+						{{ (passwordVisible ? 'Ocultar' : 'Mostrar') + ' contraseña'}} 
+					</a>
+				</div>
+			</div>
 			<p class="help">Si no la sabés, consultá a tus compañerxs.</p>
 		</div>
 		<div class="field">
@@ -17,10 +24,13 @@
 
 <script>
 	export default {
+		name: 'Login',
 		data() {
 			return {
 				visible: false,
-				gdc: null
+				gdc: null,
+				passwordVisible: false,
+				passwordType: "password",
 			}
 		},
 		mounted() {
@@ -28,6 +38,13 @@
 				this.gdc = gdc;
 				this.visible = true;
 			});
+		},
+		methods: {
+			togglePassword() {
+				if (this.passwordVisible) this.passwordType = "password";
+				else this.passwordType = "text"
+				this.passwordVisible = !this.passwordVisible
+			}
 		}
 	}
 </script>

resources/js/components/LoginAdmin.vue

@@ -2,9 +2,16 @@
     <div v-show="visible" class="block">
         <div class="field">
             <label class="label has-text-white">Contraseña de administración del barrio</label>
-            <p class="control">
+            <div class="field has-addons">
-                <input required class="input" type="password" name="password" placeholder="Contraseña de admin del barrio">
+				<div class="control">
-            </p>
+					<input required class="input" :type="this.passwordType" name="password"  placeholder="Contraseña de admin del barrio">
+				</div>
+				<div class="control">
+					<a class="button is-warning" @click="togglePassword">
+						{{ (passwordVisible ? 'Ocultar' : 'Mostrar') + ' contraseña'}} 
+					</a>
+				</div>
+			</div>
             <p class="help has-text-white">Si no la sabés, consultá a la comisión informática.</p>
         </div>
         <div class="field">
@@ -17,11 +24,13 @@
 
 <script>
     export default {
-        name: "LoginAdmin.vue",
+        name: "LoginAdmin",
         data() {
             return {
                 visible: false,
-                gdc: null
+                gdc: null,
+				passwordVisible: false,
+				passwordType: "password",
             }
         },
         mounted() {
@@ -29,7 +38,14 @@
                 this.gdc = gdc;
                 this.visible = true;
             });
-        }
+        },
+		methods: {
+			togglePassword() {
+				if (this.passwordVisible) this.passwordType = "password";
+				else this.passwordType = "text"
+				this.passwordVisible = !this.passwordVisible
+			}
+		}
     }
 </script>
 

resources/js/components/RegionSelect.vue

@@ -6,7 +6,7 @@
 	        	<div class="select">
 	        		<select @change="onRegionSelected" v-model="region">
 			    		<option :disabled="isDefaultDisabled===1" value=null>Seleccionar</option>
-						<option v-for="region in regiones" v-text="region" :name="region"></option>
+						<option v-for="(region, index) in regiones" :key="index" v-text="region" :name="region"></option>
 					</select>
 				</div>
 			</div>

resources/views/auth/admin_login.blade.php

@@ -21,10 +21,10 @@
             Contraseña incorrecta, intentalo nuevamente.
         </div>
         @enderror
-        <region-select admin="true"></region-select>
+        <region-select v-bind:admin="true"></region-select>
         <form method="post" action="login">
             @csrf
-            <barrio-select admin="true"></barrio-select>
+            <barrio-select v-bind:admin="true"></barrio-select>
             <login-admin></login-admin>
         </form>
     </div>