From 2e7294c83c6388e3855ce787f0a18c20ed652131 Mon Sep 17 00:00:00 2001 From: RaindropsSys Date: Sat, 10 Jun 2023 11:06:53 +0200 Subject: Updated 12 files and added includes/system/compare.inc (automated) --- .idea/deployment.xml | 9 +- assets/logo/newlogo-template.png | Bin 40099 -> 40366 bytes assets/logo/newlogo.png | Bin 5622 -> 5686 bytes assets/logo/newlogo3-template.png | Bin 42331 -> 47379 bytes assets/logo/newlogo3.png | Bin 5745 -> 6334 bytes includes/components/navigation.inc | 2 +- includes/components/planner.inc | 34 ++++--- includes/flags.json | 4 +- includes/system/compare.inc | 187 +++++++++++++++++++++++++++++++++++++ includes/util/banner.inc | 10 +- pages/api/money/create.php | 2 +- pages/fronting.inc | 4 + pages/travelling.inc | 14 +-- 13 files changed, 232 insertions(+), 34 deletions(-) create mode 100644 includes/system/compare.inc diff --git a/.idea/deployment.xml b/.idea/deployment.xml index e07dbe7..a20124a 100644 --- a/.idea/deployment.xml +++ b/.idea/deployment.xml @@ -2,17 +2,10 @@ - - - - - - - - + diff --git a/assets/logo/newlogo-template.png b/assets/logo/newlogo-template.png index 148d9f5..3159280 100644 Binary files a/assets/logo/newlogo-template.png and b/assets/logo/newlogo-template.png differ diff --git a/assets/logo/newlogo.png b/assets/logo/newlogo.png index 47af7ef..7745933 100644 Binary files a/assets/logo/newlogo.png and b/assets/logo/newlogo.png differ diff --git a/assets/logo/newlogo3-template.png b/assets/logo/newlogo3-template.png index e862260..41500c8 100644 Binary files a/assets/logo/newlogo3-template.png and b/assets/logo/newlogo3-template.png differ diff --git a/assets/logo/newlogo3.png b/assets/logo/newlogo3.png index 0ba967d..375b56e 100644 Binary files a/assets/logo/newlogo3.png and b/assets/logo/newlogo3.png differ diff --git a/includes/components/navigation.inc b/includes/components/navigation.inc index b82e247..478420d 100644 --- a/includes/components/navigation.inc +++ b/includes/components/navigation.inc @@ -117,7 +117,7 @@ $navigation_admin = [ "name" => $lang["navigation"]["apps"], "minimal" => false, "items" => [ - [ + time() >= 1686787200 ? null : [ "name" => $pages["fronting"]["name"][$lang["_name"]], "icon" => "/assets/icons/fronting.svg", "invert" => true, diff --git a/includes/components/planner.inc b/includes/components/planner.inc index f005f52..b5fc7a5 100644 --- a/includes/components/planner.inc +++ b/includes/components/planner.inc @@ -482,23 +482,29 @@

Front planner

+ +
+ The fronting schedule will be removed on June 15th. Due to internal discussion, we have decided to remove the fronting schedule as it is causing a lot of trouble inside the respective systems. Archives will be kept in the database. +
+ diff --git a/includes/flags.json b/includes/flags.json index d11fd54..0aed68e 100644 --- a/includes/flags.json +++ b/includes/flags.json @@ -1,7 +1,7 @@ { "age_regressor": null, "age_spells": null, - "host": null, + "host": "Host", "not_talking": null, "median": null, @@ -30,4 +30,4 @@ "other2": "Potentially having sex with %other%", "other3": "#Having sex with Raindrops", "other4": "#Potentially having sex with Raindrops" -} \ No newline at end of file +} diff --git a/includes/system/compare.inc b/includes/system/compare.inc new file mode 100644 index 0000000..6eec002 --- /dev/null +++ b/includes/system/compare.inc @@ -0,0 +1,187 @@ + + +
+
+

+
grid-template-columns: 3fr 1.5fr 2fr repeat(4, 1fr);"> + + " data-bs-toggle="tooltip"> + " data-bs-toggle="tooltip"> + " data-bs-toggle="tooltip"> + " data-bs-toggle="tooltip"> + " data-bs-toggle="tooltip"> + " data-bs-toggle="tooltip"> + + + " data-bs-toggle="tooltip"> + " data-bs-toggle="tooltip"> + " data-bs-toggle="tooltip"> + " data-bs-toggle="tooltip"> + " data-bs-toggle="tooltip"> + " data-bs-toggle="tooltip"> + + + + Code + Code + Code + Code + Code + Code + + + + " data-bs-toggle="tooltip"> + " data-bs-toggle="tooltip"> + " data-bs-toggle="tooltip"> + " data-bs-toggle="tooltip"> + " data-bs-toggle="tooltip"> + " data-bs-toggle="tooltip"> + + + " data-bs-toggle="tooltip"> + " data-bs-toggle="tooltip"> + " data-bs-toggle="tooltip"> + " data-bs-toggle="tooltip"> + " data-bs-toggle="tooltip"> + " data-bs-toggle="tooltip"> + + + " data-bs-toggle="tooltip"> + " data-bs-toggle="tooltip"> + " data-bs-toggle="tooltip"> + " data-bs-toggle="tooltip"> + " data-bs-toggle="tooltip"> + " data-bs-toggle="tooltip"> + + + " data-bs-toggle="tooltip"> + " data-bs-toggle="tooltip"> + " data-bs-toggle="tooltip"> + " data-bs-toggle="tooltip"> + " data-bs-toggle="tooltip"> + " data-bs-toggle="tooltip"> + + + " data-bs-toggle="tooltip"> + " data-bs-toggle="tooltip"> + " data-bs-toggle="tooltip"> + " data-bs-toggle="tooltip"> + " data-bs-toggle="tooltip"> + " data-bs-toggle="tooltip"> + + + + " data-bs-toggle="tooltip" class="member-link comparison-item comparison-item-clickable" href="/"> + " style="width:24px;"> + ; height: 16px; width: 16px;display: inline-block;vertical-align: middle;border-radius:2px;"> + + + + " style="width:24px;vertical-align: middle;position:relative;top:-5px;" src="/assets/species/.png" alt=""> + + + + + + + - + + + + + + 0 ? count($metadata["marefriends"]) + count($metadata["sisters"]) : "" ?> + + +
" data-bs-toggle="tooltip" data-bs-html="true" class="member-link tooltip-nohelp" href="/">" style="width:24px;">
" data-bs-toggle="tooltip" data-bs-html="true" class="member-link tooltip-nohelp" href="/">" style="width:24px;">
" data-bs-toggle="tooltip" data-bs-html="true" class="member-link tooltip-nohelp" href="/">" style="width:24px;"> + + + + 0): ?> + + " src="/assets/icons/partial.svg" alt="" style="width:24px;"> + + " src="/assets/icons/complete.svg" alt="" style="width:24px;"> + + + " src="/assets/icons/none.svg" alt="" style="width:24px;"> + + + + + " src="/assets/icons/complete.svg" alt="" style="width:24px;"> + + " src="/assets/icons/none.svg" alt="" style="width:24px;"> + + + + + " src="/assets/icons/complete.svg" alt="" style="width:24px;"> + + " src="/assets/icons/partial.svg" alt="" style="width:24px;"> + + " src="/assets/icons/none.svg" alt="" style="width:24px;"> + + + + + + " src="/assets/icons/partial.svg" alt="" style="width:24px;"> + + " src="/assets/icons/complete.svg" alt="" style="width:24px;"> + + + " src="/assets/icons/none.svg" alt="" style="width:24px;"> + + + +
+
+ + \ No newline at end of file diff --git a/includes/util/banner.inc b/includes/util/banner.inc index 01362a0..1f4d7fd 100644 --- a/includes/util/banner.inc +++ b/includes/util/banner.inc @@ -337,6 +337,14 @@ function getMemberBannerData(string $id, string $system, bool $french = false) { ]; } + if (($metadata["host"] ?? false)) { + $badges[] = [ + "id" => "host", + "color" => "fc6735", + "html" => 'Host' + ]; + } + if (($metadata["leader"] ?? false)) { $badges[] = [ "id" => "leader", @@ -403,4 +411,4 @@ function getMemberBannerData(string $id, string $system, bool $french = false) { 'friends' => $friends ?? [] ] ]; -} \ No newline at end of file +} diff --git a/pages/api/money/create.php b/pages/api/money/create.php index 0b78f57..12cc7c9 100644 --- a/pages/api/money/create.php +++ b/pages/api/money/create.php @@ -79,7 +79,7 @@ file_get_contents('https://' . $ntfy["server"] . '/' . $ntfy["topic"], false, st "Title: " . formatPonypush((getMember($myId)["display_name"] ?? getMember($myId)["name"]) . " created a transaction to " . $account["name"] . " (" . ucfirst($account["owner"]) . ")") . "\r\n" . "Tags: bits\r\n" . "Authorization: Basic " . base64_encode($ntfy["user"] . ":" . $ntfy["password"]), - 'content' => formatPonypush(($account["currency"] === "gbp" ? "£" : "€") . abs((float)$data["amount"]) . " were " . ((float)$data["amount"] >= 0 ? "added" : "removed") . " just now" . (trim($data["description"]) !== "" ? ": " . $_GET["description"] : "")) + 'content' => formatPonypush(($account["currency"] === "gbp" ? "£" : "€") . abs((float)$data["amount"]) . " were " . ((float)$data["amount"] >= 0 ? "added" : "removed") . " just now" . (trim($data["description"]) !== "" ? ": " . $data["description"] : "")) ] ])); diff --git a/pages/fronting.inc b/pages/fronting.inc index 6cd464b..9873b81 100644 --- a/pages/fronting.inc +++ b/pages/fronting.inc @@ -1,5 +1,9 @@ = 1686787200) { + peh_error("Page not found: fronting", 404); +} + require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/init.inc"; global $title; global $isLoggedIn; global $lang; global $pages; require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/components/header.inc'; diff --git a/pages/travelling.inc b/pages/travelling.inc index ee2e2c3..7eb3dfa 100644 --- a/pages/travelling.inc +++ b/pages/travelling.inc @@ -39,8 +39,8 @@ if (isset($_GET['toggleTravel']) && $isLoggedIn) { $reqContext = stream_context_create($reqOptions); // No actual data is received on DELETE, so we don't even bother trying to collect req response; if it fails it will put a warning in the logs anyway. - sleep(1); - file_get_contents("https://api.pluralkit.me/v2/members/$travellingMember", false, $reqContext); + //sleep(1); + //file_get_contents("https://api.pluralkit.me/v2/members/$travellingMember", false, $reqContext); } } else { $travelling[$_GET['member']]["travelling"] = true; @@ -86,13 +86,13 @@ if (isset($_GET['toggleTravel']) && $isLoggedIn) { $reqContext = stream_context_create($reqOptions); - sleep(1); - $member = json_decode(file_get_contents("https://api.pluralkit.me/v2/members", false, $reqContext), true); + //sleep(1); + //$member = json_decode(file_get_contents("https://api.pluralkit.me/v2/members", false, $reqContext), true); // Member exists? - if (isset($member)) { - $travelling[$id]['pluralkit'] = $member["id"]; - } + //if (isset($member)) { + //$travelling[$id]['pluralkit'] = $member["id"]; + //} } } } -- cgit