diff --git a/software/backend/data/cities-locations.json b/software/backend/data/cities-locations.json new file mode 100644 index 0000000..adff35e --- /dev/null +++ b/software/backend/data/cities-locations.json @@ -0,0 +1,576 @@ +{ + "data": [ + { + "name": "Hannover", + "country": "Germany", + "locations": [ + { + "id": 0, + "name": "Swiss Life Hall", + "address": "Ferdinand-Wilhelm-Fricke-Weg 8", + "imageIndoor": "locations/swiss-life-hall-indoor.jpg", + "imageOutdoor": "locations/swiss-life-hall-outdoor.jpg", + "seatGroups": [ + { + "name": "A", + "surcharge": 20, + "standingArea": true, + "capacity": 40 + }, + { + "name": "B", + "surcharge": 10, + "standingArea": false, + "rows": 5, + "capacity": 25 + }, + { + "name": "C", + "surcharge": 10, + "standingArea": false, + "rows": 5, + "capacity": 25 + }, + { + "name": "D", + "surcharge": 10, + "standingArea": false, + "rows": 3, + "capacity": 30 + }, + { + "name": "E", + "surcharge": 10, + "standingArea": false, + "rows": 3, + "capacity": 12 + }, + { + "name": "F", + "surcharge": 10, + "standingArea": false, + "rows": 3, + "capacity": 12 + } + ] + }, + { + "id": 1, + "name": "Capitol", + "address": "Schwarzer Bär 2", + "imageIndoor": "locations/capitol-indoor.jpg", + "imageOutdoor": "locations/capitol-outdoor.jpg", + "seatGroups": [ + { + "name": "A", + "surcharge": 20, + "standingArea": true, + "capacity": 50 + } + ] + }, + { + "id": 2, + "name": "ZAG Arena", + "address": "EXPO-Plaza 7", + "imageIndoor": "locations/zag-arena-indoor.jpg", + "imageOutdoor": "locations/zag-arena-outdoor.jpg", + "seatGroups": [ + { + "name": "A", + "surcharge": 20, + "standingArea": true, + "capacity": 40 + }, + { + "name": "B", + "surcharge": 10, + "standingArea": false, + "rows": 5, + "capacity": 25 + }, + { + "name": "C", + "surcharge": 10, + "standingArea": false, + "rows": 5, + "capacity": 25 + }, + { + "name": "D", + "surcharge": 10, + "standingArea": false, + "rows": 3, + "capacity": 30 + }, + { + "name": "E", + "surcharge": 10, + "standingArea": false, + "rows": 3, + "capacity": 12 + }, + { + "name": "F", + "surcharge": 10, + "standingArea": false, + "rows": 3, + "capacity": 12 + } + ] + }, + { + "id": 3, + "name": "Kulturzentrum Faust", + "address": "Zur Bettfedernfabrik 3", + "imageIndoor": "locations/faust-hannover-indoor.jpg", + "imageOutdoor": "locations/faust-hannover-outdoor.jpg", + "seatGroups": [ + { + "name": "A", + "surcharge": 20, + "standingArea": true, + "capacity": 25 + } + ] + } + ] + }, + { + "name": "München", + "country": "Germany", + "locations": [ + { + "id": 4, + "name": "Olympiahalle München", + "address": "Spiridon-Louis-Ring 21", + "imageIndoor": "locations/olympiahalle-munich-indoor.jpg", + "imageOutdoor": "locations/olympiahalle-munich-outdoor.jpg", + "seatGroups": [ + { + "name": "A", + "surcharge": 20, + "standingArea": true, + "capacity": 60 + }, + { + "name": "B", + "surcharge": 10, + "standingArea": false, + "rows": 5, + "capacity": 20 + }, + { + "name": "C", + "surcharge": 10, + "standingArea": false, + "rows": 5, + "capacity": 20 + }, + { + "name": "D", + "surcharge": 10, + "standingArea": false, + "rows": 3, + "capacity": 20 + }, + { + "name": "E", + "surcharge": 10, + "standingArea": false, + "rows": 3, + "capacity": 12 + }, + { + "name": "F", + "surcharge": 10, + "standingArea": false, + "rows": 3, + "capacity": 12 + } + ] + }, + { + "id": 5, + "name": "Schlachthof München", + "address": "Zenettistraße 9", + "imageIndoor": "locations/schlachthof-munich-indoor.jpg", + "imageOutdoor": "locations/schlachthof-munich-outdoor.jpg", + "seatGroups": [ + { + "name": "A", + "surcharge": 20, + "standingArea": true, + "capacity": 40 + } + ] + }, + { + "id": 6, + "name": "Muffatwerk", + "address": "Zellstraße 4", + "imageIndoor": "locations/muffatwerk-indoor.jpg", + "imageOutdoor": "locations/muffatwerk-outdoor.jpg", + "seatGroups": [ + { + "name": "A", + "surcharge": 20, + "standingArea": true, + "capacity": 60 + } + ] + } + ] + }, + { + "name": "Hamburg", + "country": "Germany", + "locations": [ + { + "id": 7, + "name": "Volksparkstadion", + "address": "Sylvesterallee 7", + "imageIndoor": "locations/volksparkstadion-hamburg-indoor.jpg", + "imageOutdoor": "locations/volksparkstadion-hamburg-outdoor.jpg", + "seatGroups": [ + { + "name": "A", + "surcharge": 20, + "standingArea": true, + "capacity": 50 + }, + { + "name": "B", + "surcharge": 10, + "standingArea": false, + "rows": 5, + "capacity": 25 + }, + { + "name": "C", + "surcharge": 10, + "standingArea": false, + "rows": 5, + "capacity": 25 + }, + { + "name": "D", + "surcharge": 10, + "standingArea": false, + "rows": 3, + "capacity": 20 + }, + { + "name": "E", + "surcharge": 10, + "standingArea": false, + "rows": 3, + "capacity": 16 + }, + { + "name": "F", + "surcharge": 10, + "standingArea": false, + "rows": 3, + "capacity": 16 + } + ] + }, + { + "id": 8, + "name": "Barclays Arena", + "address": "Sylvesterallee 10", + "imageIndoor": "locations/barclays-arena-indoor.jpg", + "imageOutdoor": "locations/barclays-arena-outdoor.jpg", + "seatGroups": [ + { + "name": "A", + "surcharge": 20, + "standingArea": false, + "capacity": 40 + }, + { + "name": "B", + "surcharge": 10, + "standingArea": false, + "rows": 5, + "capacity": 25 + }, + { + "name": "C", + "surcharge": 10, + "standingArea": false, + "rows": 5, + "capacity": 25 + } + ] + } + ] + }, + { + "name": "Berlin", + "country": "Germany", + "locations": [ + { + "id": 9, + "name": "Waldbühne Berlin", + "address": "Am Glockenturm", + "imageIndoor": "locations/waldbuehne-berlin-indoor.jpg", + "imageOutdoor": "locations/waldbuehne-berlin-outdoor.jpg", + "seatGroups": [ + { + "name": "A", + "surcharge": 20, + "standingArea": false, + "capacity": 10 + }, + { + "name": "B", + "surcharge": 10, + "standingArea": false, + "rows": 5, + "capacity": 25 + }, + { + "name": "C", + "surcharge": 10, + "standingArea": false, + "rows": 5, + "capacity": 25 + } + ] + }, + { + "id": 10, + "name": "Olympiastadion Berlin", + "address": "Olympischer Platz 3", + "imageIndoor": "locations/olympiastadion-berlin-indoor.jpg", + "imageOutdoor": "locations/olympiastadion-berlin-outdoor.jpg", + "seatGroups": [ + { + "name": "A", + "surcharge": 20, + "standingArea": true, + "capacity": 60 + }, + { + "name": "B", + "surcharge": 10, + "standingArea": false, + "rows": 5, + "capacity": 20 + }, + { + "name": "C", + "surcharge": 10, + "standingArea": false, + "rows": 5, + "capacity": 20 + }, + { + "name": "D", + "surcharge": 10, + "standingArea": false, + "rows": 3, + "capacity": 20 + }, + { + "name": "E", + "surcharge": 10, + "standingArea": false, + "rows": 3, + "capacity": 12 + }, + { + "name": "F", + "surcharge": 10, + "standingArea": false, + "rows": 3, + "capacity": 12 + } + ] + }, + { + "id": 11, + "name": "Uber Arena Berlin", + "address": "Uber-Platz 1", + "imageIndoor": "locations/uber-arena-berlin-indoor.jpg", + "imageOutdoor": "locations/uber-arena-berlin-outdoor.jpg", + "seatGroups": [ + { + "name": "A", + "surcharge": 20, + "standingArea": true, + "capacity": 50 + }, + { + "name": "B", + "surcharge": 10, + "standingArea": false, + "rows": 5, + "capacity": 30 + }, + { + "name": "C", + "surcharge": 10, + "standingArea": false, + "rows": 5, + "capacity": 30 + }, + { + "name": "D", + "surcharge": 10, + "standingArea": false, + "rows": 3, + "capacity": 20 + }, + { + "name": "E", + "surcharge": 10, + "standingArea": false, + "rows": 3, + "capacity": 12 + }, + { + "name": "F", + "surcharge": 10, + "standingArea": false, + "rows": 3, + "capacity": 12 + } + ] + }, + { + "id": 12, + "name": "Columbiahalle", + "address": "Columbiadamm 13-21", + "imageIndoor": "locations/columbiahalle-indoor.jpg", + "imageOutdoor": "locations/columbiahalle-outdoor.jpg", + "seatGroups": [ + { + "name": "A", + "surcharge": 20, + "standingArea": true, + "capacity": 50 + }, + { + "name": "B", + "surcharge": 10, + "standingArea": false, + "rows": 5, + "capacity": 30 + }, + { + "name": "C", + "surcharge": 10, + "standingArea": false, + "rows": 5, + "capacity": 30 + } + ] + }, + { + "id": 13, + "name": "Astra Kulturhaus", + "address": "Revaler Straße 99", + "imageIndoor": "locations/astra-kulturhaus-indoor.jpg", + "imageOutdoor": "locations/astra-kulturhaus-outdoor.jpg", + "seatGroups": [ + { + "name": "A", + "surcharge": 0, + "standingArea": true, + "capacity": 40 + } + ] + } + ] + }, + { + "name": "Köln", + "country": "Germany", + "locations": [ + { + "id": 14, + "name": "LANXESS arena", + "address": "Willy-Brandt-Platz", + "imageIndoor": "locations/lanxess-arena-indoor.jpg", + "imageOutdoor": "locations/lanxess-arena-outdoor.jpg", + "seatGroups": [ + { + "name": "A", + "surcharge": 20, + "standingArea": true, + "capacity": 50 + }, + { + "name": "B", + "surcharge": 10, + "standingArea": false, + "rows": 5, + "capacity": 30 + }, + { + "name": "C", + "surcharge": 10, + "standingArea": false, + "rows": 5, + "capacity": 30 + }, + { + "name": "D", + "surcharge": 10, + "standingArea": false, + "rows": 3, + "capacity": 20 + }, + { + "name": "E", + "surcharge": 10, + "standingArea": false, + "rows": 3, + "capacity": 12 + }, + { + "name": "F", + "surcharge": 10, + "standingArea": false, + "rows": 3, + "capacity": 12 + } + ] + }, + { + "id": 15, + "name": "Palladium", + "address": "Schanzenstraße 40", + "imageIndoor": "locations/palladium-indoor.jpg", + "imageOutdoor": "locations/palladium-outdoor.jpg", + "seatGroups": [ + { + "name": "A", + "surcharge": 0, + "standingArea": true, + "capacity": 50 + } + ] + }, + { + "id": 16, + "name": "E-Werk", + "address": "Schanzenstraße 37", + "imageIndoor": "locations/e-werk-indoor.jpg", + "imageOutdoor": "locations/e-werk-outdoor.jpg", + "seatGroups": [ + { + "name": "A", + "surcharge": 0, + "standingArea": true, + "capacity": 40 + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/software/backend/data/cities.json b/software/backend/data/cities.json deleted file mode 100644 index 8cbb223..0000000 --- a/software/backend/data/cities.json +++ /dev/null @@ -1,353 +0,0 @@ -{ - "data": [ - { - "name": "Hannover", - "country": "Germany", - "locations": [ - { - "id": 0, - "name": "Swiss Life Hall", - "address": "Ferdinand-Wilhelm-Fricke-Weg 8", - "image": "locations/swiss-life-hall.jpg", - "logo": "locations/capitol.logo.png", - "seatGroups": [ - { - "name": "A", - "surcharge": 20, - "standingArea": true, - "capacity": 40 - }, - { - "name": "B", - "surcharge": 10, - "standingArea": false, - "rows": 5, - "capacity": 25 - }, - { - "name": "C", - "surcharge": 10, - "standingArea": false, - "rows": 5, - "capacity": 25 - }, - { - "name": "D", - "surcharge": 10, - "standingArea": false, - "rows": 3, - "capacity": 30 - }, - { - "name": "E", - "surcharge": 10, - "standingArea": false, - "rows": 3, - "capacity": 12 - }, - { - "name": "F", - "surcharge": 10, - "standingArea": false, - "rows": 3, - "capacity": 12 - } - ] - }, - { - "id": 1, - "name": "Capitol", - "address": "Schwarzer Bär 2", - "image": "locations/capitol.jpg", - "logo": "locations/capitol-logo.png", - "seatGroups": [ - { - "name": "A", - "surcharge": 20, - "standingArea": true, - "capacity": 50 - } - ] - }, - { - "id": 2, - "name": "ZAG Arena", - "address": "EXPO-Plaza 7", - "image": "locations/zag-arena.jpg", - "logo": "locations/capitol.logo.png", - "seatGroups": [ - { - "name": "A", - "surcharge": 20, - "standingArea": true, - "capacity": 40 - }, - { - "name": "B", - "surcharge": 10, - "standingArea": false, - "rows": 5, - "capacity": 25 - }, - { - "name": "C", - "surcharge": 10, - "standingArea": false, - "rows": 5, - "capacity": 25 - }, - { - "name": "D", - "surcharge": 10, - "standingArea": false, - "rows": 3, - "capacity": 30 - }, - { - "name": "E", - "surcharge": 10, - "standingArea": false, - "rows": 3, - "capacity": 12 - }, - { - "name": "F", - "surcharge": 10, - "standingArea": false, - "rows": 3, - "capacity": 12 - } - ] - }, - { - "id": 3, - "name": "Kulturzentrum Faust", - "address": "Zur Bettfedernfabrik 3", - "image": "locations/faust-hannover.jpg", - "logo": "locations/faust-logo.png", - "seatGroups": [ - { - "name": "A", - "surcharge": 20, - "standingArea": true, - "capacity": 10 - } - ] - } - ] - }, - { - "name": "München", - "country": "Germany", - "locations": [ - { - "id": 4, - "name": "Olympiahalle München", - "address": "Spiridon-Louis-Ring 21", - "image": "locations/olympiahalle-munich.jpg", - "logo": "locations/capitol.logo.png", - "seatGroups": [ - { - "name": "A", - "surcharge": 20, - "standingArea": true, - "capacity": 10 - } - ] - }, - { - "id": 5, - "name": "Schlachthof München", - "address": "Zenettistraße 9", - "image": "locations/schlachthof-munich.jpg", - "logo": "locations/capitol.logo.png", - "seatGroups": [ - { - "name": "A", - "surcharge": 20, - "standingArea": true, - "capacity": 10 - } - ] - }, - { - "id": 6, - "name": "Muffatwerk", - "address": "Zellstraße 4", - "image": "locations/muffatwerk.jpg", - "logo": "locations/capitol.logo.png", - "seatGroups": [ - { - "name": "A", - "surcharge": 20, - "standingArea": true, - "capacity": 10 - } - ] - } - ] - }, - { - "name": "Hamburg", - "country": "Germany", - "locations": [ - { - "id": 7, - "name": "Elbphilharmonie Hamburg", - "address": "Platz der deutschen Einheit", - "image": "locations/elbphilharmonie-hamburg.jpg", - "logo": "locations/capitol.logo.png", - "seatGroups": [ - { - "name": "A", - "surcharge": 20, - "standingArea": true, - "capacity": 10 - } - ] - }, - { - "id": 8, - "name": "Volksparkstadion", - "address": "Sylvesterallee 7", - "image": "locations/volksparkstadion-hamburg.jpg", - "logo": "locations/capitol.logo.png", - "seatGroups": [ - { - "name": "A", - "surcharge": 20, - "standingArea": true, - "capacity": 10 - } - ] - }, - { - "id": 9, - "name": "Barclays Arena", - "address": "Sylvesterallee 10", - "image": "locations/barclays-arena.jpg", - "logo": "locations/capitol.logo.png", - "seatGroups": [ - { - "name": "A", - "surcharge": 20, - "standingArea": true, - "capacity": 10 - } - ] - }, - { - "id": 10, - "name": "Stage Theater im Hafen Hamburg", - "address": "Norderelbestraße 6", - "image": "locations/stage-theater-hamburg.jpg", - "logo": "locations/capitol.logo.png", - "seatGroups": [ - { - "name": "A", - "surcharge": 20, - "standingArea": true, - "capacity": 10 - } - ] - } - ] - }, - { - "name": "Berlin", - "country": "Germany", - "locations": [ - { - "id": 11, - "name": "Waldbühne Berlin", - "address": "Am Glockenturm", - "image": "locations/waldbuehne-berlin.jpg", - "logo": "locations/capitol.logo.png", - "seatGroups": [ - { - "name": "A", - "surcharge": 20, - "standingArea": true, - "capacity": 10 - } - ] - }, - { - "id": 12, - "name": "Olympiastadion Berlin", - "address": "Olympischer Platz 3", - "image": "locations/olympiastadion-berlin.jpg", - "logo": "locations/capitol.logo.png", - "seatGroups": [ - { - "name": "A", - "surcharge": 20, - "standingArea": true, - "capacity": 10 - } - ] - }, - { - "id": 13, - "name": "Uber Arena Berlin", - "address": "Uber-Platz 1", - "image": "locations/uber-arena-berlin.jpg", - "logo": "locations/capitol.logo.png", - "seatGroups": [ - { - "name": "A", - "surcharge": 20, - "standingArea": true, - "capacity": 10 - } - ] - }, - { - "id": 14, - "name": "Columbiahalle", - "address": "Columbiadamm 13-21", - "image": "locations/columbiahalle.jpg", - "logo": "locations/capitol.logo.png", - "seatGroups": [ - { - "name": "A", - "surcharge": 20, - "standingArea": true, - "capacity": 10 - } - ] - }, - { - "id": 15, - "name": "Astra Kulturhaus", - "address": "Revaler Straße 99", - "image": "locations/astra-kulturhaus.jpg", - "logo": "locations/capitol.logo.png", - "seatGroups": [ - { - "name": "A", - "surcharge": 20, - "standingArea": true, - "capacity": 10 - } - ] - }, - { - "id": 16, - "name": "Deutsche Oper Berlin", - "address": "Bismarckstraße 35", - "image": "locations/deutsche-oper-berlin.jpg", - "logo": "locations/capitol-logo.png", - "seatGroups": [ - { - "name": "A", - "surcharge": 20, - "standingArea": true, - "capacity": 10 - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/software/backend/images/locations/astra-kulturhaus.jpg b/software/backend/images/locations/astra-kulturhaus-indoor.jpg similarity index 100% rename from software/backend/images/locations/astra-kulturhaus.jpg rename to software/backend/images/locations/astra-kulturhaus-indoor.jpg diff --git a/software/backend/images/locations/astra-kulturhaus-outdoor.jpg b/software/backend/images/locations/astra-kulturhaus-outdoor.jpg new file mode 100644 index 0000000..0726a4b Binary files /dev/null and b/software/backend/images/locations/astra-kulturhaus-outdoor.jpg differ diff --git a/software/backend/images/locations/barclays-arena-indoor.jpg b/software/backend/images/locations/barclays-arena-indoor.jpg new file mode 100644 index 0000000..e47169b Binary files /dev/null and b/software/backend/images/locations/barclays-arena-indoor.jpg differ diff --git a/software/backend/images/locations/barclays-arena.jpg b/software/backend/images/locations/barclays-arena-outdoor.jpg similarity index 100% rename from software/backend/images/locations/barclays-arena.jpg rename to software/backend/images/locations/barclays-arena-outdoor.jpg diff --git a/software/backend/images/locations/capitol-indoor.jpg b/software/backend/images/locations/capitol-indoor.jpg new file mode 100644 index 0000000..a4991db Binary files /dev/null and b/software/backend/images/locations/capitol-indoor.jpg differ diff --git a/software/backend/images/locations/capitol-logo.png b/software/backend/images/locations/capitol-logo.png deleted file mode 100644 index 6787f32..0000000 Binary files a/software/backend/images/locations/capitol-logo.png and /dev/null differ diff --git a/software/backend/images/locations/capitol.jpg b/software/backend/images/locations/capitol-outdoor.jpg similarity index 100% rename from software/backend/images/locations/capitol.jpg rename to software/backend/images/locations/capitol-outdoor.jpg diff --git a/software/backend/images/locations/columbiahalle.jpg b/software/backend/images/locations/columbiahalle-indoor.jpg similarity index 100% rename from software/backend/images/locations/columbiahalle.jpg rename to software/backend/images/locations/columbiahalle-indoor.jpg diff --git a/software/backend/images/locations/columbiahalle-outdoor.jpg b/software/backend/images/locations/columbiahalle-outdoor.jpg new file mode 100644 index 0000000..58a7553 Binary files /dev/null and b/software/backend/images/locations/columbiahalle-outdoor.jpg differ diff --git a/software/backend/images/locations/deutsche-oper-berlin.jpg b/software/backend/images/locations/deutsche-oper-berlin.jpg deleted file mode 100644 index a0ae5b5..0000000 Binary files a/software/backend/images/locations/deutsche-oper-berlin.jpg and /dev/null differ diff --git a/software/backend/images/locations/e-werk-indoor.jpg b/software/backend/images/locations/e-werk-indoor.jpg new file mode 100644 index 0000000..6c3b8bf Binary files /dev/null and b/software/backend/images/locations/e-werk-indoor.jpg differ diff --git a/software/backend/images/locations/e-werk-outdoor.jpg b/software/backend/images/locations/e-werk-outdoor.jpg new file mode 100644 index 0000000..c7eecfe Binary files /dev/null and b/software/backend/images/locations/e-werk-outdoor.jpg differ diff --git a/software/backend/images/locations/elbphilharmonie-hamburg.jpg b/software/backend/images/locations/elbphilharmonie-hamburg.jpg deleted file mode 100644 index 8d8d1f9..0000000 Binary files a/software/backend/images/locations/elbphilharmonie-hamburg.jpg and /dev/null differ diff --git a/software/backend/images/locations/faust-hannover.jpg b/software/backend/images/locations/faust-hannover-indoor.jpg similarity index 100% rename from software/backend/images/locations/faust-hannover.jpg rename to software/backend/images/locations/faust-hannover-indoor.jpg diff --git a/software/backend/images/locations/faust-hannover-outdoor.jpg b/software/backend/images/locations/faust-hannover-outdoor.jpg new file mode 100644 index 0000000..664dd05 Binary files /dev/null and b/software/backend/images/locations/faust-hannover-outdoor.jpg differ diff --git a/software/backend/images/locations/faust-logo.png b/software/backend/images/locations/faust-logo.png deleted file mode 100644 index 392ab59..0000000 Binary files a/software/backend/images/locations/faust-logo.png and /dev/null differ diff --git a/software/backend/images/locations/lanxess-arena-indoor.jpg b/software/backend/images/locations/lanxess-arena-indoor.jpg new file mode 100644 index 0000000..afa8fa7 Binary files /dev/null and b/software/backend/images/locations/lanxess-arena-indoor.jpg differ diff --git a/software/backend/images/locations/lanxess-arena-outdoor.jpg b/software/backend/images/locations/lanxess-arena-outdoor.jpg new file mode 100644 index 0000000..4a7693c Binary files /dev/null and b/software/backend/images/locations/lanxess-arena-outdoor.jpg differ diff --git a/software/backend/images/locations/muffatwerk.jpg b/software/backend/images/locations/muffatwerk-indoor.jpg similarity index 100% rename from software/backend/images/locations/muffatwerk.jpg rename to software/backend/images/locations/muffatwerk-indoor.jpg diff --git a/software/backend/images/locations/muffatwerk-outdoor.jpg b/software/backend/images/locations/muffatwerk-outdoor.jpg new file mode 100644 index 0000000..c5364da Binary files /dev/null and b/software/backend/images/locations/muffatwerk-outdoor.jpg differ diff --git a/software/backend/images/locations/olympiahalle-munich-indoor.jpg b/software/backend/images/locations/olympiahalle-munich-indoor.jpg new file mode 100644 index 0000000..445ded3 Binary files /dev/null and b/software/backend/images/locations/olympiahalle-munich-indoor.jpg differ diff --git a/software/backend/images/locations/olympiahalle-munich.jpg b/software/backend/images/locations/olympiahalle-munich-outdoor.jpg similarity index 100% rename from software/backend/images/locations/olympiahalle-munich.jpg rename to software/backend/images/locations/olympiahalle-munich-outdoor.jpg diff --git a/software/backend/images/locations/olympiastadion-berlin.jpg b/software/backend/images/locations/olympiastadion-berlin-indoor.jpg similarity index 100% rename from software/backend/images/locations/olympiastadion-berlin.jpg rename to software/backend/images/locations/olympiastadion-berlin-indoor.jpg diff --git a/software/backend/images/locations/olympiastadion-berlin-outdoor.jpg b/software/backend/images/locations/olympiastadion-berlin-outdoor.jpg new file mode 100644 index 0000000..bdc0157 Binary files /dev/null and b/software/backend/images/locations/olympiastadion-berlin-outdoor.jpg differ diff --git a/software/backend/images/locations/palladium-indoor.jpg b/software/backend/images/locations/palladium-indoor.jpg new file mode 100644 index 0000000..c752b5e Binary files /dev/null and b/software/backend/images/locations/palladium-indoor.jpg differ diff --git a/software/backend/images/locations/palladium-outdoor.jpg b/software/backend/images/locations/palladium-outdoor.jpg new file mode 100644 index 0000000..0916b48 Binary files /dev/null and b/software/backend/images/locations/palladium-outdoor.jpg differ diff --git a/software/backend/images/locations/schlachthof-munich.jpg b/software/backend/images/locations/schlachthof-munich-indoor.jpg similarity index 100% rename from software/backend/images/locations/schlachthof-munich.jpg rename to software/backend/images/locations/schlachthof-munich-indoor.jpg diff --git a/software/backend/images/locations/schlachthof-munich-outdoor.jpg b/software/backend/images/locations/schlachthof-munich-outdoor.jpg new file mode 100644 index 0000000..0515e8f Binary files /dev/null and b/software/backend/images/locations/schlachthof-munich-outdoor.jpg differ diff --git a/software/backend/images/locations/stage-theater-hamburg.jpg b/software/backend/images/locations/stage-theater-hamburg.jpg deleted file mode 100644 index 929d5de..0000000 Binary files a/software/backend/images/locations/stage-theater-hamburg.jpg and /dev/null differ diff --git a/software/backend/images/locations/swiss-life-hall.jpg b/software/backend/images/locations/swiss-life-hall-indoor.jpg similarity index 100% rename from software/backend/images/locations/swiss-life-hall.jpg rename to software/backend/images/locations/swiss-life-hall-indoor.jpg diff --git a/software/backend/images/locations/swiss-life-hall-outdoor.jpg b/software/backend/images/locations/swiss-life-hall-outdoor.jpg new file mode 100644 index 0000000..ff0f4db Binary files /dev/null and b/software/backend/images/locations/swiss-life-hall-outdoor.jpg differ diff --git a/software/backend/images/locations/uber-arena-berlin.jpg b/software/backend/images/locations/uber-arena-berlin-indoor.jpg similarity index 100% rename from software/backend/images/locations/uber-arena-berlin.jpg rename to software/backend/images/locations/uber-arena-berlin-indoor.jpg diff --git a/software/backend/images/locations/uber-arena-berlin-outdoor.jpg b/software/backend/images/locations/uber-arena-berlin-outdoor.jpg new file mode 100644 index 0000000..47f3e12 Binary files /dev/null and b/software/backend/images/locations/uber-arena-berlin-outdoor.jpg differ diff --git a/software/backend/images/locations/volksparkstadion-hamburg.jpg b/software/backend/images/locations/volksparkstadion-hamburg-indoor.jpg similarity index 100% rename from software/backend/images/locations/volksparkstadion-hamburg.jpg rename to software/backend/images/locations/volksparkstadion-hamburg-indoor.jpg diff --git a/software/backend/images/locations/volksparkstadion-hamburg-outdoor.jpg b/software/backend/images/locations/volksparkstadion-hamburg-outdoor.jpg new file mode 100644 index 0000000..b6fabcc Binary files /dev/null and b/software/backend/images/locations/volksparkstadion-hamburg-outdoor.jpg differ diff --git a/software/backend/images/locations/waldbuehne-berlin.jpg b/software/backend/images/locations/waldbuehne-berlin-indoor.jpg similarity index 100% rename from software/backend/images/locations/waldbuehne-berlin.jpg rename to software/backend/images/locations/waldbuehne-berlin-indoor.jpg diff --git a/software/backend/images/locations/waldbuehne-berlin-outdoor.jpg b/software/backend/images/locations/waldbuehne-berlin-outdoor.jpg new file mode 100644 index 0000000..956180e Binary files /dev/null and b/software/backend/images/locations/waldbuehne-berlin-outdoor.jpg differ diff --git a/software/backend/images/locations/zag-arena.jpg b/software/backend/images/locations/zag-arena-indoor.jpg similarity index 100% rename from software/backend/images/locations/zag-arena.jpg rename to software/backend/images/locations/zag-arena-indoor.jpg diff --git a/software/backend/images/locations/zag-arena-outdoor.jpg b/software/backend/images/locations/zag-arena-outdoor.jpg new file mode 100644 index 0000000..16ca57d Binary files /dev/null and b/software/backend/images/locations/zag-arena-outdoor.jpg differ diff --git a/software/backend/models/locations/location.model.ts b/software/backend/models/locations/location.model.ts index c08e447..1ea7b73 100644 --- a/software/backend/models/locations/location.model.ts +++ b/software/backend/models/locations/location.model.ts @@ -5,6 +5,9 @@ import { SeatGroup } from "./seatGroup.model"; @Table({ timestamps: false }) export class Location extends Model { + @Column + urlName: string + @Column name: String @@ -16,10 +19,10 @@ export class Location extends Model { cityId: Number @Column - image: String + imageIndoor: String @Column - logo: String + imageOutdoor: String // Relations diff --git a/software/backend/routes/exercise.routes.ts b/software/backend/routes/exercise.routes.ts index 3e684f4..dbb93f1 100644 --- a/software/backend/routes/exercise.routes.ts +++ b/software/backend/routes/exercise.routes.ts @@ -23,7 +23,6 @@ exercises.get("/", (req: Request, res: Response) => { }) exercises.post("/:groupNr/:exerciseNr/:state", (req: Request, res: Response) => { - console.log(req.params.groupNr) ExerciseGroup.findOne({ where: { groupNr: req.params.groupNr } }) diff --git a/software/backend/routes/location.routes.ts b/software/backend/routes/location.routes.ts index 7398907..0437068 100644 --- a/software/backend/routes/location.routes.ts +++ b/software/backend/routes/location.routes.ts @@ -70,9 +70,9 @@ location.get("/", (req: Request, res: Response) => { }) }) -location.get("/:name", (req: Request, res: Response) => { +location.get("/:urlName", (req: Request, res: Response) => { Location.findOne({ - where: { name: { [Op.like]: req.params.name } }, + where: { urlName: req.params.urlName }, include: [ City, { diff --git a/software/backend/scripts/databaseHelper.ts b/software/backend/scripts/databaseHelper.ts index 8950195..ea02880 100644 --- a/software/backend/scripts/databaseHelper.ts +++ b/software/backend/scripts/databaseHelper.ts @@ -25,7 +25,7 @@ import accountRoles from "./../data/accountRoles.json" import bands from "./../data/bands.json" import genres from "./../data/genres.json" import events from "./../data/events.json" -import cities from "./../data/cities.json" +import citiesLocations from "./../data/cities-locations.json" import exercises from "./../data/exercises.json" @@ -82,13 +82,14 @@ export async function prepopulateDatabase() { AccountRole.bulkCreate(accountRoles.data) Genre.bulkCreate(genres.data) - for (let city of cities.data) + for (let city of citiesLocations.data) { await City.create(city) .then(async cityDataset => { for (let location of city.locations) { location["cityId"] = cityDataset.id + location["urlName"] = location.name.replaceAll(" ", "-").toLowerCase() await Location.create(location) .then(async locationDataset => { diff --git a/software/backend/server.ts b/software/backend/server.ts index ea8b63a..8157333 100644 --- a/software/backend/server.ts +++ b/software/backend/server.ts @@ -30,9 +30,9 @@ const path = require('path') app.use('/static', express.static(path.join(__dirname, 'images'))) // Add delay for more realistic response times -app.use((req, res, next) => { - setTimeout(next, Math.floor((Math.random () * 2000) + 100)) -}) +// app.use((req, res, next) => { +// setTimeout(next, Math.floor((Math.random () * 2000) + 100)) +// }) // Routes app.use("/api", api) diff --git a/software/src/components/seatPlanMap/seatGroupSheet.vue b/software/src/components/seatPlanMap/seatGroupSheet.vue index e590539..cd2ef38 100644 --- a/software/src/components/seatPlanMap/seatGroupSheet.vue +++ b/software/src/components/seatPlanMap/seatGroupSheet.vue @@ -1,7 +1,6 @@