Merge pull request #46 from VSLCatena/development

Development
VSLCatena · Jun 9, 2024 · 4f26b3d · 4f26b3d
2 parents d0568e9 + 19b98a0
commit 4f26b3d
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -4,14 +4,16 @@ services:
         hostname: pma
         image: ghcr.io/linuxserver/phpmyadmin
         profiles:
-            - debug
+            - dev
         environment:
             PMA_HOST: '${DB_HOST:-db}'
             PMA_USER: root
             PMA_PASSWORD: '${DB_ROOT_PASSWORD:-db}'
             TZ: Europe/Amsterdam
         ports:
             - '4081:80'
+        volumes:
+            - 'pmadata:/config'
         restart: unless-stopped
         networks:
             - net
@@ -67,3 +69,5 @@ networks:
 volumes:
     dbdata:
         driver: local
+    pmadata:
+        driver: local
diff --git a/src/html/bar/info.php b/src/html/bar/info.php
@@ -4,6 +4,7 @@
 ini_set('display_errors', 1);
 
 require_once '../core.php';
+header('Content-Type: application/json');
 $data = [];
 
 // Grab all categories

diff --git a/src/html/prices.php b/src/html/prices.php
@@ -2,7 +2,16 @@
 
 require_once 'core.php';
 header('Content-Type: application/json');
-$timeframe = 10 * 60;
+
+// fetch all settings
+$query    = $pdo->query('SELECT * FROM settings');
+$settings = [];
+
+foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) {
+    $settings[$row['setting']] = $row['value'];
+}
+
+$timeframe = $settings['time_round'] * 60; // quotient of unix timestamp (10 minutes * 60 seconds in a minute)
 
 function roundTo5s($num)
 {