tobias/eventmaster
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

More skeleton loader, repair bandDetailPage

Browse Source
This commit is contained in:
Tobias Zoghaib
2024-10-04 18:01:37 +02:00
parent e0a8748184
commit 519fa210e9
18 changed files with 262 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
software/backend/data/cities.json
View File

@@ -9,6 +9,7 @@
"name": "Swiss Life Hall",
"address": "Ferdinand-Wilhelm-Fricke-Weg 8",
"image": "locations/swiss-life-hall.jpg",
"logo": "locations/capitol.logo.png",
"seatGroups": [
{
"name": "A",
@@ -58,6 +59,7 @@
"name": "Capitol",
"address": "Schwarzer Bär 2",
"image": "locations/capitol.jpg",
"logo": "locations/capitol-logo.png",
"seatGroups": [
{
"name": "A",
@@ -72,6 +74,7 @@
"name": "ZAG Arena",
"address": "EXPO-Plaza 7",
"image": "locations/zag-arena.jpg",
"logo": "locations/capitol.logo.png",
"seatGroups": [
{
"name": "A",
@@ -121,6 +124,7 @@
"name": "Kulturzentrum Faust",
"address": "Zur Bettfedernfabrik 3",
"image": "locations/faust-hannover.jpg",
"logo": "locations/faust-logo.png",
"seatGroups": [
{
"name": "A",
@@ -141,6 +145,7 @@
"name": "Olympiahalle München",
"address": "Spiridon-Louis-Ring 21",
"image": "locations/olympiahalle-munich.jpg",
"logo": "locations/capitol.logo.png",
"seatGroups": [
{
"name": "A",
@@ -155,6 +160,7 @@
"name": "Schlachthof München",
"address": "Zenettistraße 9",
"image": "locations/schlachthof-munich.jpg",
"logo": "locations/capitol.logo.png",
"seatGroups": [
{
"name": "A",
@@ -169,6 +175,7 @@
"name": "Muffatwerk",
"address": "Zellstraße 4",
"image": "locations/muffatwerk.jpg",
"logo": "locations/capitol.logo.png",
"seatGroups": [
{
"name": "A",
@@ -189,6 +196,7 @@
"name": "Elbphilharmonie Hamburg",
"address": "Platz der deutschen Einheit",
"image": "locations/elbphilharmonie-hamburg.jpg",
"logo": "locations/capitol.logo.png",
"seatGroups": [
{
"name": "A",
@@ -203,6 +211,7 @@
"name": "Volksparkstadion",
"address": "Sylvesterallee 7",
"image": "locations/volksparkstadion-hamburg.jpg",
"logo": "locations/capitol.logo.png",
"seatGroups": [
{
"name": "A",
@@ -217,6 +226,7 @@
"name": "Barclays Arena",
"address": "Sylvesterallee 10",
"image": "locations/barclays-arena.jpg",
"logo": "locations/capitol.logo.png",
"seatGroups": [
{
"name": "A",
@@ -231,6 +241,7 @@
"name": "Stage Theater im Hafen Hamburg",
"address": "Norderelbestraße 6",
"image": "locations/stage-theater-hamburg.jpg",
"logo": "locations/capitol.logo.png",
"seatGroups": [
{
"name": "A",
@@ -251,6 +262,7 @@
"name": "Waldbühne Berlin",
"address": "Am Glockenturm",
"image": "locations/waldbuehne-berlin.jpg",
"logo": "locations/capitol.logo.png",
"seatGroups": [
{
"name": "A",
@@ -265,6 +277,7 @@
"name": "Olympiastadion Berlin",
"address": "Olympischer Platz 3",
"image": "locations/olympiastadion-berlin.jpg",
"logo": "locations/capitol.logo.png",
"seatGroups": [
{
"name": "A",
@@ -279,6 +292,7 @@
"name": "Uber Arena Berlin",
"address": "Uber-Platz 1",
"image": "locations/uber-arena-berlin.jpg",
"logo": "locations/capitol.logo.png",
"seatGroups": [
{
"name": "A",
@@ -293,6 +307,7 @@
"name": "Columbiahalle",
"address": "Columbiadamm 13-21",
"image": "locations/columbiahalle.jpg",
"logo": "locations/capitol.logo.png",
"seatGroups": [
{
"name": "A",
@@ -307,6 +322,7 @@
"name": "Astra Kulturhaus",
"address": "Revaler Straße 99",
"image": "locations/astra-kulturhaus.jpg",
"logo": "locations/capitol.logo.png",
"seatGroups": [
{
"name": "A",
@@ -321,6 +337,7 @@
"name": "Deutsche Oper Berlin",
"address": "Bismarckstraße 35",
"image": "locations/deutsche-oper-berlin.jpg",
"logo": "locations/capitol-logo.png",
"seatGroups": [
{
"name": "A",

2
software/backend/database.ts
View File

@@ -41,7 +41,7 @@ export const sequelize = new Sequelize({
})
export function startDatabase() {
let force = false
let force = true
// Create database and tables
sequelize.sync({ force: force })

BIN
software/backend/images/locations/capitol-logo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 22 KiB

BIN
software/backend/images/locations/faust-logo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 27 KiB

3
software/backend/models/locations/location.model.ts
View File

@@ -18,6 +18,9 @@ export class Location extends Model {
@Column
image: String
@Column
logo: String
// Relations

31
software/backend/routes/band.routes.ts
View File

@@ -7,6 +7,7 @@ import { Event } from "../models/acts/event.model";
import { Concert } from "../models/acts/concert.model";
import { Location } from "../models/locations/location.model";
import { City } from "../models/locations/city.model";
import { Op } from "sequelize";
export const band = Router()
@@ -58,8 +59,11 @@ band.get("/", (req: Request, res: Response) => {
})
// Get all information about one band
band.get("/:id", (req: Request, res: Response) => {
Band.findByPk(req.params.id, {
band.get("/:name", (req: Request, res: Response) => {
Band.findOne({
where: {
name: { [Op.like]: req.params.name }
},
include: [
{
model: Member,
@@ -73,6 +77,29 @@ band.get("/:id", (req: Request, res: Response) => {
exclude: [ "bandId" ]
}
},
{
model: Event,
include: [
{
model: Concert,
include: [
{
model: Location,
include: [ City ],
attributes: {
exclude: [ "id" ]
}
}
],
attributes: {
exclude: [ "id", "tourId", "locationId" ]
}
}
],
attributes: {
exclude: [ "id", "bandId" ]
}
},
Genre
],
attributes: {