diff --git a/src/app_modules/colab/component/card_view/card_section_data.tsx b/src/app_modules/colab/component/card_view/card_section_data.tsx index 66255d8e..af12bdec 100644 --- a/src/app_modules/colab/component/card_view/card_section_data.tsx +++ b/src/app_modules/colab/component/card_view/card_section_data.tsx @@ -6,6 +6,8 @@ import { useRouter } from "next/navigation"; import { MODEL_COLLABORATION } from "../../model/interface"; import { useState } from "react"; import { ComponentGlobal_CardLoadingOverlay } from "@/app_modules/_global/component"; +import { Component_V3_GridDetailData } from "@/app_modules/_global/component/new/comp_V3_grid_detail_data"; +import { MainColor } from "@/app_modules/_global/color"; export default function ComponentColab_CardSectionData({ colabId, @@ -19,10 +21,25 @@ export default function ComponentColab_CardSectionData({ const router = useRouter(); const [visible, setVisible] = useState(false); + const listData = [ + { + title: "Industri", + value: data?.ProjectCollaborationMaster_Industri.name + ? data.ProjectCollaborationMaster_Industri.name + : "Industri", + }, + { + title: "Lokasi", + value: data?.lokasi ? data.lokasi : "-", + }, + ]; + return ( <> { if (path) { setVisible(true); @@ -37,51 +54,10 @@ export default function ComponentColab_CardSectionData({ {data?.title ? data.title : "Judul Proyek"} - - - - - Industri - - - - : - - - - {data?.ProjectCollaborationMaster_Industri.name - ? data?.ProjectCollaborationMaster_Industri?.name - : "Industri"} - - - - - - - - Lokasi - - - - : - - - - {data?.lokasi ? data?.lokasi : "Lokasi dari proyek"} - - - - - - - Tujuan proyek - - - {data?.purpose - ? data?.purpose - : "Lorem ipsum dolor sit amet, consectetur adipisicing elit. Maiores odio nihil in animi expedita, suscipit excepturi pariatur totam esse officiis enim cumque. Quidem, facere aliquam. Sunt laboriosam incidunt iste amet"} - - + + {listData.map((e, i) => ( + + ))} {visible && } diff --git a/src/app_modules/colab/component/card_view/card_section_jumlah_partisipan.tsx b/src/app_modules/colab/component/card_view/card_section_jumlah_partisipan.tsx index 9c241cc7..48a209a8 100644 --- a/src/app_modules/colab/component/card_view/card_section_jumlah_partisipan.tsx +++ b/src/app_modules/colab/component/card_view/card_section_jumlah_partisipan.tsx @@ -12,7 +12,7 @@ export default function ComponentColab_JumlahPartisipan({ <> - + {/* */}
diff --git a/src/app_modules/colab/component/detail/detail_data.tsx b/src/app_modules/colab/component/detail/detail_data.tsx index e2f2f12a..89a57ce6 100644 --- a/src/app_modules/colab/component/detail/detail_data.tsx +++ b/src/app_modules/colab/component/detail/detail_data.tsx @@ -3,31 +3,60 @@ import { Stack, Box, Center, Title, Grid, Text } from "@mantine/core"; import ComponentColab_AuthorNameOnHeader from "../header_author_name"; import { MODEL_COLLABORATION } from "../../model/interface"; +import { Comp_V3_SetInnerHTML } from "@/app_modules/_global/component/new/comp_V3_set_html_with_stiker"; +import { Component_V3_GridDetailData } from "@/app_modules/_global/component/new/comp_V3_grid_detail_data"; export default function ComponentColab_DetailData({ data, }: { data?: MODEL_COLLABORATION; }) { + + const listData = [ + { + title: "Industri", + value: data?.ProjectCollaborationMaster_Industri.name + ? data.ProjectCollaborationMaster_Industri.name + : "Industri", + }, + { + title: "Lokasi", + value: data?.lokasi ? data.lokasi : "-", + }, + { + title: "Tujuan Proyek", + value: , + }, + { + title: "Keuntungan Proyek", + value: , + }, + ]; + + return ( <> - - -
- {data?.title ? data.title : "Judul Proyek"} -
- + +
+ {data?.title ? data.title : "Judul Proyek"} +
+ + + {listData.map((e, i) => ( + + ))} + + + {/* - - Industri - + Industri - : + : - + {data?.ProjectCollaborationMaster_Industri.name ? data.ProjectCollaborationMaster_Industri.name : "Industri"} @@ -37,35 +66,32 @@ export default function ComponentColab_DetailData({ - - Lokasi - + Lokasi - : + : - + {data?.lokasi ? data.lokasi : " Lokasi dari proyek"} - - Tujuan proyek - - {data?.purpose ? data?.purpose : "-"} + Tujuan proyek + - - Keuntungan - - {data?.benefit ? data?.benefit : "-"} + Keuntungan + - -
-
+
*/} + ); } diff --git a/src/app_modules/colab/create/index.tsx b/src/app_modules/colab/create/index.tsx index 6d71cfe4..b43f9e11 100644 --- a/src/app_modules/colab/create/index.tsx +++ b/src/app_modules/colab/create/index.tsx @@ -2,12 +2,16 @@ import { MainColor } from "@/app_modules/_global/color/color_pallet"; import ComponentGlobal_InputCountDown from "@/app_modules/_global/component/input_countdown"; +import Component_V3_Label_TextInput from "@/app_modules/_global/component/new/comp_V3_label_text_input"; +import { Component_V3_TextEditor } from "@/app_modules/_global/component/new/comp_V3_text_editor"; +import { funReplaceHtml } from "@/app_modules/_global/fun/fun_replace_html"; +import { maxInputLength } from "@/app_modules/_global/lib/maximal_setting"; import { ComponentGlobal_NotifikasiBerhasil } from "@/app_modules/_global/notif_global/notifikasi_berhasil"; import { ComponentGlobal_NotifikasiGagal } from "@/app_modules/_global/notif_global/notifikasi_gagal"; import { ComponentGlobal_NotifikasiPeringatan } from "@/app_modules/_global/notif_global/notifikasi_peringatan"; import { clientLogger } from "@/util/clientLogger"; import mqtt_client from "@/util/mqtt_client"; -import { Button, Select, Stack, TextInput, Textarea } from "@mantine/core"; +import { Button, Select, Stack, TextInput } from "@mantine/core"; import { useShallowEffect } from "@mantine/hooks"; import { useRouter } from "next/navigation"; import { useState } from "react"; @@ -16,14 +20,21 @@ import { apiGetMasterCollaboration } from "../component/lib/api_collaboration"; import colab_funCreateProyek from "../fun/create/fun_create_proyek"; import { MODEL_COLLABORATION_MASTER } from "../model/interface"; +interface IValue { + title: string; + lokasi: string; + purpose: string; + benefit: string; + projectCollaborationMaster_IndustriId: number; +} + export default function Colab_Create() { - const [value, setValue] = useState({ + const [value, setValue] = useState({ title: "", lokasi: "", purpose: "", benefit: "", projectCollaborationMaster_IndustriId: 0, - // jumlah_partisipan: 0, }); const [listIndustri, setListIndustri] = useState< @@ -55,7 +66,7 @@ export default function Colab_Create() { return ( <> - + + + + { + setValue({ + ...value, + purpose: val, + }); + }} + /> + + + + + + + + { + setValue({ + ...value, + benefit: val, + }); + }} + /> + + + + + {/*