Compare commits

..

2 Commits

Author SHA1 Message Date
09be7739d5 Fix rejected Apple:
Penambahan fitur checklist terms of service dan penambahan database blockuser

Add:
- prisma/migrations/20251124061947_add_terms_of_service_accepted/
- prisma/migrations/20251124081155_add_blocked_user_and_menu_feature/
- prisma/migrations/20251124083155_fix_master_kategori_app_and_delete_menu_feature/
- public/terms-of-service.html
- src/app/api/auth/term-service/

Fix:
- prisma/schema.prisma
- src/app/api/auth/register/route.ts
- src/app/api/auth/validasi/route.ts
- src/app_modules/_global/fun/generate_seeder.ts
- src/bin/seeder/master/master_kategori_app.json
- src/bin/seeder/user_seeder.json
- src/middleware.tsx

### No Issue
2025-11-24 16:44:00 +08:00
38734cda8c chore(release): 1.5.17 2025-11-24 11:48:20 +08:00
14 changed files with 263 additions and 17 deletions

View File

@@ -2,6 +2,13 @@
All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines.
## [1.5.17](https://wibugit.wibudev.com/wibu/hipmi/compare/v1.5.16...v1.5.17) (2025-11-24)
### Bug Fixes
* delete all data user ([fb9515d](https://wibugit.wibudev.com/wibu/hipmi/commit/fb9515dfe465ef07d43460ca4e9bb31705ec48b8))
## [1.5.16](https://wibugit.wibudev.com/wibu/hipmi/compare/v1.5.15...v1.5.16) (2025-11-20)
## [1.5.15](https://wibugit.wibudev.com/wibu/hipmi/compare/v1.5.14...v1.5.15) (2025-11-18)

View File

@@ -1,6 +1,6 @@
{
"name": "hipmi",
"version": "1.5.16",
"version": "1.5.17",
"private": true,
"prisma": {
"seed": "bun prisma/seed.ts"

View File

@@ -0,0 +1,5 @@
-- AlterTable
ALTER TABLE "Donasi_Invoice" ALTER COLUMN "masterBankId" SET DEFAULT 'null';
-- AlterTable
ALTER TABLE "User" ADD COLUMN "termsOfServiceAccepted" BOOLEAN NOT NULL DEFAULT false;

View File

@@ -0,0 +1,35 @@
-- CreateTable
CREATE TABLE "BlockedUser" (
"id" TEXT NOT NULL,
"isActive" BOOLEAN NOT NULL DEFAULT true,
"createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
"updatedAt" TIMESTAMP(3) NOT NULL,
"blockerId" TEXT NOT NULL,
"blockedId" TEXT NOT NULL,
"menuFeatureId" TEXT NOT NULL,
CONSTRAINT "BlockedUser_pkey" PRIMARY KEY ("id")
);
-- CreateTable
CREATE TABLE "MenuFeature" (
"id" TEXT NOT NULL,
"isActive" BOOLEAN NOT NULL DEFAULT true,
"createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
"updatedAt" TIMESTAMP(3) NOT NULL,
"name" TEXT NOT NULL,
CONSTRAINT "MenuFeature_pkey" PRIMARY KEY ("id")
);
-- CreateIndex
CREATE UNIQUE INDEX "BlockedUser_blockerId_blockedId_key" ON "BlockedUser"("blockerId", "blockedId");
-- AddForeignKey
ALTER TABLE "BlockedUser" ADD CONSTRAINT "BlockedUser_menuFeatureId_fkey" FOREIGN KEY ("menuFeatureId") REFERENCES "MenuFeature"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
-- AddForeignKey
ALTER TABLE "BlockedUser" ADD CONSTRAINT "BlockedUser_blockerId_fkey" FOREIGN KEY ("blockerId") REFERENCES "User"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
-- AddForeignKey
ALTER TABLE "BlockedUser" ADD CONSTRAINT "BlockedUser_blockedId_fkey" FOREIGN KEY ("blockedId") REFERENCES "User"("id") ON DELETE RESTRICT ON UPDATE CASCADE;

View File

@@ -0,0 +1,14 @@
/*
Warnings:
- You are about to drop the `MenuFeature` table. If the table is not empty, all the data it contains will be lost.
*/
-- DropForeignKey
ALTER TABLE "BlockedUser" DROP CONSTRAINT "BlockedUser_menuFeatureId_fkey";
-- DropTable
DROP TABLE "MenuFeature";
-- AddForeignKey
ALTER TABLE "BlockedUser" ADD CONSTRAINT "BlockedUser_menuFeatureId_fkey" FOREIGN KEY ("menuFeatureId") REFERENCES "MasterKategoriApp"("id") ON DELETE RESTRICT ON UPDATE CASCADE;

View File

@@ -49,8 +49,12 @@ model User {
BusinessMaps BusinessMaps[]
Investasi_Invoice Investasi_Invoice[]
EventSponsor EventSponsor[]
EventTransaksi EventTransaksi[]
EventSponsor EventSponsor[]
EventTransaksi EventTransaksi[]
termsOfServiceAccepted Boolean @default(false)
blockedUsers BlockedUser[] @relation("Blocking")
blockedBy BlockedUser[] @relation("BlockedBy")
}
model MasterUserRole {
@@ -1011,6 +1015,8 @@ model MasterKategoriApp {
updatedAt DateTime @updatedAt
name String
value String?
blockedUsers BlockedUser[]
}
// ======================= EVENT ======================= //
@@ -1073,3 +1079,20 @@ model Sticker {
MasterEmotions MasterEmotions[] @relation("StikerEmotions")
}
model BlockedUser {
id String @id @default(uuid())
isActive Boolean @default(true)
createdAt DateTime @default(now())
updatedAt DateTime @updatedAt
blockerId String // ID user yang memblokir
blockedId String // ID user yang diblokir
menuFeatureId String
menuFeature MasterKategoriApp @relation(fields: [menuFeatureId], references: [id])
blocker User @relation("BlockedBy", fields: [blockerId], references: [id])
blocked User @relation("Blocking", fields: [blockedId], references: [id])
@@unique([blockerId, blockedId])
}

View File

@@ -0,0 +1,110 @@
<!DOCTYPE html>
<html lang="id">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
<title>Syarat & Ketentuan - HIPMI Badung Connect</title>
<style>
body {
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif;
line-height: 1.6;
color: #333;
max-width: 800px;
margin: 40px auto;
padding: 0 20px;
}
h1, h2, h3 {
color: #1a365d;
}
ul {
padding-left: 20px;
}
footer {
margin-top: 40px;
font-size: 0.9em;
color: #666;
border-top: 1px solid #eee;
padding-top: 20px;
}
</style>
</head>
<body>
<h1>Syarat & Ketentuan Penggunaan HIPMI Badung Connect</h1>
<p>
Dengan menggunakan aplikasi <strong>HIPMI Badung Connect</strong> (“Aplikasi”), Anda setuju untuk mematuhi dan terikat oleh syarat dan ketentuan berikut. Jika Anda tidak setuju dengan ketentuan ini, harap jangan gunakan Aplikasi.
</p>
<h2>1. Definisi</h2>
<p>
<strong>HIPMI Badung Connect</strong> adalah platform digital resmi untuk anggota Himpunan Pengusaha Muda Indonesia (HIPMI) Kabupaten Badung, yang bertujuan memfasilitasi jaringan, kolaborasi, dan pertumbuhan bisnis para pengusaha muda.
</p>
<h2>2. Larangan Konten Tidak Pantas</h2>
<p>
Anda <strong>dilarang keras</strong> memposting, mengirim, membagikan, atau mengunggah konten apa pun yang mengandung:
</p>
<ul>
<li>Ujaran kebencian, diskriminasi, atau konten SARA (Suku, Agama, Ras, Antar-golongan)</li>
<li>Pornografi, konten seksual eksplisit, atau gambar tidak senonoh</li>
<li>Ancaman, pelecehan, bullying, atau perilaku melecehkan</li>
<li>Informasi palsu, hoaks, spam, atau konten menyesatkan</li>
<li>Konten ilegal, melanggar hukum, atau melanggar hak kekayaan intelektual pihak lain</li>
<li>Promosi narkoba, perjudian, atau aktivitas ilegal lainnya</li>
</ul>
<h2>3. Tanggung Jawab Pengguna</h2>
<p>
Anda bertanggung jawab penuh atas setiap konten yang Anda unggah atau bagikan melalui fitur-fitur berikut:
</p>
<ul>
<li>Profil (bio, foto, portofolio)</li>
<li>Forum diskusi</li>
<li>Chat pribadi atau grup</li>
<li>Lowongan kerja, investasi, dan donasi</li>
</ul>
<p>
Konten yang melanggar ketentuan ini dapat dihapus kapan saja tanpa pemberitahuan.
</p>
<h2>4. Tindakan terhadap Pelanggaran</h2>
<p>
Jika kami menerima laporan atau menemukan konten yang melanggar ketentuan ini, kami akan:
</p>
<ul>
<li>Segera menghapus konten tersebut</li>
<li>Memberikan peringatan atau memblokir akun pengguna</li>
<li>Dalam kasus berat, melaporkan ke pihak berwajib sesuai hukum yang berlaku</li>
</ul>
<p>
Tim kami berkomitmen untuk menanggapi laporan konten tidak pantas <strong>dalam waktu 24 jam</strong>.
</p>
<h2>5. Mekanisme Pelaporan</h2>
<p>
Anda dapat melaporkan konten atau pengguna yang mencurigakan melalui:
</p>
<ul>
<li>Tombol <strong>“Laporkan”</strong> di setiap posting forum atau pesan chat</li>
<li>Tombol <strong>“Blokir Pengguna”</strong> di profil pengguna</li>
</ul>
<p>
Setiap laporan akan ditangani secara rahasia dan segera.
</p>
<h2>6. Perubahan Ketentuan</h2>
<p>
Kami berhak memperbarui Syarat & Ketentuan ini sewaktu-waktu. Versi terbaru akan dipublikasikan di halaman ini dengan tanggal revisi yang diperbarui.
</p>
<h2>7. Kontak</h2>
<p>
Jika Anda memiliki pertanyaan tentang ketentuan ini, silakan hubungi kami di:
<strong>bip.baliinteraktifperkasa@gmail.com</strong>
</p>
<footer>
<p>© 2025 Bali Interaktif Perkasa. All rights reserved.</p>
</footer>
</body>
</html>

View File

@@ -14,6 +14,8 @@ export async function POST(req: Request) {
try {
const { data } = await req.json();
console.log("data >>", data);
const cekUsername = await prisma.user.findUnique({
where: {
username: data.username,
@@ -26,11 +28,20 @@ export async function POST(req: Request) {
message: "Username sudah digunakan",
});
// ✅ Validasi wajib setuju Terms
if (data.termsOfServiceAccepted !== true) {
return NextResponse.json({
success: false,
message: "You must agree to the Terms of Service",
});
}
const createUser = await prisma.user.create({
data: {
username: data.username,
nomor: data.nomor,
active: false,
termsOfServiceAccepted: data.termsOfServiceAccepted,
},
});
@@ -51,7 +62,7 @@ export async function POST(req: Request) {
success: true,
message: "Registrasi Berhasil, Anda Sedang Login",
token: token,
// data: createUser,
// data: createUser,x
},
{ status: 201 }
);
@@ -65,7 +76,5 @@ export async function POST(req: Request) {
},
{ status: 500 }
);
} finally {
await prisma.$disconnect();
}
}

View File

@@ -0,0 +1,29 @@
import { NextResponse } from "next/server";
import prisma from "@/lib/prisma";
export async function POST(req: Request) {
try {
const { data } = await req.json();
console.log("data >>", data);
const updateTermService = await prisma.user.update({
where: {
id: data.id,
},
data: {
termsOfServiceAccepted: data.termsOfServiceAccepted,
},
});
return NextResponse.json({
success: true,
message: "Berhasil",
});
} catch (error) {
console.log("error >>", error);
return NextResponse.json({
success: false,
message: "Gagal",
});
}
}

View File

@@ -24,6 +24,7 @@ export async function POST(req: Request) {
username: true,
active: true,
masterUserRoleId: true,
termsOfServiceAccepted: true,
},
});
@@ -52,6 +53,7 @@ export async function POST(req: Request) {
message: "Berhasil Login",
roleId: dataUser.masterUserRoleId,
active: dataUser.active,
termsOfServiceAccepted: dataUser.termsOfServiceAccepted,
token: token,
},
{ status: 200 }
@@ -76,7 +78,5 @@ export async function POST(req: Request) {
},
{ status: 500 }
);
} finally {
await prisma.$disconnect();
}
}

View File

@@ -60,12 +60,14 @@ async function seederUser() {
username: i.name,
masterUserRoleId: i.masterUserRoleId,
active: i.active,
termsOfServiceAccepted: i.termsOfServiceAccepted,
},
update: {
nomor: i.nomor,
username: i.name,
masterUserRoleId: i.masterUserRoleId,
active: i.active,
termsOfServiceAccepted: i.termsOfServiceAccepted,
},
});
}
@@ -564,10 +566,12 @@ async function masterKategoriApp() {
create: {
id: a.id,
name: a.name,
value: a.value,
},
update: {
id: a.id,
name: a.name,
value: a.value,
},
});
}

View File

@@ -1,30 +1,37 @@
[
{
"id": "1",
"name": "Event"
"name": "Event",
"value": "event"
},
{
"id": "2",
"name": "Job"
"name": "Job",
"value": "job"
},
{
"id": "3",
"name": "Voting"
"name": "Voting",
"value": "voting"
},
{
"id": "4",
"name": "Donasi"
"name": "Donasi",
"value": "donasi"
},
{
"id": "5",
"name": "Investasi"
"name": "Investasi",
"value": "investasi"
},
{
"id": "6",
"name": "Forum"
"name": "Forum",
"value": "forum"
},
{
"id": "7",
"name": "Collaboration"
"name": "Collaboration",
"value": "collaboration"
}
]

View File

@@ -3,12 +3,14 @@
"name": "bagas_admin",
"nomor": "6282340374412",
"masterUserRoleId": "3",
"active": true
"active": true,
"termsOfServiceAccepted": true
},
{
"name": "fahmi_admin",
"nomor": "628123833845",
"masterUserRoleId": "2",
"active": true
"active": true,
"termsOfServiceAccepted": true
}
]

View File

@@ -19,6 +19,7 @@ const CONFIG: MiddlewareConfig = {
publicRoutes: [
"/",
"/.well-known/*",
"/terms-of-service.html",
"/privacy-policy.html",
"/api/helper/*",
"/api/not-user/*",