EyeSeeTea · MiquelAdell · May 16, 2024 · May 7, 2024 · May 7, 2024 · May 7, 2024
diff --git a/README.md b/README.md
@@ -78,7 +78,7 @@ $ yarn build
 ### Structure
 
 -   `i18n/`: Contains literal translations (gettext format)
--   `public/`: Main app folder with a `index.html`, exposes the APP, contains the feedback-tool.
+-   `public/`: Main app folder with a `index.html`, exposes the APP.
 -   `src/pages`: Main React components.
 -   `src/domain`: Domain layer of the app (clean architecture)
 -   `src/data`: Data of the app (clean architecture)
@@ -107,5 +107,3 @@ Check the example script, entry `"script-example"`in `package.json`->scripts and
 User-Extended App development is sustainable thanks to the partners for which we build customized DHIS2 solutions. It has been funded by the Norwegian Refugee Council, the WHO Global Malaria Programme, Samaritan’s Purse and Medecins Sans Frontières to support countries in strengthening the collection and use of health data through DHIS2. Also, the WHO Integrated Data Platform (WIDP), where several WHO departments and units share a dedicated hosting and maintenance provided by EyeSeeTea, back some specific new features. The Long Term Agreement EyeSeeTea holds with WHO for this maintenance includes maintenance of this application, ensuring that it will always work at least with the last version of WIDP. We are passionate about both DHIS2 and open source, so giving back to the community through dedicated open-source development is and will always be part of EyeSeeTea’s commitment.
 
 You can also [support our work through a one-time contribution or becoming a regular github sponsor](https://github.com/sponsors/EyeSeeTea)
-
-
diff --git a/package.json b/package.json
@@ -17,6 +17,7 @@
         "@dhis2/ui": "7.8.1",
         "@eyeseetea/d2-api": "1.11.0",
         "@eyeseetea/d2-ui-components": "2.7.0-beta.3",
+        "@eyeseetea/feedback-component": "0.1.2",
         "@material-ui/core": "4.12.3",
         "@material-ui/icons": "4.11.2",
         "@types/react-virtualized-auto-sizer": "1.0.1",

diff --git a/public/feedback-tool/feedback-dhis2.min.js b/public/feedback-tool/feedback-dhis2.min.js
diff --git a/public/feedback-tool/feedback-github.min.js b/public/feedback-tool/feedback-github.min.js
diff --git a/public/feedback-tool/feedback.min.css b/public/feedback-tool/feedback.min.css
diff --git a/public/feedback-tool/feedback.min.js b/public/feedback-tool/feedback.min.js
diff --git a/public/feedback-tool/i18n/en.properties b/public/feedback-tool/i18n/en.properties
diff --git a/public/feedback-tool/i18n/es.properties b/public/feedback-tool/i18n/es.properties
diff --git a/public/feedback-tool/icons.png b/public/feedback-tool/icons.png
diff --git a/public/feedback-tool/spinner.gif b/public/feedback-tool/spinner.gif
diff --git a/public/index.html b/public/index.html
@@ -4,16 +4,9 @@
         <meta charset="utf-8" />
         <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico" />
 
-        <link
-            type="text/css"
-            rel="stylesheet"
-            href="%PUBLIC_URL%/includes/material-design-icons/material-icons.css"
-        />
+        <link type="text/css" rel="stylesheet" href="%PUBLIC_URL%/includes/material-design-icons/material-icons.css" />
         <link type="text/css" rel="stylesheet" href="%PUBLIC_URL%/includes/roboto-font.css" />
-        <link
-            href="//maxcdn.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.min.css"
-            rel="stylesheet"
-        />
+        <link href="//maxcdn.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.min.css" rel="stylesheet" />
 
         <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
         <meta name="theme-color" content="#000000" />
@@ -27,18 +20,9 @@
       Learn how to configure a non-root public URL by running `npm run build`.
     -->
         <title>User Extended App</title>
-
-        <script src="//code.jquery.com/jquery-latest.min.js"></script>
-        <script src="%PUBLIC_URL%/feedback-tool/feedback.min.js"></script>
-        <script src="%PUBLIC_URL%/feedback-tool/feedback-github.min.js"></script>
-        <script src="%PUBLIC_URL%/feedback-tool/feedback-dhis2.min.js"></script>
-
-        <link rel="stylesheet" href="%PUBLIC_URL%/feedback-tool/feedback.min.css" />
     </head>
     <body>
-        <noscript>
-            You need to enable JavaScript to run this app.
-        </noscript>
+        <noscript> You need to enable JavaScript to run this app. </noscript>
         <div id="root"></div>
         <!--
       This HTML file is a template.

diff --git a/src/app-config.ts b/src/app-config.ts
@@ -1,43 +1,21 @@
+import { AppConfig } from "./webapp/pages/app/AppConfig";
+
 export const appConfig: AppConfig = {
     appKey: "user-extended-app",
     appearance: {
         showShareButton: false,
     },
     feedback: {
-        token: ["03242fc6b0c5a48582", "2e6b8d3e8337b5a0b95fe2"],
-        createIssue: true,
-        sendToDhis2UserGroups: [],
-        issues: {
-            repository: "EyeSeeTea/user-extended-app-blessed",
-            title: "[User feedback] {title}",
-            body: "## dhis2\n\nUsername: {username}\n\n{body}",
+        repositories: {
+            clickUp: {
+                listId: "170646832",
+                title: "[User feedback] {title}",
+                body: "## dhis2\n\nUsername: {username}\n\n{body}",
+            },
         },
-        snapshots: {
-            repository: "EyeSeeTeaBotTest/snapshots",
-            branch: "master",
+        layoutOptions: {
+            showContact: false,
+            descriptionTemplate: "## Summary\n\n## Steps to reproduce\n\n## Actual results\n\n## Expected results\n\n",
         },
-        feedbackOptions: {},
     },
 };
-
-export interface AppConfig {
-    appKey: string;
-    appearance: {
-        showShareButton: boolean;
-    };
-    feedback?: {
-        token: string[];
-        createIssue: boolean;
-        sendToDhis2UserGroups: string[];
-        issues: {
-            repository: string;
-            title: string;
-            body: string;
-        };
-        snapshots: {
-            repository: string;
-            branch: string;
-        };
-        feedbackOptions: object;
-    };
-}
diff --git a/src/index.tsx b/src/index.tsx
@@ -13,7 +13,6 @@ import "./webapp/utils/wdyr";
 
 declare global {
     interface Window {
-        $: { feedbackDhis2(d2: object, appKey: string, feedbackOptions: object): void };
         api: D2Api;
         d2: any;
     }