diff --git a/coba.js b/coba.js deleted file mode 100644 index e69de29b..00000000 diff --git a/package.json b/package.json index 7162d8bd..a3147b4a 100644 --- a/package.json +++ b/package.json @@ -34,6 +34,7 @@ "next": "^13.5.4-canary.8", "postcss": "8.4.27", "react": "18.2.0", + "react-countdown": "^2.3.5", "react-dom": "18.2.0", "react-responsive-carousel": "^3.2.23", "react-simple-toasts": "^5.10.0", diff --git a/src/app/dev/investasi/create_berita/layout.tsx b/src/app/dev/investasi/create_berita/layout.tsx new file mode 100644 index 00000000..5c0b6fa2 --- /dev/null +++ b/src/app/dev/investasi/create_berita/layout.tsx @@ -0,0 +1,8 @@ +import { LayoutCreateBeritaInvestasi } from "@/app_modules/investasi"; +import React from "react"; + +export default async function Layout({children}: {children: React.ReactNode}) { + return<> + {children} + +} \ No newline at end of file diff --git a/src/app/dev/investasi/create_berita/page.tsx b/src/app/dev/investasi/create_berita/page.tsx new file mode 100644 index 00000000..71b43f93 --- /dev/null +++ b/src/app/dev/investasi/create_berita/page.tsx @@ -0,0 +1,8 @@ +import { CreateBeritaInvestasi } from "@/app_modules/investasi"; + +export default async function Page() { + return<> + + + +} \ No newline at end of file diff --git a/src/app/dev/investasi/dialog_page/create/layout.tsx b/src/app/dev/investasi/dialog_page/create/layout.tsx new file mode 100644 index 00000000..85568b94 --- /dev/null +++ b/src/app/dev/investasi/dialog_page/create/layout.tsx @@ -0,0 +1,16 @@ +import { LayoutDialogPageCreateInvestasi } from "@/app_modules/investasi"; +import React from "react"; + +export default async function Layout({ + children, +}: { + children: React.ReactNode; +}) { + return ( + <> + + {children} + + + ); +} diff --git a/src/app/dev/investasi/dialog_page/create/page.tsx b/src/app/dev/investasi/dialog_page/create/page.tsx new file mode 100644 index 00000000..df3fb522 --- /dev/null +++ b/src/app/dev/investasi/dialog_page/create/page.tsx @@ -0,0 +1,7 @@ +import { DialogPageCreateInvestasi } from "@/app_modules/investasi"; + +export default async function Page(){ + return<> + + +} \ No newline at end of file diff --git a/src/app/dev/investasi/dialog_page/layout.tsx b/src/app/dev/investasi/dialog_page/transaksi_saham/layout.tsx similarity index 100% rename from src/app/dev/investasi/dialog_page/layout.tsx rename to src/app/dev/investasi/dialog_page/transaksi_saham/layout.tsx diff --git a/src/app/dev/investasi/dialog_page/page.tsx b/src/app/dev/investasi/dialog_page/transaksi_saham/page.tsx similarity index 100% rename from src/app/dev/investasi/dialog_page/page.tsx rename to src/app/dev/investasi/dialog_page/transaksi_saham/page.tsx diff --git a/src/app/dev/investasi/list_edit_berita/[id]/layout.tsx b/src/app/dev/investasi/list_edit_berita/[id]/layout.tsx new file mode 100644 index 00000000..21aad071 --- /dev/null +++ b/src/app/dev/investasi/list_edit_berita/[id]/layout.tsx @@ -0,0 +1,14 @@ +import { LayoutListEditBeritaInvestasi } from "@/app_modules/investasi"; +import React from "react"; + +export default async function Layout({ + children, +}: { + children: React.ReactNode; +}) { + return ( + <> + {children} + + ); +} diff --git a/src/app/dev/investasi/list_edit_berita/[id]/page.tsx b/src/app/dev/investasi/list_edit_berita/[id]/page.tsx new file mode 100644 index 00000000..988cd671 --- /dev/null +++ b/src/app/dev/investasi/list_edit_berita/[id]/page.tsx @@ -0,0 +1,9 @@ +import { ListEditBeritaInvestasi } from "@/app_modules/investasi"; + +export default async function Page({params}: {params: {id: string}}) { + return ( + <> + + + ); +} diff --git a/src/app/lib/router_hipmi/router_investasi.ts b/src/app/lib/router_hipmi/router_investasi.ts index bf9d9953..eba60fb8 100644 --- a/src/app/lib/router_hipmi/router_investasi.ts +++ b/src/app/lib/router_hipmi/router_investasi.ts @@ -1,11 +1,12 @@ export const RouterInvestasi = { //INVESTASI transfer: "/dev/investasi/transfer", - dialog_page: "/dev/investasi/dialog_page", - status_transaksi: "/dev/investasi/status_transaksi", + dialog_transaksi: "/dev/investasi/dialog_page/transaksi_saham", + dialog_create: "/dev/investasi/dialog_page/create", // portofolio portofolio: "/dev/investasi/main/portofolio", // proses beli saham + status_transaksi: "/dev/investasi/status_transaksi", metode_transfer: "/dev/investasi/metode_transfer", // edit // edit_intro: "/dev/investasi/edit_intro/", @@ -13,9 +14,12 @@ export const RouterInvestasi = { edit_dokumen: "/dev/investasi/edit_dokumen/", edit_berita: "/dev/investasi/edit_berita/", // detail // - berita: "/dev/investasi/berita/", detail_saham_terbeli: "/dev/investasi/detail_saham_terbeli/", detail_prospektus: "/dev/investasi/detail_prospektus/", detail_dokumen: "/dev/investasi/detail_dokumen/", detail_berita: "/dev/investasi/detail_berita/", + // berita + berita: "/dev/investasi/berita/", + create_berita: "/dev/investasi/create_berita", + list_edit_berita: "/dev/investasi/list_edit_berita/" }; diff --git a/src/app_modules/admin/investasi/main/view.tsx b/src/app_modules/admin/investasi/main/view.tsx index 5b95586f..ad7c2d80 100644 --- a/src/app_modules/admin/investasi/main/view.tsx +++ b/src/app_modules/admin/investasi/main/view.tsx @@ -3,10 +3,12 @@ import { RouterAdminInvestasi } from "@/app/lib/router_hipmi/router_admin"; import { ActionIcon, + Badge, Box, Center, Grid, Paper, + ScrollArea, Stack, Table, Text, @@ -40,23 +42,43 @@ const listBox = [ const listTable = [ { id: 1, + status: { + id: 1, + name: "Publish", + }, name: "Subway Kuta", }, { id: 2, + status: { + id: 2, + name: "Menunggu Konfirmasi", + }, name: "Event MCD", }, { id: 3, + status: { + id: 2, + name: " Menunggu Konfirmasi", + }, name: "Villa Batubulan", }, { id: 4, + status: { + id: 1, + name: "Publish", + }, name: "Kost Alif Denpasar", }, { id: 5, - name: "Pabrik Rokok", + status: { + id: 1, + name: "Publish", + }, + name: "Pabrik Rokok Surya Gandum", }, ]; @@ -66,6 +88,7 @@ export default function Admin_Investasi() { const tableBody = listTable.map((e) => ( {e.name} + {e.status.id === 1 ? {e.status.name} : {e.status.name} } router.push(RouterAdminInvestasi.halaman_aksi + `${e.id}`)} @@ -101,15 +124,18 @@ export default function Admin_Investasi() {
List Investasi
- + +
+ {tableBody}
Nama Proyek InvestasiStatus Aksi
+ ); diff --git a/src/app_modules/admin/main/layout.tsx b/src/app_modules/admin/main/layout.tsx index 82dc12a0..e3070c6c 100644 --- a/src/app_modules/admin/main/layout.tsx +++ b/src/app_modules/admin/main/layout.tsx @@ -6,6 +6,7 @@ import { Box, Burger, Drawer, + Footer, Group, Header, MediaQuery, @@ -57,10 +58,27 @@ export default function AdminLayout({ return ( <> + // {/* Web View */} + // + // + // 1 + // 1 + // 1 + // + // + + // {/* + // ok + // */} + // + // } header={
- - + {/* Mobile View */} + + setOpened((o) => !o)} @@ -68,19 +86,42 @@ export default function AdminLayout({ color={theme.colors.gray[6]} mr="xl" /> - - Dashboard Admin - router.push(RouterHome.main_home)}> - - - + Dashboard Admin + router.push(RouterHome.main_home)} + > + + + + + + {/* Web View */} + + + Dashboard Admin + + {listAdminPage.map((e) => ( + router.push(e.route)}> + {e.name} + + ))} + + router.push(RouterHome.main_home)} + > + + + +
} > {children} setOpened(false)} size={"50%"}> - + {listAdminPage.map((e) => ( router.push(e.route)}> {e.name} diff --git a/src/app_modules/crowd/main/layout.tsx b/src/app_modules/crowd/main/layout.tsx index d362a5d0..af1ae295 100644 --- a/src/app_modules/crowd/main/layout.tsx +++ b/src/app_modules/crowd/main/layout.tsx @@ -15,7 +15,7 @@ export default function LayoutMainCrowd({ return ( <> } + header={} > {children} diff --git a/src/app_modules/crowd/main/view.tsx b/src/app_modules/crowd/main/view.tsx index 34a996cd..74683046 100644 --- a/src/app_modules/crowd/main/view.tsx +++ b/src/app_modules/crowd/main/view.tsx @@ -2,27 +2,41 @@ import { Warna } from "@/app/lib/warna"; import { gs_investasiFooter } from "@/app_modules/investasi/g_state"; -import { Button, Center, Stack, Text, Title } from "@mantine/core"; +import { + AspectRatio, + Button, + Center, + Image, + Paper, + Stack, + Text, + Title, +} from "@mantine/core"; import { useAtom } from "jotai"; import { useRouter } from "next/navigation"; import toast from "react-simple-toasts"; export default function MainCrowd() { const router = useRouter(); - const [changeColor, setChangeColor] = useAtom(gs_investasiFooter) + const [changeColor, setChangeColor] = useAtom(gs_investasiFooter); return ( <> -
- - Selamat datang di - HIPMI Crowd Funding + + + + + + + + -
+ + ); } diff --git a/src/app_modules/crowd/splash/view.tsx b/src/app_modules/crowd/splash/view.tsx index 02c4793a..ea6807cc 100644 --- a/src/app_modules/crowd/splash/view.tsx +++ b/src/app_modules/crowd/splash/view.tsx @@ -13,10 +13,11 @@ export default function SplashCrowd() { return ( <>
- - Welcome to, - CrowdFunding - + + Welcome to, + HIPMI + CrowdFunding +
); diff --git a/src/app_modules/investasi/berita/view.tsx b/src/app_modules/investasi/berita/view.tsx index 1ae21472..cc8cc489 100644 --- a/src/app_modules/investasi/berita/view.tsx +++ b/src/app_modules/investasi/berita/view.tsx @@ -1,19 +1,40 @@ "use client"; import { RouterInvestasi } from "@/app/lib/router_hipmi/router_investasi"; -import { AspectRatio, Grid, Image, Paper, Text, Title } from "@mantine/core"; +import { + AspectRatio, + Grid, + Group, + Image, + Paper, + Stack, + Text, + Title, +} from "@mantine/core"; +import moment from "moment"; import { useRouter } from "next/navigation"; -export default function BeritaInvestasi({id}: {id: string}) { - const router = useRouter() +export default function BeritaInvestasi({ id }: { id: string }) { + const router = useRouter(); return ( <> - router.push(RouterInvestasi.detail_berita + `${id}`)}> - Judul berita + router.push(RouterInvestasi.detail_berita + `${id}`)} + > + + + Judul berita + {moment(Date.now()).local().format("LL")} + + - Lorem ipsum dolor sit amet consectetur, adipisicing elit. + Lorem ipsum dolor sit amet consectetur, adipisicing elit.... @@ -22,6 +43,7 @@ export default function BeritaInvestasi({id}: {id: string}) { + ); diff --git a/src/app_modules/investasi/create/view.tsx b/src/app_modules/investasi/create/view.tsx index db50c479..6a54ff28 100644 --- a/src/app_modules/investasi/create/view.tsx +++ b/src/app_modules/investasi/create/view.tsx @@ -62,9 +62,9 @@ export default function InvestasiCreate({ masterPembagianDevidenId: value.pembagianDevidenId, masterPencarianInvestorId: value.pencarianInvestorId, }; - toast("Berhasil disimpan") + // toast("Berhasil disimpan") setChangeColor(true) - return setTimeout(() => router.push(RouterInvestasi.portofolio), 2000); + return setTimeout(() => router.push(RouterInvestasi.dialog_create), 1000); // if (_.values(body).includes("")) return toast("Lengkapi data"); diff --git a/src/app_modules/investasi/create_berita/layout.tsx b/src/app_modules/investasi/create_berita/layout.tsx new file mode 100644 index 00000000..0a6a2caa --- /dev/null +++ b/src/app_modules/investasi/create_berita/layout.tsx @@ -0,0 +1,44 @@ +"use client"; + +import { Warna } from "@/app/lib/warna"; +import HeaderTamplate from "@/app_modules/component/header_tamplate"; +import { AppShell, Button, Center, Footer } from "@mantine/core"; +import { IconPencilPlus } from "@tabler/icons-react"; +import { useRouter } from "next/navigation"; + +import React from "react"; +import toast from "react-simple-toasts"; + +export default function LayoutCreateBeritaInvestasi({ + children, +}: { + children: React.ReactNode; +}) { + const router = useRouter(); + return ( + <> + } + footer={ +
+
+ +
+
+ } + > + {children} + + + ); +} diff --git a/src/app_modules/investasi/create_berita/view.tsx b/src/app_modules/investasi/create_berita/view.tsx new file mode 100644 index 00000000..522713da --- /dev/null +++ b/src/app_modules/investasi/create_berita/view.tsx @@ -0,0 +1,22 @@ +"use client" + +import { AspectRatio, Button, Center, Image, Stack, TextInput, Textarea, Title } from "@mantine/core" +import { IconUpload } from "@tabler/icons-react" + +export default function CreateBeritaInvestasi(){ + return<> + + + + +
+ +
+ +