refactor: fix links + enforce closing the modal only with x button

tassiluca · Feb 1, 2024 · d39038b · d39038b
1 parent b362d1d
commit d39038b
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 8 deletions.
diff --git a/frontend/src/components/vote/RequestCodeModal.vue b/frontend/src/components/vote/RequestCodeModal.vue
@@ -35,7 +35,7 @@ function sendCodeRequest(id: string) {
 </script>
 
 <template>
-  <div class="modal fade" tabindex="-1">
+  <div class="modal fade" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1">
     <div class="modal-dialog modal-xl">
       <div class="modal-content">
         <div class="modal-header">

diff --git a/frontend/src/router/index.ts b/frontend/src/router/index.ts
@@ -9,7 +9,6 @@ import CreateElectionView from "@/views/CreateElectionView.vue";
 import RegisterView from "@/views/RegisterView.vue";
 import UserAreaView from "@/views/UserAreaView.vue";
 import ElectionDetails from "@/views/ElectionDetails.vue";
-import ElectionsTestView from '@/views/ElectionsTestView.vue';
 import CodeInsertionView from '@/views/CodeInsertionView.vue';
 import VoteView from "@/views/VoteView.vue";
 import ElectionsView from "@/views/ElectionsView.vue";
@@ -72,11 +71,6 @@ const router = createRouter({
         allowed: [Role.User, Role.Admin]
       }
     },
-    {
-      path: '/test-modal',
-      name: 'test-modal',
-      component: ElectionsTestView
-    },
     {
       path: '/insert-code/:id',
       name: 'insert-code',

diff --git a/frontend/src/views/ElectionDetails.vue b/frontend/src/views/ElectionDetails.vue
@@ -60,7 +60,7 @@ async function getVotingDetails(id: string) {
 </script>
 
 <template>
-  <Breadcrumb :paths="[{name: 'Dashboard', link: '/dashboard'}, {name: 'Details', link: '/voting/details'}]" />
+  <Breadcrumb :paths="[{name: 'Dashboard', link: '/dashboard'}, {name: 'Details', link: '/elections/details'}]" />
   <div v-if="election" class="container-sm col-md-7 text-center">
     <PageTitle title="Voting details" />
     <div class="row">

diff --git a/frontend/src/views/VoteView.vue b/frontend/src/views/VoteView.vue
@@ -19,6 +19,7 @@
         submitting.value = true;
         try {
           response.value = await useVotingStore().castVote(choosedOption.value);
+          setTimeout(async () => await router.replace(`/elections/${electionId}`), 2000);
         } catch (e: any) {
           response.value = {
             success: false,