diff --git a/src/server/backend/helperRoutes.js b/src/server/backend/helperRoutes.js index 3a57858..8a10c93 100644 --- a/src/server/backend/helperRoutes.js +++ b/src/server/backend/helperRoutes.js @@ -22,7 +22,7 @@ module.exports = ( app, settings ) => { } ); app.get( '/startPage/assets/:image', ( req, res ) => { - res.sendFile( path.join( __dirname + '/../assets/' + settings.startPage + '/assets/' + req.params.image ) ); + res.sendFile( path.join( __dirname + '/../ui/home/templates/' + settings.startPage + '/assets/' + req.params.image ) ); } ); app.get( '/startPage/preview/:template', ( req, res ) => { diff --git a/src/server/config/settings.config.json b/src/server/config/settings.config.json index 3d6a25a..a4115a8 100644 --- a/src/server/config/settings.config.json +++ b/src/server/config/settings.config.json @@ -12,6 +12,6 @@ "currency":"CHF", "gcInterval":300, "ticketTimeout":900, - "startPage":"default", + "startPage":"modern", "version":"1.0.0" } \ No newline at end of file diff --git a/src/server/ui/home/main.css b/src/server/ui/home/main.css index 699c012..5d115f8 100644 --- a/src/server/ui/home/main.css +++ b/src/server/ui/home/main.css @@ -9,39 +9,36 @@ --accent-background-hover: rgb(124, 140, 236); --overlay-color: rgba(0, 0, 0, 0.7); --inactive-color: rgb(100, 100, 100); - --highlight-backdrop: rgb(143, 134, 192); --hint-color: rgb(174, 210, 221); --PI: 3.14159265358979; } :root.dark { --primary-color: white; - --accent-background: rgb(56, 56, 112); + --accent-background: rgb(20, 20, 116); --secondary-color: white; --background-color: rgb(32, 32, 32); --popup-color: rgb(58, 58, 58); --accent-color: #42b983; --hover-color: rgb(83, 83, 83); - --accent-background-hover: #4380a8; + --accent-background-hover: rgb(124, 140, 236); --overlay-color: rgba(104, 104, 104, 0.575); --inactive-color: rgb(190, 190, 190); - --highlight-backdrop: rgb(85, 63, 207); --hint-color: rgb(88, 91, 110); } @media ( prefers-color-scheme: dark ) { :root { --primary-color: white; - --accent-background: rgb(56, 56, 112); + --accent-background: rgb(20, 20, 116); --secondary-color: white; --background-color: rgb(32, 32, 32); --popup-color: rgb(58, 58, 58); --accent-color: #42b983; --hover-color: rgb(83, 83, 83); - --accent-background-hover: #4380a8; + --accent-background-hover: rgb(124, 140, 236); --overlay-color: rgba(104, 104, 104, 0.575); --inactive-color: rgb(190, 190, 190); - --highlight-backdrop: rgb(85, 63, 207); --hint-color: rgb(88, 91, 110); } } diff --git a/src/server/ui/home/templates/default/startPage.json b/src/server/ui/home/templates/default/startPage.json index 3f48614..e1586bc 100644 --- a/src/server/ui/home/templates/default/startPage.json +++ b/src/server/ui/home/templates/default/startPage.json @@ -1,10 +1,4 @@ { - "subtitle": { - "id": "subtitle", - "type": "text", - "display": "Subtitle", - "can-be-empty": false - }, "description": { "id": "description", "type": "textarea", @@ -16,16 +10,5 @@ "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/server/ui/home/templates/fancy/assets/README.md b/src/server/ui/home/templates/fancy/assets/README.md deleted file mode 100644 index 5c3f617..0000000 --- a/src/server/ui/home/templates/fancy/assets/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# Assets directory - -Inside of the assets directory, the start page assets can be found. \ No newline at end of file diff --git a/src/server/ui/home/templates/fancy/index.html b/src/server/ui/home/templates/fancy/index.html deleted file mode 100644 index b17ca09..0000000 --- a/src/server/ui/home/templates/fancy/index.html +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - {{ pageName }} :: Home - - - -
- -

Welcome to {{ pageName }}!

-

{{ data.description }}

-
- - \ No newline at end of file diff --git a/src/server/ui/home/templates/fancy/startPage.config.json b/src/server/ui/home/templates/fancy/startPage.config.json deleted file mode 100644 index a23d7f1..0000000 --- a/src/server/ui/home/templates/fancy/startPage.config.json +++ /dev/null @@ -1 +0,0 @@ -{"subtitle":"this is a test","description":"this is a test description"} \ No newline at end of file diff --git a/src/server/ui/home/templates/fancy/startPage.json b/src/server/ui/home/templates/fancy/startPage.json deleted file mode 100644 index 3f48614..0000000 --- a/src/server/ui/home/templates/fancy/startPage.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "subtitle": { - "id": "subtitle", - "type": "text", - "display": "Subtitle", - "can-be-empty": false - }, - "description": { - "id": "description", - "type": "textarea", - "display": "Description", - "textarea-settings": { - "cols": 50, - "rows": 5, - "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/server/ui/home/templates/fancy/supportFiles/style.css b/src/server/ui/home/templates/fancy/supportFiles/style.css deleted file mode 100644 index e2549c4..0000000 --- a/src/server/ui/home/templates/fancy/supportFiles/style.css +++ /dev/null @@ -1,12 +0,0 @@ -/* -* libreevent - style.css -* -* Created by Janis Hutz 08/29/2023, Licensed under the GPL V3 License -* https://janishutz.com, development@janishutz.com -* -* -*/ - -.logo { - height: 50vh; -} \ No newline at end of file diff --git a/src/server/ui/home/templates/modern/index.html b/src/server/ui/home/templates/modern/index.html index b17ca09..b6f23af 100644 --- a/src/server/ui/home/templates/modern/index.html +++ b/src/server/ui/home/templates/modern/index.html @@ -19,9 +19,15 @@
- -

Welcome to {{ pageName }}!

+
+ +
+

{{ pageName }}

+
{{ data.subtitle }}
+
+

{{ data.description }}

+ Buy tickets
\ No newline at end of file diff --git a/src/server/ui/home/templates/modern/supportFiles/style.css b/src/server/ui/home/templates/modern/supportFiles/style.css index e2549c4..03ed11a 100644 --- a/src/server/ui/home/templates/modern/supportFiles/style.css +++ b/src/server/ui/home/templates/modern/supportFiles/style.css @@ -7,6 +7,49 @@ * */ +.title { + height: 80vh; + background-position: center; + background-repeat: no-repeat; + background-color: rgba( 0, 0, 0, 0.1 ); + background-size: cover; + background-image: url( /startPage/assets/banner.jpg ); + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + width: 100vw; + padding: 0; + margin: 0; +} + +.title-text { + background-color: var( --overlay-color ); + color: var( --secondary-color ); + display: flex; + justify-content: center; + align-items: center; + flex-direction: column; + padding: 2%; + margin-top: 1%; +} + +.button { + transition: all 1s; + padding: 1%; + border-radius: 50px; + background-color: var( --accent-background ); + cursor: pointer; + color: var( --secondary-color ); + margin-bottom: 5%; + text-decoration: none; +} + +.button:hover { + background-color: var( --accent-background-hover ); + border-radius: 10px; +} + .logo { - height: 50vh; + height: 40%; } \ No newline at end of file