Merge pull request #88 from ScilifelabDataCentre/dev

Final release for conference

next-app/src/app/accessclinicaldata/page.tsx

@@ -13,7 +13,7 @@ export default function AboutPage(): ReactElement {
 
   const breadcrumbs: { [id: string]: ILink } = {
     l1: { text: "Home", classes: "", link: "/" },
-    l2: { text: "Access Clinical Data", classes: "", link: "" },
+    l2: { text: "Access clinical data", classes: "", link: "" },
   };
 
   return (
@@ -90,10 +90,17 @@ export default function AboutPage(): ReactElement {
         <p>
           The Swedish quality registries aim to improve the health care system
           by collecting individualised health data about, for example, certain
-          diagnoses or problems (further information in Swedish). Data from a
-          certain registry can be requested by researchers after approval by a
-          steering group consisting of health care professionals and patient
-          representatives.
+          diagnoses or problems{" "}
+          <a
+            href="https://www.1177.se/sa-fungerar-varden/lagar-och-bestammelser/nationella-kvalitetsregister/#:~:text=I%20nationella%20kvalitetsregister%20samlas%20information,l%C3%A4mnas%20till%20ett%20nationellt%20kvalitetsregister"
+            target="_blank"
+            className="text-primary hover:text-black underline"
+          >
+            (further information in Swedish)
+          </a>
+          . Data from a certain registry can be requested by researchers after
+          approval by a steering group consisting of health care professionals
+          and patient representatives.
         </p>
         <p>
           Healthcare providers must inform patients before their medical
@@ -103,7 +110,15 @@ export default function AboutPage(): ReactElement {
           quality register or research study if the individual objects. If a
           person opposes the processing of their personal data after it has
           begun, the information should be erased from the register as soon as
-          possible (further information in Swedish).
+          possible{" "}
+          <a
+            href="https://www.riksdagen.se/sv/dokument-och-lagar/dokument/svensk-forfattningssamling/patientdatalag-2008355_sfs-2008-355/#K7"
+            target="_blank"
+            className="text-primary hover:text-black underline"
+          >
+            (further information in Swedish)
+          </a>
+          .
         </p>
         <p>
           Every quality registry in Sweden is connected to one of six centres

next-app/src/app/contact/page.tsx

@@ -34,6 +34,33 @@ export default function ContactPage(): ReactElement {
         </ul>
       </div>
       <div className="flex flex-col gap-y-4">
+        <div className="alert">
+          <svg
+            xmlns="http://www.w3.org/2000/svg"
+            fill="none"
+            viewBox="0 0 24 24"
+            className="h-6 w-6 shrink-0 stroke-current"
+          >
+            <path
+              strokeLinecap="round"
+              strokeLinejoin="round"
+              strokeWidth="2"
+              d="M13 16h-1v-4h-1m1-4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z"
+            ></path>
+          </svg>
+          <span className="text-sm lg:text-base">
+            The contact page is currently under reconstruction, and the contact
+            form below has been disabled. In the meantime, please reach out to
+            the Data Science Node in Precision Medicine and Diagnostics at{" "}
+            <a
+              href="mailto:[email protected]"
+              className="text-primary hover:text-black underline"
+            >
+              [email protected]
+            </a>
+            .
+          </span>
+        </div>
         <Title level={1}>Contact</Title>
         <p>
           Please fill out this form if you need to contact us at the Swedish

next-app/src/app/kiarva/layout.tsx

@@ -0,0 +1,15 @@
+export default function Layout({
+  children,
+}: Readonly<{
+  children: React.ReactNode;
+}>) {
+  return (
+    <div className="kiarva-page h-screen flex flex-col overflow-hidden h-screen overflow-hidden w-screen relative -ml-[50vw] left-1/2">
+      <main className="flex-1 overflow-hidden">
+        <section className="outer w-[100%] h-[100%] overflow-hidden">
+          {children}
+        </section>
+      </main>
+    </div>
+  );
+}

next-app/src/app/kiarva/page.tsx

@@ -5,6 +5,28 @@ import { TrackPageViewIfEnabled } from "@/util/cookiesHandling";
 
 // simport Iframe from "react-iframe";
 
+export default function KiarvaIFramePage(): ReactElement {
+  TrackPageViewIfEnabled();
+
+  const kiarva_hostname = "https://kiarva.scilifelab.se/";
+
+  return (
+    <iframe
+      src={kiarva_hostname}
+      className="w-screen h-screen overflow-auto"
+    ></iframe>
+  );
+} /*
+
+// The following code is not used in the current version of the app. It is kept here for reference.
+/*
+"use client";
+
+import { ReactElement } from "react";
+import { TrackPageViewIfEnabled } from "@/util/cookiesHandling";
+
+// simport Iframe from "react-iframe";
+
 export default function KiarvaIFramePage(): ReactElement {
   TrackPageViewIfEnabled();
 
@@ -14,8 +36,8 @@ export default function KiarvaIFramePage(): ReactElement {
     <>
       <style jsx>{`
         .kiarva-page {
-          height: 100vh; /* Full page height */
-          overflow: hidden; /* Prevent scrollbars for the page */
+          height: 100vh; /* Full page height */ /*
+          overflow: hidden; /* Prevent scrollbars for the page */ /*
         }
       `}</style>
       <div className="kiarva-page h-screen flex flex-col overflow-hidden">
@@ -48,3 +70,4 @@ export default function KiarvaIFramePage(): ReactElement {
     </>
   );
 }
+*/

next-app/src/app/privacy/page.tsx

@@ -59,11 +59,10 @@ export default function PrivacyPage(): ReactElement {
       <div className="flex flex-col gap-y-4">
         <Title level={1}>Privacy policy</Title>
         <p>
-          SciLifeLab operates the Swedish Precision Medicine Portal, which
-          provides the Service. This page is intended to inform website visitors
-          about our personal data processing policy. By using our Service, you
-          agree that your personal data will be processed in accordance with
-          this policy.
+          Data Centre at SciLifeLab provides and operates the Precision Medicine
+          Portal. This page is intended to inform website visitors about our
+          personal data processing policy. By using our Service, you agree that
+          your personal data will be processed in accordance with this policy.
         </p>
         <Title level={2}>Data collection and usage</Title>
         <p>

next-app/src/components/ContactFormComponent.tsx

@@ -159,7 +159,7 @@ export default function ContactFormComponent(): ReactElement {
             />
           </div>
           <div className="flex flex-col items-center">
-            {checkFormFilled() && checkValidForm() ? (
+            {checkFormFilled() && checkValidForm() && false ? (
               recaptchaPassed ? (
                 <input
                   type="submit"

next-app/src/components/FooterComponent.tsx

@@ -8,28 +8,28 @@ import { LINK_CLASSES } from "@/constants";
 
 export default function FooterComponent(): ReactElement {
   const linksCol1: { [id: string]: ILink } = {
-    l1: { text: "Data Sources", classes: LINK_CLASSES, link: "/datasources" },
+    l1: { text: "Data sources", classes: LINK_CLASSES, link: "/datasources" },
     l2: {
       text: "Registries",
       classes: LINK_CLASSES,
       link: "/registries",
     },
     l3: {
-      text: "Access Clinical Data",
+      text: "Access clinical data",
       classes: LINK_CLASSES,
       link: "/accessclinicaldata",
     },
     l4: {
-      text: "KIARVA Dashboard",
+      text: "KIARVA dashboard",
       classes: LINK_CLASSES,
       link: "/kiarva",
     },
   };
 
   const linksCol2: { [id: string]: ILink } = {
-    l5: { text: "About Us", classes: LINK_CLASSES, link: "/about/product" },
+    l5: { text: "About us", classes: LINK_CLASSES, link: "/about/product" },
     l6: { text: "Contact", classes: LINK_CLASSES, link: "/contact" },
-    l7: { text: "Privacy Policy", classes: LINK_CLASSES, link: "/privacy" },
+    l7: { text: "Privacy policy", classes: LINK_CLASSES, link: "/privacy" },
   };
 
   const svgs: { [id: string]: ISVG } = {