@@ -68,6 +68,7 @@ export const UsersDetails = ({ meta }: UsersDetailsProps) => {
const profile = profiles[submittedBy]
return (
{
disableInteractive
>
-
+
)
@@ -196,14 +201,14 @@ export const UsersDetails = ({ meta }: UsersDetailsProps) => {
{signedStatus}
- {ext.length > 0 ? (
+ {extensions.length > 0 ? (
- {ext.length > 1 ? (
+ {!isSame ? (
<>
Multiple File Types
) : (
- getExtensionIconLabel(ext[0])
+ getExtensionIconLabel(extensions[0])
)}
) : (
diff --git a/src/hooks/useSigitMeta.tsx b/src/hooks/useSigitMeta.tsx
index a393824..fea5154 100644
--- a/src/hooks/useSigitMeta.tsx
+++ b/src/hooks/useSigitMeta.tsx
@@ -1,5 +1,10 @@
import { useEffect, useState } from 'react'
-import { CreateSignatureEventContent, Meta, SignedEventContent } from '../types'
+import {
+ CreateSignatureEventContent,
+ DocSignatureEvent,
+ Meta,
+ SignedEventContent
+} from '../types'
import { Mark } from '../types/mark'
import {
fromUnixTimestamp,
@@ -38,7 +43,9 @@ export interface FlatMeta
encryptionKey: string | null
// Parsed Document Signatures
- parsedSignatureEvents: { [signer: `npub1${string}`]: Event }
+ parsedSignatureEvents: {
+ [signer: `npub1${string}`]: DocSignatureEvent
+ }
// Calculated completion time
completedAt?: number
@@ -74,7 +81,7 @@ export const useSigitMeta = (meta: Meta): FlatMeta => {
const [zipUrl, setZipUrl] = useState
('')
const [parsedSignatureEvents, setParsedSignatureEvents] = useState<{
- [signer: `npub1${string}`]: Event
+ [signer: `npub1${string}`]: DocSignatureEvent
}>({})
const [completedAt, setCompletedAt] = useState()
@@ -141,7 +148,10 @@ export const useSigitMeta = (meta: Meta): FlatMeta => {
}
// Temp. map to hold events and signers
- const parsedSignatureEventsMap = new Map<`npub1${string}`, Event>()
+ const parsedSignatureEventsMap = new Map<
+ `npub1${string}`,
+ DocSignatureEvent
+ >()
const signerStatusMap = new Map<`npub1${string}`, SignStatus>()
const getPrevSignerSig = (npub: `npub1${string}`) => {
@@ -183,9 +193,12 @@ export const useSigitMeta = (meta: Meta): FlatMeta => {
if (isValidSignature) {
// get the signature of prev signer from the content of current signers signedEvent
const prevSignersSig = getPrevSignerSig(npub)
-
try {
const obj: SignedEventContent = JSON.parse(event.content)
+ parsedSignatureEventsMap.set(npub, {
+ ...event,
+ parsedContent: obj
+ })
if (
obj.prevSig &&
prevSignersSig &&
diff --git a/src/layouts/StickySideColumns.module.scss b/src/layouts/StickySideColumns.module.scss
index fd99964..7690822 100644
--- a/src/layouts/StickySideColumns.module.scss
+++ b/src/layouts/StickySideColumns.module.scss
@@ -23,7 +23,11 @@
grid-gap: 15px;
}
.content {
- max-width: 550px;
- width: 550px;
+ padding: 10px;
+ border: 10px solid $overlay-background-color;
+ border-radius: 4px;
+
+ max-width: 590px;
+ width: 590px;
margin: 0 auto;
}
diff --git a/src/pages/verify/index.tsx b/src/pages/verify/index.tsx
index 69f7f0b..ceba0eb 100644
--- a/src/pages/verify/index.tsx
+++ b/src/pages/verify/index.tsx
@@ -1,12 +1,16 @@
-import { Box, Button, Tooltip, Typography, useTheme } from '@mui/material'
+import { Box, Button, Divider, Tooltip, Typography } from '@mui/material'
import JSZip from 'jszip'
import { MuiFileInput } from 'mui-file-input'
import { Event, verifyEvent } from 'nostr-tools'
-import { useEffect, useState } from 'react'
+import { useEffect, useRef, useState } from 'react'
import { toast } from 'react-toastify'
import { LoadingSpinner } from '../../components/LoadingSpinner'
import { NostrController } from '../../controllers'
-import { CreateSignatureEventContent, Meta } from '../../types'
+import {
+ CreateSignatureEventContent,
+ DocSignatureEvent,
+ Meta
+} from '../../types'
import {
decryptArrayBuffer,
extractMarksFromSignedMeta,
@@ -16,10 +20,10 @@ import {
parseJson,
readContentOfZipEntry,
signEventForMetaFile,
- shorten
+ shorten,
+ getCurrentUserFiles
} from '../../utils'
import styles from './style.module.scss'
-import { Cancel, CheckCircle } from '@mui/icons-material'
import { useLocation } from 'react-router-dom'
import axios from 'axios'
import { PdfFile } from '../../types/drawing.ts'
@@ -27,7 +31,8 @@ import {
addMarks,
convertToPdfBlob,
convertToPdfFile,
- groupMarksByPage
+ groupMarksByFileNamePage,
+ inPx
} from '../../utils/pdf.ts'
import { State } from '../../store/rootReducer.ts'
import { useSelector } from 'react-redux'
@@ -40,13 +45,101 @@ import { UsersDetails } from '../../components/UsersDetails.tsx/index.tsx'
import { UserAvatar } from '../../components/UserAvatar/index.tsx'
import { useSigitProfiles } from '../../hooks/useSigitProfiles.tsx'
import { TooltipChild } from '../../components/TooltipChild.tsx'
+import FileList from '../../components/FileList'
+import { CurrentUserFile } from '../../types/file.ts'
+import { Mark } from '../../types/mark.ts'
+
+interface PdfViewProps {
+ files: CurrentUserFile[]
+ currentFile: CurrentUserFile | null
+ parsedSignatureEvents: {
+ [signer: `npub1${string}`]: DocSignatureEvent
+ }
+}
+
+const SlimPdfView = ({
+ files,
+ currentFile,
+ parsedSignatureEvents
+}: PdfViewProps) => {
+ const pdfRefs = useRef<(HTMLDivElement | null)[]>([])
+ useEffect(() => {
+ if (currentFile !== null && !!pdfRefs.current[currentFile.id]) {
+ pdfRefs.current[currentFile.id]?.scrollIntoView({
+ behavior: 'smooth',
+ block: 'end'
+ })
+ }
+ }, [currentFile])
+ return (
+
+ {files.map((currentUserFile, i) => {
+ const { hash, filename, pdfFile, id } = currentUserFile
+ const signatureEvents = Object.keys(parsedSignatureEvents)
+ if (!hash) return
+ return (
+ <>
+
(pdfRefs.current[id] = el)}
+ key={filename}
+ className={styles.fileWrapper}
+ >
+ {pdfFile.pages.map((page, i) => {
+ const marks: Mark[] = []
+
+ signatureEvents.forEach((e) => {
+ const m = parsedSignatureEvents[
+ e as `npub1${string}`
+ ].parsedContent?.marks.filter(
+ (m) => m.pdfFileHash == hash && m.location.page == i
+ )
+ if (m) {
+ marks.push(...m)
+ }
+ })
+ return (
+
+
+ {marks.map((m) => {
+ return (
+
+ {m.value}
+
+ )
+ })}
+
+ )
+ })}
+
+
+ {i < files.length - 1 && (
+
+ File Separator
+
+ )}
+
+ )
+ })}
+