nobigtech
/
fedilove
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add confirmation on quiz.send and discard actions + Some z-index fixes

This commit is contained in:
Niko 2022-03-02 01:17:55 +01:00
parent 3519aba243
commit 08bc50fcea
4 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/src/app/css/app.css
View File

@ -96,7 +96,6 @@ img.avatar {
filter: grayscale() !important; filter: grayscale() !important;
cursor: initial !important; cursor: initial !important;
user-select: none; user-select: none;
z-index: -1;
} }
.button.floating { .button.floating {
padding: 1.5em; padding: 1.5em;
@ -523,6 +522,7 @@ main {
overflow: auto; overflow: auto;
user-select: none; user-select: none;
pointer-events: none; pointer-events: none;
z-index: 100;
} }
#toasts { #toasts {
margin: auto; margin: auto;

8
web/src/app/js/pages/quiz.js
View File

@ -157,7 +157,9 @@ app.pages.quiz = {
} }
}, },
actions: { actions: {
discard: function() { discard: async function() {
if (!await app.toast.warnConfirm(app.strings.app.confirm.crush_discard))
return false;
const dt = page().data; const dt = page().data;
if (dt.from === undefined) if (dt.from === undefined)
return; // TODO: add unknown error? return; // TODO: add unknown error?
@ -165,7 +167,9 @@ app.pages.quiz = {
setTimeout(function(){ exit() }, app.toast.DEFAULT_MILLIS); setTimeout(function(){ exit() }, app.toast.DEFAULT_MILLIS);
}); });
}, },
send: function() { send: async function() {
if (!await app.toast.infoConfirm(app.strings.app.confirm.crush_send_quiz))
return false;
const form = document.querySelector('form#quiz'); const form = document.querySelector('form#quiz');
var data = { quiz_id: page().data.id }; var data = { quiz_id: page().data.id };
for (var i = 0; i < page().data.content.length; i++) { for (var i = 0; i < page().data.content.length; i++) {

4
web/src/config/lang/en.php
View File

@ -44,6 +44,10 @@ $strings = [
'discarded_success_2' => 'Maybe other person like you, but not me', 'discarded_success_2' => 'Maybe other person like you, but not me',
'discarded_success_3' => 'You\'ll find someone, but it won\'t be me', 'discarded_success_3' => 'You\'ll find someone, but it won\'t be me',
], ],
'confirm' => [
'crush_send_quiz' => 'Are you sure?. This Quiz will be sent to your Crush and you won\'t be able to modify it.',
'crush_discard' => 'Are you sure?. You will no longer see your Crush anywhere on FediLove.',
],
'warn' => [ 'warn' => [
'already_following' => 'This person has already accepted being your crush', 'already_following' => 'This person has already accepted being your crush',
], ],

4
web/src/config/lang/es.php
View File

@ -44,6 +44,10 @@ $strings = [
'discarded_success_2' => 'Quizás le guste a otra persona, pero a mi no', 'discarded_success_2' => 'Quizás le guste a otra persona, pero a mi no',
'discarded_success_3' => 'Encontrarás a alguien, pero no seré yo', 'discarded_success_3' => 'Encontrarás a alguien, pero no seré yo',
], ],
'confirm' => [
'crush_send_quiz' => '¿Estás seguro?. Este Quiz se enviará a tu Crush y posteriormente no podrás modificarlo.',
'crush_discard' => '¿Estás seguro?. No volverás a ver a tu Crush en ningún lugar de FediLove.',
],
'warn' => [ 'warn' => [
'already_following' => 'Esta persona ya te ha aceptado como su crush', 'already_following' => 'Esta persona ya te ha aceptado como su crush',
], ],