Separate posts by year

Author: nipafx

src/main/java/zone/nox/components/Components.java

@@ -26,14 +26,4 @@ public static PostContent postContent(Post post) {
 		return new PostContent(post);
 	}
 
-	private static final LocalDateTime FIRST_DAY_2024 = LocalDate.of(2024, 4, 24).atTime(0, 0);
-	private static final DateTimeFormatter ABSOLUTE_DATE = DateTimeFormatter.ofPattern("yyyy-MM-dd / HH:mm 'NTZ'");
-	private static final DateTimeFormatter TIME = DateTimeFormatter.ofPattern("HH:mm 'NTZ'");
-
-	public static String format(LocalDateTime dateTime) {
-		return dateTime.isBefore(FIRST_DAY_2024)
-				? ABSOLUTE_DATE.format(dateTime)
-				: "Day " + (dateTime.getDayOfMonth() - FIRST_DAY_2024.getDayOfMonth() + 1) + " / " + TIME.format(dateTime);
-	}
-
 }

src/main/java/zone/nox/components/PageHeader.java

@@ -14,7 +14,7 @@
 import static dev.nipafx.ginevra.html.HtmlElement.div;
 import static dev.nipafx.ginevra.html.HtmlElement.h1;
 import static dev.nipafx.ginevra.html.HtmlElement.p;
-import static zone.nox.components.Components.format;
+import static zone.nox.data.Neotropolis.format;
 
 public record PageHeader(String title, String summary, Optional<String> dateLine) implements Component {
 

src/main/java/zone/nox/components/PostBlock.java

@@ -11,7 +11,7 @@
 import static dev.nipafx.ginevra.html.HtmlElement.a;
 import static dev.nipafx.ginevra.html.HtmlElement.div;
 import static dev.nipafx.ginevra.html.HtmlElement.span;
-import static zone.nox.components.Components.format;
+import static zone.nox.data.Neotropolis.format;
 
 public record PostBlock(Post post) implements Component {
 

src/main/java/zone/nox/templates/LandingPage.java

@@ -12,15 +12,19 @@
 import zone.nox.data.Post;
 
 import java.util.List;
+import java.util.Map.Entry;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import static dev.nipafx.ginevra.html.HtmlElement.div;
+import static dev.nipafx.ginevra.html.HtmlElement.span;
 import static java.util.Comparator.comparing;
 import static zone.nox.components.Components.layout;
 import static zone.nox.components.Components.postBlock;
 
 public class LandingPage implements Template {
 
-	public record Style(Classes posts, Classes post, Css css) implements CssStyle { }
+	public record Style(Classes posts, Classes year, Classes post, Css css) implements CssStyle { }
 
 	@StyledWith
 	public static final Style STYLE = Css.parse(Style.class, """
@@ -32,6 +36,13 @@ public record Style(Classes posts, Classes post, Css css) implements CssStyle {
 				gap: var(--gap);
 			}
 
+			.year {
+				font-family: var(--alt-font), "sans-serif";
+				font-size: var(--font-size-small);
+				color: var(--yellow);
+				text-align: center;
+			}
+
 			.post {
 				width: 100%
 			}
@@ -43,18 +54,29 @@ public HtmlPage compose(@ForAllIn("posts") List<Post> posts) {
 	}
 
 	private Element composePage(List<Post> posts) {
+		var postsByYear = posts.stream().collect(Collectors.groupingBy(post -> post.date().getYear()));
 		return layout
 				.title("Radio Nox")
 				.description("News from the Shadows of Neotropolis.")
 				.content(div
 						.classes(STYLE.posts)
-						.children(posts.stream()
-								.sorted(comparing(Post::index).reversed())
-								.map(post -> div
-										.classes(STYLE.post)
-										.children(postBlock(post)))
+						.children(postsByYear
+								.entrySet().stream()
+								.sorted(Entry.<Integer, List<Post>> comparingByKey().reversed())
+								.flatMap(entry -> composeYearWithPosts(entry.getKey(), entry.getValue()))
 								.toList())
 				);
 	}
 
+	private Stream<Element> composeYearWithPosts(int year, List<Post> posts) {
+		return Stream.concat(
+				Stream.of(span.classes(STYLE.year).text("Y" + year)),
+				posts.stream()
+						.sorted(comparing(Post::index).reversed())
+						.map(post -> div
+								.classes(STYLE.post)
+								.children(postBlock(post)))
+		);
+	}
+
 }