Merge branch 'release-1.0.66'

hackforla · Apr 4, 2022 · d1995c5 · d1995c5
2 parents f4fa5b0 + e7698cd
commit d1995c5
Show file tree

Hide file tree

Showing 84 changed files with 1,805 additions and 2,516 deletions.
diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/package.json b/client/package.json
@@ -1,7 +1,7 @@
 {
   "name": "foodoasis-client",
   "description": "React Client for Food Oasis",
-  "version": "1.0.65",
+  "version": "1.0.66",
   "author": "Hack for LA",
   "license": "GPL-2.0",
   "private": true,
@@ -37,6 +37,7 @@
     "i18next-xhr-backend": "^3.2.2",
     "js-file-download": "^0.4.12",
     "moment": "2.29.1",
+    "moment-timezone": "^0.5.34",
     "query-string": "^7.0.1",
     "react": "^17.0.2",
     "react-data-grid": "^6.1.0",

diff --git a/client/public/widget.html b/client/public/widget.html
@@ -0,0 +1,17 @@
+<html>
+  <body
+    style="margin: 1em; background-color: lightblue; font-family: sans-serif"
+  >
+    <h1>HTML Page Hosting Food Oasis</h1>
+    <div style="height: 80vh">
+      <iframe
+        src="http://devla.foodoasis.net/widget"
+        width="100%"
+        height="100%"
+        style="margin: 0; border: 2px solid #336699; box-sizing: border-box"
+      >
+        >
+      </iframe>
+    </div>
+  </body>
+</html>