diff --git a/apps/happin-web/components/Layout.tsx b/apps/happin-web/components/Layout.tsx index 2f2b67a..4e88642 100644 --- a/apps/happin-web/components/Layout.tsx +++ b/apps/happin-web/components/Layout.tsx @@ -11,8 +11,8 @@ import { getWhiteLabelDomain } from "lib/api"; const Layout = ({ children }: { children: any }) => { const [isMobileBarOpen, setIsMobileBarOpen] = useState(true); const [isProduction, setIsProduction] = useState(false); - const [showFooter, setShowFooter] = useState(true); - const [showHeader, setShowHeader] = useState(true); + const [showFooter, setShowFooter] = useState(false); + const [showHeader, setShowHeader] = useState(false); const [isRewardPage, setRewardPage] = useState(false); const [isAppRewardPage, setAppRewardPage] = useState(false); @@ -55,23 +55,27 @@ const Layout = ({ children }: { children: any }) => { if (router.asPath === '/' || router.asPath === '/events') { setIsProduction(true) setShowFooter(true); - } else { - setShowFooter(false); - setIsProduction(false) - } - if (router.asPath === '/reward') { + setShowHeader(true); + } else if (router.asPath === '/reward'){ setRewardPage(true) setShowHeader(false); + } else if (router.asPath === '/campaign') { + setShowHeader(false); } - - if (router.asPath === '/appreward') { + else if (router.asPath === '/appreward') { setAppRewardPage(true) setShowHeader(false); - } - - if (router.asPath === '/campaign') { + setShowFooter(false); + } else if (router.asPath === '/transactionHistory') { setShowHeader(false); + setShowFooter(false); } + else { + setShowFooter(false); + setIsProduction(false); + setShowHeader(true); + } + }, [router.query, router.asPath, setBoxOfficeMode]) useEffect(()=> { diff --git a/apps/happin-web/lib/api/reward.ts b/apps/happin-web/lib/api/reward.ts index e38343a..97531f2 100644 --- a/apps/happin-web/lib/api/reward.ts +++ b/apps/happin-web/lib/api/reward.ts @@ -18,7 +18,7 @@ const getTransactionHistory = async (currency:string) => { const rewardCheckIn = async () => { - const response = await postToHappin_noBody(POST_CHECKIN); + const response = await postToHappin(POST_CHECKIN,{}); return response || {} } diff --git a/apps/happin-web/netlify.toml b/apps/happin-web/netlify.toml index 2fc1a4c..a4cbfa5 100644 --- a/apps/happin-web/netlify.toml +++ b/apps/happin-web/netlify.toml @@ -7,24 +7,24 @@ [context.deploy-preview.environment] NEXT_PUBLIC_HAPPIN_SERVER_HOST="https://api.happin.app/dev-v135" - NEXT_PUBLIC_CROWD_CORE_HOST="https://api.crowdcore.com/prod" + NEXT_PUBLIC_CROWD_CORE_HOST="https://api.crowdcore.com/dev" NEXT_PUBLIC_HAPPIN_SSO="https://sso.happin.app" NEXT_PUBLIC_FIREBASE_TOKEN_HOST="https://securetoken.googleapis.com/v1/token?key=AIzaSyA5i8Q5mjsKtpw5ju0OZOaUTL-ilGVMMPA" NEXT_PUBLIC_HAPPIN_APP_APPLE_STORE="https://apps.apple.com/app/id1527348429" NEXT_PUBLIC_PAYPAL_CLIENT_ID="Ac_rMHPwGlp4J_rp3SkuqWkgYwQ6VeQrWcts6EIlrXMudyUHo6G2FNtjgBxJJFM_eVALXtc1V717GIJ3" NEXT_PUBLIC_GOOGLE_PLACE_API_KEY="AIzaSyCaXFzIMrHWJfJO-YQYjd3Jv5KgQAMjVoo" NEXT_PUBLIC_IM_SDKAPPID="1400342624" - NEXT_PUBLIC_STRIPE_PRIVATE_KEY="pk_test_xQ4eMeFV55I3XLXC1ewIEyRq" + NEXT_PUBLIC_STRIPE_PRIVATE_KEY="pk_test_51KKA0xDDG6kENiyFV3fvA846nMiBtjKaS6tmADlLDJoIioLVLQYKmFx3M25mA72pxpGY3CGDZfrCII9z7DiU82m400q3HlNUkJ" NETLIFY_USE_YARN="true" [context.production.environment] NEXT_PUBLIC_HAPPIN_SERVER_HOST="https://api.happin.app/dev-v135" - NEXT_PUBLIC_CROWD_CORE_HOST="https://api.crowdcore.com/prod" + NEXT_PUBLIC_CROWD_CORE_HOST="https://api.crowdcore.com/dev" NEXT_PUBLIC_HAPPIN_SSO="https://sso.happin.app" NEXT_PUBLIC_FIREBASE_TOKEN_HOST="https://securetoken.googleapis.com/v1/token?key=AIzaSyA5i8Q5mjsKtpw5ju0OZOaUTL-ilGVMMPA" NEXT_PUBLIC_HAPPIN_APP_APPLE_STORE="https://apps.apple.com/app/id1527348429" NEXT_PUBLIC_PAYPAL_CLIENT_ID="Ac_rMHPwGlp4J_rp3SkuqWkgYwQ6VeQrWcts6EIlrXMudyUHo6G2FNtjgBxJJFM_eVALXtc1V717GIJ3" NEXT_PUBLIC_GOOGLE_PLACE_API_KEY="AIzaSyCaXFzIMrHWJfJO-YQYjd3Jv5KgQAMjVoo" NEXT_PUBLIC_IM_SDKAPPID="1400342624" - NEXT_PUBLIC_STRIPE_PRIVATE_KEY="pk_test_xQ4eMeFV55I3XLXC1ewIEyRq" + NEXT_PUBLIC_STRIPE_PRIVATE_KEY="pk_test_51KKA0xDDG6kENiyFV3fvA846nMiBtjKaS6tmADlLDJoIioLVLQYKmFx3M25mA72pxpGY3CGDZfrCII9z7DiU82m400q3HlNUkJ" NETLIFY_USE_YARN="true" diff --git a/apps/happin-web/pages/appreward/index.tsx b/apps/happin-web/pages/appreward/index.tsx index 02a3d7a..4fb2866 100644 --- a/apps/happin-web/pages/appreward/index.tsx +++ b/apps/happin-web/pages/appreward/index.tsx @@ -124,7 +124,7 @@ const Reward = () => { setInProgress(false) } catch (err) { - generateToast('Unknown error about rewards check in', toast); + generateToast('Unknown error about Claim reward', toast); console.log(err) setInProgress(false) } @@ -432,7 +432,7 @@ const Reward = () => {
Use coins like real money. When you purchase tickets with our events, you can get discounts.
- +
Cash Out Earning