Skip to content

bug fix #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ceciliaxu9692 wants to merge 5 commits into
base: master
Choose a base branch
from
Open

bug fix #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bce8f93
bug fix
ceciliaxu9692 Jan 19, 2022
b4fb634
update footer and header
ceciliaxu9692 Jan 19, 2022
ad9022f
change stripe key
ceciliaxu9692 Jan 24, 2022
c53a748
fix error message for claim reward
ceciliaxu9692 Jan 25, 2022
399d1fe
update reward
ceciliaxu9692 Jan 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 16 additions & 12 deletions apps/happin-web/components/Layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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(()=> {
Expand Down
2 changes: 1 addition & 1 deletion apps/happin-web/lib/api/reward.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 || {}
}

Expand Down
8 changes: 4 additions & 4 deletions apps/happin-web/netlify.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
4 changes: 2 additions & 2 deletions apps/happin-web/pages/appreward/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down Expand Up @@ -432,7 +432,7 @@ const Reward = () => {
<div className="text-gray-400 font-medium text-sm leading-5">Use coins like real money. When you purchase tickets with our events, you can get discounts.</div>
</div>
<div className="bg-gray-800 rounded-xl px-4 pt-3 pb-4 mb-4" >
<a className="flex items-center" href={`mailto:WithdrawBalance@happin.app?subject=uid:${user?.uid} username:${user?.happinID}&body=message%20goes%20here`} target="_blank">
<a className="flex items-center" href={`mailto:WithdrawBalance@happin.app?subject=uid:${user?.uid} username:${user?.happinID}&body=message%20goes%20here`} target="_blank" rel="noreferrer">
<div className="flex-1">
<div className="text-lg leading-6 text-white font-semibold mb-1.5">
<span className="align-middle">Cash Out Earning</span>
Expand Down