diff --git a/.git-hooks/commit-msg b/.git-hooks/commit-msg
old mode 100644
new mode 100755
diff --git a/.git-hooks/pre-commit b/.git-hooks/pre-commit
old mode 100644
new mode 100755
diff --git a/package.json b/package.json
index 6a8af40..976298b 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
"scripts": {
"dev": "vite",
"build": "tsc && vite build",
- "lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 41",
+ "lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 32",
"lint:fix": "eslint . --fix --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
"lint:staged": "eslint --fix --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
"formatter:check": "prettier --check \"src/**/*.{ts,tsx,js,jsx,html,css,sass,less,yml,md,graphql}\"",
diff --git a/src/components/DrawPDFFields/index.tsx b/src/components/DrawPDFFields/index.tsx
index 63eb9ee..e98187c 100644
--- a/src/components/DrawPDFFields/index.tsx
+++ b/src/components/DrawPDFFields/index.tsx
@@ -37,7 +37,7 @@ import { truncate } from 'lodash'
import { hexToNpub } from '../../utils'
import { toPdfFiles } from '../../utils/pdf.ts'
PDFJS.GlobalWorkerOptions.workerSrc = new URL(
- 'pdfjs-dist/build/pdf.worker.mjs',
+ 'pdfjs-dist/build/pdf.worker.min.mjs',
import.meta.url
).toString()
diff --git a/src/layouts/Main.tsx b/src/layouts/Main.tsx
index c8f9f27..51c2086 100644
--- a/src/layouts/Main.tsx
+++ b/src/layouts/Main.tsx
@@ -136,7 +136,7 @@ export const MainLayout = () => {
}
setIsLoading(true)
- setLoadingSpinnerDesc(`Loading SIGit History`)
+ setLoadingSpinnerDesc(`Loading SIGit history...`)
getUsersAppData()
.then((appData) => {
if (appData) {
@@ -145,7 +145,7 @@ export const MainLayout = () => {
})
.finally(() => setIsLoading(false))
}
- }, [authState])
+ }, [authState, dispatch])
if (isLoading) return
diff --git a/src/pages/create/index.tsx b/src/pages/create/index.tsx
index 023dd02..e34b06d 100644
--- a/src/pages/create/index.tsx
+++ b/src/pages/create/index.tsx
@@ -24,7 +24,7 @@ import JSZip from 'jszip'
import { MuiFileInput } from 'mui-file-input'
import { Event, kinds } from 'nostr-tools'
import { useEffect, useRef, useState } from 'react'
-import { DndProvider, useDrag, useDrop } from 'react-dnd'
+import { DndProvider, DragSourceMonitor, useDrag, useDrop } from 'react-dnd'
import { HTML5Backend } from 'react-dnd-html5-backend'
import { useSelector } from 'react-redux'
import { useLocation, useNavigate } from 'react-router-dom'
@@ -127,7 +127,7 @@ export const CreatePage = () => {
})
}
})
- }, [])
+ }, [metadata, users])
// Set up event listener for authentication event
nostrController.on('nsecbunker-auth', (url) => {
setAuthUrl(url)
@@ -309,14 +309,16 @@ export const CreatePage = () => {
}
// Handle errors during file arrayBuffer conversion
- const handleFileError = (file: File) => (err: any) => {
+ const handleFileError = (file: File) => (err: unknown) => {
console.log(
`Error while getting arrayBuffer of file ${file.name} :>> `,
err
)
- toast.error(
- err.message || `Error while getting arrayBuffer of file ${file.name}`
- )
+ if (err instanceof Error) {
+ toast.error(
+ err.message || `Error while getting arrayBuffer of file ${file.name}`
+ )
+ }
return null
}
@@ -368,10 +370,12 @@ export const CreatePage = () => {
}
// Handle errors during zip file generation
- const handleZipError = (err: any) => {
+ const handleZipError = (err: unknown) => {
console.log('Error in zip:>> ', err)
setIsLoading(false)
- toast.error(err.message || 'Error occurred in generating zip file')
+ if (err instanceof Error) {
+ toast.error(err.message || 'Error occurred in generating zip file')
+ }
return null
}
@@ -438,10 +442,12 @@ export const CreatePage = () => {
}
// Handle errors during file upload
- const handleUploadError = (err: any) => {
+ const handleUploadError = (err: unknown) => {
console.log('Error in upload:>> ', err)
setIsLoading(false)
- toast.error(err.message || 'Error occurred in uploading file')
+ if (err instanceof Error) {
+ toast.error(err.message || 'Error occurred in uploading file')
+ }
return null
}
@@ -474,9 +480,13 @@ export const CreatePage = () => {
encryptionKey
)
- if (!finalZipFile) return
+ if (!finalZipFile) {
+ setIsLoading(false)
+ return
+ }
- saveAs(finalZipFile, 'request.sigit.zip')
+ saveAs(finalZipFile, `request-${now()}.sigit.zip`)
+ setIsLoading(false)
}
const generateFilesZip = async (): Promise => {
@@ -659,9 +669,11 @@ export const CreatePage = () => {
}
const arrayBuffer = await generateZipFile(zip)
- if (!arrayBuffer) return
+ if (!arrayBuffer) {
+ setIsLoading(false)
+ return
+ }
- setLoadingSpinnerDesc('Encrypting zip file')
const encryptedArrayBuffer = await encryptZipFile(
arrayBuffer,
encryptionKey
@@ -967,7 +979,7 @@ const SignerRow = ({
item: () => {
return { id: user.pubkey, index }
},
- collect: (monitor: any) => ({
+ collect: (monitor: DragSourceMonitor) => ({
isDragging: monitor.isDragging()
})
})
diff --git a/src/utils/pdf.ts b/src/utils/pdf.ts
index 78bab85..28bbfde 100644
--- a/src/utils/pdf.ts
+++ b/src/utils/pdf.ts
@@ -4,7 +4,7 @@ import { PDFDocument } from 'pdf-lib'
import { Mark } from '../types/mark.ts'
PDFJS.GlobalWorkerOptions.workerSrc = new URL(
- 'pdfjs-dist/build/pdf.worker.mjs',
+ 'pdfjs-dist/build/pdf.worker.min.mjs',
import.meta.url
).toString()
diff --git a/vite.config.ts b/vite.config.ts
index 4275495..3d09617 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -5,15 +5,6 @@ import tsconfigPaths from 'vite-tsconfig-paths'
export default defineConfig({
plugins: [react(), tsconfigPaths()],
build: {
- target: 'ES2022',
- rollupOptions: {
- output: {
- manualChunks(id) {
- if (id.includes('pdfjs-dist/build/pdf.worker.mjs')) {
- return 'pdf.worker'
- }
- }
- }
- }
+ target: 'ES2022'
}
})