diff --git a/components/Location/Location.spec.js b/components/Location/Location.spec.js new file mode 100644 index 0000000..bcde945 --- /dev/null +++ b/components/Location/Location.spec.js @@ -0,0 +1,30 @@ +import { mount, RouterLinkStub } from "@vue/test-utils"; +import Location from "./"; +import mockLocation from "@/test/fake-locations.json"; + +describe("Location", () => { + it("tests props", () => { + expect(Location.props).toMatchObject({ + location: { + type: Object, + default: {}, + required: true + } + }); + }); + + it("renders proper link to details", () => { + const wrapper = mount(Location, { + propsData: { + location: mockLocation[0] + }, + stubs: { + RouterLink: RouterLinkStub + } + }); + + expect(wrapper.findComponent(RouterLinkStub).props().to).toBe( + `/locations/${mockLocation[0].id}` + ); + }); +}); diff --git a/components/Location/index.vue b/components/Location/index.vue new file mode 100644 index 0000000..b108c69 --- /dev/null +++ b/components/Location/index.vue @@ -0,0 +1,27 @@ + + + + + diff --git a/pages/films/_id.spec.js b/pages/films/_id.spec.js index 7b501d0..ed39992 100644 --- a/pages/films/_id.spec.js +++ b/pages/films/_id.spec.js @@ -42,7 +42,8 @@ describe("Film page", () => { computed: { film: () => mockFilms[0], people: () => jest.fn(), - vehicles: () => jest.fn() + vehicles: () => jest.fn(), + locations: () => jest.fn() } }); expect(wrapper.exists()).toBe(true); @@ -69,7 +70,8 @@ describe("Film page", () => { computed: { film: () => mockFilms[0], people: () => jest.fn(), - vehicles: () => jest.fn() + vehicles: () => jest.fn(), + locations: () => jest.fn() } }); diff --git a/pages/films/_id.vue b/pages/films/_id.vue index adfa4df..547108f 100644 --- a/pages/films/_id.vue +++ b/pages/films/_id.vue @@ -51,13 +51,16 @@ - + + @@ -69,7 +72,8 @@ export default { name: "Film", components: { Person: () => import("@/components/Person"), - Vehicle: () => import("@/components/Vehicle") + Vehicle: () => import("@/components/Vehicle"), + Location: () => import("@/components/Location") }, head() { return { @@ -93,6 +97,11 @@ export default { vehicles() { return this.$store.getters["vehicles/getVehiclesByFilmId"](this.film.id); }, + locations() { + return this.$store.getters["locations/getLocationsByFilmId"]( + this.film.id + ); + }, ...mapGetters({ film: "films/film" }) diff --git a/store/locations/index.js b/store/locations/index.js index c94b2e6..f09e43d 100644 --- a/store/locations/index.js +++ b/store/locations/index.js @@ -35,5 +35,10 @@ export const actions = { export const getters = { list: state => state.list, - location: state => state.location + location: state => state.location, + getLocationsByFilmId: state => id => { + return state.list.filter(location => + location.films.find(film => film.split("/")[4] === id) + ); + } }; diff --git a/test/fake-locations.json b/test/fake-locations.json new file mode 100644 index 0000000..caea878 --- /dev/null +++ b/test/fake-locations.json @@ -0,0 +1,391 @@ +[ + { + "id": "11014596-71b0-4b3e-b8c0-1c4b15f28b9a", + "name": "Irontown", + "climate": "Continental", + "terrain": "Mountain", + "surface_water": "40", + "residents": [ + "https://ghibliapi.herokuapp.com/people/ba924631-068e-4436-b6de-f3283fa848f0", + "https://ghibliapi.herokuapp.com/people/030555b3-4c92-4fce-93fb-e70c3ae3df8b" + ], + "films": [ + "https://ghibliapi.herokuapp.com/films/0440483e-ca0e-4120-8c50-4c8cd9b965d6" + ], + "url": [ + "https://ghibliapi.herokuapp.com/locations/11014596-71b0-4b3e-b8c0-1c4b15f28b9a" + ] + }, + { + "id": "64a996aa-481e-4627-9624-ab23f59a05a9", + "name": "Gutiokipanja", + "climate": "Continental", + "terrain": "Hill", + "surface_water": "50", + "residents": [ + "https://ghibliapi.herokuapp.com/people/ba924631-068e-4436-b6de-f3283fa848f0", + "https://ghibliapi.herokuapp.com/people/030555b3-4c92-4fce-93fb-e70c3ae3df8b" + ], + "films": [ + "https://ghibliapi.herokuapp.com/films/0440483e-ca0e-4120-8c50-4c8cd9b965d6" + ], + "url": [ + "https://ghibliapi.herokuapp.com/locations/64a996aa-481e-4627-9624-ab23f59a05a9" + ] + }, + { + "id": "a8bd9c03-7c80-4a97-b7c0-6a668acaf576", + "name": "The Cat Kingdom", + "climate": "Continental", + "terrain": "Plain", + "surface_water": "30", + "residents": [ + "https://ghibliapi.herokuapp.com/people/6b3facea-ea33-47b1-96ce-3fc737b119b8", + "https://ghibliapi.herokuapp.com/people/3042818d-a8bb-4cba-8180-c19249822d57", + "https://ghibliapi.herokuapp.com/people/58d1973f-f247-47d7-9358-e56cb0d2b5a6", + "https://ghibliapi.herokuapp.com/people/a3d8e70f-46a0-4e5a-b850-db01620d6b92", + "https://ghibliapi.herokuapp.com/people/fc196c4f-0201-4ed2-9add-c6403f7c4d32" + ], + "films": [ + "https://ghibliapi.herokuapp.com/films/90b72513-afd4-4570-84de-a56c312fdf81" + ], + "url": [ + "https://ghibliapi.herokuapp.com/locations/a8bd9c03-7c80-4a97-b7c0-6a668acaf576" + ] + }, + { + "id": "56e423c4-d9a1-44c4-8bdb-1cab45fbf63e", + "name": "The Marsh House", + "climate": "Mild", + "terrain": "Marsh", + "surface_water": "60", + "residents": [], + "films": [ + "https://ghibliapi.herokuapp.com/films/5fdfb320-2a02-49a7-94ff-5ca418cae602" + ], + "url": [ + "https://ghibliapi.herokuapp.com/locations/56e423c4-d9a1-44c4-8bdb-1cab45fbf63e" + ] + }, + { + "id": "660c8c91-bd92-43db-b475-b2df6ca96fec", + "name": "Hospital", + "climate": "Continental", + "terrain": "Hill", + "surface_water": "40", + "residents": [ + "TODO" + ], + "films": [ + "https://ghibliapi.herokuapp.com/films/58611129-2dbc-4a81-a72f-77ddfc1b1b49" + ], + "url": [ + "https://ghibliapi.herokuapp.com/locations/660c8c91-bd92-43db-b475-b2df6ca96fec" + ] + }, + { + "id": "6ba60a86-7c74-4ec4-a6f4-7112b5705a2f", + "name": "Gondoa", + "climate": "TODO", + "terrain": "TODO", + "surface_water": "40", + "residents": [ + "TODO" + ], + "films": [ + "https://ghibliapi.herokuapp.com/films/2baf70d1-42bb-4437-b551-e5fed5a87abe" + ], + "url": [ + "https://ghibliapi.herokuapp.com/locations/6ba60a86-7c74-4ec4-a6f4-7112b5705a2f" + ] + }, + { + "id": "fb083a4e-77b2-4623-a2e0-6bbca5bfd5b2", + "name": "Ursula's Log Cabin", + "climate": "TODO", + "terrain": "TODO", + "surface_water": "40", + "residents": [ + "TODO" + ], + "films": [ + "https://ghibliapi.herokuapp.com/films/ea660b10-85c4-4ae3-8a5f-41cea3648e3e" + ], + "url": [ + "https://ghibliapi.herokuapp.com/locations/fb083a4e-77b2-4623-a2e0-6bbca5bfd5b2" + ] + }, + { + "id": "a072ec53-0467-4fac-864f-df234f9c4315", + "name": "Zeniba's Cottage", + "climate": "TODO", + "terrain": "TODO", + "surface_water": "40", + "residents": [ + "TODO" + ], + "films": [ + "https://ghibliapi.herokuapp.com/films/dc2e6bd1-8156-4886-adff-b39e6043af0c" + ], + "url": [ + "https://ghibliapi.herokuapp.com/locations/a072ec53-0467-4fac-864f-df234f9c4315" + ] + }, + { + "id": "682df5c3-b09e-46af-94d1-ae0d17f9b4b6", + "name": "Bamboo Forest", + "climate": "Tropical", + "terrain": "Forest", + "surface_water": "10", + "residents": [ + "TODO" + ], + "films": [ + "https://ghibliapi.herokuapp.com/films/45204234-adfd-45cb-a505-a8e7a676b114", + "https://ghibliapi.herokuapp.com/films/578ae244-7750-4d9f-867b-f3cd3d6fecf4" + ], + "url": [ + "https://ghibliapi.herokuapp.com/locations/682df5c3-b09e-46af-94d1-ae0d17f9b4b6" + ] + }, + { + "id": "26361a2c-32c6-4bd5-ae9c-8e40e17ae28d", + "name": "Pazu's Mines", + "climate": "Dry", + "terrain": "Hill", + "surface_water": "0", + "residents": [ + "TODO" + ], + "films": [ + "https://ghibliapi.herokuapp.com/films/2baf70d1-42bb-4437-b551-e5fed5a87abe" + ], + "url": [ + "https://ghibliapi.herokuapp.com/locations/26361a2c-32c6-4bd5-ae9c-8e40e17ae28d" + ] + }, + { + "id": "42f787d8-1fcb-4d3d-82f2-a74409869368", + "name": "Shizuku's Apartment", + "climate": "Continental", + "terrain": "City", + "surface_water": "0", + "residents": [ + "TODO" + ], + "films": [ + "https://ghibliapi.herokuapp.com/films/ff24da26-a969-4f0e-ba1e-a122ead6c6e3" + ], + "url": [ + "https://ghibliapi.herokuapp.com/locations/42f787d8-1fcb-4d3d-82f2-a74409869368" + ] + }, + { + "id": "0fafa7a3-64c1-43fe-881b-ecb605c01e09", + "name": "Laputa", + "climate": "Continental", + "terrain": "City", + "surface_water": "40", + "residents": [ + "TODO" + ], + "films": [ + "https://ghibliapi.herokuapp.com/films/2baf70d1-42bb-4437-b551-e5fed5a87abe" + ], + "url": [ + "https://ghibliapi.herokuapp.com/locations/0fafa7a3-64c1-43fe-881b-ecb605c01e09" + ] + }, + { + "id": "0132f7f6-fd52-4ac3-b5df-c96b609f77b6", + "name": "Tedis", + "climate": "Continental", + "terrain": "Hill", + "surface_water": "30", + "residents": [ + "TODO" + ], + "films": [ + "https://ghibliapi.herokuapp.com/films/2baf70d1-42bb-4437-b551-e5fed5a87abe" + ], + "url": [ + "https://ghibliapi.herokuapp.com/locations/0132f7f6-fd52-4ac3-b5df-c96b609f77b6" + ] + }, + { + "id": "c57fb2cb-ea85-4d73-8808-cf5dcd28c22e", + "name": "Koriko", + "climate": "Mild", + "terrain": "Hill", + "surface_water": "50", + "residents": [ + "TODO" + ], + "films": [ + "https://ghibliapi.herokuapp.com/films/ea660b10-85c4-4ae3-8a5f-41cea3648e3e" + ], + "url": [ + "https://ghibliapi.herokuapp.com/locations/c57fb2cb-ea85-4d73-8808-cf5dcd28c22e" + ] + }, + { + "id": "615aa48d-8673-4117-b35a-79cb67af1897", + "name": "Forest", + "climate": "Tropical", + "terrain": "Forest", + "surface_water": "60", + "residents": [ + "TODO" + ], + "films": [ + "https://ghibliapi.herokuapp.com/films/0440483e-ca0e-4120-8c50-4c8cd9b965d6" + ], + "url": [ + "https://ghibliapi.herokuapp.com/locations/615aa48d-8673-4117-b35a-79cb67af1897" + ] + }, + { + "id": "37d13a96-a03a-451d-8871-80be0495486e", + "name": "Bathhouse", + "climate": "Continental", + "terrain": "River", + "surface_water": "70", + "residents": [ + "TODO" + ], + "films": [ + "https://ghibliapi.herokuapp.com/films/dc2e6bd1-8156-4886-adff-b39e6043af0c" + ], + "url": [ + "https://ghibliapi.herokuapp.com/locations/37d13a96-a03a-451d-8871-80be0495486e" + ] + }, + { + "id": "6fc21b76-78fb-4451-98f7-857e32a23e85", + "name": "Matsugo", + "climate": "Continental", + "terrain": "River", + "surface_water": "60", + "residents": [ + "TODO" + ], + "films": [ + "https://ghibliapi.herokuapp.com/films/58611129-2dbc-4a81-a72f-77ddfc1b1b49" + ], + "url": [ + "https://ghibliapi.herokuapp.com/locations/6fc21b76-78fb-4451-98f7-857e32a23e85" + ] + }, + { + "id": "dbeeaecb-7817-4b8b-90ca-edc432d3033e", + "name": "Taeko's House", + "climate": "Continental", + "terrain": "River", + "surface_water": "40", + "residents": [ + "TODO" + ], + "films": [ + "https://ghibliapi.herokuapp.com/films/4e236f34-b981-41c3-8c65-f8c9000b94e7" + ], + "url": [ + "https://ghibliapi.herokuapp.com/locations/dbeeaecb-7817-4b8b-90ca-edc432d3033e" + ] + }, + { + "id": "34df8f25-8f80-4823-8f01-bf9852039987", + "name": "Piccolo S.P.A.", + "climate": "Continental", + "terrain": "River", + "surface_water": "40", + "residents": [ + "TODO" + ], + "films": [ + "https://ghibliapi.herokuapp.com/films/ebbb6b7c-945c-41ee-a792-de0e43191bd8" + ], + "url": [ + "https://ghibliapi.herokuapp.com/locations/34df8f25-8f80-4823-8f01-bf9852039987" + ] + }, + { + "id": "62346d33-caa0-4c17-8016-0aca56f3066b", + "name": "Karikiya", + "climate": "Mild", + "terrain": "City", + "surface_water": "30", + "residents": [ + "TODO" + ], + "films": [ + "https://ghibliapi.herokuapp.com/films/ea660b10-85c4-4ae3-8a5f-41cea3648e3e" + ], + "url": [ + "https://ghibliapi.herokuapp.com/locations/62346d33-caa0-4c17-8016-0aca56f3066b" + ] + }, + { + "id": "ee897b2a-405e-42b9-bff4-8b51b0f03cab", + "name": "Satsuki's School House", + "climate": "Mild", + "terrain": "River", + "surface_water": "60", + "residents": [ + "TODO" + ], + "films": [ + "https://ghibliapi.herokuapp.com/films/58611129-2dbc-4a81-a72f-77ddfc1b1b49" + ], + "url": [ + "https://ghibliapi.herokuapp.com/locations/ee897b2a-405e-42b9-bff4-8b51b0f03cab" + ] + }, + { + "id": "90241c46-d4be-411f-b00a-7561b9dda7b6", + "name": "Fujimoto's Underwater Harbor", + "climate": "Wet", + "terrain": "Ocean", + "surface_water": "100", + "residents": [ + "TODO" + ], + "films": [ + "https://ghibliapi.herokuapp.com/films/758bf02e-3122-46e0-884e-67cf83df1786" + ], + "url": [ + "https://ghibliapi.herokuapp.com/locations/90241c46-d4be-411f-b00a-7561b9dda7b6" + ] + }, + { + "id": "469b14bd-5565-4436-bbed-c2036f42cc99", + "name": "Himawari Nursery School", + "climate": "Mild", + "terrain": "Ocean", + "surface_water": "50", + "residents": [ + "TODO" + ], + "films": [ + "https://ghibliapi.herokuapp.com/films/758bf02e-3122-46e0-884e-67cf83df1786" + ], + "url": [ + "https://ghibliapi.herokuapp.com/locations/469b14bd-5565-4436-bbed-c2036f42cc99" + ] + }, + { + "id": "b6bac992-a858-4d57-8477-9652d73caaa1", + "name": "Ingary", + "climate": "Mild", + "terrain": "Hill", + "surface_water": "30", + "residents": [ + "TODO" + ], + "films": [ + "https://ghibliapi.herokuapp.com/films/cd3d059c-09f4-4ff3-8d63-bc765a5184fa" + ], + "url": [ + "https://ghibliapi.herokuapp.com/locations/b6bac992-a858-4d57-8477-9652d73caaa1" + ] + } +] \ No newline at end of file