diff --git a/public/fonts/Alex_Brush/AlexBrush-Regular.ttf b/public/fonts/Alex_Brush/AlexBrush-Regular.ttf new file mode 100644 index 0000000..5d98cd8 Binary files /dev/null and b/public/fonts/Alex_Brush/AlexBrush-Regular.ttf differ diff --git a/public/fonts/Alex_Brush/OFL.txt b/public/fonts/Alex_Brush/OFL.txt new file mode 100644 index 0000000..ebe3f91 --- /dev/null +++ b/public/fonts/Alex_Brush/OFL.txt @@ -0,0 +1,93 @@ +Copyright 2011 The Alex Brush Project Authors (https://github.com/googlefonts/alex-brush) + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +https://openfontlicense.org + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/public/fonts/Allura/Allura-Regular.ttf b/public/fonts/Allura/Allura-Regular.ttf new file mode 100644 index 0000000..c3b66ac Binary files /dev/null and b/public/fonts/Allura/Allura-Regular.ttf differ diff --git a/public/fonts/Allura/OFL.txt b/public/fonts/Allura/OFL.txt new file mode 100644 index 0000000..e80468f --- /dev/null +++ b/public/fonts/Allura/OFL.txt @@ -0,0 +1,93 @@ +Copyright 2010 The Allura Project Authors (https://github.com/googlefonts/allura) + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +https://openfontlicense.org + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/public/fonts/Dancing_Script/DancingScript-VariableFont_wght.ttf b/public/fonts/Dancing_Script/DancingScript-VariableFont_wght.ttf new file mode 100644 index 0000000..5c0f61a Binary files /dev/null and b/public/fonts/Dancing_Script/DancingScript-VariableFont_wght.ttf differ diff --git a/public/fonts/Dancing_Script/OFL.txt b/public/fonts/Dancing_Script/OFL.txt new file mode 100644 index 0000000..e37b1e8 --- /dev/null +++ b/public/fonts/Dancing_Script/OFL.txt @@ -0,0 +1,93 @@ +Copyright 2016 The Dancing Script Project Authors (https://github.com/googlefonts/DancingScript), with Reserved Font Name 'Dancing Script'. + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +https://openfontlicense.org + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/public/fonts/Dancing_Script/README.txt b/public/fonts/Dancing_Script/README.txt new file mode 100644 index 0000000..179cb42 --- /dev/null +++ b/public/fonts/Dancing_Script/README.txt @@ -0,0 +1,66 @@ +Dancing Script Variable Font +============================ + +This download contains Dancing Script as both a variable font and static fonts. + +Dancing Script is a variable font with this axis: + wght + +This means all the styles are contained in a single file: + Dancing_Script/DancingScript-VariableFont_wght.ttf + +If your app fully supports variable fonts, you can now pick intermediate styles +that aren’t available as static fonts. Not all apps support variable fonts, and +in those cases you can use the static font files for Dancing Script: + Dancing_Script/static/DancingScript-Regular.ttf + Dancing_Script/static/DancingScript-Medium.ttf + Dancing_Script/static/DancingScript-SemiBold.ttf + Dancing_Script/static/DancingScript-Bold.ttf + +Get started +----------- + +1. Install the font files you want to use + +2. Use your app's font picker to view the font family and all the +available styles + +Learn more about variable fonts +------------------------------- + + https://developers.google.com/web/fundamentals/design-and-ux/typography/variable-fonts + https://variablefonts.typenetwork.com + https://medium.com/variable-fonts + +In desktop apps + + https://theblog.adobe.com/can-variable-fonts-illustrator-cc + https://helpx.adobe.com/nz/photoshop/using/fonts.html#variable_fonts + +Online + + https://developers.google.com/fonts/docs/getting_started + https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Fonts/Variable_Fonts_Guide + https://developer.microsoft.com/en-us/microsoft-edge/testdrive/demos/variable-fonts + +Installing fonts + + MacOS: https://support.apple.com/en-us/HT201749 + Linux: https://www.google.com/search?q=how+to+install+a+font+on+gnu%2Blinux + Windows: https://support.microsoft.com/en-us/help/314960/how-to-install-or-remove-a-font-in-windows + +Android Apps + + https://developers.google.com/fonts/docs/android + https://developer.android.com/guide/topics/ui/look-and-feel/downloadable-fonts + +License +------- +Please read the full license text (OFL.txt) to understand the permissions, +restrictions and requirements for usage, redistribution, and modification. + +You can use them in your products & projects – print or digital, +commercial or otherwise. + +This isn't legal advice, please consider consulting a lawyer and see the full +license for all details. diff --git a/public/fonts/Dancing_Script/static/DancingScript-Bold.ttf b/public/fonts/Dancing_Script/static/DancingScript-Bold.ttf new file mode 100644 index 0000000..557161d Binary files /dev/null and b/public/fonts/Dancing_Script/static/DancingScript-Bold.ttf differ diff --git a/public/fonts/Dancing_Script/static/DancingScript-Medium.ttf b/public/fonts/Dancing_Script/static/DancingScript-Medium.ttf new file mode 100644 index 0000000..1bb6f94 Binary files /dev/null and b/public/fonts/Dancing_Script/static/DancingScript-Medium.ttf differ diff --git a/public/fonts/Dancing_Script/static/DancingScript-Regular.ttf b/public/fonts/Dancing_Script/static/DancingScript-Regular.ttf new file mode 100644 index 0000000..8cc83f3 Binary files /dev/null and b/public/fonts/Dancing_Script/static/DancingScript-Regular.ttf differ diff --git a/public/fonts/Dancing_Script/static/DancingScript-SemiBold.ttf b/public/fonts/Dancing_Script/static/DancingScript-SemiBold.ttf new file mode 100644 index 0000000..52e7fa8 Binary files /dev/null and b/public/fonts/Dancing_Script/static/DancingScript-SemiBold.ttf differ diff --git a/public/fonts/Great_Vibes/GreatVibes-Regular.ttf b/public/fonts/Great_Vibes/GreatVibes-Regular.ttf new file mode 100644 index 0000000..acc5d37 Binary files /dev/null and b/public/fonts/Great_Vibes/GreatVibes-Regular.ttf differ diff --git a/public/fonts/Great_Vibes/OFL.txt b/public/fonts/Great_Vibes/OFL.txt new file mode 100644 index 0000000..3557afc --- /dev/null +++ b/public/fonts/Great_Vibes/OFL.txt @@ -0,0 +1,93 @@ +Copyright 2015 The Great Vibes Pro Project Authors (https://github.com/googlefonts/great-vibes) + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +https://openfontlicense.org + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/src/App.tsx b/src/App.tsx index 2a895a9..e9f4f8d 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -116,7 +116,7 @@ const App = () => { } /> } /> - } /> + } /> } /> diff --git a/src/components/CommonNav.tsx b/src/components/CommonNav.tsx index 887a094..59354d1 100644 --- a/src/components/CommonNav.tsx +++ b/src/components/CommonNav.tsx @@ -347,7 +347,7 @@ const CommonNav: React.FC = ({ const isLast = index == filteredPathnames.length - 1; return ( - + {index > 0 && {">"}} {!isLast ? ( = ({ ) : saved && saved.saveType != null && saved.saveType == "SELECT" ? ( <> , label: string } } - - - // Handling Initia Width and height of Some tags - END const offsetX = event.clientX - dragElemRect.left; diff --git a/src/components/setting/Signature/AddSignatureModal.tsx b/src/components/setting/Signature/AddSignatureModal.tsx index e5da473..1264954 100644 --- a/src/components/setting/Signature/AddSignatureModal.tsx +++ b/src/components/setting/Signature/AddSignatureModal.tsx @@ -1,6 +1,5 @@ import React, { useEffect, useState } from 'react'; import { AiOutlineUpload, AiOutlineEdit } from 'react-icons/ai'; -import { MdCloudUpload } from 'react-icons/md'; import api from '../../../config/api'; import DrawSignatureCanvas from './DrawSignatureCanvas'; import { FaSpinner } from "react-icons/fa"; @@ -81,14 +80,14 @@ const AddSignatureModal: React.FC = ({ const fontsMap = [ - { style: "'Great Vibes', cursive", label: "Elegant Script", acronym: "f1" }, - { style: "'Pacifico', cursive", label: "Casual Handwritten", acronym: "f2" }, - { style: "'Dancing Script', cursive", label: "Smooth Flow", acronym: "f3" }, - { style: "'Playfair Display', serif", label: "Classic Serif", acronym: "f4" }, - ] + { family: "Great Vibes", label: "Great Vibes", acronym: "f1" }, + { family: "Dancing Script", label: "Dancing Script", acronym: "f2" }, + { family: "Alex Brush", label: "Alex Brush", acronym: "f3" }, + { family: "Allura", label: "Allura", acronym: "f4" }, + ]; const [selectedSignature, setSelectedSignature] = useState( - fontsMap.length > 0 ? { id: fontsMap[0].acronym, style: fontsMap[0].style } : { id: "f1", style: "" } + fontsMap.length > 0 ? { id: fontsMap[0].acronym, style: fontsMap[0].family } : { id: "f1", style: "" } ); // Store the actual file @@ -130,9 +129,9 @@ const AddSignatureModal: React.FC = ({ setActiveTab(editingSignature.signatureType as 'SELECT' | 'DRAW' | 'UPLOAD'); // Set font for SELECT tab - const fontOption = fontsMap.find(option => option.style == editingSignature.font); + const fontOption = fontsMap.find(option => option.family == editingSignature.font); if (fontOption) { - setSelectedSignature({ id: fontOption.acronym, style: fontOption.style }); + setSelectedSignature({ id: fontOption.acronym, style: fontOption.family }); } // Set signature blobs for all tabs @@ -346,17 +345,17 @@ const AddSignatureModal: React.FC = ({ {fontsMap.map((opt) => (
setSelectedSignature({ id: opt.acronym, style: opt.style })} + onClick={() => setSelectedSignature({ id: opt.acronym, style: opt.family })} className={`cursor-pointer border border-slate-200 rounded-xl p-4 text-center bg-white transition ${selectedSignature.id == opt.acronym ? "ring-2 ring-[var(--mainPrimaryBtn)]" : "hover:shadow-md"}`} > -
+
{fullName || "Full Name"}
{initials || "AB"}
diff --git a/src/components/setting/Signature/Signature.tsx b/src/components/setting/Signature/Signature.tsx index ded008c..fa6a885 100644 --- a/src/components/setting/Signature/Signature.tsx +++ b/src/components/setting/Signature/Signature.tsx @@ -39,13 +39,20 @@ const SignatureManager: React.FC = () => { id: string; }>({ show: false, id: "" }); - const signatureOptions = [ - { id: 1, name: 'print', initials: 'LA', style: 'print' }, - { id: 2, name: 'cursive', initials: 'LA', style: 'cursive' }, - { id: 3, name: 'script', initials: 'LA', style: 'script' }, - { id: 4, name: 'elegant', initials: 'LA', style: 'elegant' }, - { id: 5, name: 'modern', initials: 'LA', style: 'modern' }, - { id: 6, name: 'classic', initials: 'LA', style: 'classic' }, + // const signatureOptions = [ + // { id: 1, name: 'print', initials: 'LA', style: 'print' }, + // { id: 2, name: 'cursive', initials: 'LA', style: 'cursive' }, + // { id: 3, name: 'script', initials: 'LA', style: 'script' }, + // { id: 4, name: 'elegant', initials: 'LA', style: 'elegant' }, + // { id: 5, name: 'modern', initials: 'LA', style: 'modern' }, + // { id: 6, name: 'classic', initials: 'LA', style: 'classic' }, + // ]; + + const fontsMap = [ + { family: "Great Vibes", label: "Great Vibes", acronym: "f1" }, + { family: "Dancing Script", label: "Dancing Script", acronym: "f2" }, + { family: "Alex Brush", label: "Alex Brush", acronym: "f3" }, + { family: "Allura", label: "Allura", acronym: "f4" }, ]; const getAllSignatures = async () => { @@ -109,13 +116,13 @@ const SignatureManager: React.FC = () => { const renderSignatureText = (type, font, firstName, lastName, mode = 'name') => { if (type != 'SELECT') return null; - const selectedFont = signatureOptions.find(opt => opt.style == font); - const fontClass = `${selectedFont?.style || 'print'}`; + const selectedFont = fontsMap.find(opt => opt.acronym == font); + const fontClass = `${selectedFont?.family || 'print'}`; if (mode == 'initials') { const initials = getInitialsUtils((firstName ?? '') + (firstName && lastName ? ' ' : '') + (lastName ?? '')); return ( -
+
{initials}
); @@ -123,7 +130,7 @@ const SignatureManager: React.FC = () => { const fullName = `${firstName ?? ''} ${lastName ?? ''}`.trim(); return ( -
+
{fullName}
); diff --git a/src/components/signature/ClientSignCon.tsx b/src/components/signature/ClientSignCon.tsx index 3e7bebc..d19a873 100644 --- a/src/components/signature/ClientSignCon.tsx +++ b/src/components/signature/ClientSignCon.tsx @@ -81,11 +81,12 @@ interface SelectStyle { } const fontsMap = [ - { style: "'Great Vibes', cursive", label: "Elegant Script", acronym: "f1" }, - { style: "'Pacifico', cursive", label: "Casual Handwritten", acronym: "f2" }, - { style: "'Dancing Script', cursive", label: "Smooth Flow", acronym: "f3" }, - { style: "'Playfair Display', serif", label: "Classic Serif", acronym: "f4" }, -] + { family: "Great Vibes", label: "Great Vibes", acronym: "f1" }, + { family: "Dancing Script", label: "Dancing Script", acronym: "f2" }, + { family: "Alex Brush", label: "Alex Brush", acronym: "f3" }, + { family: "Allura", label: "Allura", acronym: "f4" }, +]; + const ClientSignCon: React.FC = ({ @@ -297,7 +298,7 @@ const ClientSignCon: React.FC = ({ signatureId: res.data.id ?? null, saveType: res.data.signatureType ?? null, save: true, - signature: res.data.signatureType == "SELECT" ? payload.firstName : (res.data.signatureBlob ?? null), + signature: res.data.signatureType == "SELECT" ? fullName : (res.data.signatureBlob ?? null), initial: res.data.signatureType == "SELECT" ? payload.initials : (res.data.initialsBlob ?? null), font: res.data.signatureType == "SELECT" ? selectedSignature.style : "" }); @@ -385,17 +386,17 @@ const ClientSignCon: React.FC = ({ {fontsMap.map((opt) => (
setSelectedSignature({ id: opt.acronym, style: opt.style })} + onClick={() => setSelectedSignature({ id: opt.acronym, style: opt.family })} className={`cursor-pointer border border-slate-200 rounded-xl p-1 text-center bg-white transition ${selectedSignature.id == opt.acronym ? "ring-2 ring-[var(--mainPrimaryBtn)]" : "hover:shadow-md"}`} > -
+
{fullName || "Full Name"}
{initials || "AB"}
@@ -626,27 +627,27 @@ const ClientSignCon: React.FC = ({ {navigationItems.map((item) => { if (item.label === 'SAVED' && preSaveSignatures.length === 0) return null; - return ( - <> -
- - {activeTab == item.id &&
} -
- - ) - } + return ( + <> +
+ + {activeTab == item.id &&
} +
+ + ) + } diff --git a/src/components/styles/style.css b/src/components/styles/style.css index 310944f..deef72e 100644 --- a/src/components/styles/style.css +++ b/src/components/styles/style.css @@ -272,6 +272,7 @@ html { .container-l { width: 400px !important; } + .form-box>div { padding: 0rem 2rem; } @@ -281,6 +282,7 @@ html { .container-l { width: 300px !important; } + .form-box>div { padding: 0rem 1rem; } @@ -357,4 +359,26 @@ html { .auth-ui-con .toggle-panel h1 { font-size: 30px; } -} \ No newline at end of file +} + +/* Adding SELECT SIGNATURE FONTS - STARTS */ +@font-face { + font-family: 'Great Vibes'; + src: url('/fonts/Great_Vibes/GreatVibes-Regular.ttf') format('truetype'); +} + +@font-face { + font-family: 'Dancing Script'; + src: url('/fonts/Dancing_Script/DancingScript-VariableFont_wght.ttf') format('truetype'); +} + +@font-face { + font-family: 'Alex Brush'; + src: url('/fonts/Alex_Brush/AlexBrush-Regular.ttf') format('truetype'); +} + +@font-face { + font-family: 'Allura'; + src: url('/fonts/Allura/Allura-Regular.ttf') format('truetype'); +} +/* Adding SELECT SIGNATURE FONTS - ENDS */ diff --git a/src/utlity/signSessionRedirect.ts b/src/utlity/signSessionRedirect.ts index fe6adbb..64b9027 100644 --- a/src/utlity/signSessionRedirect.ts +++ b/src/utlity/signSessionRedirect.ts @@ -2,7 +2,10 @@ import api from "../config/api"; const signSessionRedirect = async (accountId: string, transactionId: string, recipientId: string) => { const session = await api.get(`/api/v1/accounts/${accountId}/transactions/${transactionId}/recipients/${recipientId}/create_session`) - window.location.href = session.data.url; + const url = session.data.url; + if (url) { + window.open(url, "_blank", "noopener,noreferrer"); + } return; }