From d42892815001e1e1d7f9d41ee2fe2fca2766c9ea Mon Sep 17 00:00:00 2001
From: Rama Priyanto
Date: Fri, 7 Mar 2025 16:08:19 +0700
Subject: [PATCH] fix:avertise form
---
app/(admin)/admin/advertise/page.tsx | 21 +++++---
app/auth/page.tsx | 5 --
.../form/article/create-article-form.tsx | 52 ++++++-------------
components/form/article/edit-article-form.tsx | 1 +
components/form/login.tsx | 21 +++++---
components/table/article-table.tsx | 8 ++-
.../master-user-level-table.tsx | 23 +++++---
7 files changed, 67 insertions(+), 64 deletions(-)
diff --git a/app/(admin)/admin/advertise/page.tsx b/app/(admin)/admin/advertise/page.tsx
index a6a702c..96cc2b8 100644
--- a/app/(admin)/admin/advertise/page.tsx
+++ b/app/(admin)/admin/advertise/page.tsx
@@ -12,6 +12,8 @@ import {
ModalContent,
ModalFooter,
ModalHeader,
+ Radio,
+ RadioGroup,
Switch,
Textarea,
useDisclosure,
@@ -46,7 +48,7 @@ export default function AdvertisePage() {
const MySwal = withReactContent(Swal);
const [refresh, setRefresh] = useState(false);
- const [isHeader, setIsHeader] = useState(false);
+ const [placement, setPlacement] = useState("banner");
const [files, setFiles] = useState([]);
@@ -76,7 +78,7 @@ export default function AdvertisePage() {
const formData = {
title: values.title,
description: values.description,
- isHeader: isHeader,
+ placement: placement,
url: values.url,
};
close();
@@ -219,14 +221,17 @@ export default function AdvertisePage() {
)}
- Header
- Penempatan
+
- {isHeader ? "Ya" : "Tidak"}
-
+ Banner
+ Jumbotron
+
Thumbnail
{files.length < 1 && (
diff --git a/app/auth/page.tsx b/app/auth/page.tsx
index e173b45..300e6a1 100644
--- a/app/auth/page.tsx
+++ b/app/auth/page.tsx
@@ -1,9 +1,4 @@
-"use client";
-
import Login from "@/components/form/login";
-import QudoLogin from "@/components/form/qudo-login";
-import Cookies from "js-cookie";
-import React, { useEffect, useState } from "react";
export default function AuthPage() {
// const isAuthenticated = Cookies.get("is_authenticated") || "false";
diff --git a/components/form/article/create-article-form.tsx b/components/form/article/create-article-form.tsx
index ff524ed..2a46a2b 100644
--- a/components/form/article/create-article-form.tsx
+++ b/components/form/article/create-article-form.tsx
@@ -58,6 +58,8 @@ import {
} from "@/service/generate-article";
import GenerateContentRewriteForm from "./generate-ai-content-rewrite-form";
import Datepicker from "react-tailwindcss-datepicker";
+import Cookies from "js-cookie";
+import { getUserLevels } from "@/services/user-levels/user-levels-service";
const CustomEditor = dynamic(
() => {
@@ -112,7 +114,7 @@ const createArticleSchema = z.object({
export default function CreateArticleForm() {
const { isOpen, onOpen, onOpenChange } = useDisclosure();
-
+ const userLevel = Cookies.get("ulne");
const animatedComponents = makeAnimated();
const MySwal = withReactContent(Swal);
const router = useRouter();
@@ -285,8 +287,16 @@ export default function CreateArticleForm() {
}
};
+ const getUserLevelApprovalStatus = async () => {
+ const res = await getUserLevels(String(userLevel));
+ console.log("res", res?.data?.data?.isApprovalActive);
+ return res?.data?.data?.isApprovalActive;
+ };
+
const save = async (values: z.infer
) => {
loading();
+
+ const userLevelStatus = await getUserLevelApprovalStatus();
const formData = {
title: values.title,
typeId: 1,
@@ -296,14 +306,12 @@ export default function CreateArticleForm() {
description: htmlToString(removeImgTags(values.description)),
htmlDescription: removeImgTags(values.description),
aiArticleId: await saveArticleToDise(values),
+ // isDraft: userLevelStatus ? true : status === "draft",
+ // isPublish: userLevelStatus ? false : status === "publish",
isDraft: status === "draft",
isPublish: status === "publish",
};
- console.log(
- "ssada",
- formData,
- `${startDateValue.year}-${startDateValue.month}-${startDateValue.day}`
- );
+
const response = await createArticle(formData);
if (response?.error) {
@@ -340,7 +348,7 @@ export default function CreateArticleForm() {
if (status === "scheduled") {
const request = {
id: articleId,
- date: `${startDateValue.year}-${startDateValue.month}-${startDateValue.day}`,
+ date: `${startDateValue?.year}-${startDateValue?.month}-${startDateValue?.day}`,
};
const res = await createArticleSchedule(request);
}
@@ -659,7 +667,7 @@ export default function CreateArticleForm() {
variant="bordered"
size="sm"
color="danger"
- onClick={() => setThumbnailImg([])}
+ onPress={() => setThumbnailImg([])}
>
@@ -789,15 +797,6 @@ export default function CreateArticleForm() {
Tanggal
- {/*
setStartDateValue(e)}
- inputClassName="z-50 w-full text-xs lg:text-sm bg-white dark bg-black border-1 border-gray-200 px-2 py-[6px] rounded-sm lg:rounded-lg h-[30px] lg:h-[40px] text-gray-600 dark:text-gray-300"
- /> */}
- {/*
*/}
)}
diff --git a/components/form/article/edit-article-form.tsx b/components/form/article/edit-article-form.tsx
index 5e93550..40741c9 100644
--- a/components/form/article/edit-article-form.tsx
+++ b/components/form/article/edit-article-form.tsx
@@ -875,6 +875,7 @@ export default function EditArticleForm(props: { isDetail: boolean }) {
{isDetail &&
+ username === "admin-mabes" &&
(detailData?.statusId === 1 || detailData?.statusId === null) && (