Skip to content

Commit

Permalink
Merge pull request #106 from mokletdev/staging
Browse files Browse the repository at this point in the history
fix(frontend): timeline alignment
  • Loading branch information
teguhbayu committed May 22, 2024
2 parents 9623b62 + 7471d22 commit ad9b751
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 22 deletions.
40 changes: 21 additions & 19 deletions src/app/(main)/components/Timeline.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,10 @@ function TimelineItem({
<span className="text-white font-bold">{title}</span>
</div>
<div className="flex flex-col items-center gap-1 w-full">
<span className="text-black font-bold">{dateString}</span>
<span className="text-[#858585] text-sm">{description}</span>
<span className="text-black font-bold text-center">{dateString}</span>
<span className="text-[#858585] text-sm text-center">
{description}
</span>
</div>
</div>
);
Expand Down Expand Up @@ -69,29 +71,29 @@ export default function Timeline() {
</div>
</div>
<div className="xl:flex items-center justify-between hidden">
<TimelineItem
title="Pendaftaran Peserta"
dateString="20 Mei 2024 - 7 September 2024"
description="pendaftaran melalui website antareja.smktelkom-mlg.sch.id"
/>
<TimelineItem
title="Pendaftaran Peserta"
dateString="20 Mei - 7 September 2024"
description="pendaftaran melalui website antareja.smktelkom-mlg.sch.id"
/>
<TimelineLine />
<TimelineItem
title="Technical Meeting"
dateString="Sabtu, 7 September 2024"
description="dilaksanakan di SMK Telkom Malang"
/>
title="Technical Meeting"
dateString="Sabtu, 7 September 2024"
description="dilaksanakan di SMK Telkom Malang"
/>
<TimelineLine />
<TimelineItem
title="Uji Coba Lapangan"
dateString="Jumat, 11 Oktober 2024"
description="15.00 - 18.00 WIB (Malang) 19.00 - 22.30 WIB (Luar Malang)"
/>
title="Uji Coba Lapangan"
dateString="Jumat, 11 Oktober 2024"
description="15.00 - 18.00 WIB (Malang) 19.00 - 22.30 WIB (Luar Malang)"
/>
<TimelineLine />
<TimelineItem
title="Pelaksanaan Lomba"
dateString="Sabtu, 12 Oktober 2024"
description="06.00 WIB - selesai di SMK Telkom Malang"
/>
title="Pelaksanaan Lomba"
dateString="Sabtu, 12 Oktober 2024"
description="06.00 WIB - selesai di SMK Telkom Malang"
/>
</div>
<Image
src={"/image/timelinelogo.png"}
Expand Down
4 changes: 2 additions & 2 deletions src/app/(main)/components/Video.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export default function Video() {
</P>
</div>
<PrimaryLinkButton
href="https://drive.google.com/file/d/1-0pe9_fMHKv-33Dp0mKNF55OF1j6ptcz/view?usp=drivesdk"
href="https://drive.google.com/file/d/1KqoEFRavgL_KlhoKUBbgX-GpRBpEdQ6B/view?usp=drive_link"
className="inline-flex gap-2 items-center mb-[40px]"
>
Unduh buku panduan <FaDownload />
Expand Down Expand Up @@ -91,7 +91,7 @@ export default function Video() {
</P>
</div>
<PrimaryLinkButton
href="https://drive.google.com/file/d/1-0pe9_fMHKv-33Dp0mKNF55OF1j6ptcz/view?usp=drivesdk"
href="https://drive.google.com/file/d/1KqoEFRavgL_KlhoKUBbgX-GpRBpEdQ6B/view?usp=drive_link"
className="inline-flex gap-2 items-center mb-[40px]"
>
Unduh buku panduan <FaDownload />
Expand Down
2 changes: 1 addition & 1 deletion src/app/(main)/dashboard/components/Heading.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export default async function Heading() {
<div className="flex items-center justify-between w-full mb-3">
<H2 className="mb-2">Selamat Datang, {session?.user?.nama}👋</H2>
<PrimaryLinkButton
href="https://drive.google.com/file/d/1-0pe9_fMHKv-33Dp0mKNF55OF1j6ptcz/view?usp=drivesdk"
href="https://drive.google.com/file/d/1KqoEFRavgL_KlhoKUBbgX-GpRBpEdQ6B/view?usp=drive_link"
className="inline-flex gap-2 items-center"
>
Unduh buku panduan <FaDownload />
Expand Down

0 comments on commit ad9b751

Please sign in to comment.