diff --git a/src/app/api/division/[id]/detail/route.ts b/src/app/api/division/[id]/detail/route.ts
index 325e00f..74e34a7 100644
--- a/src/app/api/division/[id]/detail/route.ts
+++ b/src/app/api/division/[id]/detail/route.ts
@@ -142,7 +142,7 @@ export async function GET(request: Request, context: { params: { id: string } })
allData = diskusi.map((v: any) => ({
..._.omit(v, ["createdAt", "User"]),
- date: moment(v.dateStart).format("LL"),
+ date: moment(v.dateStart).format("ll"),
user: v.User.name
}))
}
diff --git a/src/app/api/home/route.ts b/src/app/api/home/route.ts
index a22962e..937fb7c 100644
--- a/src/app/api/home/route.ts
+++ b/src/app/api/home/route.ts
@@ -336,7 +336,7 @@ export async function GET(request: Request) {
allData = data.map((v: any) => ({
..._.omit(v, ["createdAt", "User"]),
- date: moment(v.dateStart).format("LL"),
+ date: moment(v.dateStart).format("ll"),
user: v.User.name
}))
}
diff --git a/src/module/division_new/ui/list_discussion.tsx b/src/module/division_new/ui/list_discussion.tsx
index f470fe4..f7562f9 100644
--- a/src/module/division_new/ui/list_discussion.tsx
+++ b/src/module/division_new/ui/list_discussion.tsx
@@ -1,6 +1,6 @@
"use client"
import { WARNA } from "@/module/_global";
-import { Box, Group, Skeleton, Stack, Text } from "@mantine/core";
+import { Box, Grid, Group, Skeleton, Stack, Text } from "@mantine/core";
import { useShallowEffect } from "@mantine/hooks";
import { useParams, useRouter } from "next/navigation";
import { useState } from "react";
@@ -50,7 +50,7 @@ export default function ListDiscussionOnDetailDivision() {
style={{
borderRadius: 10,
border: `1px solid ${"#D6D8F6"}`,
- padding: 20,
+ padding: 10,
}}
>
@@ -76,35 +76,52 @@ export default function ListDiscussionOnDetailDivision() {
}
{data.map((v, i) => {
return (
- router.push(`${param.id}/discussion/${v.id}`)}
- >
-
-
-
-
- {v.desc}
-
-
-
-
-
-
- {v.user}
+
+ router.push(`${param.id}/discussion/${v.id}`)}
+ >
+
+
+
+
+ {v.desc}
+
+
-
-
- {v.date}
-
-
+
+
+
+
+
+
+ {v.user}
+
+
+
+
+
+
+
+ {v.date}
+
+
+
+
+
);
})}
diff --git a/src/module/home/ui/list_discussion.tsx b/src/module/home/ui/list_discussion.tsx
index 6c3697f..103904f 100644
--- a/src/module/home/ui/list_discussion.tsx
+++ b/src/module/home/ui/list_discussion.tsx
@@ -1,6 +1,6 @@
'use client'
import { WARNA } from "@/module/_global";
-import { Box, Group, Skeleton, Text } from "@mantine/core";
+import { Box, Grid, Group, SimpleGrid, Skeleton, Text } from "@mantine/core";
import { GoDiscussionClosed } from "react-icons/go";
import { CiClock2, CiUser } from "react-icons/ci";
import { useRouter } from "next/navigation";
@@ -48,7 +48,7 @@ export default function ListDiscussion() {
{
@@ -71,11 +71,12 @@ export default function ListDiscussion() {
{
isData.map((v, i) => {
return (
-
+ router.push(`/division/${v.idDivision}/discussion/${v.id}`)}>
+ }} onClick={() => router.push(`/division/${v.idDivision}/discussion/${v.id}`)}>
@@ -84,16 +85,34 @@ export default function ListDiscussion() {
-
-
-
- {v.user}
-
-
-
- {v.date}
-
-
+
+
+
+
+
+
+ {v.user}
+
+
+
+
+
+
+
+ {v.date}
+
+
+
+
)
})
diff --git a/src/module/home/ui/list_event.tsx b/src/module/home/ui/list_event.tsx
index 486df6f..d4431b9 100644
--- a/src/module/home/ui/list_event.tsx
+++ b/src/module/home/ui/list_event.tsx
@@ -1,6 +1,6 @@
'use client'
import { WARNA } from "@/module/_global"
-import { Box, Divider, Group, Skeleton, Text } from "@mantine/core"
+import { Box, Divider, Flex, Group, Skeleton, Text } from "@mantine/core"
import { useRouter } from "next/navigation"
import { useState } from "react"
import { IDataHomeEvent } from "../lib/type_home"
@@ -68,16 +68,30 @@ export default function ListEventHome() {
const colorDivider = ['#535FCA', '#A7A7A7'][index % 2]
return (
- router.push(`/division/${event.idDivision}/calender/${event.id}`)} bg={bgColor} pl={15} p={10} style={{
+ router.push(`/division/${event.idDivision}/calender/${event.id}`)} bg={bgColor} pl={15} p={10} style={{
borderRadius: 10
}} h={113}>
-
+
{event.timeStart} - {event.timeEnd}
- {event.title}
- Dibuat oleh : {event.user_name}
-
+
+
+ {_.startCase(event.title)}
+
+
+
+
+ Dibuat oleh : {event.user_name}
+
+
+
diff --git a/src/module/user/profile/ui/profile.tsx b/src/module/user/profile/ui/profile.tsx
index 330192e..1518261 100644
--- a/src/module/user/profile/ui/profile.tsx
+++ b/src/module/user/profile/ui/profile.tsx
@@ -1,6 +1,6 @@
"use client"
import { LayoutIconBack, LayoutNavbarHome, SkeletonDetailProfile, WARNA } from "@/module/_global";
-import { ActionIcon, Anchor, Avatar, Box, Button, Flex, Group, Skeleton, Stack, Text } from "@mantine/core";
+import { ActionIcon, Anchor, Avatar, Box, Button, Flex, Grid, Group, SimpleGrid, Skeleton, Stack, Text } from "@mantine/core";
import { HiUser } from "react-icons/hi2";
import { RiIdCardFill } from "react-icons/ri";
import { FaSquarePhone } from "react-icons/fa6";
@@ -61,7 +61,7 @@ export default function Profile() {
-
+
{ setOpenModal(true) }} variant="light" bg={WARNA.bgIcon} size="lg" radius="lg" aria-label="Info">
@@ -72,7 +72,7 @@ export default function Profile() {
gap="xs"
>
@@ -90,43 +90,60 @@ export default function Profile() {
?
:
-
+
Informasi
- router.push(`/profile/edit/`)}>Edit
-
-
-
-
- NIK
+
+ router.push(`/profile/edit/`)}>Edit
- {isData?.nik}
-
-
-
- No Telepon
-
- +62{isData?.phone}
-
-
-
-
- Email
-
- {isData?.email}
-
-
-
-
- Jenis Kelamin
-
-
- {isData?.gender === 'M' ? 'Laki-laki' : isData?.gender === 'F' ? 'Perempuan' : ''}
-
-
-
-
+
+
+
+
+ NIK
+
+
+
+ {isData?.nik}
+
+
+
+
+
+
+ No Telpon
+
+
+
+ +62{isData?.phone}
+
+
+
+
+
+
+ Email
+
+
+
+ {isData?.email}
+
+
+
+
+
+
+ Jenis Kelamin
+
+
+
+
+ {isData?.gender === 'M' ? 'Laki-laki' : isData?.gender === 'F' ? 'Perempuan' : ''}
+
+
+
+
}
setOpenModal(false)}