wip

Tietokilta · Jan 15, 2025 · 31c13a6 · 31c13a6
1 parent 06696a6
commit 31c13a6
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 10 deletions.
diff --git a/apps/cms/src/emails/helper-components.tsx b/apps/cms/src/emails/helper-components.tsx
@@ -13,6 +13,7 @@ import {
   IS_UNDERLINE,
 } from "./utils/lexical";
 import {
+  byDate,
   formatDate,
   insertSoftHyphens,
   lexicalNodeToTextContent,
@@ -305,7 +306,7 @@ export function Calendar({
         <div>
           <span>{t[locale]["this-week"]}:</span>
           <ul>
-            {eventsThisWeek.map((newsItem) => (
+            {eventsThisWeek.toSorted(byDate).map((newsItem) => (
               <li key={newsItem.id}>
                 {newsItem.date ? (
                   <span>{formatDate(newsItem.date)} </span>
@@ -320,7 +321,7 @@ export function Calendar({
         <div>
           <span>{t[locale]["next-week"]}:</span>
           <ul>
-            {eventsNextWeek.map((newsItem) => (
+            {eventsNextWeek.toSorted(byDate).map((newsItem) => (
               <li key={newsItem.id}>
                 {newsItem.date ? (
                   <span>{formatDate(newsItem.date)} </span>
@@ -335,7 +336,7 @@ export function Calendar({
         <div>
           <span>{t[locale]["this-week-signups"]}:</span>
           <ul>
-            {signupsThisWeek.map((newsItem) => (
+            {signupsThisWeek.toSorted(byDate).map((newsItem) => (
               <li key={newsItem.id}>
                 {newsItem.signupStartDate ? (
                   <span>{formatDate(newsItem.signupStartDate)}</span>

diff --git a/apps/cms/src/emails/newsletter.tsx b/apps/cms/src/emails/newsletter.tsx
@@ -4,7 +4,12 @@ import {
   type WeeklyNewsletter,
 } from "@tietokilta/cms-types/payload";
 import { type EditorState } from "@tietokilta/cms-types/lexical";
-import { formatDateYear, isThisWeek, type TocItem } from "./utils/utils";
+import {
+  formatDateYear,
+  isNextWeek,
+  isThisWeek,
+  type TocItem,
+} from "./utils/utils";
 import {
   Calendar,
   Greetings,
@@ -74,7 +79,7 @@ export const Newsletter = ({
     (newsItem) => newsItem.date && isThisWeek(newsItem.date),
   );
   const eventsNextWeek = allNewsItems.filter(
-    (newsItem) => newsItem.date && !isThisWeek(newsItem.date),
+    (newsItem) => newsItem.date && isNextWeek(newsItem.date),
   );
   const signupsThisWeek = allNewsItems.filter(
     (newsItem) =>

diff --git a/apps/cms/src/emails/utils/utils.ts b/apps/cms/src/emails/utils/utils.ts
@@ -189,3 +189,12 @@ export const isNextWeek = (date: string): boolean => {
 
   return currentWeek + 1 === eventWeek;
 };
+
+export const byDate = (
+  a: { date?: string | null },
+  b: { date?: string | null },
+): number => {
+  if (!a.date || !b.date) return 0;
+
+  return new Date(a.date).getTime() - new Date(b.date).getTime();
+};
diff --git a/apps/web/src/custom-pages/weekly-newsletter-page.tsx b/apps/web/src/custom-pages/weekly-newsletter-page.tsx
@@ -8,9 +8,11 @@ import {
 } from "../lib/api/weekly-newsletters";
 import { getCurrentLocale, getScopedI18n } from "../locales/server";
 import {
+  byDate,
   formatDate,
   formatDateYear,
   formatDateYearOptions,
+  isNextWeek,
   isThisWeek,
   stringToId,
   type TocItem,
@@ -101,7 +103,7 @@ async function Calendar({
         <div>
           <span>{t("this-week")}:</span>
           <ol className="not-prose ml-[4ch]">
-            {eventsThisWeek.map((newsItem) => (
+            {eventsThisWeek.toSorted(byDate).map((newsItem) => (
               <li key={newsItem.id}>
                 {newsItem.date ? (
                   <span>{formatDate(newsItem.date)} </span>
@@ -116,7 +118,7 @@ async function Calendar({
         <div>
           <span>{t("next-week")}:</span>
           <ol className="not-prose ml-[4ch]">
-            {eventsNextWeek.map((newsItem) => (
+            {eventsNextWeek.toSorted(byDate).map((newsItem) => (
               <li key={newsItem.id}>
                 {newsItem.date ? (
                   <span>{formatDate(newsItem.date)} </span>
@@ -131,7 +133,7 @@ async function Calendar({
         <div>
           <span>{t("this-week-signups")}:</span>
           <ol className="not-prose ml-[4ch]">
-            {signupsThisWeek.map((newsItem) => (
+            {signupsThisWeek.toSorted(byDate).map((newsItem) => (
               <li key={newsItem.id}>
                 {newsItem.signupStartDate ? (
                   <span>{formatDate(newsItem.signupStartDate)}</span>
@@ -200,7 +202,7 @@ export default async function Page({ slug }: { slug?: string }) {
     (newsItem) => newsItem.date && isThisWeek(newsItem.date),
   );
   const eventsNextWeek = allNewsItems.filter(
-    (newsItem) => newsItem.date && !isThisWeek(newsItem.date),
+    (newsItem) => newsItem.date && isNextWeek(newsItem.date),
   );
   const signupsThisWeek = allNewsItems.filter(
     (newsItem) =>
@@ -244,7 +246,7 @@ export default async function Page({ slug }: { slug?: string }) {
     >
       <div className="relative m-auto flex max-w-full flex-col gap-8 p-4 md:p-6">
         <TableOfContents toc={toc} />
-
+        <pre>{JSON.stringify(weeklyNewsletter, null, 2)}</pre>
         <div className="max-w-4xl space-y-4 md:my-8 md:space-y-8">
           <header className="space-y-2">
             <h1 className="font-mono text-4xl">{weeklyNewsletter.title}</h1>

diff --git a/apps/web/src/lib/utils.ts b/apps/web/src/lib/utils.ts
@@ -219,6 +219,15 @@ export const isNextWeek = (date: string): boolean => {
   return currentWeek + 1 === eventWeek;
 };
 
+export const byDate = (
+  a: { date?: string | null },
+  b: { date?: string | null },
+): number => {
+  if (!a.date || !b.date) return 0;
+
+  return new Date(a.date).getTime() - new Date(b.date).getTime();
+};
+
 export const getQuotasWithOpenAndQueue = (
   quotas: EventQuota[],
   openQuotaSize: number,