diff --git a/pwa/src/apiService/apiService.ts b/pwa/src/apiService/apiService.ts index f5b609fde..f1b2cce95 100644 --- a/pwa/src/apiService/apiService.ts +++ b/pwa/src/apiService/apiService.ts @@ -105,7 +105,7 @@ export default class APIService { const authorization = this.JWT ? { Authorization: "Bearer " + this.JWT } : {}; return axios.create({ - baseURL: "https://nextcloud.test.commonground.nu/index.php/apps/opencatalogi/api", + baseURL: "http://localhost:8080/index.php/apps/opencatalogi/api", headers: { Accept: "application/json", "Content-Type": "application/json", diff --git a/pwa/src/templates/publicationDetail/PublicationsDetailTemplate.tsx b/pwa/src/templates/publicationDetail/PublicationsDetailTemplate.tsx index 641facf50..c21110d67 100644 --- a/pwa/src/templates/publicationDetail/PublicationsDetailTemplate.tsx +++ b/pwa/src/templates/publicationDetail/PublicationsDetailTemplate.tsx @@ -53,6 +53,7 @@ import { CommongroundRatingBronze, } from "../../assets/svgs/CommongroundRatingImages"; import { usePublication } from "../../hooks/publication"; +import { translateDate } from "../../services/dateFormat"; interface PublicationsDetailTemplateProps { publicationId: string; @@ -212,13 +213,13 @@ export const PublicationsDetailTemplate: React.FC {t("Published")} - {_getPublication.data.published} + {translateDate('nl', _getPublication.data.published)} } {_getPublication.data?.modified && {t("Modified")} - {_getPublication.data.modified} + {translateDate('nl',_getPublication.data.modified)} } diff --git a/pwa/src/templates/templateParts/publicationsTable/PublicationsTableTemplate.tsx b/pwa/src/templates/templateParts/publicationsTable/PublicationsTableTemplate.tsx index 3e746a88a..8bca4126b 100644 --- a/pwa/src/templates/templateParts/publicationsTable/PublicationsTableTemplate.tsx +++ b/pwa/src/templates/templateParts/publicationsTable/PublicationsTableTemplate.tsx @@ -15,6 +15,7 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { faUpload } from "@fortawesome/free-solid-svg-icons"; import { TOOLTIP_ID } from "../../../layout/Layout"; import { HorizontalOverflowWrapper } from "@conduction/components"; +import { translateDate } from "../../../services/dateFormat"; interface PublicationsTableTemplateProps { publications: any[]; @@ -58,7 +59,8 @@ export const PublicationsTableTemplate: React.FC - {publication?.description} + {publication?.description !== '' ? publication?.description : "Geen beschrijvingm"} + @@ -69,7 +71,7 @@ export const PublicationsTableTemplate: React.FC data-tooltip-content={t("Published")} > - {publication.data?.published} + {translateDate('nl', publication.published)} diff --git a/pwa/src/templates/templateParts/searchComponent/SearchComponentTemplate.tsx b/pwa/src/templates/templateParts/searchComponent/SearchComponentTemplate.tsx index 57063ebbe..f318db96f 100644 --- a/pwa/src/templates/templateParts/searchComponent/SearchComponentTemplate.tsx +++ b/pwa/src/templates/templateParts/searchComponent/SearchComponentTemplate.tsx @@ -34,7 +34,7 @@ export const SearchComponentTemplate: React.FC = ( applicationCurrentPage: pagination.applicationCurrentPage, }); - navigate("/components"); + navigate("/publication"); }; const clearFilters = () => { @@ -64,7 +64,7 @@ export const SearchComponentTemplate: React.FC = (