Merge remote-tracking branch 'origin/main'

# Conflicts:
#	prisma/migrations/20241111152326_2024_11_11/migration.sql

src/features/layout/page.tsx

@@ -8,12 +8,9 @@ export const Page = ({children}: PropsWithChildren<{}>) => {
     );
 };
 
-export const PageHeader = ({children}: PropsWithChildren<{}>) => {
+export const PageHeader = twx.div((props)=>[
-    return (
+    cn(`flex justify-between`, props.className),
-        <div className="flex justify-between">{children}</div>
+])
-    );
-};
-
 
 export const PageTitle = twx.h1((props)=>[
     cn(`text-3xl font-bold mb-6`, props.className),
@@ -26,11 +23,9 @@ export const PageDescription = twx.h2((props)=>[
 ])
 
 
-export const PageActions = ({children}: PropsWithChildren<{}>) => {
+export const PageActions = twx.h1((props)=>[
-    return (
+    cn(`flex gap-4`, props.className),
-        <h1 className="flex gap-4">{children}</h1>
+])
-    );
-};
 
 
 export const PageContent = ({children}: PropsWithChildren<{}>) => {