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

funcion/pedido-ollas #47

Merged
rho merged 92 commits from funcion/pedido-ollas into master 2025-07-15 11:27:30 -03:00
Conversation 0 Commits 92 Files changed 60 +17 -25
5 changed files with 17 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 6d6d8d4387 - Show all commits

5
resources/js/components/admin/AdminNavBar.vue → resources/js/components/admin/AdminNavBarBrand.vue
View file

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

5
resources/js/components/comisiones/ComisionesNavBar.vue → resources/js/components/comisiones/ComisionesNavBarBrand.vue
View file

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

20
resources/js/components/comunes/NavBar.vue
View file

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

6
resources/js/components/ollas/OllasNavBar.vue → resources/js/components/ollas/OllasNavBarBrand.vue
View file

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

6
resources/js/components/pedidos/PedidosNavBar.vue → resources/js/components/pedidos/PedidosNavBarBrand.vue
View file

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