MrUnknownDE/VRCX
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/VRCX.git synced 2026-04-19 06:43:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix invite response, small fixes

Browse Source
This commit is contained in:
Natsumi
2025-09-16 16:21:32 +12:00
parent 4c0b2c3299
commit 9a99b37fea
22 changed files with 137 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/views/Notifications/Notification.vue
View File

@@ -318,11 +318,11 @@
<el-tooltip placement="top" content="Decline">
<el-button
v-if="shiftHeld"
style="color: #f56c6c; margin-left: 5px"
style="color: #f56c6c"
type="text"
:icon="Close"
size="small"
class="button-pd-0"
:class="['button-pd-0', 'ml-5']"
@click="hideNotification(scope.row)" />
<el-button
v-else
@@ -338,11 +338,11 @@
<el-tooltip placement="top" content="Delete log">
<el-button
v-if="shiftHeld"
style="color: #f56c6c; margin-left: 5px"
style="color: #f56c6c"
type="text"
:icon="Close"
:icon="Delete"
size="small"
class="button-pd-0"
:class="['button-pd-0', 'ml-5']"
@click="deleteNotificationLog(scope.row)" />
<el-button
v-else
@@ -383,11 +383,11 @@
</el-table-column>
</DataTable>
<SendInviteResponseDialog
:send-invite-response-dialog="sendInviteResponseDialog"
:send-invite-response-dialog-visible="sendInviteResponseDialogVisible" />
v-model:send-invite-response-dialog="sendInviteResponseDialog"
v-model:sendInviteResponseDialogVisible="sendInviteResponseDialogVisible" />
<SendInviteRequestResponseDialog
:send-invite-response-dialog="sendInviteResponseDialog"
:send-invite-request-response-dialog-visible="sendInviteRequestResponseDialogVisible" />
v-model:send-invite-response-dialog="sendInviteResponseDialog"
v-model:sendInviteRequestResponseDialogVisible="sendInviteRequestResponseDialogVisible" />
</div>
</template>

7
src/views/Notifications/dialogs/EditAndSendInviteResponseDialog.vue
View File

@@ -1,7 +1,8 @@
<template>
<el-dialog
class="x-dialog"
v-model="editAndSendInviteResponseDialog.visible"
:model-value="editAndSendInviteResponseDialog.visible"
@close="cancelEditAndSendInviteResponse"
:title="t('dialog.edit_send_invite_response_message.header')"
width="400px"
append-to-body>
@@ -52,10 +53,10 @@
}
});
const emit = defineEmits(['closeInviteDialog', 'update:editAndSendInviteResponseDialog']);
const emit = defineEmits(['closeInviteDialog', 'closeResponseConfirmDialog']);
function cancelEditAndSendInviteResponse() {
emit('update:editAndSendInviteResponseDialog', { ...props.editAndSendInviteResponseDialog, visible: false });
emit('closeResponseConfirmDialog');
}
async function saveEditAndSendInviteResponse() {

19
src/views/Notifications/dialogs/SendInviteRequestResponseDialog.vue
View File

@@ -50,14 +50,13 @@
<EditAndSendInviteResponseDialog
:edit-and-send-invite-response-dialog="editAndSendInviteResponseDialog"
:send-invite-response-dialog="sendInviteResponseDialog"
@update:edit-and-send-invite-response-dialog="editAndSendInviteResponseDialog = $event"
@update:send-invite-response-dialog="sendInviteResponseDialog = $event"
@closeInviteDialog="closeInviteDialog" />
@closeInviteDialog="closeInviteDialog"
@closeResponseConfirmDialog="closeResponseConfirmDialog" />
<SendInviteResponseConfirmDialog
:send-invite-response-dialog="sendInviteResponseDialog"
:send-invite-response-confirm-dialog="sendInviteResponseConfirmDialog"
@update:send-invite-response-dialog="sendInviteResponseDialog = $event"
@closeInviteDialog="closeInviteDialog" />
@closeInviteDialog="closeInviteDialog"
@closeResponseConfirmDialog="closeResponseConfirmDialog" />
</el-dialog>
</template>
@@ -90,7 +89,7 @@
}
});
const emit = defineEmits(['update:sendInviteRequestResponseDialogVisible']);
const emit = defineEmits(['update:sendInviteRequestResponseDialogVisible', 'update:sendInviteResponseDialog']);
const editAndSendInviteResponseDialog = ref({
visible: false,
@@ -102,7 +101,7 @@
});
function showEditAndSendInviteResponseDialog(row) {
props.sendInviteResponseDialog.messageSlot = row;
emit('update:sendInviteResponseDialog', { ...props.sendInviteResponseDialog, messageSlot: row });
editAndSendInviteResponseDialog.value = {
newMessage: row.message,
visible: true
@@ -110,7 +109,7 @@
}
function showSendInviteResponseConfirmDialog(row) {
props.sendInviteResponseDialog.messageSlot = row;
emit('update:sendInviteResponseDialog', { ...props.sendInviteResponseDialog, messageSlot: row });
sendInviteResponseConfirmDialog.value.visible = true;
}
@@ -118,6 +117,10 @@
cancelSendInviteRequestResponse();
}
function closeResponseConfirmDialog() {
sendInviteResponseConfirmDialog.value.visible = false;
}
// function refreshInviteMessageTableData(...arg) {
// inviteMessagesRequest.refreshInviteMessageTableData(arg);
// }

11
src/views/Notifications/dialogs/SendInviteResponseConfirmDialog.vue
View File

@@ -12,7 +12,7 @@
<template #footer>
<el-button @click="cancelInviteResponseConfirm">{{ t('dialog.invite_response_message.cancel') }}</el-button>
<el-button type="primary" size="small" @click="sendInviteResponseConfirm">{{
<el-button type="primary" @click="sendInviteResponseConfirm">{{
t('dialog.invite_response_message.confirm')
}}</el-button>
</template>
@@ -42,11 +42,10 @@
}
});
const emit = defineEmits(['update:sendInviteResponseConfirmDialog', 'closeInviteDialog']);
const emit = defineEmits(['closeResponseConfirmDialog', 'closeInviteDialog']);
function cancelInviteResponseConfirm() {
emit('update:sendInviteResponseConfirmDialog', { visible: false });
props.sendInviteResponseConfirmDialog.visible = false;
emit('closeResponseConfirmDialog');
}
function sendInviteResponseConfirm() {
@@ -57,7 +56,7 @@
};
if (uploadImage.value) {
notificationRequest
.sendInviteResponsePhoto(params, D.invite.id, D.messageSlot.messageType)
.sendInviteResponsePhoto(params, D.invite.id)
.catch((err) => {
throw err;
})
@@ -76,7 +75,7 @@
});
} else {
notificationRequest
.sendInviteResponse(params, D.invite.id, D.messageSlot.messageType)
.sendInviteResponse(params, D.invite.id)
.catch((err) => {
throw err;
})

15
src/views/Notifications/dialogs/SendInviteResponseDialog.vue
View File

@@ -46,13 +46,12 @@
<EditAndSendInviteResponseDialog
:edit-and-send-invite-response-dialog="editAndSendInviteResponseDialog"
:send-invite-response-dialog="sendInviteResponseDialog"
@update:edit-and-send-invite-response-dialog="editAndSendInviteResponseDialog = $event"
@update:send-invite-response-dialog="sendInviteResponseDialog = $event"
@closeResponseConfirmDialog="closeResponseConfirmDialog"
@closeInviteDialog="closeInviteDialog" />
<SendInviteResponseConfirmDialog
:send-invite-response-dialog="sendInviteResponseDialog"
:send-invite-response-confirm-dialog="sendInviteResponseConfirmDialog"
@update:send-invite-response-dialog="sendInviteResponseDialog = $event"
@closeResponseConfirmDialog="closeResponseConfirmDialog"
@closeInviteDialog="closeInviteDialog" />
</el-dialog>
</template>
@@ -92,7 +91,7 @@
newMessage: ''
});
const emit = defineEmits(['update:sendInviteResponseDialogVisible']);
const emit = defineEmits(['update:sendInviteResponseDialogVisible', 'update:sendInviteResponseDialog']);
const sendInviteResponseConfirmDialog = ref({
visible: false
@@ -106,15 +105,19 @@
emit('update:sendInviteResponseDialogVisible', false);
}
function closeResponseConfirmDialog() {
sendInviteResponseConfirmDialog.value.visible = false;
}
function showEditAndSendInviteResponseDialog(row) {
props.sendInviteResponseDialog.messageSlot = row;
emit('update:sendInviteResponseDialog', { ...props.sendInviteResponseDialog, messageSlot: row });
editAndSendInviteResponseDialog.value = {
newMessage: row.message,
visible: true
};
}
function showSendInviteResponseConfirmDialog(row) {
props.sendInviteResponseDialog.messageSlot = row;
emit('update:sendInviteResponseDialog', { ...props.sendInviteResponseDialog, messageSlot: row });
sendInviteResponseConfirmDialog.value.visible = true;
}
</script>