diff --git a/resources/js/components/ConfirmModal.vue b/resources/js/components/ConfirmModal.vue index 81e31b6..036ac9e 100644 --- a/resources/js/components/ConfirmModal.vue +++ b/resources/js/components/ConfirmModal.vue @@ -1,17 +1,15 @@ @@ -21,7 +19,7 @@ import { DialogTitle } from '@headlessui/vue'; import Btn from '~/components/Btn.vue'; import Modal from '~/components/Modal.vue'; -defineProps<{ isOpen: boolean }>(); +defineProps<{ isOpen: boolean; title: string; description: string }>(); const emit = defineEmits(['closed', 'confirm']); diff --git a/resources/js/components/batch/BatchMint.vue b/resources/js/components/batch/BatchMint.vue index caa66ff..5457261 100644 --- a/resources/js/components/batch/BatchMint.vue +++ b/resources/js/components/batch/BatchMint.vue @@ -54,7 +54,7 @@ > Cancel - Batch Mint + Batch Mint diff --git a/resources/js/components/batch/BatchSetAttribute.vue b/resources/js/components/batch/BatchSetAttribute.vue index b7cfc6f..5011fa0 100644 --- a/resources/js/components/batch/BatchSetAttribute.vue +++ b/resources/js/components/batch/BatchSetAttribute.vue @@ -97,7 +97,7 @@ > Cancel - Batch Set Attribute + Batch Set Attribute diff --git a/resources/js/components/batch/BatchTransfer.vue b/resources/js/components/batch/BatchTransfer.vue index 16e3f2c..724ea39 100644 --- a/resources/js/components/batch/BatchTransfer.vue +++ b/resources/js/components/batch/BatchTransfer.vue @@ -61,7 +61,7 @@ > Cancel - Batch Transfer + Batch Transfer diff --git a/resources/js/components/pages/Settings.vue b/resources/js/components/pages/Settings.vue index 60c5b3d..d88e1aa 100644 --- a/resources/js/components/pages/Settings.vue +++ b/resources/js/components/pages/Settings.vue @@ -68,7 +68,9 @@ /> - Revoke + + Revoke + @@ -90,6 +92,13 @@ + @@ -105,6 +114,7 @@ import FormInput from '../FormInput.vue'; import { shortString, snackbarErrors } from '~/util'; import CopyTextIcon from '../CopyTextIcon.vue'; import LoadingCircle from '../LoadingCircle.vue'; +import ConfirmModal from '../ConfirmModal.vue'; const router = useRouter(); const appStore = useAppStore(); @@ -114,6 +124,8 @@ const tokenName = ref(); const enableTokenCreate = ref(false); const loading = ref(appStore.user || !appStore.hasMultiTenantPackage ? false : true); const creating = ref(false); +const confirmModal = ref(false); +const confirmModalName = ref(); const tokens = computed(() => appStore.user?.apiTokens); @@ -138,17 +150,27 @@ const createApiToken = async () => { } }; -const revokeToken = async (name: string) => { - if (!name) return; +const revokeToken = async () => { + if (!confirmModalName.value) return; + try { - await appStore.revokeToken(name); - snackbar.info({ title: 'Token revoked', text: `Your token ${name} has been revoked.` }); + await appStore.revokeToken(confirmModalName.value); + snackbar.info({ title: 'Token revoked', text: `Your token ${confirmModalName.value} has been revoked.` }); + confirmModalName.value = null; } catch (e: any) { if (snackbarErrors(e)) return; snackbar.error({ title: 'Token revocation failed' }); + } finally { + confirmModal.value = false; + confirmModalName.value = null; } }; +const confirmRevoke = (name: string) => { + confirmModal.value = true; + confirmModalName.value = name; +}; + const logout = async () => { await appStore.logout(); router.push({ name: 'platform.auth.login' }); diff --git a/resources/js/components/pages/create/CreateBeam.vue b/resources/js/components/pages/create/CreateBeam.vue index 389836b..cf41f73 100644 --- a/resources/js/components/pages/create/CreateBeam.vue +++ b/resources/js/components/pages/create/CreateBeam.vue @@ -82,7 +82,7 @@ > Cancel - Create + Create diff --git a/resources/js/components/pages/create/CreateCollection.vue b/resources/js/components/pages/create/CreateCollection.vue index b102eca..0d30249 100644 --- a/resources/js/components/pages/create/CreateCollection.vue +++ b/resources/js/components/pages/create/CreateCollection.vue @@ -205,7 +205,7 @@ > Cancel - Create + Create diff --git a/resources/js/components/pages/create/CreateFuelTank.vue b/resources/js/components/pages/create/CreateFuelTank.vue index 810de24..29cc953 100644 --- a/resources/js/components/pages/create/CreateFuelTank.vue +++ b/resources/js/components/pages/create/CreateFuelTank.vue @@ -120,7 +120,7 @@ > Cancel - Create + Create diff --git a/resources/js/components/pages/create/CreateListing.vue b/resources/js/components/pages/create/CreateListing.vue index 9c1f1fd..a069b15 100644 --- a/resources/js/components/pages/create/CreateListing.vue +++ b/resources/js/components/pages/create/CreateListing.vue @@ -143,7 +143,7 @@ > Cancel - Create + Create diff --git a/resources/js/components/pages/create/CreateToken.vue b/resources/js/components/pages/create/CreateToken.vue index 8a82010..ee8246b 100644 --- a/resources/js/components/pages/create/CreateToken.vue +++ b/resources/js/components/pages/create/CreateToken.vue @@ -211,7 +211,7 @@ > Cancel - Create + Create diff --git a/resources/js/components/slideovers/beam/DeleteBeamSlideover.vue b/resources/js/components/slideovers/beam/DeleteBeamSlideover.vue index 4bc7e33..4fe91d3 100644 --- a/resources/js/components/slideovers/beam/DeleteBeamSlideover.vue +++ b/resources/js/components/slideovers/beam/DeleteBeamSlideover.vue @@ -24,7 +24,7 @@
Cancel - Delete + Delete
diff --git a/resources/js/components/slideovers/beam/ExpireBeamSlideover.vue b/resources/js/components/slideovers/beam/ExpireBeamSlideover.vue index 6eafc4b..fa4a2a1 100644 --- a/resources/js/components/slideovers/beam/ExpireBeamSlideover.vue +++ b/resources/js/components/slideovers/beam/ExpireBeamSlideover.vue @@ -25,7 +25,7 @@
Cancel - Expire + Expire
diff --git a/resources/js/components/slideovers/beam/UpdateBeamSlideover.vue b/resources/js/components/slideovers/beam/UpdateBeamSlideover.vue index cae4ca5..32e655e 100644 --- a/resources/js/components/slideovers/beam/UpdateBeamSlideover.vue +++ b/resources/js/components/slideovers/beam/UpdateBeamSlideover.vue @@ -64,7 +64,7 @@
Cancel - Update + Update
diff --git a/resources/js/components/slideovers/collection/ApproveCollectionSlideover.vue b/resources/js/components/slideovers/collection/ApproveCollectionSlideover.vue index b0aa414..3bd387d 100644 --- a/resources/js/components/slideovers/collection/ApproveCollectionSlideover.vue +++ b/resources/js/components/slideovers/collection/ApproveCollectionSlideover.vue @@ -55,7 +55,7 @@
Cancel - Approve + Approve
diff --git a/resources/js/components/slideovers/collection/AttributesCollectionSlideover.vue b/resources/js/components/slideovers/collection/AttributesCollectionSlideover.vue index 033884e..617f8ed 100644 --- a/resources/js/components/slideovers/collection/AttributesCollectionSlideover.vue +++ b/resources/js/components/slideovers/collection/AttributesCollectionSlideover.vue @@ -82,7 +82,7 @@
Cancel - + {{ attributeActions.find((a) => a.value === attributeAction)?.btnText }}
diff --git a/resources/js/components/slideovers/collection/DestroyCollectionSlideover.vue b/resources/js/components/slideovers/collection/DestroyCollectionSlideover.vue index f96c5d8..5126845 100644 --- a/resources/js/components/slideovers/collection/DestroyCollectionSlideover.vue +++ b/resources/js/components/slideovers/collection/DestroyCollectionSlideover.vue @@ -41,7 +41,7 @@
Cancel - Destroy + Destroy
diff --git a/resources/js/components/slideovers/collection/MutateCollectionSlideover.vue b/resources/js/components/slideovers/collection/MutateCollectionSlideover.vue index 73dd371..eacdc76 100644 --- a/resources/js/components/slideovers/collection/MutateCollectionSlideover.vue +++ b/resources/js/components/slideovers/collection/MutateCollectionSlideover.vue @@ -99,7 +99,7 @@
Cancel - Mutate + Mutate
diff --git a/resources/js/components/slideovers/collection/UnapproveCollectionSlideover.vue b/resources/js/components/slideovers/collection/UnapproveCollectionSlideover.vue index 49ca06a..7dea2ae 100644 --- a/resources/js/components/slideovers/collection/UnapproveCollectionSlideover.vue +++ b/resources/js/components/slideovers/collection/UnapproveCollectionSlideover.vue @@ -48,7 +48,7 @@
Cancel - Unapprove + Unapprove
diff --git a/resources/js/components/slideovers/common/FreezeSlideover.vue b/resources/js/components/slideovers/common/FreezeSlideover.vue index 760a2dc..69334ae 100644 --- a/resources/js/components/slideovers/common/FreezeSlideover.vue +++ b/resources/js/components/slideovers/common/FreezeSlideover.vue @@ -81,7 +81,7 @@
Cancel - Freeze + Freeze
diff --git a/resources/js/components/slideovers/common/RetryTransactionSlideover.vue b/resources/js/components/slideovers/common/RetryTransactionSlideover.vue index 9df3f58..2c3622b 100644 --- a/resources/js/components/slideovers/common/RetryTransactionSlideover.vue +++ b/resources/js/components/slideovers/common/RetryTransactionSlideover.vue @@ -25,10 +25,16 @@
Cancel - Retry + Retry
- +