diff --git a/app/[locale]/(protected)/admin/broadcast/campaign-list/account-list/edit/[id]/page.tsx b/app/[locale]/(protected)/admin/broadcast/campaign-list/account-list/edit/[id]/page.tsx index 1ce469af..269ce368 100644 --- a/app/[locale]/(protected)/admin/broadcast/campaign-list/account-list/edit/[id]/page.tsx +++ b/app/[locale]/(protected)/admin/broadcast/campaign-list/account-list/edit/[id]/page.tsx @@ -70,7 +70,7 @@ export default function EditAccountForBroadcast() { useEffect(() => { async function getDetailData() { const response = await getMediaBlastAccount(String(id)); - const details = response.data?.data; + const details = response?.data?.data; console.log("new", details); form.setValue("name", details.accountName); form.setValue("email", details?.emailAddress); diff --git a/app/[locale]/(public)/content-management/download/page.tsx b/app/[locale]/(public)/content-management/download/page.tsx index 7b2dd35a..fe9e3fe6 100644 --- a/app/[locale]/(public)/content-management/download/page.tsx +++ b/app/[locale]/(public)/content-management/download/page.tsx @@ -54,9 +54,9 @@ const Galery = (props: any) => { const format = formatFilter == undefined ? "" : formatFilter?.join(","); const response = await mediaWishlist("2", isInstitute ? instituteId : "", name, filter, "9", pages, sortBy, format); - setGetTotalPage(response.data?.data?.totalPages); - setContentVideo(response.data?.data?.content); - setTotalContent(response.data?.data?.totalElements); + setGetTotalPage(response?.data?.data?.totalPages); + setContentVideo(response?.data?.data?.content); + setTotalContent(response?.data?.data?.totalElements); } useEffect(() => { @@ -88,9 +88,9 @@ const Galery = (props: any) => { const response = await mediaWishlist("3", isInstitute ? instituteId : "", name, filter, "12", pages, sortBy, format); - setGetTotalPage(response.data?.data?.totalPages); - setContentDocument(response.data?.data?.content); - setTotalContent(response.data?.data?.totalElements); + setGetTotalPage(response?.data?.data?.totalPages); + setContentDocument(response?.data?.data?.content); + setTotalContent(response?.data?.data?.totalElements); } useEffect(() => { @@ -113,9 +113,9 @@ const Galery = (props: any) => { const response = await mediaWishlist("4", isInstitute ? instituteId : "", name, filter, "6", pages, sortBy, format); - setGetTotalPage(response.data?.data?.totalPages); - setContentAudio(response.data?.data?.content); - setTotalContent(response.data?.data?.totalElements); + setGetTotalPage(response?.data?.data?.totalPages); + setContentAudio(response?.data?.data?.content); + setTotalContent(response?.data?.data?.totalElements); } useEffect(() => { @@ -134,10 +134,10 @@ const Galery = (props: any) => { const response = await mediaWishlist("1", isInstitute ? instituteId : "", name, filter, "12", pages, sortBy, format); - setGetTotalPage(response.data?.data?.totalPages); - setContentImage(response.data?.data?.content); + setGetTotalPage(response?.data?.data?.totalPages); + setContentImage(response?.data?.data?.content); // console.log("response", response); - setTotalContent(response.data?.data?.totalElements); + setTotalContent(response?.data?.data?.totalElements); } useEffect(() => { diff --git a/components/editor/custom-editor.js b/components/editor/custom-editor.js index 367955a5..d3e7a7d6 100644 --- a/components/editor/custom-editor.js +++ b/components/editor/custom-editor.js @@ -14,6 +14,9 @@ function CustomEditor(props) { console.log({ event, editor, data }); props.onChange(data); }} + config={{ + toolbar: [ 'heading', 'fontsize', 'bold', 'italic', 'link', 'numberedList', 'bulletedList', 'undo', 'redo', 'alignment', 'outdent', 'indent', 'blockQuote', 'insertTable', 'codeBlock', 'sourceEditing'] + }} /> ); } diff --git a/components/form/content/image-form.tsx b/components/form/content/image-form.tsx index 09fabe3b..90039951 100644 --- a/components/form/content/image-form.tsx +++ b/components/form/content/image-form.tsx @@ -355,7 +355,7 @@ export default function FormImage() { const getCategories = async () => { try { const category = await listEnableCategory(fileTypeId); - const resCategory: Category[] = category.data.data.content; + const resCategory: Category[] = category?.data.data.content; setCategories(resCategory); console.log("data category", resCategory); diff --git a/components/landing-page/navbar.tsx b/components/landing-page/navbar.tsx index 8fb75ca4..1aaba34e 100644 --- a/components/landing-page/navbar.tsx +++ b/components/landing-page/navbar.tsx @@ -62,10 +62,12 @@ const Navbar = () => { useEffect(() => { async function initState() { const response = await getInfoProfile(); - const details = response.data?.data; - - setDetail(details); - console.log("data", details); + if (!response?.error) { + const details = response?.data?.data; + + setDetail(details); + console.log("data", details); + } } initState(); diff --git a/service/http-config/axios-interceptor-instance.ts b/service/http-config/axios-interceptor-instance.ts index bbbe39c6..e02a1102 100644 --- a/service/http-config/axios-interceptor-instance.ts +++ b/service/http-config/axios-interceptor-instance.ts @@ -45,13 +45,20 @@ axiosInterceptorInstance.interceptors.response.use( }; console.log("refresh token ", data); const res = await login(data); - const { access_token } = res?.data; - const { refresh_token } = res?.data; - if (access_token) { - Cookies.set("access_token", access_token); - Cookies.set("refresh_token", refresh_token); - return axiosInterceptorInstance(originalRequest); + if (res?.error) { + Object.keys(Cookies.get()).forEach((cookieName) => { + Cookies.remove(cookieName); + }); + } else { + const { access_token } = res?.data; + const { refresh_token } = res?.data; + if (access_token) { + Cookies.set("access_token", access_token); + Cookies.set("refresh_token", refresh_token); + } } + + return axiosInterceptorInstance(originalRequest); } return Promise.reject(error); diff --git a/service/http-config/http-interceptor-service.ts b/service/http-config/http-interceptor-service.ts index 40d4e6c5..8f929ac7 100644 --- a/service/http-config/http-interceptor-service.ts +++ b/service/http-config/http-interceptor-service.ts @@ -14,11 +14,10 @@ export async function httpGetInterceptor(pathUrl: any) { data: response?.data, }; } else if (response?.status == 401) { - Cookies.set("is_logout", "true"); + Object.keys(Cookies.get()).forEach((cookieName) => { + Cookies.remove(cookieName); + }); // window.location.href = "/"; - return { - error: true, - }; } else { return { error: true, @@ -44,8 +43,10 @@ export async function httpPostInterceptor( data: response?.data, }; } else if (response?.status == 401) { - Cookies.set("is_logout", "true"); - // window.location.href = "/"; + Object.keys(Cookies.get()).forEach((cookieName) => { + Cookies.remove(cookieName); + }); + window.location.href = "/"; } else { return { error: true, @@ -71,8 +72,10 @@ export async function httpPutInterceptor( data: response?.data, }; } else if (response?.status == 401) { - Cookies.set("is_logout", "true"); - // window.location.href = "/"; + Object.keys(Cookies.get()).forEach((cookieName) => { + Cookies.remove(cookieName); + }); + window.location.href = "/"; } else { return { error: true, @@ -94,8 +97,10 @@ export async function httpDeleteInterceptor(pathUrl: any) { data: response?.data, }; } else if (response?.status == 401) { - Cookies.set("is_logout", "true"); - // window.location.href = "/"; + Object.keys(Cookies.get()).forEach((cookieName) => { + Cookies.remove(cookieName); + }); + window.location.href = "/"; } else { return { error: true, @@ -116,9 +121,6 @@ export async function httpGetInterceptorWithToken(pathUrl: any, headers?: any) { message: "success", data: response?.data, }; - } else if (response?.status == 401) { - Cookies.set("is_logout", "true"); - // window.location.href = "/"; } else { return { error: true,