From f4aeac6ad735d7c26333ed21e5944e0372381291 Mon Sep 17 00:00:00 2001 From: Max Value Date: Sun, 23 Feb 2025 23:10:15 +0000 Subject: [PATCH] Seperated clock Begun to move over to python rewrite --- auth/clock.php | 143 +++++++++++++++++++++++++++++++++++++++++++++++++ auth/index.php | 52 +----------------- 2 files changed, 145 insertions(+), 50 deletions(-) create mode 100644 auth/clock.php diff --git a/auth/clock.php b/auth/clock.php new file mode 100644 index 0000000..f1e9b9d --- /dev/null +++ b/auth/clock.php @@ -0,0 +1,143 @@ + + + + + XMDV + + + +
+
+ Doomsday clock (Incr. deg) +
+ + +"; +} +?> + +
+
+
+ Movement + '> +
+
+ + +
+ + +
+
+ +
+ + diff --git a/auth/index.php b/auth/index.php index a5aa7e0..2889073 100644 --- a/auth/index.php +++ b/auth/index.php @@ -12,11 +12,6 @@ $text = fread($file, filesize("../text.json")); fclose($file); $text = json_decode($text, true); -$file = fopen("../clock.json", "r") or die("unable to open file!"); -$data = fread($file, filesize("../clock.json")); -fclose($file); -$clock = json_decode($data, true); - $file = fopen("../data.json", "r") or die("unable to open file!"); $data = fread($file, filesize("../data.json")); fclose($file); @@ -26,7 +21,7 @@ $file = fopen("../note", "r") or die("unable to open file!"); $note = fread($file, filesize("../note")); fclose($file); -$clockIncrement = 10; +$clockIncrement = 18; if (!empty($_POST['generate_docs'])) { exec("./generate_docs.py"); @@ -34,17 +29,6 @@ if (!empty($_POST['generate_docs'])) { if (!empty($_POST['update'])) { - for ($i = 0; $i < 5; $i ++) { - if ($i == (int)$_POST['sceneCue']) { - $clock['lightingCues'][$i] = "true"; - } else { - $clock['lightingCues'][$i] = "false"; - } - } - for ($i = 0; $i < 5; $i ++) { - $clock['lightingCues'][$i + 5] = var_export(!empty($_POST["triggerCue$i"]), true); - } - $data['showingMain'] = var_export(!empty($_POST['main']), true); $data['showingAll'] = var_export(!empty($_POST['all']), true); $data['showingExtra'] = var_export(!empty($_POST['extra']), true); @@ -70,8 +54,6 @@ if (!empty($_POST['update'])) { } } - $clock['movementSpeed'] = (int)$_POST['movementSpeed']; - $clock['currentPosition'] = (int)$_POST["doomsday"]; $data['timerOffset'] = (int)$_POST['timerOffset']; $data['priceChange'] = (int)$_POST['priceChange']; $data['discount'] = (int)$_POST['discount']; @@ -129,11 +111,6 @@ if (!empty($_POST['update'])) { $file = fopen("../data.json", "w"); fwrite($file, $json); fclose($file); - - $json = json_encode($clock); - $file = fopen("../clock.json", "w"); - fwrite($file, $json); - fclose($file); } ?> @@ -165,19 +142,6 @@ fieldtext > .split { width: 50%; margin: 0; } -.floating { - position: fixed; - bottom: 25px; - right: 25px; - max-width: min(900px, calc(100% - 74px)); - padding: 10px; - color: red; - border: 2px solid red; - background-color: rgba(255, 255, 255, 0.7); -} -s { - color: green; -} .clock { position: relative; width: 100%; @@ -503,7 +467,7 @@ echo ""; } @@ -535,17 +499,5 @@ for ($i = 0; $i < 360; $i += $clockIncrement) { -
- Notes -

- Still need to do plenty to both the GFX overlay and this page (and the actual clock): -

- -

- 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. -

- -- 2.39.2