From 34757ac46184f000f9379f1b82a82987ad150316 Mon Sep 17 00:00:00 2001 From: Ada Werefox Date: Mon, 15 Apr 2024 20:40:12 -0500 Subject: [PATCH] Added an about section that is accessible through a menu button in the top right and filled it, moved source, settings, and how-to into the about section. Fixed minor issue where summary divs were not displaying the right color coding if they had no checks and were undiscovered. --- .../tracker/static/tracker/assets/main.js | 18 +- ...TUNCingCards_Alice02_Web.png => alice.png} | Bin ...gCards_Fletcher01_Web.png => fletcher.png} | Bin ...TUNCingCards_Glace01_Web.png => glace.png} | Bin .../templates/tracker/about/index.html | 63 +++---- .../templates/tracker/credits/index.html | 36 ++++ .../templates/tracker/howto/index.html | 2 +- .../tracker/templates/tracker/index.html | 167 +++++++++--------- .../werefoxtheme/static_src/src/styles.css | 3 + 9 files changed, 169 insertions(+), 120 deletions(-) rename tunictracker/tracker/static/tracker/images/trading_cards/{TUNCingCards_Alice02_Web.png => alice.png} (100%) rename tunictracker/tracker/static/tracker/images/trading_cards/{TUNCingCards_Fletcher01_Web.png => fletcher.png} (100%) rename tunictracker/tracker/static/tracker/images/trading_cards/{TUNCingCards_Glace01_Web.png => glace.png} (100%) create mode 100644 tunictracker/tracker/templates/tracker/credits/index.html diff --git a/tunictracker/tracker/static/tracker/assets/main.js b/tunictracker/tracker/static/tracker/assets/main.js index fb57b5f..ae536ea 100644 --- a/tunictracker/tracker/static/tracker/assets/main.js +++ b/tunictracker/tracker/static/tracker/assets/main.js @@ -410,11 +410,19 @@ async function apply_summary_colors(summary) { } } else { if (summary.entrances_remaining > 0) { - summary.element.classList.add( - "from-highlight-entrances-light", - "to-highlight-entrances-dark", - "text-highlight-entrances-text" - ); + if (summary.entrances_found <= 0) { + summary.element.classList.add( + "from-highlight-undiscovered-light", + "to-highlight-undiscovered-dark", + "text-highlight-undiscovered-text" + ); + } else { + summary.element.classList.add( + "from-highlight-entrances-light", + "to-highlight-entrances-dark", + "text-highlight-entrances-text" + ); + } } else { summary.element.classList.add( "from-highlight-empty-light", diff --git a/tunictracker/tracker/static/tracker/images/trading_cards/TUNCingCards_Alice02_Web.png b/tunictracker/tracker/static/tracker/images/trading_cards/alice.png similarity index 100% rename from tunictracker/tracker/static/tracker/images/trading_cards/TUNCingCards_Alice02_Web.png rename to tunictracker/tracker/static/tracker/images/trading_cards/alice.png diff --git a/tunictracker/tracker/static/tracker/images/trading_cards/TUNCingCards_Fletcher01_Web.png b/tunictracker/tracker/static/tracker/images/trading_cards/fletcher.png similarity index 100% rename from tunictracker/tracker/static/tracker/images/trading_cards/TUNCingCards_Fletcher01_Web.png rename to tunictracker/tracker/static/tracker/images/trading_cards/fletcher.png diff --git a/tunictracker/tracker/static/tracker/images/trading_cards/TUNCingCards_Glace01_Web.png b/tunictracker/tracker/static/tracker/images/trading_cards/glace.png similarity index 100% rename from tunictracker/tracker/static/tracker/images/trading_cards/TUNCingCards_Glace01_Web.png rename to tunictracker/tracker/static/tracker/images/trading_cards/glace.png diff --git a/tunictracker/tracker/templates/tracker/about/index.html b/tunictracker/tracker/templates/tracker/about/index.html index c8f070d..5e4bf4a 100644 --- a/tunictracker/tracker/templates/tracker/about/index.html +++ b/tunictracker/tracker/templates/tracker/about/index.html @@ -1,36 +1,37 @@ {% load static %}
-
- - About this tracker - - +
+ + About this tracker + -
- Settings - {% include "tracker/address/index.html" %} -
- - -
-
- - -
-
- {% include "tracker/howto/index.html" %} +
+

About

+
+
+
+ {% include "tracker/howto/index.html" %} +
+ Settings +
+ {% include "tracker/address/index.html" %} +
+ + +
+ {% comment %}
+ + +
{% endcomment %} +
+ {% include "tracker/credits/index.html" %} + {% include "tracker/src/index.html" with tracker_fe_link="https://gitea.werefox.cafe/ada/tunic-tracker-redux" tracker_be_link="https://github.com/spaceglace/tunic-randomizer/" %} +
diff --git a/tunictracker/tracker/templates/tracker/credits/index.html b/tunictracker/tracker/templates/tracker/credits/index.html new file mode 100644 index 0000000..377ede9 --- /dev/null +++ b/tunictracker/tracker/templates/tracker/credits/index.html @@ -0,0 +1,36 @@ +{% load static %} +
+ Credits +
+
+
+
+
+ + A TUNIC themed trading card for "Alice Werefox," which pictures her character lying on the ground near a chest in a small alcove with text reading: "Everything is accessible with ladder storage if you try hard enough." + + + A TUNIC themed trading card for "Glace Painbringer," which pictures her character shooting an icebolt with text reading: "The only kind of person capable of inflicting such pain... is one who has sustained a great deal worse." + + + A TUNIC themed trading card for "Fletcher, Fleet Fox," which pictures their character dashing with text reading: "Deftly jumping from project to project, there is no effort too foolhardy for them, no extreme too distant for consideration.". + +
+
+
+
+ This tracker was created by Alice Werefox and glace with special help from Fletcher whom provided the custom art assets. +
+
+
+
diff --git a/tunictracker/tracker/templates/tracker/howto/index.html b/tunictracker/tracker/templates/tracker/howto/index.html index 1fc18b1..4b990f1 100644 --- a/tunictracker/tracker/templates/tracker/howto/index.html +++ b/tunictracker/tracker/templates/tracker/howto/index.html @@ -1,4 +1,4 @@ -
+
How To Use This Tracker
diff --git a/tunictracker/tracker/templates/tracker/index.html b/tunictracker/tracker/templates/tracker/index.html index 71071ac..fff278b 100644 --- a/tunictracker/tracker/templates/tracker/index.html +++ b/tunictracker/tracker/templates/tracker/index.html @@ -1,97 +1,98 @@ {% extends "index.html" %} {% load static %} {% block content %} -
-
- {% include "tracker/about/index.html" %} -
- {% if debug != '' %} -
-
-
- - A trans pride fox emoji. - -
Tunic Transition Tracker
-
-
- ( -
 tuniik' t'raan'ziishuun' t'raakx 
- ) -
-
-
-
-
-
-
-
-
- Checks -
-
-
- {{ totals.Checks.Undiscovered }}/{{ totals.Checks.Total }} ({{ totals.Checks.Remaining }} left) -
+
+
+ {% include "tracker/about/index.html" %} +
+ {% if debug != '' %} +
+
+
+ + A trans pride fox emoji. + +
Tunic Transition Tracker
-
-
-
-
- Entrances -
-
-
- {{ totals.Entrances.Undiscovered }}/{{ totals.Entrances.Total }} ({{ totals.Entrances.Remaining }} left) -
+
+ ( +
 tuniik' t'raan'ziishuun' t'raakx 
+ )
-
-
-
- {% include "tracker/status/index.html" %} -
-
- {% include "tracker/breakdown/block.html" with extra_classes="hidden" is_current_scene="false" %} - {% for scene_title, scene_data in scenes.items %} - {% if scene_title == current_scene %} - {% include "tracker/breakdown/block.html" with extra_classes="order-first" is_current_scene="true" %} - {% else %} - {% include "tracker/breakdown/block.html" with extra_classes="order-last hidden" is_current_scene="false" %} - {% endif %} - {% endfor %} +
+
+
+
+
+
+ Checks +
+
+
+ {{ totals.Checks.Undiscovered }}/{{ totals.Checks.Total }} ({{ totals.Checks.Remaining }} left) +
+
+
+
+
+
+ Entrances +
+
+
+ {{ totals.Entrances.Undiscovered }}/{{ totals.Entrances.Total }} ({{ totals.Entrances.Remaining }} left) +
+
+
+
-
- Summary -
-
-
{% include "tracker/summary/list.html" %}
-
-
- {% include "tracker/codes/index.html" %} -
- Hints -
-
-
- {% include "tracker/hints/index.html" with value="" extra_classes="hidden" %} - {% for name, value in hints.items %} - {% include "tracker/hints/index.html" %} +
+ {% include "tracker/status/index.html" %} +
+
+ {% include "tracker/breakdown/block.html" with extra_classes="hidden" is_current_scene="false" %} + {% for scene_title, scene_data in scenes.items %} + {% if scene_title == current_scene %} + {% include "tracker/breakdown/block.html" with extra_classes="order-first" is_current_scene="true" %} + {% else %} + {% include "tracker/breakdown/block.html" with extra_classes="order-last hidden" is_current_scene="false" %} + {% endif %} {% endfor %}
-
-
- {% else %} -
{% endif %}
- {% include "tracker/src/index.html" with tracker_fe_link="https://gitea.werefox.cafe/ada/tunic-tracker-redux" tracker_be_link="https://github.com/spaceglace/TunicTransitionTracker" %} +
+ Summary +
+
+
{% include "tracker/summary/list.html" %}
+
+
+ {% include "tracker/codes/index.html" %} +
+ Hints +
+
+
+ {% include "tracker/hints/index.html" with value="" extra_classes="hidden" %} + {% for name, value in hints.items %} + {% include "tracker/hints/index.html" %} + {% endfor %} +
+
+
+
+ {% else %} +
+ {% endif %} +
+
-
{% endblock content %} diff --git a/tunictracker/werefoxtheme/static_src/src/styles.css b/tunictracker/werefoxtheme/static_src/src/styles.css index 71bfc11..e0356bc 100644 --- a/tunictracker/werefoxtheme/static_src/src/styles.css +++ b/tunictracker/werefoxtheme/static_src/src/styles.css @@ -10,3 +10,6 @@ font-family: "Trunic-Regular"; src: url("/static/fonts/Trunic-Regular.otf"); } +details summary::-webkit-details-marker { + display: none; +}