Merge pull request #134 from aura-nw/staging

Staging
aura-nw · Dec 20, 2024 · f5f5dad · f5f5dad
2 parents 7c8b21a + ce057a5
commit f5f5dad
Show file tree

Hide file tree

Showing 10 changed files with 522 additions and 374 deletions.
diff --git a/public/devConfig.json b/public/devConfig.json
@@ -1,5 +1,5 @@
 {
-  "REDIRECT_URL": "https://dev.punkga.me",
+  "REDIRECT_URL": "https://app.dev.punkga.me",
   "CHAIN_ID": "aura_6321-3",
   "CHAIN_INFO": {
     "chainId": "aura_6321-3",

diff --git a/public/mainConfig.json b/public/mainConfig.json
@@ -1,5 +1,5 @@
 {
-  "REDIRECT_URL": "https://punkga.me",
+  "REDIRECT_URL": "https://app.punkga.me",
   "CHAIN_ID": "aura_6322-2",
   "CHAIN_INFO": {
     "chainId": "aura_6322-2",

diff --git a/public/stagingConfig.json b/public/stagingConfig.json
@@ -1,5 +1,5 @@
 {
-  "REDIRECT_URL": "https://staging.punkga.me",
+  "REDIRECT_URL": "https://app.staging.punkga.me",
   "CHAIN_ID": "aura_6321-3",
   "CHAIN_INFO": {
     "chainId": "aura_6321-3",

diff --git a/src/components/Header/components/Drawer.tsx b/src/components/Header/components/Drawer.tsx
diff --git a/src/components/Header/components/UserDropdown.tsx b/src/components/Header/components/UserDropdown.tsx
diff --git a/src/components/pages/homepage/manga.tsx b/src/components/pages/homepage/manga.tsx
@@ -21,6 +21,7 @@ export default function Manga(props: IComic) {
       setLineClamp(res > 3 ? 3 : res)
     }
   }, [])
+  console.log(props)
   return (
     <Link
       href={width < 1280 ? `/comic/${props.slug}` : `/comic/${props.slug}/chapter/1`}

diff --git a/src/context/index.tsx b/src/context/index.tsx
@@ -335,6 +335,7 @@ function ContextProvider({ children }: any) {
           activeWalletAddress: res.active_wallet_address,
           noncustodialWalletAddress: res.wallet_address,
           tonWalletAddress: res.ton_wallet_address,
+          activities: res?.punkga_wallets?.[0]?.punkga_wallet_activities,
         } as IUser)
       }
       if (!res.email_verified_at && res.email) {
@@ -483,9 +484,9 @@ function ContextProvider({ children }: any) {
   }
 
   const removeTokenCookie = () => {
-    removeCookie('token', { path: '/', domain: '.punkga.me' })
-    removeCookie('token', { path: '/', domain: '.staging.punkga.me' })
-    removeCookie('token', { path: '/', domain: '.dev.punkga.me' })
+    removeCookie('token', { path: '/', domain: '.app.punkga.me' })
+    removeCookie('token', { path: '/', domain: '.app.staging.punkga.me' })
+    removeCookie('token', { path: '/', domain: '.app.dev.punkga.me' })
   }
 
   if (isSettingUp) {

diff --git a/src/models/user.ts b/src/models/user.ts
@@ -40,4 +40,5 @@ export interface IUser {
   quests: any
   rank: number
   activeWalletAddress: string
+  activities: any[]
 }
diff --git a/src/pages/events/your-city/submit/page.tsx b/src/pages/events/your-city/submit/page.tsx
@@ -42,7 +42,7 @@ function PageContent() {
   })
   const [IPList, setIPList] = useState([])
   useEffect(() => {
-    if (moment().tz('Asia/Ho_Chi_Minh').isAfter(moment.tz('2025-01-01', 'Asia/Ho_Chi_Minh'))) {
+    if (moment().tz('Asia/Ho_Chi_Minh').isAfter(moment.tz('2025-01-15', 'Asia/Ho_Chi_Minh'))) {
       replace('/events/your-city')
     }
   }, [])

diff --git a/src/pages/index.tsx b/src/pages/index.tsx
@@ -147,7 +147,6 @@ function Home() {
                   })
                 : latestComic.data?.length
                 ? latestComic.data
-                    .filter((data: any) => data.tags.every((lang: any) => lang.en.toLowerCase() != 'invent contest'))
                     .filter((data) =>
                       statusFilter.length && !statusFilter.some((s) => s.key == 'All status')
                         ? statusFilter.some((filter) => data.status.text == filter?.key)