Skip to content

Commit f7bb11e

Browse files
prafull-opensignlabsprafull-opensignlabs
committed
style: update loader and ui design of components
1 parent 6a365f7 commit f7bb11e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+726
-766
lines changed

‎apps/OpenSign/package-lock.json‎

Lines changed: 0 additions & 24 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎apps/OpenSign/package.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
"react-gtm-module": "^2.0.11",
3030
"react-helmet": "^6.1.0",
3131
"react-konva": "^18.2.10",
32-
"react-modal": "^3.16.1",
3332
"react-pdf": "^9.0.0",
3433
"react-quill": "^2.0.0",
3534
"react-redux": "^9.1.2",

‎apps/OpenSign/public/version.txt‎

-10 Bytes
Binary file not shown.

‎apps/OpenSign/src/App.js‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import PdfRequestFiles from "./pages/PdfRequestFiles";
1717
import LazyPage from "./primitives/LazyPage";
1818
import { isEnableSubscription } from "./constant/const";
1919
import SSOVerify from "./pages/SSOVerify";
20+
import Loader from "./primitives/Loader";
2021
const DebugPdf = lazy(() => import("./pages/DebugPdf"));
2122
const ForgetPassword = lazy(() => import("./pages/ForgetPassword"));
2223
const GuestLogin = lazy(() => import("./pages/GuestLogin"));
@@ -30,10 +31,10 @@ const ManageSign = lazy(() => import("./pages/Managesign"));
3031
const GenerateToken = lazy(() => import("./pages/GenerateToken"));
3132
const Webhook = lazy(() => import("./pages/Webhook"));
3233
pdfjs.GlobalWorkerOptions.workerSrc = `//cdnjs.cloudflare.com/ajax/libs/pdf.js/${pdfjs.version}/pdf.worker.min.mjs`;
33-
const Loader = () => {
34+
const AppLoader = () => {
3435
return (
35-
<div className="flex justify-center items-center h-[100vh] text-[45px] text-[#3dd3e0]">
36-
<div className="loader-37"></div>
36+
<div className="flex justify-center items-center h-[100vh]">
37+
<Loader />
3738
</div>
3839
);
3940
};
@@ -64,7 +65,7 @@ function App() {
6465
return (
6566
<div className="bg-base-200">
6667
{isloading ? (
67-
<Loader />
68+
<AppLoader />
6869
) : (
6970
<BrowserRouter>
7071
<Routes>

‎apps/OpenSign/src/assets/images/loader2.gif‎

-60.8 KB
Binary file not shown.

‎apps/OpenSign/src/components/AddSigner.js‎

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import React, { useState, useEffect } from "react";
22
import Parse from "parse";
33
import axios from "axios";
4+
import Loader from "../primitives/Loader";
45

56
const AddSigner = (props) => {
67
const [name, setName] = useState("");
@@ -225,11 +226,11 @@ const AddSigner = (props) => {
225226
return (
226227
<div className="h-full p-[20px]">
227228
{isLoader && (
228-
<div className="fixed inset-0 flex justify-center items-center bg-black bg-opacity-30 text-[45px] text-[#3dd3e0]">
229-
<div className="loader-37"></div>
229+
<div className="fixed inset-0 flex justify-center items-center bg-black bg-opacity-30">
230+
<Loader />
230231
</div>
231232
)}
232-
<div className="w-full mx-auto p-2">
233+
<div className="w-full mx-auto p-2 text-base-content">
233234
{isUserExist && (
234235
<div className="mb-3 flex items-center">
235236
<input
@@ -239,17 +240,14 @@ const AddSigner = (props) => {
239240
onChange={handleAddYourselfChange}
240241
className="op-checkbox op-checkbox-sm"
241242
/>
242-
<label htmlFor="addYourself" className="ml-2 text-gray-700 mb-0">
243+
<label htmlFor="addYourself" className="ml-2 mb-0">
243244
Add Yourself
244245
</label>
245246
</div>
246247
)}
247248
<form onSubmit={handleSubmit}>
248249
<div className="mb-3">
249-
<label
250-
htmlFor="name"
251-
className="block text-xs text-gray-700 font-semibold"
252-
>
250+
<label htmlFor="name" className="block text-xs font-semibold">
253251
Name
254252
<span className="text-[red] text-[13px]"> *</span>
255253
</label>
@@ -264,10 +262,7 @@ const AddSigner = (props) => {
264262
/>
265263
</div>
266264
<div className="mb-3">
267-
<label
268-
htmlFor="email"
269-
className="block text-xs text-gray-700 font-semibold"
270-
>
265+
<label htmlFor="email" className="block text-xs font-semibold">
271266
Email
272267
<span className="text-[red] text-[13px]"> *</span>
273268
</label>
@@ -282,10 +277,7 @@ const AddSigner = (props) => {
282277
/>
283278
</div>
284279
<div className="mb-3">
285-
<label
286-
htmlFor="phone"
287-
className="block text-xs text-gray-700 font-semibold"
288-
>
280+
<label htmlFor="phone" className="block text-xs font-semibold">
289281
Phone
290282
</label>
291283
<input
@@ -297,7 +289,6 @@ const AddSigner = (props) => {
297289
className="op-input op-input-bordered op-input-sm focus:outline-none hover:border-base-content w-full text-xs"
298290
/>
299291
</div>
300-
301292
<div className="mt-4 flex gap-x-2 justify-start">
302293
<button type="submit" className="op-btn op-btn-primary">
303294
Submit

‎apps/OpenSign/src/components/AddUser.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import Parse from "parse";
33
import axios from "axios";
44
import Title from "./Title";
55
import Alert from "../primitives/Alert";
6+
import Loader from "../primitives/Loader";
67

78
const AddUser = (props) => {
89
const [name, setName] = useState("");
@@ -194,8 +195,8 @@ const AddUser = (props) => {
194195
<Title title={"Add User"} />
195196
{isUserExist && <Alert type="danger">User already exists!</Alert>}
196197
{isLoader && (
197-
<div className="fixed inset-0 flex justify-center items-center bg-black bg-opacity-30 z-50 text-[45px] text-[#3dd3e0]">
198-
<div className="loader-37"></div>
198+
<div className="fixed inset-0 flex justify-center items-center bg-black bg-opacity-30 z-50">
199+
<Loader />
199200
</div>
200201
)}
201202
<div className="w-full mx-auto">

‎apps/OpenSign/src/components/BulkSendUi.js‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import React, { useState, useEffect, useRef } from "react";
22
import axios from "axios";
33
import SuggestionInput from "./shared/fields/SuggestionInput";
4+
import Loader from "../primitives/Loader";
45

56
const BulkSendUi = (props) => {
67
const [forms, setForms] = useState([]);
@@ -170,8 +171,8 @@ const BulkSendUi = (props) => {
170171
return (
171172
<>
172173
{isSubmit && (
173-
<div className="absolute z-[999] h-full w-full flex justify-center items-center bg-black bg-opacity-40 text-[45px] text-[#3dd3e0]">
174-
<div className="loader-37"></div>
174+
<div className="absolute z-[999] h-full w-full flex justify-center items-center bg-black bg-opacity-30">
175+
<Loader />
175176
</div>
176177
)}
177178
{props.Placeholders?.length > 0 ? (
@@ -183,7 +184,7 @@ const BulkSendUi = (props) => {
183184
{forms?.map((form, index) => (
184185
<div
185186
key={form.Id}
186-
className="p-3 op-card border-[1px] border-gray-400 m-4 bg-base-200 text-base-content grid grid-cols-1 md:grid-cols-2 gap-2 relative"
187+
className="p-3 op-card border-[1px] border-gray-400 mt-3 mx-4 mb-4 bg-base-200 text-base-content grid grid-cols-1 md:grid-cols-2 gap-2 relative"
187188
>
188189
{form?.fields?.map((field, fieldIndex) => (
189190
<div className="flex flex-col" key={field.fieldId}>
@@ -202,7 +203,7 @@ const BulkSendUi = (props) => {
202203
{forms?.length > 1 && (
203204
<button
204205
onClick={() => handleRemoveForm(index)}
205-
className="absolute right-3 top-1 border border-gray-300 rounded-lg px-2 py-1"
206+
className="absolute right-3 top-1 text-[red] border-[1px] border-[red] rounded-lg w-[1.7rem] h-[1.7rem]"
206207
>
207208
<i className="fa-solid fa-trash"></i>
208209
</button>

‎apps/OpenSign/src/components/LoginFacebook.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import React, { useState } from "react";
22
import Parse from "parse";
3+
import Loader from "../primitives/Loader";
34
// import FacebookLogin from "react-facebook-login";
45

56
const LoginFacebook = ({
@@ -114,8 +115,8 @@ const LoginFacebook = ({
114115
return (
115116
<div className="relative">
116117
{thirdpartyLoader && (
117-
<div className="fixed w-[100vw] h-[100vh] bg-black bg-opacity-30 left-0 top-0 z-[20] text-[50px] text-[#3ac9d6]">
118-
<div className="loader-37 fixed top-[45%] left-[45%]"></div>
118+
<div className="fixed flex justify-center items-center inset-0 bg-black bg-opacity-25 z-20 ">
119+
<Loader />
119120
</div>
120121
)}
121122
{/* <FacebookLogin

‎apps/OpenSign/src/components/LoginGoogle.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import Parse from "parse";
33
import { jwtDecode } from "jwt-decode";
44
import { useScript } from "../hook/useScript";
55
import ModalUi from "../primitives/ModalUi";
6+
import Loader from "../primitives/Loader";
67

78
/*
89
* `GoogleSignInBtn`as it's name indicates it render google sign in button
@@ -208,8 +209,8 @@ const GoogleSignInBtn = ({
208209
return (
209210
<div className="relative">
210211
{thirdpartyLoader && (
211-
<div className="fixed w-[100vw] h-[100vh] bg-black bg-opacity-25 top-0 left-0 z-20 text-[50px] text-[#3ac9d6]">
212-
<div className="fixed top-[50%] left-[45%] loader-37"></div>
212+
<div className="fixed flex justify-center items-center inset-0 bg-black bg-opacity-25 z-20 ">
213+
<Loader />
213214
</div>
214215
)}
215216
<div ref={googleBtn} className="text-sm"></div>

0 commit comments

Comments
 (0)