diff --git a/frontend/package-lock.json b/frontend/package-lock.json index dd93da32..2f2b0ada 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -1552,9 +1552,6 @@ "node": ">=6" } }, - "node_modules/cli-cursor": { - "dev": true - }, "node_modules/cli-truncate": { "version": "2.1.0", "dev": true, @@ -2261,9 +2258,6 @@ "integrity": "sha512-zFBQ7WFRvVRhKcWoUh+ZA1g2HVgUbsZm9sbddh8EC5iv93sui8DVVz1Npvz+r6meo9VKfa8NyLWBsQK1VvIKPA==", "license": "MIT" }, - "node_modules/debug": { - "dev": true - }, "node_modules/decamelize": { "version": "1.2.0", "dev": true, @@ -3288,6 +3282,19 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/log-update/node_modules/cli-cursor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", + "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", + "dev": true, + "license": "MIT", + "dependencies": { + "restore-cursor": "^3.1.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/log-update/node_modules/slice-ansi": { "version": "4.0.0", "dev": true, @@ -4470,6 +4477,24 @@ "eslint": ">=6.0.0" } }, + "node_modules/vue-eslint-parser/node_modules/debug": { + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", + "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "^2.1.3" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, "node_modules/vue-i18n": { "version": "10.0.8", "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-10.0.8.tgz", diff --git a/frontend/src/components/Round/RoundEdit.vue b/frontend/src/components/Round/RoundEdit.vue index 50c89a73..1f0f2a36 100644 --- a/frontend/src/components/Round/RoundEdit.vue +++ b/frontend/src/components/Round/RoundEdit.vue @@ -191,7 +191,7 @@ const deleteRound = () => { .cancelRound(props.round.id) .then(() => { emit('update:isRoundEditing', false) - router.reload() + router.go(0) }) .catch(alertService.error) } diff --git a/frontend/src/components/Vote/VoteEdit.vue b/frontend/src/components/Vote/VoteEdit.vue index 7a5e4eb0..19bb367f 100644 --- a/frontend/src/components/Vote/VoteEdit.vue +++ b/frontend/src/components/Vote/VoteEdit.vue @@ -410,14 +410,17 @@ watch(locale, (newLocale) => { dayjs.locale(newLocale) }) +// Attach scroll listener once the container is rendered (v-else-if means it's null on mount) +watch(editVoteContainer, (el) => { + if (el) { + el.addEventListener('scroll', handleScroll) + } +}) + onMounted(() => { getRoundDetails(voteId) getPastVotes(voteId) - if (editVoteContainer.value) { - editVoteContainer.value.addEventListener('scroll', handleScroll) - } - handleResize() window.addEventListener('resize', handleResize) }) diff --git a/frontend/src/components/Vote/VoteRating.vue b/frontend/src/components/Vote/VoteRating.vue index 80c26ceb..dda648b9 100644 --- a/frontend/src/components/Vote/VoteRating.vue +++ b/frontend/src/components/Vote/VoteRating.vue @@ -57,7 +57,7 @@
- + @@ -70,6 +70,16 @@
+ +

{{ $t('montage-vote-actions') }}

@@ -85,7 +95,7 @@
- + {{ $t('montage-vote-skip') }} @@ -166,7 +176,7 @@ diff --git a/frontend/src/components/Vote/VoteYesNo.vue b/frontend/src/components/Vote/VoteYesNo.vue index 66e15503..e8e11483 100644 --- a/frontend/src/components/Vote/VoteYesNo.vue +++ b/frontend/src/components/Vote/VoteYesNo.vue @@ -56,10 +56,10 @@
- + {{ $t('montage-vote-accept') }} - + {{ $t('montage-vote-decline') }}
@@ -71,6 +71,16 @@
+ +

{{ $t('montage-vote-actions') }}

@@ -86,7 +96,7 @@
- + {{ $t('montage-vote-skip') }} @@ -170,7 +180,7 @@