Merge pull request #226 from prafull-opensignlabs/auth_user

feat:add contactbook report & updated version of app in footer

Author: nxglabs

apps/OpenSign/package.json

@@ -42,7 +42,8 @@
   "scripts": {
     "start": "serve -s build",
     "start-dev": "mf-cra start",
-    "build": "rm -rf public/mfbuild && npm run micro && CI=false && mf-cra build",
+    "version": "curl -s https://api.github.com/repos/opensignlabs/opensign/releases/latest | grep '\"tag_name\":' | awk -F '\"' '{print $4}' > ./public/version.txt",
+    "build": "npm run version && rm -rf public/mfbuild && npm run micro && CI=false && mf-cra build",
     "micro": "cd ../../microfrontends/SignDocuments && npm install && npm run build",
     "test": "react-scripts test",
     "eject": "react-scripts eject",
@@ -85,4 +86,4 @@
     "pretty-quick": "^3.1.3",
     "tailwindcss": "^3.3.3"
   }
-}
+}

apps/OpenSign/public/version.txt

@@ -0,0 +1 @@
+v1.0.5-beta

apps/OpenSign/src/components/Footer.js

@@ -1,8 +1,20 @@
 import React, { useEffect, useState } from "react";
 import Package from "../../package.json";
-
+import axios from "axios";
 const Footer = () => {
   const [showButton, setShowButton] = useState(false);
+  const [version, setVersion] = useState("");
+  useEffect(() => {
+    axios
+      .get("/version.txt")
+      .then((response) => {
+        setVersion(response.data); // Set the retrieved data to the state variable
+      })
+      .catch((error) => {
+        console.error("Error reading the file:", error);
+      });
+  }, []);
+
   const handleScroll = () => {
     if (window.pageYOffset >= 50) {
       setShowButton(true);
@@ -25,16 +37,12 @@ const Footer = () => {
   }, []);
 
   const appName = "OpenSign™";
-  
+
   return (
     <>
       <div className="bg-[#222c3c] text-[#98a6ba] text-center text-[13px] py-3">
         All Rights Reserved &copy; {new Date().getFullYear()} &nbsp;
-        {appName}{" "}
-        (version:{" "}
-        {localStorage.getItem("appVersion") &&
-          `${Package.version}.${localStorage.getItem("appVersion")}`}
-        )
+        {appName} ( version: {version ? version : `${Package.version} `})
       </div>
       <button
         className={`${

apps/OpenSign/src/components/LoginGoogle.js

@@ -43,8 +43,9 @@ const GoogleSignInBtn = ({
     });
   });
   const clearStorage = async () => {
-    await Parse.User.logOut();
-
+    if (Parse.User.current()) {
+      await Parse.User.logOut();
+    }
     let baseUrl = localStorage.getItem("BaseUrl12");
     let appid = localStorage.getItem("AppID12");
     let applogo = localStorage.getItem("appLogo");
@@ -74,7 +75,6 @@ const GoogleSignInBtn = ({
     localStorage.setItem("userSettings", userSettings);
     localStorage.setItem("baseUrl", baseUrl);
     localStorage.setItem("parseAppId", appid);
-
   };
   const responseGoogle = async (response) => {
     clearStorage();

apps/OpenSign/src/components/dashboard/DashboardReport.js

@@ -9,6 +9,7 @@ function DashboardReport(props) {
   const [isLoader, setIsLoader] = useState(true);
   const [reportName, setReportName] = useState("");
   const [actions, setActions] = useState([]);
+  const [heading, setHeading] = useState([]);
   const [isNextRecord, setIsNextRecord] = useState(false);
   const [isMoreDocs, setIsMoreDocs] = useState(true);
   const abortController = new AbortController();
@@ -43,6 +44,7 @@ function DashboardReport(props) {
     if (json) {
       setActions(json.actions);
       setReportName(json.reportName);
+      setHeading(json.heading);
       Parse.serverURL = localStorage.getItem("BaseUrl12");
       Parse.initialize(localStorage.getItem("AppID12"));
       const currentUser = Parse.User.current().id;
@@ -140,7 +142,9 @@ function DashboardReport(props) {
             <ReportTable
               ReportName={reportName}
               List={List}
+              setList={setList}
               actions={actions}
+              heading={heading}
               setIsNextRecord={setIsNextRecord}
               isMoreDocs={isMoreDocs}
               docPerPage={docPerPage}

apps/OpenSign/src/json/ReportJson.js

@@ -1,11 +1,13 @@
 export default function reportJson(id) {
   // console.log("json ", json);
-
+  const head = ["Sr.No", "Name", "Note", "Folder", "File", "Owner", "Signers"];
+  const contactbook = ["Sr.No", "Name", "Email", "Phone"];
   switch (id) {
     // draft documents report
     case "ByHuevtCFY":
       return {
         reportName: "Draft Documents",
+        heading: head,
         actions: [
           {
             btnLabel: "sign",
@@ -21,6 +23,7 @@ export default function reportJson(id) {
     case "4Hhwbp482K":
       return {
         reportName: "Need your sign",
+        heading: head,
         actions: [
           {
             btnLabel: "sign",
@@ -36,6 +39,7 @@ export default function reportJson(id) {
     case "1MwEuxLEkF":
       return {
         reportName: "In-progress documents",
+        heading: head,
         actions: [
           {
             btnLabel: "View",
@@ -51,6 +55,7 @@ export default function reportJson(id) {
     case "kQUoW4hUXz":
       return {
         reportName: "Completed Documents",
+        heading: head,
         actions: [
           {
             btnLabel: "View",
@@ -66,6 +71,7 @@ export default function reportJson(id) {
     case "UPr2Fm5WY3":
       return {
         reportName: "Declined Documents",
+        heading: head,
         actions: [
           {
             btnLabel: "View",
@@ -81,6 +87,7 @@ export default function reportJson(id) {
     case "zNqBHXHsYH":
       return {
         reportName: "Expired Documents",
+        heading: head,
         actions: [
           {
             btnLabel: "View",
@@ -96,6 +103,7 @@ export default function reportJson(id) {
     case "d9k3UfYHBc":
       return {
         reportName: "Recently sent for signatures",
+        heading: head,
         actions: [
           {
             btnLabel: "View",
@@ -111,6 +119,7 @@ export default function reportJson(id) {
     case "5Go51Q7T8r":
       return {
         reportName: "Recent signature requests",
+        heading: head,
         actions: [
           {
             btnLabel: "Sign",
@@ -126,6 +135,7 @@ export default function reportJson(id) {
     case "kC5mfynCi4":
       return {
         reportName: "Drafts",
+        heading: head,
         actions: [
           {
             btnLabel: "sign",
@@ -137,6 +147,20 @@ export default function reportJson(id) {
           }
         ]
       };
+    // contactbook report
+    case "5KhaPr482K":
+      return {
+        reportName: "Contactbook",
+        heading: contactbook,
+        actions: [
+          {
+            btnLabel: "",
+            btnColor: "#f55a42",
+            textColor: "white",
+            btnIcon: "fa-solid fa-trash"
+          }
+        ]
+      };
     default:
       return null;
   }