Merge remote-tracking branch 'origin/develop'

Author: Manuel Schächinger

app/components/organisms/Header.tsx

@@ -16,7 +16,7 @@ const Header = ({ className }: Props) => {
 
   return (
     <header className="sticky top-0 pt-2 md:pt-4 z-30 mx-1 sm:mx-4 md:mx-10 lg:mx-1">
-      <div className={clsx('blurred-container w-full mx-auto flex flex-wrap justify-between px-4 sm:px-6 md:px-10 lg:px-4 py-2', className)}>
+      <div className={clsx('blurred-container w-full mx-auto flex flex-wrap justify-between px-[11px] sm:px-[23px] md:px-[39px] lg:px-3 py-2', className)}>
         <div className="flex flex-shrink-0 flex-grow items-center">
           <Link href="/" className="hidden sm:block">
             <Image

app/components/organisms/NowList.tsx

@@ -2,13 +2,21 @@ import { getLocale } from 'next-intl/server';
 
 import { loadNow } from '@lib/contentful';
 import { type LocaleCode } from '@lib/router';
-import BulletList from '../atoms/BulletList';
 
 const NowList = async () => {
   const locale = await getLocale() as LocaleCode;
   const activities = await loadNow(locale) || [];
 
-  return <BulletList bullets={activities} />;
+  return (
+    <div className="grid sm:grid-cols-2 gap-4">
+      {activities.map((activity, i) => (
+        <div key={i} className="mb-4">
+          <h2 className="text-h2">{activity.category}</h2>
+          <p className="mt-2">{activity.description}</p>
+        </div>
+      ))}
+    </div>
+  );
 };
 
 export default NowList;

app/lib/contentful.ts

@@ -47,7 +47,7 @@ type CompanyEntrySkeleton = {
 type NowEntrySkeleton = {
   contentTypeId: 'now',
   fields: {
-    activities: EntryFieldTypes.Object,
+    tasks: EntryFieldTypes.Object,
   },
 };
 
@@ -250,7 +250,7 @@ export const loadNow = async (locale?: LocaleCode) => {
       locale: getLocale(locale),
     })
       .then(getEntryFields<NowData>)
-      .then((now) => now[0].activities)
+      .then((now) => now[0].tasks)
       .catch(() => [])
   ))();
 };

app/models/now.ts

@@ -1,3 +1,3 @@
 export type NowData = {
-  activities: string[];
+  tasks: { category: string; description: string; }[];
 };