From 0352bb9051ae8afb8cdf485ca5cd7e1e43b804d3 Mon Sep 17 00:00:00 2001
From: janis <jahu04@outlook.com>
Date: Thu, 5 Oct 2023 13:31:51 +0200
Subject: [PATCH] setup do linter run & fix

---
 src/webapp/setup/src/App.vue                  |   2 +-
 .../setup/src/components/notifications.vue    | 180 ++++++-------
 src/webapp/setup/src/main.js                  |   2 +-
 src/webapp/setup/src/router/index.js          |  10 +-
 src/webapp/setup/src/router/setupRoutes.js    |   2 +-
 src/webapp/setup/src/stores/backendStore.js   |   4 +-
 src/webapp/setup/src/views/BasicSetupView.vue | 132 ++++-----
 src/webapp/setup/src/views/HomeView.vue       |  72 ++---
 src/webapp/setup/src/views/SetupRootView.vue  | 250 +++++++++---------
 src/webapp/setup/src/views/SetupStartView.vue |  36 +--
 src/webapp/setup/src/views/SetupView.vue      |  50 ++--
 src/webapp/setup/vite.config.js               |   8 +-
 12 files changed, 374 insertions(+), 374 deletions(-)

diff --git a/src/webapp/setup/src/App.vue b/src/webapp/setup/src/App.vue
index f13595e..01fd6ce 100644
--- a/src/webapp/setup/src/App.vue
+++ b/src/webapp/setup/src/App.vue
@@ -176,5 +176,5 @@ export default {
             this.theme = '&#9789;';
         }
     }
-}
+};
 </script>
\ No newline at end of file
diff --git a/src/webapp/setup/src/components/notifications.vue b/src/webapp/setup/src/components/notifications.vue
index 4b76974..8072b39 100644
--- a/src/webapp/setup/src/components/notifications.vue
+++ b/src/webapp/setup/src/components/notifications.vue
@@ -15,108 +15,108 @@
 </template>
 
 <script>
-    export default {
-        name: 'notificationsAPI',
-        props: {
-            location: {
-                type: String,
-                'default': 'topleft',
-            },
-            size: {
-                type: String,
-                'default': 'default',
-            }
-            // Size options: small, default (default option), big, bigger, huge
+export default {
+    name: 'notificationsAPI',
+    props: {
+        location: {
+            type: String,
+            'default': 'topleft',
         },
-        data () {
-            return {
-                notifications: {},
-                queue: [],
-                message: '',
-                messageType: 'hide',
-                notificationDisplayTime: 0,
-                notificationPriority: 'normal',
-                currentlyDisplayedNotificationID: 0,
-                currentID: { 'critical': 0, 'medium': 1000, 'low': 100000 },
-                displayTimeCurrentNotification: 0,
-                notificationScheduler: null,
-            }
-        },
-        methods: {
-            createNotification( message, showDuration, messageType, priority ) {
-                /* 
+        size: {
+            type: String,
+            'default': 'default',
+        }
+        // Size options: small, default (default option), big, bigger, huge
+    },
+    data () {
+        return {
+            notifications: {},
+            queue: [],
+            message: '',
+            messageType: 'hide',
+            notificationDisplayTime: 0,
+            notificationPriority: 'normal',
+            currentlyDisplayedNotificationID: 0,
+            currentID: { 'critical': 0, 'medium': 1000, 'low': 100000 },
+            displayTimeCurrentNotification: 0,
+            notificationScheduler: null,
+        };
+    },
+    methods: {
+        createNotification( message, showDuration, messageType, priority ) {
+            /* 
                     Takes a notification options array that contains: message, showDuration (in seconds), messageType (ok, error, progress, info) and priority (low, normal, critical).
                     Returns a notification ID which can be used to cancel the notification. The component will throttle notifications and display
                     one at a time and prioritize messages with higher priority. Use vue refs to access these methods.
                 */
-                let id = 0;
+            let id = 0;
 
-                if ( priority === 'critical' ) {
-                    this.currentID[ 'critical' ] += 1;
-                    id = this.currentID[ 'critical' ];
-                } else if ( priority === 'normal' ) {
-                    this.currentID[ 'medium' ] += 1;
-                    id = this.currentID[ 'medium' ];
-                } else if ( priority === 'low' ) {
-                    this.currentID[ 'low' ] += 1;
-                    id = this.currentID[ 'low' ];
-                }
-                this.notifications[ id ] = { 'message': message, 'showDuration': showDuration, 'messageType': messageType, 'priority': priority, 'id': id };
-                this.queue.push( id );
-                console.log( 'scheduled notification: ' + id + ' (' + message + ')' );
-                if ( this.displayTimeCurrentNotification >= this.notificationDisplayTime ) {
-                    this.handleNotifications();
-                }
-                return id;
-            },
-            cancelNotification ( id ) {
-                /* 
+            if ( priority === 'critical' ) {
+                this.currentID[ 'critical' ] += 1;
+                id = this.currentID[ 'critical' ];
+            } else if ( priority === 'normal' ) {
+                this.currentID[ 'medium' ] += 1;
+                id = this.currentID[ 'medium' ];
+            } else if ( priority === 'low' ) {
+                this.currentID[ 'low' ] += 1;
+                id = this.currentID[ 'low' ];
+            }
+            this.notifications[ id ] = { 'message': message, 'showDuration': showDuration, 'messageType': messageType, 'priority': priority, 'id': id };
+            this.queue.push( id );
+            console.log( 'scheduled notification: ' + id + ' (' + message + ')' );
+            if ( this.displayTimeCurrentNotification >= this.notificationDisplayTime ) {
+                this.handleNotifications();
+            }
+            return id;
+        },
+        cancelNotification ( id ) {
+            /* 
                     This method deletes a notification and, in case the notification is being displayed, hides it.
                 */
-                try { 
-                    delete this.notifications[ id ];
-                    delete this.queue[ this.queue.findIndex( id ) ];
-                } catch ( error ) {
-                    console.log( 'notification to be deleted is nonexistent or currently being displayed' );
-                }
-                if ( this.currentlyDisplayedNotificationID == id ) {
-                    this.handleNotifications();
-                }
-            },
-            handleNotifications () {
-                /* 
-                    This methods should NOT be called in any other component than this one!
-                */
-                this.displayTimeCurrentNotification = 0;
-                this.notificationDisplayTime = 0;
-                this.message = '';
-                this.queue.sort();
-                if ( this.queue.length > 0 ) {
-                    this.message = this.notifications[ this.queue[ 0 ] ][ 'message' ];
-                    this.messageType = this.notifications[ this.queue[ 0 ] ][ 'messageType' ];
-                    this.priority = this.notifications[ this.queue[ 0 ] ][ 'priority' ];
-                    this.currentlyDisplayedNotificationID = this.notifications[ this.queue[ 0 ] ][ 'id' ];
-                    this.notificationDisplayTime = this.notifications[ this.queue[ 0 ] ][ 'showDuration' ];
-                    this.queue.reverse();
-                    this.queue.pop();
-                } else {
-                    this.messageType = 'hide';
-                }
+            try { 
+                delete this.notifications[ id ];
+                delete this.queue[ this.queue.findIndex( id ) ];
+            } catch ( error ) {
+                console.log( 'notification to be deleted is nonexistent or currently being displayed' );
+            }
+            if ( this.currentlyDisplayedNotificationID == id ) {
+                this.handleNotifications();
             }
         },
-        created () {
-            this.notificationScheduler = setInterval( () => { 
-                if ( this.displayTimeCurrentNotification >= this.notificationDisplayTime ) {
-                    this.handleNotifications();
-                } else {
-                    this.displayTimeCurrentNotification += 0.5;
-                }
-            }, 500 );
-        },
-        unmounted ( ) {
-            clearInterval( this.notificationScheduler );
+        handleNotifications () {
+            /* 
+                    This methods should NOT be called in any other component than this one!
+                */
+            this.displayTimeCurrentNotification = 0;
+            this.notificationDisplayTime = 0;
+            this.message = '';
+            this.queue.sort();
+            if ( this.queue.length > 0 ) {
+                this.message = this.notifications[ this.queue[ 0 ] ][ 'message' ];
+                this.messageType = this.notifications[ this.queue[ 0 ] ][ 'messageType' ];
+                this.priority = this.notifications[ this.queue[ 0 ] ][ 'priority' ];
+                this.currentlyDisplayedNotificationID = this.notifications[ this.queue[ 0 ] ][ 'id' ];
+                this.notificationDisplayTime = this.notifications[ this.queue[ 0 ] ][ 'showDuration' ];
+                this.queue.reverse();
+                this.queue.pop();
+            } else {
+                this.messageType = 'hide';
+            }
         }
+    },
+    created () {
+        this.notificationScheduler = setInterval( () => { 
+            if ( this.displayTimeCurrentNotification >= this.notificationDisplayTime ) {
+                this.handleNotifications();
+            } else {
+                this.displayTimeCurrentNotification += 0.5;
+            }
+        }, 500 );
+    },
+    unmounted ( ) {
+        clearInterval( this.notificationScheduler );
     }
+};
 </script>
 
 <style scoped>
diff --git a/src/webapp/setup/src/main.js b/src/webapp/setup/src/main.js
index 2b3a72b..219eca5 100644
--- a/src/webapp/setup/src/main.js
+++ b/src/webapp/setup/src/main.js
@@ -9,4 +9,4 @@ const app = createApp( App );
 app.use( createPinia() );
 app.use( router );
 
-app.mount('#app');
+app.mount( '#app' );
diff --git a/src/webapp/setup/src/router/index.js b/src/webapp/setup/src/router/index.js
index 87d4d60..18e712f 100644
--- a/src/webapp/setup/src/router/index.js
+++ b/src/webapp/setup/src/router/index.js
@@ -20,14 +20,14 @@ let routes = [
             title: 'Admin login - Restart required! :: libreevent'
         }
     },
-]
+];
 
 routes.push( setupRoutes );
 
-const router = createRouter({
-    history: createWebHistory(import.meta.env.BASE_URL),
+const router = createRouter( {
+    history: createWebHistory( import.meta.env.BASE_URL ),
     routes: routes
-} )
+} );
 
 router.beforeEach( ( to ) => {
     let backendStore = useBackendStore();
@@ -41,4 +41,4 @@ router.afterEach( ( to ) => {
     document.title = to.meta.title ? to.meta.title : 'libreevent';
 } );
 
-export default router
+export default router;
diff --git a/src/webapp/setup/src/router/setupRoutes.js b/src/webapp/setup/src/router/setupRoutes.js
index 2d32ac6..cabf410 100644
--- a/src/webapp/setup/src/router/setupRoutes.js
+++ b/src/webapp/setup/src/router/setupRoutes.js
@@ -53,4 +53,4 @@ export default {
             }
         },
     ]
-}
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/src/webapp/setup/src/stores/backendStore.js b/src/webapp/setup/src/stores/backendStore.js
index 07b43aa..c5a529c 100644
--- a/src/webapp/setup/src/stores/backendStore.js
+++ b/src/webapp/setup/src/stores/backendStore.js
@@ -7,9 +7,9 @@
 *
 */
 
-import { defineStore } from "pinia";
+import { defineStore } from 'pinia';
 
-export const useBackendStore = defineStore ( 'backend', {
+export const useBackendStore = defineStore( 'backend', {
     state: () => ( { 'visitedSetupPages': {} } ),
     getters: {
         getVisitedSetupPages: ( state ) => state.visitedSetupPages,
diff --git a/src/webapp/setup/src/views/BasicSetupView.vue b/src/webapp/setup/src/views/BasicSetupView.vue
index e42a262..13aee63 100644
--- a/src/webapp/setup/src/views/BasicSetupView.vue
+++ b/src/webapp/setup/src/views/BasicSetupView.vue
@@ -81,77 +81,77 @@
 </style>
 
 <script>
-    import { useBackendStore } from '@/stores/backendStore.js';
-    import { mapStores } from 'pinia';
-    import notifications from '../components/notifications.vue';
+import { useBackendStore } from '@/stores/backendStore.js';
+import { mapStores } from 'pinia';
+import notifications from '../components/notifications.vue';
 
-    export default {
-        components: {
-            notifications,
-        },
-        data () {
-            return {
-                formData: {
-                    'dbType': 'mysql',
-                    'db': {
-                        'port': 3306,
-                    },
-                    'email': {
-                        'port': 587
-                    },
-                    'websiteName': 'libreevent',
+export default {
+    components: {
+        notifications,
+    },
+    data () {
+        return {
+            formData: {
+                'dbType': 'mysql',
+                'db': {
+                    'port': 3306,
                 },
-            }
-        },
-        computed: {
-            ...mapStores( useBackendStore )
-        },
-        methods: {
-            submit() {
-                this.collectUrl();
-                if ( this.formData.dbType === 'mysql' ) {
-                    if ( !this.formData.db.port || !this.formData.db.host || !this.formData.db.database || !this.formData.db.user || !this.formData.db.password ) {
-                        this.$refs.notification.createNotification( 'Database settings are not complete!', 5, 'error', 'normal' );
-                        return;
-                    }
-                }
-                if( this.formData.email.port && this.formData.email.host && this.formData.email.user && this.formData.email.pass
-                && this.formData.dpEmail && this.formData.display && this.formData.websiteName ) {
-                    this.formData.mailDisplay = this.formData.display + ' <' + this.formData.dpEmail + '>';
-                    const options = {
-                        method: 'post',
-                        body: JSON.stringify( this.formData ),
-                        headers: {
-                            'Content-Type': 'application/json',
-                            'charset': 'utf-8'
-                        }
-                    };
-                    fetch( '/setup/saveBasicSettings', options ).then( res => {
-                        if ( res.status === 200 ) {
-                            this.continue();
-                        } else {
-                            this.$refs.notification.createNotification( 'Setup key incorrect!', 5, 'error', 'normal' );
-                        }
-                    } );
-                } else {
-                    this.$refs.notification.createNotification( 'Missing entries', 5, 'error', 'normal' );
+                'email': {
+                    'port': 587
+                },
+                'websiteName': 'libreevent',
+            },
+        };
+    },
+    computed: {
+        ...mapStores( useBackendStore )
+    },
+    methods: {
+        submit() {
+            this.collectUrl();
+            if ( this.formData.dbType === 'mysql' ) {
+                if ( !this.formData.db.port || !this.formData.db.host || !this.formData.db.database || !this.formData.db.user || !this.formData.db.password ) {
+                    this.$refs.notification.createNotification( 'Database settings are not complete!', 5, 'error', 'normal' );
                     return;
                 }
-            },
-            continue () {
-                sessionStorage.setItem( 'basics', JSON.stringify( this.formData ) );
-                this.backendStore.addVisitedSetupPages( 'root', true );
-                this.$router.push( '/setup/root' );
-            },
-            collectUrl() {
-                this.formData.yourDomain = location.protocol + '//' + location.host;
-                this.formData.db.host = location.hostname;
+            }
+            if ( this.formData.email.port && this.formData.email.host && this.formData.email.user && this.formData.email.pass
+                && this.formData.dpEmail && this.formData.display && this.formData.websiteName ) {
+                this.formData.mailDisplay = this.formData.display + ' <' + this.formData.dpEmail + '>';
+                const options = {
+                    method: 'post',
+                    body: JSON.stringify( this.formData ),
+                    headers: {
+                        'Content-Type': 'application/json',
+                        'charset': 'utf-8'
+                    }
+                };
+                fetch( '/setup/saveBasicSettings', options ).then( res => {
+                    if ( res.status === 200 ) {
+                        this.continue();
+                    } else {
+                        this.$refs.notification.createNotification( 'Setup key incorrect!', 5, 'error', 'normal' );
+                    }
+                } );
+            } else {
+                this.$refs.notification.createNotification( 'Missing entries', 5, 'error', 'normal' );
+                return;
             }
         },
-        created () {
-            if ( sessionStorage.getItem( 'basics' ) ) {
-                this.formData = JSON.parse( sessionStorage.getItem( 'basics' ) );
-            }
+        continue () {
+            sessionStorage.setItem( 'basics', JSON.stringify( this.formData ) );
+            this.backendStore.addVisitedSetupPages( 'root', true );
+            this.$router.push( '/setup/root' );
+        },
+        collectUrl() {
+            this.formData.yourDomain = location.protocol + '//' + location.host;
+            this.formData.db.host = location.hostname;
         }
-    };
+    },
+    created () {
+        if ( sessionStorage.getItem( 'basics' ) ) {
+            this.formData = JSON.parse( sessionStorage.getItem( 'basics' ) );
+        }
+    }
+};
 </script>
diff --git a/src/webapp/setup/src/views/HomeView.vue b/src/webapp/setup/src/views/HomeView.vue
index 1e83ae2..6fc9c91 100644
--- a/src/webapp/setup/src/views/HomeView.vue
+++ b/src/webapp/setup/src/views/HomeView.vue
@@ -22,48 +22,48 @@
 </template>
 
 <script>
-    import notifications from '../components/notifications.vue';
+import notifications from '../components/notifications.vue';
 
-    export default {
-        data() {
-            return {
-                formData: {},
-            }
-        },
-        components: {
-            notifications,
-        },
-        methods: {
-            setup () {
-                const options = {
-                    method: 'post',
-                    body: JSON.stringify( this.formData ),
-                    headers: {
-                        'Content-Type': 'application/json',
-                        'charset': 'utf-8'
-                    }
-                };
-                fetch( '/setup/start', options ).then( res => {
-                    if ( res.status === 200 ) {
-                        this.$router.push( '/setup' );
-                    } else {
-                        this.$refs.notification.createNotification( 'Setup key incorrect!', 5, 'error', 'normal' );
-                    }
-                } );
-            }
-        },
-        created() {
-            fetch( '/setup/getKeyStatus' ).then( res => {
+export default {
+    data() {
+        return {
+            formData: {},
+        };
+    },
+    components: {
+        notifications,
+    },
+    methods: {
+        setup () {
+            const options = {
+                method: 'post',
+                body: JSON.stringify( this.formData ),
+                headers: {
+                    'Content-Type': 'application/json',
+                    'charset': 'utf-8'
+                }
+            };
+            fetch( '/setup/start', options ).then( res => {
                 if ( res.status === 200 ) {
-                    res.text().then( text => {
-                        if ( text === 'ok' ) {
-                            this.$router.push( '/setup' );
-                        }
-                    } );
+                    this.$router.push( '/setup' );
+                } else {
+                    this.$refs.notification.createNotification( 'Setup key incorrect!', 5, 'error', 'normal' );
                 }
             } );
         }
+    },
+    created() {
+        fetch( '/setup/getKeyStatus' ).then( res => {
+            if ( res.status === 200 ) {
+                res.text().then( text => {
+                    if ( text === 'ok' ) {
+                        this.$router.push( '/setup' );
+                    }
+                } );
+            }
+        } );
     }
+};
 </script>
 
 <style scoped>
diff --git a/src/webapp/setup/src/views/SetupRootView.vue b/src/webapp/setup/src/views/SetupRootView.vue
index 474e9b8..536bf97 100644
--- a/src/webapp/setup/src/views/SetupRootView.vue
+++ b/src/webapp/setup/src/views/SetupRootView.vue
@@ -45,156 +45,156 @@
 </template>
 
 <script>
-    import { useBackendStore } from '@/stores/backendStore.js';
-    import { mapStores } from 'pinia';
-    import notifications from '../components/notifications.vue';
+import { useBackendStore } from '@/stores/backendStore.js';
+import { mapStores } from 'pinia';
+import notifications from '../components/notifications.vue';
 
-    const lookup = [ '@', '!', '.', ',', '?', '%', '&', '-', '_', ':', ';', '*', '§', '<', '>', '{', '}', '[', ']', '(', ')', '/', '#' ];
-    export default {
-        data () {
-            return {
-                formData: {},
-                passwordCheck: true,
-                emailStatus: '',
-            }
+const lookup = [ '@', '!', '.', ',', '?', '%', '&', '-', '_', ':', ';', '*', '§', '<', '>', '{', '}', '[', ']', '(', ')', '/', '#' ];
+export default {
+    data () {
+        return {
+            formData: {},
+            passwordCheck: true,
+            emailStatus: '',
+        };
+    },
+    components: {
+        notifications,
+    },
+    computed: {
+        ...mapStores( useBackendStore )
+    },
+    methods: {
+        emailLiveChecker () {
+            setTimeout( () => {
+                if ( this.checkEmail() ) {
+                    this.emailStatus = '';
+                } else {
+                    this.emailStatus = 'Invalid email address';
+                }
+            }, 100 );
         },
-        components: {
-            notifications,
-        },
-        computed: {
-            ...mapStores( useBackendStore )
-        },
-        methods: {
-            emailLiveChecker () {
-                setTimeout( () => {
-                    if ( this.checkEmail() ) {
-                        this.emailStatus = '';
-                    } else {
-                        this.emailStatus = 'Invalid email address';
-                    }
-                }, 100 );
-            },
-            checkEmail () {
-                const mail = this.formData.mail ?? '';
-                let stat = { 'atPos': 0, 'topLevelPos': 0 };
-                for ( let l in mail ) {
-                    if ( stat[ 'atPos' ] > 0 ) {
-                        if ( mail[ l ] === '@' ) {
-                            return false;
-                        } else if ( mail[ l ] === '.' ) {
-                            if ( stat[ 'topLevelPos' ] > 0 ) {
-                                if ( l > stat[ 'topLevelPos' ] + 2 ) {
-                                    stat[ 'topLevelPos' ] = parseInt( l );
-                                } else { 
-                                    return false;
-                                }
-                            } else {
-                                if ( l > stat[ 'atPos' ] + 2 ) {
-                                    stat[ 'topLevelPos' ] = parseInt( l );
-                                } else {
-                                    return false;
-                                }
+        checkEmail () {
+            const mail = this.formData.mail ?? '';
+            let stat = { 'atPos': 0, 'topLevelPos': 0 };
+            for ( let l in mail ) {
+                if ( stat[ 'atPos' ] > 0 ) {
+                    if ( mail[ l ] === '@' ) {
+                        return false;
+                    } else if ( mail[ l ] === '.' ) {
+                        if ( stat[ 'topLevelPos' ] > 0 ) {
+                            if ( l > stat[ 'topLevelPos' ] + 2 ) {
+                                stat[ 'topLevelPos' ] = parseInt( l );
+                            } else { 
+                                return false;
                             }
-                        } else if ( !( /[a-z]/.test( mail[ l ] ) || /[A-Z]/.test( mail[ l ] ) || /[1-9]/.test( mail[ l ] ) || mail[ l ] === '-' || mail[ l ] === '_' ) ) { 
-                            return false 
-                        }
-                    } else {
-                        if ( mail[ l ] === '@' ) {
-                            if ( l > 2 ) {
-                                stat[ 'atPos' ] = parseInt( l );
+                        } else {
+                            if ( l > stat[ 'atPos' ] + 2 ) {
+                                stat[ 'topLevelPos' ] = parseInt( l );
                             } else {
                                 return false;
                             }
-                        } else if ( !( /[a-z]/.test( mail[ l ] ) || /[A-Z]/.test( mail[ l ] ) || /[1-9]/.test( mail[ l ] ) || mail[ l ] === '.' || mail[ l ] === '-' || mail[ l ] == '_' ) ) {
+                        }
+                    } else if ( !( /[a-z]/.test( mail[ l ] ) || /[A-Z]/.test( mail[ l ] ) || /[1-9]/.test( mail[ l ] ) || mail[ l ] === '-' || mail[ l ] === '_' ) ) { 
+                        return false; 
+                    }
+                } else {
+                    if ( mail[ l ] === '@' ) {
+                        if ( l > 2 ) {
+                            stat[ 'atPos' ] = parseInt( l );
+                        } else {
                             return false;
                         }
+                    } else if ( !( /[a-z]/.test( mail[ l ] ) || /[A-Z]/.test( mail[ l ] ) || /[1-9]/.test( mail[ l ] ) || mail[ l ] === '.' || mail[ l ] === '-' || mail[ l ] == '_' ) ) {
+                        return false;
                     }
                 }
-                if ( mail.length > stat[ 'topLevelPos' ] + 2 && stat[ 'topLevelPos' ] > 0 && stat[ 'atPos' ] > 0 ) {
-                    return true;
-                } else {
-                    return false;
-                }
-            },
-            submit () {
-                if ( this.formData.mail && this.formData.password && this.formData.password2 ) {
-                    if ( this.checkEmail() ) {
-                        if ( this.formData.password == this.formData.password2 ) {
-                            if ( this.passwordCheck ) {
-                                let requirementsCount = { 'special': 0, 'numbers': 0, 'lower': 0, 'upper': 0, 'incorrect': '' };
-                                const pw = this.formData.password;
-                                for ( let l in pw ) {
-                                    console.log( pw[ l ] );
-                                    if ( /[a-z]/.test( pw[ l ] ) ) {
-                                        requirementsCount[ 'lower' ] += 1;
-                                    } else if ( /[A-Z]/.test( pw[ l ] ) ) {
-                                        requirementsCount[ 'upper' ] += 1;
-                                    } else if ( lookup.includes( pw[ l ] ) ) {
-                                        requirementsCount[ 'special' ] += 1;
-                                    } else if ( !isNaN( pw[ l ] * 1 ) ) {
-                                        requirementsCount[ 'number' ] += 1;
-                                    } else {
-                                        console.log( 'incorrect letter' );
-                                        requirementsCount[ 'incorrect' ] = pw[ l ];
-                                        break;
-                                    }
-                                }
-                                if ( requirementsCount[ 'incorrect' ] ) {
-                                    this.$refs.notification.createNotification( `Character "${ requirementsCount[ 'incorrect' ] }" cannot be used for passwords`, 5, 'error', 'normal' );
+            }
+            if ( mail.length > stat[ 'topLevelPos' ] + 2 && stat[ 'topLevelPos' ] > 0 && stat[ 'atPos' ] > 0 ) {
+                return true;
+            } else {
+                return false;
+            }
+        },
+        submit () {
+            if ( this.formData.mail && this.formData.password && this.formData.password2 ) {
+                if ( this.checkEmail() ) {
+                    if ( this.formData.password == this.formData.password2 ) {
+                        if ( this.passwordCheck ) {
+                            let requirementsCount = { 'special': 0, 'numbers': 0, 'lower': 0, 'upper': 0, 'incorrect': '' };
+                            const pw = this.formData.password;
+                            for ( let l in pw ) {
+                                console.log( pw[ l ] );
+                                if ( /[a-z]/.test( pw[ l ] ) ) {
+                                    requirementsCount[ 'lower' ] += 1;
+                                } else if ( /[A-Z]/.test( pw[ l ] ) ) {
+                                    requirementsCount[ 'upper' ] += 1;
+                                } else if ( lookup.includes( pw[ l ] ) ) {
+                                    requirementsCount[ 'special' ] += 1;
+                                } else if ( !isNaN( pw[ l ] * 1 ) ) {
+                                    requirementsCount[ 'number' ] += 1;
                                 } else {
-                                    if ( pw.length > 14 ) {
-                                        if ( requirementsCount[ 'lower' ] > 1 && requirementsCount[ 'upper' ] > 1 && requirementsCount[ 'special' ] > 1 && requirementsCount[ 'numbers' ] > 1 ) {
-                                            this.proceed();
-                                        } else {
-                                            this.$refs.notification.createNotification( 'Your password does not fulfill the requirements', 5, 'error', 'normal' );
-                                        }
-                                    } else {
-                                        this.$refs.notification.createNotification( 'Your password is not long enough', 5, 'error', 'normal' );
-                                    }
+                                    console.log( 'incorrect letter' );
+                                    requirementsCount[ 'incorrect' ] = pw[ l ];
+                                    break;
                                 }
+                            }
+                            if ( requirementsCount[ 'incorrect' ] ) {
+                                this.$refs.notification.createNotification( `Character "${ requirementsCount[ 'incorrect' ] }" cannot be used for passwords`, 5, 'error', 'normal' );
                             } else {
-                                if ( confirm( 'Do you really want to proceed without having your password checked? This is strongly discouraged as it essentially removes the first factor (the password) of the authentication making it much less secure.' ) ) {
-                                    if ( confirm( 'Are you really sure?' ) ) {
+                                if ( pw.length > 14 ) {
+                                    if ( requirementsCount[ 'lower' ] > 1 && requirementsCount[ 'upper' ] > 1 && requirementsCount[ 'special' ] > 1 && requirementsCount[ 'numbers' ] > 1 ) {
                                         this.proceed();
+                                    } else {
+                                        this.$refs.notification.createNotification( 'Your password does not fulfill the requirements', 5, 'error', 'normal' );
                                     }
+                                } else {
+                                    this.$refs.notification.createNotification( 'Your password is not long enough', 5, 'error', 'normal' );
                                 }
                             }
                         } else {
-                            this.$refs.notification.createNotification( 'Passwords do not match', 10, 'error', 'normal' );
+                            if ( confirm( 'Do you really want to proceed without having your password checked? This is strongly discouraged as it essentially removes the first factor (the password) of the authentication making it much less secure.' ) ) {
+                                if ( confirm( 'Are you really sure?' ) ) {
+                                    this.proceed();
+                                }
+                            }
                         }
                     } else {
-                        this.$refs.notification.createNotification( 'The email address you entered is not an email address', 10, 'error', 'normal' );
+                        this.$refs.notification.createNotification( 'Passwords do not match', 10, 'error', 'normal' );
                     }
                 } else {
-                    this.$refs.notification.createNotification( 'One or more fields missing!', 10, 'error', 'normal' );
+                    this.$refs.notification.createNotification( 'The email address you entered is not an email address', 10, 'error', 'normal' );
                 }
-            },
-            proceed () {
-                const options = {
-                    method: 'post',
-                    body: JSON.stringify( this.formData ),
-                    headers: {
-                        'Content-Type': 'application/json',
-                        'charset': 'utf-8'
-                    }
-                };
-                fetch( '/setup/saveRootAccount', options ).then( res => {
-                    if ( res.status === 200 ) {
-                        sessionStorage.setItem( 'basics', JSON.stringify( this.formData ) );
-                        this.backendStore.addVisitedSetupPages( 'complete', true );
-                        this.$router.push( 'complete' );
-                    } else {
-                        this.$refs.notification.createNotification( 'Setup key incorrect!', 5, 'error', 'normal' );
-                    }
-                } );
-            },
-        },
-        created () {
-            if ( sessionStorage.getItem( 'root' ) ) {
-                this.formData = JSON.parse( sessionStorage.getItem( 'root' ) );
+            } else {
+                this.$refs.notification.createNotification( 'One or more fields missing!', 10, 'error', 'normal' );
             }
+        },
+        proceed () {
+            const options = {
+                method: 'post',
+                body: JSON.stringify( this.formData ),
+                headers: {
+                    'Content-Type': 'application/json',
+                    'charset': 'utf-8'
+                }
+            };
+            fetch( '/setup/saveRootAccount', options ).then( res => {
+                if ( res.status === 200 ) {
+                    sessionStorage.setItem( 'basics', JSON.stringify( this.formData ) );
+                    this.backendStore.addVisitedSetupPages( 'complete', true );
+                    this.$router.push( 'complete' );
+                } else {
+                    this.$refs.notification.createNotification( 'Setup key incorrect!', 5, 'error', 'normal' );
+                }
+            } );
+        },
+    },
+    created () {
+        if ( sessionStorage.getItem( 'root' ) ) {
+            this.formData = JSON.parse( sessionStorage.getItem( 'root' ) );
         }
-    };
+    }
+};
 </script>
 
 
diff --git a/src/webapp/setup/src/views/SetupStartView.vue b/src/webapp/setup/src/views/SetupStartView.vue
index 876fa83..3d1ae68 100644
--- a/src/webapp/setup/src/views/SetupStartView.vue
+++ b/src/webapp/setup/src/views/SetupStartView.vue
@@ -21,23 +21,23 @@
 </template>
 
 <script>
-    import { useBackendStore } from '@/stores/backendStore.js';
-    import { mapStores } from 'pinia';
+import { useBackendStore } from '@/stores/backendStore.js';
+import { mapStores } from 'pinia';
 
-    export default {
-        data () {
-            return {
-                formData: {}
-            }
-        },
-        computed: {
-            ...mapStores( useBackendStore )
-        },
-        methods: {
-            setup () {
-                this.backendStore.addVisitedSetupPages( 'basics', true );
-                this.$router.push( '/setup/basics' );
-            }
-        },
-    };
+export default {
+    data () {
+        return {
+            formData: {}
+        };
+    },
+    computed: {
+        ...mapStores( useBackendStore )
+    },
+    methods: {
+        setup () {
+            this.backendStore.addVisitedSetupPages( 'basics', true );
+            this.$router.push( '/setup/basics' );
+        }
+    },
+};
 </script>
diff --git a/src/webapp/setup/src/views/SetupView.vue b/src/webapp/setup/src/views/SetupView.vue
index 9c05ed5..034c5c3 100644
--- a/src/webapp/setup/src/views/SetupView.vue
+++ b/src/webapp/setup/src/views/SetupView.vue
@@ -29,33 +29,33 @@
 </template>
 
 <script>
-    import { useBackendStore } from '@/stores/backendStore.js';
-    import { mapStores } from 'pinia';
+import { useBackendStore } from '@/stores/backendStore.js';
+import { mapStores } from 'pinia';
 
-    export default {
-        data () {
-            return {
-                formData: {}
+export default {
+    data () {
+        return {
+            formData: {}
+        };
+    },
+    computed: {
+        ...mapStores( useBackendStore )
+    },
+    created () {
+        this.backendStore.loadVisitedSetupPages();
+        fetch( '/setup/getKeyStatus' ).then( res => {
+            if ( res.status === 200 ) {
+                res.text().then( text => {
+                    if ( text != 'ok' ) {
+                        this.$router.push( '/' );
+                    }
+                } );
+            } else {
+                this.$router.push( '/' );
             }
-        },
-        computed: {
-            ...mapStores( useBackendStore )
-        },
-        created () {
-            this.backendStore.loadVisitedSetupPages();
-            fetch( '/setup/getKeyStatus' ).then( res => {
-                if ( res.status === 200 ) {
-                    res.text().then( text => {
-                        if ( text != 'ok' ) {
-                            this.$router.push( '/' );
-                        }
-                    } );
-                } else {
-                    this.$router.push( '/' );
-                }
-            } );
-        },
-    };
+        } );
+    },
+};
 </script>
 
 
diff --git a/src/webapp/setup/vite.config.js b/src/webapp/setup/vite.config.js
index 5541e55..9290395 100644
--- a/src/webapp/setup/vite.config.js
+++ b/src/webapp/setup/vite.config.js
@@ -1,7 +1,7 @@
-import { fileURLToPath, URL } from 'node:url'
+import { fileURLToPath, URL } from 'node:url';
 
-import { defineConfig } from 'vite'
-import vue from '@vitejs/plugin-vue'
+import { defineConfig } from 'vite';
+import vue from '@vitejs/plugin-vue';
 
 // https://vitejs.dev/config/
 export default defineConfig( {
@@ -16,4 +16,4 @@ export default defineConfig( {
     server: {
         'port': 8081
     }
-})
+} );