sigit/sigit.io
7
2
Fork 0
Code Issues 51 Pull Requests 3 Actions Packages Projects 1 Releases Wiki Activity

fix: #201, #145, #205 and additional fixes #206

Merged
enes merged 14 commits from 201-toolbox-update into staging 2024-09-30 14:20:07 +00:00
Conversation 0 Commits 14 Files Changed 11 +83 -95
1 changed files with 83 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f8a4480994 - Show all commits

178
src/utils/mark.ts
View File

@ -9,20 +9,8 @@ import {
faSignature, faSignature,
faBriefcase, faBriefcase,
faIdCard, faIdCard,
faHeading,
faClock, faClock,
faCalendarDays, fa1
fa1,
faImage,
faSquareCheck,
faCheckDouble,
faPaperclip,
faCircleDot,
faSquareCaretDown,
faTableCellsLarge,
faStamp,
faCreditCard,
faPhone
} from '@fortawesome/free-solid-svg-icons' } from '@fortawesome/free-solid-svg-icons'
/** /**
@ -154,15 +142,9 @@ const findOtherUserMarks = (marks: Mark[], pubkey: string): Mark[] => {
export const DEFAULT_TOOLBOX = [ export const DEFAULT_TOOLBOX = [
{ {
identifier: MarkType.TEXT, identifier: MarkType.FULLNAME,
icon: faT, icon: faIdCard,
label: 'Text', label: 'Full Name',
active: true
},
{
identifier: MarkType.SIGNATURE,
icon: faSignature,
label: 'Signature',
active: false active: false
}, },
{ {
@ -172,15 +154,9 @@ export const DEFAULT_TOOLBOX = [
active: false active: false
}, },
{ {
identifier: MarkType.FULLNAME, identifier: MarkType.SIGNATURE,
icon: faIdCard, icon: faSignature,
label: 'Full Name', label: 'Signature',
active: false
},
{
identifier: MarkType.INITIALS,
icon: faHeading,
label: 'Initials',
active: false active: false
}, },
{ {
@ -190,77 +166,89 @@ export const DEFAULT_TOOLBOX = [
active: false active: false
}, },
{ {
identifier: MarkType.DATE, identifier: MarkType.TEXT,
icon: faCalendarDays, icon: faT,
label: 'Date', label: 'Text',
active: false active: true
}, },
{ {
identifier: MarkType.NUMBER, identifier: MarkType.NUMBER,
icon: fa1, icon: fa1,
label: 'Number', label: 'Number',
active: false active: false
},
{
identifier: MarkType.IMAGES,
icon: faImage,
label: 'Images',
active: false
},
{
identifier: MarkType.CHECKBOX,
icon: faSquareCheck,
label: 'Checkbox',
active: false
},
{
identifier: MarkType.MULTIPLE,
icon: faCheckDouble,
label: 'Multiple',
active: false
},
{
identifier: MarkType.FILE,
icon: faPaperclip,
label: 'File',
active: false
},
{
identifier: MarkType.RADIO,
icon: faCircleDot,
label: 'Radio',
active: false
},
{
identifier: MarkType.SELECT,
icon: faSquareCaretDown,
label: 'Select',
active: false
},
{
identifier: MarkType.CELLS,
icon: faTableCellsLarge,
label: 'Cells',
active: false
},
{
identifier: MarkType.STAMP,
icon: faStamp,
label: 'Stamp',
active: false
},
{
identifier: MarkType.PAYMENT,
icon: faCreditCard,
label: 'Payment',
active: false
},
{
identifier: MarkType.PHONE,
icon: faPhone,
label: 'Phone',
active: false
} }
// {
eugene commented 2024-09-18 09:47:04 +00:00
Outdated
Review
Copy Link

Can we rely on the active flag rather than commenting out?

Can we rely on the `active` flag rather than commenting out?
enes commented 2024-09-18 09:54:12 +00:00
Outdated
Review
Copy Link

The active flag is for coming soon currently, and instead of adding a new flag to differentiate between coming soon and visually hidden, I opted to comment out.

The active flag is for `coming soon` currently, and instead of adding a new flag to differentiate between coming soon and visually hidden, I opted to comment out.
eugene commented 2024-09-19 10:32:09 +00:00
Outdated
Review
Copy Link

Can you please add a comment to capture the difference in the codebase?

Can you please add a comment to capture the difference in the codebase?
enes commented 2024-09-19 11:18:05 +00:00
Outdated
Review
Copy Link

Okay, made it clearer with new property names, isHidden and isComingSoon so there is no confusion as with active (also removed comments and used isHidden instead).

Okay, made it clearer with new property names, `isHidden` and `isComingSoon` so there is no confusion as with `active` (also removed comments and used `isHidden` instead).
// identifier: MarkType.INITIALS,
// icon: faHeading,
// label: 'Initials',
// active: false
// },
// {
// identifier: MarkType.DATE,
// icon: faCalendarDays,
// label: 'Date',
// active: false
// },
// {
// identifier: MarkType.IMAGES,
// icon: faImage,
// label: 'Images',
// active: false
// },
// {
// identifier: MarkType.CHECKBOX,
// icon: faSquareCheck,
// label: 'Checkbox',
// active: false
// },
// {
// identifier: MarkType.MULTIPLE,
// icon: faCheckDouble,
// label: 'Multiple',
// active: false
// },
// {
// identifier: MarkType.FILE,
// icon: faPaperclip,
// label: 'File',
// active: false
// },
// {
// identifier: MarkType.RADIO,
// icon: faCircleDot,
// label: 'Radio',
// active: false
// },
// {
// identifier: MarkType.SELECT,
// icon: faSquareCaretDown,
// label: 'Select',
// active: false
// },
// {
// identifier: MarkType.CELLS,
// icon: faTableCellsLarge,
// label: 'Cells',
// active: false
// },
// {
// identifier: MarkType.STAMP,
// icon: faStamp,
// label: 'Stamp',
// active: false
// },
// {
// identifier: MarkType.PAYMENT,
// icon: faCreditCard,
// label: 'Payment',
// active: false
// },
// {
// identifier: MarkType.PHONE,
// icon: faPhone,
// label: 'Phone',
// active: false
// }
] ]
export const getToolboxLabelByMarkType = (markType: MarkType) => { export const getToolboxLabelByMarkType = (markType: MarkType) => {