From 19807f729cd8f4833e759eb7208d2fea2c8af03f Mon Sep 17 00:00:00 2001 From: Janis Hutz Date: Thu, 11 May 2023 18:00:23 +0200 Subject: [PATCH] seatplan prep + lang prep --- src/webapp/package-lock.json | 13 ++++- src/webapp/package.json | 3 +- src/webapp/public/lang/order/cart/en.json | 0 src/webapp/public/lang/order/pay/en.json | 0 src/webapp/public/lang/order/purchase/en.json | 0 .../public/lang/order/tickets/details/en.json | 0 .../public/lang/order/tickets/list/en.json | 0 .../lang/order/tickets/noseatplan/en.json | 0 .../lang/order/tickets/seatplan/en.json | 0 src/webapp/public/lang/user/account/en.json | 0 src/webapp/public/lang/user/login/en.json | 0 src/webapp/public/lang/user/signup/en.json | 0 src/webapp/src/components/noseatplan.vue | 57 ++++++++----------- .../src/components/seatplan/editor/window.vue | 57 +++++++++++++++++++ src/webapp/src/router/adminRoutes.js | 13 ++++- src/webapp/src/router/index.js | 2 +- src/webapp/src/views/admin/EventsView.vue | 10 +++- .../src/views/admin/events/EditorView.vue | 26 +++++++++ 18 files changed, 142 insertions(+), 39 deletions(-) create mode 100644 src/webapp/public/lang/order/cart/en.json create mode 100644 src/webapp/public/lang/order/pay/en.json create mode 100644 src/webapp/public/lang/order/purchase/en.json create mode 100644 src/webapp/public/lang/order/tickets/details/en.json create mode 100644 src/webapp/public/lang/order/tickets/list/en.json create mode 100644 src/webapp/public/lang/order/tickets/noseatplan/en.json create mode 100644 src/webapp/public/lang/order/tickets/seatplan/en.json create mode 100644 src/webapp/public/lang/user/account/en.json create mode 100644 src/webapp/public/lang/user/login/en.json create mode 100644 src/webapp/public/lang/user/signup/en.json create mode 100644 src/webapp/src/views/admin/events/EditorView.vue diff --git a/src/webapp/package-lock.json b/src/webapp/package-lock.json index fe4e6ff..bc9dd1a 100644 --- a/src/webapp/package-lock.json +++ b/src/webapp/package-lock.json @@ -11,7 +11,8 @@ "core-js": "^3.8.3", "pinia": "^2.0.34", "vue": "^3.2.13", - "vue-router": "^4.0.3" + "vue-router": "^4.0.3", + "vue3-draggable-resizable": "^1.6.5" }, "devDependencies": { "@vue/cli-plugin-babel": "~5.0.0", @@ -9220,6 +9221,11 @@ "integrity": "sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==", "dev": true }, + "node_modules/vue3-draggable-resizable": { + "version": "1.6.5", + "resolved": "https://registry.npmjs.org/vue3-draggable-resizable/-/vue3-draggable-resizable-1.6.5.tgz", + "integrity": "sha512-31142E31fGNnq3HKqvmFLSsqIbhck7TyGuQWhUKrDw6DOcGAuRx4ddRjaxvT6fe7dgeKH53qAh+i0ZlWtPLl2g==" + }, "node_modules/watchpack": { "version": "2.4.0", "resolved": "https://registry.npmmirror.com/watchpack/-/watchpack-2.4.0.tgz", @@ -16998,6 +17004,11 @@ "integrity": "sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==", "dev": true }, + "vue3-draggable-resizable": { + "version": "1.6.5", + "resolved": "https://registry.npmjs.org/vue3-draggable-resizable/-/vue3-draggable-resizable-1.6.5.tgz", + "integrity": "sha512-31142E31fGNnq3HKqvmFLSsqIbhck7TyGuQWhUKrDw6DOcGAuRx4ddRjaxvT6fe7dgeKH53qAh+i0ZlWtPLl2g==" + }, "watchpack": { "version": "2.4.0", "resolved": "https://registry.npmmirror.com/watchpack/-/watchpack-2.4.0.tgz", diff --git a/src/webapp/package.json b/src/webapp/package.json index eee77fa..3058d76 100644 --- a/src/webapp/package.json +++ b/src/webapp/package.json @@ -10,7 +10,8 @@ "core-js": "^3.8.3", "pinia": "^2.0.34", "vue": "^3.2.13", - "vue-router": "^4.0.3" + "vue-router": "^4.0.3", + "vue3-draggable-resizable": "^1.6.5" }, "devDependencies": { "@vue/cli-plugin-babel": "~5.0.0", diff --git a/src/webapp/public/lang/order/cart/en.json b/src/webapp/public/lang/order/cart/en.json new file mode 100644 index 0000000..e69de29 diff --git a/src/webapp/public/lang/order/pay/en.json b/src/webapp/public/lang/order/pay/en.json new file mode 100644 index 0000000..e69de29 diff --git a/src/webapp/public/lang/order/purchase/en.json b/src/webapp/public/lang/order/purchase/en.json new file mode 100644 index 0000000..e69de29 diff --git a/src/webapp/public/lang/order/tickets/details/en.json b/src/webapp/public/lang/order/tickets/details/en.json new file mode 100644 index 0000000..e69de29 diff --git a/src/webapp/public/lang/order/tickets/list/en.json b/src/webapp/public/lang/order/tickets/list/en.json new file mode 100644 index 0000000..e69de29 diff --git a/src/webapp/public/lang/order/tickets/noseatplan/en.json b/src/webapp/public/lang/order/tickets/noseatplan/en.json new file mode 100644 index 0000000..e69de29 diff --git a/src/webapp/public/lang/order/tickets/seatplan/en.json b/src/webapp/public/lang/order/tickets/seatplan/en.json new file mode 100644 index 0000000..e69de29 diff --git a/src/webapp/public/lang/user/account/en.json b/src/webapp/public/lang/user/account/en.json new file mode 100644 index 0000000..e69de29 diff --git a/src/webapp/public/lang/user/login/en.json b/src/webapp/public/lang/user/login/en.json new file mode 100644 index 0000000..e69de29 diff --git a/src/webapp/public/lang/user/signup/en.json b/src/webapp/public/lang/user/signup/en.json new file mode 100644 index 0000000..e69de29 diff --git a/src/webapp/src/components/noseatplan.vue b/src/webapp/src/components/noseatplan.vue index ed76093..a1d939e 100644 --- a/src/webapp/src/components/noseatplan.vue +++ b/src/webapp/src/components/noseatplan.vue @@ -17,10 +17,17 @@

Total: {{ eventInfo[ 'currency' ] }} {{ total }}

To cart -
+

Available tickets

-
- {{ ticket.name }} ({{ eventInfo[ 'categories' ][ ticket.category ][ 'name' ] }}) - {{ eventInfo.currency }} {{ eventInfo.categories[ ticket.category ][ 'price' ][ '1' ] }} add Selected remove +
+
+ {{ eventInfo[ 'categories' ][ ticket.category ][ 'name' ] }}
+
+
+ {{ ticketOption.name }}
({{ ticketOption.age }})
{{ eventInfo.currency }} {{ eventInfo[ 'categories' ][ ticket.category ][ 'price' ][ ticketOption.id ] }} add Selected remove +
+
+
@@ -49,7 +56,7 @@ export default { data () { return { tickets: { 'ticket1': { 'name': 'Ticket 1', 'id': 'ticket1', 'category': 1 }, 'ticket2': { 'name': 'Ticket 2', 'id': 'ticket2', 'category': 2 } }, - eventInfo: { 'name': 'TestEvent', 'location': 'TestLocation', 'date': 'TestDate', 'RoomName': 'TestRoom', 'currency': 'CHF', 'categories': { '1': { 'price': { '1':25, '2':35 }, 'bg': 'black', 'fg': 'white', 'name': 'Category 1' }, '2': { 'price': { '1':15, '2':20 }, 'bg': 'green', 'fg': 'white', 'name': 'Category 2' } }, 'ageGroups': { '1':{ 'id': 1, 'name':'Child', 'age':'0 - 15.99' }, '2':{ 'id': 2, 'name': 'Adult', 'age': null } }, 'ageGroupCount':2, 'stage': true }, + eventInfo: { 'name': 'TestEvent', 'location': 'TestLocation', 'date': 'TestDate', 'RoomName': 'TestRoom', 'currency': 'CHF', 'categories': { '1': { 'price': { '1':25, '2':35 }, 'bg': 'black', 'fg': 'white', 'name': 'Category 1' }, '2': { 'price': { '1':15, '2':20 }, 'bg': 'green', 'fg': 'white', 'name': 'Category 2' } }, 'ageGroups': { '1':{ 'id': 1, 'name':'Child', 'age':'0 - 15.99 years' }, '2':{ 'id': 2, 'name': 'Adult', 'age': null } }, 'ageGroupCount':2, 'stage': true }, selectedSeats: {}, pricingCurrentlySelected: {}, total: 0, @@ -228,7 +235,7 @@ export default { overflow: scroll; } - .seatingPlan { + .noseatplan { grid-area: main; display: flex; flex-direction: column; @@ -237,13 +244,21 @@ export default { overflow: scroll; } - .active { - cursor: pointer; + .wrapper { + width: 30%; + display: flex; + flex-direction: column; + align-items: justify; + justify-content: justify; + text-align: justify; } - .occupied { - background-color: var( --hover-color ); - padding: 0.4%; + .ticket { + width: 100%; + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; } .overlay { @@ -299,28 +314,6 @@ export default { margin-top: 3vh; } - .option { - list-style: none; - padding: 7px 15px; - border-radius: 10px; - border-color: var( --primary-color ); - border-style: solid; - border-width: 1px; - margin: 3px 0px; - cursor: pointer; - } - - .stage { - border-color: var( --primary-color ); - border-style: solid; - width: 80%; - height: 7%; - display: flex; - flex-direction: column; - align-items: center; - justify-content: center; - } - .button { background-color: var( --accent-background ); color: var( --secondary-color ); diff --git a/src/webapp/src/components/seatplan/editor/window.vue b/src/webapp/src/components/seatplan/editor/window.vue index e69de29..2474ae9 100644 --- a/src/webapp/src/components/seatplan/editor/window.vue +++ b/src/webapp/src/components/seatplan/editor/window.vue @@ -0,0 +1,57 @@ +