added url, apikey to lockscreen

src/handlers/config.ts

@@ -20,7 +20,8 @@ const config = new ConfigManager(__path + '/config.json', true, {
 		database: 'hydrationhub'
 	},
 	devmode: false,
-	devmode_fileupload: false
+	devmode_fileupload: false,
+	galleryApiKey: '',
 });//, log.core); // Disabled due to Cyclic dependencies with log handler (specifically-> devmode for loglevel)
 
 

src/handlers/db.ts

@@ -13,7 +13,7 @@ const dotEnvExist = !fs.existsSync(dotEnvPath);
 fs.writeFileSync(dotEnvPath, `DATABASE_URL="mysql://${config.global.mysql.user}:${config.global.mysql.password}@${config.global.mysql.host}:${config.global.mysql.port}/${config.global.mysql.database}"`);
 log.core.info('Generated .env file for Prisma.');
 if (dotEnvExist) {
-	log.core.error('Please run "npx prisma db push" to synchronize the database.');
+	log.db.error('Please run "npx prisma db push" to synchronize the database.');
 	process.exit(1);
 }
 

src/routes/frontend/screensaver.ts

@@ -1,7 +1,8 @@
 import express, { Request, Response } from 'express';
+import config from '../../handlers/config.js';
 
 function get(req: Request, res: Response) {
-	res.render("screensaver")
+	res.render("screensaver", { apikey: config.global.galleryApiKey })
 }
 
 export default { get };

static/css/lockscreen.css

@@ -20,7 +20,7 @@
 	margin-bottom: 0px;
 	padding-bottom: 0px;
 	text-align: center;
-	width: 95%;
+	width: 140%;
 	vertical-align: middle;
 	font-family: monospace;
 }
@@ -47,3 +47,13 @@
 	95%,
 	100% {background-position:0 75%,0 25%,100% 75%,100% 25%}
 }
+
+
+#credits {
+	position: absolute;
+	bottom: 1px;
+	left: 1px;
+	mix-blend-mode: difference;
+	color: white;
+	font-weight: bold;
+}

static/js/lockscreenBgHandler.js

@@ -23,13 +23,14 @@ function handleImage() {
 			// default galery; spring awakens
 			uuid: '01919dec-b2cd-7adc-8ca2-a071d1169cbc;01953de0-3aa7-71f1-bfff-cbf9488efa64',
 			unsplash: true,
-			// orientation: 'landscape',
+			orientation: 'landscape',
 			height: window.screen.availHeight,
 			width: window.screen.availWidth,
-			cropCenteringMode: 'sm'
+			cropCenteringMode: 'sm',
+			apikey: apiKey
 		};
 
-		const apiUrl = `https://staging.thegreydiamond.de/projects/photoPortfolio/api/getRand.php?${new URLSearchParams(apiParams).toString()}`;
+		const apiUrl = `https://photo.thegreydiamond.de/api/images/random.php?${new URLSearchParams(apiParams).toString()}`;
 
 		fetch(apiUrl)
 			.then((response) => response.json())
@@ -79,7 +80,7 @@ function handleImage() {
 					}, 1000);
 
 					// Set the credits
-					credits.innerHTML = `Photo by <a href="${data.user.links.html}" class="external-link" target="_blank">${data.user.name}</a>`;
+					credits.innerHTML = `"${data.title}" by <a href="${data.user.links.html}" class="external-link" target="_blank">${data.user.name}</a>`;
 					credits.style.zIndex = 300000;
 				}
 			})

views/admin/users.eta

@@ -4,7 +4,7 @@
 <section class="section container" id="mainSelect">
 	<h1 class="title">Benutzerverwaltung</h1>
 	<p class="heading"><button class="js-modal-trigger button" data-target="modal-js-example">
-				Neuen Konakt anlegen
+		Benutzer anlegen
 	</button></p>
 	<table class="table is-striped is-fullwidth is-hoverable" data-dataSource="user" id="userTable" data-pageSize="10">
 		<thead>

views/partials/nav.eta

@@ -6,14 +6,22 @@
 		<a class="navbar-item primary is-hidden" id="nav_username" href="/">
 			<strong>Hey, <span id="nav_usernameContent"></span></strong>
 		</a>
+
+		<a role="button" class="navbar-burger" aria-label="menu" aria-expanded="false" data-target="navbarBasicExample">
+			<span aria-hidden="true"></span>
+			<span aria-hidden="true"></span>
+			<span aria-hidden="true"></span>
+			<span aria-hidden="true"></span>
+		</a>
 	</div>
 
-	<div id="navbarBasicExample" class="navbar-menu is-active">
+	<div id="navbarBasicExample" class="navbar-menu">
 		<div class="navbar-end">
 			<div class="navbar-item" id="dynamic-navbar-buttons">
 				<!-- Buttons will be dynamically injected here -->
 			</div>
 		</div>
+	</div>
 	<script>
 		document.addEventListener('DOMContentLoaded', () => {
 			const navbarButtons = document.getElementById('dynamic-navbar-buttons');
@@ -22,7 +30,8 @@
 
 			const buttonsConfig = {
 				'/user_select': [
-						{ text: '', icon: 'bi bi-gear', link: '/admin' }
+					{ text: '', icon: 'bi bi-gear', link: '/admin' },
+					{ text: '', icon: 'bi bi-house', link: '/user_select' }
 				],
 				'/product_select': [
 					{ text: 'Zur Abrechnung', link: '/pay_up' },
@@ -34,7 +43,18 @@
 					{ text: '', icon: 'bi bi-box-arrow-right', link: '/user_select' }
 				],
 				'/admin': [
-						{ text: '', icon: 'bi bi-gear', link: '/admin' },
+					{ text: '', icon: 'bi bi-house', link: '/user_select' }
+				],
+				'/admin/products': [
+					{ text: '', icon: 'bi bi-arrow-return-left', link: '/admin' },
+					{ text: '', icon: 'bi bi-house', link: '/user_select' }
+				],
+				'/admin/users': [
+					{ text: '', icon: 'bi bi-arrow-return-left', link: '/admin' },
+					{ text: '', icon: 'bi bi-house', link: '/user_select' }
+				],
+				'/admin/report': [
+					{ text: '', icon: 'bi bi-arrow-return-left', link: '/admin' },
 					{ text: '', icon: 'bi bi-house', link: '/user_select' }
 				]
 			};
@@ -62,7 +82,17 @@
 				}
 				navbarButtons.appendChild(btn);
 			});
+
+			// Burger menu toggle
+			const burger = document.querySelector('.navbar-burger');
+			const menu = document.querySelector('.navbar-menu');
+
+			if (burger && menu) {
+				burger.addEventListener('click', () => {
+					burger.classList.toggle('is-active');
+					menu.classList.toggle('is-active');
+				});
+			}
 		});
 	</script>
-	</div>
 </nav>

views/screensaver.eta

@@ -10,6 +10,9 @@
     <div id="date"></div>
 
 </div>
+<script>
+const apiKey = "<%= it.apikey %>";
+</script>
 <script src="/static/apiWrapper.js"></script>
 <script src="/static/pageDriver.js"></script>
 <script src="/static/js/lockscreenBgHandler.js"></script>

views/user_select.eta

@@ -6,7 +6,7 @@
 </section>
 <hidden>
 	<!-- Base Button -->
-	<button class="button is-link is-medium m-2" id="baseStruct">Username</button>
+	<button class="button is-dark is-medium m-2" id="baseStruct">Username</button>
 </hidden>
 <div class="modal" id="pinPadModal">
   <div class="modal-background"></div>