From 2f02fdce1d036fc7092e69c6b9b574ddd67bef7e Mon Sep 17 00:00:00 2001 From: Brandon Sprague Date: Wed, 24 Jan 2024 16:15:39 -0800 Subject: [PATCH 1/3] Update NVMRC version Fixing deploy, see https://github.com/RMI-PACTA/app/actions/runs/7647915614/job/20839748220 --- .nvmrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.nvmrc b/.nvmrc index 7da30cb..4a58985 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -16.13 +18.18 From 462dbcd1c63a137db57eaa8634f34635be6959f4 Mon Sep 17 00:00:00 2001 From: Brandon Sprague Date: Wed, 24 Jan 2024 16:18:40 -0800 Subject: [PATCH 2/3] Build dev before lint + typecheck Required to have access to `.nuxt/` generated things --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 995ae1a..b1bac63 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -45,9 +45,9 @@ jobs: working-directory: frontend run: | npm ci + npm run build:dev npm run lint npm run typecheck - npm run build:dev - name: Run all builds and tests run: | From d4476e724056a61811575561d353d449c15fabb7 Mon Sep 17 00:00:00 2001 From: Brandon Sprague Date: Wed, 24 Jan 2024 16:56:41 -0800 Subject: [PATCH 3/3] Fix loading issue --- frontend/composables/useModal.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/frontend/composables/useModal.ts b/frontend/composables/useModal.ts index 6cc72b0..8cb7351 100644 --- a/frontend/composables/useModal.ts +++ b/frontend/composables/useModal.ts @@ -41,7 +41,7 @@ export const useModal = () => { loadingSet.value.add(loadKey) } const stopLoading = (loadKey: string) => { - return () => loadingSet.value.delete(loadKey) + loadingSet.value.delete(loadKey) } const clearLoading = () => { loadingSet.value.clear() } const withLoading = (fn: () => Promise, opKey: string): Promise => { @@ -64,7 +64,7 @@ export const useModal = () => { startLoading(opKey) onMounted(() => { fn() - stopLoading(opKey)() + stopLoading(opKey) }) } @@ -97,7 +97,6 @@ export const useModal = () => { withLoading, onMountedWithLoading, startLoading, - stopLoading, clearLoading, loading, loadingSet,