feat:merge

This commit is contained in:
Anang Yusman 2025-03-06 00:41:56 +08:00
commit dbf0edb58e
3 changed files with 5 additions and 8 deletions

View File

@ -328,7 +328,7 @@ export default function ExecutiveDashboard() {
</Card> </Card>
</div> </div>
<div className="w-full mt-3"> <div className="w-full mt-3">
<Card className="rounded-sm p-3 h-[850px]"> <Card className="rounded-sm p-3 h-[750px]">
<div className="flex flex-row justify-between"> <div className="flex flex-row justify-between">
<p className="text-base font-semibold">Konten Paling Populer</p> <p className="text-base font-semibold">Konten Paling Populer</p>
<LucideBoxSelect /> <LucideBoxSelect />
@ -338,14 +338,14 @@ export default function ExecutiveDashboard() {
<iframe <iframe
src={`${baseUrl + view2 + param}`} src={`${baseUrl + view2 + param}`}
width="100%" width="100%"
height="500" height="650"
frameBorder="0" frameBorder="0"
/> />
) : ( ) : (
<iframe <iframe
src={`${`${url + ticket4}/${view2}${param}`}`} src={`${`${url + ticket4}/${view2}${param}`}`}
width="100%" width="100%"
height="500" height="650"
frameBorder="0" frameBorder="0"
/> />
)} )}
@ -353,7 +353,7 @@ export default function ExecutiveDashboard() {
</Card> </Card>
</div> </div>
<div className="w-full mt-3"> <div className="w-full mt-3">
<Card className="rounded-sm p-3 h-[850px]"> <Card className="rounded-sm p-3 h-[750px]">
<div className="flex flex-row justify-between"> <div className="flex flex-row justify-between">
<p className="text-base font-semibold"> <p className="text-base font-semibold">
Heatmap Konten Dengan Interaksi Heatmap Konten Dengan Interaksi

View File

@ -7,7 +7,7 @@ const axiosBaseProdInstance = axios.create({
headers: { headers: {
"content-type": "application/json", "content-type": "application/json",
}, },
withCredentials: true, withCredentials: false,
}); });
export default axiosBaseProdInstance; export default axiosBaseProdInstance;

View File

@ -41,7 +41,6 @@ export async function httpPostInterceptor(
headers?: any headers?: any
) { ) {
const resCsrf = await getCsrfToken(); const resCsrf = await getCsrfToken();
const csrfToken = resCsrf?.data?.token;
const defaultHeaders = { const defaultHeaders = {
"Content-Type": "application/json", "Content-Type": "application/json",
@ -49,7 +48,6 @@ export async function httpPostInterceptor(
const mergedHeaders = { const mergedHeaders = {
...defaultHeaders, ...defaultHeaders,
...headers, ...headers,
...(csrfToken ? { "X-XSRF-TOKEN": csrfToken } : {}),
}; };
const response = await axiosBaseProdInstance const response = await axiosBaseProdInstance
@ -90,7 +88,6 @@ export async function httpPutInterceptor(
const mergedHeaders = { const mergedHeaders = {
...defaultHeaders, ...defaultHeaders,
...headers, ...headers,
...(csrfToken ? { "X-XSRF-TOKEN": csrfToken } : {}),
}; };
const response = await axiosBaseProdInstance const response = await axiosBaseProdInstance