feat: add legal-dao card and attester param in router (#15)

Co-authored-by: alpers <alpers@163.com>
zCloak-Network · Feb 3, 2023 · 371f83a · 371f83a
1 parent bb456f2
commit 371f83a
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 7 deletions.
diff --git a/packages/app-config/src/ctypes/index.ts b/packages/app-config/src/ctypes/index.ts
@@ -31,6 +31,18 @@ export const ctypeMeta: Record<HexString, CTypeMeta> = {
   '0x15ea88be73bd78986a41141fc86497f0cfef4a0d1b5463d100758edca37c546b': {
     type: 'all',
     card: 'christmas2022/bac_card2.webp'
+  },
+  '0xa99186086d83f834f0bf951cb7f78cd142f147f3bd7a689086f157418944716c': {
+    type: 'attest',
+    card: 'legal-dao/bg2.jpeg',
+    icon: 'legal-dao/icon.jpeg',
+    color: '#FFFFFF'
+  },
+  '0xfd4a31cc472ab8fa4fdb8a1096cb3e8fc52514c92193602f5996b912ed898b02': {
+    type: 'attest',
+    card: 'legal-dao/bg2.jpeg',
+    icon: 'legal-dao/icon.jpeg',
+    color: '#FFFFFF'
   }
 };
 

diff --git a/packages/app-config/src/ctypes/type.ts b/packages/app-config/src/ctypes/type.ts
@@ -6,4 +6,5 @@ export type CTypeMeta = {
   icon?: string;
   card?: string;
   bg?: string;
+  color?: string;
 };
diff --git a/packages/app/public/legal-dao/bg2.jpeg b/packages/app/public/legal-dao/bg2.jpeg
diff --git a/packages/app/public/legal-dao/icon.jpeg b/packages/app/public/legal-dao/icon.jpeg
diff --git a/packages/page-account/src/index.tsx b/packages/page-account/src/index.tsx
@@ -40,7 +40,7 @@ const Account: React.FC = () => {
     }
 
     loginWallet().then(() => {
-      navigate(redirect ?? '/claimer/ctype');
+      navigate(redirect ?? '/claimer');
     });
   }, [loginWallet, redirect, login, navigate, toggleOpen]);
 

diff --git a/packages/page-ctype/src/create/CreateClaim.tsx b/packages/page-ctype/src/create/CreateClaim.tsx
@@ -4,8 +4,8 @@
 import type { CType } from '@zcloak/ctype/types';
 import type { AnyJson } from '@zcloak/vc/types';
 
-import React, { useCallback, useState } from 'react';
-import { useNavigate } from 'react-router-dom';
+import React, { useCallback, useMemo, useState } from 'react';
+import { useNavigate, useParams } from 'react-router-dom';
 
 import { Did } from '@zcloak/did';
 
@@ -20,7 +20,7 @@ import {
 } from '@credential/react-components';
 import { CreateSubject } from '@credential/react-ctype';
 import { InputDid } from '@credential/react-dids';
-import { useCTypeMetaForAttest, useToggle } from '@credential/react-hooks';
+import { useCTypeMetaForAttest, useQueryParam, useToggle } from '@credential/react-hooks';
 
 import SubmitClaim from './SubmitClaim';
 
@@ -29,6 +29,17 @@ function CreateClaim({ ctype, isAuto }: { ctype: CType; isAuto: boolean }) {
   const [attester, setAttester] = useState<Did | null>(null);
   const [contents, setContents] = useState<AnyJson>({});
   const navigate = useNavigate();
+  const { id } = useParams();
+
+  const [_attester] = useQueryParam<string>('attester');
+
+  const defaultAttester = useMemo(() => {
+    if (ctype.$id === id) {
+      return _attester ?? undefined;
+    }
+
+    return undefined;
+  }, [ctype, id, _attester]);
 
   const ctypeMeta = useCTypeMetaForAttest(ctype.$id);
 
@@ -58,7 +69,12 @@ function CreateClaim({ ctype, isAuto }: { ctype: CType; isAuto: boolean }) {
             <Typography mb={4} textAlign="center" variant="h2">
               Create Claim
             </Typography>
-            <InputDid label="Attester" onChange={setAttester} />
+            <InputDid
+              defaultValue={defaultAttester}
+              disabled={!!defaultAttester}
+              label="Attester"
+              onChange={setAttester}
+            />
             <Box mt={2}>
               <CreateSubject onChange={setContents as any} schema={ctype} />
             </Box>

diff --git a/packages/react-components/src/CTypeCard.tsx b/packages/react-components/src/CTypeCard.tsx
@@ -113,7 +113,8 @@ function CTypeCard({ actions, ctype, meta }: Props) {
           ? {
               background: `url(${meta.card}) no-repeat, #fff`,
               backgroundSize: 'cover',
-              backgroundPosition: 'center'
+              backgroundPosition: 'center',
+              color: meta?.color
             }
           : {}
       }

diff --git a/packages/react-dids/src/DidsProvider.tsx b/packages/react-dids/src/DidsProvider.tsx
@@ -97,7 +97,9 @@ function DidsProvider({ children, didRole }: { didRole: DidRole; children: React
       {isLocked ? <UnlockModal did={did} onUnlock={unUnlock} open /> : children}
     </DidsContext.Provider>
   ) : (
-    <Navigate to={{ pathname: '/account', search: `?redirect=${location.pathname}` }} />
+    <Navigate
+      to={{ pathname: '/account', search: `?redirect=${location.pathname}${location.search}` }}
+    />
   );
 }