Merge pull request #861 from OpenSignLabs/resolve_stage

Author: nxglabs

apps/OpenSign/src/components/opensigndrive/DriveBody.js

@@ -1,7 +1,5 @@
 import React, { useState, useEffect, useRef } from "react";
-import folder from "../../assets/images/folder.png";
 import "../../styles/opensigndrive.css";
-import pdfLogo from "../../assets/images/pdf3.png";
 import axios from "axios";
 import * as ContextMenu from "@radix-ui/react-context-menu";
 import { saveAs } from "file-saver";
@@ -336,7 +334,7 @@ function DriveBody(props) {
       ) : (
         <tr onClick={() => checkPdfStatus(data)}>
           <td className="cursor-pointer flex items-center">
-            <i className="fa fa-file-pdf mr-[8px] text-[26px] text-[#ed4d0e]"></i>
+            <i className="fa-solid fa-file-lines mr-[8px] text-[26px] text-neutral"></i>
             <span className="text-[12px] font-medium">{data.Name}</span>
           </td>
           <td>{createddate}</td>
@@ -348,23 +346,27 @@ function DriveBody(props) {
                 e.stopPropagation();
                 handleMenuItemClick("Download", data);
               }}
-              className="fa fa-download mr-[8px] text-[#ed280e]"
+              className="fa fa-download mr-[8px] op-text-primary"
               aria-hidden="true"
             ></i>
           </td>
         </tr>
       )
     ) : listType === "list" && data.Type === "Folder" ? (
-      <div key={ind} className="icon-container">
+      <div key={ind} className="relative w-[100px] h-[100px] mx-2 my-3">
         <ContextMenu.Root>
-          <ContextMenu.Trigger className="ContextMenuTrigger">
+          <ContextMenu.Trigger className="flex flex-col justify-center items-center">
             <div data-tut={props.dataTutSeventh}>
-              <img
+              {/* <img
                 alt="folder"
                 onClick={() => handleOnclikFolder(data)}
                 src={folder}
                 className="w-full h-full"
-              />
+              /> */}
+              <i
+                className="fa-solid fa-folder text-[100px] mx-auto text-secondary"
+                onClick={() => handleOnclikFolder(data)}
+              ></i>
               {rename === data.objectId ? (
                 <input
                   onFocus={() => {
@@ -412,15 +414,20 @@ function DriveBody(props) {
         <HoverCard.Trigger asChild>
           <div>
             <ContextMenu.Root>
-              <div className="icon-container">
-                <ContextMenu.Trigger className="ContextMenuTrigger">
-                  <img
+              <div className="relative w-[100px] h-[100px] mx-2 my-3">
+                <ContextMenu.Trigger className="flex flex-col justify-center items-center">
+                  {/* <img
                     alt="PDF"
                     className="w-full h-full"
                     src={pdfLogo}
                     onClick={() => checkPdfStatus(data)}
+                  /> */}
+                  <i
+                    className="fa-solid fa-file-lines text-[100px] text-neutral"
+                    onClick={() => checkPdfStatus(data)}
                     data-tut={props.dataTutSixth}
-                  />
+                  ></i>
+
                   {rename === data.objectId ? (
                     <input
                       autoFocus={true}

apps/OpenSign/src/index.css

@@ -15,3 +15,38 @@ body {
   -ms-overflow-style: none; /* IE and Edge */
   scrollbar-width: none; /* Firefox */
 }
+
+/* below css class replace bootstrap background color with daisy */
+.op-bg-primary {
+  @apply bg-primary;
+}
+.op-bg-secondary {
+  @apply bg-secondary;
+}
+.op-bg-info {
+  @apply bg-info;
+}
+.op-bg-success{
+  @apply bg-success;
+}
+.op-bg-warning {
+  @apply bg-warning;
+}
+
+/* below css class replace bootstrap text color with daisy */
+.op-text-primary {
+  @apply text-primary;
+}
+.op-text-secondary {
+  @apply text-secondary;
+}
+.op-text-info {
+  @apply text-info;
+}
+.op-text-success{
+  @apply text-success;
+}
+.op-text-warning {
+  @apply text-warning;
+}
+

apps/OpenSign/src/pages/GenerateToken.js

@@ -203,7 +203,7 @@ function GenerateToken() {
 
           <ModalUi
             isOpen={isModal}
-            title={"Regenerate Token"}
+            title={apiToken ? "Regenerate Token" : "Generate Token"}
             handleClose={handleModal}
           >
             <div className="m-[20px]">

apps/OpenSign/src/primitives/GetReportDisplay.js

@@ -951,15 +951,15 @@ const ReportTable = (props) => {
             <i
               data-tut="reactourFirst"
               onClick={() => navigate("/form/template")}
-              className="fa-solid fa-square-plus text-accent text-[25px]"
+              className="fa-solid fa-square-plus text-accent text-[40px]"
             ></i>
           )}
           {props.form && (
             <div
               className="cursor-pointer"
               onClick={() => handleContactFormModal()}
             >
-              <i className="fa-solid fa-square-plus text-accent text-[25px]"></i>
+              <i className="fa-solid fa-square-plus text-accent text-[40px]"></i>
             </div>
           )}
         </div>
@@ -1000,7 +1000,7 @@ const ReportTable = (props) => {
                         <td className="px-4 py-2 font-semibold">
                           {item?.Name}{" "}
                         </td>
-                        <td className="px-4 py-2">{item?.Email || "-"}</td>
+                        <td className="px-4 py-2 ">{item?.Email || "-"}</td>
                         <td className="px-4 py-2">{item?.Phone || "-"}</td>
                         <td className="px-3 py-2 text-white grid grid-cols-2">
                           {props.actions?.length > 0 &&
@@ -1053,7 +1053,7 @@ const ReportTable = (props) => {
                             {startIndex + index + 1}
                           </th>
                         )}
-                        <td className="px-4 py-2 font-semibold min-w-56">
+                        <td className="px-4 py-2 font-semibold min-w-56 max-w-56">
                           {item?.Name}{" "}
                         </td>
                         {props.heading.includes("Note") && (