lfk/frontend
2
0
Fork 0
Code Issues 3 Pull Requests Actions Projects Releases Wiki Activity

Fixed delete_triggered not getting reset

Browse Source 
ref #103
This commit is contained in:
Nicolai Ort 2021-03-19 18:50:15 +01:00
parent 418f9c2662
commit e76e5abcf8
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/components/settings/ConfirmProfileDeletion.svelte
View File

@ -6,10 +6,12 @@
import Toastify from "toastify-js"; import Toastify from "toastify-js";
import { createEventDispatcher } from "svelte"; import { createEventDispatcher } from "svelte";
export let modal_open; export let modal_open;
export let delete_triggered;
const dispatch = createEventDispatcher(); const dispatch = createEventDispatcher();
function cancelDelete() { function cancelDelete() {
modal_open = false; modal_open = false;
dispatch("cancelDelete", { id: delete_donor.id }); delete_triggered = false;
dispatch("cancelDelete");
} }
function deleteMe() { function deleteMe() {
MeService.meControllerRemove(true) MeService.meControllerRemove(true)
@ -25,6 +27,7 @@
} }
</script> </script>
{modal_open}
{#if modal_open} {#if modal_open}
<div <div
class="fixed z-10 inset-0 overflow-y-auto" class="fixed z-10 inset-0 overflow-y-auto"

10
src/components/settings/Settings.svelte
View File

@ -8,11 +8,11 @@
$: delete_triggered = false; $: delete_triggered = false;
$: original_data = {}; $: original_data = {};
$: editable = {}; $: editable = {};
$: modal_open = false;
$: changes_performed = !( $: changes_performed = !(
JSON.stringify(editable) === JSON.stringify(original_data) JSON.stringify(editable) === JSON.stringify(original_data)
); );
$: save_enabled = changes_performed && isEmail(editable.email); $: save_enabled = changes_performed && isEmail(editable.email);
let modal_open = false;
const user_promise = MeService.meControllerGet().then((data) => { const user_promise = MeService.meControllerGet().then((data) => {
data_loaded = true; data_loaded = true;
data.groups = data.groups.map((g) => g.id); data.groups = data.groups.map((g) => g.id);
@ -42,7 +42,7 @@
} }
</script> </script>
<ConfirmProfileDeletion bind:modal_open /> <ConfirmProfileDeletion bind:modal_open bind:delete_triggered/>
<div class="pt-12 px-4 sm:px-6 lg:px-8 lg:pt-20 bg-gray-900 pb-12"> <div class="pt-12 px-4 sm:px-6 lg:px-8 lg:pt-20 bg-gray-900 pb-12">
<div class="text-center mb-8"> <div class="text-center mb-8">
<h1 <h1
@ -51,7 +51,7 @@
</h1> </h1>
</div> </div>
</div> </div>
{modal_open}
<div class="pt-0 pb-16 bg-gray-50 overflow-hidden lg:pt-12 lg:py-24"> <div class="pt-0 pb-16 bg-gray-50 overflow-hidden lg:pt-12 lg:py-24">
<div class="max-w-7xl mx-auto py-6 px-4 sm:px-6 lg:px-8"> <div class="max-w-7xl mx-auto py-6 px-4 sm:px-6 lg:px-8">
<div> <div>
@ -195,7 +195,9 @@
<span data-id="donor_actions_${editable.id}"> <span data-id="donor_actions_${editable.id}">
{#if delete_triggered} {#if delete_triggered}
<button <button
on:click={modal_open=true} on:click={()=>{
modal_open = true;
}}
class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-red-600 text-base font-medium text-white hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-red-500 sm:ml-3 sm:w-auto sm:">{$_('confirm-deletion')}</button> class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-red-600 text-base font-medium text-white hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-red-500 sm:ml-3 sm:w-auto sm:">{$_('confirm-deletion')}</button>
<button <button
on:click={() => { on:click={() => {