From 9827bb2c69bc86fc7308d04597497226ce82e2d7 Mon Sep 17 00:00:00 2001
From: Janis Hutz <development@janishutz.com>
Date: Mon, 31 Jul 2023 15:47:10 +0200
Subject: [PATCH] clean up some todos

---
 src/server/app.js                             | 10 +++----
 src/server/backend/db/data/tickets.json       |  0
 src/server/backend/tickets/ticketGenerator.js | 14 ++++++++--
 .../src/components/seatplan/editor/window.vue | 11 ++++++--
 src/webapp/main/src/views/user/TwoFA.vue      | 28 +++++++++++++++++--
 website/dist/templates/default/index.html     |  0
 website/dist/templates/rounded/index.html     |  0
 website/dist/templates/simple/index.html      |  0
 8 files changed, 50 insertions(+), 13 deletions(-)
 create mode 100644 src/server/backend/db/data/tickets.json
 create mode 100644 website/dist/templates/default/index.html
 create mode 100644 website/dist/templates/rounded/index.html
 create mode 100644 website/dist/templates/simple/index.html

diff --git a/src/server/app.js b/src/server/app.js
index 1b808c4..620f562 100644
--- a/src/server/app.js
+++ b/src/server/app.js
@@ -15,8 +15,9 @@ const bodyParser = require( 'body-parser' );
 const cookieParser = require( 'cookie-parser' );
 const http = require( 'http' );
 const fs = require( 'fs' );
-const pm = require( './backend/plugins/manager.js' );
-const pluginManager = new pm();
+const token = require( './backend/token.js' );
+// const pm = require( './backend/plugins/manager.js' );
+// const pluginManager = new pm();
 
 
 console.log( `
@@ -59,11 +60,10 @@ if ( settings.init ) {
     app.use( express.static( '../webapp/setup/dist' ) );
 }
 
-console.log( '[ Server ] loading and initializing middlewares' );
 // initialise express with middlewares
-// TODO: Generate random secret
+console.log( '[ Server ] loading and initializing middlewares' );
 app.use( expressSession( {
-    secret: 'gaoevgoawefgo083tq2rfvöfaf0p8',
+    secret: token.generateToken( 60 ),
     resave: false,
     saveUninitialized: true,
     cookie: {
diff --git a/src/server/backend/db/data/tickets.json b/src/server/backend/db/data/tickets.json
new file mode 100644
index 0000000..e69de29
diff --git a/src/server/backend/tickets/ticketGenerator.js b/src/server/backend/tickets/ticketGenerator.js
index 3c1c788..f35363e 100644
--- a/src/server/backend/tickets/ticketGenerator.js
+++ b/src/server/backend/tickets/ticketGenerator.js
@@ -9,19 +9,27 @@
 
 
 const pdfme = require( '@pdfme/generator' );
+const db = require( '../db/db.js' );
 
 class TicketGenerator {
     constructor () {
         this.ticketQueue = {};
     }
 
-    generateTicket (  ) {
+    generateTicket ( data ) {
 
     }
 
-    ticketGenerator () {
+    ticketGenerator ( event, data ) {
         return new Promise( ( resolve, reject ) => {
-            
+            db.getJSONDataSimple( event ).then( template => {
+                pdfme.generate( { template, data } ).then( pdf => {
+                    resolve( pdf );
+                    // TODO: Maybe write to disk
+                } ).catch( error => {
+                    reject( error );
+                } );
+            } );
         } );
     }
 }
diff --git a/src/webapp/main/src/components/seatplan/editor/window.vue b/src/webapp/main/src/components/seatplan/editor/window.vue
index 8393f2e..1664d6e 100644
--- a/src/webapp/main/src/components/seatplan/editor/window.vue
+++ b/src/webapp/main/src/components/seatplan/editor/window.vue
@@ -9,7 +9,6 @@
 
 <template>
     <div id="window">
-        <!-- TODO: Add additional div with v-if to check if a location has been selected and warn if not so. -->
         <properties class="properties" v-model:draggables="draggables" @updated="handleUpdate" :scale-factor="scaleFactor" :active="active" :history-pos="historyPos" :zoom-factor="zoomFactor" v-model:general-settings="generalSettings"></properties>
         <div class="parent" id="parent">
             <div class="content-parent">
@@ -80,6 +79,7 @@
                 historyPos: 0,
                 generalSettings: { 'namingScheme': 'numeric' },
                 seatCountInfo: { 'data': {}, 'count': 0 },
+                autoSave: null,
             }
         },
         methods: {
@@ -93,6 +93,9 @@
                 reliably according to testing done.
             */
             runHook () {
+                if ( !sessionStorage.getItem( 'locationID' ) ) {
+                    this.$router.push( '/admin/events' );
+                }
                 let self = this;
                 this.zoomFactor = sessionStorage.getItem( 'zoom' ) ? parseFloat( sessionStorage.getItem( 'zoom' ) ) : 1;
 
@@ -128,7 +131,8 @@
                     }
                 };
 
-                // TODO: Create 1min interval saving
+                // Auto save every 60s (60K ms)
+                this.autoSave = setInterval( this.saveDraft(), 60000 );
                 
                 /* 
                 Calculate scale factor (this adds support for differently sized screens)
@@ -165,7 +169,7 @@
                 } );
 
                 if ( !sessionStorage.getItem( 'seatplan-history' ) ) {
-                    sessionStorage.setItem( 'seatplan-history', JSON.stringify( { '1': this.scaleDown( this.draggables ) } ) );
+                    sessionStorage.setItem( 'seatplaTODO:n-history', JSON.stringify( { '1': this.scaleDown( this.draggables ) } ) );
                 }
 
                 let history = sessionStorage.getItem( 'seatplan-history' ) ? JSON.parse( sessionStorage.getItem( 'seatplan-history' ) ) : {};
@@ -407,6 +411,7 @@
         },
         unmounted() {
             clearInterval( this.sizePoll );
+            clearInterval( this.autoSave );
         },
     }
 </script>
diff --git a/src/webapp/main/src/views/user/TwoFA.vue b/src/webapp/main/src/views/user/TwoFA.vue
index 365c3bd..6ab81b8 100644
--- a/src/webapp/main/src/views/user/TwoFA.vue
+++ b/src/webapp/main/src/views/user/TwoFA.vue
@@ -25,7 +25,8 @@
         },
         data () { 
             return {
-                code: { '1': '', '2': '' }
+                code: { '1': '', '2': '' },
+                serverPing: null,
             }
         },
         computed: {
@@ -61,14 +62,37 @@
                     }, false)
                 }, 300 );
             } else {
-                // TODO: Add ping method (pings every 5 sec)
                 setTimeout( () => {
                     this.$refs.notification.createNotification( 'Unsupported browser detected. Redirection might take longer to occur!', 20, 'warning', 'normal' );
                 }, 300 );
+                // ping server every 5s to check if logged in
+                this.serverPing = setInterval( () => {
+                    fetch( '/user/2fa/ping' ).then( res => {
+                        if ( res.status === 200 ) {
+                            res.json().then( data => {
+                                if ( data ) {
+                                    if ( data.status === 'ok' ) {
+                                        this.userStore.setUserAuth( true );
+                                        this.$router.push( sessionStorage.getItem( 'redirect' ) ?? '/account' );
+                                    }
+                                }
+                            } );
+                        } else {
+                            console.error( 'Request failed' );
+                            this.$refs.notification.createNotification( 'We are sorry, but an error occurred. You will not be redirected automatically', 300, 'error', 'normal' );
+                        }
+                    } ).catch( error => {
+                        console.error( error );
+                        this.$refs.notification.createNotification( 'We are sorry, but an error occurred. You will not be redirected automatically', 300, 'error', 'normal' );
+                    } );
+                }, 5000 );
             }
             let code = sessionStorage.getItem( '2faCode' ) ? sessionStorage.getItem( '2faCode' ) : '';
             this.code = { '1': code.slice( 0, 3 ), '2': code.substring( 3 ) };
         },
+        unmounted() {
+            clearInterval( this.serverPing );
+        }
     }
 </script>
 
diff --git a/website/dist/templates/default/index.html b/website/dist/templates/default/index.html
new file mode 100644
index 0000000..e69de29
diff --git a/website/dist/templates/rounded/index.html b/website/dist/templates/rounded/index.html
new file mode 100644
index 0000000..e69de29
diff --git a/website/dist/templates/simple/index.html b/website/dist/templates/simple/index.html
new file mode 100644
index 0000000..e69de29