Create Vehicle page layout
This commit is contained in:
@@ -14,6 +14,7 @@ export default {
|
|||||||
fetchOnServer: false,
|
fetchOnServer: false,
|
||||||
async fetch() {
|
async fetch() {
|
||||||
const { store } = this.$nuxt.context;
|
const { store } = this.$nuxt.context;
|
||||||
|
if (!store.state.films.list.length) await store.dispatch("films/getList");
|
||||||
if (!store.state.people.list.length) await store.dispatch("people/getList");
|
if (!store.state.people.list.length) await store.dispatch("people/getList");
|
||||||
if (!store.state.vehicles.list.length)
|
if (!store.state.vehicles.list.length)
|
||||||
await store.dispatch("vehicles/getList");
|
await store.dispatch("vehicles/getList");
|
||||||
@@ -42,4 +43,8 @@ html {
|
|||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
margin: 0;
|
margin: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
main {
|
||||||
|
min-height: calc(100vh - 64px * 2);
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -2,6 +2,8 @@ import { mount, createLocalVue } from "@vue/test-utils";
|
|||||||
import Vuex from "vuex";
|
import Vuex from "vuex";
|
||||||
import Vehicle from "./_id";
|
import Vehicle from "./_id";
|
||||||
import mockVehicles from "@/test/fake-vehicles.json";
|
import mockVehicles from "@/test/fake-vehicles.json";
|
||||||
|
import mockPeople from "@/test/fake-people.json";
|
||||||
|
import mockFilms from "@/test/fake-films.json";
|
||||||
|
|
||||||
let $route = {
|
let $route = {
|
||||||
path: "/vehicles",
|
path: "/vehicles",
|
||||||
@@ -39,8 +41,11 @@ describe("Vehicle page", () => {
|
|||||||
localVue,
|
localVue,
|
||||||
store,
|
store,
|
||||||
computed: {
|
computed: {
|
||||||
vehicle: () => mockVehicles[0]
|
vehicle: () => mockVehicles[0],
|
||||||
}
|
pilot: () => mockPeople[0],
|
||||||
|
film: () => mockFilms[0]
|
||||||
|
},
|
||||||
|
stubs: ["nuxt-link"]
|
||||||
});
|
});
|
||||||
expect(wrapper.exists()).toBe(true);
|
expect(wrapper.exists()).toBe(true);
|
||||||
});
|
});
|
||||||
@@ -64,8 +69,11 @@ describe("Vehicle page", () => {
|
|||||||
localVue,
|
localVue,
|
||||||
store,
|
store,
|
||||||
computed: {
|
computed: {
|
||||||
vehicle: () => mockVehicles[0]
|
vehicle: () => mockVehicles[0],
|
||||||
}
|
pilot: () => jest.fn(),
|
||||||
|
film: () => jest.fn()
|
||||||
|
},
|
||||||
|
stubs: ["nuxt-link"]
|
||||||
});
|
});
|
||||||
|
|
||||||
await wrapper.vm.$options.asyncData({ store, params: $route.params });
|
await wrapper.vm.$options.asyncData({ store, params: $route.params });
|
||||||
|
|||||||
@@ -1,6 +1,40 @@
|
|||||||
<template>
|
<template>
|
||||||
<div>
|
<div
|
||||||
{{ vehicle }}
|
class="py-4 flex flex-col lg:flex-row items-center lg:items-start justify-center"
|
||||||
|
>
|
||||||
|
<article
|
||||||
|
class="mb-4 inline-flex flex-col justify-between bg-gray-100 prose prose-sm rounded-md shadow-md transition-shadow duration-300 hover:shadow-xl"
|
||||||
|
>
|
||||||
|
<header class="p-4 rounded-t-md">
|
||||||
|
<h1>
|
||||||
|
{{ vehicle.name + " (" + vehicle.vehicle_class + ")" }}
|
||||||
|
</h1>
|
||||||
|
<h2 class="text-gray-700 mt-0" v-if="pilot">
|
||||||
|
piloted by
|
||||||
|
<nuxt-link
|
||||||
|
:to="`/people/${pilot.id}`"
|
||||||
|
class="inline-block rounded text-md font-semibold bg-gray-400 py-2 px-4 border-b-4 border-gray-500"
|
||||||
|
>
|
||||||
|
{{ pilot.name }}
|
||||||
|
</nuxt-link>
|
||||||
|
</h2>
|
||||||
|
</header>
|
||||||
|
|
||||||
|
<section class="px-4 pb-4 infos">
|
||||||
|
<p>{{ vehicle.description }}</p>
|
||||||
|
|
||||||
|
<h3>
|
||||||
|
Appears in
|
||||||
|
</h3>
|
||||||
|
<nuxt-link
|
||||||
|
v-if="film"
|
||||||
|
:to="`/films/${film.id}`"
|
||||||
|
class="inline-block rounded text-md font-semibold bg-gray-400 py-2 px-4 border-b-4 border-gray-500"
|
||||||
|
>
|
||||||
|
{{ film.title }}
|
||||||
|
</nuxt-link>
|
||||||
|
</section>
|
||||||
|
</article>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
@@ -25,6 +59,12 @@ export default {
|
|||||||
await store.dispatch("vehicles/getVehicle", params.id);
|
await store.dispatch("vehicles/getVehicle", params.id);
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
|
pilot: function() {
|
||||||
|
return this.$store.getters["vehicles/getPilot"];
|
||||||
|
},
|
||||||
|
film: function() {
|
||||||
|
return this.$store.getters["vehicles/getFilm"];
|
||||||
|
},
|
||||||
...mapGetters({
|
...mapGetters({
|
||||||
vehicle: "vehicles/vehicle"
|
vehicle: "vehicles/vehicle"
|
||||||
})
|
})
|
||||||
@@ -32,4 +72,9 @@ export default {
|
|||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style></style>
|
<style lang="css" scoped>
|
||||||
|
article header {
|
||||||
|
background-color: #85ffbd;
|
||||||
|
background-image: linear-gradient(45deg, #85ffbd 0%, #fffb7d 100%);
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
|||||||
@@ -25,7 +25,9 @@ export const actions = {
|
|||||||
},
|
},
|
||||||
async getVehicle({ commit }, id) {
|
async getVehicle({ commit }, id) {
|
||||||
try {
|
try {
|
||||||
const vehicle = await this.$axios.$get(`/api/vehicles/${id}`);
|
const vehicle = await this.$axios.$get(
|
||||||
|
`/api/vehicles/${id}?fields=id,name,description,vehicle_class,length,pilot,films`
|
||||||
|
);
|
||||||
commit("setVehicle", vehicle);
|
commit("setVehicle", vehicle);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
throw Error(`API Error occurred: ${e.message}`);
|
throw Error(`API Error occurred: ${e.message}`);
|
||||||
@@ -38,5 +40,15 @@ export const getters = {
|
|||||||
vehicle: state => state.vehicle,
|
vehicle: state => state.vehicle,
|
||||||
getVehiclesByFilmId: state => id => {
|
getVehiclesByFilmId: state => id => {
|
||||||
return state.list.filter(vehicle => vehicle.films.split("/")[4] === id);
|
return state.list.filter(vehicle => vehicle.films.split("/")[4] === id);
|
||||||
|
},
|
||||||
|
getPilot: (state, getters, rootState) => {
|
||||||
|
return rootState.people.list.find(
|
||||||
|
people => people.id === state.vehicle.pilot.split("/")[4]
|
||||||
|
);
|
||||||
|
},
|
||||||
|
getFilm: (state, getters, rootState) => {
|
||||||
|
return rootState.films.list.find(
|
||||||
|
film => film.id === state.vehicle.films.split("/")[4]
|
||||||
|
);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user