Annika/keepr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

moved trycatch to the correct location lol

Browse Source
This commit is contained in:
Annika
2022-08-05 16:08:24 -06:00
parent 11bd724fb9
commit c019fafe52
13 changed files with 101 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files
keepr.client/src/components/KeepModalButtons.vue
+16 -5
View File
@@ -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)
}
}
}
}
keepr.client/src/components/KeepsList.vue
-20
View File
@@ -1,20 +0,0 @@
<template>
<div class="component">
keeps list
</div>
</template>
<script>
export default {
setup(){
return {}
}
}
</script>
<style lang="scss" scoped>
</style>
keepr.client/src/components/NewKeepModal.vue
+13 -10
View File
@@ -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
}
}
}
keepr.client/src/components/NewVaultModal.vue
+14 -8
View File
@@ -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)
}
}
}
}
keepr.client/src/components/VaultKeepModalButtons.vue
+17 -8
View File
@@ -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)
}
}
}
}
keepr.client/src/pages/HomePage.vue
+7
View File
@@ -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)
}
}
};
},
keepr.client/src/pages/ProfilePage.vue
+6
View File
@@ -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) {
keepr.client/src/pages/VaultPage.vue
+20 -8
View File
@@ -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)
}
}
};
},
keepr.client/src/services/KeepsService.js
-20
View File
@@ -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)
}
}
}
keepr.client/src/services/ProfilesService.js
-16
View File
@@ -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)
}
}
}
keepr.client/src/services/VaultKeepsService.js
-10
View File
@@ -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)
}
}
}
keepr.client/src/services/VaultsService.js
-14
View File
@@ -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)
}
}
}