From 828cba41bd87a6535ee7c64ac7b98fb475a8dffb Mon Sep 17 00:00:00 2001
From: Ivan Kuzmenko <6745157+rndtrash@users.noreply.github.com>
Date: Sun, 16 Nov 2025 11:31:13 +0300
Subject: [PATCH] =?UTF-8?q?=D0=90=D0=BA=D1=82=D1=83=D0=B0=D0=BB=D1=8C?=
 =?UTF-8?q?=D0=BD=D1=8B=D0=B5=20=D1=81=D0=BE=D0=B1=D1=8B=D1=82=D0=B8=D1=8F?=
 =?UTF-8?q?=20=D0=B2=D1=8B=D1=81=D1=82=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D1=8B?=
 =?UTF-8?q?=20=D0=B2=D0=BF=D0=B5=D1=80=D1=91=D0=B4=20=D1=81=D0=BF=D0=B8?=
 =?UTF-8?q?=D1=81=D0=BA=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/lib/components/BlogCard.svelte |  2 +-
 src/lib/util/Blogs.ts              |  3 +--
 src/routes/+page.svelte            | 23 +++++++++++++++----
 src/routes/blog/+page.server.ts    |  2 +-
 src/routes/blog/+page.svelte       | 37 ++++++++++++++++++++++++++----
 5 files changed, 55 insertions(+), 12 deletions(-)

diff --git a/src/lib/components/BlogCard.svelte b/src/lib/components/BlogCard.svelte
index 25bf97d..aa704c9 100644
--- a/src/lib/components/BlogCard.svelte
+++ b/src/lib/components/BlogCard.svelte
@@ -22,7 +22,7 @@
 		post,
 		size = BlogCardSize.Both,
 		fullHeight = false
-	}: { post: App.BlogPost; size: BlogCardSize; fullHeight: boolean } = $props();
+	}: { post: App.BlogPost; size?: BlogCardSize; fullHeight?: boolean } = $props();
 
 	const type: App.BlogPostType = post.type ?? 'article';
 	let isPostNew = $state(false);
diff --git a/src/lib/util/Blogs.ts b/src/lib/util/Blogs.ts
index 3b193dc..223ca87 100644
--- a/src/lib/util/Blogs.ts
+++ b/src/lib/util/Blogs.ts
@@ -31,6 +31,7 @@ export function postEventStatus(post: App.BlogPost): EventStatus {
 export type PostComparer = (a: App.BlogPost, b: App.BlogPost) => number;
 
 export const sortPostsByPostDate: PostComparer = (a, b) => new Date(b.date!).valueOf() - new Date(a.date!).valueOf();
+export const sortPostsByPostAndUpdateDate: PostComparer = (a, b) => laterDate(b.date!, b.dateChanged) - laterDate(a.date!, a.dateChanged);
 
 function laterDate(a: string, ...dates: (string | undefined)[]): number {
 	const dateA = new Date(a).valueOf();
@@ -45,8 +46,6 @@ function laterDate(a: string, ...dates: (string | undefined)[]): number {
 	return max;
 }
 
-export const sortPostsByPostAndUpdateDate: PostComparer = (a, b) => laterDate(b.date!, b.dateChanged) - laterDate(a.date!, a.dateChanged);
-
 export async function fetchPostsSorted(postComparer?: PostComparer) {
 	const allPosts = await fetchPosts();
 
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index e617887..f6024d4 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -1,11 +1,24 @@
 <script lang="ts">
 	import SocialButton from '$lib/components/SocialButton.svelte';
 	import { PUBLIC_TS_DISCORD, PUBLIC_TS_TELEGRAM } from '$env/static/public';
-	import BlogCard, { BlogCardSize } from '$src/lib/components/BlogCard.svelte';
+	import BlogCard, { BlogCardSize } from '$lib/components/BlogCard.svelte';
 	import { page } from '$app/state';
 	import type { PageData } from './$types';
+	import { onMount } from 'svelte';
+	import { postIsEventOfInterest } from '$lib/util/Blogs';
 
-	export let data: PageData;
+	let { data }: { data: PageData } = $props();
+
+	// postIsEventOfInterest(b) ? b.dateEventTo : undefined
+	let posts: App.BlogPost[] = $state(page.data.posts);
+	onMount(() => {
+		const dateToNum = (d: string) => new Date(d).valueOf();
+		posts = posts.sort(
+			(a, b) =>
+				dateToNum(postIsEventOfInterest(b) ? b.dateEventTo! : b.date!) -
+				dateToNum(postIsEventOfInterest(a) ? a.dateEventTo! : a.date!)
+		);
+	});
 </script>
 
 <svelte:head>
@@ -88,9 +101,11 @@
 	<h1 class="font-disket text-center text-2xl font-bold sm:text-4xl">ПОСЛЕДНИЕ ПОСТЫ</h1>
 
 	<div class="flex flex-row items-stretch justify-evenly gap-4 overflow-x-auto p-4">
-		{#each page.data.posts as post, i}
+		{#each posts as post, i}
 			<div class="aspect-3/2 w-80 shrink-0">
-				<BlogCard {post} size={BlogCardSize.Short} fullHeight />
+				{#key post}
+					<BlogCard {post} size={BlogCardSize.Short} fullHeight />
+				{/key}
 			</div>
 		{/each}
 	</div>
diff --git a/src/routes/blog/+page.server.ts b/src/routes/blog/+page.server.ts
index c5653b5..916e748 100644
--- a/src/routes/blog/+page.server.ts
+++ b/src/routes/blog/+page.server.ts
@@ -1,4 +1,4 @@
-import { fetchPostsSorted } from "$src/lib/util/Blogs";
+import { fetchPostsSorted } from "$lib/util/Blogs";
 
 export async function load() {
     return { title: "Блог", description: "Новости и заметки проектов Tea Sanctuary", posts: await fetchPostsSorted() };
diff --git a/src/routes/blog/+page.svelte b/src/routes/blog/+page.svelte
index da243da..3eed89a 100644
--- a/src/routes/blog/+page.svelte
+++ b/src/routes/blog/+page.svelte
@@ -1,8 +1,10 @@
 <script lang="ts">
 	import { page } from '$app/state';
-	import SocialHyperlink from '$src/lib/components/SocialHyperlink.svelte';
-	import InfoBlock from '$src/lib/components/InfoBlock.svelte';
-	import BlogCard from '$src/lib/components/BlogCard.svelte';
+	import SocialHyperlink from '$lib/components/SocialHyperlink.svelte';
+	import InfoBlock from '$lib/components/InfoBlock.svelte';
+	import BlogCard, { BlogCardSize } from '$lib/components/BlogCard.svelte';
+	import { postIsEventOfInterest, type PostComparer } from '$lib/util/Blogs';
+	import { onMount } from 'svelte';
 
 	function groupPostsByMonthYear(posts: App.BlogPost[]) {
 		const groupedPosts = new Map<string, App.BlogPost[]>();
@@ -19,7 +21,20 @@
 		return groupedPosts;
 	}
 
+	function getEventsOfInterest(posts: App.BlogPost[]) {
+		// Сортировка в обратном порядке - чем ближе к завершению, тем раньше в списке
+		const sortPostsByEvent: PostComparer = (a, b) =>
+			new Date(a.dateEventTo!).valueOf() - new Date(b.dateEventTo!).valueOf();
+
+		return posts.filter((a) => postIsEventOfInterest(a)).sort(sortPostsByEvent);
+	}
+
 	const groupedPosts = groupPostsByMonthYear(page.data.posts);
+	let eventPosts: App.BlogPost[] = $state([]);
+
+	onMount(() => {
+		eventPosts = getEventsOfInterest(page.data.posts);
+	});
 </script>
 
 <section class="hero flex shrink-0 flex-col items-center justify-center gap-5 overflow-hidden p-4">
@@ -39,6 +54,20 @@
 	пропускать новые посты!
 </InfoBlock>
 
+{#if !!eventPosts && eventPosts.length > 0}
+	<section class="flex flex-col items-stretch bg-amber-50 pt-4">
+		<h1 class="font-disket text-center text-2xl font-bold sm:text-4xl">АКТУАЛЬНЫЕ СОБЫТИЯ</h1>
+
+		<div class="flex flex-row items-stretch justify-evenly gap-4 overflow-x-auto p-4">
+			{#each eventPosts as post, i}
+				<div class="aspect-3/2 w-80 shrink-0">
+					<BlogCard {post} size={BlogCardSize.Short} fullHeight />
+				</div>
+			{/each}
+		</div>
+	</section>
+{/if}
+
 <section class="flex flex-col items-stretch p-2 pb-8 md:p-4">
 	{#each groupedPosts.entries() as [monthYear, postsInMonthYear]}
 		<h1
@@ -52,4 +81,4 @@
 			{/each}
 		</div>
 	{/each}
-</section>
\ No newline at end of file
+</section>