funcion/pedido-ollas #47

Merged
rho merged 92 commits from funcion/pedido-ollas into master 2025-07-15 11:27:30 -03:00
5 changed files with 17 additions and 25 deletions
Showing only changes of commit 6d6d8d4387 - Show all commits

View file

@ -1,10 +1,8 @@
<script> <script>
import { mapGetters, mapMutations, mapState } from "vuex"; import { mapGetters, mapMutations, mapState } from "vuex";
import Burger from "../comunes/Burger.vue";
export default { export default {
name: "AdminNavBar", name: "AdminNavBarBrand",
components: { Burger },
computed: { computed: {
...mapState('ui', ["burger_activa"]), ...mapState('ui', ["burger_activa"]),
...mapGetters('admin', ["barrio"]) ...mapGetters('admin', ["barrio"])
@ -20,7 +18,6 @@ export default {
<p> <p>
{{`Barrio: ${barrio}`}} {{`Barrio: ${barrio}`}}
</p> </p>
<burger/>
</div> </div>
</template> </template>

View file

@ -1,10 +1,8 @@
<script> <script>
import { mapMutations, mapState } from "vuex"; import { mapMutations, mapState } from "vuex";
import Burger from "../comunes/Burger.vue";
export default { export default {
name: "ComisionesNavBar", name: "ComisionesNavBarBrand",
components: { Burger },
computed: { computed: {
...mapState('ui', ["burger_activa"]) ...mapState('ui', ["burger_activa"])
}, },
@ -26,7 +24,6 @@ export default {
<template> <template>
<div class="navbar-item hide-below-1024"> <div class="navbar-item hide-below-1024">
<p>{{ nombre }}</p> <p>{{ nombre }}</p>
<burger/>
</div> </div>
</template> </template>

View file

@ -7,10 +7,11 @@
<a class="navbar-item" href="https://mps.org.uy"> <a class="navbar-item" href="https://mps.org.uy">
<img src="/assets/logoMPS.png" height="28" alt="Logo del MPS"> <img src="/assets/logoMPS.png" height="28" alt="Logo del MPS">
</a> </a>
<pedidos-nav-bar v-if="rol === 'barrio'"/> <pedidos-nav-bar-brand v-if="rol === 'barrio'"/>
<ollas-nav-bar v-else-if="rol === 'ollas'"/> <ollas-nav-bar-brand v-else-if="rol === 'ollas'"/>
<admin-nav-bar v-else-if="rol === 'admin_barrio'"/> <admin-nav-bar-brand v-else-if="rol === 'admin_barrio'"/>
<comisiones-nav-bar v-else/> <comisiones-nav-bar-brand v-else/>
<burger/>
</div> </div>
<div class="navbar-menu" <div class="navbar-menu"
:class="{'is-active': burger_activa}"> :class="{'is-active': burger_activa}">
@ -32,14 +33,15 @@
<script> <script>
import ChismosaDropdown from '../pedidos/ChismosaDropdown.vue'; import ChismosaDropdown from '../pedidos/ChismosaDropdown.vue';
import { mapGetters, mapState } from "vuex"; import { mapGetters, mapState } from "vuex";
import PedidosNavBar from "../pedidos/PedidosNavBar.vue"; import PedidosNavBarBrand from "../pedidos/PedidosNavBarBrand.vue";
import ComisionesNavBar from "../comisiones/ComisionesNavBar.vue"; import ComisionesNavBarBrand from "../comisiones/ComisionesNavBarBrand.vue";
import AdminNavBar from "../admin/AdminNavBar.vue"; import AdminNavBarBrand from "../admin/AdminNavBarBrand.vue";
import OllasNavBar from "../ollas/OllasNavBar.vue"; import OllasNavBarBrand from "../ollas/OllasNavBarBrand.vue";
import Buscador from "../pedidos/Buscador.vue"; import Buscador from "../pedidos/Buscador.vue";
import Burger from "./Burger.vue";
export default { export default {
components: { Buscador, OllasNavBar, AdminNavBar, ComisionesNavBar, PedidosNavBar, ChismosaDropdown }, components: { Burger, Buscador, OllasNavBarBrand, AdminNavBarBrand, ComisionesNavBarBrand, PedidosNavBarBrand, ChismosaDropdown },
computed: { computed: {
...mapGetters('pedido', ["pedidoDefinido"]), ...mapGetters('pedido', ["pedidoDefinido"]),
...mapState('login', ["rol"]), ...mapState('login', ["rol"]),

View file

@ -1,11 +1,10 @@
<script> <script>
import { mapGetters, mapMutations, mapState } from "vuex"; import { mapGetters, mapMutations, mapState } from "vuex";
import Burger from "../comunes/Burger.vue";
import ChismosaDropdown from "../pedidos/ChismosaDropdown.vue"; import ChismosaDropdown from "../pedidos/ChismosaDropdown.vue";
export default { export default {
name: "OllasNavBar", name: "OllasNavBarBrand",
components: { Burger, ChismosaDropdown }, components: { ChismosaDropdown },
computed: { computed: {
...mapGetters('pedido', ["pedidoDefinido"]), ...mapGetters('pedido', ["pedidoDefinido"]),
...mapState('pedido', ["nombre"]), ...mapState('pedido', ["nombre"]),
@ -24,7 +23,6 @@ export default {
v-if="pedidoDefinido" v-if="pedidoDefinido"
class="hide-above-1023" class="hide-above-1023"
ariaControls="mobile"/> ariaControls="mobile"/>
<burger/>
</div> </div>
</template> </template>

View file

@ -1,11 +1,10 @@
<script> <script>
import { mapGetters, mapMutations, mapState } from "vuex"; import { mapGetters, mapMutations, mapState } from "vuex";
import ChismosaDropdown from "./ChismosaDropdown.vue"; import ChismosaDropdown from "./ChismosaDropdown.vue";
import Burger from "../comunes/Burger.vue";
export default { export default {
name: "PedidosNavBar", name: "PedidosNavBarBrand",
components: { Burger, ChismosaDropdown }, components: { ChismosaDropdown },
computed: { computed: {
...mapGetters('pedido', ["pedidoDefinido"]), ...mapGetters('pedido', ["pedidoDefinido"]),
...mapState('pedido', ["nombre", "grupo_de_compra"]), ...mapState('pedido', ["nombre", "grupo_de_compra"]),
@ -26,7 +25,6 @@ export default {
v-if="pedidoDefinido" v-if="pedidoDefinido"
class="hide-above-1023" class="hide-above-1023"
ariaControls="mobile"/> ariaControls="mobile"/>
<burger/>
</div> </div>
</template> </template>