Merge branch 'main' into 11-restrict-creation

medic · Feb 23, 2024 · 1b6fff9 · 1b6fff9
2 parents ee0d6df + 7b888cf
commit 1b6fff9
Show file tree

Hide file tree

Showing 35 changed files with 970 additions and 80 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cht-user-management",
-  "version": "1.0.12",
+  "version": "1.0.13",
   "main": "dist/index.js",
   "dependencies": {
     "@fastify/autoload": "^5.8.0",
@@ -20,6 +20,7 @@
     "fastify": "^4.23.2",
     "fastify-sse-v2": "^3.1.2",
     "jsonwebtoken": "^9.0.2",
+    "jszip": "^3.10.1",
     "libphonenumber-js": "^1.10.48",
     "liquidjs": "^10.9.2",
     "lodash": "^4.17.21",
@@ -29,6 +30,7 @@
     "uuid": "^9.0.1"
   },
   "devDependencies": {
+    "@fastify/static": "^7.0.1",
     "@medic/eslint-config": "^1.1.0",
     "@types/chai": "^4.3.11",
     "@types/mocha": "^10.0.6",

diff --git a/src/public/app/form_switch.html → src/liquid/app/form_switch.html b/src/public/app/form_switch.html → src/liquid/app/form_switch.html
diff --git a/src/public/app/fragment_edit.html → src/liquid/app/fragment_edit.html b/src/public/app/fragment_edit.html → src/liquid/app/fragment_edit.html
diff --git a/src/public/app/fragment_home.html → src/liquid/app/fragment_home.html b/src/public/app/fragment_home.html → src/liquid/app/fragment_home.html
diff --git a/src/public/app/nav.html → src/liquid/app/nav.html b/src/public/app/nav.html → src/liquid/app/nav.html
@@ -74,7 +74,7 @@
             <span class="material-symbols-outlined">group_add</span> Upload
           </a>
 
-          <a class="navbar-item" href="/files/credentials" download="{{ session.authInfo.domain }}.users.csv">
+          <a class="navbar-item" href="/files/credentials">
             <span class="material-symbols-outlined">save_as</span> Save Credentials
           </a>
 

diff --git a/src/liquid/app/view.html b/src/liquid/app/view.html
@@ -0,0 +1,43 @@
+<html>
+
+<head>
+  <title>CHT User Management Tool</title>
+  <script src="/public/htmx.min.js"></script>
+  <script src="/public/sse.js"></script>
+  <script src="/public/bulma-calendar.min.js"></script>
+
+  <link rel="stylesheet" href="/public/bulma.min.css" />
+  <link rel="stylesheet" href="/public/bulma-tooltip.min.css" />
+  <link rel="stylesheet" href="/public/bulma-calendar.min.css" />
+  <link rel="stylesheet" href="/public/material-symbols.css" />
+
+  <style>
+    .material-symbols-outlined {
+      margin-right: 5px;
+    };
+  </style>
+</head>
+
+<body>
+  {% include "app/nav.html" %}
+
+  <div id="app" class="" style="min-height: 100vh">
+    <div id="workflow-content" class="container tile is-parent">
+      {% if view == "list" %}
+        {% include "app/fragment_home.html" %}
+      {% else %}
+        {% include "app/form_switch.html" %}
+      {% endif %}
+    </div>
+  </div>
+
+  <script type="text/javascript">
+    bulmaCalendar.attach('input[type="date"]', {
+      lang: 'en-US',
+      dateFormat: 'yyyy-MM-dd',
+      maxDate: new Date(),
+    });
+  </script>
+</body>
+
+</html>
diff --git a/src/public/auth/authentication_form.html → src/liquid/auth/authentication_form.html b/src/public/auth/authentication_form.html → src/liquid/auth/authentication_form.html
diff --git a/src/public/auth/view.html → src/liquid/auth/view.html b/src/public/auth/view.html → src/liquid/auth/view.html
@@ -2,10 +2,8 @@
 
 <head>
     <title>CHT User Management Tool</title>
-    <script src="https://unpkg.com/[email protected]"
-        integrity="sha384-FhXw7b6AlE/jyjlZH5iHa/tTe9EpJ1Y55RjcgPbjeWMskSxZt1v9qkxLJWNJaGni"
-        crossorigin="anonymous"></script>
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/css/bulma.min.css">
+    <script src="/public/htmx.min.js"></script>
+    <link rel="stylesheet" href="/public/bulma.min.css" />  
 </head>
 
 <body>

diff --git a/...lic/components/contact_type_property.html → ...uid/components/contact_type_property.html b/...lic/components/contact_type_property.html → ...uid/components/contact_type_property.html
diff --git a/src/public/components/list_cell.html → src/liquid/components/list_cell.html b/src/public/components/list_cell.html → src/liquid/components/list_cell.html
diff --git a/src/public/components/move_result.html → src/liquid/components/move_result.html b/src/public/components/move_result.html → src/liquid/components/move_result.html
diff --git a/src/public/components/search_input.html → src/liquid/components/search_input.html b/src/public/components/search_input.html → src/liquid/components/search_input.html
diff --git a/src/public/components/search_results.html → src/liquid/components/search_results.html b/src/public/components/search_results.html → src/liquid/components/search_results.html
diff --git a/src/public/place/bulk_create_form.html → src/liquid/place/bulk_create_form.html b/src/public/place/bulk_create_form.html → src/liquid/place/bulk_create_form.html
diff --git a/src/public/place/create_form.html → src/liquid/place/create_form.html b/src/public/place/create_form.html → src/liquid/place/create_form.html
diff --git a/src/public/place/list.html → src/liquid/place/list.html b/src/public/place/list.html → src/liquid/place/list.html
diff --git a/src/public/place/move_form.html → src/liquid/place/move_form.html b/src/public/place/move_form.html → src/liquid/place/move_form.html
diff --git a/src/public/app/view.html b/src/public/app/view.html
diff --git a/src/public/bulma-calendar.min.css b/src/public/bulma-calendar.min.css
diff --git a/src/public/bulma-calendar.min.js b/src/public/bulma-calendar.min.js
diff --git a/src/public/bulma-tooltip.min.css b/src/public/bulma-tooltip.min.css
diff --git a/src/public/bulma.min.css b/src/public/bulma.min.css
diff --git a/src/public/htmx.min.js b/src/public/htmx.min.js
diff --git a/src/public/material-symbols.css b/src/public/material-symbols.css
@@ -0,0 +1,23 @@
+/* fallback */
+@font-face {
+  font-family: 'Material Symbols Outlined';
+  font-style: normal;
+  font-weight: 400;
+  src: url(/public/material-symbols.woff2) format('woff2');
+}
+
+.material-symbols-outlined {
+  font-family: 'Material Symbols Outlined';
+  font-weight: normal;
+  font-style: normal;
+  font-size: 24px;
+  line-height: 1;
+  letter-spacing: normal;
+  text-transform: none;
+  display: inline-block;
+  white-space: nowrap;
+  word-wrap: normal;
+  direction: ltr;
+  -webkit-font-feature-settings: 'liga';
+  -webkit-font-smoothing: antialiased;
+}
diff --git a/src/public/material-symbols.woff2 b/src/public/material-symbols.woff2