Merge pull request #487 from OpenCatalogi/feature/DIMOC-298/OC-public…

…ation-detail-page feature/DIMOC-298/OC-publication-detail-page
OpenCatalogi · Sep 13, 2024 · ab27281 · ab27281
2 parents 46bccc3 + c482970
commit ab27281
Show file tree

Hide file tree

Showing 11 changed files with 168 additions and 701 deletions.
diff --git a/.github/workflows/opencatalogi-page-deploy.yml b/.github/workflows/opencatalogi-page-deploy.yml
@@ -11,6 +11,7 @@ env: # Change these to your preferences any image url can also be a base encoded
 
   ME_URL: "https://api.opencatalogi.nl/api/users/me"
   API_URL: "https://api.opencatalogi.nl/api"
+  NEXTCLOUD_API_URL: "https://nextcloud.test.commonground.nu/index.php/apps/opencatalogi/api"
   ADMIN_URL: "https://api.opencatalogi.nl/admin"
   BASE_URL: "https://api.opencatalogi.nl"
   FRONTEND_URL: "https://api.opencatalogi.nl"
@@ -83,6 +84,7 @@ jobs:
           envkey_GATSBY_SHOW_THEME_SWITCHER: ${{ env.SHOW_THEME_SWITCHER }}
           envkey_GATSBY_ME_URL: ${{ env.ME_URL }}
           envkey_GATSBY_API_URL: ${{ env.API_URL }}
+          envkey_NEXTCLOUD_API_URL: ${{ env.NEXTCLOUD_API_URL }}
           envkey_GATSBY_ADMIN_URL: ${{ env.ADMIN_URL }}
           envkey_GATSBY_BASE_URL: ${{ env.BASE_URL }}
           envkey_GATSBY_FRONTEND_URL: ${{ env.FRONTEND_URL }}

diff --git 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: "http://localhost:8080/index.php/apps/opencatalogi/api",
+      baseURL: window.sessionStorage.getItem("NEXTCLOUD_API_URL") ?? "",
       headers: {
         Accept: "application/json",
         "Content-Type": "application/json",

diff --git a/pwa/src/hooks/useEnvironment.ts b/pwa/src/hooks/useEnvironment.ts
@@ -31,6 +31,10 @@ export const useEnvironment = () => {
     );
     window.sessionStorage.setItem("API_URL", process.env.GATSBY_API_URL ?? "");
     window.sessionStorage.setItem("BASE_URL", process.env.GATSBY_BASE_URL ?? "");
+    window.sessionStorage.setItem(
+      "NEXTCLOUD_API_URL",
+      process.env.GATSBY_NEXTCLOUD_BASE_URL ?? "http://nextcloud.local/index.php/apps/opencatalogi/api",
+    );
     window.sessionStorage.setItem("NL_DESIGN_THEME_CLASSNAME", process.env.GATSBY_NL_DESIGN_THEME_CLASSNAME ?? "");
     window.sessionStorage.setItem("GITHUB_ORGANIZATION_URL", process.env.GATSBY_GITHUB_ORGANIZATION_URL ?? "");
     window.sessionStorage.setItem("FAVICON_URL", process.env.GATSBY_FAVICON_URL ?? "");
@@ -80,6 +84,10 @@ export const useEnvironment = () => {
       config.GATSBY_USE_GITHUB_REPOSITORY_NAME_AS_PATH_PREFIX ?? "",
     );
     window.sessionStorage.setItem("API_URL", config.GATSBY_API_URL ?? "");
+    window.sessionStorage.setItem(
+      "NEXTCLOUD_API_URL",
+      config.GATSBY_NEXTCLOUD_BASE_URL ?? "http://nextcloud.local/index.php/apps/opencatalogi/api",
+    );
     window.sessionStorage.setItem("BASE_URL", config.GATSBY_BASE_URL ?? "");
     window.sessionStorage.setItem("NL_DESIGN_THEME_CLASSNAME", config.GATSBY_NL_DESIGN_THEME_CLASSNAME ?? "");
     window.sessionStorage.setItem("GITHUB_ORGANIZATION_URL", config.GATSBY_GITHUB_ORGANIZATION_URL ?? "");

diff --git a/pwa/src/templates/componentDetail/ComponentsDetailTemplate.tsx b/pwa/src/templates/componentDetail/ComponentsDetailTemplate.tsx
@@ -150,7 +150,7 @@ export const ComponentsDetailTemplate: React.FC<ComponentsDetailTemplateProps> =
   const imageHasValidSource = (src: string): boolean => {
     try {
       const url = new URL(src);
-      return url.protocol === "htpp:" || url.protocol === "https:";
+      return url.protocol === "http:" || url.protocol === "https:";
     } catch (_) {
       return false;
     }

diff --git a/pwa/src/templates/publicationDetail/PublicationsDetailTemplate.module.css b/pwa/src/templates/publicationDetail/PublicationsDetailTemplate.module.css
@@ -191,7 +191,7 @@
 
 .cardsContainer {
   display: grid;
-  grid-template-columns: 1fr 1fr;
+  grid-template-columns: 1fr 1fr 1fr;
 }
 
 .cardsContainer > :not(:last-child) {