Merge branch 'prod' of https://gitlab.com/hanifsalafi/mediahub_redesign into prod
This commit is contained in:
commit
e4ac7a867d
|
|
@ -32,4 +32,4 @@ auto-deploy:
|
|||
services:
|
||||
- docker:dind
|
||||
script:
|
||||
- curl --user admin:$JENKINS_PWD http://38.47.180.165:8080/job/auto-deploy-new-mediahub-fe/build?token=autodeploynewmediahub
|
||||
- curl --user admin:$JENKINS_PWD http://103.31.38.120:8080/job/auto-deploy-new-mediahub-fe/build?token=autodeploynewmediahub
|
||||
|
|
|
|||
|
|
@ -103,7 +103,10 @@ export default function TrackingBeritaCard() {
|
|||
|
||||
// cek pesan API
|
||||
if (!res?.data?.success) {
|
||||
throw new Error(res?.data?.message || "Limit media tracking per hari sudah tercapai. Maksimal 5 tracking per hari.");
|
||||
throw new Error(
|
||||
res?.data?.message ||
|
||||
"Limit media tracking per hari sudah tercapai. Maksimal 5 tracking per hari."
|
||||
);
|
||||
}
|
||||
|
||||
return res;
|
||||
|
|
|
|||
|
|
@ -1402,6 +1402,7 @@ export default function FormConvertSPIT() {
|
|||
);
|
||||
}
|
||||
|
||||
|
||||
// {spit with new layout file placements}
|
||||
// "use client";
|
||||
// import React, { ChangeEvent, useEffect, useRef, useState } from "react";
|
||||
|
|
|
|||
|
|
@ -363,7 +363,6 @@ export default function FormTaskTa() {
|
|||
assignmentType: taskType,
|
||||
assignmentTypeId: type,
|
||||
expertCompetencies: Array.from(selectedCompetencies).join(","),
|
||||
title: data.title,
|
||||
attachmentUrl: cleanedLinks,
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -37,15 +37,23 @@ export default function PerformancePoldaViz() {
|
|||
const view2 =
|
||||
levelName == "MABES POLRI"
|
||||
? isInternational[0]
|
||||
? // "views/2023_09_db-ranking-polda_rev100/db-ranking-13?"
|
||||
"views/2025_11_Mediahub-Admin-Mabes-Breadkdown-Rev100/db-jumlah-konten?"
|
||||
: // "views/2023_09_db-ranking-polda_rev100/db-ranking-13?"
|
||||
"views/2025_11_Mediahub-Admin-Mabes-Breadkdown-Rev100/db-jumlah-konten?"
|
||||
?
|
||||
"views/2023_09_db-ranking-polda_rev100/db-ranking-13?"
|
||||
// "views/2025_11_Mediahub-Admin-Mabes-Breadkdown-Rev100/db-jumlah-konten?"
|
||||
// "views/2025_10_db-ranking-polda_rev100/db-ranking-13?"
|
||||
:
|
||||
"views/2023_09_db-ranking-polda_rev100/db-ranking-13?"
|
||||
// "views/2025_11_Mediahub-Admin-Mabes-Breadkdown-Rev100/db-jumlah-konten?"
|
||||
// "views/2025_10_db-ranking-polda_rev100/db-ranking-13?"
|
||||
: safeLevelName.includes("POLDA")
|
||||
? // `views/2023_09_db-ranking-polres-by-polda_rev100/db-ranking-by-polda?polda-selected=${state}&`
|
||||
`views/2025_11_Mediahub-Admin-Mabes-Breadkdown-Rev100/db-jumlah-konten?provinsi-polda=${provState}&`
|
||||
: // `views/2023_09_db-ranking-polres-by-polda_rev100/db-ranking-by-polda?polda-selected=${state}&`;
|
||||
`views/2025_11_Mediahub-Admin-Mabes-Breadkdown-Rev100/db-jumlah-konten?provinsi-polda=${provState}&`;
|
||||
?
|
||||
`views/2023_09_db-ranking-polres-by-polda_rev100/db-ranking-by-polda?polda-selected=${provState}&`
|
||||
// `views/2025_11_Mediahub-Admin-Mabes-Breadkdown-Rev100/db-jumlah-konten?provinsi-polda=${provState}&`
|
||||
// `views/2025_10_db-ranking-polda_rev100/db-ranking-13?provinsi-polda=${provState}&`
|
||||
:
|
||||
`views/2023_09_db-ranking-polres-by-polda_rev100/db-ranking-by-polda?polda-selected=${provState}&`;
|
||||
// `views/2025_11_Mediahub-Admin-Mabes-Breadkdown-Rev100/db-jumlah-konten?provinsi-polda=${provState}&`;
|
||||
// `views/2025_10_db-ranking-polda_rev100/db-ranking-13?provinsi-polda=${provState}&`;
|
||||
|
||||
const param = ":embed=yes&:toolbar=yes&:iframeSizedToWindow=true";
|
||||
|
||||
|
|
|
|||
|
|
@ -55,8 +55,8 @@ export const validatePassword = (password: string, confirmPassword?: string): Pa
|
|||
}
|
||||
|
||||
// Check for special character
|
||||
if (!/[@$!%*?&]/.test(password)) {
|
||||
errors.push("Password must contain at least one special character (@$!%*?&)");
|
||||
if (!/[~!@#$%^&*-+=?><]/.test(password)) {
|
||||
errors.push("Password must contain at least one special character (~!@#$%^&*-+=?><)");
|
||||
}
|
||||
|
||||
// Check password confirmation
|
||||
|
|
|
|||
|
|
@ -127,16 +127,16 @@ export async function getAcceptance(id: any, isAccept: any) {
|
|||
return httpGetInterceptor(url);
|
||||
}
|
||||
|
||||
export async function acceptAssignment(id: any) {
|
||||
const url = `assignment/acceptance?id=${id}`;
|
||||
return httpPostInterceptor(url, id);
|
||||
}
|
||||
|
||||
export async function getAcceptanceTa(id: any, isAccept: any) {
|
||||
const url = `assignment-expert/acceptance?id=${id}&isAccept=${isAccept}`;
|
||||
return httpGetInterceptor(url);
|
||||
}
|
||||
|
||||
export async function acceptAssignment(id: any) {
|
||||
const url = `assignment/acceptance?id=${id}`;
|
||||
return httpPostInterceptor(url, id);
|
||||
}
|
||||
|
||||
export async function acceptAssignmentTa(id: any) {
|
||||
const url = `assignment-expert/acceptance?id=${id}`;
|
||||
return httpPostInterceptor(url, id);
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ export const registrationSchema = z.object({
|
|||
.min(1, { message: "Password is required" })
|
||||
.min(8, { message: "Password must be at least 8 characters" })
|
||||
.max(100, { message: "Password must be less than 100 characters" })
|
||||
.regex(/^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[@$!%*?&])[A-Za-z\d@$!%*?&]/, {
|
||||
.regex(/^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[#@$!%*?&])[A-Za-z\d@$!%*#?&]/, {
|
||||
message: "Password must contain at least one uppercase letter, one lowercase letter, one number, and one special character"
|
||||
}),
|
||||
passwordConf: z
|
||||
|
|
|
|||
Loading…
Reference in New Issue