diff --git a/app/[locale]/(public)/satker/[satker_name]/page.tsx b/app/[locale]/(public)/satker/[satker_name]/page.tsx
new file mode 100644
index 00000000..e0864a5a
--- /dev/null
+++ b/app/[locale]/(public)/satker/[satker_name]/page.tsx
@@ -0,0 +1,21 @@
+"use client";
+
+import ContentCategory from "@/components/landing-page/content-category";
+import HeaderBannerSatker from "@/components/landing-page/header-banner-satker";
+import NewContent from "@/components/landing-page/new-content";
+import WelcomeSatker from "@/components/landing-page/welcome-satker";
+import React from "react";
+
+const page = () => {
+ return (
+
+
+
+
+
+
+
+ );
+};
+
+export default page;
diff --git a/app/[locale]/(public)/satker/layout.tsx b/app/[locale]/(public)/satker/layout.tsx
new file mode 100644
index 00000000..fab820cf
--- /dev/null
+++ b/app/[locale]/(public)/satker/layout.tsx
@@ -0,0 +1,22 @@
+import LayoutProvider from "@/providers/layout.provider";
+import LayoutContentProvider from "@/providers/content.provider";
+import DashCodeSidebar from "@/components/partials/sidebar";
+import DashCodeFooter from "@/components/partials/footer";
+import ThemeCustomize from "@/components/partials/customizer";
+import DashCodeHeader from "@/components/partials/header";
+
+import { redirect } from "@/components/navigation";
+import Footer from "@/components/landing-page/footer";
+import Navbar from "@/components/landing-page/navbar";
+
+const layout = async ({ children }: { children: React.ReactNode }) => {
+ return (
+ <>
+
+ {children}
+
+ >
+ );
+};
+
+export default layout;
diff --git a/components/form/content/image-form.tsx b/components/form/content/image-form.tsx
index 09cf3cb5..9a6128ec 100644
--- a/components/form/content/image-form.tsx
+++ b/components/form/content/image-form.tsx
@@ -421,14 +421,6 @@ export default function FormImage() {
// MySwal.fire("Sukses", "Data berhasil disimpan.", "success");
};
- // function showProgress() {
- // $('#modalProgress').modal('show');
- // }
-
- // function hideProgress() {
- // $('#modalProgress').modal('hide');
- // }
-
const onSubmit = (data: ImageSchema) => {
MySwal.fire({
title: "Simpan Data",
diff --git a/components/landing-page/division.tsx b/components/landing-page/division.tsx
index 6b59a642..9fd77d2a 100644
--- a/components/landing-page/division.tsx
+++ b/components/landing-page/division.tsx
@@ -2,50 +2,51 @@ import React, { useState } from "react";
import { Button } from "../ui/button";
import { Reveal } from "./Reveal";
import { Icon } from "@iconify/react/dist/iconify.js";
+import { Link } from "@/i18n/routing";
const Division = () => {
const [searchTerm, setSearchTerm] = useState("");
const [seeAllValue, setSeeAllValue] = useState(false);
const regions = [
- { name: "SIBER", logo: "/assets/satker/siber.png" },
- { name: "DIVKUM", logo: "/assets/satker/divkum.png" },
- { name: "PUSKEU", logo: "/assets/satker/puskeu.png" },
- { name: "SSDM", logo: "/assets/satker/ssdm.png" },
- { name: "ITWASUM", logo: "/assets/satker/itwasum.png" },
- { name: "STIK-PTIK", logo: "/assets/satker/stik-ptik.png" },
- { name: "SATUAN KERJA POLRI", logo: "/assets/satker/satuan-kerja-polri.png" },
- { name: "BRIMOB", logo: "/assets/satker/brimob.png" },
- { name: "DIV HUMAS", logo: "/assets/satker/div-humas.png" },
- { name: "PUSLITBANG", logo: "/assets/satker/puslitbang.png" },
- { name: "BINMAS", logo: "/assets/satker/binmas.png" },
- { name: "DIV TIK", logo: "/assets/satker/div-tik.png" },
- { name: "SPRIPIM", logo: "/assets/satker/spripim.png" },
- { name: "DIVPROPRAM", logo: "/assets/satker/div-propram.png" },
- { name: "KORPS SABHARA BAHARKAM", logo: "/assets/satker/khorp-sabhara-baharkam.png" },
- { name: "PUSDOKKES", logo: "/assets/satker/pusdokkes.png" },
- { name: "BAHARKAM", logo: "/assets/satker/baharkam.png" },
- { name: "POLAIRUD", logo: "/assets/satker/polairud.png" },
- { name: "POLAIR", logo: "/assets/satker/polair.png" },
- { name: "POLUDARA", logo: "/assets/satker/poludara.png" },
- { name: "LEMDIKLAT", logo: "/assets/satker/lemdiklat.png" },
- { name: "AKPOL", logo: "/assets/satker/akpol.png" },
- { name: "KORLANTAS", logo: "/assets/satker/korlantas.png" },
- { name: "PUSINAFIS", logo: "/assets/satker/pusinafis.png" },
- { name: "PUSJARAH", logo: "/assets/satker/pusjarah.png" },
- { name: "PUSIKNAS", logo: "/assets/satker/pusiknas.png" },
- { name: "SLOG", logo: "/assets/satker/slog.png" },
- { name: "BAINTELKAM", logo: "/assets/satker/baintelkam.jpg" },
- { name: "BARESKRIM", logo: "/assets/satker/bareskrim.png" },
- { name: "DIVHUBINTER", logo: "/assets/satker/divhubinter.png" },
- { name: "SETUM", logo: "/assets/satker/setum.png" },
- { name: "PUSLABFOR", logo: "/assets/satker/puslabfor.png" },
- { name: "DENSUS 88", logo: "/assets/satker/densus88.png" },
- { name: "SAHLI KAPOLRI", logo: "/assets/satker/sahli-kapolri.png" },
- { name: "SOPS", logo: "/assets/satker/sops.png" },
- { name: "SRENA", logo: "/assets/satker/srena.png" },
- { name: "SESPIM POLRI", logo: "/assets/satker/sespim-polri.png" },
- { name: "SETUPA POLRI", logo: "/assets/satker/setupa-polri.png" },
+ { name: "SIBER", slug: "siber", logo: "/assets/satker/siber.png" },
+ { name: "DIVKUM", slug: "divkum", logo: "/assets/satker/divkum.png" },
+ { name: "PUSKEU", slug: "puskeu", logo: "/assets/satker/puskeu.png" },
+ { name: "SSDM", slug: "ssdm", logo: "/assets/satker/ssdm.png" },
+ { name: "ITWASUM", slug: "itwasum", logo: "/assets/satker/itwasum.png" },
+ { name: "STIK-PTIK", slug: "stik-ptik", logo: "/assets/satker/stik-ptik.png" },
+ { name: "SATUAN KERJA POLRI", slug: "satuan-kerja-polri", logo: "/assets/satker/satuan-kerja-polri.png" },
+ { name: "BRIMOB", slug: "brimob", logo: "/assets/satker/brimob.png" },
+ { name: "DIV HUMAS", slug: "div-humas", logo: "/assets/satker/div-humas.png" },
+ { name: "PUSLITBANG", slug: "puslitbang", logo: "/assets/satker/puslitbang.png" },
+ { name: "BINMAS", slug: "binmas", logo: "/assets/satker/binmas.png" },
+ { name: "DIV TIK", slug: "div-tik", logo: "/assets/satker/div-tik.png" },
+ { name: "SPRIPIM", slug: "spripim", logo: "/assets/satker/spripim.png" },
+ { name: "DIVPROPRAM", slug: "divpropram", logo: "/assets/satker/div-propram.png" },
+ { name: "KORPS SABHARA BAHARKAM", slug: "korps-sabhara-baharkam", logo: "/assets/satker/khorp-sabhara-baharkam.png" },
+ { name: "PUSDOKKES", slug: "pusdokkes", logo: "/assets/satker/pusdokkes.png" },
+ { name: "BAHARKAM", slug: "baharkam", logo: "/assets/satker/baharkam.png" },
+ { name: "POLAIRUD", slug: "polairud", logo: "/assets/satker/polairud.png" },
+ { name: "POLAIR", slug: "polair", logo: "/assets/satker/polair.png" },
+ { name: "POLUDARA", slug: "poludara", logo: "/assets/satker/poludara.png" },
+ { name: "LEMDIKLAT", slug: "lemdiklat", logo: "/assets/satker/lemdiklat.png" },
+ { name: "AKPOL", slug: "akpol", logo: "/assets/satker/akpol.png" },
+ { name: "KORLANTAS", slug: "korlantas", logo: "/assets/satker/korlantas.png" },
+ { name: "PUSINAFIS", slug: "pusinafis", logo: "/assets/satker/pusinafis.png" },
+ { name: "PUSJARAH", slug: "pusjarah", logo: "/assets/satker/pusjarah.png" },
+ { name: "PUSIKNAS", slug: "pusiknas", logo: "/assets/satker/pusiknas.png" },
+ { name: "SLOG", slug: "slog", logo: "/assets/satker/slog.png" },
+ { name: "BAINTELKAM", slug: "baintelkam", logo: "/assets/satker/baintelkam.jpg" },
+ { name: "BARESKRIM", slug: "bareskrim", logo: "/assets/satker/bareskrim.png" },
+ { name: "DIVHUBINTER", slug: "divhubinter", logo: "/assets/satker/divhubinter.png" },
+ { name: "SETUM", slug: "setum", logo: "/assets/satker/setum.png" },
+ { name: "PUSLABFOR", slug: "puslabfor", logo: "/assets/satker/puslabfor.png" },
+ { name: "DENSUS 88", slug: "densus-88", logo: "/assets/satker/densus88.png" },
+ { name: "SAHLI KAPOLRI", slug: "sahli-kapolri", logo: "/assets/satker/sahli-kapolri.png" },
+ { name: "SOPS", slug: "sops", logo: "/assets/satker/sops.png" },
+ { name: "SRENA", slug: "srena", logo: "/assets/satker/srena.png" },
+ { name: "SESPIM POLRI", slug: "sespim-polri", logo: "/assets/satker/sespim-polri.png" },
+ { name: "SETUPA POLRI", slug: "setupa-polri", logo: "/assets/satker/setupa-polri.png" },
];
return (
@@ -70,22 +71,22 @@ const Division = () => {
{regions.map((region, index) =>
!seeAllValue ? (
index < 7 ? (
-
+
) : (
""
)
) : (
-
+
)
)}
diff --git a/components/landing-page/header-banner-satker.tsx b/components/landing-page/header-banner-satker.tsx
new file mode 100644
index 00000000..d0a3ba7c
--- /dev/null
+++ b/components/landing-page/header-banner-satker.tsx
@@ -0,0 +1,121 @@
+"use client";
+import { listData } from "@/service/landing/landing";
+import { useParams, usePathname, useRouter } from "next/navigation";
+import React, { useEffect, useState } from "react";
+import Skeleton, { SkeletonTheme } from "react-loading-skeleton";
+import { Link } from "@/i18n/routing";
+import { getPublicLocaleTimestamp } from "@/utils/globals";
+import { Icon } from "@iconify/react/dist/iconify.js";
+import { Carousel, CarouselContent, CarouselItem, CarouselNext, CarouselPrevious } from "@/components/ui/carousel";
+
+const HeaderBannerSatker = () => {
+ const router = useRouter();
+ const params = useParams();
+ const satkerName: any = params?.satker_name;
+ const asPath: any = usePathname();
+ const [content, setContent] = useState([]);
+
+ const [isBannerLoading, setIsBannerLoading] = useState(true);
+ const [centerPadding, setCenterPadding] = useState();
+
+ useEffect(() => {
+ // async function initState() {
+ // const res = await listCarousel();
+ // setContent(res.data?.data);
+ // setCenterPadding(`${Math.trunc(Number(window.innerWidth) / 10 + 40)}px`);
+ // }
+
+ async function fetchData() {
+ const res = await listData("1", "", "", 5, 0, "createdAt", "", "", satkerName);
+ let data = res?.data?.data?.content;
+ setContent(data);
+ setCenterPadding(`${Math.trunc(Number(window.innerWidth) / 10 + 40)}px`);
+ setIsBannerLoading(false);
+ console.log("Done");
+ }
+
+ fetchData();
+ }, [params?.page]);
+
+ const settings = {
+ className: "center",
+ // centerMode: true,
+ infinite: true,
+ centerPadding,
+ slidesToShow: 2,
+ autoplay: true,
+ speed: 1500,
+ autoplaySpeed: 15_000,
+ focusOnSelect: true,
+ responsive: [
+ {
+ breakpoint: 768,
+ settings: {
+ arrows: false,
+ centerMode: true,
+ centerPadding: "60px",
+ slidesToShow: 1,
+ },
+ },
+ {
+ breakpoint: 480,
+ settings: {
+ arrows: false,
+ centerMode: true,
+ centerPadding: "20px",
+ slidesToShow: 1,
+ },
+ },
+ ],
+ };
+ return (
+
+ {/* Header */}
+
+ {isBannerLoading ? (
+
+
+
+ ) : (
+
+
+
+ {content?.map((row: any) => (
+
+
+

+
+
{row?.categoryName}
+
+
{row.title}
+
+
+ {getPublicLocaleTimestamp(new Date(row?.createdAt))} WIB {" | "}
+ {row?.clickCount}
+
+
+
+
+ ))}
+
+
+
+
+
+ )}
+
+
+ );
+};
+
+export default HeaderBannerSatker;
diff --git a/components/landing-page/welcome-polda.tsx b/components/landing-page/welcome-polda.tsx
index 41236231..fa78b17f 100644
--- a/components/landing-page/welcome-polda.tsx
+++ b/components/landing-page/welcome-polda.tsx
@@ -3,7 +3,6 @@ import React, { useEffect, useState } from "react";
import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger } from "../ui/dropdown-menu";
import { FiFile, FiImage, FiMusic, FiYoutube } from "react-icons/fi";
import { Icon } from "@iconify/react/dist/iconify.js";
-import { capitalize } from "@/utils/globals";
const WelcomePolda = () => {
const router = useRouter();
diff --git a/components/landing-page/welcome-satker.tsx b/components/landing-page/welcome-satker.tsx
new file mode 100644
index 00000000..4febc618
--- /dev/null
+++ b/components/landing-page/welcome-satker.tsx
@@ -0,0 +1,109 @@
+"use client";
+
+import { useParams, usePathname, useRouter } from "next/navigation";
+import React, { useEffect, useState } from "react";
+import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger } from "../ui/dropdown-menu";
+import { FiFile, FiImage, FiMusic, FiYoutube } from "react-icons/fi";
+import { Icon } from "@iconify/react/dist/iconify.js";
+import { capitalize } from "@/utils/globals";
+
+const WelcomeSatker = () => {
+ const router = useRouter();
+ const asPath: any = usePathname();
+ const params = useParams();
+ const satkerName: any = params?.satker_name;
+ const [categorySelect, setCategorySelect] = useState("0");
+ const [search, setSearch] = useState();
+
+ useEffect(() => {
+ function initState() {
+ console.log(categorySelect);
+ }
+
+ initState();
+ }, [categorySelect]);
+
+ return (
+
+
+ {/* Heading */}
+
+ Selamat Datang di Satker {satkerName.replace("-", " ")}
+
+
+
+ Liputan resmi yang bersumber dari kegiatan Polri di Satker {satkerName.replace("-", " ")}
+
+
+ {/* Search Form */}
+
+ {/* Dropdown */}
+
+
+
+
+
+ Konten
+
+
+
+
+
+
+
+ Audio Visual
+
+
+
+
+
+ Audio
+
+
+
+
+
+ Foto
+
+
+
+
+
+ Teks
+
+
+
+
+
+
+
+ {/* Search Input */}
+
+ {/* Button */}
+
+
+
+
+ );
+};
+
+export default WelcomeSatker;
diff --git a/package-lock.json b/package-lock.json
index 8d683e4b..15eef23e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -130,7 +130,6 @@
"swiper": "^11.1.15",
"tailwind-merge": "^2.5.5",
"tailwindcss-animate": "^1.0.7",
- "tus-js-client": "^4.2.3",
"use-places-autocomplete": "^4.0.1",
"vaul": "^0.9.1",
"yup": "^1.6.1",
@@ -3882,11 +3881,6 @@
"node": ">=8"
}
},
- "node_modules/buffer-from": {
- "version": "1.1.2",
- "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
- "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="
- },
"node_modules/busboy": {
"version": "1.6.0",
"resolved": "https://registry.npmjs.org/busboy/-/busboy-1.6.0.tgz",
@@ -4169,15 +4163,6 @@
"simple-swizzle": "^0.2.2"
}
},
- "node_modules/combine-errors": {
- "version": "3.0.3",
- "resolved": "https://registry.npmjs.org/combine-errors/-/combine-errors-3.0.3.tgz",
- "integrity": "sha512-C8ikRNRMygCwaTx+Ek3Yr+OuZzgZjduCOfSQBjbM8V3MfgcjSTeto/GXP6PAwKvJz/v15b7GHZvx5rOlczFw/Q==",
- "dependencies": {
- "custom-error-instance": "2.1.1",
- "lodash.uniqby": "4.5.0"
- }
- },
"node_modules/combined-stream": {
"version": "1.0.8",
"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
@@ -4294,11 +4279,6 @@
"resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
"integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw=="
},
- "node_modules/custom-error-instance": {
- "version": "2.1.1",
- "resolved": "https://registry.npmjs.org/custom-error-instance/-/custom-error-instance-2.1.1.tgz",
- "integrity": "sha512-p6JFxJc3M4OTD2li2qaHkDCw9SfMw82Ldr6OC9Je1aXiGfhx2W8p3GaoeaGrPJTUN9NirTM/KTxHWMUdR1rsUg=="
- },
"node_modules/cytoscape": {
"version": "3.30.4",
"resolved": "https://registry.npmjs.org/cytoscape/-/cytoscape-3.30.4.tgz",
@@ -7924,11 +7904,6 @@
"resolved": "https://registry.npmjs.org/jquery/-/jquery-2.2.4.tgz",
"integrity": "sha512-lBHj60ezci2u1v2FqnZIraShGgEXq35qCzMv4lITyHGppTnA13rwR0MgwyNJh9TnDs3aXUvd1xjAotfraMHX/Q=="
},
- "node_modules/js-base64": {
- "version": "3.7.7",
- "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-3.7.7.tgz",
- "integrity": "sha512-7rCnleh0z2CkXhH67J8K1Ytz0b2Y+yxTPL+/KOJoa20hfnVQ/3/T6W/KflYI4bRHRagNeXeU2bkNGI3v1oS/lw=="
- },
"node_modules/js-cookie": {
"version": "3.0.5",
"resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-3.0.5.tgz",
@@ -8182,46 +8157,6 @@
"resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz",
"integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="
},
- "node_modules/lodash._baseiteratee": {
- "version": "4.7.0",
- "resolved": "https://registry.npmjs.org/lodash._baseiteratee/-/lodash._baseiteratee-4.7.0.tgz",
- "integrity": "sha512-nqB9M+wITz0BX/Q2xg6fQ8mLkyfF7MU7eE+MNBNjTHFKeKaZAPEzEg+E8LWxKWf1DQVflNEn9N49yAuqKh2mWQ==",
- "dependencies": {
- "lodash._stringtopath": "~4.8.0"
- }
- },
- "node_modules/lodash._basetostring": {
- "version": "4.12.0",
- "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-4.12.0.tgz",
- "integrity": "sha512-SwcRIbyxnN6CFEEK4K1y+zuApvWdpQdBHM/swxP962s8HIxPO3alBH5t3m/dl+f4CMUug6sJb7Pww8d13/9WSw=="
- },
- "node_modules/lodash._baseuniq": {
- "version": "4.6.0",
- "resolved": "https://registry.npmjs.org/lodash._baseuniq/-/lodash._baseuniq-4.6.0.tgz",
- "integrity": "sha512-Ja1YevpHZctlI5beLA7oc5KNDhGcPixFhcqSiORHNsp/1QTv7amAXzw+gu4YOvErqVlMVyIJGgtzeepCnnur0A==",
- "dependencies": {
- "lodash._createset": "~4.0.0",
- "lodash._root": "~3.0.0"
- }
- },
- "node_modules/lodash._createset": {
- "version": "4.0.3",
- "resolved": "https://registry.npmjs.org/lodash._createset/-/lodash._createset-4.0.3.tgz",
- "integrity": "sha512-GTkC6YMprrJZCYU3zcqZj+jkXkrXzq3IPBcF/fIPpNEAB4hZEtXU8zp/RwKOvZl43NUmwDbyRk3+ZTbeRdEBXA=="
- },
- "node_modules/lodash._root": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz",
- "integrity": "sha512-O0pWuFSK6x4EXhM1dhZ8gchNtG7JMqBtrHdoUFUWXD7dJnNSUze1GuyQr5sOs0aCvgGeI3o/OJW8f4ca7FDxmQ=="
- },
- "node_modules/lodash._stringtopath": {
- "version": "4.8.0",
- "resolved": "https://registry.npmjs.org/lodash._stringtopath/-/lodash._stringtopath-4.8.0.tgz",
- "integrity": "sha512-SXL66C731p0xPDC5LZg4wI5H+dJo/EO4KTqOMwLYCH3+FmmfAKJEZCm6ohGpI+T1xwsDsJCfL4OnhorllvlTPQ==",
- "dependencies": {
- "lodash._basetostring": "~4.12.0"
- }
- },
"node_modules/lodash.clonedeep": {
"version": "4.5.0",
"resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
@@ -8248,20 +8183,6 @@
"integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
"dev": true
},
- "node_modules/lodash.throttle": {
- "version": "4.1.1",
- "resolved": "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz",
- "integrity": "sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ=="
- },
- "node_modules/lodash.uniqby": {
- "version": "4.5.0",
- "resolved": "https://registry.npmjs.org/lodash.uniqby/-/lodash.uniqby-4.5.0.tgz",
- "integrity": "sha512-IRt7cfTtHy6f1aRVA5n7kT8rgN3N1nH6MOWLcHfpWG2SH19E3JksLK38MktLxZDhlAjCP9jpIXkOnRXlu6oByQ==",
- "dependencies": {
- "lodash._baseiteratee": "~4.7.0",
- "lodash._baseuniq": "~4.6.0"
- }
- },
"node_modules/longest-streak": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/longest-streak/-/longest-streak-3.1.0.tgz",
@@ -10832,21 +10753,6 @@
"react-is": "^16.13.1"
}
},
- "node_modules/proper-lockfile": {
- "version": "4.1.2",
- "resolved": "https://registry.npmjs.org/proper-lockfile/-/proper-lockfile-4.1.2.tgz",
- "integrity": "sha512-TjNPblN4BwAWMXU8s9AEz4JmQxnD1NNL7bNOY/AKUzyamc379FWASUhc/K1pL2noVb+XmZKLL68cjzLsiOAMaA==",
- "dependencies": {
- "graceful-fs": "^4.2.4",
- "retry": "^0.12.0",
- "signal-exit": "^3.0.2"
- }
- },
- "node_modules/proper-lockfile/node_modules/signal-exit": {
- "version": "3.0.7",
- "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
- "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
- },
"node_modules/property-expr": {
"version": "2.0.6",
"resolved": "https://registry.npmjs.org/property-expr/-/property-expr-2.0.6.tgz",
@@ -10899,11 +10805,6 @@
"url": "https://github.com/sponsors/ljharb"
}
},
- "node_modules/querystringify": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
- "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ=="
- },
"node_modules/queue-microtask": {
"version": "1.2.3",
"resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
@@ -11890,11 +11791,6 @@
"resolved": "https://registry.npmjs.org/remove-accents/-/remove-accents-0.5.0.tgz",
"integrity": "sha512-8g3/Otx1eJaVD12e31UbJj1YzdtVvzH85HV7t+9MJYk/u3XmkOUJ5Ys9wQrf9PCPK8+xn4ymzqYCiZl6QWKn+A=="
},
- "node_modules/requires-port": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
- "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ=="
- },
"node_modules/resize-observer-polyfill": {
"version": "1.5.1",
"resolved": "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz",
@@ -11939,14 +11835,6 @@
"integrity": "sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==",
"deprecated": "https://github.com/lydell/resolve-url#deprecated"
},
- "node_modules/retry": {
- "version": "0.12.0",
- "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
- "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==",
- "engines": {
- "node": ">= 4"
- }
- },
"node_modules/reusify": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
@@ -13165,34 +13053,6 @@
"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
"integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="
},
- "node_modules/tus-js-client": {
- "version": "4.2.3",
- "resolved": "https://registry.npmjs.org/tus-js-client/-/tus-js-client-4.2.3.tgz",
- "integrity": "sha512-UkQUCeDWKh5AwArcasIJWcL5EP66XPypKQtsdPu82wNnTea8eAUHdpDx3DcfZgDERAiCII895zMYkXri4M1wzw==",
- "dependencies": {
- "buffer-from": "^1.1.2",
- "combine-errors": "^3.0.3",
- "is-stream": "^2.0.0",
- "js-base64": "^3.7.2",
- "lodash.throttle": "^4.1.1",
- "proper-lockfile": "^4.1.2",
- "url-parse": "^1.5.7"
- },
- "engines": {
- "node": ">=18"
- }
- },
- "node_modules/tus-js-client/node_modules/is-stream": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
- "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
- "engines": {
- "node": ">=8"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
"node_modules/type-check": {
"version": "0.4.0",
"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
@@ -13567,15 +13427,6 @@
"punycode": "^2.1.0"
}
},
- "node_modules/url-parse": {
- "version": "1.5.10",
- "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
- "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
- "dependencies": {
- "querystringify": "^2.1.1",
- "requires-port": "^1.0.0"
- }
- },
"node_modules/use-callback-ref": {
"version": "1.3.2",
"resolved": "https://registry.npmjs.org/use-callback-ref/-/use-callback-ref-1.3.2.tgz",
diff --git a/package.json b/package.json
index e7554270..71c8239a 100644
--- a/package.json
+++ b/package.json
@@ -131,7 +131,6 @@
"swiper": "^11.1.15",
"tailwind-merge": "^2.5.5",
"tailwindcss-animate": "^1.0.7",
- "tus-js-client": "^4.2.3",
"use-places-autocomplete": "^4.0.1",
"vaul": "^0.9.1",
"yup": "^1.6.1",
diff --git a/service/auth.ts b/service/auth.ts
index 97dc3248..476c2bb1 100644
--- a/service/auth.ts
+++ b/service/auth.ts
@@ -1,4 +1,3 @@
-import qs from "qs";
import { getAPIDummy } from "./http-config/axiosCustom";
import { httpPost } from "./http-config/http-base-service";
import {
@@ -9,10 +8,7 @@ import {
export async function login(data: any) {
const pathUrl = "signin";
- const headers = {
- 'content-type': 'application/x-www-form-urlencoded',
- };
- return httpPost(pathUrl, headers, qs.stringify(data));
+ return httpPost(pathUrl, data);
}
export async function getProfile(token: any) {
diff --git a/service/http-config/axios-interceptor-instance.ts b/service/http-config/axios-interceptor-instance.ts
index 1c360122..51fcb1e9 100644
--- a/service/http-config/axios-interceptor-instance.ts
+++ b/service/http-config/axios-interceptor-instance.ts
@@ -1,6 +1,6 @@
import axios from "axios";
import Cookies from "js-cookie";
-import { login } from "../auth";
+import { login } from "../login-services";
const baseURL = "https://netidhub.com/api/";
@@ -39,17 +39,14 @@ axiosInterceptorInstance.interceptors.response.use(
if (error.response.status === 401 && !originalRequest._retry) {
originalRequest._retry = true;
const data = {
+ refreshToken: refreshToken,
grant_type: "refresh_token",
- refresh_token: refreshToken,
client_id: "mediahub-app",
};
- 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);
+ if (res.data?.data?.access_token) {
+ Cookies.set("access_token", res.data.data.access_token);
+ Cookies.set("refresh_token", res.data.data.refresh_token);
return axiosInterceptorInstance(originalRequest);
}
}