From ea0bce17db307d261c88b00dff21d05fd4b214de Mon Sep 17 00:00:00 2001 From: will Date: Tue, 27 Aug 2024 19:33:37 +0100 Subject: [PATCH] Implemented clock 2 & 3 into GFX + Changed control panel to thirds view + Changed banner background + Added moving timer 3 to the screen focus + Moved control pannel lighting fieldset --- auth/index.php | 67 ++++++++++++---------- clock.json | 2 +- data.json | 2 +- index.html | 149 ++++++++++++++++++++++++++++++++++++++----------- items.json | 3 + 5 files changed, 159 insertions(+), 64 deletions(-) diff --git a/auth/index.php b/auth/index.php index 8acb257..5a9ecb8 100644 --- a/auth/index.php +++ b/auth/index.php @@ -43,6 +43,7 @@ if (!empty($_POST['update'])) { $data['showingTimer1'] = var_export(!empty($_POST['timer1']), true); $data['showingTimer2'] = var_export(!empty($_POST['timer2']), true); $data['showingTimer3'] = var_export(!empty($_POST['timer3']), true); + $data['timer3Main'] = var_export(!empty($_POST['timer3Main']), true); $data['showingBanner'] = var_export(!empty($_POST['banner']), true); $data['showingSigil'] = [ var_export(!empty($_POST['sigilNE']), true), @@ -180,7 +181,7 @@ for ($i = 0; $i < 360; $i += $clockIncrement) {
-
+

XMDV Interface

@@ -293,6 +294,7 @@ for ($i = 0; $i < count($text['bottomText']); $i++) { echo "
"; } echo ""; +echo "
"; echo "
Banner text"; for ($i = 0; $i < count($text['bannerText']); $i++) { $line = $text['bannerText'][$i]; @@ -359,6 +361,10 @@ $timer3Checked = ""; if ($data['showingTimer3'] == "true") { $timer3Checked = " checked='checked' "; } +$timer3MainChecked = ""; +if ($data['timer3Main'] == "true") { + $timer3MainChecked = " checked='checked' "; +} $timerOffset = $data["timerOffset"]; ?>
@@ -405,38 +411,14 @@ $timerOffset = $data["timerOffset"];
> - +
+ > +
-
-Doomsday clock (Incr. $clockIncrement deg)"; -echo "
"; -echo ""; -for ($i = 0; $i < 360; $i += $clockIncrement) { - $checked = ""; - if ($clock['currentPosition'] == $i) { - $checked = " checked='checked' "; - } - echo ""; -} -?> -
-
- Movement - '> -
-
- - -
- - -
-
-
+
Lighting
+
+
+Doomsday clock (Incr. $clockIncrement deg)"; +echo "
"; +echo ""; +for ($i = 0; $i < 360; $i += $clockIncrement) { + $checked = ""; + if ($clock['currentPosition'] == $i) { + $checked = " checked='checked' "; + } + echo ""; +} +?> +
+
+ Movement + '> +
+
+ + +
+ + +
@@ -488,7 +496,6 @@ for ($i = 0; $i < 5; $i ++) {
  • Make the top banner look better
  • Add some kind of rating into the item file and make it display
  • add marquee of the current buyers of the product and figure out how to do this (potentially hard?)
    • -

  • and then still to do in the admin department: Talk to Joe about the GFX system, ask Ash about the lighting desk sAcn input and to setup things, makerspace the clock, text people about things, arrange screentest with Jack. diff --git a/clock.json b/clock.json index 3c56d26..c29ed80 100755 --- a/clock.json +++ b/clock.json @@ -1 +1 @@ -{"currentPosition":230,"movementSpeed":30,"function":"ease","lightingCues":["false","false","true","false","false","true","false","true","false","true"]} \ No newline at end of file +{"currentPosition":230,"movementSpeed":30,"function":"ease","lightingCues":["false","true","false","false","false","true","false","true","false","true"]} \ No newline at end of file diff --git a/data.json b/data.json index 812dfe8..6bdb3fd 100755 --- a/data.json +++ b/data.json @@ -1 +1 @@ -{"topText":["It's here!"],"bottomText":["It's here!"],"bannerText":"The quant we created!","itemId":1,"currency":{"prefix":"$","postfix":" hairs"},"discount":70,"prefix":"false","round":"true","priceChange":50,"showingMain":"true","showingAll":"true","showingExtra":"true","showingTimer1":"true","showingTimer2":"false","showingTimer3":"false","showingBanner":"true","showingSigil":["false","false","false","false"],"timer1End":1724723324,"timer2End":1724720211,"timer3End":1724720386,"timerOffset":0} \ No newline at end of file +{"topText":["It's here!"],"bottomText":["It's here!"],"bannerText":"It's here!","itemId":2,"currency":{"prefix":"$","postfix":" hairs"},"discount":70,"prefix":"false","round":"true","priceChange":50,"showingMain":"true","showingAll":"true","showingExtra":"true","showingTimer1":"true","showingTimer2":"true","showingTimer3":"true","timer3Main":"false","showingBanner":"true","showingSigil":["false","false","false","false"],"timer1End":1724723324,"timer2End":1724780836,"timer3End":1724781031,"timerOffset":0} \ No newline at end of file diff --git a/index.html b/index.html index cd82600..eed82d8 100644 --- a/index.html +++ b/index.html @@ -4,11 +4,17 @@