From 84d95fde3f08a8260a4cd415e72aa31501981ce2 Mon Sep 17 00:00:00 2001
From: insects <mail@liv.nrw>
Date: Wed, 5 Feb 2025 19:21:00 +0100
Subject: [PATCH] more small things

---
 src/data.rs      | 7 +------
 src/templates.rs | 8 ++------
 static/style.css | 4 ++++
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/data.rs b/src/data.rs
index bd7addd..a0d6552 100644
--- a/src/data.rs
+++ b/src/data.rs
@@ -122,7 +122,7 @@ impl<'a> CombinedFish<'a> {
         let now = clock::get_current_eorzea_date();
         let first_window = self.windows.first();
         self.is_up = if let Some(window) = first_window {
-            window.start_time < now && (window.start_time + window.duration) > now
+            (window.start_time < now) && ((window.start_time + window.duration) > now)
         } else {
             false
         };
@@ -380,11 +380,6 @@ impl<'a> CombinedFish<'a> {
                 idx_date += Duration::hours(8);
             }
         }
-
-        if self.meta.name_en == "The Drowned Sniper" {
-            dbg!(&results[1]);
-            dbg!(clock::to_earth_time(results[1].start_time));
-        }
         results
     }
 }
diff --git a/src/templates.rs b/src/templates.rs
index c71a963..24a5974 100644
--- a/src/templates.rs
+++ b/src/templates.rs
@@ -29,11 +29,7 @@ pub fn main_page(state: State<Arc<AppState>>) -> Markup {
             .cmp(&afish.is_up)
             .then(bfish.is_always_up.cmp(&afish.is_always_up))
             .then(bfish.rarity.total_cmp(&afish.rarity).reverse())
-        // if (afish.is_up || afish.is_always_up) && !(bfish.is_up && bfish.is_always_up) {
-        //     Ordering::Less
-        // } else {
-        //     Ordering::Greater
-        // }
+            .then(bfish.meta.name_en.cmp(&afish.meta.name_en))
     });
     layout(html! {
         h1 { "Hello! Current ET: " (clock::get_current_eorzea_date().format("%H:%M")) }
@@ -42,7 +38,7 @@ pub fn main_page(state: State<Arc<AppState>>) -> Markup {
                 .title {
                     h3 { (fish.meta.name_en) }
                     .subtitle {
-                        (fish.entry.patch)
+                        "Patch " (fish.entry.patch)
                     }
                 }
                 .meta {
diff --git a/static/style.css b/static/style.css
index 289f91c..40f2003 100644
--- a/static/style.css
+++ b/static/style.css
@@ -26,6 +26,10 @@ section {
     color: gray;
 }
 
+.meta {
+    align-self: center;
+}
+
 section.up {
     background-color: greenyellow;
 }