sigit/sigit.io
6
2
Fork 0
Code Issues 55 Pull Requests 2 Actions Packages Projects 1 Releases Wiki Activity

Releasing new design #161

Merged
b merged 241 commits from staging into main 2024-08-21 11:38:25 +00:00
Conversation 0 Commits 241 Files Changed 149 +387 -549
22 changed files with 387 additions and 549 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8d683de88c - Show all commits

192
src/components/DrawPDFFields/index.tsx
View File

@ -1,43 +1,15 @@
import { import { AccessTime, CalendarMonth, ExpandMore, Gesture, PictureAsPdf, Badge, Work, Close } from '@mui/icons-material'
AccessTime, import { Box, Typography, Accordion, AccordionDetails, AccordionSummary, CircularProgress, FormControl, InputLabel, MenuItem, Select } from '@mui/material'
CalendarMonth,
ExpandMore,
Gesture,
PictureAsPdf,
Badge,
Work,
Close
} from '@mui/icons-material'
import {
Box,
Typography,
Accordion,
AccordionDetails,
AccordionSummary,
CircularProgress,
FormControl,
InputLabel,
MenuItem,
Select
} from '@mui/material'
import styles from './style.module.scss' import styles from './style.module.scss'
import { useEffect, useState } from 'react' import { useEffect, useState } from 'react'
import * as PDFJS from 'pdfjs-dist' import * as PDFJS from "pdfjs-dist";
import { ProfileMetadata, User } from '../../types' import { ProfileMetadata, User } from '../../types';
import { import { PdfFile, DrawTool, MouseState, PdfPage, DrawnField, MarkType } from '../../types/drawing';
PdfFile, import { truncate } from 'lodash';
DrawTool, import { hexToNpub } from '../../utils';
MouseState,
PdfPage,
DrawnField,
MarkType
} from '../../types/drawing'
import { truncate } from 'lodash'
import { hexToNpub } from '../../utils'
import { toPdfFiles } from '../../utils/pdf.ts' import { toPdfFiles } from '../../utils/pdf.ts'
PDFJS.GlobalWorkerOptions.workerSrc = PDFJS.GlobalWorkerOptions.workerSrc = 'node_modules/pdfjs-dist/build/pdf.worker.mjs';
'node_modules/pdfjs-dist/build/pdf.worker.mjs'
interface Props { interface Props {
selectedFiles: File[] selectedFiles: File[]
@ -57,34 +29,35 @@ export const DrawPDFFields = (props: Props) => {
const [toolbox] = useState<DrawTool[]>([ const [toolbox] = useState<DrawTool[]>([
{ {
identifier: MarkType.SIGNATURE, identifier: MarkType.SIGNATURE,
icon: <Gesture />, icon: <Gesture/>,
label: 'Signature', label: 'Signature',
active: false active: false
}, },
{ {
identifier: MarkType.FULLNAME, identifier: MarkType.FULLNAME,
icon: <Badge />, icon: <Badge/>,
label: 'Full Name', label: 'Full Name',
active: true active: true
}, },
{ {
identifier: MarkType.JOBTITLE, identifier: MarkType.JOBTITLE,
icon: <Work />, icon: <Work/>,
label: 'Job Title', label: 'Job Title',
active: false active: false
}, },
{ {
identifier: MarkType.DATE, identifier: MarkType.DATE,
icon: <CalendarMonth />, icon: <CalendarMonth/>,
label: 'Date', label: 'Date',
active: false active: false
}, },
{ {
identifier: MarkType.DATETIME, identifier: MarkType.DATETIME,
icon: <AccessTime />, icon: <AccessTime/>,
label: 'Datetime', label: 'Datetime',
active: false active: false
} },
]) ])
const [mouseState, setMouseState] = useState<MouseState>({ const [mouseState, setMouseState] = useState<MouseState>({
@ -110,11 +83,11 @@ export const DrawPDFFields = (props: Props) => {
*/ */
useEffect(() => { useEffect(() => {
// window.addEventListener('mousedown', onMouseDown); // window.addEventListener('mousedown', onMouseDown);
window.addEventListener('mouseup', onMouseUp) window.addEventListener('mouseup', onMouseUp);
return () => { return () => {
// window.removeEventListener('mousedown', onMouseDown); // window.removeEventListener('mousedown', onMouseDown);
window.removeEventListener('mouseup', onMouseUp) window.removeEventListener('mouseup', onMouseUp);
} }
}, []) }, [])
@ -185,7 +158,7 @@ export const DrawPDFFields = (props: Props) => {
*/ */
const onMouseMove = (event: any, page: PdfPage) => { const onMouseMove = (event: any, page: PdfPage) => {
if (mouseState.clicked && selectedTool) { if (mouseState.clicked && selectedTool) {
const lastElementIndex = page.drawnFields.length - 1 const lastElementIndex = page.drawnFields.length -1
const lastDrawnField = page.drawnFields[lastElementIndex] const lastDrawnField = page.drawnFields[lastElementIndex]
const { mouseX, mouseY } = getMouseCoordinates(event) const { mouseX, mouseY } = getMouseCoordinates(event)
@ -239,10 +212,7 @@ export const DrawPDFFields = (props: Props) => {
*/ */
const onDranwFieldMouseMove = (event: any, drawnField: DrawnField) => { const onDranwFieldMouseMove = (event: any, drawnField: DrawnField) => {
if (mouseState.dragging) { if (mouseState.dragging) {
const { mouseX, mouseY, rect } = getMouseCoordinates( const { mouseX, mouseY, rect } = getMouseCoordinates(event, event.target.parentNode)
event,
event.target.parentNode
)
const coordsOffset = mouseState.coordsInWrapper const coordsOffset = mouseState.coordsInWrapper
if (coordsOffset) { if (coordsOffset) {
@ -288,10 +258,7 @@ export const DrawPDFFields = (props: Props) => {
*/ */
const onResizeHandleMouseMove = (event: any, drawnField: DrawnField) => { const onResizeHandleMouseMove = (event: any, drawnField: DrawnField) => {
if (mouseState.resizing) { if (mouseState.resizing) {
const { mouseX, mouseY } = getMouseCoordinates( const { mouseX, mouseY } = getMouseCoordinates(event, event.target.parentNode.parentNode)
event,
event.target.parentNode.parentNode
)
const width = mouseX - drawnField.left const width = mouseX - drawnField.left
const height = mouseY - drawnField.top const height = mouseY - drawnField.top
@ -310,18 +277,10 @@ export const DrawPDFFields = (props: Props) => {
* @param pdfPageIndex pdf page index * @param pdfPageIndex pdf page index
* @param drawnFileIndex drawn file index * @param drawnFileIndex drawn file index
*/ */
const onRemoveHandleMouseDown = ( const onRemoveHandleMouseDown = (event: any, pdfFileIndex: number, pdfPageIndex: number, drawnFileIndex: number) => {
event: any,
pdfFileIndex: number,
pdfPageIndex: number,
drawnFileIndex: number
) => {
event.stopPropagation() event.stopPropagation()
pdfFiles[pdfFileIndex].pages[pdfPageIndex].drawnFields.splice( pdfFiles[pdfFileIndex].pages[pdfPageIndex].drawnFields.splice(drawnFileIndex, 1)
drawnFileIndex,
1
)
} }
/** /**
@ -341,9 +300,9 @@ export const DrawPDFFields = (props: Props) => {
*/ */
const getMouseCoordinates = (event: any, customTarget?: any) => { const getMouseCoordinates = (event: any, customTarget?: any) => {
const target = customTarget ? customTarget : event.target const target = customTarget ? customTarget : event.target
const rect = target.getBoundingClientRect() const rect = target.getBoundingClientRect();
const mouseX = event.clientX - rect.left //x position within the element. const mouseX = event.clientX - rect.left; //x position within the element.
const mouseY = event.clientY - rect.top //y position within the element. const mouseY = event.clientY - rect.top; //y position within the element.
return { return {
mouseX, mouseX,
@ -357,7 +316,7 @@ export const DrawPDFFields = (props: Props) => {
* creates the pdfFiles object and sets to a state * creates the pdfFiles object and sets to a state
*/ */
const parsePdfPages = async () => { const parsePdfPages = async () => {
const pdfFiles: PdfFile[] = await toPdfFiles(selectedFiles) const pdfFiles: PdfFile[] = await toPdfFiles(selectedFiles);
setPdfFiles(pdfFiles) setPdfFiles(pdfFiles)
} }
@ -367,7 +326,7 @@ export const DrawPDFFields = (props: Props) => {
* @returns if expanded pdf accordion is present * @returns if expanded pdf accordion is present
*/ */
const hasExpandedPdf = () => { const hasExpandedPdf = () => {
return !!pdfFiles.filter((pdfFile) => !!pdfFile.expanded).length return !!pdfFiles.filter(pdfFile => !!pdfFile.expanded).length
} }
const handleAccordionExpandChange = (expanded: boolean, pdfFile: PdfFile) => { const handleAccordionExpandChange = (expanded: boolean, pdfFile: PdfFile) => {
@ -396,11 +355,9 @@ export const DrawPDFFields = (props: Props) => {
*/ */
const getPdfPages = (pdfFile: PdfFile, pdfFileIndex: number) => { const getPdfPages = (pdfFile: PdfFile, pdfFileIndex: number) => {
return ( return (
<Box <Box sx={{
sx={{
width: '100%' width: '100%'
}} }}>
>
{pdfFile.pages.map((page, pdfPageIndex: number) => { {pdfFile.pages.map((page, pdfPageIndex: number) => {
return ( return (
<div <div
@ -410,27 +367,17 @@ export const DrawPDFFields = (props: Props) => {
marginBottom: '10px' marginBottom: '10px'
}} }}
className={`${styles.pdfImageWrapper} ${selectedTool ? styles.drawing : ''}`} className={`${styles.pdfImageWrapper} ${selectedTool ? styles.drawing : ''}`}
onMouseMove={(event) => { onMouseMove={(event) => {onMouseMove(event, page)}}
onMouseMove(event, page) onMouseDown={(event) => {onMouseDown(event, page)}}
}}
onMouseDown={(event) => {
onMouseDown(event, page)
}}
> >
<img <img draggable="false" style={{ width: '100%' }} src={page.image}/>
draggable="false"
style={{ width: '100%' }}
src={page.image}
/>
{page.drawnFields.map((drawnField, drawnFieldIndex: number) => { {page.drawnFields.map((drawnField, drawnFieldIndex: number) => {
return ( return (
<div <div
key={drawnFieldIndex} key={drawnFieldIndex}
onMouseDown={onDrawnFieldMouseDown} onMouseDown={onDrawnFieldMouseDown}
onMouseMove={(event) => { onMouseMove={(event) => { onDranwFieldMouseMove(event, drawnField)}}
onDranwFieldMouseMove(event, drawnField)
}}
className={styles.drawingRectangle} className={styles.drawingRectangle}
style={{ style={{
left: `${drawnField.left}px`, left: `${drawnField.left}px`,
@ -442,68 +389,41 @@ export const DrawPDFFields = (props: Props) => {
> >
<span <span
onMouseDown={onResizeHandleMouseDown} onMouseDown={onResizeHandleMouseDown}
onMouseMove={(event) => { onMouseMove={(event) => {onResizeHandleMouseMove(event, drawnField)}}
onResizeHandleMouseMove(event, drawnField)
}}
className={styles.resizeHandle} className={styles.resizeHandle}
></span> ></span>
<span <span
onMouseDown={(event) => { onMouseDown={(event) => {onRemoveHandleMouseDown(event, pdfFileIndex, pdfPageIndex, drawnFieldIndex)}}
onRemoveHandleMouseDown(
event,
pdfFileIndex,
pdfPageIndex,
drawnFieldIndex
)
}}
className={styles.removeHandle} className={styles.removeHandle}
> >
<Close fontSize="small" /> <Close fontSize='small'/>
</span> </span>
<div <div
onMouseDown={onUserSelectHandleMouseDown} onMouseDown={onUserSelectHandleMouseDown}
className={styles.userSelect} className={styles.userSelect}
> >
<FormControl fullWidth size="small"> <FormControl fullWidth size='small'>
<InputLabel id="counterparts">Counterpart</InputLabel> <InputLabel id="counterparts">Counterpart</InputLabel>
<Select <Select
value={drawnField.counterpart} value={drawnField.counterpart}
onChange={(event) => { onChange={(event) => { drawnField.counterpart = event.target.value; refreshPdfFiles() }}
drawnField.counterpart = event.target.value
refreshPdfFiles()
}}
labelId="counterparts" labelId="counterparts"
label="Counterparts" label="Counterparts"
> >
{props.users.map((user, index) => { {props.users.map((user, index) => {
let displayValue = truncate( let displayValue = truncate(hexToNpub(user.pubkey), {
hexToNpub(user.pubkey),
{
length: 16 length: 16
} })
)
const metadata = props.metadata[user.pubkey] const metadata = props.metadata[user.pubkey]
if (metadata) { if (metadata) {
displayValue = truncate( displayValue = truncate(metadata.name || metadata.display_name || metadata.username, {
metadata.name ||
metadata.display_name ||
metadata.username,
{
length: 16 length: 16
} })
)
} }
return ( return <MenuItem key={index} value={hexToNpub(user.pubkey)}>{displayValue}</MenuItem>
<MenuItem
key={index}
value={hexToNpub(user.pubkey)}
>
{displayValue}
</MenuItem>
)
})} })}
</Select> </Select>
</FormControl> </FormControl>
@ -521,7 +441,7 @@ export const DrawPDFFields = (props: Props) => {
if (parsingPdf) { if (parsingPdf) {
return ( return (
<Box sx={{ width: '100%', textAlign: 'center' }}> <Box sx={{ width: '100%', textAlign: 'center' }}>
<CircularProgress /> <CircularProgress/>
</Box> </Box>
) )
} }
@ -537,19 +457,13 @@ export const DrawPDFFields = (props: Props) => {
{pdfFiles.map((pdfFile, pdfFileIndex: number) => { {pdfFiles.map((pdfFile, pdfFileIndex: number) => {
return ( return (
<Accordion <Accordion key={pdfFileIndex} expanded={pdfFile.expanded} onChange={(_event, expanded) => {handleAccordionExpandChange(expanded, pdfFile)}}>
key={pdfFileIndex}
expanded={pdfFile.expanded}
onChange={(_event, expanded) => {
handleAccordionExpandChange(expanded, pdfFile)
}}
>
<AccordionSummary <AccordionSummary
expandIcon={<ExpandMore />} expandIcon={<ExpandMore />}
aria-controls={`panel${pdfFileIndex}-content`} aria-controls={`panel${pdfFileIndex}-content`}
id={`panel${pdfFileIndex}header`} id={`panel${pdfFileIndex}header`}
> >
<PictureAsPdf sx={{ mr: 1 }} /> <PictureAsPdf sx={{ mr: 1 }}/>
{pdfFile.file.name} {pdfFile.file.name}
</AccordionSummary> </AccordionSummary>
<AccordionDetails> <AccordionDetails>
@ -563,19 +477,13 @@ export const DrawPDFFields = (props: Props) => {
{showDrawToolBox && ( {showDrawToolBox && (
<Box className={styles.drawToolBoxContainer}> <Box className={styles.drawToolBoxContainer}>
<Box className={styles.drawToolBox}> <Box className={styles.drawToolBox}>
{toolbox {toolbox.filter(drawTool => drawTool.active).map((drawTool: DrawTool, index: number) => {
.filter((drawTool) => drawTool.active)
.map((drawTool: DrawTool, index: number) => {
return ( return (
<Box <Box
key={index} key={index}
onClick={() => { onClick={() => {handleToolSelect(drawTool)}} className={`${styles.toolItem} ${selectedTool?.identifier === drawTool.identifier ? styles.selected : ''}`}>
handleToolSelect(drawTool) { drawTool.icon }
}} { drawTool.label }
className={`${styles.toolItem} ${selectedTool?.identifier === drawTool.identifier ? styles.selected : ''}`}
>
{drawTool.icon}
{drawTool.label}
</Box> </Box>
) )
})} })}

22
src/components/PDFView/PdfItem.tsx
View File

@ -1,6 +1,6 @@
import { PdfFile } from '../../types/drawing.ts' import { PdfFile } from '../../types/drawing.ts'
import { CurrentUserMark } from '../../types/mark.ts' import { CurrentUserMark } from '../../types/mark.ts'
import PdfPageItem from './PdfPageItem.tsx' import PdfPageItem from './PdfPageItem.tsx';
interface PdfItemProps { interface PdfItemProps {
pdfFile: PdfFile pdfFile: PdfFile
@ -13,20 +13,12 @@ interface PdfItemProps {
/** /**
* Responsible for displaying pages of a single Pdf File. * Responsible for displaying pages of a single Pdf File.
*/ */
const PdfItem = ({ const PdfItem = ({ pdfFile, currentUserMarks, handleMarkClick, selectedMarkValue, selectedMark }: PdfItemProps) => {
pdfFile, const filterByPage = (marks: CurrentUserMark[], page: number): CurrentUserMark[] => {
currentUserMarks, return marks.filter((m) => m.mark.location.page === page);
handleMarkClick,
selectedMarkValue,
selectedMark
}: PdfItemProps) => {
const filterByPage = (
marks: CurrentUserMark[],
page: number
): CurrentUserMark[] => {
return marks.filter((m) => m.mark.location.page === page)
} }
return pdfFile.pages.map((page, i) => { return (
pdfFile.pages.map((page, i) => {
return ( return (
<PdfPageItem <PdfPageItem
page={page} page={page}
@ -37,7 +29,7 @@ const PdfItem = ({
selectedMark={selectedMark} selectedMark={selectedMark}
/> />
) )
}) }))
} }
export default PdfItem export default PdfItem

18
src/components/PDFView/PdfMarkItem.tsx
View File

@ -12,18 +12,14 @@ interface PdfMarkItemProps {
/** /**
* Responsible for display an individual Pdf Mark. * Responsible for display an individual Pdf Mark.
*/ */
const PdfMarkItem = ({ const PdfMarkItem = ({ selectedMark, handleMarkClick, selectedMarkValue, userMark }: PdfMarkItemProps) => {
selectedMark, const { location } = userMark.mark;
handleMarkClick, const handleClick = () => handleMarkClick(userMark.mark.id);
selectedMarkValue, const getMarkValue = () => (
userMark
}: PdfMarkItemProps) => {
const { location } = userMark.mark
const handleClick = () => handleMarkClick(userMark.mark.id)
const getMarkValue = () =>
selectedMark?.mark.id === userMark.mark.id selectedMark?.mark.id === userMark.mark.id
? selectedMarkValue ? selectedMarkValue
: userMark.mark.value : userMark.mark.value
)
return ( return (
<div <div
onClick={handleClick} onClick={handleClick}
@ -34,9 +30,7 @@ const PdfMarkItem = ({
width: inPx(location.width), width: inPx(location.width),
height: inPx(location.height) height: inPx(location.height)
}} }}
> >{getMarkValue()}</div>
{getMarkValue()}
</div>
) )
} }

39
src/components/PDFView/PdfMarking.tsx
View File

@ -6,17 +6,17 @@ import React, { useState, useEffect } from 'react'
import { import {
findNextCurrentUserMark, findNextCurrentUserMark,
isCurrentUserMarksComplete, isCurrentUserMarksComplete,
updateCurrentUserMarks updateCurrentUserMarks,
} from '../../utils' } from '../../utils'
import { EMPTY } from '../../utils/const.ts' import { EMPTY } from '../../utils/const.ts'
import { Container } from '../Container' import { Container } from '../Container'
import styles from '../../pages/sign/style.module.scss' import styles from '../../pages/sign/style.module.scss'
interface PdfMarkingProps { interface PdfMarkingProps {
files: { pdfFile: PdfFile; filename: string; hash: string | null }[] files: { pdfFile: PdfFile, filename: string, hash: string | null }[],
currentUserMarks: CurrentUserMark[] currentUserMarks: CurrentUserMark[],
setIsReadyToSign: (isReadyToSign: boolean) => void setIsReadyToSign: (isReadyToSign: boolean) => void,
setCurrentUserMarks: (currentUserMarks: CurrentUserMark[]) => void setCurrentUserMarks: (currentUserMarks: CurrentUserMark[]) => void,
setUpdatedMarks: (markToUpdate: Mark) => void setUpdatedMarks: (markToUpdate: Mark) => void
} }
@ -35,21 +35,21 @@ const PdfMarking = (props: PdfMarkingProps) => {
setUpdatedMarks setUpdatedMarks
} = props } = props
const [selectedMark, setSelectedMark] = useState<CurrentUserMark | null>(null) const [selectedMark, setSelectedMark] = useState<CurrentUserMark | null>(null)
const [selectedMarkValue, setSelectedMarkValue] = useState<string>('') const [selectedMarkValue, setSelectedMarkValue] = useState<string>("")
useEffect(() => { useEffect(() => {
setSelectedMark(findNextCurrentUserMark(currentUserMarks) || null) setSelectedMark(findNextCurrentUserMark(currentUserMarks) || null)
}, [currentUserMarks]) }, [currentUserMarks])
const handleMarkClick = (id: number) => { const handleMarkClick = (id: number) => {
const nextMark = currentUserMarks.find((mark) => mark.mark.id === id) const nextMark = currentUserMarks.find((mark) => mark.mark.id === id);
setSelectedMark(nextMark!) setSelectedMark(nextMark!);
setSelectedMarkValue(nextMark?.mark.value ?? EMPTY) setSelectedMarkValue(nextMark?.mark.value ?? EMPTY);
} }
const handleSubmit = (event: React.FormEvent<HTMLFormElement>) => { const handleSubmit = (event: React.FormEvent<HTMLFormElement>) => {
event.preventDefault() event.preventDefault();
if (!selectedMarkValue || !selectedMark) return if (!selectedMarkValue || !selectedMark) return;
const updatedMark: CurrentUserMark = { const updatedMark: CurrentUserMark = {
...selectedMark, ...selectedMark,
@ -61,10 +61,7 @@ const PdfMarking = (props: PdfMarkingProps) => {
} }
setSelectedMarkValue(EMPTY) setSelectedMarkValue(EMPTY)
const updatedCurrentUserMarks = updateCurrentUserMarks( const updatedCurrentUserMarks = updateCurrentUserMarks(currentUserMarks, updatedMark);
currentUserMarks,
updatedMark
)
setCurrentUserMarks(updatedCurrentUserMarks) setCurrentUserMarks(updatedCurrentUserMarks)
setSelectedMark(findNextCurrentUserMark(updatedCurrentUserMarks) || null) setSelectedMark(findNextCurrentUserMark(updatedCurrentUserMarks) || null)
console.log(isCurrentUserMarksComplete(updatedCurrentUserMarks)) console.log(isCurrentUserMarksComplete(updatedCurrentUserMarks))
@ -72,22 +69,22 @@ const PdfMarking = (props: PdfMarkingProps) => {
setUpdatedMarks(updatedMark.mark) setUpdatedMarks(updatedMark.mark)
} }
const handleChange = (event: React.ChangeEvent<HTMLInputElement>) => const handleChange = (event: React.ChangeEvent<HTMLInputElement>) => setSelectedMarkValue(event.target.value)
setSelectedMarkValue(event.target.value)
return ( return (
<> <>
<Container className={styles.container}> <Container className={styles.container}>
{currentUserMarks?.length > 0 && ( {
currentUserMarks?.length > 0 && (
<PdfView <PdfView
files={files} files={files}
handleMarkClick={handleMarkClick} handleMarkClick={handleMarkClick}
selectedMarkValue={selectedMarkValue} selectedMarkValue={selectedMarkValue}
selectedMark={selectedMark} selectedMark={selectedMark}
currentUserMarks={currentUserMarks} currentUserMarks={currentUserMarks}
/> />)}
)} {
{selectedMark !== null && ( selectedMark !== null && (
<MarkFormField <MarkFormField
handleSubmit={handleSubmit} handleSubmit={handleSubmit}
handleChange={handleChange} handleChange={handleChange}

18
src/components/PDFView/PdfPageItem.tsx
View File

@ -13,13 +13,7 @@ interface PdfPageProps {
/** /**
* Responsible for rendering a single Pdf Page and its Marks * Responsible for rendering a single Pdf Page and its Marks
*/ */
const PdfPageItem = ({ const PdfPageItem = ({ page, currentUserMarks, handleMarkClick, selectedMarkValue, selectedMark }: PdfPageProps) => {
page,
currentUserMarks,
handleMarkClick,
selectedMarkValue,
selectedMark
}: PdfPageProps) => {
return ( return (
<div <div
className={styles.pdfImageWrapper} className={styles.pdfImageWrapper}
@ -29,8 +23,14 @@ const PdfPageItem = ({
marginTop: '10px' marginTop: '10px'
}} }}
> >
<img draggable="false" src={page.image} style={{ width: '100%' }} /> <img
{currentUserMarks.map((m, i) => ( draggable="false"
src={page.image}
style={{ width: '100%'}}
/>
{
currentUserMarks.map((m, i) => (
<PdfMarkItem <PdfMarkItem
key={i} key={i}
handleMarkClick={handleMarkClick} handleMarkClick={handleMarkClick}

27
src/components/PDFView/index.tsx
View File

@ -4,7 +4,7 @@ import PdfItem from './PdfItem.tsx'
import { CurrentUserMark } from '../../types/mark.ts' import { CurrentUserMark } from '../../types/mark.ts'
interface PdfViewProps { interface PdfViewProps {
files: { pdfFile: PdfFile; filename: string; hash: string | null }[] files: { pdfFile: PdfFile, filename: string, hash: string | null }[]
currentUserMarks: CurrentUserMark[] currentUserMarks: CurrentUserMark[]
handleMarkClick: (id: number) => void handleMarkClick: (id: number) => void
selectedMarkValue: string selectedMarkValue: string
@ -14,24 +14,14 @@ interface PdfViewProps {
/** /**
* Responsible for rendering Pdf files. * Responsible for rendering Pdf files.
*/ */
const PdfView = ({ const PdfView = ({ files, currentUserMarks, handleMarkClick, selectedMarkValue, selectedMark }: PdfViewProps) => {
files, const filterByFile = (currentUserMarks: CurrentUserMark[], hash: string): CurrentUserMark[] => {
currentUserMarks, return currentUserMarks.filter((currentUserMark) => currentUserMark.mark.pdfFileHash === hash)
handleMarkClick,
selectedMarkValue,
selectedMark
}: PdfViewProps) => {
const filterByFile = (
currentUserMarks: CurrentUserMark[],
hash: string
): CurrentUserMark[] => {
return currentUserMarks.filter(
(currentUserMark) => currentUserMark.mark.pdfFileHash === hash
)
} }
return ( return (
<Box sx={{ width: '100%' }}> <Box sx={{ width: '100%' }}>
{files.map(({ pdfFile, hash }, i) => { {
files.map(({ pdfFile, hash }, i) => {
if (!hash) return if (!hash) return
return ( return (
<PdfItem <PdfItem
@ -43,9 +33,10 @@ const PdfView = ({
selectedMarkValue={selectedMarkValue} selectedMarkValue={selectedMarkValue}
/> />
) )
})} })
}
</Box> </Box>
) )
} }
export default PdfView export default PdfView;

17
src/controllers/MetadataController.ts
View File

@ -164,18 +164,13 @@ export class MetadataController extends EventEmitter {
* or a fallback RelaySet with Sigit's Relay * or a fallback RelaySet with Sigit's Relay
*/ */
public findRelayListMetadata = async (hexKey: string): Promise<RelaySet> => { public findRelayListMetadata = async (hexKey: string): Promise<RelaySet> => {
const relayEvent = const relayEvent = await findRelayListInCache(hexKey)
(await findRelayListInCache(hexKey)) || || await findRelayListAndUpdateCache([this.specialMetadataRelay], hexKey)
(await findRelayListAndUpdateCache( || await findRelayListAndUpdateCache(await this.nostrController.getMostPopularRelays(), hexKey)
[this.specialMetadataRelay],
hexKey
)) ||
(await findRelayListAndUpdateCache(
await this.nostrController.getMostPopularRelays(),
hexKey
))
return relayEvent ? getUserRelaySet(relayEvent.tags) : getDefaultRelaySet() return relayEvent
? getUserRelaySet(relayEvent.tags)
: getDefaultRelaySet()
} }
public extractProfileMetadataContent = (event: Event) => { public extractProfileMetadataContent = (event: Event) => {

16
src/index.css
View File

@ -111,9 +111,7 @@ button:disabled {
/* Fonts */ /* Fonts */
@font-face { @font-face {
font-family: 'Roboto'; font-family: 'Roboto';
src: src: local('Roboto Medium'), local('Roboto-Medium'),
local('Roboto Medium'),
local('Roboto-Medium'),
url('assets/fonts/roboto-medium.woff2') format('woff2'), url('assets/fonts/roboto-medium.woff2') format('woff2'),
url('assets/fonts/roboto-medium.woff') format('woff'); url('assets/fonts/roboto-medium.woff') format('woff');
font-weight: 500; font-weight: 500;
@ -123,9 +121,7 @@ button:disabled {
@font-face { @font-face {
font-family: 'Roboto'; font-family: 'Roboto';
src: src: local('Roboto Light'), local('Roboto-Light'),
local('Roboto Light'),
local('Roboto-Light'),
url('assets/fonts/roboto-light.woff2') format('woff2'), url('assets/fonts/roboto-light.woff2') format('woff2'),
url('assets/fonts/roboto-light.woff') format('woff'); url('assets/fonts/roboto-light.woff') format('woff');
font-weight: 300; font-weight: 300;
@ -135,9 +131,7 @@ button:disabled {
@font-face { @font-face {
font-family: 'Roboto'; font-family: 'Roboto';
src: src: local('Roboto Bold'), local('Roboto-Bold'),
local('Roboto Bold'),
local('Roboto-Bold'),
url('assets/fonts/roboto-bold.woff2') format('woff2'), url('assets/fonts/roboto-bold.woff2') format('woff2'),
url('assets/fonts/roboto-bold.woff') format('woff'); url('assets/fonts/roboto-bold.woff') format('woff');
font-weight: bold; font-weight: bold;
@ -147,9 +141,7 @@ button:disabled {
@font-face { @font-face {
font-family: 'Roboto'; font-family: 'Roboto';
src: src: local('Roboto'), local('Roboto-Regular'),
local('Roboto'),
local('Roboto-Regular'),
url('assets/fonts/roboto-regular.woff2') format('woff2'), url('assets/fonts/roboto-regular.woff2') format('woff2'),
url('assets/fonts/roboto-regular.woff') format('woff'); url('assets/fonts/roboto-regular.woff') format('woff');
font-weight: normal; font-weight: normal;

25
src/pages/create/index.tsx
View File

@ -341,10 +341,9 @@ export const CreatePage = () => {
return fileHashes return fileHashes
} }
const createMarks = (fileHashes: { [key: string]: string }): Mark[] => { const createMarks = (fileHashes: { [key: string]: string }) : Mark[] => {
return drawnPdfs return drawnPdfs.flatMap((drawnPdf) => {
.flatMap((drawnPdf) => { const fileHash = fileHashes[drawnPdf.file.name];
const fileHash = fileHashes[drawnPdf.file.name]
return drawnPdf.pages.flatMap((page, index) => { return drawnPdf.pages.flatMap((page, index) => {
return page.drawnFields.map((drawnField) => { return page.drawnFields.map((drawnField) => {
return { return {
@ -354,7 +353,7 @@ export const CreatePage = () => {
top: drawnField.top, top: drawnField.top,
left: drawnField.left, left: drawnField.left,
height: drawnField.height, height: drawnField.height,
width: drawnField.width width: drawnField.width,
}, },
npub: drawnField.counterpart, npub: drawnField.counterpart,
pdfFileHash: fileHash pdfFileHash: fileHash
@ -363,8 +362,8 @@ export const CreatePage = () => {
}) })
}) })
.map((mark, index) => { .map((mark, index) => {
return { ...mark, id: index } return {...mark, id: index }
}) });
} }
// Handle errors during zip file generation // Handle errors during zip file generation
@ -432,9 +431,13 @@ export const CreatePage = () => {
if (!arraybuffer) return null if (!arraybuffer) return null
return new File([new Blob([arraybuffer])], `${unixNow}.sigit.zip`, { return new File(
[new Blob([arraybuffer])],
`${unixNow}.sigit.zip`,
{
type: 'application/zip' type: 'application/zip'
}) }
)
} }
// Handle errors during file upload // Handle errors during file upload
@ -542,7 +545,9 @@ export const CreatePage = () => {
: viewers.map((viewer) => viewer.pubkey) : viewers.map((viewer) => viewer.pubkey)
).filter((receiver) => receiver !== usersPubkey) ).filter((receiver) => receiver !== usersPubkey)
return receivers.map((receiver) => sendNotification(receiver, meta)) return receivers.map((receiver) =>
sendNotification(receiver, meta)
)
} }
const handleCreate = async () => { const handleCreate = async () => {

3
src/pages/settings/relays/index.tsx
View File

@ -91,8 +91,7 @@ export const RelaysPage = () => {
if (isMounted) { if (isMounted) {
if ( if (
!relaysState?.mapUpdated || !relaysState?.mapUpdated ||
(newRelayMap?.mapUpdated !== undefined && newRelayMap?.mapUpdated !== undefined && (newRelayMap?.mapUpdated > relaysState?.mapUpdated)
newRelayMap?.mapUpdated > relaysState?.mapUpdated)
) { ) {
if ( if (
!relaysState?.map || !relaysState?.map ||

6
src/pages/sign/MarkFormField.tsx
View File

@ -15,8 +15,8 @@ interface MarkFormFieldProps {
* Responsible for rendering a form field connected to a mark and keeping track of its value. * Responsible for rendering a form field connected to a mark and keeping track of its value.
*/ */
const MarkFormField = (props: MarkFormFieldProps) => { const MarkFormField = (props: MarkFormFieldProps) => {
const { handleSubmit, handleChange, selectedMark, selectedMarkValue } = props const { handleSubmit, handleChange, selectedMark, selectedMarkValue } = props;
const getSubmitButton = () => (selectedMark.isLast ? 'Complete' : 'Next') const getSubmitButton = () => selectedMark.isLast ? 'Complete' : 'Next';
return ( return (
<div className={styles.fixedBottomForm}> <div className={styles.fixedBottomForm}>
<Box component="form" onSubmit={handleSubmit}> <Box component="form" onSubmit={handleSubmit}>
@ -34,4 +34,4 @@ const MarkFormField = (props: MarkFormFieldProps) => {
) )
} }
export default MarkFormField export default MarkFormField;

60
src/pages/sign/index.tsx
View File

@ -16,16 +16,13 @@ import { State } from '../../store/rootReducer'
import { CreateSignatureEventContent, Meta, SignedEvent } from '../../types' import { CreateSignatureEventContent, Meta, SignedEvent } from '../../types'
import { import {
decryptArrayBuffer, decryptArrayBuffer,
encryptArrayBuffer, encryptArrayBuffer, extractMarksFromSignedMeta,
extractMarksFromSignedMeta,
extractZipUrlAndEncryptionKey, extractZipUrlAndEncryptionKey,
generateEncryptionKey, generateEncryptionKey,
generateKeysFile, generateKeysFile, getFilesWithHashes,
getFilesWithHashes,
getHash, getHash,
hexToNpub, hexToNpub,
isOnline, isOnline, loadZip,
loadZip,
now, now,
npubToHex, npubToHex,
parseJson, parseJson,
@ -44,8 +41,7 @@ import { getLastSignersSig } from '../../utils/sign.ts'
import { import {
filterMarksByPubkey, filterMarksByPubkey,
getCurrentUserMarks, getCurrentUserMarks,
isCurrentUserMarksComplete, isCurrentUserMarksComplete, updateMarks
updateMarks
} from '../../utils' } from '../../utils'
import PdfMarking from '../../components/PDFView/PdfMarking.tsx' import PdfMarking from '../../components/PDFView/PdfMarking.tsx'
enum SignedStatus { enum SignedStatus {
@ -85,7 +81,7 @@ export const SignPage = () => {
const [signers, setSigners] = useState<`npub1${string}`[]>([]) const [signers, setSigners] = useState<`npub1${string}`[]>([])
const [viewers, setViewers] = useState<`npub1${string}`[]>([]) const [viewers, setViewers] = useState<`npub1${string}`[]>([])
const [marks, setMarks] = useState<Mark[]>([]) const [marks, setMarks] = useState<Mark[] >([])
const [creatorFileHashes, setCreatorFileHashes] = useState<{ const [creatorFileHashes, setCreatorFileHashes] = useState<{
[key: string]: string [key: string]: string
}>({}) }>({})
@ -104,10 +100,8 @@ export const SignPage = () => {
const [authUrl, setAuthUrl] = useState<string>() const [authUrl, setAuthUrl] = useState<string>()
const nostrController = NostrController.getInstance() const nostrController = NostrController.getInstance()
const [currentUserMarks, setCurrentUserMarks] = useState<CurrentUserMark[]>( const [currentUserMarks, setCurrentUserMarks] = useState<CurrentUserMark[]>([]);
[] const [isReadyToSign, setIsReadyToSign] = useState(false);
)
const [isReadyToSign, setIsReadyToSign] = useState(false)
useEffect(() => { useEffect(() => {
if (signers.length > 0) { if (signers.length > 0) {
@ -198,16 +192,13 @@ export const SignPage = () => {
setViewers(createSignatureContent.viewers) setViewers(createSignatureContent.viewers)
setCreatorFileHashes(createSignatureContent.fileHashes) setCreatorFileHashes(createSignatureContent.fileHashes)
setSubmittedBy(createSignatureEvent.pubkey) setSubmittedBy(createSignatureEvent.pubkey)
setMarks(createSignatureContent.markConfig) setMarks(createSignatureContent.markConfig);
if (usersPubkey) { if (usersPubkey) {
const metaMarks = filterMarksByPubkey( const metaMarks = filterMarksByPubkey(createSignatureContent.markConfig, usersPubkey!)
createSignatureContent.markConfig,
usersPubkey!
)
const signedMarks = extractMarksFromSignedMeta(meta) const signedMarks = extractMarksFromSignedMeta(meta)
const currentUserMarks = getCurrentUserMarks(metaMarks, signedMarks) const currentUserMarks = getCurrentUserMarks(metaMarks, signedMarks);
setCurrentUserMarks(currentUserMarks) setCurrentUserMarks(currentUserMarks);
// setCurrentUserMark(findNextCurrentUserMark(currentUserMarks) || null) // setCurrentUserMark(findNextCurrentUserMark(currentUserMarks) || null)
setIsReadyToSign(isCurrentUserMarksComplete(currentUserMarks)) setIsReadyToSign(isCurrentUserMarksComplete(currentUserMarks))
} }
@ -316,7 +307,7 @@ export const SignPage = () => {
) )
if (arrayBuffer) { if (arrayBuffer) {
files[fileName] = await convertToPdfFile(arrayBuffer, fileName) files[fileName] = await convertToPdfFile(arrayBuffer, fileName);
const hash = await getHash(arrayBuffer) const hash = await getHash(arrayBuffer)
if (hash) { if (hash) {
@ -357,7 +348,7 @@ export const SignPage = () => {
const decrypt = async (file: File) => { const decrypt = async (file: File) => {
setLoadingSpinnerDesc('Decrypting file') setLoadingSpinnerDesc('Decrypting file')
const zip = await loadZip(file) const zip = await loadZip(file);
if (!zip) return if (!zip) return
const parsedKeysJson = await parseKeysJson(zip) const parsedKeysJson = await parseKeysJson(zip)
@ -448,7 +439,7 @@ export const SignPage = () => {
) )
if (arrayBuffer) { if (arrayBuffer) {
files[fileName] = await convertToPdfFile(arrayBuffer, fileName) files[fileName] = await convertToPdfFile(arrayBuffer, fileName);
const hash = await getHash(arrayBuffer) const hash = await getHash(arrayBuffer)
if (hash) { if (hash) {
@ -529,10 +520,7 @@ export const SignPage = () => {
} }
// Sign the event for the meta file // Sign the event for the meta file
const signEventForMeta = async (signerContent: { const signEventForMeta = async (signerContent: { prevSig: string, marks: Mark[] }) => {
prevSig: string
marks: Mark[]
}) => {
return await signEventForMetaFile( return await signEventForMetaFile(
JSON.stringify(signerContent), JSON.stringify(signerContent),
nostrController, nostrController,
@ -541,8 +529,8 @@ export const SignPage = () => {
} }
const getSignerMarksForMeta = (): Mark[] | undefined => { const getSignerMarksForMeta = (): Mark[] | undefined => {
if (currentUserMarks.length === 0) return if (currentUserMarks.length === 0) return;
return currentUserMarks.map(({ mark }: CurrentUserMark) => mark) return currentUserMarks.map(( { mark }: CurrentUserMark) => mark);
} }
// Update the meta signatures // Update the meta signatures
@ -612,9 +600,13 @@ export const SignPage = () => {
if (!arraybuffer) return null if (!arraybuffer) return null
return new File([new Blob([arraybuffer])], `${unixNow}.sigit.zip`, { return new File(
[new Blob([arraybuffer])],
`${unixNow}.sigit.zip`,
{
type: 'application/zip' type: 'application/zip'
}) }
)
} }
// Handle errors during zip file generation // Handle errors during zip file generation
@ -702,7 +694,7 @@ export const SignPage = () => {
setIsLoading(true) setIsLoading(true)
setLoadingSpinnerDesc('Signing nostr event') setLoadingSpinnerDesc('Signing nostr event')
if (!meta) return if (!meta) return;
const prevSig = getLastSignersSig(meta, signers) const prevSig = getLastSignersSig(meta, signers)
if (!prevSig) return if (!prevSig) return
@ -926,13 +918,11 @@ export const SignPage = () => {
) )
} }
return ( return <PdfMarking
<PdfMarking
files={getFilesWithHashes(files, currentFileHashes)} files={getFilesWithHashes(files, currentFileHashes)}
currentUserMarks={currentUserMarks} currentUserMarks={currentUserMarks}
setIsReadyToSign={setIsReadyToSign} setIsReadyToSign={setIsReadyToSign}
setCurrentUserMarks={setCurrentUserMarks} setCurrentUserMarks={setCurrentUserMarks}
setUpdatedMarks={setUpdatedMarks} setUpdatedMarks={setUpdatedMarks}
/> />
)
} }

31
src/pages/verify/index.tsx
View File

@ -23,17 +23,14 @@ import {
SignedEventContent SignedEventContent
} from '../../types' } from '../../types'
import { import {
decryptArrayBuffer, decryptArrayBuffer, extractMarksFromSignedMeta,
extractMarksFromSignedMeta,
extractZipUrlAndEncryptionKey, extractZipUrlAndEncryptionKey,
getHash, getHash,
hexToNpub, hexToNpub, now,
now,
npubToHex, npubToHex,
parseJson, parseJson,
readContentOfZipEntry, readContentOfZipEntry,
shorten, shorten, signEventForMetaFile
signEventForMetaFile
} from '../../utils' } from '../../utils'
import styles from './style.module.scss' import styles from './style.module.scss'
import { Cancel, CheckCircle } from '@mui/icons-material' import { Cancel, CheckCircle } from '@mui/icons-material'
@ -44,7 +41,7 @@ import {
addMarks, addMarks,
convertToPdfBlob, convertToPdfBlob,
convertToPdfFile, convertToPdfFile,
groupMarksByPage groupMarksByPage,
} from '../../utils/pdf.ts' } from '../../utils/pdf.ts'
import { State } from '../../store/rootReducer.ts' import { State } from '../../store/rootReducer.ts'
import { useSelector } from 'react-redux' import { useSelector } from 'react-redux'
@ -81,7 +78,7 @@ export const VerifyPage = () => {
const [currentFileHashes, setCurrentFileHashes] = useState<{ const [currentFileHashes, setCurrentFileHashes] = useState<{
[key: string]: string | null [key: string]: string | null
}>({}) }>({})
const [files, setFiles] = useState<{ [filename: string]: PdfFile }>({}) const [files, setFiles] = useState<{ [filename: string]: PdfFile}>({})
const [metadata, setMetadata] = useState<{ [key: string]: ProfileMetadata }>( const [metadata, setMetadata] = useState<{ [key: string]: ProfileMetadata }>(
{} {}
@ -158,10 +155,7 @@ export const VerifyPage = () => {
) )
if (arrayBuffer) { if (arrayBuffer) {
files[fileName] = await convertToPdfFile( files[fileName] = await convertToPdfFile(arrayBuffer, fileName!)
arrayBuffer,
fileName!
)
const hash = await getHash(arrayBuffer) const hash = await getHash(arrayBuffer)
if (hash) { if (hash) {
@ -175,6 +169,7 @@ export const VerifyPage = () => {
setCurrentFileHashes(fileHashes) setCurrentFileHashes(fileHashes)
setFiles(files) setFiles(files)
setSigners(createSignatureContent.signers) setSigners(createSignatureContent.signers)
setViewers(createSignatureContent.viewers) setViewers(createSignatureContent.viewers)
setCreatorFileHashes(createSignatureContent.fileHashes) setCreatorFileHashes(createSignatureContent.fileHashes)
@ -182,6 +177,8 @@ export const VerifyPage = () => {
setMeta(metaInNavState) setMeta(metaInNavState)
setIsLoading(false) setIsLoading(false)
} }
}) })
.catch((err) => { .catch((err) => {
@ -384,7 +381,7 @@ export const VerifyPage = () => {
} }
const handleExport = async () => { const handleExport = async () => {
if (Object.entries(files).length === 0 || !meta || !usersPubkey) return if (Object.entries(files).length === 0 ||!meta ||!usersPubkey) return;
const usersNpub = hexToNpub(usersPubkey) const usersNpub = hexToNpub(usersPubkey)
if ( if (
@ -398,10 +395,10 @@ export const VerifyPage = () => {
setIsLoading(true) setIsLoading(true)
setLoadingSpinnerDesc('Signing nostr event') setLoadingSpinnerDesc('Signing nostr event')
if (!meta) return if (!meta) return;
const prevSig = getLastSignersSig(meta, signers) const prevSig = getLastSignersSig(meta, signers)
if (!prevSig) return if (!prevSig) return;
const signedEvent = await signEventForMetaFile( const signedEvent = await signEventForMetaFile(
JSON.stringify({ prevSig }), JSON.stringify({ prevSig }),
@ -409,10 +406,10 @@ export const VerifyPage = () => {
setIsLoading setIsLoading
) )
if (!signedEvent) return if (!signedEvent) return;
const exportSignature = JSON.stringify(signedEvent, null, 2) const exportSignature = JSON.stringify(signedEvent, null, 2)
const updatedMeta = { ...meta, exportSignature } const updatedMeta = {...meta, exportSignature }
const stringifiedMeta = JSON.stringify(updatedMeta, null, 2) const stringifiedMeta = JSON.stringify(updatedMeta, null, 2)
const zip = new JSZip() const zip = new JSZip()

4
src/types/drawing.ts
View File

@ -9,7 +9,7 @@ export interface MouseState {
} }
export interface PdfFile { export interface PdfFile {
file: File file: File,
pages: PdfPage[] pages: PdfPage[]
expanded?: boolean expanded?: boolean
} }
@ -34,7 +34,7 @@ export interface DrawnField {
export interface DrawTool { export interface DrawTool {
identifier: MarkType identifier: MarkType
label: string label: string
icon: JSX.Element icon: JSX.Element,
defaultValue?: string defaultValue?: string
selected?: boolean selected?: boolean
active?: boolean active?: boolean

24
src/types/mark.ts
View File

@ -1,4 +1,4 @@
import { MarkType } from './drawing' import { MarkType } from "./drawing";
export interface CurrentUserMark { export interface CurrentUserMark {
mark: Mark mark: Mark
@ -7,18 +7,18 @@ export interface CurrentUserMark {
} }
export interface Mark { export interface Mark {
id: number id: number;
npub: string npub: string;
pdfFileHash: string pdfFileHash: string;
type: MarkType type: MarkType;
location: MarkLocation location: MarkLocation;
value?: string value?: string;
} }
export interface MarkLocation { export interface MarkLocation {
top: number top: number;
left: number left: number;
height: number height: number;
width: number width: number;
page: number page: number;
} }

24
src/types/zip.ts
View File

@ -1,4 +1,4 @@
export interface OutputByType { export interface OutputByType {
base64: string base64: string
string: string string: string
text: string text: string
@ -11,18 +11,16 @@ export interface OutputByType {
} }
interface InputByType { interface InputByType {
base64: string base64: string;
string: string string: string;
text: string text: string;
binarystring: string binarystring: string;
array: number[] array: number[];
uint8array: Uint8Array uint8array: Uint8Array;
arraybuffer: ArrayBuffer arraybuffer: ArrayBuffer;
blob: Blob blob: Blob;
stream: NodeJS.ReadableStream stream: NodeJS.ReadableStream;
} }
export type OutputType = keyof OutputByType export type OutputType = keyof OutputByType
export type InputFileFormat = export type InputFileFormat = InputByType[keyof InputByType] | Promise<InputByType[keyof InputByType]>;
| InputByType[keyof InputByType]
| Promise<InputByType[keyof InputByType]>

34
src/utils/mark.ts
View File

@ -9,12 +9,9 @@ import { Event } from 'nostr-tools'
* @param marks - default Marks extracted from Meta * @param marks - default Marks extracted from Meta
* @param signedMetaMarks - signed user Marks extracted from DocSignatures * @param signedMetaMarks - signed user Marks extracted from DocSignatures
*/ */
const getCurrentUserMarks = ( const getCurrentUserMarks = (marks: Mark[], signedMetaMarks: Mark[]): CurrentUserMark[] => {
marks: Mark[],
signedMetaMarks: Mark[]
): CurrentUserMark[] => {
return marks.map((mark, index, arr) => { return marks.map((mark, index, arr) => {
const signedMark = signedMetaMarks.find((m) => m.id === mark.id) const signedMark = signedMetaMarks.find((m) => m.id === mark.id);
if (signedMark && !!signedMark.value) { if (signedMark && !!signedMark.value) {
mark.value = signedMark.value mark.value = signedMark.value
} }
@ -30,10 +27,8 @@ const getCurrentUserMarks = (
* Returns next incomplete CurrentUserMark if there is one * Returns next incomplete CurrentUserMark if there is one
* @param usersMarks * @param usersMarks
*/ */
const findNextCurrentUserMark = ( const findNextCurrentUserMark = (usersMarks: CurrentUserMark[]): CurrentUserMark | undefined => {
usersMarks: CurrentUserMark[] return usersMarks.find((mark) => !mark.isCompleted);
): CurrentUserMark | undefined => {
return usersMarks.find((mark) => !mark.isCompleted)
} }
/** /**
@ -42,7 +37,7 @@ const findNextCurrentUserMark = (
* @param pubkey * @param pubkey
*/ */
const filterMarksByPubkey = (marks: Mark[], pubkey: string): Mark[] => { const filterMarksByPubkey = (marks: Mark[], pubkey: string): Mark[] => {
return marks.filter((mark) => mark.npub === hexToNpub(pubkey)) return marks.filter(mark => mark.npub === hexToNpub(pubkey))
} }
/** /**
@ -62,9 +57,7 @@ const extractMarksFromSignedMeta = (meta: Meta): Mark[] => {
* marked as complete. * marked as complete.
* @param currentUserMarks * @param currentUserMarks
*/ */
const isCurrentUserMarksComplete = ( const isCurrentUserMarksComplete = (currentUserMarks: CurrentUserMark[]): boolean => {
currentUserMarks: CurrentUserMark[]
): boolean => {
return currentUserMarks.every((mark) => mark.isCompleted) return currentUserMarks.every((mark) => mark.isCompleted)
} }
@ -75,7 +68,7 @@ const isCurrentUserMarksComplete = (
* @param markToUpdate * @param markToUpdate
*/ */
const updateMarks = (marks: Mark[], markToUpdate: Mark): Mark[] => { const updateMarks = (marks: Mark[], markToUpdate: Mark): Mark[] => {
const indexToUpdate = marks.findIndex((mark) => mark.id === markToUpdate.id) const indexToUpdate = marks.findIndex(mark => mark.id === markToUpdate.id);
return [ return [
...marks.slice(0, indexToUpdate), ...marks.slice(0, indexToUpdate),
markToUpdate, markToUpdate,
@ -83,13 +76,8 @@ const updateMarks = (marks: Mark[], markToUpdate: Mark): Mark[] => {
] ]
} }
const updateCurrentUserMarks = ( const updateCurrentUserMarks = (currentUserMarks: CurrentUserMark[], markToUpdate: CurrentUserMark): CurrentUserMark[] => {
currentUserMarks: CurrentUserMark[], const indexToUpdate = currentUserMarks.findIndex((m) => m.mark.id === markToUpdate.mark.id)
markToUpdate: CurrentUserMark
): CurrentUserMark[] => {
const indexToUpdate = currentUserMarks.findIndex(
(m) => m.mark.id === markToUpdate.mark.id
)
return [ return [
...currentUserMarks.slice(0, indexToUpdate), ...currentUserMarks.slice(0, indexToUpdate),
markToUpdate, markToUpdate,
@ -97,7 +85,7 @@ const updateCurrentUserMarks = (
] ]
} }
const isLast = <T>(index: number, arr: T[]) => index === arr.length - 1 const isLast = <T>(index: number, arr: T[]) => (index === (arr.length -1))
export { export {
getCurrentUserMarks, getCurrentUserMarks,
@ -106,5 +94,5 @@ export {
isCurrentUserMarksComplete, isCurrentUserMarksComplete,
findNextCurrentUserMark, findNextCurrentUserMark,
updateMarks, updateMarks,
updateCurrentUserMarks updateCurrentUserMarks,
} }

133
src/utils/pdf.ts
View File

@ -3,14 +3,13 @@ import * as PDFJS from 'pdfjs-dist'
import { PDFDocument } from 'pdf-lib' import { PDFDocument } from 'pdf-lib'
import { Mark } from '../types/mark.ts' import { Mark } from '../types/mark.ts'
PDFJS.GlobalWorkerOptions.workerSrc = PDFJS.GlobalWorkerOptions.workerSrc = 'node_modules/pdfjs-dist/build/pdf.worker.mjs';
'node_modules/pdfjs-dist/build/pdf.worker.mjs'
/** /**
* Scale between the PDF page's natural size and rendered size * Scale between the PDF page's natural size and rendered size
* @constant {number} * @constant {number}
*/ */
const SCALE: number = 3 const SCALE: number = 3;
/** /**
* Defined font size used when generating a PDF. Currently it is difficult to fully * Defined font size used when generating a PDF. Currently it is difficult to fully
* correlate font size used at the time of filling in / drawing on the PDF * correlate font size used at the time of filling in / drawing on the PDF
@ -18,20 +17,20 @@ const SCALE: number = 3
* This should be fixed going forward. * This should be fixed going forward.
* Switching to PDF-Lib will most likely make this problem redundant. * Switching to PDF-Lib will most likely make this problem redundant.
*/ */
const FONT_SIZE: number = 40 const FONT_SIZE: number = 40;
/** /**
* Current font type used when generating a PDF. * Current font type used when generating a PDF.
*/ */
const FONT_TYPE: string = 'Arial' const FONT_TYPE: string = 'Arial';
/** /**
* Converts a PDF ArrayBuffer to a generic PDF File * Converts a PDF ArrayBuffer to a generic PDF File
* @param arrayBuffer of a PDF * @param arrayBuffer of a PDF
* @param fileName identifier of the pdf file * @param fileName identifier of the pdf file
*/ */
const toFile = (arrayBuffer: ArrayBuffer, fileName: string): File => { const toFile = (arrayBuffer: ArrayBuffer, fileName: string) : File => {
const blob = new Blob([arrayBuffer], { type: 'application/pdf' }) const blob = new Blob([arrayBuffer], { type: "application/pdf" });
return new File([blob], fileName, { type: 'application/pdf' }) return new File([blob], fileName, { type: "application/pdf" });
} }
/** /**
@ -51,40 +50,42 @@ const toPdfFile = async (file: File): Promise<PdfFile> => {
* @return PdfFile[] - an array of Sigit's internal Pdf File type * @return PdfFile[] - an array of Sigit's internal Pdf File type
*/ */
const toPdfFiles = async (selectedFiles: File[]): Promise<PdfFile[]> => { const toPdfFiles = async (selectedFiles: File[]): Promise<PdfFile[]> => {
return Promise.all(selectedFiles.filter(isPdf).map(toPdfFile)) return Promise.all(selectedFiles
.filter(isPdf)
.map(toPdfFile));
} }
/** /**
* A utility that transforms a drawing coordinate number into a CSS-compatible string * A utility that transforms a drawing coordinate number into a CSS-compatible string
* @param coordinate * @param coordinate
*/ */
const inPx = (coordinate: number): string => `${coordinate}px` const inPx = (coordinate: number): string => `${coordinate}px`;
/** /**
* A utility that checks if a given file is of the pdf type * A utility that checks if a given file is of the pdf type
* @param file * @param file
*/ */
const isPdf = (file: File) => file.type.toLowerCase().includes('pdf') const isPdf = (file: File) => file.type.toLowerCase().includes('pdf');
/** /**
* Reads the pdf file binaries * Reads the pdf file binaries
*/ */
const readPdf = (file: File): Promise<string> => { const readPdf = (file: File): Promise<string> => {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
const reader = new FileReader() const reader = new FileReader();
reader.onload = (e: any) => { reader.onload = (e: any) => {
const data = e.target.result const data = e.target.result
resolve(data) resolve(data)
} };
reader.onerror = (err) => { reader.onerror = (err) => {
console.error('err', err) console.error('err', err)
reject(err) reject(err)
} };
reader.readAsDataURL(file) reader.readAsDataURL(file);
}) })
} }
@ -93,28 +94,26 @@ const readPdf = (file: File): Promise<string> => {
* @param data pdf file bytes * @param data pdf file bytes
*/ */
const pdfToImages = async (data: any): Promise<PdfPage[]> => { const pdfToImages = async (data: any): Promise<PdfPage[]> => {
const images: string[] = [] const images: string[] = [];
const pdf = await PDFJS.getDocument(data).promise const pdf = await PDFJS.getDocument(data).promise;
const canvas = document.createElement('canvas') const canvas = document.createElement("canvas");
for (let i = 0; i < pdf.numPages; i++) { for (let i = 0; i < pdf.numPages; i++) {
const page = await pdf.getPage(i + 1) const page = await pdf.getPage(i + 1);
const viewport = page.getViewport({ scale: SCALE }) const viewport = page.getViewport({ scale: SCALE });
const context = canvas.getContext('2d') const context = canvas.getContext("2d");
canvas.height = viewport.height canvas.height = viewport.height;
canvas.width = viewport.width canvas.width = viewport.width;
await page.render({ canvasContext: context!, viewport: viewport }).promise await page.render({ canvasContext: context!, viewport: viewport }).promise;
images.push(canvas.toDataURL()) images.push(canvas.toDataURL());
} }
return Promise.resolve( return Promise.resolve(images.map((image) => {
images.map((image) => {
return { return {
image, image,
drawnFields: [] drawnFields: []
} }
}) }))
)
} }
/** /**
@ -122,37 +121,34 @@ const pdfToImages = async (data: any): Promise<PdfPage[]> => {
* Returns an array of encoded images where each image is a representation * Returns an array of encoded images where each image is a representation
* of a PDF page with completed and signed marks from all users * of a PDF page with completed and signed marks from all users
*/ */
const addMarks = async ( const addMarks = async (file: File, marksPerPage: {[key: string]: Mark[]}) => {
file: File, const p = await readPdf(file);
marksPerPage: { [key: string]: Mark[] } const pdf = await PDFJS.getDocument(p).promise;
) => { const canvas = document.createElement("canvas");
const p = await readPdf(file)
const pdf = await PDFJS.getDocument(p).promise
const canvas = document.createElement('canvas')
const images: string[] = [] const images: string[] = [];
for (let i = 0; i < pdf.numPages; i++) { for (let i = 0; i< pdf.numPages; i++) {
const page = await pdf.getPage(i + 1) const page = await pdf.getPage(i+1)
const viewport = page.getViewport({ scale: SCALE }) const viewport = page.getViewport({ scale: SCALE });
const context = canvas.getContext('2d') const context = canvas.getContext("2d");
canvas.height = viewport.height canvas.height = viewport.height;
canvas.width = viewport.width canvas.width = viewport.width;
await page.render({ canvasContext: context!, viewport: viewport }).promise await page.render({ canvasContext: context!, viewport: viewport }).promise;
marksPerPage[i].forEach((mark) => draw(mark, context!)) marksPerPage[i].forEach(mark => draw(mark, context!))
images.push(canvas.toDataURL()) images.push(canvas.toDataURL());
} }
return Promise.resolve(images) return Promise.resolve(images);
} }
/** /**
* Utility to scale mark in line with the PDF-to-PNG scale * Utility to scale mark in line with the PDF-to-PNG scale
*/ */
const scaleMark = (mark: Mark): Mark => { const scaleMark = (mark: Mark): Mark => {
const { location } = mark const { location } = mark;
return { return {
...mark, ...mark,
location: { location: {
@ -169,7 +165,7 @@ const scaleMark = (mark: Mark): Mark => {
* Utility to check if a Mark has value * Utility to check if a Mark has value
* @param mark * @param mark
*/ */
const hasValue = (mark: Mark): boolean => !!mark.value const hasValue = (mark: Mark): boolean => !!mark.value;
/** /**
* Draws a Mark on a Canvas representation of a PDF Page * Draws a Mark on a Canvas representation of a PDF Page
@ -177,14 +173,14 @@ const hasValue = (mark: Mark): boolean => !!mark.value
* @param ctx a Canvas representation of a specific PDF Page * @param ctx a Canvas representation of a specific PDF Page
*/ */
const draw = (mark: Mark, ctx: CanvasRenderingContext2D) => { const draw = (mark: Mark, ctx: CanvasRenderingContext2D) => {
const { location } = mark const { location } = mark;
ctx!.font = FONT_SIZE + 'px ' + FONT_TYPE ctx!.font = FONT_SIZE + 'px ' + FONT_TYPE;
ctx!.fillStyle = 'black' ctx!.fillStyle = 'black';
const textMetrics = ctx!.measureText(mark.value!) const textMetrics = ctx!.measureText(mark.value!);
const textX = location.left + (location.width - textMetrics.width) / 2 const textX = location.left + (location.width - textMetrics.width) / 2;
const textY = location.top + (location.height + parseInt(ctx!.font)) / 2 const textY = location.top + (location.height + parseInt(ctx!.font)) / 2;
ctx!.fillText(mark.value!, textX, textY) ctx!.fillText(mark.value!, textX, textY);
} }
/** /**
@ -192,7 +188,7 @@ const draw = (mark: Mark, ctx: CanvasRenderingContext2D) => {
* @param markedPdfPages * @param markedPdfPages
*/ */
const convertToPdfBlob = async (markedPdfPages: string[]): Promise<Blob> => { const convertToPdfBlob = async (markedPdfPages: string[]): Promise<Blob> => {
const pdfDoc = await PDFDocument.create() const pdfDoc = await PDFDocument.create();
for (const page of markedPdfPages) { for (const page of markedPdfPages) {
const pngImage = await pdfDoc.embedPng(page) const pngImage = await pdfDoc.embedPng(page)
@ -207,6 +203,7 @@ const convertToPdfBlob = async (markedPdfPages: string[]): Promise<Blob> => {
const pdfBytes = await pdfDoc.save() const pdfBytes = await pdfDoc.save()
return new Blob([pdfBytes], { type: 'application/pdf' }) return new Blob([pdfBytes], { type: 'application/pdf' })
} }
/** /**
@ -214,12 +211,9 @@ const convertToPdfBlob = async (markedPdfPages: string[]): Promise<Blob> => {
* @param arrayBuffer * @param arrayBuffer
* @param fileName * @param fileName
*/ */
const convertToPdfFile = async ( const convertToPdfFile = async (arrayBuffer: ArrayBuffer, fileName: string): Promise<PdfFile> => {
arrayBuffer: ArrayBuffer, const file = toFile(arrayBuffer, fileName);
fileName: string return toPdfFile(file);
): Promise<PdfFile> => {
const file = toFile(arrayBuffer, fileName)
return toPdfFile(file)
} }
/** /**
@ -232,7 +226,7 @@ const groupMarksByPage = (marks: Mark[]) => {
return marks return marks
.filter(hasValue) .filter(hasValue)
.map(scaleMark) .map(scaleMark)
.reduce<{ [key: number]: Mark[] }>(byPage, {}) .reduce<{[key: number]: Mark[]}>(byPage, {})
} }
/** /**
@ -243,10 +237,11 @@ const groupMarksByPage = (marks: Mark[]) => {
* @param obj - accumulator in the reducer callback * @param obj - accumulator in the reducer callback
* @param mark - current value, i.e. Mark being examined * @param mark - current value, i.e. Mark being examined
*/ */
const byPage = (obj: { [key: number]: Mark[] }, mark: Mark) => { const byPage = (obj: { [key: number]: Mark[]}, mark: Mark) => {
const key = mark.location.page const key = mark.location.page;
const curGroup = obj[key] ?? [] const curGroup = obj[key] ?? [];
return { ...obj, [key]: [...curGroup, mark] } return { ...obj, [key]: [...curGroup, mark]
}
} }
export { export {
@ -257,5 +252,5 @@ export {
convertToPdfFile, convertToPdfFile,
addMarks, addMarks,
convertToPdfBlob, convertToPdfBlob,
groupMarksByPage groupMarksByPage,
} }

19
src/utils/relays.ts
View File

@ -5,8 +5,8 @@ import { localCache } from '../services'
import { ONE_WEEK_IN_MS, SIGIT_RELAY } from './const.ts' import { ONE_WEEK_IN_MS, SIGIT_RELAY } from './const.ts'
import { RelayMap, RelaySet } from '../types' import { RelayMap, RelaySet } from '../types'
const READ_MARKER = 'read' const READ_MARKER = "read"
const WRITE_MARKET = 'write' const WRITE_MARKET = "write"
/** /**
* Attempts to find a relay list from the provided lookUpRelays. * Attempts to find a relay list from the provided lookUpRelays.
@ -15,10 +15,7 @@ const WRITE_MARKET = 'write'
* @param hexKey * @param hexKey
* @return found relay list or null * @return found relay list or null
*/ */
const findRelayListAndUpdateCache = async ( const findRelayListAndUpdateCache = async (lookUpRelays: string[], hexKey: string): Promise<Event | null> => {
lookUpRelays: string[],
hexKey: string
): Promise<Event | null> => {
try { try {
const eventFilter: Filter = { const eventFilter: Filter = {
kinds: [RelayList], kinds: [RelayList],
@ -45,14 +42,10 @@ const findRelayListAndUpdateCache = async (
const findRelayListInCache = async (hexKey: string): Promise<Event | null> => { const findRelayListInCache = async (hexKey: string): Promise<Event | null> => {
try { try {
// Attempt to retrieve the metadata event from the local cache // Attempt to retrieve the metadata event from the local cache
const cachedRelayListMetadataEvent = const cachedRelayListMetadataEvent = await localCache.getUserRelayListMetadata(hexKey)
await localCache.getUserRelayListMetadata(hexKey)
// Check if the cached event is not older than one week // Check if the cached event is not older than one week
if ( if (cachedRelayListMetadataEvent && isOlderThanOneWeek(cachedRelayListMetadataEvent.cachedAt)) {
cachedRelayListMetadataEvent &&
isOlderThanOneWeek(cachedRelayListMetadataEvent.cachedAt)
) {
return cachedRelayListMetadataEvent.event return cachedRelayListMetadataEvent.event
} }
@ -111,5 +104,5 @@ export {
findRelayListInCache, findRelayListInCache,
getUserRelaySet, getUserRelaySet,
getDefaultRelaySet, getDefaultRelaySet,
getDefaultRelayMap getDefaultRelayMap,
} }

9
src/utils/sign.ts
View File

@ -5,10 +5,7 @@ import { Meta } from '../types'
* This function returns the signature of last signer * This function returns the signature of last signer
* It will be used in the content of export signature's signedEvent * It will be used in the content of export signature's signedEvent
*/ */
const getLastSignersSig = ( const getLastSignersSig = (meta: Meta, signers: `npub1${string}`[]): string | null => {
meta: Meta,
signers: `npub1${string}`[]
): string | null => {
// if there're no signers then use creator's signature // if there're no signers then use creator's signature
if (signers.length === 0) { if (signers.length === 0) {
try { try {
@ -24,7 +21,9 @@ const getLastSignersSig = (
// get the signature of last signer // get the signature of last signer
try { try {
const lastSignatureEvent: Event = JSON.parse(meta.docSignatures[lastSigner]) const lastSignatureEvent: Event = JSON.parse(
meta.docSignatures[lastSigner]
)
return lastSignatureEvent.sig return lastSignatureEvent.sig
} catch (error) { } catch (error) {
return null return null

4
src/utils/utils.ts
View File

@ -73,9 +73,9 @@ export const timeout = (ms: number = 60000) => {
* @param fileHashes * @param fileHashes
*/ */
export const getFilesWithHashes = ( export const getFilesWithHashes = (
files: { [filename: string]: PdfFile }, files: { [filename: string ]: PdfFile },
fileHashes: { [key: string]: string | null } fileHashes: { [key: string]: string | null }
) => { ) => {
return Object.entries(files).map(([filename, pdfFile]) => { return Object.entries(files).map(([filename, pdfFile]) => {
return { pdfFile, filename, hash: fileHashes[filename] } return { pdfFile, filename, hash: fileHashes[filename] }
}) })

11
src/utils/zip.ts
View File

@ -36,12 +36,17 @@ const readContentOfZipEntry = async <T extends OutputType>(
const loadZip = async (data: InputFileFormat): Promise<JSZip | null> => { const loadZip = async (data: InputFileFormat): Promise<JSZip | null> => {
try { try {
return await JSZip.loadAsync(data) return await JSZip.loadAsync(data);
} catch (err: any) { } catch (err: any) {
console.log('err in loading zip file :>> ', err) console.log('err in loading zip file :>> ', err)
toast.error(err.message || 'An error occurred in loading zip file.') toast.error(err.message || 'An error occurred in loading zip file.')
return null return null;
} }
} }
export { readContentOfZipEntry, loadZip } export {
readContentOfZipEntry,
loadZip
}