diff --git a/src/server/admin/startPageManager.js b/src/server/admin/startPageManager.js index a5ed678..802548d 100644 --- a/src/server/admin/startPageManager.js +++ b/src/server/admin/startPageManager.js @@ -24,8 +24,8 @@ class StartPageManager { loadStartPagePreferences( startPageName ) { 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' ) ) ); + options = JSON.parse( fs.readFileSync( path.join( __dirname + '/../ui/home/templates/' + startPageName + '/startPage.json' ) ) ); + conf = JSON.parse( fs.readFileSync( path.join( __dirname + '/../ui/home/templates/' + startPageName + '/startPage.config.json' ) ) ); return { 'conf': conf, 'options': options }; } catch ( err ) { return {}; diff --git a/src/server/ui/home/templates/default/startPage.config.json b/src/server/ui/home/templates/default/startPage.config.json index e69de29..6f861d4 100644 --- a/src/server/ui/home/templates/default/startPage.config.json +++ b/src/server/ui/home/templates/default/startPage.config.json @@ -0,0 +1,5 @@ +{ + "subtitle": "this is a test", + "description": "this is a test description", + "banner": "homeBanner.jpg" +} \ No newline at end of file diff --git a/src/server/ui/home/templates/default/startPage.json b/src/server/ui/home/templates/default/startPage.json index e69de29..08b5c50 100644 --- a/src/server/ui/home/templates/default/startPage.json +++ b/src/server/ui/home/templates/default/startPage.json @@ -0,0 +1,31 @@ +{ + "subtitle": { + "id": "subtitle", + "type": "text", + "display": "Subtitle", + "can-be-empty": false + }, + "description": { + "id": "description", + "type": "textarea", + "display": "Description", + "textarea-settings": { + "resize-y": true, + "resize-x": false, + "max-length": 0, + "min-length": 100 + }, + "can-be-empty": false + }, + "banner": { + "id": "banner", + "type": "image", + "display": "Banner", + "image-settings": { + "upload-name": "homeBanner", + "accept-filetype": "image/jpeg", + "height": 200, + "width": 350 + } + } +} \ No newline at end of file diff --git a/src/webapp/main/src/views/admin/EventsView.vue b/src/webapp/main/src/views/admin/EventsView.vue index 426eee4..a841abb 100644 --- a/src/webapp/main/src/views/admin/EventsView.vue +++ b/src/webapp/main/src/views/admin/EventsView.vue @@ -21,7 +21,7 @@
{{ event.description }}
{{ event.date }} -{{ event.description }}
{{ event.date }}