diff --git a/app/src/components/CompleteModal.vue b/app/src/components/CompleteModal.vue index 81e632d..057a474 100644 --- a/app/src/components/CompleteModal.vue +++ b/app/src/components/CompleteModal.vue @@ -8,7 +8,7 @@ import CompleteAnimation from '../img/complete-animation.json' const showModal = ref(true) // Controls whether the modal is visible or not const router = useRouter() - +const toast = useToast() const closeModal = () => { showModal.value = false } @@ -27,7 +27,7 @@ const backtoMap = async () => { router.push({ name: 'map' }) } catch (err) { // useToast().error('Failed to load map') - useToast().error('無法讀取地圖') + toast.error('無法讀取地圖') console.error(err) } } diff --git a/app/src/components/QuestMap.vue b/app/src/components/QuestMap.vue index 40e9a46..734c2ab 100644 --- a/app/src/components/QuestMap.vue +++ b/app/src/components/QuestMap.vue @@ -77,22 +77,13 @@ const genOption = (nodes, edges) => ({ const { data: { completed, unlocked }, } = params - switch (completed !== unlocked) { - case false: { - // completed==unlocked, when completed or not yet unlocked - if (completed) { - return '#00ff00' - } - return '#454552' - } - case true: { - // completed!=unlocked, only when unlocked but not completed - return '#ADADB5' - } - default: { - return '#454552' - } + if (completed) { + return '#00ff00' } + if (unlocked) { + return '#ADADB5' + } + return '454552' }, }, },