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

CharacterBadges rename and Characters routing, fix Season component text fetching breaking dependent breadcrumb calculations

Browse Source
This commit is contained in:
Xevion
2020-09-17 13:59:04 -05:00
parent 2894a654af
commit ec25ce6571
3 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/src/components/Episode.vue
View File

@@ -8,7 +8,7 @@
<template v-if="ready"> <template v-if="ready">
<h3 class="card-title">"{{ episode.title }}"</h3> <h3 class="card-title">"{{ episode.title }}"</h3>
<span>{{ episode.description }}</span> <span>{{ episode.description }}</span>
<CharacterList v-if="episode && episode.characters" :characters="episode.characters"></CharacterList> <CharacterBadges v-if="episode && episode.characters" :characters="episode.characters"></CharacterBadges>
</template> </template>
<template v-else> <template v-else>
<Skeleton style="width: 30%;"></Skeleton> <Skeleton style="width: 30%;"></Skeleton>
@@ -59,7 +59,7 @@
<script> <script>
import QuoteList from "./QuoteList.vue"; import QuoteList from "./QuoteList.vue";
import CharacterList from "./CharacterList.vue"; import CharacterBadges from "./CharacterBadges.vue";
import Skeleton from './Skeleton.vue'; import Skeleton from './Skeleton.vue';
import {types} from "@/mutation_types"; import {types} from "@/mutation_types";
@@ -67,7 +67,7 @@ export default {
name: "Episode", name: "Episode",
components: { components: {
QuoteList, QuoteList,
CharacterList, CharacterBadges,
Skeleton, Skeleton,
}, },
created() { created() {

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

@@ -1,7 +1,7 @@
<template> <template>
<div> <div>
<b-breadcrumb :items="breadcrumbs"></b-breadcrumb> <b-breadcrumb :items="breadcrumbs"></b-breadcrumb>
<b-card> <b-card v-if="ready">
<b-list-group> <b-list-group>
<b-list-group-item v-for="episode in season.episodes" :key="episode.episode_id"> <b-list-group-item v-for="episode in season.episodes" :key="episode.episode_id">
<b-row align-v="start" align-content="start"> <b-row align-v="start" align-content="start">
@@ -48,6 +48,9 @@ export default {
} }
}, },
computed: { computed: {
ready() {
return this.$store.state.preloaded;
},
breadcrumbs() { breadcrumbs() {
return [ return [
{ {
@@ -61,7 +64,7 @@ export default {
] ]
}, },
season() { season() {
return this.$store.state.preloaded ? this.$store.state.quoteData[this.$route.params.season - 1] : null; return this.$store.state.quoteData[this.$route.params.season - 1];
} }
} }
} }

26
client/src/router.js
View File

@@ -1,10 +1,11 @@
import Vue from "vue"; import Vue from "vue";
import Router from "vue-router"; import Router from "vue-router";
import Home from "./components/Home.vue"; import Home from "@/components/Home.vue";
import Episode from "./components/Episode.vue"; import Episode from "@/components/Episode.vue";
import SearchResults from "./components/SearchResults.vue"; import SearchResults from "@/components/SearchResults.vue";
import Character from "./components/Character.vue"; import Character from "@/components/Character.vue";
import Season from "./components/Season.vue"; import Season from "@/components/Season.vue";
import Characters from "@/components/Characters";
Vue.use(Router); Vue.use(Router);
@@ -16,6 +17,16 @@ export default new Router({
name: "Home", name: "Home",
component: Home, component: Home,
}, },
{
path: "/characters/",
name: "Characters",
component: Characters,
},
{
path: "/search_results",
name: "SearchResults",
component: SearchResults,
},
{ {
path: "/character/:character", path: "/character/:character",
name: "Character", name: "Character",
@@ -31,11 +42,6 @@ export default new Router({
name: "Episode", name: "Episode",
component: Episode, component: Episode,
}, },
{
path: "/search_results",
name: "SearchResults",
component: SearchResults,
},
{ {
path: "*", path: "*",
}, },