Skip to content
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.

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

merge testnet modify to mainnet #37

Merged
merged 53 commits into from
Mar 17, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
4ffc0d5
update nova tx hash verify
MickWang Mar 15, 2024
7113be0
update for nova hash verify
MickWang Mar 15, 2024
04817d0
feat:mobile ui change.
SarahShy0920 Mar 15, 2024
3d7984e
fix: change leaderboard
haymond-ZK Mar 16, 2024
2265de1
Merge branch 'main' of github.com:zkLinkProtocol/zklink-nova-app into…
haymond-ZK Mar 16, 2024
7b81394
fix: Fixed mobile style
haymond-ZK Mar 16, 2024
751cc22
Merge branch 'main' of github.com:zkLinkProtocol/zklink-nova-app into…
haymond-ZK Mar 16, 2024
93db4b1
fix: Fixed mobile notification
haymond-ZK Mar 16, 2024
634c80f
feat:mobile UI
SarahShy0920 Mar 16, 2024
79f46d2
Merge remote-tracking branch 'origin/main' into feature-ui_mobile_adapt
SarahShy0920 Mar 16, 2024
50381d8
fix:merge bug fix
SarahShy0920 Mar 16, 2024
32d6c45
Merge branch 'feature-ui_mobile_adapt' into feat/test
SarahShy0920 Mar 16, 2024
d3ede6f
test twitter auth
zkLeonardo Mar 16, 2024
5214509
test twitter auth
zkLeonardo Mar 16, 2024
75b3741
test twitter auth
zkLeonardo Mar 16, 2024
76354cf
feat: add twitter main account widget
zkLeonardo Mar 14, 2024
0994ee2
update twitter main account widget
zkLeonardo Mar 15, 2024
3d994eb
update maintenance tips
zkLeonardo Mar 15, 2024
c48a18f
add blast
MickWang Mar 15, 2024
aaf1b69
update for blast
MickWang Mar 15, 2024
ce29e8a
fix: update eth amount
zkLeonardo Mar 15, 2024
5592a62
fix: update leaderboard account self data style
zkLeonardo Mar 15, 2024
20ce3ac
update for blast
MickWang Mar 15, 2024
0799c86
add tweet share btn
MickWang Mar 14, 2024
3b0f876
update for tweet share
MickWang Mar 15, 2024
7585dd8
update for tweet share
MickWang Mar 15, 2024
88429b8
feat: update nova points style
zkLeonardo Mar 15, 2024
7d2f8b6
feat: update nova points style
zkLeonardo Mar 15, 2024
d14d4f2
update twitter share text
zkLeonardo Mar 15, 2024
09d2810
add dashboard tips & add header explorer nav
zkLeonardo Mar 15, 2024
207ca1e
fix: update titter share btn
zkLeonardo Mar 16, 2024
1374ec8
fix: update titter share btn
zkLeonardo Mar 16, 2024
d0af922
fix merge
zkLeonardo Mar 16, 2024
39128a9
fix merge
zkLeonardo Mar 16, 2024
f80ec10
fix merge
zkLeonardo Mar 16, 2024
137a5de
Merge branch 'feat/verify-hash-nova' into goerli
zkLeonardo Mar 16, 2024
da6bfc4
update twitter auth
zkLeonardo Mar 16, 2024
c13e361
Merge branch 'feat/test' into goerli
zkLeonardo Mar 16, 2024
2c1f7ee
fix: Fixed modal style
haymond-ZK Mar 16, 2024
5af9739
Merge branch 'feat/test' into goerli
zkLeonardo Mar 16, 2024
e3696fd
fix: update leaderboard table style
zkLeonardo Mar 16, 2024
1ecc1e7
fix: Optimize button
haymond-ZK Mar 16, 2024
567609d
for test wallet
MickWang Mar 16, 2024
9234bfc
fix: update group milestone pregress bar
zkLeonardo Mar 17, 2024
645e86a
update twitter auth for mainnet
zkLeonardo Mar 17, 2024
0eecd9f
fix: update eth amount
zkLeonardo Mar 15, 2024
67f3ef0
feat: update nova points style
zkLeonardo Mar 15, 2024
abccb23
fix merge
zkLeonardo Mar 17, 2024
d5eed2f
fix merge
zkLeonardo Mar 17, 2024
a3486c5
feat: update nova points style
zkLeonardo Mar 15, 2024
d179a42
feat:mobile UI
SarahShy0920 Mar 16, 2024
1be233c
fix merge
zkLeonardo Mar 17, 2024
e8feeed
fix: update bridge
zkLeonardo Mar 17, 2024
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
Prev Previous commit
Next Next commit
fix: change leaderboard
  • Loading branch information
haymond-ZK committed Mar 16, 2024
commit 3d7984e5dc92d7be7ca04404095020bb8d4bb99e
2 changes: 0 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/pages/Dashboard/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -476,7 +476,7 @@ export default function Dashboard() {
* return home page if not active
*/
if (!isConnected || !invite?.twitterHandler) {
navigatorTo("/");
navigatorTo("/");
}
}, [isConnected, invite]);

Expand Down
22 changes: 12 additions & 10 deletions src/pages/Leaderboard/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,11 @@ import NFTLeaderboard from "./components/NFTLeaderboard";
import NFTLuckWinner from "./components/NFTLuckWinner";
import styled from "styled-components";
import { useState } from "react";
import { BgBox, BgCoverImg, TableBox } from "@/styles/common";
import { BgBox, BgCoverImg, TableBoxs } from "@/styles/common";
import { Tooltip as ReactTooltip } from "react-tooltip";
const TabItem = styled.div`
border-radius: 1rem;
background: rgba(51, 51, 51, 0.4);
backdrop-filter: blur(15.800000190734863px);
color: #7b8ea0;
font-family: Satoshi;
font-size: 1rem;
font-style: normal;
Expand All @@ -22,18 +20,22 @@ const TabItem = styled.div`
background: rgba(0, 0, 0, 0.4);
backdrop-filter: blur(15.800000190734863px);
}
.gradient-btn{
background: linear-gradient(to right, #48ebae, #3d51fc, #49e9b0);
color: #fff;
}
`;

export default function Leaderboard() {
const [tabsActive, setTabsActive] = useState(0);
return (
<BgBox>
<BgCoverImg />
<div className="px-[10.44rem] mt-[3rem] min-h-[50rem] overflow-auto z-[10]">
<div className="md:px-[10.44rem] md:mt-[3rem] min-h-[50rem] overflow-auto z-[10] px-[1rem] mt-[1rem]">
{/* Tab btns */}
<div className="flex items-center gap-[2rem]">
<div className="flex items-center md:gap-[2rem] gap-[1rem]">
<TabItem
className={`px-[2rem] py-[1rem] cursor-pointer ${
className={`md:px-[2rem] px-[1rem] md:py-[1rem] py-[0.5rem] cursor-pointer text-nowrap gradient-btn ${
tabsActive === 0 ? "active" : ""
}`}
onClick={() => setTabsActive(0)}
Expand All @@ -44,13 +46,13 @@ export default function Leaderboard() {
{/* <Tooltip content="coming soon"> */}
<TabItem
data-tooltip-id="coming-soon"
className={`px-[2rem] py-[1rem] opacity-40 cursor-not-allowed`}
className={`md:px-[2rem] px-[1rem] md:py-[1rem] py-[0.5rem] opacity-40 cursor-not-allowed text-nowrap bg-slate-700/40 text-slate-500`}
>
Referral Leaderboard
</TabItem>
<TabItem
data-tooltip-id="coming-soon"
className={`px-[2rem] py-[1rem] opacity-40 cursor-not-allowed`}
className={`md:px-[2rem] px-[1rem] md:py-[1rem] py-[0.5rem] opacity-40 cursor-not-allowed text-nowrap bg-slate-700/40 text-slate-500`}
>
Mystery Box Winners
</TabItem>
Expand All @@ -64,11 +66,11 @@ export default function Leaderboard() {
/>

{/* Content: tab views */}
<TableBox className="mt-[2rem]">
<TableBoxs className="mt-[2rem]">
{tabsActive === 0 && <PointsLeaderboard />}
{tabsActive === 1 && <NFTLeaderboard />}
{tabsActive === 2 && <NFTLuckWinner />}
</TableBox>
</TableBoxs>
</div>
</BgBox>
);
Expand Down
44 changes: 43 additions & 1 deletion src/styles/common.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export const BgCoverImg = styled.div`
top: 7.5rem;
left: 50%;
transform: translate(-50%, 0);
width: 58.875rem;
width: 100vw;
height: calc(100vh - 7.5rem);
border-radius: 58.875rem;
background: rgba(0, 194, 255, 0.32);
Expand Down Expand Up @@ -92,6 +92,48 @@ export const TableBox = styled.div`
}
`;

export const TableBoxs = styled.div`
.table {
padding: 0 1.5rem;
border-radius: 1rem;
background: rgba(0, 0, 0, 0.4);
backdrop-filter: blur(15.800000190734863px);
}
.table-header {
tr {
border-bottom: 0.0625rem solid #546779;
}
th {
padding: 1.5rem 1rem 1.5rem 0;
background: none;
color: #c6d3dd;
font-family: Satoshi;
font-size: 1rem;
font-style: normal;
font-weight: 900;
line-height: 1.5rem; /* 150% */
}
th::last-child {
padding-right: 0;
}
}

.table-tbody {
tr:first-child td {
padding: 1.5rem 0 0.75rem;
}
tr:last-child td {
padding: 0.75rem 0 1.5rem;
}
td {
padding: 0.75rem 1rem 0.75rem 0;
}
td::last-child {
padding-right: 0;
}
}
`;

export const FooterTvlText = styled.p`
color: #fff;
font-family: Satoshi;
Expand Down