Skip to content

Commit

Permalink
Merge branch 'develop' into feature/certificate_page
Browse files Browse the repository at this point in the history
  • Loading branch information
@Luphia
Luphia authored Sep 19, 2024
2 parents 34a6860 + d48453b commit 193d446
Show file tree
Hide file tree
Showing 17 changed files with 130 additions and 620 deletions.
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "iSunFA",
"version": "0.8.1+17",
"version": "0.8.1+16",
"private": false,
"scripts": {
"dev": "next dev",
Expand Down
24 changes: 24 additions & 0 deletions public/icons/edit.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 15 additions & 0 deletions public/icons/empty_box.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions public/icons/pre_launch_project.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions public/icons/profit_change.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions public/icons/top_project_roi.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
145 changes: 10 additions & 135 deletions src/components/company_info_page_body/company_info_page_body.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ import { FREE_COMPANY_ID } from '@/constants/config';
import { KYCStatus } from '@/constants/kyc';
import { FiEdit, FiTrash2 } from 'react-icons/fi';
import { LuArrowLeftRight } from 'react-icons/lu';
import { IoArrowForward } from 'react-icons/io5';
import { FaCheck } from 'react-icons/fa6';

const CompanyInfoPageBody = () => {
const { t } = useTranslation(['common', 'kyc']);
Expand Down Expand Up @@ -163,20 +165,7 @@ const CompanyInfoPageBody = () => {
<div className="mt-10 flex gap-4 max-md:max-w-full max-md:flex-wrap">
<div className="flex gap-2 whitespace-nowrap text-sm font-medium leading-5 tracking-normal text-divider-text-lv-1">
<div className="my-auto">
<svg
xmlns="http://www.w3.org/2000/svg"
width="16"
height="16"
fill="none"
viewBox="0 0 16 16"
>
<path
fill="#002462"
fillRule="evenodd"
d="M2 7.714a6 6 0 1112 0V10a.857.857 0 001.715 0V7.714a7.714 7.714 0 10-15.429 0v7.429a.857.857 0 001.714 0V7.714zM5.43 13.43a.857.857 0 10-1.714 0v1.714a.857.857 0 001.714 0v-1.714zM8 5.714A2.571 2.571 0 005.43 8.286V10a.857.857 0 11-1.714 0V8.286a4.286 4.286 0 118.571 0v6.857a.857.857 0 01-1.714 0V8.286A2.571 2.571 0 008 5.714zm7.715 7.715a.857.857 0 00-1.715 0v1.714a.857.857 0 001.715 0v-1.714zM8 13.143c.474 0 .858.384.858.857v1.143a.857.857 0 01-1.715 0V14c0-.473.384-.857.857-.857zm.858-4.286a.857.857 0 00-1.715 0v1.714a.857.857 0 101.715 0V8.857z"
clipRule="evenodd"
></path>
</svg>
<Image src="/icons/fingerprint.svg" width={16} height={16} alt="fingerprint"></Image>
</div>
<div>{t('kyc:COMPANY_BASIC_INFO.KYC')}</div>
</div>
Expand Down Expand Up @@ -282,26 +271,7 @@ const CompanyInfoPageBody = () => {
className="px-8 py-3.5 text-lg font-medium leading-7 tracking-normal max-md:px-5"
>
<p>{t('kyc:COMPANY_BASIC_INFO.GO_KYC')}</p>
<svg
xmlns="http://www.w3.org/2000/svg"
width="24"
height="24"
fill="none"
viewBox="0 0 24 24"
>
<path
className="fill-current"
fillRule="evenodd"
d="M11.77 4.456c.44-.44 1.153-.44 1.592 0l6.75 6.75c.44.439.44 1.151 0 1.59l-6.75 6.75a1.125 1.125 0 01-1.591-1.59L17.725 12l-5.954-5.954a1.125 1.125 0 010-1.591z"
clipRule="evenodd"
></path>
<path
className="fill-current"
fillRule="evenodd"
d="M3.566 12.001c0-.621.504-1.125 1.125-1.125H18.38a1.125 1.125 0 010 2.25H4.69a1.125 1.125 0 01-1.125-1.125z"
clipRule="evenodd"
></path>
</svg>
<IoArrowForward size={24} />
</Button>
</div>
</div>
Expand Down Expand Up @@ -518,20 +488,7 @@ const CompanyInfoPageBody = () => {
className="px-8 py-3.5 text-lg font-medium leading-7 tracking-normal max-md:px-5"
>
<p>{t('kyc:COMPANY_BASIC_INFO.VERIFIED')}</p>
<svg
xmlns="http://www.w3.org/2000/svg"
width="24"
height="24"
viewBox="0 0 24 24"
fill="none"
>
<path
fillRule="evenodd"
clipRule="evenodd"
d="M20.5333 5.47065C20.8262 5.76354 20.8262 6.23841 20.5333 6.53131L9.53326 17.5313C9.24037 17.8242 8.76549 17.8242 8.4726 17.5313L3.4726 12.5313C3.17971 12.2384 3.17971 11.7635 3.4726 11.4706C3.76549 11.1778 4.24037 11.1778 4.53326 11.4706L9.00293 15.9403L19.4726 5.47065C19.7655 5.17775 20.2404 5.17775 20.5333 5.47065Z"
fill="currentColor"
/>
</svg>
<FaCheck size={24} />
</Button>
</div>
</div>
Expand Down Expand Up @@ -639,26 +596,7 @@ const CompanyInfoPageBody = () => {
className="px-8 py-3.5 text-lg font-medium leading-7 tracking-normal max-md:px-5"
>
<p>{t('kyc:COMPANY_BASIC_INFO.GO_KYC')}</p>
<svg
xmlns="http://www.w3.org/2000/svg"
width="24"
height="24"
fill="none"
viewBox="0 0 24 24"
>
<path
className="fill-current"
fillRule="evenodd"
d="M11.77 4.456c.44-.44 1.153-.44 1.592 0l6.75 6.75c.44.439.44 1.151 0 1.59l-6.75 6.75a1.125 1.125 0 01-1.591-1.59L17.725 12l-5.954-5.954a1.125 1.125 0 010-1.591z"
clipRule="evenodd"
></path>
<path
className="fill-current"
fillRule="evenodd"
d="M3.566 12.001c0-.621.504-1.125 1.125-1.125H18.38a1.125 1.125 0 010 2.25H4.69a1.125 1.125 0 01-1.125-1.125z"
clipRule="evenodd"
></path>
</svg>
<IoArrowForward size={24} />
</Button>
</div>
</div>
Expand All @@ -678,21 +616,7 @@ const CompanyInfoPageBody = () => {
<div className="flex gap-4 max-md:max-w-full max-md:flex-wrap">
<div className="flex gap-2 text-sm font-medium leading-5 tracking-normal text-divider-text-lv-1">
<div className="my-auto">
<svg
xmlns="http://www.w3.org/2000/svg"
width="16"
height="16"
fill="none"
viewBox="0 0 16 16"
>
<path fill="#002462" d="M8 16A8 8 0 108 0a8 8 0 000 16z"></path>
<path
fill="#FFA502"
fillRule="evenodd"
d="M9.143 4.571a1.143 1.143 0 11-2.286 0 1.143 1.143 0 012.286 0zM5.57 11.43c0-.395.32-.715.715-.715h1V8.143h-.429a.714.714 0 110-1.429H8c.394 0 .714.32.714.715v3.285h1a.714.714 0 010 1.429H6.286a.714.714 0 01-.715-.714z"
clipRule="evenodd"
></path>
</svg>
<Image src="/icons/info.svg" width={16} height={16} alt="company"></Image>
</div>
<div>{t('kyc:COMPANY_BASIC_INFO.COMPANY_INFO')}</div>
</div>
Expand Down Expand Up @@ -732,20 +656,7 @@ const CompanyInfoPageBody = () => {
variant={'secondaryBorderless'}
size={'extraSmall'}
>
<svg
xmlns="http://www.w3.org/2000/svg"
width="21"
height="20"
fill="none"
viewBox="0 0 21 20"
>
<path
className="fill-current"
fillRule="evenodd"
d="M15.639 1.554a2.518 2.518 0 013.56 3.56l-7.969 7.97-.046.046c-.243.243-.447.448-.693.598-.216.133-.452.23-.698.29-.28.067-.57.067-.912.066H7.419a.75.75 0 01-.75-.75V11.94v-.066c0-.343 0-.632.067-.912.059-.247.157-.483.289-.699.15-.246.355-.45.598-.692l.047-.047 7.969-7.969zm2.5 1.06a1.018 1.018 0 00-1.44 0l-7.969 7.97c-.313.313-.38.387-.426.462a.917.917 0 00-.11.265c-.02.085-.025.185-.025.628v.645h.645c.444 0 .543-.004.629-.025a.917.917 0 00.265-.11c.074-.046.148-.113.462-.426l7.969-7.969a1.018 1.018 0 000-1.44zm-11.751-.03H9.919a.75.75 0 110 1.5h-3.5c-.712 0-1.202.001-1.581.032-.37.03-.57.086-.714.16a1.75 1.75 0 00-.764.764c-.074.144-.13.343-.16.713-.03.38-.031.869-.031 1.581v7c0 .713 0 1.202.032 1.581.03.37.085.57.159.714.167.33.435.597.764.765.145.073.344.129.714.159.38.03.869.031 1.58.031h7c.713 0 1.203 0 1.582-.031.37-.03.57-.086.713-.16a1.75 1.75 0 00.765-.764c.074-.144.13-.343.16-.714.03-.379.03-.868.03-1.58v-3.5a.75.75 0 011.5 0v3.53c.001.674.001 1.225-.036 1.673-.038.463-.118.881-.317 1.272a3.25 3.25 0 01-1.42 1.42c-.391.2-.81.28-1.273.318-.447.036-.998.036-1.672.036H6.388c-.674 0-1.225 0-1.672-.036-.463-.038-.882-.119-1.273-.318a3.25 3.25 0 01-1.42-1.42c-.199-.39-.28-.81-.318-1.272-.036-.448-.036-.999-.036-1.672V7.303c0-.673 0-1.224.036-1.672.038-.463.12-.881.318-1.272a3.25 3.25 0 011.42-1.42c.391-.2.81-.28 1.273-.318.447-.037.998-.037 1.672-.037z"
clipRule="evenodd"
></path>
</svg>
<FiEdit size={20} />
</Button>
)}
</div>
Expand All @@ -764,20 +675,7 @@ const CompanyInfoPageBody = () => {
variant={'secondaryBorderless'}
size={'extraSmall'}
>
<svg
xmlns="http://www.w3.org/2000/svg"
width="21"
height="20"
fill="none"
viewBox="0 0 21 20"
>
<path
className="fill-current"
fillRule="evenodd"
d="M15.639 1.554a2.518 2.518 0 013.56 3.56l-7.969 7.97-.046.046c-.243.243-.447.448-.693.598-.216.133-.452.23-.698.29-.28.067-.57.067-.912.066H7.419a.75.75 0 01-.75-.75V11.94v-.066c0-.343 0-.632.067-.912.059-.247.157-.483.289-.699.15-.246.355-.45.598-.692l.047-.047 7.969-7.969zm2.5 1.06a1.018 1.018 0 00-1.44 0l-7.969 7.97c-.313.313-.38.387-.426.462a.917.917 0 00-.11.265c-.02.085-.025.185-.025.628v.645h.645c.444 0 .543-.004.629-.025a.917.917 0 00.265-.11c.074-.046.148-.113.462-.426l7.969-7.969a1.018 1.018 0 000-1.44zm-11.751-.03H9.919a.75.75 0 110 1.5h-3.5c-.712 0-1.202.001-1.581.032-.37.03-.57.086-.714.16a1.75 1.75 0 00-.764.764c-.074.144-.13.343-.16.713-.03.38-.031.869-.031 1.581v7c0 .713 0 1.202.032 1.581.03.37.085.57.159.714.167.33.435.597.764.765.145.073.344.129.714.159.38.03.869.031 1.58.031h7c.713 0 1.203 0 1.582-.031.37-.03.57-.086.713-.16a1.75 1.75 0 00.765-.764c.074-.144.13-.343.16-.714.03-.379.03-.868.03-1.58v-3.5a.75.75 0 011.5 0v3.53c.001.674.001 1.225-.036 1.673-.038.463-.118.881-.317 1.272a3.25 3.25 0 01-1.42 1.42c-.391.2-.81.28-1.273.318-.447.036-.998.036-1.672.036H6.388c-.674 0-1.225 0-1.672-.036-.463-.038-.882-.119-1.273-.318a3.25 3.25 0 01-1.42-1.42c-.199-.39-.28-.81-.318-1.272-.036-.448-.036-.999-.036-1.672V7.303c0-.673 0-1.224.036-1.672.038-.463.12-.881.318-1.272a3.25 3.25 0 011.42-1.42c.391-.2.81-.28 1.273-.318.447-.037.998-.037 1.672-.037z"
clipRule="evenodd"
></path>
</svg>
<FiEdit size={20} />
</Button>
</div>
</div>
Expand Down Expand Up @@ -816,30 +714,7 @@ const CompanyInfoPageBody = () => {
<div className="mt-10 flex gap-4 max-md:max-w-full max-md:flex-wrap">
<div className="flex gap-2 whitespace-nowrap text-sm font-medium leading-5 tracking-normal text-divider-text-lv-1">
<div className="my-auto">
<svg
xmlns="http://www.w3.org/2000/svg"
width="16"
height="16"
fill="none"
viewBox="0 0 16 16"
>
<path
fill="#002462"
fillRule="evenodd"
d="M2.134.107c-1.079 0-1.902.898-1.902 1.94v11.906c0 1.043.823 1.94 1.902 1.94h9.4c1.079 0 1.902-.898 1.902-1.94V2.107a2 2 0 00-2-2H2.134z"
clipRule="evenodd"
></path>
<path
fill="#FFA502"
fillRule="evenodd"
d="M1.09 11.714H.232v2.239c0 1.042.823 1.94 1.902 1.94h9.4c1.079 0 1.902-.898 1.902-1.94v-2.239H1.089zM3.233 3.437a.714.714 0 000 1.428h2.852a.714.714 0 100-1.428H3.233zm0 3.277a.714.714 0 100 1.429h1.426a.714.714 0 000-1.429H3.233z"
clipRule="evenodd"
></path>
<path
fill="#FFA502"
d="M10.745 8.45a.571.571 0 01-.303.16l-2.456.442a.571.571 0 01-.665-.655l.41-2.494a.571.571 0 01.161-.312L12.596.909a1.144 1.144 0 011.623 0l1.21 1.212a1.144 1.144 0 010 1.623L10.746 8.45z"
></path>
</svg>
<Image src="/icons/edit.svg" width={16} height={16} alt="edit"></Image>
</div>
<div>{t('kyc:COMPANY_BASIC_INFO.ACCOUNT')}</div>
</div>
Expand Down
Loading

0 comments on commit 193d446

Please sign in to comment.