Skip to content

Commit 5976358

Browse files
nxglabsnxglabs
authored
Merge branch 'staging' into main
2 parents 8da2c7f + 45a96ec commit 5976358

File tree

93 files changed

+2852
-4436
lines changed

Some content is hidden

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

93 files changed

+2852
-4436
lines changed

‎.github/workflows/Docker.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: ci
22
on:
33
push:
44
branches:
5-
- 'staging'
5+
- 'main'
66

77
jobs:
88
docker:

‎apps/OpenSign/package-lock.json‎

Lines changed: 45 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: 1 addition & 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",
@@ -88,6 +87,7 @@
8887
"@babel/runtime-corejs2": "^7.24.7",
8988
"autoprefixer": "^10.4.19",
9089
"commitizen": "^4.3.0",
90+
"daisyui": "^4.12.2",
9191
"eslint": "^8.57.0",
9292
"eslint-plugin-prettier": "^4.2.1",
9393
"eslint-plugin-react": "^7.34.1",

‎apps/OpenSign/public/index.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!DOCTYPE html>
2-
<html lang="en">
2+
<html lang="en" data-theme="opensigncss">
33

44
<head>
55
<meta charset="utf-8" />
@@ -50,4 +50,4 @@
5050
-->
5151
</body>
5252

53-
</html>
53+
</html>

‎apps/OpenSign/public/version.txt‎

-10 Bytes
Binary file not shown.

‎apps/OpenSign/src/App.js‎

Lines changed: 6 additions & 18 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"));
@@ -34,23 +35,10 @@ pdfjs.GlobalWorkerOptions.workerSrc = new URL(
3435
"pdfjs-dist/legacy/build/pdf.worker.min.mjs",
3536
import.meta.url
3637
).toString();
37-
const Loader = () => {
38+
const AppLoader = () => {
3839
return (
39-
<div
40-
style={{
41-
height: "100vh",
42-
display: "flex",
43-
alignItems: "center",
44-
justifyContent: "center"
45-
}}
46-
>
47-
<div
48-
style={{
49-
fontSize: "45px",
50-
color: "#3dd3e0"
51-
}}
52-
className="loader-37"
53-
></div>
40+
<div className="flex justify-center items-center h-[100vh]">
41+
<Loader />
5442
</div>
5543
);
5644
};
@@ -79,9 +67,9 @@ function App() {
7967
};
8068

8169
return (
82-
<div className="bg-[#eef1f5]">
70+
<div className="bg-base-200">
8371
{isloading ? (
84-
<Loader />
72+
<AppLoader />
8573
) : (
8674
<BrowserRouter>
8775
<Routes>

‎apps/OpenSign/src/assets/gif/mail_sent.gif‎

316 KB
Loading

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

-60.8 KB
Binary file not shown.

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

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

66
const AddSigner = (props) => {
77
const [name, setName] = useState("");
@@ -227,38 +227,29 @@ const AddSigner = (props) => {
227227
<div className="h-full p-[20px]">
228228
{isLoader && (
229229
<div className="fixed inset-0 flex justify-center items-center bg-black bg-opacity-30">
230-
<div
231-
style={{
232-
fontSize: "45px",
233-
color: "#3dd3e0"
234-
}}
235-
className="loader-37"
236-
></div>
230+
<Loader />
237231
</div>
238232
)}
239-
<div className="w-full mx-auto p-2">
233+
<div className="w-full mx-auto p-2 text-base-content">
240234
{isUserExist && (
241-
<div className="mb-3">
235+
<div className="mb-3 flex items-center">
242236
<input
243237
type="checkbox"
244238
id="addYourself"
245239
checked={addYourself}
246240
onChange={handleAddYourselfChange}
247-
className="form-checkbox"
241+
className="op-checkbox op-checkbox-sm"
248242
/>
249-
<label htmlFor="addYourself" className="ml-2 text-gray-700">
243+
<label htmlFor="addYourself" className="ml-2 mb-0">
250244
Add Yourself
251245
</label>
252246
</div>
253247
)}
254248
<form onSubmit={handleSubmit}>
255249
<div className="mb-3">
256-
<label
257-
htmlFor="name"
258-
className="block text-xs text-gray-700 font-semibold"
259-
>
250+
<label htmlFor="name" className="block text-xs font-semibold">
260251
Name
261-
<span style={{ color: "red", fontSize: 13 }}> *</span>
252+
<span className="text-[red] text-[13px]"> *</span>
262253
</label>
263254
<input
264255
type="text"
@@ -267,16 +258,13 @@ const AddSigner = (props) => {
267258
onChange={(e) => setName(e.target.value)}
268259
required
269260
disabled={addYourself}
270-
className="px-3 py-2 w-full border-[1px] border-gray-300 rounded focus:outline-none text-xs"
261+
className="op-input op-input-bordered op-input-sm focus:outline-none hover:border-base-content w-full text-xs"
271262
/>
272263
</div>
273264
<div className="mb-3">
274-
<label
275-
htmlFor="email"
276-
className="block text-xs text-gray-700 font-semibold"
277-
>
265+
<label htmlFor="email" className="block text-xs font-semibold">
278266
Email
279-
<span style={{ color: "red", fontSize: 13 }}> *</span>
267+
<span className="text-[red] text-[13px]"> *</span>
280268
</label>
281269
<input
282270
type="email"
@@ -285,14 +273,11 @@ const AddSigner = (props) => {
285273
onChange={(e) => setEmail(e.target.value?.toLowerCase())}
286274
required
287275
disabled={addYourself}
288-
className="px-3 py-2 w-full border-[1px] border-gray-300 rounded focus:outline-none text-xs lowercase"
276+
className="op-input op-input-bordered op-input-sm focus:outline-none hover:border-base-content w-full text-xs"
289277
/>
290278
</div>
291279
<div className="mb-3">
292-
<label
293-
htmlFor="phone"
294-
className="block text-xs text-gray-700 font-semibold"
295-
>
280+
<label htmlFor="phone" className="block text-xs font-semibold">
296281
Phone
297282
</label>
298283
<input
@@ -301,23 +286,17 @@ const AddSigner = (props) => {
301286
value={phone}
302287
onChange={(e) => setPhone(e.target.value)}
303288
disabled={addYourself}
304-
className="px-3 py-2 w-full border-[1px] border-gray-300 rounded focus:outline-none text-xs"
289+
className="op-input op-input-bordered op-input-sm focus:outline-none hover:border-base-content w-full text-xs"
305290
/>
306291
</div>
307-
308-
<div className="mt-4 flex justify-start">
309-
<button
310-
type="submit"
311-
style={{ backgroundColor: modalSubmitBtnColor }}
312-
className="mr-2 px-[20px] py-1.5 text-white rounded shadow-md text-center focus:outline-none "
313-
>
292+
<div className="mt-4 flex gap-x-2 justify-start">
293+
<button type="submit" className="op-btn op-btn-primary">
314294
Submit
315295
</button>
316296
<button
317297
type="button"
318298
onClick={() => handleReset()}
319-
style={{ backgroundColor: modalCancelBtnColor }}
320-
className="px-4 py-1.5 text-black border-[1px] border-[#ccc] shadow-md rounded focus:outline-none"
299+
className="op-btn op-btn-secondary"
321300
>
322301
Reset
323302
</button>

0 commit comments

Comments
 (0)