Releasing new design #161

Merged
b merged 241 commits from staging into main 2024-08-21 11:38:25 +00:00
2 changed files with 9 additions and 3 deletions
Showing only changes of commit 2becab9f79 - Show all commits

View File

@ -14,6 +14,8 @@ import styles from './style.module.scss'
import { CurrentUserFile } from '../../types/file.ts' import { CurrentUserFile } from '../../types/file.ts'
import FileList from '../FileList' import FileList from '../FileList'
import { StickySideColumns } from '../../layouts/StickySideColumns.tsx' import { StickySideColumns } from '../../layouts/StickySideColumns.tsx'
import { UsersDetails } from '../UsersDetails.tsx'
import { Meta } from '../../types'
interface PdfMarkingProps { interface PdfMarkingProps {
files: CurrentUserFile[] files: CurrentUserFile[]
@ -22,6 +24,7 @@ interface PdfMarkingProps {
setCurrentUserMarks: (currentUserMarks: CurrentUserMark[]) => void setCurrentUserMarks: (currentUserMarks: CurrentUserMark[]) => void
setUpdatedMarks: (markToUpdate: Mark) => void setUpdatedMarks: (markToUpdate: Mark) => void
handleDownload: () => void handleDownload: () => void
meta: Meta | null
} }
/** /**
@ -37,7 +40,8 @@ const PdfMarking = (props: PdfMarkingProps) => {
setIsReadyToSign, setIsReadyToSign,
setCurrentUserMarks, setCurrentUserMarks,
setUpdatedMarks, setUpdatedMarks,
handleDownload handleDownload,
meta
} = 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>('')
@ -81,8 +85,8 @@ const PdfMarking = (props: PdfMarkingProps) => {
} }
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 = getUpdatedMark( const updatedMark: CurrentUserMark = getUpdatedMark(
selectedMark, selectedMark,
@ -126,6 +130,7 @@ const PdfMarking = (props: PdfMarkingProps) => {
)} )}
</div> </div>
} }
right={meta !== null && <UsersDetails meta={meta} />}
> >
<div className={styles.container}> <div className={styles.container}>
{currentUserMarks?.length > 0 && ( {currentUserMarks?.length > 0 && (

View File

@ -958,6 +958,7 @@ export const SignPage = () => {
setCurrentUserMarks={setCurrentUserMarks} setCurrentUserMarks={setCurrentUserMarks}
setUpdatedMarks={setUpdatedMarks} setUpdatedMarks={setUpdatedMarks}
handleDownload={handleDownload} handleDownload={handleDownload}
meta={meta}
/> />
) )
} }