nathalie/pedi2
3
3
Fork 1
Code Issues Pull requests 1 Projects Releases Wiki Activity

funcion/refactor-general #45

Open
atasistro wants to merge 111 commits from funcion/refactor-general into master
pull from: funcion/refactor-general
merge into: nathalie:master
Conversation 0 Commits 111 Files changed 80 +9 -9
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 1a8f9eda18 - Show all commits

4
resources/js/components/comunes/BarrioSelect.vue
View file

@ -1,7 +1,7 @@
<template> <template>
<div v-if="region_elegida !== null" class="block"> <div v-if="region_elegida !== null" class="block">
<div class="field"> <div class="field">
<label class="label" :class="admin ? 'has-text-white' : ''"> <label class="label" :class="adminUrl ? 'has-text-white' : ''">
Seleccioná tu barrio o grupo de compra Seleccioná tu barrio o grupo de compra
</label> </label>
<div class="control"> <div class="control">
@ -35,7 +35,7 @@ export default {
}, },
computed: { computed: {
...mapState('login',["region_elegida","grupos_de_compra","grupo_de_compra_elegido"]), ...mapState('login',["region_elegida","grupos_de_compra","grupo_de_compra_elegido"]),
...mapGetters('login',["admin"]), ...mapGetters('login',["adminUrl"]),
}, },
data() { data() {
return { return {

6
resources/js/components/comunes/Login.vue
View file

@ -2,7 +2,7 @@
<div v-if="grupo_de_compra_elegido !== null" class="block"> <div v-if="grupo_de_compra_elegido !== null" class="block">
<div class="field"> <div class="field">
<label class="label" <label class="label"
:class="admin ? 'has-text-white' : ''">{{ mensajes.mensaje }}</label> :class="adminUrl ? 'has-text-white' : ''">{{ mensajes.mensaje }}</label>
<div class="field has-addons"> <div class="field has-addons">
<div class="control"> <div class="control">
<input required class="input" :type="this.passwordType" name="password" :placeholder="mensajes.mensaje"> <input required class="input" :type="this.passwordType" name="password" :placeholder="mensajes.mensaje">
@ -14,7 +14,7 @@
</div> </div>
</div> </div>
<p class="help" <p class="help"
:class="admin ? 'has-text-white' : ''">{{ mensajes.ayuda }}</p> :class="adminUrl ? 'has-text-white' : ''">{{ mensajes.ayuda }}</p>
</div> </div>
<div class="field"> <div class="field">
<div class="control"> <div class="control">
@ -37,7 +37,7 @@ export default {
}, },
computed: { computed: {
...mapState('login',["grupo_de_compra_elegido"]), ...mapState('login',["grupo_de_compra_elegido"]),
...mapGetters('login',["admin","mensajes"]), ...mapGetters('login',["adminUrl","mensajes"]),
}, },
methods: { methods: {
togglePassword() { togglePassword() {

4
resources/js/components/comunes/LoginForm.vue
View file

@ -20,10 +20,10 @@ export default {
await this.getRegiones(); await this.getRegiones();
}, },
computed: { computed: {
...mapGetters('login',["admin"]), ...mapGetters('login',["adminUrl"]),
...mapState('login',["grupo_de_compra_elegido"]), ...mapState('login',["grupo_de_compra_elegido"]),
nombre() { nombre() {
return `${this.grupo_de_compra_elegido}${this.admin ? '_admin' : ''}`; return `${this.grupo_de_compra_elegido}${this.adminUrl ? '_admin' : ''}`;
} }
}, },
methods: { methods: {

4
resources/js/components/comunes/RegionSelect.vue
View file

@ -1,7 +1,7 @@
<template> <template>
<div class="block"> <div class="block">
<div class="field"> <div class="field">
<label class="label" :class="admin ? 'has-text-white' : ''"> <label class="label" :class="adminUrl ? 'has-text-white' : ''">
Seleccioná tu región Seleccioná tu región
</label> </label>
<div class="control"> <div class="control">
@ -38,7 +38,7 @@ export default {
}, },
computed: { computed: {
...mapState('login',["regiones","region_elegida"]), ...mapState('login',["regiones","region_elegida"]),
...mapGetters('login',["admin"]), ...mapGetters('login',["adminUrl"]),
} }
} }
</script> </script>