Merge pull request #125 from ConductionNL/feature/OP-186/Improvements

Added improvements for development
ConductionNL · Feb 12, 2024 · 3d1b473 · 3d1b473
2 parents 0cf147b + 98db18c
commit 3d1b473
Show file tree

Hide file tree

Showing 9 changed files with 103 additions and 19 deletions.
diff --git a/pwa/gatsby-config.js b/pwa/gatsby-config.js
@@ -30,5 +30,34 @@ module.exports = {
         autoGenHomeLabel: "Home",
       },
     },
+    {
+      resolve: "gatsby-plugin-html-attributes",
+      options: {
+        lang: "nl-NL",
+      },
+    },
+    {
+      resolve: "gatsby-plugin-security-txt",
+      options: {
+        intro: `${
+          process.env.GATSBY_SECURITY_TXT_INTRO ??
+          "Information related to reporting security vulnerabilities of this site."
+        }`,
+        contact: `${
+          process.env.GATSBY_SECURITY_TXT_CONTACT ?? "mailto:info@conduction.nl"
+        }`,
+        expires: `${
+          process.env.GATSBY_SECURITY_TXT_EXPIRES ?? "2024-12-31T23:00:00.000Z"
+        }`,
+        encryption: `${process.env.GATSBY_SECURITY_TXT_ENCRYPTION ?? ""}`,
+        acknowledgements: `${
+          process.env.GATSBY_SECURITY_TXT_ACKNOWLEDGEMENTS ?? ""
+        }`,
+        languages: `${process.env.GATSBY_SECURITY_TXT_LANGUAGES ?? "nl, en"}`,
+        canonical: `${process.env.GATSBY_SECURITY_TXT_CANONICAL ?? ""}`,
+        policy: `${process.env.GATSBY_SECURITY_TXT_POLICY ?? ""}`,
+        hiring: `${process.env.GATSBY_SECURITY_TXT_HIRING ?? ""}`,
+      },
+    },
   ],
 };
diff --git a/pwa/package-lock.json b/pwa/package-lock.json
diff --git a/pwa/package.json b/pwa/package.json
@@ -68,7 +68,9 @@
     "dedent": "^1.5.1",
     "gatsby": "^5.12.11",
     "gatsby-plugin-breadcrumb": "^12.3.2",
+    "gatsby-plugin-html-attributes": "^1.0.5",
     "gatsby-plugin-layout": "^4.12.0",
+    "gatsby-plugin-security-txt": "^1.2.1",
     "html-react-parser": "^5.0.6",
     "i18next": "^23.7.7",
     "jwt-decode": "^4.0.0",

diff --git a/pwa/src/apiService/resources/gitHub.ts b/pwa/src/apiService/resources/gitHub.ts
@@ -11,6 +11,10 @@ export default class GitHub {
   }
 
   public getContent = async (filePath: string): Promise<any> => {
+    // For Development
+    // To test edited documentation paste name of the branch with the edited documentation
+    // filePath += `?ref=feature/example`;
+
     const { data } = await this._send(this._instance, "GET", filePath);
 
     return data;

diff --git a/pwa/src/hooks/htmlParser/anchor/getAnchor.tsx b/pwa/src/hooks/htmlParser/anchor/getAnchor.tsx
@@ -62,15 +62,6 @@ const handleInternalLinks = (props: any, targetFile: string, location: string, d
     return; // ensure no other flow is triggered
   }
 
-  // Internal Links: homepage
-  if (props.href.includes("/") && location === "/") {
-    const directoryFound = directories.some((directory) => directory.location === props.href);
-
-    if (directoryFound) navigate(`/${targetFile}`);
-
-    return; // ensure no other flow is triggered
-  }
-
   // Internal Links: different directory
   if (props.href.includes("/")) {
     const targetDirectory = props.href.split("/").reverse()[1];

diff --git a/pwa/src/layout/Head.tsx b/pwa/src/layout/Head.tsx
@@ -11,6 +11,9 @@ export const Head: React.FC = () => {
 
   return (
     <Helmet
+      htmlAttributes={{
+        lang: "nl-NL",
+      }}
       bodyAttributes={{
         class: theme,
       }}

diff --git a/pwa/static/.env.development b/pwa/static/.env.development
@@ -33,3 +33,14 @@ GATSBY_PAGE_TITLE="Common Gateway"
 
 # NL-Design Theme
 GATSBY_NL_DESIGN_THEME_CLASSNAME=conduction-theme
+
+# Security.txt https://www.gatsbyjs.com/plugins/gatsby-plugin-security-txt/
+GATSBY_SECURITY_TXT_INTRO=Information related to reporting security vulnerabilities of this site.
+GATSBY_SECURITY_TXT_CONTACT=mailto:info@conduction.nl
+GATSBY_SECURITY_TXT_EXPIRES=2024-12-31T23:00:00.000Z
+GATSBY_SECURITY_TXT_ENCRYPTION=
+GATSBY_SECURITY_TXT_ACKNOWLEDGEMENTS=
+GATSBY_SECURITY_TXT_LANGUAGES=nl, en
+GATSBY_SECURITY_TXT_CANONICAL=
+GATSBY_SECURITY_TXT_POLICY=
+GATSBY_SECURITY_TXT_HIRING=
diff --git a/pwa/static/.env.production b/pwa/static/.env.production
@@ -15,6 +15,7 @@ GATSBY_NAVBAR_CONTENT=
 
 # Footer
 GASTBY_FOOTER_CONTENT=
+# options: "heading-1" | "heading-2" | "heading-3" | "heading-4" | "heading-5" 
 GATSBY_FOOTER_CONTENT_HEADER=
 GATSBY_FOOTER_SHOW_LOGO=
 GATSBY_FOOTER_LOGO_HREF=
@@ -32,3 +33,14 @@ GATSBY_PAGE_TITLE=
 
 # NL-Design Theme
 GATSBY_NL_DESIGN_THEME_CLASSNAME=
+
+# Security.txt https://www.gatsbyjs.com/plugins/gatsby-plugin-security-txt/
+GATSBY_SECURITY_TXT_INTRO=Information related to reporting security vulnerabilities of this site.
+GATSBY_SECURITY_TXT_CONTACT=mailto:info@conduction.nl
+GATSBY_SECURITY_TXT_EXPIRES=2024-12-31T23:00:00.000Z
+GATSBY_SECURITY_TXT_ENCRYPTION=
+GATSBY_SECURITY_TXT_ACKNOWLEDGEMENTS=
+GATSBY_SECURITY_TXT_LANGUAGES=nl, en
+GATSBY_SECURITY_TXT_CANONICAL=
+GATSBY_SECURITY_TXT_POLICY=
+GATSBY_SECURITY_TXT_HIRING=
diff --git a/pwa/static/.well-known/security.txt b/pwa/static/.well-known/security.txt