Merge pull request #213 from isd-sgcu/main

add: poster to freshynight rules
isd-sgcu · Aug 3, 2024 · d48fd49 · d48fd49
2 parents cdba5cc + 82c0287
commit d48fd49
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 49 deletions.
diff --git a/public/rpkm/freshy-night/rules.png b/public/rpkm/freshy-night/rules.png
diff --git a/src/app/rpkm/freshy-night/rules/page.tsx b/src/app/rpkm/freshy-night/rules/page.tsx
@@ -1,30 +1,19 @@
 'use client';
 import modalStyles from '@/components/rpkm/Modal/ModalStyle';
 import Base from '@/components/rpkm/freshy-night/Base';
-import Card from '@/components/rpkm/freshy-night/rules/Card';
 import MIC from '@public/rpkm/freshy-night/mic.svg';
 import Image from 'next/image';
 import { cn } from '@/lib/utils';
 import Link from 'next/link';
-interface RulesData {
-  imgUrl?: string;
-  description?: string;
-}
-const setOfRules: RulesData[] = [
-  { description: 'description' },
-  { imgUrl: '', description: 'description' },
-  { imgUrl: '', description: 'description' },
-  { imgUrl: '', description: 'description' },
-  { imgUrl: '', description: 'description' },
-  { imgUrl: '', description: 'description' },
-];
+import RULES from '@public/rpkm/freshy-night/rules.png';
+
 export default function Rules() {
   const { button } = modalStyles['red'];
 
   return (
     <div className="min-h-screen w-full grid place-items-center relative">
       <Base
-        className="p-[10%] h-[calc(50vw*(801/371))] gap-6"
+        className="py-[10%] h-[calc(50vw*(801/371))] gap-10"
         withBus={true}
       >
         <section className="drop-shadow-lg relative font-sopha text-stroke text-stroke-rpkm-blue -mt-12 -ml-8">
@@ -41,17 +30,17 @@ export default function Rules() {
             ภายในงาน
           </span>
         </section>
-
-        <div className="grid grid-cols-3 grid-rows-2 place-items-center w-full h-full gap-4">
-          {setOfRules.map((e: RulesData, i: number) => (
-            <Card
-              imgUrl={e.imgUrl}
-              description={e.description}
-              num={i + 1}
-              key={i}
-            />
-          ))}
-        </div>
+        <main className="h-full w-full rounded-xl">
+          <Image
+            src={RULES}
+            alt="poster"
+            width={0}
+            height={0}
+            layout="responsive"
+            objectFit="contain"
+            className="rounded-xl"
+          />
+        </main>
 
         <Link
           href="/rpkm/freshy-night/confirm-register"

diff --git a/src/components/rpkm/freshy-night/Base.tsx b/src/components/rpkm/freshy-night/Base.tsx
@@ -17,7 +17,7 @@ export default function Base(props: BaseProps) {
     <>
       <div
         className={cn(
-          'bg-[#FFFEF7E5] flex flex-col items-center w-[85%] min-h-[calc(70vw*(801/371))] my-[5%] p-[10%] mx-auto [clip-path:polygon(1rem_0,calc(100%-1rem)_0,100%_1rem,100%_calc(100%-1rem),calc(100%-1rem)_100%,1rem_100%,0_calc(100%-1rem),0_1rem)]',
+          'bg-[#FFFEF7E5] flex flex-col items-center w-[85%] min-h-[calc(70vw*(801/371))] my-[5%] p-[5%] mx-auto [clip-path:polygon(1rem_0,calc(100%-1rem)_0,100%_1rem,100%_calc(100%-1rem),calc(100%-1rem)_100%,1rem_100%,0_calc(100%-1rem),0_1rem)]',
           className
         )}
       >

diff --git a/src/components/rpkm/freshy-night/rules/Card.tsx b/src/components/rpkm/freshy-night/rules/Card.tsx