Merge branch 'main' into release

Author: SatooRu65536

app/_component/sections/notice/Announce.tsx

@@ -1,40 +1,53 @@
+import ImageSection from '../Image';
 import NoticeCard from './Card';
 import { getNotices } from '@/components/loadFiles';
 import { css } from '@/styled-system/css';
 
-export default function Notice() {
+interface Props {
+  img: string;
+}
+
+export default function Notice({ img }: Props) {
   const notices = getNotices();
   // ビルド時点での期限が過ぎたお知らせは表示しないï
   const displayNotices = notices.filter(
     (n) => n.deadline.getTime() > Date.now(),
   );
 
+  if (displayNotices.length === 0) {
+    return null;
+  }
+
   return (
-    <section
-      className={css({
-        padding: '50px 0',
-        textAlign: 'center',
-      })}
-    >
-      <h2
+    <>
+      <section
         className={css({
-          paddingBottom: '30px',
-          fontSize: '2rem',
+          padding: '50px 0',
+          textAlign: 'center',
         })}
       >
-        お知らせ
-      </h2>
+        <h2
+          className={css({
+            paddingBottom: '30px',
+            fontSize: '2rem',
+          })}
+        >
+          お知らせ
+        </h2>
 
-      <div
-        className={css({
-          marginInline: 'auto',
-          maxWidth: '800px',
-        })}
-      >
-        {displayNotices.map((notice) => (
-          <NoticeCard key={notice.id} notice={notice} />
-        ))}
-      </div>
-    </section>
+        <div
+          className={css({
+            marginInline: 'auto',
+            maxWidth: '800px',
+          })}
+        >
+          {displayNotices.map((notice) => (
+            <NoticeCard key={notice.id} notice={notice} />
+          ))}
+        </div>
+      </section>
+
+      <ImageSection img={img} />
+    </>
   );
 }

app/page.tsx

@@ -20,8 +20,7 @@ export default function Home() {
   return (
     <main>
       <TopSection message={mdContents[0]} images={[hero, ...others]} />
-      <Notice />
-      <ImageSection img={imagepathes[0].path} />
+      <Notice img={imagepathes[0].path} />
       <RecentPosts posts={posts} />
       {mdContents.splice(1).map((content, index) => {
         return (