Merge remote-tracking branch 'upstream/master'

i18n/en.pot

@@ -5,8 +5,8 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"POT-Creation-Date: 2023-03-26T21:27:59.631Z\n"
-"PO-Revision-Date: 2023-03-26T21:27:59.631Z\n"
+"POT-Creation-Date: 2023-06-12T19:57:22.426Z\n"
+"PO-Revision-Date: 2023-06-12T19:57:22.426Z\n"
 
 msgid "Enable users"
 msgstr ""
@@ -317,6 +317,45 @@ msgstr ""
 msgid "And {{overflow}} more..."
 msgstr ""
 
+msgid "Distributed under GNU GLPv3"
+msgstr ""
+
+msgid ""
+"User-Extended App is a DHIS2 Web Application that provides an easy and "
+"integrated way to perform common operations to DHIS2 users which would be "
+"burdensome to perform using the in-built DHIS2 User management application."
+msgstr ""
+
+msgid ""
+"This application has been funded by the the Norwegian Refugee Council "
+"(NRC), the WHO Global Malaria Programme and Samaritan’s Purse to support "
+"countries in strengthening the collection and use of health data by using "
+"DHIS2. The application has been developed by [EyeSeeTea "
+"SL](http://eyeseetea.com). Source code, documentation and release notes can "
+"be found at the [EyeSeetea GitHub Project "
+"Page](https://eyeseetea.github.io/user-extended-app-blessed/)"
+msgstr ""
+
+msgid ""
+"If you wish to contribute to the development of User Extended App with new "
+"features, please contact [EyeSeeTea](mailto:hello@eyeseetea.com)."
+msgstr ""
+
+msgid "About User Extended App"
+msgstr ""
+
+msgid "Samaritan's Purse"
+msgstr ""
+
+msgid "World Health Organization"
+msgstr ""
+
+msgid "EyeSeeTea"
+msgstr ""
+
+msgid "Norwegian Refugee Council"
+msgstr ""
+
 msgid "Edit users"
 msgstr ""
 

i18n/es.po

@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2023-03-26T21:27:59.631Z\n"
+"POT-Creation-Date: 2023-06-12T19:57:22.426Z\n"
 "PO-Revision-Date: 2018-10-25T09:02:35.143Z\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -317,6 +317,44 @@ msgstr ""
 msgid "And {{overflow}} more..."
 msgstr ""
 
+msgid "Distributed under GNU GLPv3"
+msgstr ""
+
+msgid ""
+"User-Extended App is a DHIS2 Web Application that provides an easy and "
+"integrated way to perform common operations to DHIS2 users which would be "
+"burdensome to perform using the in-built DHIS2 User management application."
+msgstr ""
+
+msgid ""
+"This application has been funded by the the Norwegian Refugee Council (NRC), "
+"the WHO Global Malaria Programme and Samaritan’s Purse to support countries "
+"in strengthening the collection and use of health data by using DHIS2. The "
+"application has been developed by [EyeSeeTea SL](http://eyeseetea.com). "
+"Source code, documentation and release notes can be found at the [EyeSeetea "
+"GitHub Project Page](https://eyeseetea.github.io/user-extended-app-blessed/)"
+msgstr ""
+
+msgid ""
+"If you wish to contribute to the development of User Extended App with new "
+"features, please contact [EyeSeeTea](mailto:hello@eyeseetea.com)."
+msgstr ""
+
+msgid "About User Extended App"
+msgstr ""
+
+msgid "Samaritan's Purse"
+msgstr ""
+
+msgid "World Health Organization"
+msgstr ""
+
+msgid "EyeSeeTea"
+msgstr ""
+
+msgid "Norwegian Refugee Council"
+msgstr ""
+
 msgid "Edit users"
 msgstr ""
 

package.json

@@ -1,7 +1,7 @@
 {
     "name": "user-extended-app",
     "description": "DHIS2 Extended User app",
-    "version": "1.2.2",
+    "version": "1.3.0",
     "license": "GPL-3.0",
     "author": "EyeSeeTea team",
     "homepage": ".",
@@ -45,11 +45,14 @@
         "react": "17.0.2",
         "react-dom": "17.0.2",
         "react-json-view": "1.21.3",
+        "react-markdown": "^8.0.7",
         "react-moment": "1.1.1",
         "react-router-dom": "6.0.2",
         "react-scripts": "4.0.3",
         "react-virtualized-auto-sizer": "1.0.6",
         "react-window": "1.8.6",
+        "rehype-raw": "^6.1.1",
+        "rehype-sanitize": "^5.0.1",
         "rx": "4.1.0",
         "rxjs": "6.6.7",
         "styled-components": "5.3.3",

src/webapp/components/about/About.tsx

@@ -0,0 +1,44 @@
+import React from "react";
+import styled from "styled-components";
+import { Info as InfoIcon } from "@material-ui/icons";
+import { Link } from "react-router-dom";
+
+interface AboutProps {
+    visible: boolean;
+}
+
+export const About: React.FC<AboutProps> = React.memo(({ visible }) => {
+    return (
+        <>
+            {visible && (
+                <AboutButton to="/about">
+                    <InfoIcon fontSize="small" />
+                </AboutButton>
+            )}
+        </>
+    );
+});
+
+const AboutButton = styled(Link)`
+    position: fixed;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    bottom: -3px;
+    right: 140px;
+    z-index: 10002;
+    background-color: #ff9800;
+    color: white;
+    width: 40px;
+    height: 40px;
+    cursor: pointer;
+    border: 1px solid rgba(0, 0, 0, 0.1);
+    border-radius: 2px;
+    background-clip: padding-box;
+    box-shadow: 0 4px 16px rgba(0, 0, 0, 0.2);
+    box-sizing: border-box;
+
+    &:hover {
+        border: 2px solid #ff9800;
+    }
+`;