diff --git a/src/server/admin/adminAPIRoutes.js b/src/server/admin/adminAPIRoutes.js index 892f915..dee3d89 100644 --- a/src/server/admin/adminAPIRoutes.js +++ b/src/server/admin/adminAPIRoutes.js @@ -28,7 +28,7 @@ module.exports = ( app ) => { getHandler.handleCall( req.params.call, req.query ).then( data => { res.send( data ); } ).catch( error => { - res.status( error.code ).send( error.error ); + res.status( error.code ?? 500 ).send( error.error ); } ); } else { res.status( 403 ).sendFile( path.join( __dirname + '/../ui/' + ( req.query.lang ?? 'en' ) + '/errors/403.html' ) ); @@ -41,7 +41,7 @@ module.exports = ( app ) => { res.send( data ); } ).catch( error => { console.error( error ); - res.status( error.code ).send( error.error ); + res.status( error.code ?? 500 ).send( error.error ); } ); } else { res.status( 403 ).sendFile( path.join( __dirname + '/../ui/' + ( req.query.lang ?? 'en' ) + '/errors/403.html' ) ); diff --git a/src/server/admin/startPageManager.js b/src/server/admin/startPageManager.js index 4608198..a5ed678 100644 --- a/src/server/admin/startPageManager.js +++ b/src/server/admin/startPageManager.js @@ -22,7 +22,14 @@ class StartPageManager { } loadStartPagePreferences( startPageName ) { - return JSON.parse( fs.readFileSync( path.join( __dirname + '/../ui/home/templates/' + startPageName + '/startPage.config.html' ) ) ); + let conf, options; + try { + conf = JSON.parse( fs.readFileSync( path.join( __dirname + '/../ui/home/templates/' + startPageName + '/startPage.json' ) ) ); + options = JSON.parse( fs.readFileSync( path.join( __dirname + '/../ui/home/templates/' + startPageName + '/startPage.config.json' ) ) ); + return { 'conf': conf, 'options': options }; + } catch ( err ) { + return {}; + } } findAllStartPageTemplates() { diff --git a/src/server/backend/userAPIRoutes.js b/src/server/backend/userAPIRoutes.js index e8b2903..0bf9384 100644 --- a/src/server/backend/userAPIRoutes.js +++ b/src/server/backend/userAPIRoutes.js @@ -26,7 +26,7 @@ module.exports = ( app, settings ) => { res.send( data ); } } ).catch( error => { - res.status( error.code ).send( error.message ); + res.status( error.code ?? 500 ).send( error.message ); } ); } ); @@ -35,7 +35,7 @@ module.exports = ( app, settings ) => { postHandler.handleCall( req.params.call, req.body, req.session ).then( data => { res.send( data ); } ).catch( error => { - res.status( error.code ).send( error.message ); + res.status( error.code ?? 500 ).send( error.message ); } ); } ); }; \ No newline at end of file diff --git a/src/webapp/main/src/views/admin/PagesView.vue b/src/webapp/main/src/views/admin/PagesView.vue index c86d4f9..cce3221 100644 --- a/src/webapp/main/src/views/admin/PagesView.vue +++ b/src/webapp/main/src/views/admin/PagesView.vue @@ -11,9 +11,13 @@

Pages

Here you can modify your landing page (the start page of libreǝvent)

- + +
+ +
@@ -32,6 +36,7 @@ if ( res.status === 200 ) { res.json().then( json => { this.startPageSettings = json; + console.log( json ); } ); } } ); @@ -54,8 +59,7 @@ fetch( '/admin/getAPI/getSettings' ).then( res => { if ( res.status === 200 ) { res.json().then( json => { - console.log( json[ 'startPage' ] ); - this.selectedTemplate = json[ 'startPage' ]; + this.selectedTemplate = String( json[ 'startPage' ] ); } ); } } );