diff --git a/src/webapp/main/src/components/notifications/popups.vue b/src/webapp/main/src/components/notifications/popups.vue index b516e2f..9188a28 100644 --- a/src/webapp/main/src/components/notifications/popups.vue +++ b/src/webapp/main/src/components/notifications/popups.vue @@ -64,6 +64,9 @@ +
+ +
@@ -193,6 +196,15 @@ background-color: var( --popup-color ); } + .popup-iframe { + width: 100%; + height: 100%; + } + + .iframe-wrapper { + height: 100%; + } + .small { width: 40%; height: 40%; diff --git a/src/webapp/main/src/router/mainRoutes.js b/src/webapp/main/src/router/mainRoutes.js index 8e96fa3..ad92f1c 100644 --- a/src/webapp/main/src/router/mainRoutes.js +++ b/src/webapp/main/src/router/mainRoutes.js @@ -116,6 +116,15 @@ export default [ transition: 'scale' } }, + { + path: '/password-reset', + name: 'passwordReset', + component: () => import( '@/views/user/PasswordResetView.vue' ), + meta: { + title: 'Reset password - ', + transition: 'scale' + } + }, { path: '/guest', name: 'guestPurchase', diff --git a/src/webapp/main/src/views/admin/PluginsView.vue b/src/webapp/main/src/views/admin/PluginsView.vue index 50af34a..d525352 100644 --- a/src/webapp/main/src/views/admin/PluginsView.vue +++ b/src/webapp/main/src/views/admin/PluginsView.vue @@ -10,8 +10,9 @@ diff --git a/src/webapp/main/src/views/admin/SettingsView.vue b/src/webapp/main/src/views/admin/SettingsView.vue index bc4caa5..c88c770 100644 --- a/src/webapp/main/src/views/admin/SettingsView.vue +++ b/src/webapp/main/src/views/admin/SettingsView.vue @@ -25,6 +25,7 @@

Admin Accounts

+

Before setting or editing permissions here, please read the corresponding section of the documentation here.
Usually, the permissions automatically set by the system on account creation should be appropriate.

@@ -85,9 +86,16 @@ 'type': 'toggle', }, 'phoneNumberRequired': { - 'display': 'Require user to provide address?', + 'display': 'Require user to provide phone number?', 'id': 'phoneNumberRequired', - 'tooltip':'With this toggle you may specify whether or not a user has to provide their address when purchasing something. (Keep GDPR in mind when processing data!)', + 'tooltip':'With this toggle you may specify whether or not a user has to provide their phone number when purchasing something. (Keep GDPR in mind when processing data!)', + 'value': false, + 'type': 'toggle', + }, + 'dobRequired': { + 'display': 'Require user to provide their birth date?', + 'id': 'dobRequired', + 'tooltip':'With this toggle you may specify whether or not a user has to provide their date of birth when purchasing something. (Keep GDPR in mind when processing data!)', 'value': false, 'type': 'toggle', }, @@ -154,40 +162,46 @@ }, showPaymentSettings () { this.$refs.popup.openPopup( 'Payment gateway settings', { + 'link': '/payments/settings', + } + , 'iframe' ); + }, + createAccount() { + this.$refs.popup.openPopup( 'Create new admin user', { 'pagesSettings': { - 'display': 'Modify pages', - 'id': 'pagesSettings', - 'tooltip':'Change this setting to allow or disallow the selected user to access and change any settings of pages like the start page.', - 'value': false, - 'type': 'toggle', + 'display': 'Modify pages', + 'id': 'pagesSettings', + 'tooltip':'With this setting you can choose one of the preset permissions for users. Account management is only allowed for the root user.', + 'value': 'eventManager', + 'type': 'select', + 'restrictions': { + 'fullAccess': { + 'value': 'fullAccess', + 'displayName': 'Full Access' + }, + 'eventManager': { + 'value': 'eventManager', + 'displayName': 'Event Manager' + }, + 'entryControl': { + 'value': 'entryControl', + 'displayName': 'Entry Control' + } + } }, - 'locationsSettings': { - 'display': 'Location settings and seat plans', - 'id': 'locationsSettings', - 'tooltip':'Change this setting to allow or disallow the selected user to modify, delete or create locations with their corresponding seat plans.', - 'value': false, - 'type': 'toggle', + 'username': { + 'display': 'Username', + 'id': 'username', + 'tooltip':'Add a username for this user', + 'value': '', + 'type': 'text', }, - 'plugins': { - 'display': 'Plugin management', - 'id': 'plugins', - 'tooltip':'Change this setting to allow or disallow the selected user to install or uninstall plugins. Some plugins might allow you to set extra permissions inside of their settings panels', - 'value': false, - 'type': 'toggle', - }, - 'events': { - 'display': 'Event management', - 'id': 'events', - 'tooltip':'Change this setting to allow or disallow the selected user to install or uninstall plugins. Some plugins might allow you to set extra permissions inside of their settings panels', - 'value': false, - 'type': 'toggle', - }, - 'entryControl': { - 'display': 'Entry control', - 'id': 'entryControl', - 'tooltip':'Change this setting to allow or disallow the selected user to execute entry control at the entrance to your event location.', - 'value': true, - 'type': 'toggle', + 'email': { + 'display': 'Email', + 'id': 'email', + 'tooltip':'Add an email-address for this user', + 'value': '', + 'type': 'text', }, } , 'settings' ); diff --git a/src/webapp/main/src/views/user/PasswordResetView.vue b/src/webapp/main/src/views/user/PasswordResetView.vue new file mode 100644 index 0000000..51c019d --- /dev/null +++ b/src/webapp/main/src/views/user/PasswordResetView.vue @@ -0,0 +1,42 @@ + + + + + \ No newline at end of file