From c019fafe520d6cb699d39252c628bd517d241b44 Mon Sep 17 00:00:00 2001 From: Annika Date: Fri, 5 Aug 2022 16:08:24 -0600 Subject: [PATCH] moved trycatch to the correct location lol --- .../src/components/KeepModalButtons.vue | 21 ++++++++++---- keepr.client/src/components/KeepsList.vue | 20 ------------- keepr.client/src/components/NewKeepModal.vue | 23 ++++++++------- keepr.client/src/components/NewVaultModal.vue | 22 +++++++++------ .../src/components/VaultKeepModalButtons.vue | 25 +++++++++++------ keepr.client/src/pages/HomePage.vue | 7 +++++ keepr.client/src/pages/ProfilePage.vue | 6 ++++ keepr.client/src/pages/VaultPage.vue | 28 +++++++++++++------ keepr.client/src/services/KeepsService.js | 20 ------------- keepr.client/src/services/ProfilesService.js | 16 ----------- .../src/services/VaultKeepsService.js | 10 ------- keepr.client/src/services/VaultsService.js | 14 ---------- todo.md | 8 ++++++ 13 files changed, 101 insertions(+), 119 deletions(-) delete mode 100644 keepr.client/src/components/KeepsList.vue create mode 100644 todo.md diff --git a/keepr.client/src/components/KeepModalButtons.vue b/keepr.client/src/components/KeepModalButtons.vue index 9221f7d..3d1cd6b 100644 --- a/keepr.client/src/components/KeepModalButtons.vue +++ b/keepr.client/src/components/KeepModalButtons.vue @@ -67,14 +67,25 @@ export default { }, async deleteKeep() { - await keepsService.delete(props.keep.id) - Modal.getOrCreateInstance(document.getElementById("keepModal")).hide(); - // do more things + try { + await keepsService.delete(props.keep.id) + Modal.getOrCreateInstance(document.getElementById("keepModal")).hide(); + + } catch (error) { + logger.error(error) + Pop.toast(error) + } }, async addToVault(vaultId) { - await vaultKeepsService.create(props.keep.id, vaultId) - Modal.getOrCreateInstance(document.getElementById("keepModal")).hide(); + try { + await vaultKeepsService.create(props.keep.id, vaultId) + Modal.getOrCreateInstance(document.getElementById("keepModal")).hide(); + + } catch (error) { + logger.error(error) + Pop.toast(error) + } } } } diff --git a/keepr.client/src/components/KeepsList.vue b/keepr.client/src/components/KeepsList.vue deleted file mode 100644 index 27669d3..0000000 --- a/keepr.client/src/components/KeepsList.vue +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/keepr.client/src/components/NewKeepModal.vue b/keepr.client/src/components/NewKeepModal.vue index 1aa161a..d82e050 100644 --- a/keepr.client/src/components/NewKeepModal.vue +++ b/keepr.client/src/components/NewKeepModal.vue @@ -54,17 +54,20 @@ export default { tags: "", async createKeep() { - let newKeep = { - name: this.name, - img: this.img, - description: this.description - // ,tags: this.tags + try { + let newKeep = { + name: this.name, + img: this.img, + description: this.description + // ,tags: this.tags + } + await keepsService.create(newKeep) + Modal.getOrCreateInstance(document.getElementById("newKeepModal")).hide() + + } catch (error) { + logger.error(error) + Pop.toast(error0) } - await keepsService.create(newKeep) - Modal.getOrCreateInstance(document.getElementById("newKeepModal")).hide(); - - // reload vaults - // close modal } } } diff --git a/keepr.client/src/components/NewVaultModal.vue b/keepr.client/src/components/NewVaultModal.vue index f75296d..43df579 100644 --- a/keepr.client/src/components/NewVaultModal.vue +++ b/keepr.client/src/components/NewVaultModal.vue @@ -47,14 +47,20 @@ export default { isPrivate: false, async createVault() { - let newVault = { - name: this.name, - img: this.img, - isPrivate: this.isPrivate - } - - await vaultsService.createVault(newVault) - Modal.getOrCreateInstance(document.getElementById("newVaultModal")).hide(); + try { + let newVault = { + name: this.name, + img: this.img, + isPrivate: this.isPrivate + } + + await vaultsService.createVault(newVault) + Modal.getOrCreateInstance(document.getElementById("newVaultModal")).hide(); + + } catch (error) { + logger.error(error) + Pop.toast(error) + } } } } diff --git a/keepr.client/src/components/VaultKeepModalButtons.vue b/keepr.client/src/components/VaultKeepModalButtons.vue index 1abdd33..fa698f8 100644 --- a/keepr.client/src/components/VaultKeepModalButtons.vue +++ b/keepr.client/src/components/VaultKeepModalButtons.vue @@ -54,17 +54,26 @@ export default { }, async removeFromVault() { - // props.keep don't have vaultKeepId... - logger.log(props.keep) - await vaultKeepsService.delete(props.keep.vaultKeepId) - Modal.getOrCreateInstance(document.getElementById("keepModal")).hide(); + try { + await vaultKeepsService.delete(props.keep.vaultKeepId) + Modal.getOrCreateInstance(document.getElementById("keepModal")).hide(); + + } catch (error) { + logger.error(error) + Pop.toast(error) + } }, async deleteKeep() { - await keepsService.delete(props.keep.id) - await vaultKeepsService.delete(props.keep.vaultKeepId) - Modal.getOrCreateInstance(document.getElementById("keepModal")).hide(); - // do more things + try { + await keepsService.delete(props.keep.id) + await vaultKeepsService.delete(props.keep.vaultKeepId) + Modal.getOrCreateInstance(document.getElementById("keepModal")).hide(); + + } catch (error) { + logger.error(error) + Pop.toast(error) + } } } } diff --git a/keepr.client/src/pages/HomePage.vue b/keepr.client/src/pages/HomePage.vue index 0e60553..1213f96 100644 --- a/keepr.client/src/pages/HomePage.vue +++ b/keepr.client/src/pages/HomePage.vue @@ -35,11 +35,18 @@ export default { return { keeps: computed(() => AppState.keeps), activeKeep: computed(() => AppState.activeKeep), + viewKeep(keep) { + try { // AppState.activeKeep = keep; // make API call to trigger view counter keepsService.getById(keep.id) Modal.getOrCreateInstance(document.getElementById("keepModal")).show(); + + } catch (error) { + logger.error(error) + Pop.toast(error) + } } }; }, diff --git a/keepr.client/src/pages/ProfilePage.vue b/keepr.client/src/pages/ProfilePage.vue index 43ef53d..40f0403 100644 --- a/keepr.client/src/pages/ProfilePage.vue +++ b/keepr.client/src/pages/ProfilePage.vue @@ -81,11 +81,17 @@ export default { activeKeep: computed(() => AppState.activeKeep), async viewKeep(keep) { + try { keep.creator = AppState.activeProfile; // AppState.activeKeep = keep // make API call to trigger view counter keepsService.getById(keep.id) Modal.getOrCreateInstance(document.getElementById("keepModal")).show(); + + } catch (error) { + logger.error(error) + Pop.toast(error) + } }, async viewVault(vault) { diff --git a/keepr.client/src/pages/VaultPage.vue b/keepr.client/src/pages/VaultPage.vue index 3124c5e..03ea01f 100644 --- a/keepr.client/src/pages/VaultPage.vue +++ b/keepr.client/src/pages/VaultPage.vue @@ -60,17 +60,29 @@ export default { account: computed(() => AppState.account), async viewKeep(keep) { - // AppState.activeKeep = keep - // make API call to trigger view counter - // debugger - await keepsService.getById(keep.id) - AppState.activeKeep = keep - Modal.getOrCreateInstance(document.getElementById('keepModal')).show() + try { + // AppState.activeKeep = keep + // make API call to trigger view counter + // debugger + await keepsService.getById(keep.id) + AppState.activeKeep = keep + Modal.getOrCreateInstance(document.getElementById('keepModal')).show() + + } catch (error) { + logger.error(error) + Pop.toast(error) + } }, async deleteVault() { - await vaultsService.delete(AppState.activeVault.id, AppState.vaultKeeps) - router.push({ name: "Profile", params: { id: AppState.account.id } }) + try { + await vaultsService.delete(AppState.activeVault.id, AppState.vaultKeeps) + router.push({ name: "Profile", params: { id: AppState.account.id } }) + + } catch (error) { + logger.error(error) + Pop.toast(error) + } } }; }, diff --git a/keepr.client/src/services/KeepsService.js b/keepr.client/src/services/KeepsService.js index 765b554..1a4e848 100644 --- a/keepr.client/src/services/KeepsService.js +++ b/keepr.client/src/services/KeepsService.js @@ -5,49 +5,29 @@ import Pop from '../utils/Pop' class KeepsService { async getAll() { - try { const res = await api.get('api/keeps') AppState.keeps = res.data - } catch (error) { - logger.error(error) - Pop.error(error) - } } async getById(id) { - try { const res = await api.get('api/keeps/' + id) AppState.activeKeep = res.data - } catch (error) { - logger.error(error) - Pop.error(error) - } } async create(newKeep) { - try { const res = await api.post('api/keeps', newKeep) // logger.log(res.data) AppState.profileKeeps.push(res.data) AppState.keeps.push(res.data) // this.getAll() - } catch (error) { - logger.error(error) - Pop.error(error) - } } async delete(keepId) { - try { const res = await api.delete('api/keeps/' + keepId) // logger.log(res.data) // AppState.keeps.filter((k) => k.id != res.data) // AppState.keeps.filter((k) => k.id != keepId) this.getAll() - } catch (error) { - logger.error(error) - Pop.error(error) - } } } diff --git a/keepr.client/src/services/ProfilesService.js b/keepr.client/src/services/ProfilesService.js index ecaaf85..81d6e59 100644 --- a/keepr.client/src/services/ProfilesService.js +++ b/keepr.client/src/services/ProfilesService.js @@ -4,41 +4,25 @@ import { api } from './AxiosService' class ProfilesService { async getProfile(profileId) { - try { const res = await api.get('api/profiles/' + profileId) // logger.log(res.data) AppState.activeProfile = res.data - } catch (error) { - logger.error(error) - } } async getKeeps(profileId) { - try { const res = await api.get('api/profiles/' + profileId + '/keeps') AppState.profileKeeps = res.data - } catch (error) { - logger.error(error) - } } async getVaults(profileId) { - try { const res = await api.get('api/profiles/' + profileId + '/vaults') logger.log(res.data) AppState.profileVaults = res.data - } catch (error) { - logger.error(error) - } } async getMyVaults(profileId) { - try { const res = await api.get('api/profiles/' + profileId + '/vaults') AppState.myVaults = res.data - } catch (error) { - logger.error(error) - } } } diff --git a/keepr.client/src/services/VaultKeepsService.js b/keepr.client/src/services/VaultKeepsService.js index adfb8be..e3082ba 100644 --- a/keepr.client/src/services/VaultKeepsService.js +++ b/keepr.client/src/services/VaultKeepsService.js @@ -6,28 +6,18 @@ import { vaultsService } from '../services/VaultsService' class VaultKeepsService { async create(keepId, vaultId) { - try { let newVaultKeep = { vaultId: vaultId, keepId: keepId } const res = await api.post('api/vaultkeeps', newVaultKeep) AppState.vaultKeeps.push(res.data) - } catch (error) { - logger.error(error) - Pop.error(error) - } } async delete(vaultKeepId) { - try { logger.log(vaultKeepId) await api.delete('api/vaultkeeps/' + vaultKeepId) await vaultsService.getVaultKeeps(AppState.activeVault.id) - } catch (error) { - logger.error(error) - Pop.error(error) - } } } diff --git a/keepr.client/src/services/VaultsService.js b/keepr.client/src/services/VaultsService.js index 5865835..1ae3030 100644 --- a/keepr.client/src/services/VaultsService.js +++ b/keepr.client/src/services/VaultsService.js @@ -21,31 +21,17 @@ class VaultsService { } async createVault(vaultData) { - try { const res = await api.post('api/vaults', vaultData) // logger.log(res.data) // AppState.myVaults.push(res.data) profilesService.getVaults(AppState.account.id) AppState.myVaults = AppState.profileVaults - } catch (error) { - logger.error(error) - Pop.error(error) - } } async delete(vaultId, vaultKeeps) { - try { - // vaultKeeps will collect in db... if this isn't here - // for (let vk = 0; vk < vaultKeeps.length; vk++) { - // await vaultKeepsService.delete(vaultKeeps[vk].id) - // } await api.delete('api/vaults/' + vaultId) profilesService.getVaults(AppState.account.id) AppState.myVaults = AppState.profileVaults - } catch (error) { - logger.error(error) - Pop.error(error) - } } } diff --git a/todo.md b/todo.md new file mode 100644 index 0000000..ea66c63 --- /dev/null +++ b/todo.md @@ -0,0 +1,8 @@ +add form validation to new keep and new vault +upload images instead of linking them (BIG TASK) +move trycatches to component (DONE) +make more efficient to manipulate appstate without backend calls +fix styling bug for bottom button on keeps without delete or remove buttons in vualt +enable ability to add to vault from vaults that aren't yours +add title/aria/alt accessibility tags to everything +maybe add a shadow to the bottom of keep and vault cards? \ No newline at end of file