diff --git a/software/backend/images/artists/alex-turner.jpg b/software/backend/images/artists/alex-turner.jpg new file mode 100644 index 0000000..6869e13 Binary files /dev/null and b/software/backend/images/artists/alex-turner.jpg differ diff --git a/software/backend/images/artists/andy-nicholson.jpg b/software/backend/images/artists/andy-nicholson.jpg new file mode 100644 index 0000000..052d411 Binary files /dev/null and b/software/backend/images/artists/andy-nicholson.jpg differ diff --git a/software/backend/images/artists/unknown-artist.jpg b/software/backend/images/artists/unknown-artist.jpg new file mode 100644 index 0000000..17ba455 Binary files /dev/null and b/software/backend/images/artists/unknown-artist.jpg differ diff --git a/software/backend/images/bands/red-hot-chili-peppers-2.jpg b/software/backend/images/bands/red-hot-chili-peppers-2.jpg new file mode 100644 index 0000000..1725e3a Binary files /dev/null and b/software/backend/images/bands/red-hot-chili-peppers-2.jpg differ diff --git a/software/backend/routes/band.routes.ts b/software/backend/routes/band.routes.ts index f8d8da0..87f99f4 100644 --- a/software/backend/routes/band.routes.ts +++ b/software/backend/routes/band.routes.ts @@ -3,13 +3,54 @@ import { Band } from "../models/acts/band.model"; import { Request, Response, Router } from "express"; import { Rating } from "../models/acts/rating.model"; import { Genre } from "../models/acts/genre.model"; +import { Tour } from "../models/acts/tour.model"; +import { Concert } from "../models/acts/concert.model"; +import { Location } from "../models/acts/location.model"; +import { City } from "../models/acts/city.model"; export const band = Router() // Get all bands band.get("/", (req: Request, res: Response) => { Band.findAll({ - include: [ Genre, Rating ] + include: [ + { + model: Member, + attributes: { + exclude: [ "id", "bandId" ] + } + }, + { + model: Rating, + attributes: { + exclude: [ "id", "bandId" ] + } + }, + { + model: Tour, + include: [ + { + model: Concert, + include: [ + { + model: Location, + include: [ City ], + attributes: { + exclude: [ "id" ] + } + } + ], + attributes: { + exclude: [ "id", "tourId", "locationId" ] + } + } + ], + attributes: { + exclude: [ "id", "bandId" ] + } + }, + Genre + ] }) .then(bands => { res.status(200).json(bands) diff --git a/software/src/components/cardWithLeftImage.vue b/software/src/components/cardWithLeftImage.vue index 833536e..57e2c21 100644 --- a/software/src/components/cardWithLeftImage.vue +++ b/software/src/components/cardWithLeftImage.vue @@ -1,21 +1,30 @@