janishutz/libreevent
1
0
Fork 0
mirror of https://github.com/janishutz/libreevent.git synced 2025-11-25 05:14:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix bug in start page settings + a bit of progress

Browse Source
This commit is contained in:
janis
2023-09-05 10:33:55 +02:00
parent a52ec14845
commit 1ad22482a4
4 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/server/admin/adminAPIRoutes.js
View File

@@ -28,7 +28,7 @@ module.exports = ( app ) => {
getHandler.handleCall( req.params.call, req.query ).then( data => { getHandler.handleCall( req.params.call, req.query ).then( data => {
res.send( data ); res.send( data );
} ).catch( error => { } ).catch( error => {
res.status( error.code ).send( error.error ); res.status( error.code ?? 500 ).send( error.error );
} ); } );
} else { } else {
res.status( 403 ).sendFile( path.join( __dirname + '/../ui/' + ( req.query.lang ?? 'en' ) + '/errors/403.html' ) ); 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 ); res.send( data );
} ).catch( error => { } ).catch( error => {
console.error( error ); console.error( error );
res.status( error.code ).send( error.error ); res.status( error.code ?? 500 ).send( error.error );
} ); } );
} else { } else {
res.status( 403 ).sendFile( path.join( __dirname + '/../ui/' + ( req.query.lang ?? 'en' ) + '/errors/403.html' ) ); res.status( 403 ).sendFile( path.join( __dirname + '/../ui/' + ( req.query.lang ?? 'en' ) + '/errors/403.html' ) );

9
src/server/admin/startPageManager.js
View File

@@ -22,7 +22,14 @@ class StartPageManager {
} }
loadStartPagePreferences( startPageName ) { 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() { findAllStartPageTemplates() {

4
src/server/backend/userAPIRoutes.js
View File

@@ -26,7 +26,7 @@ module.exports = ( app, settings ) => {
res.send( data ); res.send( data );
} }
} ).catch( error => { } ).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 => { postHandler.handleCall( req.params.call, req.body, req.session ).then( data => {
res.send( data ); res.send( data );
} ).catch( error => { } ).catch( error => {
res.status( error.code ).send( error.message ); res.status( error.code ?? 500 ).send( error.message );
} ); } );
} ); } );
}; };

10
src/webapp/main/src/views/admin/PagesView.vue
View File

@@ -11,9 +11,13 @@
<div> <div>
<h2>Pages</h2> <h2>Pages</h2>
<p>Here you can modify your landing page (the start page of libreǝvent)</p> <p>Here you can modify your landing page (the start page of libreǝvent)</p>
<select name="templateSel" id="templateSel" v-bind="selectedTemplate"> <select name="templateSel" id="templateSel" v-model="selectedTemplate">
<option v-for="el in startPageTemplates" :value="el">{{ el }}</option> <option v-for="el in startPageTemplates" :value="el">{{ el }}</option>
</select> </select>
<!-- Start page settings -> Defined by startPage.json file -->
<div class="start-page-settings">
</div>
</div> </div>
</template> </template>
@@ -32,6 +36,7 @@
if ( res.status === 200 ) { if ( res.status === 200 ) {
res.json().then( json => { res.json().then( json => {
this.startPageSettings = json; this.startPageSettings = json;
console.log( json );
} ); } );
} }
} ); } );
@@ -54,8 +59,7 @@
fetch( '/admin/getAPI/getSettings' ).then( res => { fetch( '/admin/getAPI/getSettings' ).then( res => {
if ( res.status === 200 ) { if ( res.status === 200 ) {
res.json().then( json => { res.json().then( json => {
console.log( json[ 'startPage' ] ); this.selectedTemplate = String( json[ 'startPage' ] );
this.selectedTemplate = json[ 'startPage' ];
} ); } );
} }
} ); } );