surya/myprojplanet_vite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Circuits OK

Browse Source 
Accounts Ok
Movements OK
This commit is contained in:
Paolo Arena
2022-09-14 11:31:48 +02:00
parent 44c75768c6
commit 25a60472ab
34 changed files with 299 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/layouts/toolbar/notifPopover/notifPopover.ts
View File

@@ -40,7 +40,7 @@ export default defineComponent({
const notifStore = useNotifStore()
const { t } = useI18n()
const $q = useQuasar()
const q = useQuasar()
const loading = ref(false)
@@ -109,9 +109,9 @@ export default defineComponent({
console.log('usernotifs.value', usernotifs.value, to)
const ret = await userStore.setUserNotifs(usernotifs.value)
/*if (ret) {
tools.showPositiveNotif($q, t('db.recupdated'))
tools.showPositiveNotif(q, t('db.recupdated'))
} else {
tools.showNegativeNotif($q, t('db.recfailed'))
tools.showNegativeNotif(q, t('db.recfailed'))
}*/
}
})
@@ -222,7 +222,7 @@ export default defineComponent({
t,
username,
userStore,
$q,
q,
}
},
})

31
src/layouts/toolbar/notifPopover/notifPopover.vue
View File

@@ -11,8 +11,8 @@
<q-drawer v-model="open" side="right" elevated class="text-black"
:overlay="true"
:breakpoint="1200"
:width="$q.screen.lt.sm ? tools.getwidth($q) : 450"
>
:width="q.screen.lt.sm ? tools.getwidth($q) : 450"
>
<q-bar class="bg-primary text-white">
{{ $t('notifs.notifs') }}
<q-space/>
@@ -101,7 +101,7 @@
size="sm"
icon="fas fa-user-plus"
color="positive" :label="$t('friends.accept')"
@click="tools.addToMyFriends($q, userStore.my.username, notif.sender)"
@click="tools.addToMyFriends(q, userStore.my.username, notif.sender)"
/>
<q-btn
dense
@@ -109,11 +109,13 @@
size="sm"
icon="fas fa-user-minus"
color="negative" :label="$t('friends.refuse')"
@click="tools.refuseReqFriends($q, userStore.my.username, notif.sender)"
@click="tools.refuseReqFriends(q, userStore.my.username, notif.sender)"
/>
</div>
</q-item-label>
<q-item-label caption lines="2" v-else-if="notif.typedir === shared_consts.TypeNotifs.TYPEDIR_GROUPS && notif.status === 0 && notif.typeid === shared_consts.TypeNotifs.ID_GROUP_REQUEST_TO_ENTER" v-ripple>
<q-item-label caption lines="2"
v-else-if="notif.typedir === shared_consts.TypeNotifs.TYPEDIR_GROUPS && notif.status === 0 && notif.typeid === shared_consts.TypeNotifs.ID_GROUP_REQUEST_TO_ENTER"
v-ripple>
<div class="row no-wrap justify-evenly" v-if="tools.iAmAdminGroup(notif.extrafield)">
<q-btn
dense
@@ -121,7 +123,7 @@
size="sm"
icon="fas fa-user-plus"
color="positive" :label="$t('friends.accept')"
@click="tools.addToMyGroups($q, notif.sender, notif.extrafield)"
@click="tools.addToMyGroups(q, notif.sender, notif.extrafield)"
/>
<q-btn
dense
@@ -129,11 +131,13 @@
size="sm"
icon="fas fa-user-minus"
color="negative" :label="$t('friends.refuse')"
@click="tools.refuseReqGroup($q, notif.sender, notif.extrafield)"
@click="tools.refuseReqGroup(q, notif.sender, notif.extrafield)"
/>
</div>
</q-item-label>
<q-item-label caption lines="2" v-else-if="notif.typedir === shared_consts.TypeNotifs.TYPEDIR_CIRCUITS && notif.status === 0 && notif.typeid === shared_consts.TypeNotifs.ID_CIRCUIT_REQUEST_TO_ENTER" v-ripple>
<q-item-label caption lines="2"
v-else-if="notif.typedir === shared_consts.TypeNotifs.TYPEDIR_CIRCUITS && notif.status === 0 && notif.typeid === shared_consts.TypeNotifs.ID_CIRCUIT_REQUEST_TO_ENTER"
v-ripple>
<div class="row no-wrap justify-evenly" v-if="tools.iAmAdminCircuit(notif.extrafield)">
<q-btn
@@ -142,7 +146,7 @@
size="sm"
icon="fas fa-user-plus"
color="positive" :label="$t('circuit.accept')"
@click="tools.addToMyCircuits($q, notif.sender, notif.extrafield)"
@click="tools.addToMyCircuits(q, notif.sender, notif.extrafield)"
/>
<q-btn
dense
@@ -150,11 +154,12 @@
size="sm"
icon="fas fa-user-minus"
color="negative" :label="$t('shared.refuse_ask')"
@click="tools.refuseReqCircuit($q, notif.sender, notif.extrafield)"
@click="tools.refuseReqCircuit(q, notif.sender, notif.extrafield)"
/>
</div>
</q-item-label>
<q-item-label caption lines="2" v-else-if="notif.typedir === shared_consts.TypeNotifs.TYPEDIR_CIRCUITS && notif.status === 0 && notif.typeid === shared_consts.TypeNotifs.ID_CIRCUIT_SENDCOINSREQ" v-ripple>
<q-item-label caption lines="2"
v-else-if="notif.typedir === shared_consts.TypeNotifs.TYPEDIR_CIRCUITS && notif.status === 0 && notif.typeid === shared_consts.TypeNotifs.ID_CIRCUIT_SENDCOINSREQ" v-ripple>
<div class="row no-wrap justify-evenly">
<q-btn
@@ -163,7 +168,7 @@
size="sm"
icon="fas fa-user-plus"
color="positive" :label="$t('circuit.accept_coins')"
@click="tools.acceptCoins($q, notif.sender, notif)"
@click="tools.acceptCoins(q, notif.sender, notif)"
/>
<q-btn
dense
@@ -171,7 +176,7 @@
size="sm"
icon="fas fa-user-minus"
color="negative" :label="$t('circuit.refuse_coins')"
@click="tools.refuseCoins($q, notif.sender, notif.extrarec)"
@click="tools.refuseCoins(q, notif.sender, notif)"
/>
</div>
</q-item-label>