diff --git a/package.json b/package.json index 4413abcd..e6c6b9dc 100644 --- a/package.json +++ b/package.json @@ -62,6 +62,7 @@ "next": "^13.5.4-canary.8", "next-dev": "^1.1.9", "next-scroll-loader": "^1.0.9", + "pdfjs-dist": "^4.6.82", "postcss": "8.4.27", "react": "18.2.0", "react-countdown": "^2.3.5", @@ -76,7 +77,6 @@ "react-pdf": "^9.1.0", "react-quill": "^2.0.0", "react-responsive-carousel": "^3.2.23", - "react-simple-toasts": "^5.10.0", "react-toastify": "^9.1.3", "socket.io-client": "^4.7.2", "tailwindcss": "3.3.3", diff --git a/prisma/schema.prisma b/prisma/schema.prisma index 2d38d7c4..5aa6018e 100644 --- a/prisma/schema.prisma +++ b/prisma/schema.prisma @@ -173,6 +173,19 @@ model MasterBidangBisnis { Portofolio Portofolio[] } +// ------------------- MASTER -------------------------- // + +model MasterBank { + id String @id @default(cuid()) + namaBank String + namaAkun String + norek String + isActive Boolean @default(true) + createdAt DateTime @default(now()) + updatedAt DateTime @updatedAt + Investasi_Invoice Investasi_Invoice[] +} + model MasterStatus { id String @id @default(cuid()) name String @@ -182,18 +195,6 @@ model MasterStatus { Job Job[] } -// ------------------- MASTER -------------------------- // - -model MasterBank { - id String @id @default(cuid()) - name String - norek String - active Boolean @default(true) - createdAt DateTime @default(now()) - updatedAt DateTime @updatedAt - Investasi_Invoice Investasi_Invoice[] -} - // -------------------- INVESTASI --------------------- // // Table investasi / saham model Investasi { @@ -385,7 +386,7 @@ model Investasi_Invoice { model InvestasiMaster_StatusInvoice { id String @id @default(cuid()) name String - active Boolean @default(true) + isActive Boolean @default(true) createdAt DateTime @default(now()) updatedAt DateTime @updatedAt @@ -622,6 +623,7 @@ model Voting { isActive Boolean @default(true) createdAt DateTime @default(now()) updatedAt DateTime @updatedAt + isArsip Boolean @default(false) title String deskripsi String diff --git a/public/donasi/image/0aed0def-3278-41eb-be5c-9ba8f0ebdf6f.jpeg b/public/donasi/image/0aed0def-3278-41eb-be5c-9ba8f0ebdf6f.jpeg deleted file mode 100644 index 22cb9a6e..00000000 Binary files a/public/donasi/image/0aed0def-3278-41eb-be5c-9ba8f0ebdf6f.jpeg and /dev/null differ diff --git a/public/donasi/image/0d8d18cc-b3a1-4186-b91b-85c67b7bee26.jpeg b/public/donasi/image/0d8d18cc-b3a1-4186-b91b-85c67b7bee26.jpeg deleted file mode 100644 index d3ea1214..00000000 Binary files a/public/donasi/image/0d8d18cc-b3a1-4186-b91b-85c67b7bee26.jpeg and /dev/null differ diff --git a/public/donasi/image/2a2aed6f-54a1-4e50-9bab-05b2950f071e.jpeg b/public/donasi/image/2a2aed6f-54a1-4e50-9bab-05b2950f071e.jpeg deleted file mode 100644 index 8b60e122..00000000 Binary files a/public/donasi/image/2a2aed6f-54a1-4e50-9bab-05b2950f071e.jpeg and /dev/null differ diff --git a/public/donasi/image/4be5bd92-75c3-434c-8875-68e0cae8b9d4.jpeg b/public/donasi/image/4be5bd92-75c3-434c-8875-68e0cae8b9d4.jpeg deleted file mode 100644 index 00b4469e..00000000 Binary files a/public/donasi/image/4be5bd92-75c3-434c-8875-68e0cae8b9d4.jpeg and /dev/null differ diff --git a/public/donasi/image/5a8864a2-e924-4553-b908-8b27c143897b.jpeg b/public/donasi/image/5a8864a2-e924-4553-b908-8b27c143897b.jpeg deleted file mode 100644 index 5652497a..00000000 Binary files a/public/donasi/image/5a8864a2-e924-4553-b908-8b27c143897b.jpeg and /dev/null differ diff --git a/public/donasi/image/5f1a3a2d-b387-4923-9202-89422e4a5055.jpeg b/public/donasi/image/5f1a3a2d-b387-4923-9202-89422e4a5055.jpeg deleted file mode 100644 index de0ad98c..00000000 Binary files a/public/donasi/image/5f1a3a2d-b387-4923-9202-89422e4a5055.jpeg and /dev/null differ diff --git a/public/donasi/image/63727029-2d81-42b6-aa4c-29979ac57f07.jpeg b/public/donasi/image/63727029-2d81-42b6-aa4c-29979ac57f07.jpeg deleted file mode 100644 index d3ea1214..00000000 Binary files a/public/donasi/image/63727029-2d81-42b6-aa4c-29979ac57f07.jpeg and /dev/null differ diff --git a/public/donasi/image/694e5940-a5eb-4b68-900f-565d68250a2d.jpeg b/public/donasi/image/694e5940-a5eb-4b68-900f-565d68250a2d.jpeg deleted file mode 100644 index d040a767..00000000 Binary files a/public/donasi/image/694e5940-a5eb-4b68-900f-565d68250a2d.jpeg and /dev/null differ diff --git a/public/donasi/image/70df004f-eeb0-4469-8f76-41897e712d97.jpeg b/public/donasi/image/70df004f-eeb0-4469-8f76-41897e712d97.jpeg deleted file mode 100644 index d3ea1214..00000000 Binary files a/public/donasi/image/70df004f-eeb0-4469-8f76-41897e712d97.jpeg and /dev/null differ diff --git a/public/donasi/image/91771b2d-dbef-43ff-a346-0c1bde05dfdf.jpeg b/public/donasi/image/91771b2d-dbef-43ff-a346-0c1bde05dfdf.jpeg deleted file mode 100644 index 7ad2d286..00000000 Binary files a/public/donasi/image/91771b2d-dbef-43ff-a346-0c1bde05dfdf.jpeg and /dev/null differ diff --git a/public/donasi/image/97e4669b-7b23-4773-be34-6d09c38f4cbc.jpeg b/public/donasi/image/97e4669b-7b23-4773-be34-6d09c38f4cbc.jpeg deleted file mode 100644 index d040a767..00000000 Binary files a/public/donasi/image/97e4669b-7b23-4773-be34-6d09c38f4cbc.jpeg and /dev/null differ diff --git a/public/donasi/image/b832bd30-2c30-4fa2-b8bf-13ceebcbac1c.jpeg b/public/donasi/image/b832bd30-2c30-4fa2-b8bf-13ceebcbac1c.jpeg deleted file mode 100644 index d0b9edda..00000000 Binary files a/public/donasi/image/b832bd30-2c30-4fa2-b8bf-13ceebcbac1c.jpeg and /dev/null differ diff --git a/public/donasi/image/e85805b1-353d-4f5b-b016-226ba10e58c5.jpeg b/public/donasi/image/e85805b1-353d-4f5b-b016-226ba10e58c5.jpeg deleted file mode 100644 index 83e6366e..00000000 Binary files a/public/donasi/image/e85805b1-353d-4f5b-b016-226ba10e58c5.jpeg and /dev/null differ diff --git a/public/donasi/image/ebba534b-7a83-4e67-abac-08da8482fcde.jpeg b/public/donasi/image/ebba534b-7a83-4e67-abac-08da8482fcde.jpeg deleted file mode 100644 index 6453d730..00000000 Binary files a/public/donasi/image/ebba534b-7a83-4e67-abac-08da8482fcde.jpeg and /dev/null differ diff --git a/public/donasi/image_cerita/16fc767f-18de-4390-93eb-cfc94f7620e3.jpeg b/public/donasi/image_cerita/16fc767f-18de-4390-93eb-cfc94f7620e3.jpeg deleted file mode 100644 index 22cb9a6e..00000000 Binary files a/public/donasi/image_cerita/16fc767f-18de-4390-93eb-cfc94f7620e3.jpeg and /dev/null differ diff --git a/public/donasi/image_cerita/247e0aa2-55bf-4034-921d-8e4c507048ff.jpeg b/public/donasi/image_cerita/247e0aa2-55bf-4034-921d-8e4c507048ff.jpeg deleted file mode 100644 index e25549da..00000000 Binary files a/public/donasi/image_cerita/247e0aa2-55bf-4034-921d-8e4c507048ff.jpeg and /dev/null differ diff --git a/public/donasi/image_cerita/32e4253d-ec8b-47d7-ac54-33f20538ed13.jpeg b/public/donasi/image_cerita/32e4253d-ec8b-47d7-ac54-33f20538ed13.jpeg deleted file mode 100644 index 5652497a..00000000 Binary files a/public/donasi/image_cerita/32e4253d-ec8b-47d7-ac54-33f20538ed13.jpeg and /dev/null differ diff --git a/public/donasi/image_cerita/353d2dec-50eb-4b3a-8778-11256f57a644.jpeg b/public/donasi/image_cerita/353d2dec-50eb-4b3a-8778-11256f57a644.jpeg deleted file mode 100644 index 5652497a..00000000 Binary files a/public/donasi/image_cerita/353d2dec-50eb-4b3a-8778-11256f57a644.jpeg and /dev/null differ diff --git a/public/donasi/image_cerita/39c23733-fe61-4784-85d0-fd2ef3273346.jpg b/public/donasi/image_cerita/39c23733-fe61-4784-85d0-fd2ef3273346.jpg deleted file mode 100644 index b71d094e..00000000 Binary files a/public/donasi/image_cerita/39c23733-fe61-4784-85d0-fd2ef3273346.jpg and /dev/null differ diff --git a/public/donasi/image_cerita/58969439-ea34-4738-b4a3-df22f6da019b.jpeg b/public/donasi/image_cerita/58969439-ea34-4738-b4a3-df22f6da019b.jpeg deleted file mode 100644 index d040a767..00000000 Binary files a/public/donasi/image_cerita/58969439-ea34-4738-b4a3-df22f6da019b.jpeg and /dev/null differ diff --git a/public/donasi/image_cerita/7a887e72-c76f-417e-a31d-19d215a2be57.jpeg b/public/donasi/image_cerita/7a887e72-c76f-417e-a31d-19d215a2be57.jpeg deleted file mode 100644 index 22cb9a6e..00000000 Binary files a/public/donasi/image_cerita/7a887e72-c76f-417e-a31d-19d215a2be57.jpeg and /dev/null differ diff --git a/public/donasi/image_cerita/87396aa0-09f4-4fe9-8a95-69e019b6045e.jpeg b/public/donasi/image_cerita/87396aa0-09f4-4fe9-8a95-69e019b6045e.jpeg deleted file mode 100644 index 6453d730..00000000 Binary files a/public/donasi/image_cerita/87396aa0-09f4-4fe9-8a95-69e019b6045e.jpeg and /dev/null differ diff --git a/public/donasi/image_cerita/8f28ee52-1fef-47cb-a011-ade48aa025dd.jpeg b/public/donasi/image_cerita/8f28ee52-1fef-47cb-a011-ade48aa025dd.jpeg deleted file mode 100644 index d3ea1214..00000000 Binary files a/public/donasi/image_cerita/8f28ee52-1fef-47cb-a011-ade48aa025dd.jpeg and /dev/null differ diff --git a/public/donasi/image_cerita/901beeef-26b6-4ce8-ab96-c83d5d97e63f.jpeg b/public/donasi/image_cerita/901beeef-26b6-4ce8-ab96-c83d5d97e63f.jpeg deleted file mode 100644 index 7ad2d286..00000000 Binary files a/public/donasi/image_cerita/901beeef-26b6-4ce8-ab96-c83d5d97e63f.jpeg and /dev/null differ diff --git a/public/donasi/image_cerita/927e0798-4722-40f5-b7d1-e73d1d03d304.jpg b/public/donasi/image_cerita/927e0798-4722-40f5-b7d1-e73d1d03d304.jpg deleted file mode 100644 index b71d094e..00000000 Binary files a/public/donasi/image_cerita/927e0798-4722-40f5-b7d1-e73d1d03d304.jpg and /dev/null differ diff --git a/public/donasi/image_cerita/b1cd4f75-00b5-45f0-b132-e4714bfbffa8.jpg b/public/donasi/image_cerita/b1cd4f75-00b5-45f0-b132-e4714bfbffa8.jpg deleted file mode 100644 index b71d094e..00000000 Binary files a/public/donasi/image_cerita/b1cd4f75-00b5-45f0-b132-e4714bfbffa8.jpg and /dev/null differ diff --git a/public/donasi/image_cerita/ba8ffd22-9640-4b34-aca2-b90ff42a31be.jpeg b/public/donasi/image_cerita/ba8ffd22-9640-4b34-aca2-b90ff42a31be.jpeg deleted file mode 100644 index 4f712802..00000000 Binary files a/public/donasi/image_cerita/ba8ffd22-9640-4b34-aca2-b90ff42a31be.jpeg and /dev/null differ diff --git a/public/donasi/image_cerita/d8053e84-93e7-4197-9fac-03777175d8b4.jpg b/public/donasi/image_cerita/d8053e84-93e7-4197-9fac-03777175d8b4.jpg deleted file mode 100644 index b71d094e..00000000 Binary files a/public/donasi/image_cerita/d8053e84-93e7-4197-9fac-03777175d8b4.jpg and /dev/null differ diff --git a/public/donasi/image_cerita/e2610b3b-d821-4c2c-8bdf-c8a7aff4e0e2.jpeg b/public/donasi/image_cerita/e2610b3b-d821-4c2c-8bdf-c8a7aff4e0e2.jpeg deleted file mode 100644 index 5652497a..00000000 Binary files a/public/donasi/image_cerita/e2610b3b-d821-4c2c-8bdf-c8a7aff4e0e2.jpeg and /dev/null differ diff --git a/public/donasi/image_cerita/f6192006-f93b-4222-8e89-41388732e970.jpeg b/public/donasi/image_cerita/f6192006-f93b-4222-8e89-41388732e970.jpeg deleted file mode 100644 index 6453d730..00000000 Binary files a/public/donasi/image_cerita/f6192006-f93b-4222-8e89-41388732e970.jpeg and /dev/null differ diff --git a/public/donasi/invoice/022d0c53-d5c7-4b2c-a6a7-8dd1a9b7ac86.jpg b/public/donasi/invoice/022d0c53-d5c7-4b2c-a6a7-8dd1a9b7ac86.jpg deleted file mode 100644 index 1b3756ff..00000000 Binary files a/public/donasi/invoice/022d0c53-d5c7-4b2c-a6a7-8dd1a9b7ac86.jpg and /dev/null differ diff --git a/public/donasi/invoice/2be14a7c-1865-47c6-b171-e0b3459d76a0.png b/public/donasi/invoice/2be14a7c-1865-47c6-b171-e0b3459d76a0.png deleted file mode 100644 index 6f356546..00000000 Binary files a/public/donasi/invoice/2be14a7c-1865-47c6-b171-e0b3459d76a0.png and /dev/null differ diff --git a/public/donasi/invoice/c7cc699c-4bb0-4ce0-b24a-a49fdf1d7080.png b/public/donasi/invoice/c7cc699c-4bb0-4ce0-b24a-a49fdf1d7080.png deleted file mode 100644 index 6f356546..00000000 Binary files a/public/donasi/invoice/c7cc699c-4bb0-4ce0-b24a-a49fdf1d7080.png and /dev/null differ diff --git a/public/donasi/invoice/f25e58f5-6627-4e48-9a76-946f5e5db469.png b/public/donasi/invoice/f25e58f5-6627-4e48-9a76-946f5e5db469.png deleted file mode 100644 index 6f356546..00000000 Binary files a/public/donasi/invoice/f25e58f5-6627-4e48-9a76-946f5e5db469.png and /dev/null differ diff --git a/public/donasi/invoice/fc40104b-74e4-4ec6-a791-c7d33dee3446.jpg b/public/donasi/invoice/fc40104b-74e4-4ec6-a791-c7d33dee3446.jpg deleted file mode 100644 index ea83eb05..00000000 Binary files a/public/donasi/invoice/fc40104b-74e4-4ec6-a791-c7d33dee3446.jpg and /dev/null differ diff --git a/public/donasi/kabar/0de92876-be7a-4d87-afcb-6ceba1586058.jpeg b/public/donasi/kabar/0de92876-be7a-4d87-afcb-6ceba1586058.jpeg deleted file mode 100644 index de0ad98c..00000000 Binary files a/public/donasi/kabar/0de92876-be7a-4d87-afcb-6ceba1586058.jpeg and /dev/null differ diff --git a/public/donasi/pencairan/80f3613a-d0dd-4d22-8249-c54e12cbb575.png b/public/donasi/pencairan/80f3613a-d0dd-4d22-8249-c54e12cbb575.png deleted file mode 100644 index 827976fd..00000000 Binary files a/public/donasi/pencairan/80f3613a-d0dd-4d22-8249-c54e12cbb575.png and /dev/null differ diff --git a/public/donasi/pencairan/ba62da22-8973-4789-88a3-b20acd726dc9.jpg b/public/donasi/pencairan/ba62da22-8973-4789-88a3-b20acd726dc9.jpg deleted file mode 100644 index 7d8e71ab..00000000 Binary files a/public/donasi/pencairan/ba62da22-8973-4789-88a3-b20acd726dc9.jpg and /dev/null differ diff --git a/public/file/27f4023f-11db-4521-b707-dd300ba275e5.pdf b/public/file/06d21d20-bded-412d-9270-3c420a01e000.pdf similarity index 100% rename from public/file/27f4023f-11db-4521-b707-dd300ba275e5.pdf rename to public/file/06d21d20-bded-412d-9270-3c420a01e000.pdf diff --git a/public/file/0cbfef55-042a-4554-a42c-4cd6e3e05a9f.pdf b/public/file/0cbfef55-042a-4554-a42c-4cd6e3e05a9f.pdf deleted file mode 100644 index 14373298..00000000 Binary files a/public/file/0cbfef55-042a-4554-a42c-4cd6e3e05a9f.pdf and /dev/null differ diff --git a/public/file/33603b95-ab2c-495b-84aa-e14d1f41ed50.pdf b/public/file/2cd52f2b-adc2-4406-9ac4-fee79b2211cb.pdf similarity index 100% rename from public/file/33603b95-ab2c-495b-84aa-e14d1f41ed50.pdf rename to public/file/2cd52f2b-adc2-4406-9ac4-fee79b2211cb.pdf diff --git a/public/file/3dd73ab3-6951-47be-b6f5-c24b5131887d.pdf b/public/file/37ccf14d-1f7d-4b55-89ec-3bfc3e164cc5.pdf similarity index 100% rename from public/file/3dd73ab3-6951-47be-b6f5-c24b5131887d.pdf rename to public/file/37ccf14d-1f7d-4b55-89ec-3bfc3e164cc5.pdf diff --git a/public/file/3b4b9575-b5c9-422a-b1cc-605ed6ce61a3.pdf b/public/file/3b4b9575-b5c9-422a-b1cc-605ed6ce61a3.pdf deleted file mode 100644 index 6b87abcb..00000000 Binary files a/public/file/3b4b9575-b5c9-422a-b1cc-605ed6ce61a3.pdf and /dev/null differ diff --git a/public/file/3e554564-51d3-436e-b763-a06c9b1653fa.pdf b/public/file/3e554564-51d3-436e-b763-a06c9b1653fa.pdf deleted file mode 100644 index 6b87abcb..00000000 Binary files a/public/file/3e554564-51d3-436e-b763-a06c9b1653fa.pdf and /dev/null differ diff --git a/public/file/47c428b5-68a5-4bf1-8cd2-77954666b9e8.pdf b/public/file/47c428b5-68a5-4bf1-8cd2-77954666b9e8.pdf new file mode 100644 index 00000000..20de4171 Binary files /dev/null and b/public/file/47c428b5-68a5-4bf1-8cd2-77954666b9e8.pdf differ diff --git a/public/file/4969c838-482b-41f2-b07a-55123bafe370.pdf b/public/file/4ee5328a-dcc5-4853-96dc-056d82d4eec0.pdf similarity index 100% rename from public/file/4969c838-482b-41f2-b07a-55123bafe370.pdf rename to public/file/4ee5328a-dcc5-4853-96dc-056d82d4eec0.pdf diff --git a/public/file/5e46b50e-5dc5-47e3-90fd-b71fd79ee6c1.jpeg b/public/file/5e46b50e-5dc5-47e3-90fd-b71fd79ee6c1.jpeg deleted file mode 100644 index 25a18f99..00000000 Binary files a/public/file/5e46b50e-5dc5-47e3-90fd-b71fd79ee6c1.jpeg and /dev/null differ diff --git a/public/file/4df07b6c-e80e-4aaa-8765-5ecb3706d840.pdf b/public/file/714b6b5a-50f4-410f-9e78-23a3f5e440c2.pdf similarity index 100% rename from public/file/4df07b6c-e80e-4aaa-8765-5ecb3706d840.pdf rename to public/file/714b6b5a-50f4-410f-9e78-23a3f5e440c2.pdf diff --git a/public/file/644b58c8-a9a9-4896-9a70-a582f10738be.pdf b/public/file/7362d267-5204-4e2b-a94e-e5f0300e09a9.pdf similarity index 100% rename from public/file/644b58c8-a9a9-4896-9a70-a582f10738be.pdf rename to public/file/7362d267-5204-4e2b-a94e-e5f0300e09a9.pdf diff --git a/public/file/79947482-e01c-45ce-ac03-9ac66a8536ca.pdf b/public/file/79947482-e01c-45ce-ac03-9ac66a8536ca.pdf deleted file mode 100644 index 14373298..00000000 Binary files a/public/file/79947482-e01c-45ce-ac03-9ac66a8536ca.pdf and /dev/null differ diff --git a/public/file/51ee2a38-715f-469d-a457-1ecb86a7efd3.pdf b/public/file/8131246c-804c-4bdb-9940-23288f470513.pdf similarity index 100% rename from public/file/51ee2a38-715f-469d-a457-1ecb86a7efd3.pdf rename to public/file/8131246c-804c-4bdb-9940-23288f470513.pdf diff --git a/public/file/9f0a17aa-05d5-4948-8ea2-7a42406bed95.pdf b/public/file/9f0a17aa-05d5-4948-8ea2-7a42406bed95.pdf new file mode 100644 index 00000000..a158080a Binary files /dev/null and b/public/file/9f0a17aa-05d5-4948-8ea2-7a42406bed95.pdf differ diff --git a/public/file/5cac5901-7bc5-4484-9464-2d7d46c5cc1a.pdf b/public/file/b362dbdb-aba3-4f19-9667-782aedc1cb42.pdf similarity index 100% rename from public/file/5cac5901-7bc5-4484-9464-2d7d46c5cc1a.pdf rename to public/file/b362dbdb-aba3-4f19-9667-782aedc1cb42.pdf diff --git a/public/file/b97bd66d-835d-4b85-9364-b6e7f829086b.pdf b/public/file/b97bd66d-835d-4b85-9364-b6e7f829086b.pdf deleted file mode 100644 index 92b2f709..00000000 Binary files a/public/file/b97bd66d-835d-4b85-9364-b6e7f829086b.pdf and /dev/null differ diff --git a/public/file/c75b1df8-7c20-4183-bacd-23e83a9e8396.pdf b/public/file/c75b1df8-7c20-4183-bacd-23e83a9e8396.pdf deleted file mode 100644 index 92b2f709..00000000 Binary files a/public/file/c75b1df8-7c20-4183-bacd-23e83a9e8396.pdf and /dev/null differ diff --git a/public/file/c9542a35-6970-43c9-9ff5-8a78b7c864dd.pdf b/public/file/c9542a35-6970-43c9-9ff5-8a78b7c864dd.pdf deleted file mode 100644 index 8efc2640..00000000 Binary files a/public/file/c9542a35-6970-43c9-9ff5-8a78b7c864dd.pdf and /dev/null differ diff --git a/public/file/cb5a14cf-7078-48fd-9166-5b96c186c376.pdf b/public/file/cb5a14cf-7078-48fd-9166-5b96c186c376.pdf deleted file mode 100644 index d7ba5e1d..00000000 Binary files a/public/file/cb5a14cf-7078-48fd-9166-5b96c186c376.pdf and /dev/null differ diff --git a/public/file/7be86df1-64ec-457f-b6dd-4768262ade8f.pdf b/public/file/cdea2d5d-0334-4435-82af-0f0bef42bab6.pdf similarity index 100% rename from public/file/7be86df1-64ec-457f-b6dd-4768262ade8f.pdf rename to public/file/cdea2d5d-0334-4435-82af-0f0bef42bab6.pdf diff --git a/public/file/cf2e680b-c588-47da-8f36-928d4f95fc7e.pdf b/public/file/cf2e680b-c588-47da-8f36-928d4f95fc7e.pdf new file mode 100644 index 00000000..a158080a Binary files /dev/null and b/public/file/cf2e680b-c588-47da-8f36-928d4f95fc7e.pdf differ diff --git a/public/file/cf6817d8-1067-46af-8da2-44bd1ad1203d.pdf b/public/file/cf6817d8-1067-46af-8da2-44bd1ad1203d.pdf deleted file mode 100644 index 14373298..00000000 Binary files a/public/file/cf6817d8-1067-46af-8da2-44bd1ad1203d.pdf and /dev/null differ diff --git a/public/file/a3236be1-3a83-433b-8f92-df778b1bf467.pdf b/public/file/d0951c67-9587-440c-8803-76df49065ca4.pdf similarity index 100% rename from public/file/a3236be1-3a83-433b-8f92-df778b1bf467.pdf rename to public/file/d0951c67-9587-440c-8803-76df49065ca4.pdf diff --git a/public/file/d1a8c490-d2d3-4e05-829f-3e55a6f5527e.pdf b/public/file/d1a8c490-d2d3-4e05-829f-3e55a6f5527e.pdf new file mode 100644 index 00000000..a158080a Binary files /dev/null and b/public/file/d1a8c490-d2d3-4e05-829f-3e55a6f5527e.pdf differ diff --git a/public/file/d789f7d8-f02e-4aab-a67c-0f6e7a2a223a.pdf b/public/file/d789f7d8-f02e-4aab-a67c-0f6e7a2a223a.pdf new file mode 100644 index 00000000..a158080a Binary files /dev/null and b/public/file/d789f7d8-f02e-4aab-a67c-0f6e7a2a223a.pdf differ diff --git a/public/file/dccc6d8f-d2d5-430f-84e5-69b401466ed3.jpeg b/public/file/dccc6d8f-d2d5-430f-84e5-69b401466ed3.jpeg deleted file mode 100644 index 25a18f99..00000000 Binary files a/public/file/dccc6d8f-d2d5-430f-84e5-69b401466ed3.jpeg and /dev/null differ diff --git a/public/file/dd090612-fe9e-4fe2-b776-7124325a0e9b.jpeg b/public/file/dd090612-fe9e-4fe2-b776-7124325a0e9b.jpeg deleted file mode 100644 index 25a18f99..00000000 Binary files a/public/file/dd090612-fe9e-4fe2-b776-7124325a0e9b.jpeg and /dev/null differ diff --git a/public/file/e7e7ba42-087f-42cf-80d1-cfaa40996356.pdf b/public/file/e7e7ba42-087f-42cf-80d1-cfaa40996356.pdf new file mode 100644 index 00000000..a158080a Binary files /dev/null and b/public/file/e7e7ba42-087f-42cf-80d1-cfaa40996356.pdf differ diff --git a/public/file/ee97fba3-8236-437d-91c9-dfdaee6bf192.pdf b/public/file/ee97fba3-8236-437d-91c9-dfdaee6bf192.pdf new file mode 100644 index 00000000..a158080a Binary files /dev/null and b/public/file/ee97fba3-8236-437d-91c9-dfdaee6bf192.pdf differ diff --git a/public/file/f3e68402-341e-4f8e-a560-876da051799a.pdf b/public/file/f3e68402-341e-4f8e-a560-876da051799a.pdf new file mode 100644 index 00000000..a158080a Binary files /dev/null and b/public/file/f3e68402-341e-4f8e-a560-876da051799a.pdf differ diff --git a/public/file/a5c5ea49-6036-4ef5-9fbd-071ce474cd29.pdf b/public/file/f4c037e0-993c-4f28-888d-962017a0f9d8.pdf similarity index 100% rename from public/file/a5c5ea49-6036-4ef5-9fbd-071ce474cd29.pdf rename to public/file/f4c037e0-993c-4f28-888d-962017a0f9d8.pdf diff --git a/public/file/ffc13ef0-54b2-46fd-8ebc-01523cddce52.pdf b/public/file/ffc13ef0-54b2-46fd-8ebc-01523cddce52.pdf new file mode 100644 index 00000000..a158080a Binary files /dev/null and b/public/file/ffc13ef0-54b2-46fd-8ebc-01523cddce52.pdf differ diff --git a/public/file/516c7e01-3fb2-47e3-be42-fe7a28e011ee.jpg b/public/investasi/0180c07f-13e5-48eb-bd86-b160f36d1145.jpg similarity index 100% rename from public/file/516c7e01-3fb2-47e3-be42-fe7a28e011ee.jpg rename to public/investasi/0180c07f-13e5-48eb-bd86-b160f36d1145.jpg diff --git a/public/investasi/01e7a1ff-b1cc-4fef-bb24-3b0747b4602b.jpeg b/public/investasi/01e7a1ff-b1cc-4fef-bb24-3b0747b4602b.jpeg deleted file mode 100644 index 7ad2d286..00000000 Binary files a/public/investasi/01e7a1ff-b1cc-4fef-bb24-3b0747b4602b.jpeg and /dev/null differ diff --git a/public/file/41ddf88e-01a7-4653-8217-4c7b9c2031af.jpg b/public/investasi/05860dbc-7890-4d2f-a905-7e8e535fbca1.jpg similarity index 100% rename from public/file/41ddf88e-01a7-4653-8217-4c7b9c2031af.jpg rename to public/investasi/05860dbc-7890-4d2f-a905-7e8e535fbca1.jpg diff --git a/public/investasi/09c22d28-4efe-443c-a432-fc49d6681055.jpeg b/public/investasi/09c22d28-4efe-443c-a432-fc49d6681055.jpeg deleted file mode 100644 index 25a18f99..00000000 Binary files a/public/investasi/09c22d28-4efe-443c-a432-fc49d6681055.jpeg and /dev/null differ diff --git a/public/file/9262d292-68cf-4cc6-a332-e3fa18ffb729.jpg b/public/investasi/1220d18d-22e9-4280-a1d9-fc0a6bf45c42.jpg similarity index 100% rename from public/file/9262d292-68cf-4cc6-a332-e3fa18ffb729.jpg rename to public/investasi/1220d18d-22e9-4280-a1d9-fc0a6bf45c42.jpg diff --git a/public/file/7f26ce38-ed31-45f8-aea8-4ff3cfebff2d.jpg b/public/investasi/172a22ad-c6a4-4bb1-a7df-3a74c65b93a3.jpg similarity index 100% rename from public/file/7f26ce38-ed31-45f8-aea8-4ff3cfebff2d.jpg rename to public/investasi/172a22ad-c6a4-4bb1-a7df-3a74c65b93a3.jpg diff --git a/public/investasi/206ab5ea-015e-414f-888d-052a83b5069d.jpg b/public/investasi/1f87d533-b4df-4830-95a8-64f9d9502e24.jpg similarity index 100% rename from public/investasi/206ab5ea-015e-414f-888d-052a83b5069d.jpg rename to public/investasi/1f87d533-b4df-4830-95a8-64f9d9502e24.jpg diff --git a/public/investasi/b5dee9fb-ea68-4115-9a0a-068c26247ed7.jpg b/public/investasi/29c4198b-b2f8-4788-b3c1-d6326a84311e.jpg similarity index 100% rename from public/investasi/b5dee9fb-ea68-4115-9a0a-068c26247ed7.jpg rename to public/investasi/29c4198b-b2f8-4788-b3c1-d6326a84311e.jpg diff --git a/public/investasi/2ce5c1aa-106a-48ad-a484-433c06e50403.jpg b/public/investasi/2ce5c1aa-106a-48ad-a484-433c06e50403.jpg deleted file mode 100644 index 110305ff..00000000 Binary files a/public/investasi/2ce5c1aa-106a-48ad-a484-433c06e50403.jpg and /dev/null differ diff --git a/public/investasi/384c1993-26c5-45ed-ac96-dabce6428ba5.jpg b/public/investasi/384c1993-26c5-45ed-ac96-dabce6428ba5.jpg deleted file mode 100644 index 878fa5eb..00000000 Binary files a/public/investasi/384c1993-26c5-45ed-ac96-dabce6428ba5.jpg and /dev/null differ diff --git a/public/investasi/40260fef-9b46-47c9-896c-2a8df127d25e.jpg b/public/investasi/40260fef-9b46-47c9-896c-2a8df127d25e.jpg new file mode 100644 index 00000000..ee10af17 Binary files /dev/null and b/public/investasi/40260fef-9b46-47c9-896c-2a8df127d25e.jpg differ diff --git a/public/investasi/b4c57c7b-bd74-487b-b711-f9557b227d84.jpg b/public/investasi/45b1fb02-2398-442f-9c86-b20e0c46bbdc.jpg similarity index 100% rename from public/investasi/b4c57c7b-bd74-487b-b711-f9557b227d84.jpg rename to public/investasi/45b1fb02-2398-442f-9c86-b20e0c46bbdc.jpg diff --git a/public/file/1e56f93e-df1a-4062-9d67-7fda5302bef2.jpeg b/public/investasi/63d465be-d589-4185-ac37-7e7bf6634232.jpeg similarity index 100% rename from public/file/1e56f93e-df1a-4062-9d67-7fda5302bef2.jpeg rename to public/investasi/63d465be-d589-4185-ac37-7e7bf6634232.jpeg diff --git a/public/investasi/74bf9679-adb4-4811-945c-0d3ce0922a49.jpeg b/public/investasi/74bf9679-adb4-4811-945c-0d3ce0922a49.jpeg deleted file mode 100644 index 25a18f99..00000000 Binary files a/public/investasi/74bf9679-adb4-4811-945c-0d3ce0922a49.jpeg and /dev/null differ diff --git a/public/investasi/a18e390e-04fb-4913-942d-fb65c46b3ebd.jpg b/public/investasi/819198cd-144f-4c7b-9549-f75ce7953c13.jpg similarity index 100% rename from public/investasi/a18e390e-04fb-4913-942d-fb65c46b3ebd.jpg rename to public/investasi/819198cd-144f-4c7b-9549-f75ce7953c13.jpg diff --git a/public/file/ce539db8-fd34-453a-aa75-25d7be692622.jpg b/public/investasi/81ad1def-1ede-4535-a297-1d3e717aedc7.jpg similarity index 100% rename from public/file/ce539db8-fd34-453a-aa75-25d7be692622.jpg rename to public/investasi/81ad1def-1ede-4535-a297-1d3e717aedc7.jpg diff --git a/public/investasi/974a98dc-6198-4e3e-b241-9562adc2fc62.jpg b/public/investasi/974a98dc-6198-4e3e-b241-9562adc2fc62.jpg deleted file mode 100644 index 110305ff..00000000 Binary files a/public/investasi/974a98dc-6198-4e3e-b241-9562adc2fc62.jpg and /dev/null differ diff --git a/public/file/ebf630db-9269-453a-818a-a4707966f15a.jpg b/public/investasi/9d6e5393-a808-40bc-a6de-c966fc4f4fc0.jpg similarity index 100% rename from public/file/ebf630db-9269-453a-818a-a4707966f15a.jpg rename to public/investasi/9d6e5393-a808-40bc-a6de-c966fc4f4fc0.jpg diff --git a/public/investasi/9ec4a36e-702a-4d94-bffd-4e8d33090248.jpg b/public/investasi/9ec4a36e-702a-4d94-bffd-4e8d33090248.jpg deleted file mode 100644 index 110305ff..00000000 Binary files a/public/investasi/9ec4a36e-702a-4d94-bffd-4e8d33090248.jpg and /dev/null differ diff --git a/public/investasi/ab589c37-5e8e-42de-ab3f-b2948bc9b54e.png b/public/investasi/ab589c37-5e8e-42de-ab3f-b2948bc9b54e.png new file mode 100644 index 00000000..e8961c82 Binary files /dev/null and b/public/investasi/ab589c37-5e8e-42de-ab3f-b2948bc9b54e.png differ diff --git a/public/investasi/ae0ec403-d7ab-49b7-a14a-f9d1eef0ebe8.jpg b/public/investasi/ae0ec403-d7ab-49b7-a14a-f9d1eef0ebe8.jpg deleted file mode 100644 index e2490e0d..00000000 Binary files a/public/investasi/ae0ec403-d7ab-49b7-a14a-f9d1eef0ebe8.jpg and /dev/null differ diff --git a/public/investasi/aecade9f-a9c6-4c65-b0f6-24ac3e074a58.jpg b/public/investasi/aecade9f-a9c6-4c65-b0f6-24ac3e074a58.jpg new file mode 100644 index 00000000..cbfea1c7 Binary files /dev/null and b/public/investasi/aecade9f-a9c6-4c65-b0f6-24ac3e074a58.jpg differ diff --git a/public/investasi/af17cca9-1878-493e-83b0-eb1ec7e2533d.jpg b/public/investasi/af17cca9-1878-493e-83b0-eb1ec7e2533d.jpg deleted file mode 100644 index f17ae14b..00000000 Binary files a/public/investasi/af17cca9-1878-493e-83b0-eb1ec7e2533d.jpg and /dev/null differ diff --git a/public/investasi/b988c656-c8b7-4065-a5a5-6813cbc9d077.jpeg b/public/investasi/b988c656-c8b7-4065-a5a5-6813cbc9d077.jpeg deleted file mode 100644 index 25a18f99..00000000 Binary files a/public/investasi/b988c656-c8b7-4065-a5a5-6813cbc9d077.jpeg and /dev/null differ diff --git a/public/investasi/18d79f6a-8b04-4b03-aa88-1f612708b15b.jpg b/public/investasi/d371b59a-f3e9-4026-b177-08e706228070.jpg similarity index 100% rename from public/investasi/18d79f6a-8b04-4b03-aa88-1f612708b15b.jpg rename to public/investasi/d371b59a-f3e9-4026-b177-08e706228070.jpg diff --git a/public/investasi/e73819a0-1aff-45ea-8711-4a28c704e455.jpg b/public/investasi/d57d693b-ac91-488b-b462-ed00730fb8d9.jpg similarity index 100% rename from public/investasi/e73819a0-1aff-45ea-8711-4a28c704e455.jpg rename to public/investasi/d57d693b-ac91-488b-b462-ed00730fb8d9.jpg diff --git a/public/investasi/ded2315c-19a8-44d1-b7ef-96e95f36f50a.png b/public/investasi/ded2315c-19a8-44d1-b7ef-96e95f36f50a.png new file mode 100644 index 00000000..e8961c82 Binary files /dev/null and b/public/investasi/ded2315c-19a8-44d1-b7ef-96e95f36f50a.png differ diff --git a/public/investasi/5c95f1a9-1d23-4461-bc72-b3e91a8c641c.jpg b/public/investasi/e810a225-9a75-4576-bfe3-436aa348dd61.jpg similarity index 100% rename from public/investasi/5c95f1a9-1d23-4461-bc72-b3e91a8c641c.jpg rename to public/investasi/e810a225-9a75-4576-bfe3-436aa348dd61.jpg diff --git a/public/investasi/0f26c0fc-a3d0-44b8-896c-ea0d750af313.jpg b/public/investasi/f5e5ca13-1ab9-484f-a057-cd75916edeee.jpg similarity index 100% rename from public/investasi/0f26c0fc-a3d0-44b8-896c-ea0d750af313.jpg rename to public/investasi/f5e5ca13-1ab9-484f-a057-cd75916edeee.jpg diff --git a/public/donasi/invoice/7293bb5a-df7e-4921-aae2-f525f3ebee3d.jpg b/public/investasi/invoice/7ae4e0cc-90f3-45ad-8c16-29df393fa2aa.jpg similarity index 100% rename from public/donasi/invoice/7293bb5a-df7e-4921-aae2-f525f3ebee3d.jpg rename to public/investasi/invoice/7ae4e0cc-90f3-45ad-8c16-29df393fa2aa.jpg diff --git a/public/donasi/invoice/5e4c18e4-06da-4e91-a2fa-b19ba1ab5fa8.png b/public/investasi/invoice/8a4d8bb5-6041-4f7e-ae6b-cf7e7566af19.png similarity index 100% rename from public/donasi/invoice/5e4c18e4-06da-4e91-a2fa-b19ba1ab5fa8.png rename to public/investasi/invoice/8a4d8bb5-6041-4f7e-ae6b-cf7e7566af19.png diff --git a/public/donasi/invoice/2a49f6f4-e438-4553-8805-262cfc149676.jpg b/public/investasi/invoice/ba686742-464b-472f-8493-5ea4cfa14029.jpg similarity index 100% rename from public/donasi/invoice/2a49f6f4-e438-4553-8805-262cfc149676.jpg rename to public/investasi/invoice/ba686742-464b-472f-8493-5ea4cfa14029.jpg diff --git a/public/donasi/invoice/49823a9a-0a6f-4098-85f9-25fa20b235e1.jpg b/public/investasi/invoice/bdfdc9df-5d53-4c1c-ad71-33d959c9adb0.jpg similarity index 100% rename from public/donasi/invoice/49823a9a-0a6f-4098-85f9-25fa20b235e1.jpg rename to public/investasi/invoice/bdfdc9df-5d53-4c1c-ad71-33d959c9adb0.jpg diff --git a/public/job/085b304e-7ec8-4581-9897-cf6da87ace02.png b/public/job/085b304e-7ec8-4581-9897-cf6da87ace02.png deleted file mode 100644 index f1aa5b43..00000000 Binary files a/public/job/085b304e-7ec8-4581-9897-cf6da87ace02.png and /dev/null differ diff --git a/public/job/0fbd6251-c6a4-4552-82be-f630f04b838c.jpg b/public/job/0fbd6251-c6a4-4552-82be-f630f04b838c.jpg deleted file mode 100644 index 4204a23e..00000000 Binary files a/public/job/0fbd6251-c6a4-4552-82be-f630f04b838c.jpg and /dev/null differ diff --git a/public/job/15634b64-db59-43ef-ad49-e6f4e9dd1329.jpg b/public/job/15634b64-db59-43ef-ad49-e6f4e9dd1329.jpg deleted file mode 100644 index 4204a23e..00000000 Binary files a/public/job/15634b64-db59-43ef-ad49-e6f4e9dd1329.jpg and /dev/null differ diff --git a/public/job/19681f45-09bd-4ab3-9756-ce3ab7e6a2a7.jpg b/public/job/19681f45-09bd-4ab3-9756-ce3ab7e6a2a7.jpg deleted file mode 100644 index 4204a23e..00000000 Binary files a/public/job/19681f45-09bd-4ab3-9756-ce3ab7e6a2a7.jpg and /dev/null differ diff --git a/public/job/6ca7d19c-6d7b-49fb-acd6-44e5f1b09d7b.jpg b/public/job/6ca7d19c-6d7b-49fb-acd6-44e5f1b09d7b.jpg deleted file mode 100644 index f1447727..00000000 Binary files a/public/job/6ca7d19c-6d7b-49fb-acd6-44e5f1b09d7b.jpg and /dev/null differ diff --git a/public/job/80b01061-3161-414e-980e-2fc3ac8ee1d3.jpg b/public/job/80b01061-3161-414e-980e-2fc3ac8ee1d3.jpg deleted file mode 100644 index bad7a539..00000000 Binary files a/public/job/80b01061-3161-414e-980e-2fc3ac8ee1d3.jpg and /dev/null differ diff --git a/public/job/8de58603-2b20-43b7-a847-b64979fb72bb.jpg b/public/job/8de58603-2b20-43b7-a847-b64979fb72bb.jpg deleted file mode 100644 index 1006efb3..00000000 Binary files a/public/job/8de58603-2b20-43b7-a847-b64979fb72bb.jpg and /dev/null differ diff --git a/public/job/a2486cad-442a-4f4b-b09c-9c0aa7a54cab.jpg b/public/job/a2486cad-442a-4f4b-b09c-9c0aa7a54cab.jpg deleted file mode 100644 index eeda6691..00000000 Binary files a/public/job/a2486cad-442a-4f4b-b09c-9c0aa7a54cab.jpg and /dev/null differ diff --git a/public/job/d643b552-9dd9-4f28-a5cc-3cdaa38b651a.jpg b/public/job/d643b552-9dd9-4f28-a5cc-3cdaa38b651a.jpg deleted file mode 100644 index 4204a23e..00000000 Binary files a/public/job/d643b552-9dd9-4f28-a5cc-3cdaa38b651a.jpg and /dev/null differ diff --git a/public/job/d898fe23-0689-4a74-b389-f90368547015.png b/public/job/d898fe23-0689-4a74-b389-f90368547015.png deleted file mode 100644 index f1aa5b43..00000000 Binary files a/public/job/d898fe23-0689-4a74-b389-f90368547015.png and /dev/null differ diff --git a/public/job/e5700057-a462-4085-84a4-c2a5acb36b4c.png b/public/job/e5700057-a462-4085-84a4-c2a5acb36b4c.png deleted file mode 100644 index f1aa5b43..00000000 Binary files a/public/job/e5700057-a462-4085-84a4-c2a5acb36b4c.png and /dev/null differ diff --git a/public/job/e8df686f-85a7-4c7e-a10d-177744ecbb79.jpg b/public/job/e8df686f-85a7-4c7e-a10d-177744ecbb79.jpg deleted file mode 100644 index 1006efb3..00000000 Binary files a/public/job/e8df686f-85a7-4c7e-a10d-177744ecbb79.jpg and /dev/null differ diff --git a/public/map/foto/058062ed-4f6c-4b66-973d-baec02269426.jpg b/public/map/foto/058062ed-4f6c-4b66-973d-baec02269426.jpg deleted file mode 100644 index 6649ae84..00000000 Binary files a/public/map/foto/058062ed-4f6c-4b66-973d-baec02269426.jpg and /dev/null differ diff --git a/public/map/foto/a4e06daa-c60c-47a5-b401-aa9dd2d62890.jpg b/public/map/foto/46652933-8736-44d7-8a0b-d2a7ba80847d.jpg similarity index 100% rename from public/map/foto/a4e06daa-c60c-47a5-b401-aa9dd2d62890.jpg rename to public/map/foto/46652933-8736-44d7-8a0b-d2a7ba80847d.jpg diff --git a/public/map/foto/827d47a1-7578-4a6e-8441-6f557ca0e610.jpg b/public/map/foto/827d47a1-7578-4a6e-8441-6f557ca0e610.jpg new file mode 100644 index 00000000..830b275a Binary files /dev/null and b/public/map/foto/827d47a1-7578-4a6e-8441-6f557ca0e610.jpg differ diff --git a/public/map/pin/6d3378ed-2f89-4a8b-b93a-787d72118a17.png b/public/map/pin/285525f9-7e90-454c-8615-3cccd731441b.png similarity index 100% rename from public/map/pin/6d3378ed-2f89-4a8b-b93a-787d72118a17.png rename to public/map/pin/285525f9-7e90-454c-8615-3cccd731441b.png diff --git a/public/map/pin/3b90a6b0-660f-4b0c-b9a2-4a7859b7d15f.png b/public/map/pin/3b90a6b0-660f-4b0c-b9a2-4a7859b7d15f.png deleted file mode 100644 index 7db4a537..00000000 Binary files a/public/map/pin/3b90a6b0-660f-4b0c-b9a2-4a7859b7d15f.png and /dev/null differ diff --git a/public/map/pin/3d9d3ee4-4c58-4297-b73d-3f04d00a1279.png b/public/map/pin/3d9d3ee4-4c58-4297-b73d-3f04d00a1279.png new file mode 100644 index 00000000..eb94d9c2 Binary files /dev/null and b/public/map/pin/3d9d3ee4-4c58-4297-b73d-3f04d00a1279.png differ diff --git a/public/map/pin/3ff6721e-6f70-49a1-ba30-e9a0256fbea6.png b/public/map/pin/3ff6721e-6f70-49a1-ba30-e9a0256fbea6.png new file mode 100644 index 00000000..d3b8ec8a Binary files /dev/null and b/public/map/pin/3ff6721e-6f70-49a1-ba30-e9a0256fbea6.png differ diff --git a/public/portofolio/logo/350232de-d19d-4aed-8e65-0f4aed58d386.jpg b/public/portofolio/logo/178ae3d7-57e9-474b-8dc7-1b1441eb1055.jpg similarity index 100% rename from public/portofolio/logo/350232de-d19d-4aed-8e65-0f4aed58d386.jpg rename to public/portofolio/logo/178ae3d7-57e9-474b-8dc7-1b1441eb1055.jpg diff --git a/public/portofolio/logo/28c87bcb-61dd-4111-a694-c8d1e792311f.jpg b/public/portofolio/logo/28c87bcb-61dd-4111-a694-c8d1e792311f.jpg deleted file mode 100644 index d906e018..00000000 Binary files a/public/portofolio/logo/28c87bcb-61dd-4111-a694-c8d1e792311f.jpg and /dev/null differ diff --git a/public/portofolio/logo/b46ad0ae-497e-4968-9943-14b571adce9a.jpg b/public/portofolio/logo/b46ad0ae-497e-4968-9943-14b571adce9a.jpg deleted file mode 100644 index b069b1ed..00000000 Binary files a/public/portofolio/logo/b46ad0ae-497e-4968-9943-14b571adce9a.jpg and /dev/null differ diff --git a/public/portofolio/logo/b5716434-cc9d-4b83-a447-6ad4376d4899.png b/public/portofolio/logo/b5716434-cc9d-4b83-a447-6ad4376d4899.png deleted file mode 100644 index 0733e81b..00000000 Binary files a/public/portofolio/logo/b5716434-cc9d-4b83-a447-6ad4376d4899.png and /dev/null differ diff --git a/public/portofolio/logo/baad553b-93eb-4f3a-b2cf-bfc017d1f745.png b/public/portofolio/logo/e33d3035-9513-479d-8fb8-2788206bde03.png similarity index 100% rename from public/portofolio/logo/baad553b-93eb-4f3a-b2cf-bfc017d1f745.png rename to public/portofolio/logo/e33d3035-9513-479d-8fb8-2788206bde03.png diff --git a/public/profile/background/c5387b1b-a1da-4e0a-9961-e00cbe454b69.jpeg b/public/profile/background/c5387b1b-a1da-4e0a-9961-e00cbe454b69.jpeg deleted file mode 100644 index 32ce4052..00000000 Binary files a/public/profile/background/c5387b1b-a1da-4e0a-9961-e00cbe454b69.jpeg and /dev/null differ diff --git a/public/profile/background/c9eb5476-197d-4569-82a3-45e1e9226acf.jpeg b/public/profile/background/c9eb5476-197d-4569-82a3-45e1e9226acf.jpeg deleted file mode 100644 index 1c6a9047..00000000 Binary files a/public/profile/background/c9eb5476-197d-4569-82a3-45e1e9226acf.jpeg and /dev/null differ diff --git a/public/profile/background/847a4fa4-837d-4abd-aef2-435d8f259b4c.jpeg b/public/profile/background/fa163c38-4ba2-4c07-8d20-9e77e375ccbe.jpeg similarity index 100% rename from public/profile/background/847a4fa4-837d-4abd-aef2-435d8f259b4c.jpeg rename to public/profile/background/fa163c38-4ba2-4c07-8d20-9e77e375ccbe.jpeg diff --git a/public/profile/background/fe538c17-3907-4deb-a8e4-4572ea81eecf.jpeg b/public/profile/background/fe538c17-3907-4deb-a8e4-4572ea81eecf.jpeg new file mode 100644 index 00000000..eb24410a Binary files /dev/null and b/public/profile/background/fe538c17-3907-4deb-a8e4-4572ea81eecf.jpeg differ diff --git a/public/profile/foto/6452c349-66fc-4db7-99ff-37a659f351bb.jpeg b/public/profile/foto/6452c349-66fc-4db7-99ff-37a659f351bb.jpeg deleted file mode 100644 index 4660498f..00000000 Binary files a/public/profile/foto/6452c349-66fc-4db7-99ff-37a659f351bb.jpeg and /dev/null differ diff --git a/public/profile/foto/6b616896-18b4-4d16-9f25-84332fb0679b.jpeg b/public/profile/foto/6b616896-18b4-4d16-9f25-84332fb0679b.jpeg deleted file mode 100644 index 12a8ae8b..00000000 Binary files a/public/profile/foto/6b616896-18b4-4d16-9f25-84332fb0679b.jpeg and /dev/null differ diff --git a/public/profile/foto/dd539470-959e-4063-aa78-86626bd185be.jpeg b/public/profile/foto/dd539470-959e-4063-aa78-86626bd185be.jpeg deleted file mode 100644 index 309c5830..00000000 Binary files a/public/profile/foto/dd539470-959e-4063-aa78-86626bd185be.jpeg and /dev/null differ diff --git a/public/profile/foto/f29acfca-8c7d-4613-9c4c-51eba880a979.jpg b/public/profile/foto/de5fcfeb-f4ac-4790-a046-ff6f63220382.jpg similarity index 100% rename from public/profile/foto/f29acfca-8c7d-4613-9c4c-51eba880a979.jpg rename to public/profile/foto/de5fcfeb-f4ac-4790-a046-ff6f63220382.jpg diff --git a/public/profile/foto/02fd0df2-337e-474f-972f-cd3748ac19a7.jpg b/public/profile/foto/e4e0e348-3670-4b77-ac83-e570fa696b0c.jpg similarity index 100% rename from public/profile/foto/02fd0df2-337e-474f-972f-cd3748ac19a7.jpg rename to public/profile/foto/e4e0e348-3670-4b77-ac83-e570fa696b0c.jpg diff --git a/src/app/api/investasi/bukti-transfer/[id]/route.ts b/src/app/api/investasi/bukti-transfer/[id]/route.ts new file mode 100644 index 00000000..0877bb3d --- /dev/null +++ b/src/app/api/investasi/bukti-transfer/[id]/route.ts @@ -0,0 +1,33 @@ +import { NextRequest, NextResponse } from "next/server"; +import fs from "fs"; +import prisma from "@/app/lib/prisma"; + +export async function GET( + req: NextRequest, + { params }: { params: { id: string } } +) { + const data = await prisma.images.findUnique({ + where: { + id: params.id, + }, + select: { + url: true, + }, + }); + + if (!fs.existsSync(`./public/investasi/invoice/${data?.url}`)) { + const fl = fs.readFileSync(`./public/aset/no-img.png`); + return new NextResponse(fl, { + headers: { + "Content-Type": "image/png", + }, + }); + } + + const fl = fs.readFileSync(`./public/investasi/invoice/${data?.url}`); + return new NextResponse(fl, { + headers: { + "Content-Type": "image/png", + }, + }); +} diff --git a/src/app/api/seeder/route.ts b/src/app/api/seeder/route.ts index 2f2ff12f..024cf41a 100644 --- a/src/app/api/seeder/route.ts +++ b/src/app/api/seeder/route.ts @@ -6,7 +6,6 @@ import pencarianInvestor from "./../../../bin/seeder/investasi/pencarian_investo import periodeDeviden from "./../../../bin/seeder/investasi/periode_deviden.json"; import pembagianDeviden from "./../../../bin/seeder/investasi/pembagian_deviden.json"; import statusInvestasi from "./../../../bin/seeder/investasi/status_investasi.json"; -import namaBank from "./../../../bin/seeder/investasi/nama_bank.json"; import statusTransaksiInvestasi from "./../../../bin/seeder/investasi/status_transaksi_investasi.json"; import jenisProgres from "../../../bin/seeder/investasi/master_progres.json"; import userSeeder from "../../../bin/seeder/user_seeder.json"; @@ -25,11 +24,11 @@ import collaboration_industri from "../../../bin/seeder/colab/master_industri.js import collaboration_status from "../../../bin/seeder/colab/master_status.json"; import collaboration_jumlah_minimal_room from "../../../bin/seeder/colab/jumlah_minimal_room.json"; import nomor_admin from "../../../bin/seeder/nomor_admin.json"; +import { master_nama_bank } from "@/bin/seeder/master"; export async function GET(req: Request) { const dev = new URL(req.url).searchParams.get("dev"); if (dev === "DEV-HIPMI") { - for (let i of userRole) { const data = await prisma.masterUserRole.upsert({ where: { @@ -146,19 +145,21 @@ export async function GET(req: Request) { }); } - for (let i of namaBank) { + for (let i of master_nama_bank) { await prisma.masterBank.upsert({ where: { id: i.id.toString(), }, create: { id: i.id.toString(), - name: i.name, + namaBank: i.namaBank, + namaAkun: i.namaAkun, norek: i.norek.toString(), }, update: { id: i.id.toString(), - name: i.name, + namaBank: i.namaBank, + namaAkun: i.namaAkun, norek: i.norek.toString(), }, }); diff --git a/src/app/dev/admin/app-information/main/page.tsx b/src/app/dev/admin/app-information/main/page.tsx index 7af7b346..42c3b5de 100644 --- a/src/app/dev/admin/app-information/main/page.tsx +++ b/src/app/dev/admin/app-information/main/page.tsx @@ -1,16 +1,19 @@ -import { AdminAppInformation_MainView } from "@/app_modules/admin/app_info"; +import { adminAppInformation_funGetBidangBisnis } from "@/app_modules/admin/app_info/fun"; import adminAppInformation_getMasterBank from "@/app_modules/admin/app_info/fun/master/get_list_bank"; import adminAppInformation_getNomorAdmin from "@/app_modules/admin/app_info/fun/master/get_nomor_admin"; +import { AdminAppInformation_UiMain } from "@/app_modules/admin/app_info/ui"; export default async function Page() { const nomorAdmin = await adminAppInformation_getNomorAdmin(); const listBank = await adminAppInformation_getMasterBank(); + const dataBidangBisnis = await adminAppInformation_funGetBidangBisnis() return ( <> - ); diff --git a/src/app/dev/admin/colab/dashboard/loading.tsx b/src/app/dev/admin/colab/dashboard/loading.tsx deleted file mode 100644 index 8767538e..00000000 --- a/src/app/dev/admin/colab/dashboard/loading.tsx +++ /dev/null @@ -1,9 +0,0 @@ -import ComponentAdminGlobal_LoadingPage from "@/app_modules/admin/_admin_global/loading_admin_page"; - -export default async function Page() { - return ( - <> - - - ); -} diff --git a/src/app/dev/admin/colab/sub-menu/loading.tsx b/src/app/dev/admin/colab/sub-menu/loading.tsx deleted file mode 100644 index 8767538e..00000000 --- a/src/app/dev/admin/colab/sub-menu/loading.tsx +++ /dev/null @@ -1,9 +0,0 @@ -import ComponentAdminGlobal_LoadingPage from "@/app_modules/admin/_admin_global/loading_admin_page"; - -export default async function Page() { - return ( - <> - - - ); -} diff --git a/src/app/dev/admin/developer/loading.tsx b/src/app/dev/admin/developer/loading.tsx deleted file mode 100644 index 8767538e..00000000 --- a/src/app/dev/admin/developer/loading.tsx +++ /dev/null @@ -1,9 +0,0 @@ -import ComponentAdminGlobal_LoadingPage from "@/app_modules/admin/_admin_global/loading_admin_page"; - -export default async function Page() { - return ( - <> - - - ); -} diff --git a/src/app/dev/admin/donasi/main/loading.tsx b/src/app/dev/admin/donasi/main/loading.tsx deleted file mode 100644 index 8767538e..00000000 --- a/src/app/dev/admin/donasi/main/loading.tsx +++ /dev/null @@ -1,9 +0,0 @@ -import ComponentAdminGlobal_LoadingPage from "@/app_modules/admin/_admin_global/loading_admin_page"; - -export default async function Page() { - return ( - <> - - - ); -} diff --git a/src/app/dev/admin/donasi/sub-menu/review/page.tsx b/src/app/dev/admin/donasi/sub-menu/review/page.tsx index 45e018cf..0031b08a 100644 --- a/src/app/dev/admin/donasi/sub-menu/review/page.tsx +++ b/src/app/dev/admin/donasi/sub-menu/review/page.tsx @@ -1,6 +1,6 @@ import { AdminDonasi_TableReview } from "@/app_modules/admin/donasi"; import adminDonasi_getListReview from "@/app_modules/admin/donasi/fun/get/get_list_review"; -import { user_getOneUserId } from "@/app_modules/fun_global/get_user_token"; +import { user_funGetOneUserId } from "@/app_modules/fun_global/get_user_token"; export default async function Page() { const listReview = await adminDonasi_getListReview({page: 1}); diff --git a/src/app/dev/admin/event/child/riwayat/page.tsx b/src/app/dev/admin/event/child/riwayat/page.tsx index 8d3dbdd0..a6923bad 100644 --- a/src/app/dev/admin/event/child/riwayat/page.tsx +++ b/src/app/dev/admin/event/child/riwayat/page.tsx @@ -1,9 +1,8 @@ import { AdminEvent_Riwayat } from "@/app_modules/admin/event"; -import { AdminEvent_getListAllRiwayat } from "@/app_modules/admin/event/fun/get/get_list_all_riwayat"; +import { adminEvent_funGetListAllRiwayat } from "@/app_modules/admin/event/fun/get/get_list_all_riwayat"; export default async function Page() { - const listRiwayat = await AdminEvent_getListAllRiwayat() - + const listRiwayat = await adminEvent_funGetListAllRiwayat({ page: 1 }); return ( <> diff --git a/src/app/dev/admin/event/detail/main-detail/page.tsx b/src/app/dev/admin/event/detail/main-detail/page.tsx new file mode 100644 index 00000000..57f5cef0 --- /dev/null +++ b/src/app/dev/admin/event/detail/main-detail/page.tsx @@ -0,0 +1,3 @@ +export default function Page({ params }: { params: { id: string } }) { + return null; +} diff --git a/src/app/dev/admin/event/detail/peserta/[id]/page.tsx b/src/app/dev/admin/event/detail/peserta/[id]/page.tsx new file mode 100644 index 00000000..7038c519 --- /dev/null +++ b/src/app/dev/admin/event/detail/peserta/[id]/page.tsx @@ -0,0 +1,13 @@ +import { AdminEvent_UiDetailPeserta } from "@/app_modules/admin/event/_ui"; +import { adminEvent_getListPesertaById } from "@/app_modules/admin/event/fun/get/get_list_peserta_by_id"; + +export default async function Page({ params }: { params: { id: string } }) { + const eventId = params.id; + const dataPeserta = await adminEvent_getListPesertaById({ eventId, page: 1 }); + + return ( + <> + + + ); +} diff --git a/src/app/dev/admin/event/main/loading.tsx b/src/app/dev/admin/event/main/loading.tsx deleted file mode 100644 index 8767538e..00000000 --- a/src/app/dev/admin/event/main/loading.tsx +++ /dev/null @@ -1,9 +0,0 @@ -import ComponentAdminGlobal_LoadingPage from "@/app_modules/admin/_admin_global/loading_admin_page"; - -export default async function Page() { - return ( - <> - - - ); -} diff --git a/src/app/dev/admin/event/table/publish/page.tsx b/src/app/dev/admin/event/table/publish/page.tsx index 6b7d421f..50fc6b34 100644 --- a/src/app/dev/admin/event/table/publish/page.tsx +++ b/src/app/dev/admin/event/table/publish/page.tsx @@ -1,8 +1,9 @@ import { AdminEvent_TablePublish } from "@/app_modules/admin/event"; +import { adminEvent_funGetListPublish } from "@/app_modules/admin/event/fun"; import { AdminEvent_getListTableByStatusId } from "@/app_modules/admin/event/fun/get/get_list_table_by_status_id"; export default async function Page() { - const listPublish = await AdminEvent_getListTableByStatusId("1"); + const listPublish = await adminEvent_funGetListPublish({page: 1}); return ( <> diff --git a/src/app/dev/admin/event/table/reject/page.tsx b/src/app/dev/admin/event/table/reject/page.tsx index 74e069b4..236885b6 100644 --- a/src/app/dev/admin/event/table/reject/page.tsx +++ b/src/app/dev/admin/event/table/reject/page.tsx @@ -1,10 +1,12 @@ import { AdminEvent_TableReject } from "@/app_modules/admin/event"; -import { AdminEvent_getListTableByStatusId } from "@/app_modules/admin/event/fun/get/get_list_table_by_status_id"; +import { adminEvent_funGetListReject } from "@/app_modules/admin/event/fun"; export default async function Page() { - const listReject = await AdminEvent_getListTableByStatusId("4") + const listReject = await adminEvent_funGetListReject({ page: 1 }); - return <> - + return ( + <> + -} \ No newline at end of file + ); +} diff --git a/src/app/dev/admin/event/table/review/page.tsx b/src/app/dev/admin/event/table/review/page.tsx index d21a34a1..fb6d8d3f 100644 --- a/src/app/dev/admin/event/table/review/page.tsx +++ b/src/app/dev/admin/event/table/review/page.tsx @@ -1,10 +1,13 @@ import { AdminEvent_TableReview } from "@/app_modules/admin/event"; +import { adminEvent_funGetListReview } from "@/app_modules/admin/event/fun"; import { AdminEvent_getListTableByStatusId } from "@/app_modules/admin/event/fun/get/get_list_table_by_status_id"; export default async function Page() { - const listReview = await AdminEvent_getListTableByStatusId("2") + const listReview = await adminEvent_funGetListReview({ page: 1 }); - return <> - - -} \ No newline at end of file + return ( + <> + + + ); +} diff --git a/src/app/dev/admin/forum/main/loading.tsx b/src/app/dev/admin/forum/main/loading.tsx deleted file mode 100644 index 8767538e..00000000 --- a/src/app/dev/admin/forum/main/loading.tsx +++ /dev/null @@ -1,9 +0,0 @@ -import ComponentAdminGlobal_LoadingPage from "@/app_modules/admin/_admin_global/loading_admin_page"; - -export default async function Page() { - return ( - <> - - - ); -} diff --git a/src/app/dev/admin/investasi/bukti-transfer/[id]/page.tsx b/src/app/dev/admin/investasi/bukti-transfer/[id]/page.tsx new file mode 100644 index 00000000..9ee34fed --- /dev/null +++ b/src/app/dev/admin/investasi/bukti-transfer/[id]/page.tsx @@ -0,0 +1,10 @@ +import { AdminInvestasi_DetailBuktiTransfer } from "@/app_modules/admin/investasi/detail"; + +export default async function Page({ params }: { params: { id: string } }) { + const imageId = params.id; + return ( + <> + + + ); +} diff --git a/src/app/dev/admin/investasi/bukti_transfer/layout.tsx b/src/app/dev/admin/investasi/bukti_transfer/layout.tsx deleted file mode 100644 index cac14c4b..00000000 --- a/src/app/dev/admin/investasi/bukti_transfer/layout.tsx +++ /dev/null @@ -1,16 +0,0 @@ -import { Admin_LayoutBuktiTransferInvestasi } from "@/app_modules/admin/investasi"; -import React from "react"; - -export default async function Layout({ - children, -}: { - children: React.ReactNode; -}) { - return ( - <> - - {children} - - - ); -} diff --git a/src/app/dev/admin/investasi/bukti_transfer/page.tsx b/src/app/dev/admin/investasi/bukti_transfer/page.tsx deleted file mode 100644 index 90040a12..00000000 --- a/src/app/dev/admin/investasi/bukti_transfer/page.tsx +++ /dev/null @@ -1,9 +0,0 @@ -import { Admin_BuktiTransferInvestasi } from "@/app_modules/admin/investasi"; - -export default async function Page() { - return ( - <> - - - ); -} diff --git a/src/app/dev/admin/investasi/detail/publish/[id]/page.tsx b/src/app/dev/admin/investasi/detail/publish/[id]/page.tsx index 1300ad94..b87747e9 100644 --- a/src/app/dev/admin/investasi/detail/publish/[id]/page.tsx +++ b/src/app/dev/admin/investasi/detail/publish/[id]/page.tsx @@ -1,13 +1,27 @@ import { AdminInvestasi_DetailPublish } from "@/app_modules/admin/investasi"; +import { + adminInvestasi_funGetAllTransaksiById, + adminInvestasi_getStatusInvestasi, +} from "@/app_modules/admin/investasi/fun"; import getOneInvestasiById from "@/app_modules/investasi/fun/get_one_investasi_by_id"; +export default async function Page({ params }: { params: { id: string } }) { + const investasiId = params.id; + const dataInvestasi = await getOneInvestasiById(investasiId); + const statusTransaksi = await adminInvestasi_getStatusInvestasi(); + const dataTransaksi = await adminInvestasi_funGetAllTransaksiById({ + investasiId, + page: 1, + }); - -export default async function Page({params}: {params: {id: string}}) { - const investasiId = params.id; - const dataInvestasi = await getOneInvestasiById(investasiId); - - return<> - + return ( + <> + -} \ No newline at end of file + ); +} diff --git a/src/app/dev/admin/investasi/detail/review/[id]/page.tsx b/src/app/dev/admin/investasi/detail/review/[id]/page.tsx index ffa8ea6f..840957b1 100644 --- a/src/app/dev/admin/investasi/detail/review/[id]/page.tsx +++ b/src/app/dev/admin/investasi/detail/review/[id]/page.tsx @@ -1,5 +1,4 @@ import { Admin_KonfirmasiInvestasi } from "@/app_modules/admin/investasi"; -import { funGetUserProfile } from "@/app_modules/fun_global/get_user_profile"; import getOneInvestasiById from "@/app_modules/investasi/fun/get_one_investasi_by_id"; export default async function Page({ params }: { params: { id: string } }) { diff --git a/src/app/dev/admin/investasi/main/loading.tsx b/src/app/dev/admin/investasi/main/loading.tsx deleted file mode 100644 index 8767538e..00000000 --- a/src/app/dev/admin/investasi/main/loading.tsx +++ /dev/null @@ -1,9 +0,0 @@ -import ComponentAdminGlobal_LoadingPage from "@/app_modules/admin/_admin_global/loading_admin_page"; - -export default async function Page() { - return ( - <> - - - ); -} diff --git a/src/app/dev/admin/job/main/loading.tsx b/src/app/dev/admin/job/main/loading.tsx deleted file mode 100644 index 8767538e..00000000 --- a/src/app/dev/admin/job/main/loading.tsx +++ /dev/null @@ -1,9 +0,0 @@ -import ComponentAdminGlobal_LoadingPage from "@/app_modules/admin/_admin_global/loading_admin_page"; - -export default async function Page() { - return ( - <> - - - ); -} diff --git a/src/app/dev/admin/layout.tsx b/src/app/dev/admin/layout.tsx index ed1372dc..3ee61021 100644 --- a/src/app/dev/admin/layout.tsx +++ b/src/app/dev/admin/layout.tsx @@ -1,7 +1,7 @@ import { AdminLayout } from "@/app_modules/admin/main_dashboard"; import adminNotifikasi_countNotifikasi from "@/app_modules/admin/notifikasi/fun/count/count_is_read"; import adminNotifikasi_getByUserId from "@/app_modules/admin/notifikasi/fun/get/get_notifikasi_by_user_id"; -import { user_getOneUserId } from "@/app_modules/fun_global/get_user_token"; +import { user_funGetOneUserId } from "@/app_modules/fun_global/get_user_token"; import { user_getOneByUserId } from "@/app_modules/home/fun/get/get_one_user_by_id"; import React from "react"; @@ -10,7 +10,7 @@ export default async function Layout({ }: { children: React.ReactNode; }) { - const userId = await user_getOneUserId(); + const userId = await user_funGetOneUserId(); const dataUser = await user_getOneByUserId(userId); const listNotif = await adminNotifikasi_getByUserId(); const countNotifikasi = await adminNotifikasi_countNotifikasi(); diff --git a/src/app/dev/admin/main/dashboard/loading.tsx b/src/app/dev/admin/main/dashboard/loading.tsx deleted file mode 100644 index 8767538e..00000000 --- a/src/app/dev/admin/main/dashboard/loading.tsx +++ /dev/null @@ -1,9 +0,0 @@ -import ComponentAdminGlobal_LoadingPage from "@/app_modules/admin/_admin_global/loading_admin_page"; - -export default async function Page() { - return ( - <> - - - ); -} diff --git a/src/app/dev/admin/vote/child/riwayat/page.tsx b/src/app/dev/admin/vote/child/riwayat/page.tsx index 5e340dc1..df211c60 100644 --- a/src/app/dev/admin/vote/child/riwayat/page.tsx +++ b/src/app/dev/admin/vote/child/riwayat/page.tsx @@ -1,8 +1,9 @@ import { AdminVote_Riwayat } from "@/app_modules/admin/vote"; +import { adminVote_funGetListRiwayat } from "@/app_modules/admin/vote/fun"; import { AdminVote_getListTableByStatusId } from "@/app_modules/admin/vote/fun/get/get_list_table_by_status_id"; export default async function Page() { - const dataVote = await AdminVote_getListTableByStatusId("0"); + const dataVote = await adminVote_funGetListRiwayat({page: 1}); return ( <> diff --git a/src/app/dev/admin/vote/child/table_publish/page.tsx b/src/app/dev/admin/vote/child/table_publish/page.tsx index 05f09fd9..485a1e7b 100644 --- a/src/app/dev/admin/vote/child/table_publish/page.tsx +++ b/src/app/dev/admin/vote/child/table_publish/page.tsx @@ -1,8 +1,9 @@ import { AdminVote_TablePublish } from "@/app_modules/admin/vote"; import { AdminVote_getListTableByStatusId } from "@/app_modules/admin/vote/fun/get/get_list_table_by_status_id"; +import { adminVote_funGetListPublish } from "@/app_modules/admin/vote/fun/get/status/get_list_publish"; export default async function Page() { - const dataVote = await AdminVote_getListTableByStatusId("1") + const dataVote = await adminVote_funGetListPublish({page: 1}); return ( <> diff --git a/src/app/dev/admin/vote/child/table_reject/page.tsx b/src/app/dev/admin/vote/child/table_reject/page.tsx index 2eb2d72b..a941804b 100644 --- a/src/app/dev/admin/vote/child/table_reject/page.tsx +++ b/src/app/dev/admin/vote/child/table_reject/page.tsx @@ -1,11 +1,11 @@ import { AdminVote_TableReject } from "@/app_modules/admin/vote"; -import { AdminVote_getListTableByStatusId } from "@/app_modules/admin/vote/fun/get/get_list_table_by_status_id"; +import { adminVote_funGetListReject } from "@/app_modules/admin/vote/fun"; export default async function Page() { - const dataVote = await AdminVote_getListTableByStatusId("4"); + const dataVote = await adminVote_funGetListReject({ page: 1 }); return ( <> - + ); } diff --git a/src/app/dev/admin/vote/child/table_review/page.tsx b/src/app/dev/admin/vote/child/table_review/page.tsx index 25ff7f2e..2ce5111a 100644 --- a/src/app/dev/admin/vote/child/table_review/page.tsx +++ b/src/app/dev/admin/vote/child/table_review/page.tsx @@ -1,9 +1,8 @@ import { AdminVote_TableReview } from "@/app_modules/admin/vote"; -import { AdminVote_getListTableByStatusId } from "@/app_modules/admin/vote/fun/get/get_list_table_by_status_id"; - +import { adminVote_funGetListReview } from "@/app_modules/admin/vote/fun"; export default async function Page() { - const listVote = await AdminVote_getListTableByStatusId("2") + const listVote = await adminVote_funGetListReview({ page: 1 }); return ( <> diff --git a/src/app/dev/admin/vote/main/loading.tsx b/src/app/dev/admin/vote/main/loading.tsx deleted file mode 100644 index 8767538e..00000000 --- a/src/app/dev/admin/vote/main/loading.tsx +++ /dev/null @@ -1,9 +0,0 @@ -import ComponentAdminGlobal_LoadingPage from "@/app_modules/admin/_admin_global/loading_admin_page"; - -export default async function Page() { - return ( - <> - - - ); -} diff --git a/src/app/dev/colab/detail/group/[id]/page.tsx b/src/app/dev/colab/detail/group/[id]/page.tsx index 420aa361..51c5968a 100644 --- a/src/app/dev/colab/detail/group/[id]/page.tsx +++ b/src/app/dev/colab/detail/group/[id]/page.tsx @@ -4,13 +4,13 @@ import { Colab_GroupChatView, } from "@/app_modules/colab"; import colab_getMessageByRoomId from "@/app_modules/colab/fun/get/room_chat/get_message_by_room_id"; -import { user_getOneUserId } from "@/app_modules/fun_global/get_user_token"; +import { user_funGetOneUserId } from "@/app_modules/fun_global/get_user_token"; import { user_getOneByUserId } from "@/app_modules/home/fun/get/get_one_user_by_id"; import _ from "lodash"; export default async function Page({ params }: { params: { id: string } }) { const roomId = params.id; - const userLoginId = await user_getOneUserId(); + const userLoginId = await user_funGetOneUserId(); const getData = (await adminColab_getOneRoomChatById({ roomId: roomId })) .data; const dataRoom = _.omit(getData, [ diff --git a/src/app/dev/colab/detail/main_detail/[id]/layout.tsx b/src/app/dev/colab/detail/main_detail/[id]/layout.tsx index 9c36e1c7..fd2f6a6b 100644 --- a/src/app/dev/colab/detail/main_detail/[id]/layout.tsx +++ b/src/app/dev/colab/detail/main_detail/[id]/layout.tsx @@ -1,6 +1,6 @@ import { LayoutColab_MainDetail } from "@/app_modules/colab"; import colab_getOneCollaborationById from "@/app_modules/colab/fun/get/get_one_by_id"; -import { user_getOneUserId } from "@/app_modules/fun_global/get_user_token"; +import { user_funGetOneUserId } from "@/app_modules/fun_global/get_user_token"; import React from "react"; export default async function Layout({ @@ -13,7 +13,7 @@ export default async function Layout({ const colabId = params.id; const dataColab = await colab_getOneCollaborationById(colabId); const authorId = dataColab?.Author?.id; - const userLoginId = await user_getOneUserId(); + const userLoginId = await user_funGetOneUserId(); return ( <> diff --git a/src/app/dev/colab/detail/main_detail/[id]/page.tsx b/src/app/dev/colab/detail/main_detail/[id]/page.tsx index 1c38b796..eb4eed2a 100644 --- a/src/app/dev/colab/detail/main_detail/[id]/page.tsx +++ b/src/app/dev/colab/detail/main_detail/[id]/page.tsx @@ -2,11 +2,11 @@ import { Colab_MainDetail } from "@/app_modules/colab"; import colab_funCekPartisipasiById from "@/app_modules/colab/fun/get/cek_partisipasi_by_user_id"; import colab_getListPartisipanByColabId from "@/app_modules/colab/fun/get/get_list_partisipan_by_id"; import colab_getOneCollaborationById from "@/app_modules/colab/fun/get/get_one_by_id"; -import { user_getOneUserId } from "@/app_modules/fun_global/get_user_token"; +import { user_funGetOneUserId } from "@/app_modules/fun_global/get_user_token"; export default async function Page({ params }: { params: { id: string } }) { let colabId = params.id; - const userLoginId = await user_getOneUserId(); + const userLoginId = await user_funGetOneUserId(); const dataColab = await colab_getOneCollaborationById(colabId); const listPartisipan = await colab_getListPartisipanByColabId(colabId); const cekPartisipan = await colab_funCekPartisipasiById(colabId); diff --git a/src/app/dev/colab/main/beranda/page.tsx b/src/app/dev/colab/main/beranda/page.tsx index 29973ad3..a049bf12 100644 --- a/src/app/dev/colab/main/beranda/page.tsx +++ b/src/app/dev/colab/main/beranda/page.tsx @@ -1,10 +1,10 @@ import { Colab_Beranda } from "@/app_modules/colab"; import colab_getListAllProyek from "@/app_modules/colab/fun/get/get_list_all_proyek"; -import { user_getOneUserId } from "@/app_modules/fun_global/get_user_token"; +import { user_funGetOneUserId } from "@/app_modules/fun_global/get_user_token"; export default async function Page() { const listData = await colab_getListAllProyek({page: 1}); - const userLoginId = await user_getOneUserId(); + const userLoginId = await user_funGetOneUserId(); return ( <> diff --git a/src/app/dev/donasi/create/cerita_penggalang/[id]/page.tsx b/src/app/dev/donasi/create/cerita_penggalang/[id]/page.tsx index 39d228ea..1f141e66 100644 --- a/src/app/dev/donasi/create/cerita_penggalang/[id]/page.tsx +++ b/src/app/dev/donasi/create/cerita_penggalang/[id]/page.tsx @@ -1,10 +1,10 @@ import { CreateCeritaPenggalangDonasi } from "@/app_modules/donasi"; import { Donasi_getTemporaryCreate } from "@/app_modules/donasi/fun/get/get_temporary_create"; -import { user_getOneUserId } from "@/app_modules/fun_global/get_user_token"; +import { user_funGetOneUserId } from "@/app_modules/fun_global/get_user_token"; export default async function Page({ params }: { params: { id: string } }) { const getTemporaryCreate = await Donasi_getTemporaryCreate(params.id); - const userId = await user_getOneUserId(); + const userId = await user_funGetOneUserId(); return ( <> diff --git a/src/app/dev/donasi/create/create_donasi/page.tsx b/src/app/dev/donasi/create/create_donasi/page.tsx index d1589c57..d1d187a9 100644 --- a/src/app/dev/donasi/create/create_donasi/page.tsx +++ b/src/app/dev/donasi/create/create_donasi/page.tsx @@ -3,7 +3,7 @@ import { Donasi_getMasterDurasi, Donasi_getMasterKategori, } from "@/app_modules/donasi/fun"; -import { user_getOneUserId } from "@/app_modules/fun_global/get_user_token"; +import { user_funGetOneUserId } from "@/app_modules/fun_global/get_user_token"; export default async function Page() { const masterKategori = await Donasi_getMasterKategori(); diff --git a/src/app/dev/donasi/detail/detail_main/[id]/page.tsx b/src/app/dev/donasi/detail/detail_main/[id]/page.tsx index 6c72ece2..804c103a 100644 --- a/src/app/dev/donasi/detail/detail_main/[id]/page.tsx +++ b/src/app/dev/donasi/detail/detail_main/[id]/page.tsx @@ -1,13 +1,13 @@ import { DetailMainDonasi } from "@/app_modules/donasi"; import { Donasi_getCountDonatur } from "@/app_modules/donasi/fun/count/get_count_donatur"; import { Donasi_getOneById } from "@/app_modules/donasi/fun/get/get_one_donasi_by_id"; -import { user_getOneUserId } from "@/app_modules/fun_global/get_user_token"; +import { user_funGetOneUserId } from "@/app_modules/fun_global/get_user_token"; export default async function Page({ params }: { params: { id: string } }) { let donasiId = params.id; const dataDonasi = await Donasi_getOneById(donasiId); const countDonatur = await Donasi_getCountDonatur(donasiId) - const userLoginId = await user_getOneUserId(); + const userLoginId = await user_funGetOneUserId(); return ( <> diff --git a/src/app/dev/donasi/detail/detail_publish/[id]/page.tsx b/src/app/dev/donasi/detail/detail_publish/[id]/page.tsx index a283e6d2..b92e8928 100644 --- a/src/app/dev/donasi/detail/detail_publish/[id]/page.tsx +++ b/src/app/dev/donasi/detail/detail_publish/[id]/page.tsx @@ -1,12 +1,12 @@ import { DetailPublishDonasi } from "@/app_modules/donasi"; import { Donasi_getCountDonatur } from "@/app_modules/donasi/fun/count/get_count_donatur"; import { Donasi_getOneById } from "@/app_modules/donasi/fun/get/get_one_donasi_by_id"; -import { user_getOneUserId } from "@/app_modules/fun_global/get_user_token"; +import { user_funGetOneUserId } from "@/app_modules/fun_global/get_user_token"; export default async function Page({ params }: { params: { id: string } }) { const dataPublish = await Donasi_getOneById(params.id); const countDonatur= await Donasi_getCountDonatur(params.id) - const userLoginId = await user_getOneUserId(); + const userLoginId = await user_funGetOneUserId(); // console.log(userLoginId) diff --git a/src/app/dev/donasi/main/galang_dana/page.tsx b/src/app/dev/donasi/main/galang_dana/page.tsx index 63d73bda..cda297bf 100644 --- a/src/app/dev/donasi/main/galang_dana/page.tsx +++ b/src/app/dev/donasi/main/galang_dana/page.tsx @@ -4,10 +4,10 @@ import { donasi_funGetAllStatusDraft } from "@/app_modules/donasi/fun/get/status import { donasi_funGetAllStatusPublish } from "@/app_modules/donasi/fun/get/status/get_all_status_publish"; import { donasi_funGetAllStatusReject } from "@/app_modules/donasi/fun/get/status/get_all_status_reject"; import { donasi_funGetAllStatusReview } from "@/app_modules/donasi/fun/get/status/get_all_status_review"; -import { user_getOneUserId } from "@/app_modules/fun_global/get_user_token"; +import { user_funGetOneUserId } from "@/app_modules/fun_global/get_user_token"; export default async function Page() { - const authorId = await user_getOneUserId(); + const authorId = await user_funGetOneUserId(); const listPublish = await donasi_funGetAllStatusPublish({page: 1}); const listReview = await donasi_funGetAllStatusReview({page: 1}); const listDraft = await donasi_funGetAllStatusDraft({page: 1}); diff --git a/src/app/dev/donasi/main/layout.tsx b/src/app/dev/donasi/main/layout.tsx index d1aa3c54..a37c2dd6 100644 --- a/src/app/dev/donasi/main/layout.tsx +++ b/src/app/dev/donasi/main/layout.tsx @@ -1,6 +1,6 @@ import { LayoutDonasi } from "@/app_modules/donasi"; import { Donasi_getNotifByUserId } from "@/app_modules/donasi/fun/get/get_notif_by_user_id"; -import { user_getOneUserId } from "@/app_modules/fun_global/get_user_token"; +import { user_funGetOneUserId } from "@/app_modules/fun_global/get_user_token"; import React from "react"; export default async function Layout({ @@ -8,7 +8,7 @@ export default async function Layout({ }: { children: React.ReactNode; }) { - const userId = await user_getOneUserId(); + const userId = await user_funGetOneUserId(); // console.log(userId) const isRead = await Donasi_getNotifByUserId(userId).then((res: any) => res.map((val: any) => val.isRead) diff --git a/src/app/dev/donasi/proses_donasi/metode_pembayaran/[id]/page.tsx b/src/app/dev/donasi/proses_donasi/metode_pembayaran/[id]/page.tsx index 2005b669..797d8742 100644 --- a/src/app/dev/donasi/proses_donasi/metode_pembayaran/[id]/page.tsx +++ b/src/app/dev/donasi/proses_donasi/metode_pembayaran/[id]/page.tsx @@ -1,11 +1,11 @@ import { Donasi_MetodePembayaran } from "@/app_modules/donasi"; import { Donasi_getMasterBank } from "@/app_modules/donasi/fun/master/get_bank"; -import { user_getOneUserId } from "@/app_modules/fun_global/get_user_token"; +import { user_funGetOneUserId } from "@/app_modules/fun_global/get_user_token"; export default async function Page({params}: {params: {id: string}}) { let donasiId= params.id const listBank = await Donasi_getMasterBank() - const authorId = await user_getOneUserId() + const authorId = await user_funGetOneUserId() return<> diff --git a/src/app/dev/event/create/page.tsx b/src/app/dev/event/create/page.tsx index bb44e1ce..a1eb4bc1 100644 --- a/src/app/dev/event/create/page.tsx +++ b/src/app/dev/event/create/page.tsx @@ -1,10 +1,10 @@ import { Event_Create } from "@/app_modules/event"; import { Event_getMasterTipeAcara } from "@/app_modules/event/fun/master/get_tipe_acara"; -import { user_getOneUserId } from "@/app_modules/fun_global/get_user_token"; +import { user_funGetOneUserId } from "@/app_modules/fun_global/get_user_token"; import _ from "lodash"; export default async function Page() { - const userId = await user_getOneUserId() + const userId = await user_funGetOneUserId() const listTipeAcara = await Event_getMasterTipeAcara(); return ; diff --git a/src/app/dev/event/detail/main/[id]/page.tsx b/src/app/dev/event/detail/main/[id]/page.tsx index 024ca9c2..9326b5ed 100644 --- a/src/app/dev/event/detail/main/[id]/page.tsx +++ b/src/app/dev/event/detail/main/[id]/page.tsx @@ -3,13 +3,13 @@ import { Event_countTotalPesertaById } from "@/app_modules/event/fun/count/count import { Event_CekUserJoinById } from "@/app_modules/event/fun/get/cek_user_join_by_id"; import { Event_getListPesertaById } from "@/app_modules/event/fun/get/get_list_peserta_by_id"; import { Event_getOneById } from "@/app_modules/event/fun/get/get_one_by_id"; -import { user_getOneUserId } from "@/app_modules/fun_global/get_user_token"; +import { user_funGetOneUserId } from "@/app_modules/fun_global/get_user_token"; export default async function Page({ params }: { params: { id: string } }) { let eventId = params.id; const dataEvent = await Event_getOneById(eventId); const listPeserta = await Event_getListPesertaById(eventId); - const userLoginId = await user_getOneUserId(); + const userLoginId = await user_funGetOneUserId(); const isJoin = await Event_CekUserJoinById(eventId, userLoginId); const totalPeserta = await Event_countTotalPesertaById(eventId) diff --git a/src/app/dev/event/detail/riwayat/[id]/page.tsx b/src/app/dev/event/detail/riwayat/[id]/page.tsx index fddfa079..859ac000 100644 --- a/src/app/dev/event/detail/riwayat/[id]/page.tsx +++ b/src/app/dev/event/detail/riwayat/[id]/page.tsx @@ -4,7 +4,7 @@ import { Event_countTotalPesertaById } from "@/app_modules/event/fun/count/count import { Event_CekUserJoinById } from "@/app_modules/event/fun/get/cek_user_join_by_id"; import { Event_getListPesertaById } from "@/app_modules/event/fun/get/get_list_peserta_by_id"; import { Event_getOneById } from "@/app_modules/event/fun/get/get_one_by_id"; -import { user_getOneUserId } from "@/app_modules/fun_global/get_user_token"; +import { user_funGetOneUserId } from "@/app_modules/fun_global/get_user_token"; export default async function Page({ params }: { params: { id: string } }) { let eventId = params.id; diff --git a/src/app/dev/event/main/kontribusi/page.tsx b/src/app/dev/event/main/kontribusi/page.tsx index 62955eb6..c62ad6cd 100644 --- a/src/app/dev/event/main/kontribusi/page.tsx +++ b/src/app/dev/event/main/kontribusi/page.tsx @@ -1,6 +1,6 @@ import { Event_Kontribusi } from "@/app_modules/event"; import { event_getListKontibusiByUserId } from "@/app_modules/event/fun/get/get_list_kontribusi_by_user_id"; -import { user_getOneUserId } from "@/app_modules/fun_global/get_user_token"; +import { user_funGetOneUserId } from "@/app_modules/fun_global/get_user_token"; export default async function Page() { const listKontribusi = await event_getListKontibusiByUserId({page: 1}) diff --git a/src/app/dev/event/main/riwayat/page.tsx b/src/app/dev/event/main/riwayat/page.tsx index 3c20774d..0b44a8db 100644 --- a/src/app/dev/event/main/riwayat/page.tsx +++ b/src/app/dev/event/main/riwayat/page.tsx @@ -1,7 +1,7 @@ import { Event_Riwayat } from "@/app_modules/event"; import { event_getListRiwayatSaya } from "@/app_modules/event/fun/get/get_list_riwayat_saya"; import { event_getListSemuaRiwayat } from "@/app_modules/event/fun/get/riwayat/get_list_semua_riwayat"; -import { user_getOneUserId } from "@/app_modules/fun_global/get_user_token"; +import { user_funGetOneUserId } from "@/app_modules/fun_global/get_user_token"; export default async function Page({ params }: { params: { id: string } }) { let eventId = params.id; diff --git a/src/app/dev/event/main/status_page/page.tsx b/src/app/dev/event/main/status_page/page.tsx index 28d7fd80..6bb4d32a 100644 --- a/src/app/dev/event/main/status_page/page.tsx +++ b/src/app/dev/event/main/status_page/page.tsx @@ -3,10 +3,10 @@ import { event_getAllDraft } from "@/app_modules/event/fun/get/status/get_all_dr import { event_getAllReject } from "@/app_modules/event/fun/get/status/get_all_reject"; import { event_getAllReview } from "@/app_modules/event/fun/get/status/get_all_review"; import { event_funGetAllStatusPublish } from "@/app_modules/event/fun/get/status/get_all_status_publish"; -import { user_getOneUserId } from "@/app_modules/fun_global/get_user_token"; +import { user_funGetOneUserId } from "@/app_modules/fun_global/get_user_token"; export default async function Page() { - const authorId = await user_getOneUserId(); + const authorId = await user_funGetOneUserId(); const listPublish = await event_funGetAllStatusPublish({ page: 1 }); const listReview = await event_getAllReview({ page: 1 }); const listDraft = await event_getAllDraft({ page: 1 }); diff --git a/src/app/dev/forum/detail/main-detail/[id]/page.tsx b/src/app/dev/forum/detail/main-detail/[id]/page.tsx index 0c764797..53fdf30a 100644 --- a/src/app/dev/forum/detail/main-detail/[id]/page.tsx +++ b/src/app/dev/forum/detail/main-detail/[id]/page.tsx @@ -2,7 +2,7 @@ import Forum_MainDetail from "@/app_modules/forum/detail/main_detail"; import { forum_funGetAllKomentarById } from "@/app_modules/forum/fun/get/get_all_komentar_by_id"; import { forum_getOnePostingById } from "@/app_modules/forum/fun/get/get_one_posting_by_id"; import { forum_countOneTotalKomentarById } from "@/app_modules/forum/fun/count/count_one_total_komentar_by_id"; -import { user_getOneUserId } from "@/app_modules/fun_global/get_user_token"; +import { user_funGetOneUserId } from "@/app_modules/fun_global/get_user_token"; import { RouterForum } from "@/app/lib/router_hipmi/router_forum"; import { redirect } from "next/navigation"; import { forum_countTotalKomenById } from "@/app_modules/forum/fun/count/count_total_komentar_by_id"; @@ -10,7 +10,7 @@ import { forum_countTotalKomenById } from "@/app_modules/forum/fun/count/count_t export default async function Page({ params }: { params: { id: string } }) { let postingId = params.id; - const userLoginId = await user_getOneUserId(); + const userLoginId = await user_funGetOneUserId(); const dataPosting = await forum_getOnePostingById(postingId); const listKomentar = await forum_funGetAllKomentarById({ postingId: postingId, diff --git a/src/app/dev/forum/forumku/[id]/layout.tsx b/src/app/dev/forum/forumku/[id]/layout.tsx index 9c27fcf3..6fcc7d0f 100644 --- a/src/app/dev/forum/forumku/[id]/layout.tsx +++ b/src/app/dev/forum/forumku/[id]/layout.tsx @@ -1,5 +1,5 @@ import { LayoutForum_Forumku } from "@/app_modules/forum"; -import { user_getOneUserId } from "@/app_modules/fun_global/get_user_token"; +import { user_funGetOneUserId } from "@/app_modules/fun_global/get_user_token"; import { user_getOneByUserId } from "@/app_modules/home/fun/get/get_one_user_by_id"; import React from "react"; diff --git a/src/app/dev/forum/forumku/[id]/page.tsx b/src/app/dev/forum/forumku/[id]/page.tsx index 2432252d..40789dc1 100644 --- a/src/app/dev/forum/forumku/[id]/page.tsx +++ b/src/app/dev/forum/forumku/[id]/page.tsx @@ -1,14 +1,14 @@ import { Forum_Forumku } from "@/app_modules/forum"; import { forum_getAllPostingByAuhtorId } from "@/app_modules/forum/fun/get/get_list_posting_by_author_id"; import { forum_countOneTotalKomentarById } from "@/app_modules/forum/fun/count/count_one_total_komentar_by_id"; -import { user_getOneUserId } from "@/app_modules/fun_global/get_user_token"; +import { user_funGetOneUserId } from "@/app_modules/fun_global/get_user_token"; import { user_getOneByUserId } from "@/app_modules/home/fun/get/get_one_user_by_id"; import _ from "lodash"; import { forum_countPostingByAuthorId } from "@/app_modules/forum/fun/count/count_posting_by_author_id"; export default async function Page({ params }: { params: { id: string } }) { const authorId = params.id; - const userLoginId = await user_getOneUserId(); + const userLoginId = await user_funGetOneUserId(); const dataAuthor = await user_getOneByUserId(authorId); const auhtorSelectedData = _.omit(dataAuthor, [ "Profile.email", diff --git a/src/app/dev/forum/komentar/[id]/page.tsx b/src/app/dev/forum/komentar/[id]/page.tsx index 0a9e3c1f..03f99668 100644 --- a/src/app/dev/forum/komentar/[id]/page.tsx +++ b/src/app/dev/forum/komentar/[id]/page.tsx @@ -1,11 +1,11 @@ import { Forum_Komentar } from "@/app_modules/forum"; import { forum_getOnePostingById } from "@/app_modules/forum/fun/get/get_one_posting_by_id"; -import { user_getOneUserId } from "@/app_modules/fun_global/get_user_token"; +import { user_funGetOneUserId } from "@/app_modules/fun_global/get_user_token"; export default async function Page({ params }: { params: { id: string } }) { let postingId = params.id; const dataPosting = await forum_getOnePostingById(postingId); - const userLoginId = await user_getOneUserId() + const userLoginId = await user_funGetOneUserId() return ( <> diff --git a/src/app/dev/forum/main/layout.tsx b/src/app/dev/forum/main/layout.tsx index 2ec30e3d..f42ac00d 100644 --- a/src/app/dev/forum/main/layout.tsx +++ b/src/app/dev/forum/main/layout.tsx @@ -1,5 +1,5 @@ import { LayoutForum_Main } from "@/app_modules/forum"; -import { user_getOneUserId } from "@/app_modules/fun_global/get_user_token"; +import { user_funGetOneUserId } from "@/app_modules/fun_global/get_user_token"; import { user_getOneByUserId } from "@/app_modules/home/fun/get/get_one_user_by_id"; import React from "react"; @@ -8,7 +8,7 @@ export default async function Layout({ }: { children: React.ReactNode; }) { - const authorId = await user_getOneUserId(); + const authorId = await user_funGetOneUserId(); const dataAuthor = await user_getOneByUserId(authorId); return ( diff --git a/src/app/dev/forum/main/page.tsx b/src/app/dev/forum/main/page.tsx index f1caab55..2b5bc1e8 100644 --- a/src/app/dev/forum/main/page.tsx +++ b/src/app/dev/forum/main/page.tsx @@ -1,10 +1,10 @@ import { Forum_Beranda } from "@/app_modules/forum"; import { forum_new_getAllPosting } from "@/app_modules/forum/fun/get/new_get_all_posting"; -import { user_getOneUserId } from "@/app_modules/fun_global/get_user_token"; +import { user_funGetOneUserId } from "@/app_modules/fun_global/get_user_token"; export default async function Page() { const listForum = await forum_new_getAllPosting({ page: 1 }); - const userLoginId = await user_getOneUserId(); + const userLoginId = await user_funGetOneUserId(); // console.log(JSON.stringify(listForum, null, 2)); diff --git a/src/app/dev/forum/report/komentar-lainnya/[id]/page.tsx b/src/app/dev/forum/report/komentar-lainnya/[id]/page.tsx index 4c4b9439..8edbbf4f 100644 --- a/src/app/dev/forum/report/komentar-lainnya/[id]/page.tsx +++ b/src/app/dev/forum/report/komentar-lainnya/[id]/page.tsx @@ -1,9 +1,9 @@ import { Forum_ReportKomentarLainnya } from "@/app_modules/forum"; -import { user_getOneUserId } from "@/app_modules/fun_global/get_user_token"; +import { user_funGetOneUserId } from "@/app_modules/fun_global/get_user_token"; export default async function Page({ params }: { params: { id: string } }) { let komentarId = params.id; - const userLoginId = await user_getOneUserId(); + const userLoginId = await user_funGetOneUserId(); return ( <> diff --git a/src/app/dev/forum/report/komentar/[id]/page.tsx b/src/app/dev/forum/report/komentar/[id]/page.tsx index 88717b66..11a226e5 100644 --- a/src/app/dev/forum/report/komentar/[id]/page.tsx +++ b/src/app/dev/forum/report/komentar/[id]/page.tsx @@ -1,11 +1,11 @@ import { Forum_ReportKomentar } from "@/app_modules/forum"; import { forum_getMasterKategoriReport } from "@/app_modules/forum/fun/master/get_master_kategori_report"; -import { user_getOneUserId } from "@/app_modules/fun_global/get_user_token"; +import { user_funGetOneUserId } from "@/app_modules/fun_global/get_user_token"; export default async function Page({ params }: { params: { id: string } }) { let komentarId = params.id; const listReport = await forum_getMasterKategoriReport(); - const userLoginId = await user_getOneUserId(); + const userLoginId = await user_funGetOneUserId(); return ( diff --git a/src/app/dev/forum/report/posting-lainnya/[id]/page.tsx b/src/app/dev/forum/report/posting-lainnya/[id]/page.tsx index 3039aef6..84b1abda 100644 --- a/src/app/dev/forum/report/posting-lainnya/[id]/page.tsx +++ b/src/app/dev/forum/report/posting-lainnya/[id]/page.tsx @@ -1,9 +1,9 @@ import { Forum_ReportPostingLainnya } from "@/app_modules/forum"; -import { user_getOneUserId } from "@/app_modules/fun_global/get_user_token"; +import { user_funGetOneUserId } from "@/app_modules/fun_global/get_user_token"; export default async function Page({ params }: { params: { id: string } }) { let postingId = params.id; - const userLoginId = await user_getOneUserId() + const userLoginId = await user_funGetOneUserId() return ( <> diff --git a/src/app/dev/forum/report/posting/[id]/page.tsx b/src/app/dev/forum/report/posting/[id]/page.tsx index d52c5827..17f48e47 100644 --- a/src/app/dev/forum/report/posting/[id]/page.tsx +++ b/src/app/dev/forum/report/posting/[id]/page.tsx @@ -1,11 +1,11 @@ import { Forum_ReportPosting } from "@/app_modules/forum"; import { forum_getMasterKategoriReport } from "@/app_modules/forum/fun/master/get_master_kategori_report"; -import { user_getOneUserId } from "@/app_modules/fun_global/get_user_token"; +import { user_funGetOneUserId } from "@/app_modules/fun_global/get_user_token"; export default async function Page({ params }: { params: { id: string } }) { let postingId = params.id; const listReport = await forum_getMasterKategoriReport(); - const userLoginId = await user_getOneUserId(); + const userLoginId = await user_funGetOneUserId(); return ( <> diff --git a/src/app/dev/home/page.tsx b/src/app/dev/home/page.tsx index aa3e2356..f6878fd1 100644 --- a/src/app/dev/home/page.tsx +++ b/src/app/dev/home/page.tsx @@ -1,6 +1,6 @@ import { RouterAdminDashboard } from "@/app/lib/router_hipmi/router_admin"; import { RouterHome } from "@/app/lib/router_hipmi/router_home"; -import { user_getOneUserId } from "@/app_modules/fun_global/get_user_token"; +import { user_funGetOneUserId } from "@/app_modules/fun_global/get_user_token"; import { HomeView } from "@/app_modules/home"; import { user_getOneByUserId } from "@/app_modules/home/fun/get/get_one_user_by_id"; import { job_getTwoForHomeView } from "@/app_modules/job/fun/get/get_two_for_home_view"; @@ -8,7 +8,7 @@ import notifikasi_countUserNotifikasi from "@/app_modules/notifikasi/fun/count/f import { redirect } from "next/navigation"; export default async function Page() { - const userId = await user_getOneUserId(); + const userId = await user_funGetOneUserId(); const dataUser = await user_getOneByUserId(userId); const dataJob = await job_getTwoForHomeView(); diff --git a/src/app/dev/investasi/create_berita/[id]/layout.tsx b/src/app/dev/investasi/create_berita/[id]/layout.tsx index 833d254b..1a75b995 100644 --- a/src/app/dev/investasi/create_berita/[id]/layout.tsx +++ b/src/app/dev/investasi/create_berita/[id]/layout.tsx @@ -1,8 +1,18 @@ import { LayoutCreateBeritaInvestasi } from "@/app_modules/investasi"; import React from "react"; -export default async function Layout({children, params}: {children: React.ReactNode, params: {id: string}}) { - return<> - {children} +export default async function Layout({ + children, + params, +}: { + children: React.ReactNode; + params: { id: string }; +}) { + return ( + <> + + {children} + -} \ No newline at end of file + ); +} diff --git a/src/app/dev/investasi/create_berita/[id]/loading.tsx b/src/app/dev/investasi/create_berita/[id]/loading.tsx deleted file mode 100644 index d8a1c040..00000000 --- a/src/app/dev/investasi/create_berita/[id]/loading.tsx +++ /dev/null @@ -1,9 +0,0 @@ -import ComponentGlobal_V2_LoadingPage from "@/app_modules/_global/loading_page_v2"; - -export default async function Page() { - return ( - <> - - - ); -} diff --git a/src/app/dev/investasi/create_berita/[id]/page.tsx b/src/app/dev/investasi/create_berita/[id]/page.tsx index 0c6fcbee..f96a8c2c 100644 --- a/src/app/dev/investasi/create_berita/[id]/page.tsx +++ b/src/app/dev/investasi/create_berita/[id]/page.tsx @@ -1,8 +1,9 @@ import { CreateBeritaInvestasi } from "@/app_modules/investasi"; -export default async function Page({params}: {params: {id: string}}) { - return<> - - +export default async function Page({ params }: { params: { id: string } }) { + return ( + <> + -} \ No newline at end of file + ); +} diff --git a/src/app/dev/investasi/detail/[id]/page.tsx b/src/app/dev/investasi/detail/[id]/page.tsx index 3925d01d..2effc19f 100644 --- a/src/app/dev/investasi/detail/[id]/page.tsx +++ b/src/app/dev/investasi/detail/[id]/page.tsx @@ -1,43 +1,20 @@ import { funGetUserProfile } from "@/app_modules/fun_global/get_user_profile"; import { DetailInvestasi } from "@/app_modules/investasi"; import getOneInvestasiById from "@/app_modules/investasi/fun/get_one_investasi_by_id"; - -import yaml from "yaml"; -import fs from "fs"; -import { cookies } from "next/headers"; -import { unsealData } from "iron-session"; +import { user_funGetOneUserId } from "@/app_modules/fun_global/get_user_token"; import funProgressBar from "@/app_modules/investasi/fun/fun_progress_bar"; import funTotalInvestorByIdInvestasi from "@/app_modules/investasi/fun/fun_total_investor_by_id"; -const config = yaml.parse(fs.readFileSync("config.yaml").toString()); export default async function Page({ params }: { params: { id: string } }) { - const c = cookies().get("ssn"); - const usr = JSON.parse( - await unsealData(c?.value as string, { - password: config.server.password, - }) - ); - - const loginUserId = usr.id; - const dataInvestasi = await getOneInvestasiById(params.id); - const dataUser = await funGetUserProfile(dataInvestasi?.authorId as any) - - let total = Number(dataInvestasi?.totalLembar) - let beli = Number(dataInvestasi?.lembarTerbeli) - const progress = await funProgressBar(total, beli) - - const totalInvestor = await funTotalInvestorByIdInvestasi(dataInvestasi?.id) - - // console.log(dataInvestasi?.MasterProgresInvestasi?.name) +const investasiId = params.id + const dataInvestasi = await getOneInvestasiById(investasiId); + const loginUserId = await user_funGetOneUserId(); return ( <> ); diff --git a/src/app/dev/investasi/detail/saham/[id]/page.tsx b/src/app/dev/investasi/detail/saham/[id]/page.tsx new file mode 100644 index 00000000..0b3edcea --- /dev/null +++ b/src/app/dev/investasi/detail/saham/[id]/page.tsx @@ -0,0 +1,13 @@ +import { investasi_funGetOneInvoiceById } from "@/app_modules/investasi/_fun/get/fun_get_one_invoice_by_id"; +import { Investasi_UiDetailSahamSaya } from "@/app_modules/investasi/_ui"; + +export default async function Page({ params }: { params: { id: string } }) { + const invoiceId = params.id; + const dataSaham = await investasi_funGetOneInvoiceById({ invoiceId }); + + return ( + <> + + + ); +} diff --git a/src/app/dev/investasi/detail_berita/[id]/page.tsx b/src/app/dev/investasi/detail_berita/[id]/page.tsx index c8f77c5e..d4d0f75e 100644 --- a/src/app/dev/investasi/detail_berita/[id]/page.tsx +++ b/src/app/dev/investasi/detail_berita/[id]/page.tsx @@ -1,12 +1,17 @@ import { DetailBeritaInvestasi } from "@/app_modules/investasi"; import getOneBeritaInvestasiById from "@/app_modules/investasi/fun/get_one_berita_by_id"; -export default async function Page({params}: {params: {id: string}}) { - // console.log(params.id) - const dataBerita = await getOneBeritaInvestasiById(params.id) - // console.log(dataBerita) +export default async function Page({ params }: { params: { id: string } }) { + const investasiId = params.id; + const dataBerita = await getOneBeritaInvestasiById(investasiId); + // console.log(dataBerita) - return <> - + return ( + <> + -} \ No newline at end of file + ); +} diff --git a/src/app/dev/investasi/detail_dokumen/[id]/page.tsx b/src/app/dev/investasi/detail_dokumen/[id]/page.tsx index 6037f374..cd2202ee 100644 --- a/src/app/dev/investasi/detail_dokumen/[id]/page.tsx +++ b/src/app/dev/investasi/detail_dokumen/[id]/page.tsx @@ -1,10 +1,11 @@ import { DetailDokumenInvestasi } from "@/app_modules/investasi"; import getOneInvestasiById from "@/app_modules/investasi/fun/get_one_investasi_by_id"; -export default async function Page({params}: {params: {id: string}}) { - const dataInvestasi = await getOneInvestasiById(params.id) - // console.log(params.id) - return<> - +export default async function Page({ params }: { params: { id: string } }) { + const dataInvestasi = await getOneInvestasiById(params.id); + return ( + <> + -} \ No newline at end of file + ); +} diff --git a/src/app/dev/investasi/file-view/dokumen/[id]/page.tsx b/src/app/dev/investasi/file-view/dokumen/[id]/page.tsx new file mode 100644 index 00000000..446fef71 --- /dev/null +++ b/src/app/dev/investasi/file-view/dokumen/[id]/page.tsx @@ -0,0 +1,11 @@ +import { Investasi_UiFileViewDokumen } from "@/app_modules/investasi/_ui"; + +export default async function Page({ params }: { params: { id: string } }) { + const dokumenId = params.id; + + return ( + <> + + + ); +} diff --git a/src/app/dev/investasi/file-view/[id]/page.tsx b/src/app/dev/investasi/file-view/prospektus/[id]/page.tsx similarity index 80% rename from src/app/dev/investasi/file-view/[id]/page.tsx rename to src/app/dev/investasi/file-view/prospektus/[id]/page.tsx index e37dcb81..cb7f2e3c 100644 --- a/src/app/dev/investasi/file-view/[id]/page.tsx +++ b/src/app/dev/investasi/file-view/prospektus/[id]/page.tsx @@ -3,8 +3,6 @@ import { Investasi_UiFileView } from "@/app_modules/investasi/_ui"; export default async function Page({ params }: { params: { id: string } }) { const prospekId = params.id; - const dataProspek = await investasi_funGetProspekById({ prospekId: prospekId }); - return ( <> diff --git a/src/app/dev/investasi/list_edit_berita/[id]/page.tsx b/src/app/dev/investasi/list_edit_berita/[id]/page.tsx index 898fd9ad..4f5a9e8c 100644 --- a/src/app/dev/investasi/list_edit_berita/[id]/page.tsx +++ b/src/app/dev/investasi/list_edit_berita/[id]/page.tsx @@ -1,15 +1,13 @@ import { ListEditBeritaInvestasi } from "@/app_modules/investasi"; import getOneInvestasiById from "@/app_modules/investasi/fun/get_one_investasi_by_id"; -export default async function Page({params}: {params: {id: string}}) { - - const dataInvestasi = await getOneInvestasiById(params.id) +export default async function Page({ params }: { params: { id: string } }) { + const dataInvestasi = await getOneInvestasiById(params.id); // console.log(dataInvestasi) - return ( <> - + ); } diff --git a/src/app/dev/investasi/main/layout.tsx b/src/app/dev/investasi/main/layout.tsx index 652b25c9..d20a2396 100644 --- a/src/app/dev/investasi/main/layout.tsx +++ b/src/app/dev/investasi/main/layout.tsx @@ -1,8 +1,14 @@ -import { LayoutMainInvestasi } from "@/app_modules/investasi"; +import { Investasi_UiLayoutMain } from "@/app_modules/investasi/_ui"; import React from "react"; -export default async function Layout({children}: {children: React.ReactNode}) { - return <> - {children} +export default async function Layout({ + children, +}: { + children: React.ReactNode; +}) { + return ( + <> + {children} -} \ No newline at end of file + ); +} diff --git a/src/app/dev/investasi/main/page.tsx b/src/app/dev/investasi/main/page.tsx index d488824d..bc3fe278 100644 --- a/src/app/dev/investasi/main/page.tsx +++ b/src/app/dev/investasi/main/page.tsx @@ -1,12 +1,12 @@ -import { MainInvestasi } from "@/app_modules/investasi"; +import { Investasi_UiBeranda } from "@/app_modules/investasi/_ui"; import { investasi_funGetAllPublish } from "@/app_modules/investasi/fun/get_all_investasi"; export default async function Page() { - const allData = await investasi_funGetAllPublish(); + const allData = await investasi_funGetAllPublish({ page: 1 }); return ( <> - + ); } diff --git a/src/app/dev/investasi/main/portofolio/page.tsx b/src/app/dev/investasi/main/portofolio/page.tsx index 53d718e2..681557a2 100644 --- a/src/app/dev/investasi/main/portofolio/page.tsx +++ b/src/app/dev/investasi/main/portofolio/page.tsx @@ -6,33 +6,52 @@ import { unsealData } from "iron-session"; import getInvestasiByStatusId from "@/app_modules/investasi/fun/get_investasi_by_id"; import getStatusInvestasi from "@/app_modules/investasi/fun/master/get_status_investasi"; import getPortoByStatusId from "@/app_modules/investasi/fun/get_porto_status_by_id"; - -const config = yaml.parse(fs.readFileSync("config.yaml").toString()); +import { user_funGetOneUserId } from "@/app_modules/fun_global/get_user_token"; +import { Investasi_UiPortofolio } from "@/app_modules/investasi/_ui"; +import { + investasi_funGetAllInvestasiNonPublishByUserId, + investasi_funGetAllPublishByUserId, +} from "@/app_modules/investasi/_fun"; export default async function Page() { - const c = cookies().get("ssn"); - const tkn = JSON.parse( - await unsealData(c?.value as string, { - password: config.server.password, - }) - ); + const userId = await user_funGetOneUserId(); + const listStatus = await getStatusInvestasi(); + const dataDraft = await getPortoByStatusId(userId, 1); + const dataReview = await getPortoByStatusId(userId, 2); + const dataPublish = await getPortoByStatusId(userId, 3); + const dataReject = await getPortoByStatusId(userId, 4); - const listStatusInvestasi = await getStatusInvestasi(); - const dataDraft = await getPortoByStatusId(tkn.id, 1) - const dataReview = await getPortoByStatusId(tkn.id, 2) - const dataPublish = await getPortoByStatusId(tkn.id, 3) - const dataReject = await getPortoByStatusId(tkn.id, 4) + const listDataPublish = await investasi_funGetAllPublishByUserId({ page: 1 }); + const listDataReview = await investasi_funGetAllInvestasiNonPublishByUserId({ + page: 1, + statusId: "2", + }); + const listDataDraft = await investasi_funGetAllInvestasiNonPublishByUserId({ + page: 1, + statusId: "3", + }); + const listDataReject = await investasi_funGetAllInvestasiNonPublishByUserId({ + page: 1, + statusId: "4", + }); return ( <> - */} + ); diff --git a/src/app/dev/investasi/main/saham_saya/page.tsx b/src/app/dev/investasi/main/saham_saya/page.tsx index 1d0b3612..bfbfe599 100644 --- a/src/app/dev/investasi/main/saham_saya/page.tsx +++ b/src/app/dev/investasi/main/saham_saya/page.tsx @@ -1,23 +1,24 @@ -import { InvestasiSahamTerbeli } from "@/app_modules/investasi"; -import getListTransaksiBerhasilInvestasi from "@/app_modules/investasi/fun/get_list_transaksi_berhasil_by_id"; -import yaml from "yaml"; +import { investasi_funGetSuccessTransactionById } from "@/app_modules/investasi/_fun"; +import { Investasi_UiSahamSaya } from "@/app_modules/investasi/_ui"; import fs from "fs"; -import { cookies } from "next/headers"; -import { unsealData } from "iron-session"; +import yaml from "yaml"; const config = yaml.parse(fs.readFileSync("config.yaml").toString()); export default async function Page() { - const c = cookies().get("ssn"); - const user = JSON.parse( - await unsealData(c?.value as string, { - password: config.server.password, - }) - ); - const listTransaksi = await getListTransaksiBerhasilInvestasi(user.id) + // const c = cookies().get("ssn"); + // const user = JSON.parse( + // await unsealData(c?.value as string, { + // password: config.server.password, + // }) + // ); + // const listTransaksi = await getListTransaksiBerhasilInvestasi(user.id); + + const dataSaham = await investasi_funGetSuccessTransactionById({ page: 1 }); return ( <> - + {/* */} + ); } diff --git a/src/app/dev/investasi/main/transaksi/page.tsx b/src/app/dev/investasi/main/transaksi/page.tsx index 525a1a51..f3ba90f3 100644 --- a/src/app/dev/investasi/main/transaksi/page.tsx +++ b/src/app/dev/investasi/main/transaksi/page.tsx @@ -8,26 +8,26 @@ import { unsealData } from "iron-session"; import { cookies } from "next/headers"; import funCountDown from "@/app_modules/investasi/fun/fun_countdown_investasi"; import funCekSisaWaktuTransaksiInvestasi from "@/app_modules/investasi/fun/fun_cek_sisa_waktu"; +import { user_funGetOneUserId } from "@/app_modules/fun_global/get_user_token"; +import { investasi_funGetTransaksiByUserId } from "@/app_modules/investasi/_fun"; +import { Investasi_UiDaftarTransaksi } from "@/app_modules/investasi/_ui"; const config = yaml.parse(fs.readFileSync("config.yaml").toString()); export default async function Page() { - const c = cookies().get("ssn"); - const tkn = JSON.parse( - await unsealData(c?.value as string, { - password: config.server.password, - }) - ); - const userId = tkn.id; + const userId = await user_funGetOneUserId(); const statusTransaksi = await getMaster_StatusTransaksiInvestasi(); const listTransaksi = await getListAllTransaksiById_Investasi(userId); - // console.log(listTransaksi) - + + // NEW + const dataTransaksi = await investasi_funGetTransaksiByUserId({page: 1}); + return ( <> - + /> */} + ); } diff --git a/src/app/dev/investasi/status-transaksi/berhasil/[id]/page.tsx b/src/app/dev/investasi/status-transaksi/berhasil/[id]/page.tsx new file mode 100644 index 00000000..6015c0e9 --- /dev/null +++ b/src/app/dev/investasi/status-transaksi/berhasil/[id]/page.tsx @@ -0,0 +1,13 @@ +import { StatusTransaksiInvestasi } from "@/app_modules/investasi"; +import { investasi_funGetOneInvoiceById } from "@/app_modules/investasi/_fun/get/fun_get_one_invoice_by_id"; +import { Investasi_UiTransaksiBerhasil } from "@/app_modules/investasi/_ui"; + +export default async function Page({params}: {params: {id: string}}) { + const invoiceId = params.id; + const dataTransaksi = await investasi_funGetOneInvoiceById({ invoiceId }); + return ( + <> + + + ); +} diff --git a/src/app/dev/investasi/status-transaksi/gagal/[id]/page.tsx b/src/app/dev/investasi/status-transaksi/gagal/[id]/page.tsx new file mode 100644 index 00000000..b13315c3 --- /dev/null +++ b/src/app/dev/investasi/status-transaksi/gagal/[id]/page.tsx @@ -0,0 +1,18 @@ +import { funGlobal_getNomorAdmin } from "@/app_modules/_global/fun/get"; +import { investasi_funGetOneInvoiceById } from "@/app_modules/investasi/_fun/get/fun_get_one_invoice_by_id"; +import { Investasi_UiTransaksiGagal } from "@/app_modules/investasi/_ui/status_transaksi/ui_transaksi_gagal"; + +export default async function Page({ params }: { params: { id: string } }) { + const invoiceId = params.id; + const dataTransaksi = await investasi_funGetOneInvoiceById({ invoiceId }); + const nomorAdmin = await funGlobal_getNomorAdmin(); + + return ( + <> + + + ); +} diff --git a/src/app/dev/investasi/status_transaksi/berhasil/layout.tsx b/src/app/dev/investasi/status_transaksi/berhasil/layout.tsx deleted file mode 100644 index 6b2fd6be..00000000 --- a/src/app/dev/investasi/status_transaksi/berhasil/layout.tsx +++ /dev/null @@ -1,9 +0,0 @@ - -import { LayoutStatusTransaksiInvestasi } 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/status_transaksi/berhasil/loading.tsx b/src/app/dev/investasi/status_transaksi/berhasil/loading.tsx deleted file mode 100644 index d8a1c040..00000000 --- a/src/app/dev/investasi/status_transaksi/berhasil/loading.tsx +++ /dev/null @@ -1,9 +0,0 @@ -import ComponentGlobal_V2_LoadingPage from "@/app_modules/_global/loading_page_v2"; - -export default async function Page() { - return ( - <> - - - ); -} diff --git a/src/app/dev/investasi/status_transaksi/berhasil/page.tsx b/src/app/dev/investasi/status_transaksi/berhasil/page.tsx deleted file mode 100644 index b751d50b..00000000 --- a/src/app/dev/investasi/status_transaksi/berhasil/page.tsx +++ /dev/null @@ -1,8 +0,0 @@ -import { StatusTransaksiInvestasi } from "@/app_modules/investasi"; - - -export default async function Page() { - return<> - - -} \ No newline at end of file diff --git a/src/app/dev/investasi/status_transaksi/gagal/[id]/layout.tsx b/src/app/dev/investasi/status_transaksi/gagal/[id]/layout.tsx deleted file mode 100644 index d9a96998..00000000 --- a/src/app/dev/investasi/status_transaksi/gagal/[id]/layout.tsx +++ /dev/null @@ -1,16 +0,0 @@ -import { LayoutStatusTransaksiInvestasi_Gagal } 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/status_transaksi/gagal/[id]/loading.tsx b/src/app/dev/investasi/status_transaksi/gagal/[id]/loading.tsx deleted file mode 100644 index d8a1c040..00000000 --- a/src/app/dev/investasi/status_transaksi/gagal/[id]/loading.tsx +++ /dev/null @@ -1,9 +0,0 @@ -import ComponentGlobal_V2_LoadingPage from "@/app_modules/_global/loading_page_v2"; - -export default async function Page() { - return ( - <> - - - ); -} diff --git a/src/app/dev/investasi/status_transaksi/gagal/[id]/page.tsx b/src/app/dev/investasi/status_transaksi/gagal/[id]/page.tsx deleted file mode 100644 index fb6362ad..00000000 --- a/src/app/dev/investasi/status_transaksi/gagal/[id]/page.tsx +++ /dev/null @@ -1,14 +0,0 @@ -import { StatusTransaksiInvestasi_Gagal } from "@/app_modules/investasi"; -import getTransaksiByIdInvestasi from "@/app_modules/investasi/fun/get_transaksi_investasi"; - -export default async function Page({ params }: { params: { id: string } }) { - // console.log(params.id) - const dataTransaksi = await getTransaksiByIdInvestasi(params.id); -// console.log(dataTransaksi); - - return ( - <> - - - ); -} diff --git a/src/app/dev/investasi/transaksi/invoice/[id]/page.tsx b/src/app/dev/investasi/transaksi/invoice/[id]/page.tsx index 96af36c1..11d9fd8f 100644 --- a/src/app/dev/investasi/transaksi/invoice/[id]/page.tsx +++ b/src/app/dev/investasi/transaksi/invoice/[id]/page.tsx @@ -1,12 +1,13 @@ +import { investasi_funGetOneInvoiceById } from "@/app_modules/investasi/_fun/get/fun_get_one_invoice_by_id"; import { Investasi_UiInvoice } from "@/app_modules/investasi/_ui"; -export default function Page({ params }: { params: { id: string } }) { +export default async function Page({ params }: { params: { id: string } }) { const invoiceId = params.id; - + const dataInvoice = await investasi_funGetOneInvoiceById({ invoiceId: invoiceId }); return ( <> - + ); } diff --git a/src/app/dev/investasi/transaksi/metode-pembayaran/[id]/page.tsx b/src/app/dev/investasi/transaksi/metode-pembayaran/[id]/page.tsx index b55c3045..7553f2ef 100644 --- a/src/app/dev/investasi/transaksi/metode-pembayaran/[id]/page.tsx +++ b/src/app/dev/investasi/transaksi/metode-pembayaran/[id]/page.tsx @@ -8,7 +8,7 @@ export default async function Page({ params }: { params: { id: string } }) { return ( <> - + ); } diff --git a/src/app/dev/investasi/transaksi/proses-transaksi/[id]/page.tsx b/src/app/dev/investasi/transaksi/proses-transaksi/[id]/page.tsx index 08909807..7fb5988e 100644 --- a/src/app/dev/investasi/transaksi/proses-transaksi/[id]/page.tsx +++ b/src/app/dev/investasi/transaksi/proses-transaksi/[id]/page.tsx @@ -1,11 +1,13 @@ +import { funGlobal_getNomorAdmin } from "@/app_modules/_global/fun/get"; import { Investasi_UiProsesTransaksi } from "@/app_modules/investasi/_ui"; export default async function Page({ params }: { params: { id: string } }) { const invoiceId = params.id; - + const nomorAdmin = await funGlobal_getNomorAdmin(); + return ( <> - + ); } diff --git a/src/app/dev/katalog/[id]/layout.tsx b/src/app/dev/katalog/[id]/layout.tsx index 82012dc7..adc07fd4 100644 --- a/src/app/dev/katalog/[id]/layout.tsx +++ b/src/app/dev/katalog/[id]/layout.tsx @@ -1,4 +1,4 @@ -import { user_getOneUserId } from "@/app_modules/fun_global/get_user_token"; +import { user_funGetOneUserId } from "@/app_modules/fun_global/get_user_token"; import { KatalogLayout } from "@/app_modules/katalog/main"; import { Profile_getOneProfileAndUserById } from "@/app_modules/katalog/profile/fun/get/get_one_user_profile"; @@ -12,7 +12,7 @@ export default async function Layout({ const profileId = params.id; const dataProfile = await Profile_getOneProfileAndUserById(profileId) const authorId = dataProfile?.userId; - const userLoginId = await user_getOneUserId(); + const userLoginId = await user_funGetOneUserId(); return ( diff --git a/src/app/dev/katalog/[id]/page.tsx b/src/app/dev/katalog/[id]/page.tsx index 9116b1e1..851209c8 100644 --- a/src/app/dev/katalog/[id]/page.tsx +++ b/src/app/dev/katalog/[id]/page.tsx @@ -1,4 +1,4 @@ -import { user_getOneUserId } from "@/app_modules/fun_global/get_user_token"; +import { user_funGetOneUserId } from "@/app_modules/fun_global/get_user_token"; import { Katalog_MainView } from "@/app_modules/katalog"; import { funGetListPortofolio } from "@/app_modules/katalog/portofolio/fun/get/get_list_portofolio"; import { Profile_getOneProfileAndUserById } from "@/app_modules/katalog/profile/fun/get/get_one_user_profile"; @@ -6,7 +6,7 @@ import { Profile_getOneProfileAndUserById } from "@/app_modules/katalog/profile/ export default async function Page({ params }: { params: { id: string } }) { let profileId = params.id; - const userLoginId = await user_getOneUserId(); + const userLoginId = await user_funGetOneUserId(); const listPorto = await funGetListPortofolio(profileId); const dataProfile = await Profile_getOneProfileAndUserById(profileId); diff --git a/src/app/dev/portofolio/create/[id]/page.tsx b/src/app/dev/portofolio/create/[id]/page.tsx index 5e9fbccf..1f1fce9c 100644 --- a/src/app/dev/portofolio/create/[id]/page.tsx +++ b/src/app/dev/portofolio/create/[id]/page.tsx @@ -1,4 +1,3 @@ -import { myConsole } from "@/app/fun/my_console"; import { CreatePortofolio } from "@/app_modules/katalog/portofolio"; import { Portofolio_getMasterBidangBisnis } from "@/app_modules/katalog/portofolio/fun/master/get_bidang_bisnis"; diff --git a/src/app/dev/portofolio/edit/data/[id]/page.tsx b/src/app/dev/portofolio/edit/data/[id]/page.tsx index 0098efa1..6d23121d 100644 --- a/src/app/dev/portofolio/edit/data/[id]/page.tsx +++ b/src/app/dev/portofolio/edit/data/[id]/page.tsx @@ -14,7 +14,6 @@ export default async function Page({ params }: { params: { id: string } }) { "profileId", ]); - const listBidang = await Portofolio_getMasterBidangBisnis() return ( diff --git a/src/app/dev/portofolio/main/[id]/layout.tsx b/src/app/dev/portofolio/main/[id]/layout.tsx index 0fa87b85..30f2c15e 100644 --- a/src/app/dev/portofolio/main/[id]/layout.tsx +++ b/src/app/dev/portofolio/main/[id]/layout.tsx @@ -1,4 +1,4 @@ -import { user_getOneUserId } from "@/app_modules/fun_global/get_user_token"; +import { user_funGetOneUserId } from "@/app_modules/fun_global/get_user_token"; import { PortofolioLayout } from "@/app_modules/katalog/portofolio"; import { portofolio_getOneById } from "@/app_modules/katalog/portofolio/fun/get/get_one_portofolio"; @@ -11,7 +11,7 @@ export default async function Layout({ }) { let portoId = params.id; const getPorto = await portofolio_getOneById(portoId); - const userLoginId = await user_getOneUserId(); + const userLoginId = await user_funGetOneUserId(); // console.log(userLoginId); // console.log(getPorto?.Profile?.User?.id); return ( diff --git a/src/app/dev/portofolio/main/[id]/page.tsx b/src/app/dev/portofolio/main/[id]/page.tsx index 6e863ebc..89a0bd87 100644 --- a/src/app/dev/portofolio/main/[id]/page.tsx +++ b/src/app/dev/portofolio/main/[id]/page.tsx @@ -1,12 +1,12 @@ import ComponentGlobal_IsEmptyData from "@/app_modules/_global/component/is_empty_data"; -import { user_getOneUserId } from "@/app_modules/fun_global/get_user_token"; +import { user_funGetOneUserId } from "@/app_modules/fun_global/get_user_token"; import { ViewPortofolio } from "@/app_modules/katalog/portofolio"; import { portofolio_getOneById } from "@/app_modules/katalog/portofolio/fun/get/get_one_portofolio"; const mapboxToken = process.env.MAPBOX_TOKEN!; export default async function Page({ params }: { params: { id: string } }) { const getPorto = await portofolio_getOneById(params.id); - const userLoginId = await user_getOneUserId(); + const userLoginId = await user_funGetOneUserId(); return ( <> diff --git a/src/app/dev/profile/create/page.tsx b/src/app/dev/profile/create/page.tsx index 6f0b64c7..4c849b39 100644 --- a/src/app/dev/profile/create/page.tsx +++ b/src/app/dev/profile/create/page.tsx @@ -1,8 +1,8 @@ -import { user_getOneUserId } from "@/app_modules/fun_global/get_user_token"; +import { user_funGetOneUserId } from "@/app_modules/fun_global/get_user_token"; import { CreateProfile } from "@/app_modules/katalog/profile"; export default async function Page() { - const userId = await user_getOneUserId(); + const userId = await user_funGetOneUserId(); return ( <> diff --git a/src/app/dev/user-not-active/page.tsx b/src/app/dev/user-not-active/page.tsx index 52f02abf..3437cade 100644 --- a/src/app/dev/user-not-active/page.tsx +++ b/src/app/dev/user-not-active/page.tsx @@ -1,12 +1,12 @@ import { RouterAdminDashboard } from "@/app/lib/router_hipmi/router_admin"; import { RouterHome } from "@/app/lib/router_hipmi/router_home"; -import { user_getOneUserId } from "@/app_modules/fun_global/get_user_token"; +import { user_funGetOneUserId } from "@/app_modules/fun_global/get_user_token"; import { Home_UserNonActive } from "@/app_modules/home"; import { user_getOneByUserId } from "@/app_modules/home/fun/get/get_one_user_by_id"; import { redirect } from "next/navigation"; export default async function Page() { - const userId = await user_getOneUserId(); + const userId = await user_funGetOneUserId(); const dataUser = await user_getOneByUserId(userId); if (dataUser?.active === true) { diff --git a/src/app/dev/vote/detail/daftar-kontributor/[id]/page.tsx b/src/app/dev/vote/detail/daftar-kontributor/[id]/page.tsx new file mode 100644 index 00000000..451b4a9a --- /dev/null +++ b/src/app/dev/vote/detail/daftar-kontributor/[id]/page.tsx @@ -0,0 +1,13 @@ +import { Voting_UiDetailKontributorVoting } from "@/app_modules/vote/_ui"; +import { Vote_getListKontributorById } from "@/app_modules/vote/fun/get/get_list_kontributor_by_id"; + +export default async function Page({ params }: { params: { id: string } }) { + const votingId = params.id; + const listKontributor = await Vote_getListKontributorById(votingId); + + return ( + <> + + + ); +} diff --git a/src/app/dev/vote/detail/draft/[id]/page.tsx b/src/app/dev/vote/detail/draft/[id]/page.tsx index 850cb121..6403bd9f 100644 --- a/src/app/dev/vote/detail/draft/[id]/page.tsx +++ b/src/app/dev/vote/detail/draft/[id]/page.tsx @@ -1,9 +1,9 @@ import { Vote_DetailDraft } from "@/app_modules/vote"; -import { Vote_getOnebyId } from "@/app_modules/vote/fun/get/get_one_by_id"; +import { voting_funGetOneVotingbyId } from "@/app_modules/vote/fun/get/fun_get_one_by_id"; export default async function Page({ params }: { params: { id: string } }) { const voteId = params.id; - const dataVote = await Vote_getOnebyId(voteId); + const dataVote = await voting_funGetOneVotingbyId(voteId); return ( <> diff --git a/src/app/dev/vote/detail/kontribusi/[id]/layout.tsx b/src/app/dev/vote/detail/kontribusi/[id]/layout.tsx index ca76dac8..b580b73a 100644 --- a/src/app/dev/vote/detail/kontribusi/[id]/layout.tsx +++ b/src/app/dev/vote/detail/kontribusi/[id]/layout.tsx @@ -1,14 +1,25 @@ +import { user_funGetOneUserId } from "@/app_modules/fun_global"; import { LayoutVote_DetailKontribusi } from "@/app_modules/vote"; import React from "react"; export default async function Layout({ children, + params, }: { children: React.ReactNode; + params: { id: string }; }) { + const votingId = params.id; + const userLoginId = await user_funGetOneUserId(); + return ( <> - {children} + + {children} + ); } diff --git a/src/app/dev/vote/detail/kontribusi/[id]/page.tsx b/src/app/dev/vote/detail/kontribusi/[id]/page.tsx index 75dd7eb3..d42fc576 100644 --- a/src/app/dev/vote/detail/kontribusi/[id]/page.tsx +++ b/src/app/dev/vote/detail/kontribusi/[id]/page.tsx @@ -1,19 +1,13 @@ import { Vote_DetailKontribusi } from "@/app_modules/vote"; -import { Vote_getListKontributorById } from "@/app_modules/vote/fun/get/get_list_kontributor_by_id"; -import { Vote_getOnebyId } from "@/app_modules/vote/fun/get/get_one_by_id"; +import { voting_funGetOneVotingbyId } from "@/app_modules/vote/fun/get/fun_get_one_by_id"; export default async function Page({ params }: { params: { id: string } }) { let voteId = params.id; - const dataVote = await Vote_getOnebyId(voteId) - const listKontributor = await Vote_getListKontributorById(voteId) - + const dataVote = await voting_funGetOneVotingbyId(voteId); return ( <> - + ); } diff --git a/src/app/dev/vote/detail/main/[id]/layout.tsx b/src/app/dev/vote/detail/main/[id]/layout.tsx index 6e978bef..5514893f 100644 --- a/src/app/dev/vote/detail/main/[id]/layout.tsx +++ b/src/app/dev/vote/detail/main/[id]/layout.tsx @@ -1,14 +1,22 @@ +import { user_funGetOneUserId } from "@/app_modules/fun_global/get_user_token"; import { LayoutVote_MainDetail } from "@/app_modules/vote"; import React from "react"; export default async function Layout({ children, + params, }: { children: React.ReactNode; + params: { id: string }; }) { + const votingId = params.id; + const userLoginId = await user_funGetOneUserId(); + return ( <> - {children} + + {children} + ); } diff --git a/src/app/dev/vote/detail/main/[id]/page.tsx b/src/app/dev/vote/detail/main/[id]/page.tsx index c85e4ab3..f331be1f 100644 --- a/src/app/dev/vote/detail/main/[id]/page.tsx +++ b/src/app/dev/vote/detail/main/[id]/page.tsx @@ -1,19 +1,19 @@ -import { user_getOneUserId } from "@/app_modules/fun_global/get_user_token"; +import { user_funGetOneUserId } from "@/app_modules/fun_global/get_user_token"; import { Vote_MainDetail } from "@/app_modules/vote"; import { Vote_cekKontributorById } from "@/app_modules/vote/fun/get/cek_kontributor_by_id"; import { Vote_getHasilVoteById } from "@/app_modules/vote/fun/get/get_list_hasil_by_id"; import { Vote_getListKontributorById } from "@/app_modules/vote/fun/get/get_list_kontributor_by_id"; -import { Vote_getOnebyId } from "@/app_modules/vote/fun/get/get_one_by_id"; +import { voting_funGetOneVotingbyId } from "@/app_modules/vote/fun/get/fun_get_one_by_id"; import { Vote_getOnePilihanVotingByUserId } from "@/app_modules/vote/fun/get/get_one_pilihan_voting_by_user_id"; export default async function Page({ params }: { params: { id: string } }) { const voteId = params.id; - const dataVote = await Vote_getOnebyId(voteId); + const dataVote = await voting_funGetOneVotingbyId(voteId); const hasilVoting = await Vote_getHasilVoteById(voteId as any); const isKontributor = await Vote_cekKontributorById(voteId); const pilihanKontributor = await Vote_getOnePilihanVotingByUserId(voteId); const listKontributor = await Vote_getListKontributorById(voteId); - const userLoginId = await user_getOneUserId(); + const userLoginId = await user_funGetOneUserId(); return ( <> diff --git a/src/app/dev/vote/detail/publish/[id]/layout.tsx b/src/app/dev/vote/detail/publish/[id]/layout.tsx index 6730430a..1865f488 100644 --- a/src/app/dev/vote/detail/publish/[id]/layout.tsx +++ b/src/app/dev/vote/detail/publish/[id]/layout.tsx @@ -1,10 +1,29 @@ +import { user_funGetOneUserId } from "@/app_modules/fun_global"; import { LayoutVote_DetailPublish } from "@/app_modules/vote"; +import { Voting_funGetOneVotingbyId } from "@/app_modules/vote/fun/get"; import React from "react"; -export default function Layout({ children }: { children: React.ReactNode }) { +export default async function Layout({ + children, + params, +}: { + children: React.ReactNode; + params: { id: string }; +}) { + const votingId = params.id; + const userLoginId = await user_funGetOneUserId(); + + const dataVoting = await Voting_funGetOneVotingbyId(votingId); + const authorId = dataVoting?.authorId; + return ( <> - {children} + + {children} + ); } diff --git a/src/app/dev/vote/detail/publish/[id]/page.tsx b/src/app/dev/vote/detail/publish/[id]/page.tsx index a0db9358..df0477dc 100644 --- a/src/app/dev/vote/detail/publish/[id]/page.tsx +++ b/src/app/dev/vote/detail/publish/[id]/page.tsx @@ -1,18 +1,14 @@ import { Vote_DetailPublish } from "@/app_modules/vote"; import { Vote_getListKontributorById } from "@/app_modules/vote/fun/get/get_list_kontributor_by_id"; -import { Vote_getOnebyId } from "@/app_modules/vote/fun/get/get_one_by_id"; +import { voting_funGetOneVotingbyId } from "@/app_modules/vote/fun/get/fun_get_one_by_id"; export default async function Page({ params }: { params: { id: string } }) { let voteId = params.id; - const dataVote = await Vote_getOnebyId(voteId); - const listKontributor = await Vote_getListKontributorById(voteId); + const dataVote = await voting_funGetOneVotingbyId(voteId); return ( <> - + ); } diff --git a/src/app/dev/vote/detail/reject/[id]/page.tsx b/src/app/dev/vote/detail/reject/[id]/page.tsx index 3f4c1b5f..e7b2ea93 100644 --- a/src/app/dev/vote/detail/reject/[id]/page.tsx +++ b/src/app/dev/vote/detail/reject/[id]/page.tsx @@ -1,9 +1,9 @@ import { Vote_DetailReject } from "@/app_modules/vote"; -import { Vote_getOnebyId } from "@/app_modules/vote/fun/get/get_one_by_id"; +import { voting_funGetOneVotingbyId } from "@/app_modules/vote/fun/get/fun_get_one_by_id"; export default async function Page({ params }: { params: { id: string } }) { let voteId = params.id; - const dataVote = await Vote_getOnebyId(voteId); + const dataVote = await voting_funGetOneVotingbyId(voteId); return ( <> diff --git a/src/app/dev/vote/detail/review/[id]/page.tsx b/src/app/dev/vote/detail/review/[id]/page.tsx index a9dbd486..f0febb86 100644 --- a/src/app/dev/vote/detail/review/[id]/page.tsx +++ b/src/app/dev/vote/detail/review/[id]/page.tsx @@ -1,9 +1,9 @@ import { Vote_DetailReview } from "@/app_modules/vote"; -import { Vote_getOnebyId } from "@/app_modules/vote/fun/get/get_one_by_id"; +import { voting_funGetOneVotingbyId } from "@/app_modules/vote/fun/get/fun_get_one_by_id"; export default async function Page({ params }: { params: { id: string } }) { let voteId = params.id; - const dataVote = await Vote_getOnebyId(voteId); + const dataVote = await voting_funGetOneVotingbyId(voteId); return ( <> diff --git a/src/app/dev/vote/detail/semua_riwayat/[id]/layout.tsx b/src/app/dev/vote/detail/semua_riwayat/[id]/layout.tsx index 4723aa9d..5906589f 100644 --- a/src/app/dev/vote/detail/semua_riwayat/[id]/layout.tsx +++ b/src/app/dev/vote/detail/semua_riwayat/[id]/layout.tsx @@ -1,14 +1,26 @@ +import { user_funGetOneUserId } from "@/app_modules/fun_global"; import { LayoutVote_DetailSemuaRiwayat } from "@/app_modules/vote"; import React from "react"; export default async function Layout({ children, + params, }: { children: React.ReactNode; + params: { id: string }; }) { + const votingId = params.id; + const userLoginId = await user_funGetOneUserId(); + + return ( <> - {children} + + {children} + ); } diff --git a/src/app/dev/vote/edit/[id]/page.tsx b/src/app/dev/vote/edit/[id]/page.tsx index d43d25e6..a5fb255e 100644 --- a/src/app/dev/vote/edit/[id]/page.tsx +++ b/src/app/dev/vote/edit/[id]/page.tsx @@ -1,11 +1,11 @@ import { Vote_Edit } from "@/app_modules/vote"; import { Vote_getListDaftarNamaById } from "@/app_modules/vote/fun/get/get_list_daftar_vote_by_id"; -import { Vote_getOnebyId } from "@/app_modules/vote/fun/get/get_one_by_id"; +import { voting_funGetOneVotingbyId } from "@/app_modules/vote/fun/get/fun_get_one_by_id"; import _ from "lodash"; export default async function Page({ params }: { params: { id: string } }) { let voteId = params.id; - const dataVote = await Vote_getOnebyId(voteId); + const dataVote = await voting_funGetOneVotingbyId(voteId); const data = _.omit(dataVote, ["Voting_DaftarNamaVote"]); const listDaftarVote = await Vote_getListDaftarNamaById(voteId); diff --git a/src/app/lib/router_admin/router_admin_event.ts b/src/app/lib/router_admin/router_admin_event.ts index 21daaa87..1fa83338 100644 --- a/src/app/lib/router_admin/router_admin_event.ts +++ b/src/app/lib/router_admin/router_admin_event.ts @@ -2,6 +2,9 @@ export const RouterAdminEvent = { main_event: "/dev/admin/event/main", // detail + detail_peserta: "/dev/admin/event/detail/peserta/", + + // child detail_tipe_acara: "/dev/admin/event/child/tipe_acara", detail_riwayat: "/dev/admin/event/child/riwayat", diff --git a/src/app/lib/router_admin/router_admin_investasi.ts b/src/app/lib/router_admin/router_admin_investasi.ts index 60c81afb..0416b6c3 100644 --- a/src/app/lib/router_admin/router_admin_investasi.ts +++ b/src/app/lib/router_admin/router_admin_investasi.ts @@ -1,4 +1,7 @@ export const RouterAdminInvestasi = { + // API + api_bukti_transfer: "/api/investasi/bukti-transfer/", + main: "/dev/admin/investasi/main", table_publish: "/dev/admin/investasi/sub-menu/publish", table_review: "/dev/admin/investasi/sub-menu/review", @@ -8,4 +11,5 @@ export const RouterAdminInvestasi = { detail_publish: "/dev/admin/investasi/detail/publish/", detail_review: "/dev/admin/investasi/detail/review/", detail_reject: "/dev/admin/investasi/detail/reject/", -}; \ No newline at end of file + bukti_transfer: "/dev/admin/investasi/bukti-transfer/", +}; diff --git a/src/app/lib/router_hipmi/router_investasi.ts b/src/app/lib/router_hipmi/router_investasi.ts index 7c97bdec..92fe3d75 100644 --- a/src/app/lib/router_hipmi/router_investasi.ts +++ b/src/app/lib/router_hipmi/router_investasi.ts @@ -1,13 +1,28 @@ export const NEW_RouterInvestasi = { + // API + api_gambar: "/api/investasi/gambar/", + // Transaksi pembelian: "/dev/investasi/transaksi/pembelian/", metode_pembayaran: "/dev/investasi/transaksi/metode-pembayaran/", invoice: "/dev/investasi/transaksi/invoice/", proses_transaksi: "/dev/investasi/transaksi/proses-transaksi/", + // stasus transaksi + transaksi_gagal: "/dev/investasi/status-transaksi/gagal/", + transaksi_berhasil: "/dev/investasi/status-transaksi/berhasil/", + // file view - file_view: "/dev/investasi/file-view/", -} + file_view_prospektus: "/dev/investasi/file-view/prospektus/", + file_view_dokumen: "/dev/investasi/file-view/dokumen/", + + // detail + detail_saham: "/dev/investasi/detail/saham/", + detail_publish: "/dev/investasi/detail_portofolio/publish/", + detail_review: "/dev/investasi/detail_portofolio/review/", + detail_draft: "/dev/investasi/detail_portofolio/draft/", + detail_reject: "/dev/investasi/detail_portofolio/reject/", +}; export const RouterInvestasi_OLD = { api_gambar: "/api/investasi/gambar/", @@ -32,7 +47,7 @@ export const RouterInvestasi_OLD = { proses_investasi: "/dev/investasi/proses_investasi/", proses_transaksi: "/dev/investasi/proses_transaksi/", status_transaksi: "/dev/investasi/status_transaksi/berhasil", - status_pesanan:"/dev/investasi/status_pesanan/", + status_pesanan: "/dev/investasi/status_pesanan/", status_transaksi_gagal: "/dev/investasi/status_transaksi/gagal/", metode_transfer: "/dev/investasi/metode_transfer/", @@ -56,7 +71,7 @@ export const RouterInvestasi_OLD = { detail_reject: "/dev/investasi/detail_portofolio/reject/", // berita - berita: "/dev/investasi/berita/", + daftar_berita: "/dev/investasi/berita/", create_berita: "/dev/investasi/create_berita/", list_edit_berita: "/dev/investasi/list_edit_berita/", @@ -64,5 +79,3 @@ export const RouterInvestasi_OLD = { upload_prospektus: "/dev/investasi/upload_prospektus/", upload_dokumen: "/dev/investasi/upload_dokumen/", }; - - diff --git a/src/app/lib/router_hipmi/router_vote.ts b/src/app/lib/router_hipmi/router_vote.ts index 9b1e1635..2bcf428e 100644 --- a/src/app/lib/router_hipmi/router_vote.ts +++ b/src/app/lib/router_hipmi/router_vote.ts @@ -21,4 +21,5 @@ export const RouterVote = { detail_kontribusi: "/dev/vote/detail/kontribusi/", detail_semua_riwayat: "/dev/vote/detail/semua_riwayat/", detail_riwayat_saya: "/dev/vote/detail/riwayat_saya/", + daftar_kontributor: "/dev/vote/detail/daftar-kontributor/", }; diff --git a/src/app_modules/_global/author_name_on_header.tsx b/src/app_modules/_global/author_name_on_header.tsx index 940941c4..9409f6f3 100644 --- a/src/app_modules/_global/author_name_on_header.tsx +++ b/src/app_modules/_global/author_name_on_header.tsx @@ -17,7 +17,7 @@ import { ComponentGlobal_NotifikasiPeringatan } from "./notif_global/notifikasi_ import moment from "moment"; import { useState } from "react"; -export default function ComponentGlobal_AuthorNameOnHeader({ +export default function ComponentGlobal_AuthorNameAndAvatar({ profileId, imagesId, authorName, diff --git a/src/app_modules/_global/color/backgrond_and_border.module.css b/src/app_modules/_global/color/backgrond_and_border.module.css new file mode 100644 index 00000000..36e785a8 --- /dev/null +++ b/src/app_modules/_global/color/backgrond_and_border.module.css @@ -0,0 +1,7 @@ +.background_and_border { + background-color: #002e59; + border-color: #00447d; + border-radius: "10px"; + padding: 15px; + color: white; +} diff --git a/src/app_modules/_global/color/index.ts b/src/app_modules/_global/color/index.ts new file mode 100644 index 00000000..1304032e --- /dev/null +++ b/src/app_modules/_global/color/index.ts @@ -0,0 +1,4 @@ +import { AccentColor, MainColor } from "./color_pallet"; + +export { MainColor }; +export { AccentColor }; diff --git a/src/app_modules/_global/component/box_information.tsx b/src/app_modules/_global/component/box_information.tsx index f51fb951..ce66af3f 100644 --- a/src/app_modules/_global/component/box_information.tsx +++ b/src/app_modules/_global/component/box_information.tsx @@ -20,10 +20,10 @@ export default function ComponentGlobal_BoxInformation({ }} > - + * Report - + {informasi} @@ -38,7 +38,7 @@ export default function ComponentGlobal_BoxInformation({ }} > - + *{" "} {informasi} diff --git a/src/app_modules/_global/component/comp_author_name_and_avatar.tsx b/src/app_modules/_global/component/comp_author_name_and_avatar.tsx new file mode 100644 index 00000000..3d70f61e --- /dev/null +++ b/src/app_modules/_global/component/comp_author_name_and_avatar.tsx @@ -0,0 +1,100 @@ +"use client"; + +import { RouterProfile } from "@/app/lib/router_hipmi/router_katalog"; +import { + Avatar, + Center, + Divider, + Grid, + Group, + Loader, + Overlay, + Stack, + Text, +} from "@mantine/core"; +import { useRouter } from "next/navigation"; +import { MODEL_USER } from "@/app_modules/home/model/interface"; +import React, { useState } from "react"; +import { ComponentGlobal_NotifikasiPeringatan } from "../notif_global/notifikasi_peringatan"; + +export default function ComponentGlobal_AvatarAndAuthorName({ + dataUser, + isPembatas, + componentRight, +}: { + dataUser: MODEL_USER; + isPembatas?: boolean; + componentRight?: React.ReactNode; +}) { + const router = useRouter(); + const [visible, setVisible] = useState(false); + + return ( + <> + + + { + if (dataUser?.Profile?.id) { + setVisible(true); + router.push(RouterProfile.katalog + dataUser?.Profile?.id); + } else { + ComponentGlobal_NotifikasiPeringatan("Id tidak ditemukan"); + } + }} + > + {visible ? ( + + +
+ +
+
+
+ ) : ( + + )} +
+ + + + + + {dataUser?.username ? dataUser?.username : "Nama author"} + + + {componentRight ? componentRight : null} + + + +
+ {isPembatas ? : ""} +
+ + ); +} diff --git a/src/app_modules/_global/loading_card.tsx b/src/app_modules/_global/component/comp_loading_card.tsx similarity index 100% rename from src/app_modules/_global/loading_card.tsx rename to src/app_modules/_global/component/comp_loading_card.tsx diff --git a/src/app_modules/_global/component/comp_tampilan_angka_ratusan.tsx b/src/app_modules/_global/component/comp_tampilan_angka_ratusan.tsx new file mode 100644 index 00000000..aa7b2565 --- /dev/null +++ b/src/app_modules/_global/component/comp_tampilan_angka_ratusan.tsx @@ -0,0 +1,55 @@ +import { Group, Text } from "@mantine/core"; + +export default function ComponentGlobal_TampilanAngkaRatusan({ + nominal, + color, + fontSize, + fontWeight, + textBefore, + textAfter, +}: { + nominal: number; + color?: string; + fontSize?: number | string; + fontWeight?: string | number; + textBefore?: string; + textAfter?: string; +}) { + return ( + <> + + {textBefore ? ( + + {textBefore} + + ) : ( + "" + )} + + {new Intl.NumberFormat("id-ID", { maximumFractionDigits: 10 }).format( + nominal + )} + + {textAfter ? ( + + {textAfter} + + ) : ( + "" + )} + + + ); +} diff --git a/src/app_modules/_global/component/comp_tampilan_rupiah.tsx b/src/app_modules/_global/component/comp_tampilan_rupiah.tsx new file mode 100644 index 00000000..4fb89562 --- /dev/null +++ b/src/app_modules/_global/component/comp_tampilan_rupiah.tsx @@ -0,0 +1,31 @@ +import { MainColor } from "@/app_modules/_global/color/color_pallet"; +import { Text } from "@mantine/core"; + +export default function ComponentGlobal_TampilanRupiah({ + nominal, + color, + fontSize, + fontWeight, +}: { + nominal: number; + color?: string; + fontSize?: number | string; + fontWeight?: string | number; +}) { + return ( + <> + + Rp.{" "} + {new Intl.NumberFormat("id-ID", { maximumFractionDigits: 10 }).format( + nominal + )} + + + ); +} diff --git a/src/app_modules/_global/component/index.ts b/src/app_modules/_global/component/index.ts new file mode 100644 index 00000000..e5e7bad5 --- /dev/null +++ b/src/app_modules/_global/component/index.ts @@ -0,0 +1,9 @@ +import ComponentGlobal_AvatarAndAuthorName from "./comp_author_name_and_avatar"; +import ComponentGlobal_CardLoadingOverlay from "./comp_loading_card"; +import ComponentGlobal_TampilanAngkaRatusan from "./comp_tampilan_angka_ratusan"; +import ComponentGlobal_TampilanRupiah from "./comp_tampilan_rupiah"; + +export { ComponentGlobal_TampilanRupiah }; +export { ComponentGlobal_TampilanAngkaRatusan }; +export { ComponentGlobal_AvatarAndAuthorName }; +export { ComponentGlobal_CardLoadingOverlay }; diff --git a/src/app_modules/_global/component/is_empty_data.tsx b/src/app_modules/_global/component/is_empty_data.tsx index 0cc2fe35..6e73a7b6 100644 --- a/src/app_modules/_global/component/is_empty_data.tsx +++ b/src/app_modules/_global/component/is_empty_data.tsx @@ -11,12 +11,8 @@ export default function ComponentGlobal_IsEmptyData({ }) { return ( <> -
- {text ? text : "Tidak Ada Data"} +
+ {text ? text : "Tidak ada data"}
); diff --git a/src/app_modules/_global/fun/generate_seeder.ts b/src/app_modules/_global/fun/generate_seeder.ts index 828bde19..c1f89d11 100644 --- a/src/app_modules/_global/fun/generate_seeder.ts +++ b/src/app_modules/_global/fun/generate_seeder.ts @@ -12,7 +12,6 @@ import event_tipe_acara from "../../../bin/seeder/event/master_tipe_acara.json"; import forum_kategori_report from "../../../bin/seeder/forum/master_report.json"; import forum_status_posting from "../../../bin/seeder/forum/master_status.json"; import jenisProgres from "../../../bin/seeder/investasi/master_progres.json"; -import namaBank from "../../../bin/seeder/investasi/nama_bank.json"; import pembagianDeviden from "../../../bin/seeder/investasi/pembagian_deviden.json"; import pencarianInvestor from "../../../bin/seeder/investasi/pencarian_investor.json"; import periodeDeviden from "../../../bin/seeder/investasi/periode_deviden.json"; @@ -25,6 +24,7 @@ import userSeeder from "../../../bin/seeder/user_seeder.json"; import voting_status from "../../../bin/seeder/voting/master_status.json"; import { master_kategori_app } from "@/bin/seeder/master"; import { new_status_transaksi_investasi } from "@/bin/seeder/investasi"; +import { master_nama_bank } from "@/bin/seeder/master"; export async function generate_seeder() { for (let i of userRole) { @@ -143,24 +143,26 @@ export async function generate_seeder() { }); } - for (let i of namaBank) { + for (let i of master_nama_bank) { await prisma.masterBank.upsert({ where: { id: i.id.toString(), }, create: { id: i.id.toString(), - name: i.name, + namaBank: i.namaBank, + namaAkun: i.namaAkun, norek: i.norek.toString(), }, update: { id: i.id.toString(), - name: i.name, + namaBank: i.namaBank, + namaAkun: i.namaAkun, norek: i.norek.toString(), }, }); } - + for (let i of statusTransaksiInvestasi) { await prisma.masterStatusTransaksiInvestasi.upsert({ where: { diff --git a/src/app_modules/_global/fun/get/fun_get_all_bank.ts b/src/app_modules/_global/fun/get/fun_get_all_bank.ts index 4092a121..59ede53a 100644 --- a/src/app_modules/_global/fun/get/fun_get_all_bank.ts +++ b/src/app_modules/_global/fun/get/fun_get_all_bank.ts @@ -8,7 +8,7 @@ export async function funGlobal_getAllBank() { id: "asc", }, where: { - active: true, + isActive: true, }, }); return data; diff --git a/src/app_modules/_global/fun/get/fun_get_nomor_admin.ts b/src/app_modules/_global/fun/get/fun_get_nomor_admin.ts new file mode 100644 index 00000000..7b98da50 --- /dev/null +++ b/src/app_modules/_global/fun/get/fun_get_nomor_admin.ts @@ -0,0 +1,13 @@ +"use server"; + +import prisma from "@/app/lib/prisma"; + +export async function funGlobal_getNomorAdmin() { + const data = await prisma.nomorAdmin.findFirst({ + where: { + isActive: true, + }, + }); + + return data +} diff --git a/src/app_modules/_global/fun/get/index.ts b/src/app_modules/_global/fun/get/index.ts index 6c8d677a..3e6f8403 100644 --- a/src/app_modules/_global/fun/get/index.ts +++ b/src/app_modules/_global/fun/get/index.ts @@ -1,3 +1,5 @@ +import { funGlobal_getNomorAdmin } from "./fun_get_nomor_admin"; import { funGlobal_getMasterKategoriApp } from "./fun_master_kategori_app"; export { funGlobal_getMasterKategoriApp }; +export { funGlobal_getNomorAdmin }; diff --git a/src/app_modules/_global/ui/index.ts b/src/app_modules/_global/ui/index.ts new file mode 100644 index 00000000..3f3bb8f8 --- /dev/null +++ b/src/app_modules/_global/ui/index.ts @@ -0,0 +1,11 @@ +import UIGlobal_Drawer from "./ui_drawer"; +import UIGlobal_LayoutHeaderTamplate from "./ui_header_tamplate"; +import UIGlobal_LayoutTamplate from "./ui_layout_tamplate"; +import UIGlobal_Modal from "./ui_modal"; +import UIGlobal_SplashScreen from "./ui_splash"; + +export { UIGlobal_LayoutTamplate }; +export { UIGlobal_LayoutHeaderTamplate }; +export { UIGlobal_Drawer }; +export { UIGlobal_Modal }; +export { UIGlobal_SplashScreen }; diff --git a/src/app_modules/admin/_admin_global/_component/comp_admin_tampilan_rupiah.tsx b/src/app_modules/admin/_admin_global/_component/comp_admin_tampilan_rupiah.tsx new file mode 100644 index 00000000..9838ef81 --- /dev/null +++ b/src/app_modules/admin/_admin_global/_component/comp_admin_tampilan_rupiah.tsx @@ -0,0 +1,28 @@ +import { MainColor } from "@/app_modules/_global/color/color_pallet"; +import { Text } from "@mantine/core"; + +export function ComponentAdminGlobal_TampilanRupiah({ + nominal, + color, + fontSize, +}: { + nominal: number; + color?: string; + fontSize?: number; +}) { + return ( + <> + + Rp.{" "} + {new Intl.NumberFormat("id-ID", { maximumFractionDigits: 10 }).format( + nominal + )} + + + ); +} diff --git a/src/app_modules/admin/_admin_global/_component/index.ts b/src/app_modules/admin/_admin_global/_component/index.ts new file mode 100644 index 00000000..f3daef24 --- /dev/null +++ b/src/app_modules/admin/_admin_global/_component/index.ts @@ -0,0 +1,5 @@ +import { ComponentAdminGlobal_TitlePage } from "./title_page"; +import { ComponentAdminGlobal_TampilanRupiah } from "./comp_admin_tampilan_rupiah"; + +export { ComponentAdminGlobal_TampilanRupiah }; +export { ComponentAdminGlobal_TitlePage }; diff --git a/src/app_modules/admin/_admin_global/_component/title_page.tsx b/src/app_modules/admin/_admin_global/_component/title_page.tsx new file mode 100644 index 00000000..adf4b7f1 --- /dev/null +++ b/src/app_modules/admin/_admin_global/_component/title_page.tsx @@ -0,0 +1,29 @@ +"use client"; + +import { Group, Title, TextInput } from "@mantine/core"; +import { IconSearch } from "@tabler/icons-react"; +import React from "react"; + +export function ComponentAdminGlobal_TitlePage({ + name, + color, + component, +}: { + name: string; + color?: string; + component?: React.ReactNode; +}) { + return ( + <> + + {name} + {component ? component : ""} + + + ); +} diff --git a/src/app_modules/admin/_admin_global/back_button.tsx b/src/app_modules/admin/_admin_global/back_button.tsx index f35ba450..6d606134 100644 --- a/src/app_modules/admin/_admin_global/back_button.tsx +++ b/src/app_modules/admin/_admin_global/back_button.tsx @@ -17,8 +17,6 @@ export default function ComponentAdminGlobal_BackButton({ <>
- ); - - return ( - <> - {/* */} - - {customLOader} - - - ); -} diff --git a/src/app_modules/admin/app_info/component/index.tsx b/src/app_modules/admin/app_info/component/index.tsx new file mode 100644 index 00000000..931974a5 --- /dev/null +++ b/src/app_modules/admin/app_info/component/index.tsx @@ -0,0 +1,3 @@ +import { AdminAppInformation_ComponentTitlePageBank } from "./info_bank/comp_title_page"; + +export { AdminAppInformation_ComponentTitlePageBank }; diff --git a/src/app_modules/admin/app_info/component/info_bank/comp_title_page.tsx b/src/app_modules/admin/app_info/component/info_bank/comp_title_page.tsx new file mode 100644 index 00000000..01dfefc1 --- /dev/null +++ b/src/app_modules/admin/app_info/component/info_bank/comp_title_page.tsx @@ -0,0 +1,32 @@ +import { ComponentAdminGlobal_TitlePage } from "@/app_modules/admin/_admin_global/_component"; +import { Button } from "@mantine/core"; +import { IconCirclePlus } from "@tabler/icons-react"; + +export function AdminAppInformation_ComponentTitlePageBank({ + onEventListener, +}: { + onEventListener: (val: any) => void; +}) { + return ( + <> + } + radius={"xl"} + onClick={() => { + onEventListener({ + isCreate: true, + isUpdate: false, + }); + }} + > + Tambah + + } + /> + + ); +} diff --git a/src/app_modules/admin/app_info/fun/create/fun_create_bidang_bisnis.ts b/src/app_modules/admin/app_info/fun/create/fun_create_bidang_bisnis.ts new file mode 100644 index 00000000..1fb0add0 --- /dev/null +++ b/src/app_modules/admin/app_info/fun/create/fun_create_bidang_bisnis.ts @@ -0,0 +1,25 @@ +"use server"; + +import prisma from "@/app/lib/prisma"; +import { RouterAdminAppInformation } from "@/app/lib/router_admin/router_app_information"; +import { revalidatePath } from "next/cache"; + +export async function adminAppInformation_funCreateBidangBisnis({ + name, +}: { + name: string; +}) { + const count = await prisma.masterBidangBisnis.count({}); + const idBidangBisnis = count + 1; + + const createData = await prisma.masterBidangBisnis.create({ + data: { + id: idBidangBisnis.toString(), + name: name, + }, + }); + + if (!createData) return { status: 400, message: "Gagal menambahkan" }; + revalidatePath(RouterAdminAppInformation.main); + return { status: 201, message: "Berhasil menambahkan" }; +} diff --git a/src/app_modules/admin/app_info/fun/create/fun_create_new_bank.ts b/src/app_modules/admin/app_info/fun/create/fun_create_new_bank.ts index a7a80c1f..ff3c9372 100644 --- a/src/app_modules/admin/app_info/fun/create/fun_create_new_bank.ts +++ b/src/app_modules/admin/app_info/fun/create/fun_create_new_bank.ts @@ -1,11 +1,12 @@ "use server"; import prisma from "@/app/lib/prisma"; +import { MODEL_MASTER_BANK } from "@/app_modules/investasi/_lib/interface"; export default async function adminAppInformation_createBank({ data, }: { - data: any; + data: MODEL_MASTER_BANK; }) { const count = await prisma.masterBank.count({}); const idBank = count + 1; @@ -13,7 +14,8 @@ export default async function adminAppInformation_createBank({ const create = await prisma.masterBank.create({ data: { id: idBank.toString(), - name: data.name, + namaBank: data.namaBank, + namaAkun: data.namaAkun, norek: data.norek, }, }); diff --git a/src/app_modules/admin/app_info/fun/index.ts b/src/app_modules/admin/app_info/fun/index.ts new file mode 100644 index 00000000..ee73fe68 --- /dev/null +++ b/src/app_modules/admin/app_info/fun/index.ts @@ -0,0 +1,7 @@ +import { adminAppInformation_funCreateBidangBisnis } from "./create/fun_create_bidang_bisnis"; +import { adminAppInformation_funGetBidangBisnis } from "./master/fun_get_master_bidang_bisnis"; +import { adminAppInformation_funUpdateBidangBisnis } from "./update/fun_update_bidang_bisnis"; + +export { adminAppInformation_funGetBidangBisnis }; +export { adminAppInformation_funCreateBidangBisnis }; +export { adminAppInformation_funUpdateBidangBisnis }; diff --git a/src/app_modules/admin/app_info/fun/master/fun_get_master_bidang_bisnis.ts b/src/app_modules/admin/app_info/fun/master/fun_get_master_bidang_bisnis.ts new file mode 100644 index 00000000..975c53df --- /dev/null +++ b/src/app_modules/admin/app_info/fun/master/fun_get_master_bidang_bisnis.ts @@ -0,0 +1,13 @@ +"use server"; + +import prisma from "@/app/lib/prisma"; + +export async function adminAppInformation_funGetBidangBisnis() { + const data = await prisma.masterBidangBisnis.findMany({ + orderBy: { + createdAt: "desc", + }, + }); + + return data; +} diff --git a/src/app_modules/admin/app_info/fun/update/fun_udpate_status_bank.ts b/src/app_modules/admin/app_info/fun/update/fun_udpate_status_bank.ts index 402b0081..20708e11 100644 --- a/src/app_modules/admin/app_info/fun/update/fun_udpate_status_bank.ts +++ b/src/app_modules/admin/app_info/fun/update/fun_udpate_status_bank.ts @@ -1,22 +1,24 @@ "use server"; import prisma from "@/app/lib/prisma"; -import { MODEL_DATA_BANK } from "@/app_modules/investasi/_lib/interface"; +import { MODEL_MASTER_BANK } from "@/app_modules/investasi/_lib/interface"; export default async function adminAppInformation_updateStatusBankById({ data, }: { - data: MODEL_DATA_BANK; + data: MODEL_MASTER_BANK; }) { const updt = await prisma.masterBank.update({ where: { id: data.id, }, data: { - active: data.active, + isActive: data.isActive, }, }); + + if (!updt) return { status: 400, message: "Gagal update" }; return { status: 200, message: "Berhasil update" }; } diff --git a/src/app_modules/admin/app_info/fun/update/fun_update_bidang_bisnis.ts b/src/app_modules/admin/app_info/fun/update/fun_update_bidang_bisnis.ts new file mode 100644 index 00000000..ab6a4e4d --- /dev/null +++ b/src/app_modules/admin/app_info/fun/update/fun_update_bidang_bisnis.ts @@ -0,0 +1,42 @@ +"use server"; + +import prisma from "@/app/lib/prisma"; +import { RouterAdminAppInformation } from "@/app/lib/router_admin/router_app_information"; +import { revalidatePath } from "next/cache"; + +export async function adminAppInformation_funUpdateBidangBisnis({ + data, +}: { + data: { id: string; active?: boolean; name?: string }; +}) { + if (data.name) { + const updateData = await prisma.masterBidangBisnis.update({ + where: { + id: data.id, + }, + data: { + name: data.name, + }, + }); + + if (!updateData) return { status: 400, message: "Gagal update data" }; + revalidatePath(RouterAdminAppInformation.main); + return { status: 200, message: "Berhasil update data" }; + } + + if (data.active !== null) { + const updateAktivasi = await prisma.masterBidangBisnis.update({ + where: { + id: data.id, + }, + data: { + active: data.active, + }, + }); + + if (!updateAktivasi) + return { status: 400, message: "Gagal update aktivasi" }; + revalidatePath(RouterAdminAppInformation.main); + return { status: 200, message: "Berhasil update aktivasi" }; + } +} diff --git a/src/app_modules/admin/app_info/fun/update/fun_update_data_bank.ts b/src/app_modules/admin/app_info/fun/update/fun_update_data_bank.ts index be90087e..6cdd2091 100644 --- a/src/app_modules/admin/app_info/fun/update/fun_update_data_bank.ts +++ b/src/app_modules/admin/app_info/fun/update/fun_update_data_bank.ts @@ -1,19 +1,20 @@ "use server"; import prisma from "@/app/lib/prisma"; -import { MODEL_DATA_BANK } from "@/app_modules/investasi/_lib/interface"; +import { MODEL_MASTER_BANK } from "@/app_modules/investasi/_lib/interface"; export default async function adminAppInformation_updateDataBankById({ data, }: { - data: MODEL_DATA_BANK; + data: MODEL_MASTER_BANK; }) { const updt = await prisma.masterBank.update({ where: { id: data.id, }, data: { - name: data.name, + namaBank: data.namaBank, + namaAkun: data.namaAkun, norek: data.norek, }, }); diff --git a/src/app_modules/admin/app_info/index.ts b/src/app_modules/admin/app_info/index.ts deleted file mode 100644 index 1ac49935..00000000 --- a/src/app_modules/admin/app_info/index.ts +++ /dev/null @@ -1,2 +0,0 @@ -import AdminAppInformation_MainView from "./main"; -export { AdminAppInformation_MainView }; diff --git a/src/app_modules/admin/app_info/lib/global_state.ts b/src/app_modules/admin/app_info/lib/global_state.ts new file mode 100644 index 00000000..26c4e460 --- /dev/null +++ b/src/app_modules/admin/app_info/lib/global_state.ts @@ -0,0 +1,9 @@ +import { atomWithStorage } from "jotai/utils"; + +/** + * @param index | 0 - 3 | 1: Whatsapp, 2: Bank, 3: Bidang Bisnis + */ +export const gs_app_information_menu = atomWithStorage( + "gs_app_information_menu", + "1" +); diff --git a/src/app_modules/admin/app_info/lib/index.ts b/src/app_modules/admin/app_info/lib/index.ts new file mode 100644 index 00000000..b73da9a7 --- /dev/null +++ b/src/app_modules/admin/app_info/lib/index.ts @@ -0,0 +1,3 @@ +import { gs_app_information_menu } from "./global_state"; + +export { gs_app_information_menu }; diff --git a/src/app_modules/admin/app_info/main/index.tsx b/src/app_modules/admin/app_info/main/index.tsx deleted file mode 100644 index e5127d56..00000000 --- a/src/app_modules/admin/app_info/main/index.tsx +++ /dev/null @@ -1,28 +0,0 @@ -"use client"; - -import { - Space, - Stack -} from "@mantine/core"; -import ComponentAdminGlobal_HeaderTamplate from "../../_admin_global/header_tamplate"; -import InformasiBank from "./info_bank"; -import InformasiWhatApps from "./info_whatsapp"; - -export default function AdminAppInformation_MainView({ - nomorAdmin, - listBank, -}: { - nomorAdmin: any; - listBank: any[]; -}) { - return ( - <> - - - - - - - - ); -} diff --git a/src/app_modules/admin/app_info/main/info_bank.tsx b/src/app_modules/admin/app_info/main/info_bank.tsx deleted file mode 100644 index 7af9e22e..00000000 --- a/src/app_modules/admin/app_info/main/info_bank.tsx +++ /dev/null @@ -1,394 +0,0 @@ -"use client"; - -import { MODEL_DATA_BANK } from "@/app_modules/investasi/_lib/interface"; -import { - ActionIcon, - Button, - Center, - Grid, - Group, - Modal, - Paper, - ScrollArea, - Stack, - Switch, - Table, - Text, - TextInput, - Title, - Tooltip -} from "@mantine/core"; -import { - IconCirclePlus, - IconEdit -} from "@tabler/icons-react"; -import _ from "lodash"; -import { useState } from "react"; -import { ComponentAdminGlobal_NotifikasiBerhasil } from "../../_admin_global/admin_notifikasi/notifikasi_berhasil"; -import { ComponentAdminGlobal_NotifikasiGagal } from "../../_admin_global/admin_notifikasi/notifikasi_gagal"; -import adminAppInformation_createBank from "../fun/create/fun_create_new_bank"; -import adminAppInformation_getMasterBank from "../fun/master/get_list_bank"; -import adminAppInformation_updateStatusBankById from "../fun/update/fun_udpate_status_bank"; -import adminAppInformation_updateDataBankById from "../fun/update/fun_update_data_bank"; - -export default function InformasiBank({ - listBank, -}: { - listBank: MODEL_DATA_BANK[]; -}) { - const [data, setData] = useState(listBank); - const [isCreate, setIsCreate] = useState(false); - const [newData, setNewData] = useState({ - name: "", - norek: "", - }); - - const [isUpdate, setIsUpdate] = useState(false); - const [updateData, setUpdateData] = useState({ - id: "", - name: "", - norek: "", - }); - - const [isActivation, setIsActivation] = useState(false); - const [updateStatus, setUpdateStatus] = useState({ - id: "", - active: "", - }); - - const [checked, setChecked] = useState(false); - - async function onCreate() { - const create = await adminAppInformation_createBank({ data: newData }); - if (create.status === 200) { - const loadData = await adminAppInformation_getMasterBank(); - setData(loadData); - ComponentAdminGlobal_NotifikasiBerhasil(create.message); - } else { - ComponentAdminGlobal_NotifikasiGagal(create.message); - } - setIsCreate(false); - } - - async function onUpdate() { - const updt = await adminAppInformation_updateDataBankById({ - data: updateData as any, - }); - if (updt.status === 200) { - const loadData = await adminAppInformation_getMasterBank(); - setData(loadData); - ComponentAdminGlobal_NotifikasiBerhasil(updt.message); - setIsUpdate(false); - } else { - ComponentAdminGlobal_NotifikasiGagal(updt.message); - } - } - - async function onUpdateActivation({ - id, - value, - }: { - id: string; - value: boolean; - }) { - const data = { - id: id, - active: value, - }; - const updt = await adminAppInformation_updateStatusBankById({ - data: data as any, - }); - if (updt.status === 200) { - const loadData = await adminAppInformation_getMasterBank(); - setData(loadData); - ComponentAdminGlobal_NotifikasiBerhasil(updt.message); - setIsActivation(false); - } else { - ComponentAdminGlobal_NotifikasiGagal(updt.message); - } - } - - const rowTable = _.isEmpty(data) ? ( - -
- Tidak ada data -
- - ) : ( - data.map((e, i) => ( - - -
- {e?.name} -
- - -
- {e?.norek} -
- - -
- { - setIsActivation(true); - setUpdateStatus({ - id: e?.id, - active: val.currentTarget.checked as any, - }); - }} - /> -
- - - - { - setIsUpdate(true); - setIsCreate(false); - setUpdateData({ - id: e?.id, - name: e?.name, - norek: e?.norek, - }); - }} - > - - - - - - - - )) - ); - - return ( - <> - - - Informasi Bank - - - - - - - - - - - - - - - - - - {rowTable} -
-
Nama Bank
-
-
Nomor Rekening
-
-
Status
-
-
Aksi
-
-
- {/*
- { - // onPageClick(val); - // }} - /> -
*/} -
-
- - - {isCreate ? ( - - -
- Tambah Daftar Bank -
- { - setNewData({ - ...newData, - name: val.currentTarget.value, - }); - }} - /> - { - setNewData({ - ...newData, - norek: val.currentTarget.value, - }); - }} - /> - - - - -
-
- ) : ( - "" - )} - {isUpdate ? ( - - -
- Update Data Bank -
- { - const value = val.currentTarget.value; - setUpdateData({ ...updateData, name: value }); - }} - /> - { - const value = val.currentTarget.value; - setUpdateData({ ...updateData, norek: value }); - }} - /> - - - - -
-
- ) : ( - "" - )} -
-
- - {/* Activasi bank */} - setIsActivation(false)} - > - - - Anda ingin{" "} - {updateStatus.active ? ( - <Text span inherit> - mengaktifkan - </Text> - ) : ( - <Text span inherit> - menonaktifkan - </Text> - )}{" "} - Bank ini ? - - - - - - - - - ); -} diff --git a/src/app_modules/admin/app_info/ui/index.tsx b/src/app_modules/admin/app_info/ui/index.tsx new file mode 100644 index 00000000..93598420 --- /dev/null +++ b/src/app_modules/admin/app_info/ui/index.tsx @@ -0,0 +1,3 @@ +import AdminAppInformation_UiMain from "./ui_main"; + +export { AdminAppInformation_UiMain }; diff --git a/src/app_modules/admin/app_info/ui/ui_main.tsx b/src/app_modules/admin/app_info/ui/ui_main.tsx new file mode 100644 index 00000000..03782b1a --- /dev/null +++ b/src/app_modules/admin/app_info/ui/ui_main.tsx @@ -0,0 +1,77 @@ +"use client"; + +import { Button, Group, Stack } from "@mantine/core"; +import { useAtom } from "jotai"; +import ComponentAdminGlobal_HeaderTamplate from "../../_admin_global/header_tamplate"; +import { gs_app_information_menu } from "../lib"; +import { + AdminAppInformation_ViewInfoBank, + AdminAppInformation_ViewInformasiWhatApps, + AdminAppInformation_ViewKategoriPortofolio, +} from "../view"; + +export default function AdminAppInformation_UiMain({ + nomorAdmin, + listBank, + dataBidangBisnis, +}: { + nomorAdmin: any; + listBank: any[]; + dataBidangBisnis: any[]; +}) { + const [selectPage, setSelectPage] = useAtom(gs_app_information_menu); + const listPage = [ + { + id: "1", + name: "Whatsapp", + }, + { + id: "2", + name: "Informasi Bank", + }, + { + id: "3", + name: "Bidang Bisnis", + }, + ]; + + return ( + <> + + + + + {listPage.map((e, i) => ( + + ))} + + + {selectPage === "1" && ( + + )} + + {selectPage === "2" && ( + + )} + {selectPage === "3" && ( + + )} + + + ); +} diff --git a/src/app_modules/admin/app_info/view/index.tsx b/src/app_modules/admin/app_info/view/index.tsx new file mode 100644 index 00000000..55184d32 --- /dev/null +++ b/src/app_modules/admin/app_info/view/index.tsx @@ -0,0 +1,7 @@ +import AdminAppInformation_ViewInfoBank from "./view_info_bank"; +import AdminAppInformation_ViewInformasiWhatApps from "./view_info_whatsapp"; +import { AdminAppInformation_ViewKategoriPortofolio } from "./view_kategori_portofolio"; + +export { AdminAppInformation_ViewInformasiWhatApps }; +export { AdminAppInformation_ViewInfoBank }; +export { AdminAppInformation_ViewKategoriPortofolio }; diff --git a/src/app_modules/admin/app_info/view/view_info_bank.tsx b/src/app_modules/admin/app_info/view/view_info_bank.tsx new file mode 100644 index 00000000..42ce3059 --- /dev/null +++ b/src/app_modules/admin/app_info/view/view_info_bank.tsx @@ -0,0 +1,421 @@ +"use client"; + +import { MODEL_MASTER_BANK } from "@/app_modules/investasi/_lib/interface"; +import { + ActionIcon, + Button, + Center, + Grid, + Group, + Modal, + Paper, + ScrollArea, + Stack, + Switch, + Table, + Text, + TextInput, + Title, + Tooltip, +} from "@mantine/core"; +import { IconCirclePlus, IconEdit } from "@tabler/icons-react"; +import _ from "lodash"; +import { useState } from "react"; +import { ComponentAdminGlobal_NotifikasiBerhasil } from "../../_admin_global/admin_notifikasi/notifikasi_berhasil"; +import { ComponentAdminGlobal_NotifikasiGagal } from "../../_admin_global/admin_notifikasi/notifikasi_gagal"; +import adminAppInformation_createBank from "../fun/create/fun_create_new_bank"; +import adminAppInformation_getMasterBank from "../fun/master/get_list_bank"; +import adminAppInformation_updateStatusBankById from "../fun/update/fun_udpate_status_bank"; +import adminAppInformation_updateDataBankById from "../fun/update/fun_update_data_bank"; +import { ComponentAdminGlobal_TitlePage } from "../../_admin_global/_component"; +import { AdminAppInformation_ComponentTitlePageBank } from "../component"; + +export default function AdminAppInformation_ViewInfoBank({ + listBank, +}: { + listBank: MODEL_MASTER_BANK[]; +}) { + const [data, setData] = useState(listBank); + const [isCreate, setIsCreate] = useState(false); + const [isLoadingCreate, setLoadingCreate] = useState(false); + + const [newData, setNewData] = useState({ + namaBank: "", + namaAkun: "", + norek: "", + }); + + const [isUpdate, setIsUpdate] = useState(false); + const [updateData, setUpdateData] = useState({ + id: "", + namaBank: "", + namaAkun: "", + norek: "", + }); + + const [isActivation, setIsActivation] = useState(false); + const [updateStatus, setUpdateStatus] = useState({ + id: "", + active: "", + }); + + async function onCreate() { + const create = await adminAppInformation_createBank({ data: newData }); + if (create.status === 200) { + try { + const loadData = await adminAppInformation_getMasterBank(); + setData(loadData); + } catch (error) { + console.log(error); + } finally { + setLoadingCreate(true); + ComponentAdminGlobal_NotifikasiBerhasil(create.message); + } + } else { + ComponentAdminGlobal_NotifikasiGagal(create.message); + } + setIsCreate(false); + } + + async function onUpdate() { + const updt = await adminAppInformation_updateDataBankById({ + data: updateData as any, + }); + if (updt.status === 200) { + const loadData = await adminAppInformation_getMasterBank(); + setData(loadData); + ComponentAdminGlobal_NotifikasiBerhasil(updt.message); + setIsUpdate(false); + } else { + ComponentAdminGlobal_NotifikasiGagal(updt.message); + } + } + + async function onUpdateActivation({ + id, + value, + }: { + id: string; + value: boolean; + }) { + const data = { + id: id, + isActive: value, + }; + + const updt = await adminAppInformation_updateStatusBankById({ + data: data as any, + }); + + if (updt.status === 200) { + const loadData = await adminAppInformation_getMasterBank(); + setData(loadData); + ComponentAdminGlobal_NotifikasiBerhasil(updt.message); + setIsActivation(false); + } else { + ComponentAdminGlobal_NotifikasiGagal(updt.message); + } + } + + const rowTable = _.isEmpty(data) ? ( + +
+ Tidak ada data +
+ + ) : ( + data.map((e, i) => ( + + +
+ {e?.namaBank} +
+ + +
+ { + setIsActivation(true); + setUpdateStatus({ + id: e?.id, + active: val.currentTarget.checked as any, + }); + }} + /> +
+ + +
+ {e?.namaAkun} +
+ + +
+ {e?.norek} +
+ + + + + { + setIsUpdate(true); + setIsCreate(false); + setUpdateData({ + id: e?.id, + namaBank: e?.namaBank, + namaAkun: e?.namaAkun, + norek: e?.norek, + }); + }} + > + + + + + + + + )) + ); + + return ( + <> + + + { + setIsCreate(val.isCreate); + setIsUpdate(val.isUpdate); + }} + /> + + + + + + + + + + + + + + + + + {rowTable} +
+
Bank
+
+
Status
+
+
Nama Rekening
+
+
Nomor Rekening
+
+
Aksi
+
+
+
+
+ + + {isCreate ? ( + + +
+ Tambah Daftar Bank +
+ + { + setNewData({ + ...newData, + namaBank: val.currentTarget.value, + }); + }} + /> + + { + setNewData({ + ...newData, + namaAkun: val.currentTarget.value, + }); + }} + /> + + { + setNewData({ + ...newData, + norek: val.currentTarget.value, + }); + }} + /> + + + + +
+
+ ) : ( + "" + )} + + {isUpdate ? ( + + +
+ Update Data Bank +
+ { + const value = val.currentTarget.value; + setUpdateData({ ...updateData, namaBank: value }); + }} + /> + + { + const value = val.currentTarget.value; + setUpdateData({ ...updateData, namaAkun: value }); + }} + /> + + { + const value = val.currentTarget.value; + setUpdateData({ ...updateData, norek: value }); + }} + /> + + + + +
+
+ ) : ( + "" + )} +
+
+ + {/* Activasi bank */} + setIsActivation(false)} + > + + + Anda ingin{" "} + {updateStatus.active ? ( + <Text span inherit> + mengaktifkan + </Text> + ) : ( + <Text span inherit> + menonaktifkan + </Text> + )}{" "} + Bank ini ? + + + + + + + +
+ + ); +} diff --git a/src/app_modules/admin/app_info/main/info_whatsapp.tsx b/src/app_modules/admin/app_info/view/view_info_whatsapp.tsx similarity index 78% rename from src/app_modules/admin/app_info/main/info_whatsapp.tsx rename to src/app_modules/admin/app_info/view/view_info_whatsapp.tsx index 77773476..50d1895f 100644 --- a/src/app_modules/admin/app_info/main/info_whatsapp.tsx +++ b/src/app_modules/admin/app_info/view/view_info_whatsapp.tsx @@ -3,12 +3,13 @@ import { ActionIcon, Button, + Collapse, Group, Paper, Stack, TextInput, Title, - Tooltip + Tooltip, } from "@mantine/core"; import { IconEdit, IconPhone } from "@tabler/icons-react"; import { useState } from "react"; @@ -16,11 +17,17 @@ import { ComponentAdminGlobal_NotifikasiBerhasil } from "../../_admin_global/adm import { ComponentAdminGlobal_NotifikasiGagal } from "../../_admin_global/admin_notifikasi/notifikasi_gagal"; import adminAppInformation_getNomorAdmin from "../fun/master/get_nomor_admin"; import adminAppInformation_funUpdateNomorAdmin from "../fun/update/fun_update_nomor"; +import { useDisclosure } from "@mantine/hooks"; +import { MainColor } from "@/app_modules/_global/color/color_pallet"; -export default function InformasiWhatApps({ nomorAdmin }: { nomorAdmin: any }) { - const [disabled, setDisable] = useState(true); +export default function AdminAppInformation_ViewInformasiWhatApps({ + nomorAdmin, +}: { + nomorAdmin: any; +}) { const [dataNomor, setDataNomor] = useState(nomorAdmin); const [updateNomor, setUpdateNomor] = useState(""); + const [opened, { toggle }] = useDisclosure(false); async function onUpdate() { const newNumber = (dataNomor.nomor = updateNomor); @@ -33,14 +40,10 @@ export default function InformasiWhatApps({ nomorAdmin }: { nomorAdmin: any }) { data: dataNomor, }); if (updt.status === 200) { - setDisable(true); - setUpdateNomor(""); const loadDdata = await adminAppInformation_getNomorAdmin(); setDataNomor(loadDdata); - if (loadDdata) { - ComponentAdminGlobal_NotifikasiBerhasil(updt.message); - return; - } + toggle(); + ComponentAdminGlobal_NotifikasiBerhasil(updt.message); } else { ComponentAdminGlobal_NotifikasiGagal(updt.message); } @@ -68,29 +71,31 @@ export default function InformasiWhatApps({ nomorAdmin }: { nomorAdmin: any }) { { - setDisable(false); + toggle(); setUpdateNomor(dataNomor.nomor); }} >
- {disabled ? ( - "" - ) : ( + } @@ -103,18 +108,16 @@ export default function InformasiWhatApps({ nomorAdmin }: { nomorAdmin: any }) { - )} + diff --git a/src/app_modules/admin/app_info/view/view_kategori_portofolio.tsx b/src/app_modules/admin/app_info/view/view_kategori_portofolio.tsx new file mode 100644 index 00000000..ec2533e5 --- /dev/null +++ b/src/app_modules/admin/app_info/view/view_kategori_portofolio.tsx @@ -0,0 +1,358 @@ +import { MODEL_DEFAULT_MASTER_OLD } from "@/app_modules/model_global/interface"; +import { + ActionIcon, + Button, + Center, + Grid, + Group, + Modal, + Paper, + ScrollArea, + Stack, + Switch, + Table, + Text, + TextInput, + Title, + Tooltip, +} from "@mantine/core"; +import { IconCirclePlus, IconEdit } from "@tabler/icons-react"; +import { useState } from "react"; +import { ComponentAdminGlobal_TitlePage } from "../../_admin_global/_component"; +import { ComponentAdminGlobal_NotifikasiBerhasil } from "../../_admin_global/admin_notifikasi/notifikasi_berhasil"; +import { ComponentAdminGlobal_NotifikasiGagal } from "../../_admin_global/admin_notifikasi/notifikasi_gagal"; +import { + adminAppInformation_funCreateBidangBisnis, + adminAppInformation_funGetBidangBisnis, + adminAppInformation_funUpdateBidangBisnis, +} from "../fun"; + +export function AdminAppInformation_ViewKategoriPortofolio({ + dataBidangBisnis, +}: { + dataBidangBisnis: MODEL_DEFAULT_MASTER_OLD[]; +}) { + const [data, setData] = useState(dataBidangBisnis); + + // Create + const [isLoadingCreate, setLoadingCreate] = useState(false); + const [isCreate, setIsCreate] = useState(false); + const [newData, setNewData] = useState(""); + async function onCreate() { + const create = await adminAppInformation_funCreateBidangBisnis({ + name: newData, + }); + + if (create.status === 201) { + try { + setLoadingCreate(true); + const loadData = await adminAppInformation_funGetBidangBisnis(); + setData(loadData); + } catch (error) { + console.log(error); + } finally { + setNewData(""); + setLoadingCreate(false); + ComponentAdminGlobal_NotifikasiBerhasil(create.message); + } + } else { + ComponentAdminGlobal_NotifikasiGagal(create.message); + } + } + + // Update Data + const [isLoadingUpdate, setLoadingUpdate] = useState(false); + const [isUpdate, setIsUpdate] = useState(false); + const [updateData, setUpdateData] = useState({ + id: "", + name: "", + }); + + async function onUpdate() { + const updt = await adminAppInformation_funUpdateBidangBisnis({ + data: updateData as any, + }); + if (updt?.status === 200) { + try { + setLoadingUpdate(true); + const loadData = await adminAppInformation_funGetBidangBisnis(); + setData(loadData); + } catch (error) { + console.log(error); + } finally { + setLoadingUpdate(false); + ComponentAdminGlobal_NotifikasiBerhasil(updt.message); + } + } else { + ComponentAdminGlobal_NotifikasiGagal(updt?.message as any); + } + } + + // Activation + const [openModal, setOpenModal] = useState(false); + const [updateStatus, setUpdateStatus] = useState({ + id: "", + active: null, + }); + + async function onUpdateActivation({ + id, + active, + }: { + id: string; + active: boolean; + }) { + const updt = await adminAppInformation_funUpdateBidangBisnis({ + data: { id: id, active: active }, + }); + + if (updt?.status === 200) { + try { + setLoadingUpdate(true); + const loadData = await adminAppInformation_funGetBidangBisnis(); + setData(loadData); + } catch (error) { + console.log(error); + } finally { + setOpenModal(false); + setLoadingUpdate(false); + ComponentAdminGlobal_NotifikasiBerhasil(updt?.message); + } + } else { + ComponentAdminGlobal_NotifikasiGagal(updt?.message as any); + } + } + + // Row Table + const rowTable = data.map((e, i) => ( + + +
+ {e?.name} +
+ + +
+ { + setOpenModal(true); + setUpdateStatus({ + id: e?.id, + active: val.currentTarget.checked as any, + }); + }} + /> +
+ + + + + { + setIsUpdate(true); + setIsCreate(false); + setUpdateData({ + id: e?.id, + name: e?.name, + }); + }} + > + + + + + + + + )); + + return ( + <> + + } + onClick={() => { + setIsCreate(true); + setIsUpdate(false); + }} + > + Tambah + + } + /> + + + + + + + + + + + + + + {rowTable} +
+
Kategori
+
+
Status
+
+
Aksi
+
+
+
+
+ + + {/* Form Create */} + {isCreate ? ( + + +
+ Tambah Bidang Bisnis +
+ + { + setNewData(val.currentTarget.value); + }} + /> + + + + + +
+
+ ) : ( + "" + )} + {/* Form Update */} + {isUpdate ? ( + + +
+ Update Bidang Bisnis +
+ { + const value = val.currentTarget.value; + setUpdateData({ ...updateData, name: value }); + }} + /> + + + + + +
+
+ ) : ( + "" + )} +
+
+
+ + {/* Activasi bank */} + setOpenModal(false)} + > + + + Anda ingin{" "} + {updateStatus.active ? ( + <Text span inherit> + mengaktifkan + </Text> + ) : ( + <Text span inherit> + menonaktifkan + </Text> + )}{" "} + Bidang Bisnis ini ? + + + + + + + + + ); +} diff --git a/src/app_modules/admin/colab/fun/edit/fun_report_project_by_id.ts b/src/app_modules/admin/colab/fun/edit/fun_report_project_by_id.ts index 8a9f5b2f..9dba8149 100644 --- a/src/app_modules/admin/colab/fun/edit/fun_report_project_by_id.ts +++ b/src/app_modules/admin/colab/fun/edit/fun_report_project_by_id.ts @@ -2,7 +2,7 @@ import prisma from "@/app/lib/prisma"; import { RouterAdminColab } from "@/app/lib/router_admin/router_admin_colab"; -import { user_getOneUserId } from "@/app_modules/fun_global/get_user_token"; +import { user_funGetOneUserId } from "@/app_modules/fun_global/get_user_token"; import { revalidatePath } from "next/cache"; export default async function adminColab_funReportProjectById({ @@ -12,7 +12,7 @@ export default async function adminColab_funReportProjectById({ colabId: string; report: string; }) { - const authorId = await user_getOneUserId(); + const authorId = await user_funGetOneUserId(); const projectUpdate = await prisma.projectCollaboration.update({ where: { diff --git a/src/app_modules/admin/donasi/main/index.tsx b/src/app_modules/admin/donasi/main/index.tsx index 33415ad8..1072a543 100644 --- a/src/app_modules/admin/donasi/main/index.tsx +++ b/src/app_modules/admin/donasi/main/index.tsx @@ -44,13 +44,13 @@ export default function AdminDonasi_Main({ link: RouterAdminDonasi_OLD.table_review, color: "orange", }, - { - id: 3, - name: "Draft", - jumlah: countDraft, - link: "", - color: "yellow", - }, + // { + // id: 3, + // name: "Draft", + // jumlah: countDraft, + // link: "", + // color: "yellow", + // }, { id: 4, name: "Reject", @@ -65,7 +65,7 @@ export default function AdminDonasi_Main({ - - {/* - Donasi - - - {listBox.map((e, i) => ( - - - - - {e.name} - {e.jumlah} - - {e.link !== "" ? ( - router.push(e.link)}> - {" "} - - - ) : ( - - )} - - - ))} - - */} ); } diff --git a/src/app_modules/admin/event/_ui/index.ts b/src/app_modules/admin/event/_ui/index.ts new file mode 100644 index 00000000..69e91d6f --- /dev/null +++ b/src/app_modules/admin/event/_ui/index.ts @@ -0,0 +1,3 @@ +import { AdminEvent_UiDetailPeserta } from "./ui_detail_peserta"; + +export { AdminEvent_UiDetailPeserta }; diff --git a/src/app_modules/admin/event/_ui/ui_detail_peserta.tsx b/src/app_modules/admin/event/_ui/ui_detail_peserta.tsx new file mode 100644 index 00000000..783d0ccc --- /dev/null +++ b/src/app_modules/admin/event/_ui/ui_detail_peserta.tsx @@ -0,0 +1,28 @@ +"use client"; + +import { Stack } from "@mantine/core"; +import ComponentAdminGlobal_BackButton from "../../_admin_global/back_button"; +import { AdminEvent_ViewDetailPeserta } from "../_view"; +import { MODEL_EVENT_PESERTA } from "@/app_modules/event/model/interface"; +import { ComponentAdminGlobal_TitlePage } from "../../_admin_global/_component"; + +export function AdminEvent_UiDetailPeserta({ + dataPeserta, + eventId, +}: { + dataPeserta: any; + eventId: string +}) { + return ( + <> + + + + + + + ); +} diff --git a/src/app_modules/admin/event/_view/index.ts b/src/app_modules/admin/event/_view/index.ts new file mode 100644 index 00000000..dbc96afa --- /dev/null +++ b/src/app_modules/admin/event/_view/index.ts @@ -0,0 +1,3 @@ +import { AdminEvent_ViewDetailPeserta } from "./view_detail_peserta"; + +export { AdminEvent_ViewDetailPeserta }; diff --git a/src/app_modules/admin/event/_view/view_detail_peserta.tsx b/src/app_modules/admin/event/_view/view_detail_peserta.tsx new file mode 100644 index 00000000..6c09ef87 --- /dev/null +++ b/src/app_modules/admin/event/_view/view_detail_peserta.tsx @@ -0,0 +1,112 @@ +"use client"; + +import { MODEL_EVENT_PESERTA } from "@/app_modules/event/model/interface"; +import { + Button, + Center, + Pagination, + Paper, + ScrollArea, + Stack, + Table, +} from "@mantine/core"; +import { useState } from "react"; +import { adminEvent_getListPesertaById } from "../fun"; +import _ from "lodash"; +import ComponentAdminGlobal_IsEmptyData from "../../_admin_global/is_empty_data"; + +export function AdminEvent_ViewDetailPeserta({ + dataPeserta, + eventId, +}: { + dataPeserta: any; + eventId: string; +}) { + const [data, setData] = useState(dataPeserta.data); + const [isNPage, setNPage] = useState(dataPeserta.nPage); + const [isActivePage, setActivePage] = useState(1); + + async function onPageClick(p: any) { + setActivePage(p); + const loadData = await adminEvent_getListPesertaById({ + eventId: eventId, + page: p, + }); + setData(loadData.data as any); + setNPage(loadData.nPage); + } + + const tableRow = _.isEmpty(data) + ? [] + : data.map((e, i) => ( + + +
{e?.User?.username}
+ + +
{e?.User?.Profile?.name}
+ + +
+{e?.User?.nomor}
+ + +
{e?.User?.Profile?.email}
+ + + )); + + return ( + <> + + + + + + + + + + + + {tableRow} +
+
Username
+
+
Name
+
+
Nomor
+
+
Email
+
+ {_.isEmpty(data) ? ( + + ) : ( + "" + )} +
+ +
+ { + onPageClick(val); + }} + /> +
+
+ + {/*
{JSON.stringify(dataPeserta, null, 2)}
*/} + + ); +} diff --git a/src/app_modules/admin/event/child/riwayat.tsx b/src/app_modules/admin/event/child/riwayat.tsx index 0a3fa315..3e0d54a3 100644 --- a/src/app_modules/admin/event/child/riwayat.tsx +++ b/src/app_modules/admin/event/child/riwayat.tsx @@ -1,36 +1,36 @@ "use client"; +import { RouterProfile } from "@/app/lib/router_hipmi/router_katalog"; +import { + MODEL_EVENT, + MODEL_EVENT_PESERTA, +} from "@/app_modules/event/model/interface"; import { Avatar, - Box, Button, Center, Divider, Grid, Group, - Loader, Modal, + Pagination, Paper, - SimpleGrid, + ScrollArea, Spoiler, Stack, Table, Text, + TextInput, Title, } from "@mantine/core"; -import ComponentAdminGlobal_HeaderTamplate from "../../_admin_global/header_tamplate"; -import { - MODEL_EVENT, - MODEL_EVENT_PESERTA, -} from "@/app_modules/event/model/interface"; -import { data } from "autoprefixer"; -import _ from "lodash"; -import moment from "moment"; -import { IconEyeShare } from "@tabler/icons-react"; import { useDisclosure, useShallowEffect } from "@mantine/hooks"; +import { IconCircleCheck, IconSearch } from "@tabler/icons-react"; import { useState } from "react"; -import { AdminEvent_getListPesertaById } from "../fun/get/get_list_peserta_by_id"; -import { RouterProfile } from "@/app/lib/router_hipmi/router_katalog"; +import ComponentAdminGlobal_HeaderTamplate from "../../_admin_global/header_tamplate"; +import { adminEvent_funGetListAllRiwayat } from "../fun"; +import { adminEvent_getListPesertaById } from "../fun/get/get_list_peserta_by_id"; +import { useRouter } from "next/navigation"; +import { RouterAdminEvent } from "@/app/lib/router_admin/router_admin_event"; export default function AdminEvent_Riwayat({ listRiwayat, @@ -47,68 +47,192 @@ export default function AdminEvent_Riwayat({ ); } -function DetailRiwayat({ listRiwayat }: { listRiwayat: MODEL_EVENT[] }) { - const [opened, setOpen] = useState(false); +function DetailRiwayat({ listRiwayat }: { listRiwayat: any }) { + const router = useRouter(); + const [opened, { open, close }] = useDisclosure(false); const [peserta, setPeserta] = useState(); const [eventId, setEventId] = useState(""); const [loading, setLoading] = useState(false); - const TableRows = listRiwayat.map((e, i) => ( - + const [data, setData] = useState(listRiwayat.data); + const [isNPage, setNPage] = useState(listRiwayat.nPage); + const [isActivePage, setActivePage] = useState(1); + const [isSearch, setSearch] = useState(""); + + async function onSearch(s: string) { + setSearch(s); + const loadData = await adminEvent_funGetListAllRiwayat({ + page: 1, + search: s, + }); + setData(loadData.data as any); + setNPage(loadData.nPage); + } + + async function onPageClick(p: any) { + setActivePage(p); + const loadData = await adminEvent_funGetListAllRiwayat({ + search: isSearch, + page: p, + }); + setData(loadData.data as any); + setNPage(loadData.nPage); + } + + const TableRows = data.map((e, i) => ( + - {e?.Author?.Profile?.name} - {e?.title} - {e?.lokasi} - {e?.EventMaster_TipeAcara?.name} - {e?.tanggal.toLocaleString("id-ID", { dateStyle: "full" })} + - {e.tanggal.toLocaleTimeString([], { - hour: "2-digit", - minute: "2-digit", - })} +
+ {e?.Author?.username} +
- - {e.deskripsi} - +
+ {e.title} +
+ + +
+ {e.lokasi} +
+ + +
+ {e.EventMaster_TipeAcara.name} +
+ + +
+ {e.tanggal.toLocaleString("id-ID", { dateStyle: "full" })} +
+ + +
+ {e.tanggal.toLocaleTimeString([], { + timeStyle: "short", + hourCycle: "h24", + })} +
+ + +
+ + {e.deskripsi} + +
)); - useShallowEffect(() => { - getAllPeserta(eventId); - }, [eventId]); + // useShallowEffect(() => { + // getAllPeserta(eventId); + // }, [eventId]); - async function getAllPeserta(eventId: string) { - await AdminEvent_getListPesertaById(eventId).then((res: any) => - setPeserta(res) - ); - } + // async function getAllPeserta(eventId: string) { + // await adminEvent_getListPesertaById(eventId).then((res: any) => + // setPeserta(res) + // ); + // } return ( <> + + + Riwayat + } + radius={"xl"} + placeholder="Masukan judul" + onChange={(val) => { + onSearch(val.currentTarget.value); + }} + /> + + + + + + + + + + + + + + + + + + {TableRows} +
+
Aksi
+
+
Username
+
+
Judul
+
+
Lokasi
+
+
Tipe Acara
+
+
Tanggal
+
+
Jam
+
+
Deskripsi
+
+
+ +
+ { + onPageClick(val); + }} + /> +
+
+
+ setOpen(false)} + onClose={close} size={"md"} // closeOnClickOutside={false} withCloseButton={false} @@ -145,55 +269,6 @@ function DetailRiwayat({ listRiwayat }: { listRiwayat: MODEL_EVENT[] }) { - - - - - RIWAYAT - - - - - - - - - - - - - - - - {TableRows} -
-
Aksi
-
-
Author
-
-
Judul
-
-
Lokasi
-
Tipe AcaraTanggalJam -
Deskripsi
-
-
- {_.isEmpty(TableRows) ? ( -
- Tidak Ada Data -
- ) : ( - "" - )} -
-
); } diff --git a/src/app_modules/admin/event/child/tipe_acara.tsx b/src/app_modules/admin/event/child/tipe_acara.tsx index d90f136d..77e37a58 100644 --- a/src/app_modules/admin/event/child/tipe_acara.tsx +++ b/src/app_modules/admin/event/child/tipe_acara.tsx @@ -1,12 +1,14 @@ "use client"; +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 { MODEL_DEFAULT_MASTER_OLD } from "@/app_modules/model_global/interface"; import { ActionIcon, - Box, Button, Divider, Group, - List, Modal, Paper, SimpleGrid, @@ -15,20 +17,14 @@ import { TextInput, Title, } from "@mantine/core"; -import ComponentAdminDonasi_TombolKembali from "../../donasi/component/tombol_kembali"; -import ComponentAdminGlobal_HeaderTamplate from "../../_admin_global/header_tamplate"; -import { MODEL_DEFAULT_MASTER_OLD } from "@/app_modules/model_global/interface"; -import { useState } from "react"; -import { AdminEvent_funCreateTipeAcara } from "../fun/create/fun_create_tipe_acara"; -import { ComponentGlobal_NotifikasiPeringatan } from "@/app_modules/_global/notif_global/notifikasi_peringatan"; -import { ComponentGlobal_NotifikasiBerhasil } from "@/app_modules/_global/notif_global/notifikasi_berhasil"; -import { ComponentGlobal_NotifikasiGagal } from "@/app_modules/_global/notif_global/notifikasi_gagal"; -import { AdminEvent_getListTipeAcara } from "../fun/get/get_list_tipe_acara"; -import { IconEditCircle, IconTrash } from "@tabler/icons-react"; -import { AdminEvent_funEditTipeAcara } from "../fun/edit/fun_edit_tipe_acara"; import { useDisclosure } from "@mantine/hooks"; +import { IconCirclePlus, IconEditCircle, IconTrash } from "@tabler/icons-react"; +import { useState } from "react"; +import ComponentAdminGlobal_HeaderTamplate from "../../_admin_global/header_tamplate"; +import { AdminEvent_funCreateTipeAcara } from "../fun/create/fun_create_tipe_acara"; import { AdminEvent_funEditActivationTipeAcaraById } from "../fun/edit/fun_edit_activation_tipe_acara"; -import { number } from "echarts"; +import { AdminEvent_funEditTipeAcara } from "../fun/edit/fun_edit_tipe_acara"; +import { AdminEvent_getListTipeAcara } from "../fun/get/get_list_tipe_acara"; export default function AdminEvent_DetailTipeAcara({ listTipe, @@ -38,14 +34,19 @@ export default function AdminEvent_DetailTipeAcara({ return ( <> - + + ); } -function DetailTipeAcara({ listTipe }: { listTipe: MODEL_DEFAULT_MASTER_OLD[] }) { +function DetailTipeAcara({ + listTipe, +}: { + listTipe: MODEL_DEFAULT_MASTER_OLD[]; +}) { const [tipe, setTipe] = useState(listTipe); const [name, setName] = useState(""); const [openEditor, setOpenEditor] = useState(false); @@ -55,6 +56,7 @@ function DetailTipeAcara({ listTipe }: { listTipe: MODEL_DEFAULT_MASTER_OLD[] }) id: "", name: "", }); + const [openCreate, setOpenCreate] = useState(false); return ( <> @@ -79,8 +81,28 @@ function DetailTipeAcara({ listTipe }: { listTipe: MODEL_DEFAULT_MASTER_OLD[] }) + + Tipe Acara + + + -
- - - { - setName(val.target.value); - }} - /> - - - - - -
-
@@ -122,6 +124,7 @@ function DetailTipeAcara({ listTipe }: { listTipe: MODEL_DEFAULT_MASTER_OLD[] }) variant="transparent" onClick={() => { setOpenEditor(true); + setOpenCreate(false); setEdit(e); }} > @@ -150,27 +153,67 @@ function DetailTipeAcara({ listTipe }: { listTipe: MODEL_DEFAULT_MASTER_OLD[] })
+ {openCreate ? ( +
+ + + { + setName(val.currentTarget.value); + }} + /> + + + + + + +
+ ) : ( + "" + )} +
{openEditor ? ( { setEdit({ ...(edit as any), - name: val.target.value, + namaBank: val.target.value, }); }} /> -