pull main
This commit is contained in:
commit
f50d37f4de
|
|
@ -713,6 +713,7 @@ export default function FilterPage() {
|
|||
startDateString={startDateString}
|
||||
endDateString={endDateString}
|
||||
monthYearFilter={monthYearFilter}
|
||||
isRegionalCall={true}
|
||||
/>
|
||||
<FilterVideoComponent
|
||||
categoryFilter={categoryFilter}
|
||||
|
|
@ -720,6 +721,7 @@ export default function FilterPage() {
|
|||
startDateString={startDateString}
|
||||
endDateString={endDateString}
|
||||
monthYearFilter={monthYearFilter}
|
||||
isRegionalCall={true}
|
||||
/>
|
||||
<FilterDocumentComponent
|
||||
categoryFilter={categoryFilter}
|
||||
|
|
@ -727,6 +729,7 @@ export default function FilterPage() {
|
|||
startDateString={startDateString}
|
||||
endDateString={endDateString}
|
||||
monthYearFilter={monthYearFilter}
|
||||
isRegionalCall={true}
|
||||
/>
|
||||
<FilterAudioComponent
|
||||
categoryFilter={categoryFilter}
|
||||
|
|
@ -734,6 +737,7 @@ export default function FilterPage() {
|
|||
startDateString={startDateString}
|
||||
endDateString={endDateString}
|
||||
monthYearFilter={monthYearFilter}
|
||||
isRegionalCall={true}
|
||||
/>
|
||||
<FilterIndeksComponent
|
||||
categoryFilter={categoryFilter}
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@ export default function FilterAudioComponent(props: {
|
|||
startDateString?: string;
|
||||
endDateString?: string;
|
||||
monthYearFilter?: any;
|
||||
isRegionalCall?: any;
|
||||
}) {
|
||||
const {
|
||||
categoryFilter,
|
||||
|
|
@ -29,6 +30,7 @@ export default function FilterAudioComponent(props: {
|
|||
startDateString,
|
||||
endDateString,
|
||||
monthYearFilter,
|
||||
isRegionalCall,
|
||||
} = props;
|
||||
const [newContent, setNewContent] = useState<any>();
|
||||
const asPath = usePathname();
|
||||
|
|
@ -42,7 +44,7 @@ export default function FilterAudioComponent(props: {
|
|||
const categorie = searchParams?.get("category");
|
||||
const group = searchParams?.get("group");
|
||||
const [totalContent, setTotalContent] = useState();
|
||||
const isRegional = group || asPath.includes("/polda/");
|
||||
const isRegional = isRegionalCall || group || asPath.includes("/polda/");
|
||||
const searchType = isRegional ? "regional" : "filter";
|
||||
const router = useRouter();
|
||||
const poldaName = params?.polda_name;
|
||||
|
|
@ -75,11 +77,16 @@ export default function FilterAudioComponent(props: {
|
|||
let startDateFilter = startDateString ? startDateString : "";
|
||||
let endDateFilter = endDateString ? endDateString : "";
|
||||
let monthFilter = monthYearFilter ? monthYearFilter : "";
|
||||
const search = title == undefined ? "" : title;
|
||||
|
||||
const filter =
|
||||
categoryFilter?.length > 0
|
||||
? categoryFilter?.sort().join(",")
|
||||
: categorie || "";
|
||||
const response = await listDataRegional(
|
||||
"4",
|
||||
"",
|
||||
"",
|
||||
search,
|
||||
filter,
|
||||
"",
|
||||
"",
|
||||
startDateFilter,
|
||||
|
|
@ -93,7 +100,8 @@ export default function FilterAudioComponent(props: {
|
|||
const contentData = data?.content;
|
||||
setNewContent(contentData);
|
||||
setTotalData(data?.totalElements);
|
||||
// setLoading(false);
|
||||
setTotalPage(data?.totalPages);
|
||||
setTotalContent(data?.totalElements);
|
||||
}
|
||||
|
||||
useEffect(() => {
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@ export default function FilterDocumentComponent(props: {
|
|||
startDateString?: string;
|
||||
endDateString?: string;
|
||||
monthYearFilter?: any;
|
||||
isRegionalCall?: any;
|
||||
}) {
|
||||
const {
|
||||
categoryFilter,
|
||||
|
|
@ -29,6 +30,7 @@ export default function FilterDocumentComponent(props: {
|
|||
startDateString,
|
||||
endDateString,
|
||||
monthYearFilter,
|
||||
isRegionalCall,
|
||||
} = props;
|
||||
const [newContent, setNewContent] = useState<any>();
|
||||
const asPath = usePathname();
|
||||
|
|
@ -42,7 +44,7 @@ export default function FilterDocumentComponent(props: {
|
|||
const categorie = searchParams?.get("category");
|
||||
const group = searchParams?.get("group");
|
||||
const [totalContent, setTotalContent] = useState();
|
||||
const isRegional = group || asPath.includes("/polda/");
|
||||
const isRegional = isRegionalCall || group || asPath.includes("/polda/");
|
||||
const searchType = isRegional ? "regional" : "filter";
|
||||
|
||||
const router = useRouter();
|
||||
|
|
@ -77,10 +79,16 @@ export default function FilterDocumentComponent(props: {
|
|||
let endDateFilter = endDateString ? endDateString : "";
|
||||
let monthFilter = monthYearFilter ? monthYearFilter : "";
|
||||
|
||||
const search = title == undefined ? "" : title;
|
||||
const filter =
|
||||
categoryFilter?.length > 0
|
||||
? categoryFilter?.sort().join(",")
|
||||
: categorie || "";
|
||||
|
||||
const response = await listDataRegional(
|
||||
"3",
|
||||
"",
|
||||
"",
|
||||
search,
|
||||
filter,
|
||||
"",
|
||||
"",
|
||||
startDateFilter,
|
||||
|
|
@ -94,7 +102,8 @@ export default function FilterDocumentComponent(props: {
|
|||
const contentData = data?.content;
|
||||
setNewContent(contentData);
|
||||
setTotalData(data?.totalElements);
|
||||
// setLoading(false);
|
||||
setTotalPage(data?.totalPages);
|
||||
setTotalContent(data?.totalElements);
|
||||
}
|
||||
|
||||
async function getDataAll() {
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@ export default function FilterImageComponent(props: {
|
|||
startDateString?: string;
|
||||
endDateString?: string;
|
||||
monthYearFilter?: any;
|
||||
isRegionalCall?: any;
|
||||
}) {
|
||||
const {
|
||||
categoryFilter,
|
||||
|
|
@ -28,6 +29,7 @@ export default function FilterImageComponent(props: {
|
|||
startDateString,
|
||||
endDateString,
|
||||
monthYearFilter,
|
||||
isRegionalCall,
|
||||
} = props;
|
||||
const router = useRouter();
|
||||
const [newContent, setNewContent] = useState<any>();
|
||||
|
|
@ -43,7 +45,7 @@ export default function FilterImageComponent(props: {
|
|||
const [totalContent, setTotalContent] = useState();
|
||||
const poldaName = params?.polda_name;
|
||||
const satkerName = params?.satker_name;
|
||||
const isRegional = group || asPath.includes("/polda/");
|
||||
const isRegional = isRegionalCall || group || asPath.includes("/polda/");
|
||||
const searchType = isRegional ? "regional" : "filter";
|
||||
|
||||
useEffect(() => {
|
||||
|
|
@ -115,10 +117,16 @@ export default function FilterImageComponent(props: {
|
|||
let endDateFilter = endDateString ? endDateString : "";
|
||||
let monthFilter = monthYearFilter ? monthYearFilter : "";
|
||||
|
||||
const search = title == undefined ? "" : title;
|
||||
const filter =
|
||||
categoryFilter?.length > 0
|
||||
? categoryFilter?.sort().join(",")
|
||||
: categorie || "";
|
||||
|
||||
const response = await listDataRegional(
|
||||
"1",
|
||||
"",
|
||||
"",
|
||||
search,
|
||||
filter,
|
||||
"",
|
||||
"",
|
||||
startDateFilter,
|
||||
|
|
@ -132,7 +140,8 @@ export default function FilterImageComponent(props: {
|
|||
const contentData = data?.content;
|
||||
setNewContent(contentData);
|
||||
setTotalData(data?.totalElements);
|
||||
// setLoading(false);
|
||||
setTotalPage(data?.totalPages);
|
||||
setTotalContent(data?.totalElements);
|
||||
}
|
||||
|
||||
const basePath = asPath.includes("/polda/")
|
||||
|
|
@ -203,17 +212,19 @@ export default function FilterImageComponent(props: {
|
|||
// whileHover={{ scale: 0.95 }}
|
||||
// transition={{ duration: 0.3 }}
|
||||
>
|
||||
<Image
|
||||
priority={true}
|
||||
// placeholder={`data:image/svg+xml;base64,${toBase64(
|
||||
// shimmer(700, 475)
|
||||
// )}`}
|
||||
width={2560}
|
||||
height={1440}
|
||||
alt="image"
|
||||
src={image?.smallThumbnailLink}
|
||||
className="w-full h-full object-cover"
|
||||
/>
|
||||
{image?.thumbnailLink &&
|
||||
<Image
|
||||
priority={true}
|
||||
// placeholder={`data:image/svg+xml;base64,${toBase64(
|
||||
// shimmer(700, 475)
|
||||
// )}`}
|
||||
width={2560}
|
||||
height={1440}
|
||||
alt="image"
|
||||
src={image?.thumbnailLink}
|
||||
className="w-full h-full object-cover"
|
||||
/>
|
||||
}
|
||||
</div>
|
||||
|
||||
{/* Badge category */}
|
||||
|
|
|
|||
|
|
@ -171,14 +171,16 @@ export default function IndeksCarouselComponent(props: {
|
|||
className="cursor-pointer relative group overflow-hidden bg-white dark:bg-black dark:border dark:border-gray-500 rounded-xl shadow-md hover:shadow-lg transition-shadow duration-300"
|
||||
>
|
||||
<div className="w-full h-48 lg:h-60">
|
||||
<Image
|
||||
priority
|
||||
width={2560}
|
||||
height={1440}
|
||||
alt="image"
|
||||
src={image?.thumbnailLink}
|
||||
className="w-full h-full object-cover"
|
||||
/>
|
||||
{image?.thumbnailLink &&
|
||||
<Image
|
||||
priority
|
||||
width={2560}
|
||||
height={1440}
|
||||
alt="image"
|
||||
src={image?.thumbnailLink}
|
||||
className="w-full h-full object-cover"
|
||||
/>
|
||||
}
|
||||
</div>
|
||||
|
||||
<div className="p-4 h-full flex flex-col justify-between">
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@ export default function FilterVideoComponent(props: {
|
|||
startDateString?: string;
|
||||
endDateString?: string;
|
||||
monthYearFilter?: any;
|
||||
isRegionalCall?: any;
|
||||
}) {
|
||||
const {
|
||||
categoryFilter,
|
||||
|
|
@ -30,6 +31,7 @@ export default function FilterVideoComponent(props: {
|
|||
startDateString,
|
||||
endDateString,
|
||||
monthYearFilter,
|
||||
isRegionalCall,
|
||||
} = props;
|
||||
const [newContent, setNewContent] = useState<any>();
|
||||
const asPath = usePathname();
|
||||
|
|
@ -43,8 +45,7 @@ export default function FilterVideoComponent(props: {
|
|||
const categorie = searchParams?.get("category");
|
||||
const group = searchParams?.get("group");
|
||||
const [totalContent, setTotalContent] = useState();
|
||||
|
||||
const isRegional = group || asPath.includes("/polda/");
|
||||
const isRegional = isRegionalCall || group || asPath.includes("/polda/");
|
||||
const searchType = isRegional ? "regional" : "filter";
|
||||
const router = useRouter();
|
||||
const poldaName = params?.polda_name;
|
||||
|
|
@ -78,10 +79,16 @@ export default function FilterVideoComponent(props: {
|
|||
let endDateFilter = endDateString ? endDateString : "";
|
||||
let monthFilter = monthYearFilter ? monthYearFilter : "";
|
||||
|
||||
const search = title == undefined ? "" : title;
|
||||
const filter =
|
||||
categoryFilter?.length > 0
|
||||
? categoryFilter?.sort().join(",")
|
||||
: categorie || "";
|
||||
|
||||
const response = await listDataRegional(
|
||||
"2",
|
||||
"",
|
||||
"",
|
||||
search,
|
||||
filter,
|
||||
"",
|
||||
"",
|
||||
startDateFilter,
|
||||
|
|
@ -95,7 +102,8 @@ export default function FilterVideoComponent(props: {
|
|||
const contentData = data?.content;
|
||||
setNewContent(contentData);
|
||||
setTotalData(data?.totalElements);
|
||||
// setLoading(false);
|
||||
setTotalPage(data?.totalPages);
|
||||
setTotalContent(data?.totalElements);
|
||||
}
|
||||
|
||||
async function getDataAll() {
|
||||
|
|
@ -164,17 +172,19 @@ export default function FilterVideoComponent(props: {
|
|||
// whileHover={{ scale: 0.95 }}
|
||||
// transition={{ duration: 0.3 }}
|
||||
>
|
||||
<Image
|
||||
priority={true}
|
||||
// placeholder={`data:image/svg+xml;base64,${toBase64(
|
||||
// shimmer(700, 475)
|
||||
// )}`}
|
||||
alt="video"
|
||||
width={2560}
|
||||
height={1440}
|
||||
src={video?.smallThumbnailLink}
|
||||
className="w-full h-full object-cover"
|
||||
/>
|
||||
{video?.thumbnailLink &&
|
||||
<Image
|
||||
priority={true}
|
||||
// placeholder={`data:image/svg+xml;base64,${toBase64(
|
||||
// shimmer(700, 475)
|
||||
// )}`}
|
||||
alt="video"
|
||||
width={2560}
|
||||
height={1440}
|
||||
src={video?.thumbnailLink}
|
||||
className="w-full h-full object-cover"
|
||||
/>
|
||||
}
|
||||
</div>
|
||||
|
||||
{/* Badge category */}
|
||||
|
|
|
|||
Loading…
Reference in New Issue