From 3f40a2a18e9562bfab4e5adfb77e00ae5b4fc956 Mon Sep 17 00:00:00 2001 From: alpers Date: Thu, 17 Aug 2023 10:38:55 +0800 Subject: [PATCH 1/3] feat: add shanghai event --- packages/app-config/src/ctypes/index.ts | 5 ++ packages/app-config/src/hk-event.ts | 2 +- packages/app-config/src/isRelease.ts | 2 +- .../public/shanghai-event/bag_card_global.svg | 1 + .../app/public/shanghai-event/img_bag.svg | 1 + .../public/shanghai-event/logo_antalpha.svg | 1 + .../public/shanghai-event/logo_buidler.png | Bin 0 -> 7812 bytes .../app/public/shanghai-event/logo_zcloak.svg | 1 + .../app/public/shanghai-event/svg_title.svg | 1 + packages/page-hk-event/src/ConnectWallet.tsx | 5 +- packages/page-hk-event/src/Login.tsx | 63 +++++++----------- packages/page-hk-event/src/Splash.tsx | 2 +- 12 files changed, 40 insertions(+), 44 deletions(-) create mode 100644 packages/app/public/shanghai-event/bag_card_global.svg create mode 100644 packages/app/public/shanghai-event/img_bag.svg create mode 100644 packages/app/public/shanghai-event/logo_antalpha.svg create mode 100644 packages/app/public/shanghai-event/logo_buidler.png create mode 100644 packages/app/public/shanghai-event/logo_zcloak.svg create mode 100644 packages/app/public/shanghai-event/svg_title.svg diff --git a/packages/app-config/src/ctypes/index.ts b/packages/app-config/src/ctypes/index.ts index 7b3c4f6c..b72f28a8 100644 --- a/packages/app-config/src/ctypes/index.ts +++ b/packages/app-config/src/ctypes/index.ts @@ -62,6 +62,11 @@ export const ctypeMeta: Record = { type: 'all', card: 'yantai-event/bag_card_yantai.svg', icon: 'hk-event/icon_logo.png' + }, + // shanghai event + '0xf9dd4e34e40fa434ba96541beccd7b1c7762836f5aa320924248b7604a505462': { + type: 'all', + card: 'shanghai-event/bag_card_global.svg' } }; diff --git a/packages/app-config/src/hk-event.ts b/packages/app-config/src/hk-event.ts index 0a62012e..66927464 100644 --- a/packages/app-config/src/hk-event.ts +++ b/packages/app-config/src/hk-event.ts @@ -5,5 +5,5 @@ import { isRelease } from './isRelease'; export const LOGGED_PREFIX = 'logged_hk_event:'; export const CTYPE_ID = isRelease - ? '0x341829ca64a7105ff941b4b8a9710e2806053cbfb7c97fc9cfd569ab4b5d55d2' + ? '0xf9dd4e34e40fa434ba96541beccd7b1c7762836f5aa320924248b7604a505462' : '0x6c62809700813f4ffb59ea97a31f4d34e206a4233bc2bb75bed1d705c4314930'; diff --git a/packages/app-config/src/isRelease.ts b/packages/app-config/src/isRelease.ts index d6958e51..921f2ba1 100644 --- a/packages/app-config/src/isRelease.ts +++ b/packages/app-config/src/isRelease.ts @@ -1,4 +1,4 @@ // Copyright 2021-2023 zcloak authors & contributors // SPDX-License-Identifier: Apache-2.0 -export const isRelease = location.hostname.includes('zkid.app'); +export const isRelease = true; diff --git a/packages/app/public/shanghai-event/bag_card_global.svg b/packages/app/public/shanghai-event/bag_card_global.svg new file mode 100644 index 00000000..9963db8f --- /dev/null +++ b/packages/app/public/shanghai-event/bag_card_global.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/packages/app/public/shanghai-event/img_bag.svg b/packages/app/public/shanghai-event/img_bag.svg new file mode 100644 index 00000000..ec3f3d3f --- /dev/null +++ b/packages/app/public/shanghai-event/img_bag.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/packages/app/public/shanghai-event/logo_antalpha.svg b/packages/app/public/shanghai-event/logo_antalpha.svg new file mode 100644 index 00000000..5e4322f8 --- /dev/null +++ b/packages/app/public/shanghai-event/logo_antalpha.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/packages/app/public/shanghai-event/logo_buidler.png b/packages/app/public/shanghai-event/logo_buidler.png new file mode 100644 index 0000000000000000000000000000000000000000..4e661e6a755d11ef23e173c8ff542350430f404a GIT binary patch literal 7812 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 \ No newline at end of file diff --git a/packages/app/public/shanghai-event/svg_title.svg b/packages/app/public/shanghai-event/svg_title.svg new file mode 100644 index 00000000..4860001d --- /dev/null +++ b/packages/app/public/shanghai-event/svg_title.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/packages/page-hk-event/src/ConnectWallet.tsx b/packages/page-hk-event/src/ConnectWallet.tsx index d84a711d..168bef50 100644 --- a/packages/page-hk-event/src/ConnectWallet.tsx +++ b/packages/page-hk-event/src/ConnectWallet.tsx @@ -21,7 +21,7 @@ const ConnectWallet = () => { { height: 50, bgcolor: '#000', color: '#fff', - borderRadius: '25px', + borderRadius: '4px', + border: '1px solid #FFFFFF', boxShadow: '0px 4px 20px rgba(45,51,60,0.27)', ':hover': { bgcolor: '#000', diff --git a/packages/page-hk-event/src/Login.tsx b/packages/page-hk-event/src/Login.tsx index b8aae9b8..0018d173 100644 --- a/packages/page-hk-event/src/Login.tsx +++ b/packages/page-hk-event/src/Login.tsx @@ -12,11 +12,19 @@ const Login = () => { flexDirection='column' position='relative' sx={{ - height: 730, - background: 'url(/yantai-event/jpg_yt.webp) no-repeat, #F5DBB2', - backgroundPosition: 'bottom left' + height: 830, + background: '#000000' + // backgroundPosition: 'top center' }} > + { } }} > - - - - SURFING SUMMER - - - YANTAI + + + + + + + + + + + Shanghai, August 18, 2023 - - - Surfing Summer 2023 is an offline Web3 event organized by CSWA on July 28-30, 2023 in Yantai, Shandong. - This credential serves as zCloak’s free commemorative cards issued to all attendees. - - - + {/* { > Powered by zCloak - + */} ); }; diff --git a/packages/page-hk-event/src/Splash.tsx b/packages/page-hk-event/src/Splash.tsx index 3507e35f..b95d18e6 100644 --- a/packages/page-hk-event/src/Splash.tsx +++ b/packages/page-hk-event/src/Splash.tsx @@ -11,7 +11,7 @@ const Splash = () => { const [open, toggle] = useToggle(true); useEffect(() => { - setTimeout(toggle, 2000); + setTimeout(toggle, 200); }, [toggle]); return ( From afab53823b4a711f5a2065b7c8e58d856045a3bd Mon Sep 17 00:00:00 2001 From: alpers Date: Thu, 17 Aug 2023 10:39:44 +0800 Subject: [PATCH 2/3] fix isRelease --- packages/app-config/src/isRelease.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/app-config/src/isRelease.ts b/packages/app-config/src/isRelease.ts index 921f2ba1..d6958e51 100644 --- a/packages/app-config/src/isRelease.ts +++ b/packages/app-config/src/isRelease.ts @@ -1,4 +1,4 @@ // Copyright 2021-2023 zcloak authors & contributors // SPDX-License-Identifier: Apache-2.0 -export const isRelease = true; +export const isRelease = location.hostname.includes('zkid.app'); From 45acbcccff7206ab29f63aa8f6fa44224041bd2b Mon Sep 17 00:00:00 2001 From: alpers Date: Thu, 17 Aug 2023 10:41:28 +0800 Subject: [PATCH 3/3] fix splash --- packages/page-hk-event/src/Splash.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/page-hk-event/src/Splash.tsx b/packages/page-hk-event/src/Splash.tsx index b95d18e6..3507e35f 100644 --- a/packages/page-hk-event/src/Splash.tsx +++ b/packages/page-hk-event/src/Splash.tsx @@ -11,7 +11,7 @@ const Splash = () => { const [open, toggle] = useToggle(true); useEffect(() => { - setTimeout(toggle, 200); + setTimeout(toggle, 2000); }, [toggle]); return (