xevion/the-office
1
0
Fork 0
mirror of https://github.com/Xevion/the-office.git synced 2025-12-10 08:08:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

add Promise to FETCH_CHARACTER action, add getCharacter getter to store, fix Skeleton.vue animated position bricking

Browse Source
This commit is contained in:
Xevion
2020-09-17 13:59:54 -05:00
parent ec25ce6571
commit 46bea4af4d
2 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
client/src/components/Skeleton.vue
View File

@@ -26,14 +26,14 @@
@-webkit-keyframes SkeletonLoading {
0% {
background-position: 0 0;
background-position: -200px 0;
}
100% {
background-position: calc(200px + 100%) 0;
}
}
@keyframes SkeletonLoading {
@keyframes SkeletonLoa,ding {
0% {
background-position: -200px 0;
}
@@ -51,8 +51,7 @@ span {
export default {
props: {
inner_style: {
type: String,
default: ''
type: Object
},
inner_class: {
type: String,

20
client/src/store.js
View File

@@ -118,11 +118,18 @@ export default new Vuex.Store({
})
},
[types.FETCH_CHARACTER]({commit}, character_id) {
const path = `${process.env.VUE_APP_API_URL}/api/character/${character_id}/`;
axios.get(path)
.then((res) => {
commit(types.MERGE_CHARACTER, {id: character_id, characterData: res.data})
})
return new Promise((resolve, reject) => {
const path = `${process.env.VUE_APP_API_URL}/api/character/${character_id}/`;
axios.get(path)
.then((res) => {
commit(types.MERGE_CHARACTER, {id: character_id, characterData: res.data})
resolve();
})
.catch((error) => {
reject();
console.error(error);
})
})
}
},
getters: {
@@ -146,5 +153,8 @@ export default new Vuex.Store({
isValidEpisode: (state, getters) => (season, episode = 1) => {
return season >= 1 && season <= 9 && episode >= 1 && episode <= getters.getEpisodeCount(season)
},
getCharacter: (state) => (character_id) => {
return state.characters[character_id];
}
}
});