Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
118 commits
Select commit Hold shift + click to select a range
501e488
add queries for minting characters
corlard3y Jan 8, 2026
611ed9b
chore: add character info
corlard3y Jan 12, 2026
9b25673
Merge branch 'main' of https://github.com/pushchain/push-portal into …
corlard3y Jan 16, 2026
6f7ace6
chore: fix merge errors
corlard3y Jan 16, 2026
434ce09
chore: add squads pages
corlard3y Jan 19, 2026
057896d
chore: add pushpassitem
corlard3y Jan 20, 2026
0b61eaf
Merge branch 'main' of https://github.com/pushchain/push-portal into …
corlard3y Jan 21, 2026
c64b6bd
chore:add logged in state and user details
corlard3y Jan 22, 2026
b5d7b5a
chore:add sybil check and leaderboard changes
corlard3y Jan 22, 2026
5f6557b
chore: add leaderboard items
corlard3y Jan 24, 2026
bfef6f2
chore: add squads endpoint
corlard3y Jan 24, 2026
72314b1
chore: add modal
corlard3y Jan 26, 2026
7a6c2cc
add spin endpoints
corlard3y Jan 26, 2026
c461833
chore: fix spin img
corlard3y Jan 26, 2026
7ba1706
chore: add bg img
corlard3y Jan 26, 2026
995f952
chore: add stopper
corlard3y Jan 26, 2026
ae2ac4e
chore: add spin status and auth headers check
corlard3y Jan 26, 2026
5fc8378
chore: add spin wheel endpoints
corlard3y Jan 26, 2026
ad7053b
chore: add invites
corlard3y Jan 27, 2026
2a3fc23
chore: add invite request code
corlard3y Jan 27, 2026
5f03b71
chore: update baseurl
corlard3y Jan 27, 2026
0a6e74e
chore: add stats data
corlard3y Jan 27, 2026
ea48079
chore: add null state
corlard3y Jan 27, 2026
91263d8
chore: fix naming
corlard3y Jan 27, 2026
46679a4
add type:fix
corlard3y Jan 27, 2026
a511357
chore: add create user flow
corlard3y Jan 27, 2026
0fad902
chore: update input text
corlard3y Jan 27, 2026
debf9b4
chore: add daily rewards changes
corlard3y Jan 27, 2026
ad51dbe
chore: add streak day
corlard3y Jan 28, 2026
3e51d5a
chore: remove close button
corlard3y Jan 28, 2026
83d2957
chore: pause - fix spinboard
corlard3y Jan 28, 2026
2ddcba1
chore: add context and update squads
corlard3y Jan 28, 2026
cbbb880
chore: add squads details
corlard3y Jan 28, 2026
136c160
chore: update invite modal
corlard3y Jan 29, 2026
28befbe
chore: add invite code flow
corlard3y Jan 29, 2026
943f3f5
rm logs
corlard3y Jan 29, 2026
869834d
chore: test otter pass
corlard3y Jan 29, 2026
1cdae94
chore: add demo card
corlard3y Jan 30, 2026
540d858
chore: add reflection
corlard3y Jan 30, 2026
36a437c
update title
corlard3y Feb 1, 2026
0c6bb60
chore: add eligible api
corlard3y Feb 1, 2026
93442a2
chore: pause character updates
corlard3y Feb 1, 2026
c3e1564
chore: add spin section
corlard3y Feb 2, 2026
951fe1b
chore: update spin status and landing
corlard3y Feb 2, 2026
e4c9df1
chore: add button config
corlard3y Feb 2, 2026
48fe9d8
chore: complete spin
corlard3y Feb 3, 2026
f51d835
chore: add pending invites
corlard3y Feb 3, 2026
8a8cdff
chore: add resolve wallet api and invite member modal fix
corlard3y Feb 4, 2026
64c1c32
add accept/reject endpoints
corlard3y Feb 4, 2026
5af311c
chore: fix modal and fix height in squads
corlard3y Feb 4, 2026
f3e370e
chore: add squad level card
corlard3y Feb 4, 2026
af4c93a
chore: add level progress
corlard3y Feb 4, 2026
4b042cd
chore: update rewards activities
corlard3y Feb 9, 2026
5d6c5f9
chore: add quests
corlard3y Feb 9, 2026
3e061a9
chore: add claim button for quests
corlard3y Feb 10, 2026
7e152ac
chore: add rare pass history
corlard3y Feb 10, 2026
7d00790
add rare pass apis
corlard3y Feb 10, 2026
75414c8
chore: add new otter pass files
corlard3y Feb 11, 2026
9b09a6b
chore: add locked status
corlard3y Feb 11, 2026
50e3af3
chore: update type fixes
corlard3y Feb 11, 2026
8fafefa
chore: add rare pass history
corlard3y Feb 11, 2026
d4bb38d
chore: add rarepass
corlard3y Feb 12, 2026
23d05b7
chore: add boss quests sections
corlard3y Feb 12, 2026
a7ace1b
chore: add questsProgress
corlard3y Feb 12, 2026
f538e5b
add quest progress types
corlard3y Feb 12, 2026
ab5489a
chore: add progress and error message
corlard3y Feb 12, 2026
2609d76
chore: add error message
corlard3y Feb 12, 2026
00e4645
chore: add activity button styles
corlard3y Feb 12, 2026
0d26342
chore: make responsive
corlard3y Feb 12, 2026
c183309
chore: fix laptop view
corlard3y Feb 12, 2026
f42f78a
chore: add locked state to dashboard header
corlard3y Feb 13, 2026
356741c
locked status
corlard3y Feb 13, 2026
54fa56f
chore: update eligibility button
corlard3y Feb 16, 2026
e2d345b
chore: add push wallet sybil api check
corlard3y Feb 16, 2026
35dc76c
chore: add push wallet sybil query files
corlard3y Feb 16, 2026
9ec5b64
chore: add custom check
corlard3y Feb 16, 2026
70bd3ca
chore: add next shuffle fees
corlard3y Feb 17, 2026
7be9f00
chore: add next reshuffle fee
corlard3y Feb 17, 2026
8ba1c01
chore: add payment to reshuffle
corlard3y Feb 17, 2026
822e206
chore: update season 3 baseurl
corlard3y Feb 17, 2026
edbdb9a
chore: fix baseurl
corlard3y Feb 17, 2026
ca36771
update basepath
corlard3y Feb 17, 2026
c203cb1
fix: base url
corlard3y Feb 17, 2026
b9b0edb
update basepath
corlard3y Feb 18, 2026
eee9885
chore: add streaks
corlard3y Feb 18, 2026
d1bb8c4
add spinner
corlard3y Feb 18, 2026
22e2d06
Merge branch 'main' into addSeasonThreeChanges
corlard3y Feb 18, 2026
4ea183a
chore: fix provider and auth buttons
corlard3y Feb 18, 2026
5d74fcf
chore: remove unused hooks
corlard3y Feb 18, 2026
7edaa25
chore: remove unused components
corlard3y Feb 18, 2026
0b80fe0
chore: fix level
corlard3y Feb 18, 2026
4a408dc
chore: add level up modal
corlard3y Feb 18, 2026
873e3e7
add temporary fix for levelProgress
corlard3y Feb 18, 2026
6c57f45
add level progress hook
corlard3y Feb 18, 2026
0bc19cf
chore: add invite refresh fn
corlard3y Feb 18, 2026
4935970
chore: add squad members table
corlard3y Feb 18, 2026
6eebcd1
chore: add squads section
corlard3y Feb 18, 2026
7d46604
fix squads/invites squads, progress bar
corlard3y Feb 18, 2026
b4df2c9
chore: fix invite code loading state
corlard3y Feb 19, 2026
63da9d1
chore: update type in models
corlard3y Feb 19, 2026
a346c32
chore: add sqauds types and fix more types
corlard3y Feb 19, 2026
c78d785
rm component
corlard3y Feb 19, 2026
c39d2ef
chore: fix social activities response
corlard3y Feb 23, 2026
4af5244
fix z-index
corlard3y Feb 23, 2026
cc5b58f
type check for activity success response
corlard3y Feb 23, 2026
c6f7604
chore: fix response
corlard3y Feb 27, 2026
c64b251
Merge branch 'main' into addSeasonThreeChanges
corlard3y Feb 27, 2026
6560214
chore: add discord & twitter
corlard3y Feb 28, 2026
6506672
test twitter firebase changes
corlard3y Feb 28, 2026
7847422
chore: add lottle files
corlard3y Feb 28, 2026
9e8e439
add lottie files
corlard3y Feb 28, 2026
657f3d2
chore: update streak border
corlard3y Feb 28, 2026
c72c2ce
chore: add second wallet flow
corlard3y Mar 2, 2026
9e2f655
Merge branch 'addSeasonThreeChanges' of https://github.com/pushchain/…
corlard3y Mar 2, 2026
aa51492
chore: add cult status api
corlard3y Mar 2, 2026
107f5b9
add cult api
corlard3y Mar 2, 2026
d682c41
chore: add cult leaderboard items
corlard3y Mar 2, 2026
8e25a39
chore: push changes
corlard3y Mar 2, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
"firebase": "^10.12.2",
"formik": "^2.4.9",
"gsap": "^3.14.1",
"lottie-react": "^2.4.1",
"openpgp": "^5.5.0",
"rc-pagination": "^5.1.0",
"react": "^19.0.0",
Expand Down
Binary file added public/Otter Pass/Accessory/01-Accessory.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/Otter Pass/Accessory/02-Accessory.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/Otter Pass/Accessory/03-Accessory.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/Otter Pass/Accessory/04-Accessory.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/Otter Pass/Accessory/05-Accessory.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/Otter Pass/Accessory/06-Accessory.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/Otter Pass/Accessory/07-Accessory.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/Otter Pass/Accessory/08-Accessory.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/Otter Pass/Accessory/09-Accessory.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/Otter Pass/Accessory/10-Accessory.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/Otter Pass/Accessory/11-Accessory.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/Otter Pass/Accessory/12-Accessory.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/Otter Pass/Accessory/13-Accessory.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/Otter Pass/Accessory/14-Accessory.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/Otter Pass/Accessory/15-Accessory.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/Otter Pass/Accessory/16-Accessory.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/Otter Pass/Accessory/17-Accessory.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/Otter Pass/Accessory/18-Accessory.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/Otter Pass/Accessory/19-Accessory.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/Otter Pass/Accessory/20-Accessory.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/Otter Pass/Accessory/21-Accessory.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/Otter Pass/Accessory/22-Accessory.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/Otter Pass/Accessory/23-Accessory.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/Otter Pass/Accessory/24-Accessory.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/Otter Pass/Accessory/25-Accessory.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/Otter Pass/Accessory/26-Accessory.png
Binary file added public/Otter Pass/Base-Body.png
Binary file added public/Otter Pass/Body/01-Body.png
Binary file added public/Otter Pass/Body/02-Body.png
Binary file added public/Otter Pass/Body/03-Body.png
Binary file added public/Otter Pass/Body/04-Body.png
Binary file added public/Otter Pass/Body/05-Body.png
Binary file added public/Otter Pass/Body/06-Body.png
Binary file added public/Otter Pass/Body/07-Body.png
Binary file added public/Otter Pass/Body/08-Body.png
Binary file added public/Otter Pass/Body/09-Body.png
Binary file added public/Otter Pass/Body/10-Body.png
Binary file added public/Otter Pass/Body/11-Body.png
Binary file added public/Otter Pass/Body/12-Body.png
Binary file added public/Otter Pass/Body/13-Body.png
Binary file added public/Otter Pass/Body/14-Body.png
Binary file added public/Otter Pass/Body/15-Body.png
Binary file added public/Otter Pass/Body/16-Body.png
Binary file added public/Otter Pass/Body/17-Body.png
Binary file added public/Otter Pass/Body/18-Body.png
Binary file added public/Otter Pass/Body/19-Body.png
Binary file added public/Otter Pass/Body/20-Body.png
Binary file added public/Otter Pass/Body/21-Body.png
Binary file added public/Otter Pass/Body/22-Body.png
Binary file added public/Otter Pass/Body/23-Body.png
Binary file added public/Otter Pass/Body/24-Body.png
Binary file added public/Otter Pass/Body/25-Body.png
Binary file added public/Otter Pass/Body/26-Body.png
Binary file added public/Otter Pass/Body/27-Body.png
Binary file added public/Otter Pass/Body/28-Body.png
Binary file added public/Otter Pass/Body/29-Body.png
Binary file added public/Otter Pass/Body/30-Body.png
Binary file added public/Otter Pass/Body/31-Body.png
Binary file added public/Otter Pass/Body/32-Body.png
Binary file added public/Otter Pass/Body/33-Body.png
Binary file added public/Otter Pass/Body/34-Body.png
Binary file added public/Otter Pass/Body/35-Body.png
Binary file added public/Otter Pass/Body/36-Body.png
Binary file added public/Otter Pass/Body/37-Body.png
Binary file added public/Otter Pass/Body/38-Body.png
Binary file added public/Otter Pass/Body/39-Body.png
Binary file added public/Otter Pass/Body/40-Body.png
Binary file added public/Otter Pass/Head/01-Head.png
Binary file added public/Otter Pass/Head/02-Head.png
Binary file added public/Otter Pass/Head/03-Head.png
Binary file added public/Otter Pass/Head/04-Head.png
Binary file added public/Otter Pass/Head/05-Head.png
Binary file added public/Otter Pass/Head/06-Head.png
Binary file added public/Otter Pass/Head/07-Head.png
Binary file added public/Otter Pass/Head/08-Head.png
Binary file added public/Otter Pass/Head/09-Head.png
Binary file added public/Otter Pass/Head/10-Head.png
Binary file added public/Otter Pass/Headgear/01-Headgear.png
Binary file added public/Otter Pass/Headgear/02-Headgear.png
Binary file added public/Otter Pass/Headgear/03-Headgear.png
Binary file added public/Otter Pass/Headgear/04-Headgear.png
Binary file added public/Otter Pass/Headgear/05-Headgear.png
Binary file added public/Otter Pass/Headgear/06-Headgear.png
Binary file added public/Otter Pass/Headgear/07-Headgear.png
Binary file added public/Otter Pass/Headgear/08-Headgear.png
Binary file added public/Otter Pass/Headgear/09-Headgear.png
Binary file added public/Otter Pass/Headgear/10-Headgear.png
Binary file added public/Otter Pass/Headgear/11-Headgear.png
Binary file added public/Otter Pass/Headgear/12-Headgear.png
Binary file added public/Otter Pass/Headgear/13-Headgear.png
Binary file added public/Otter Pass/Headgear/14-Headgear.png
Binary file added public/Otter Pass/Headgear/15-Headgear.png
Binary file added public/Otter Pass/Headgear/16-Headgear.png
Binary file added public/Otter Pass/Headgear/17-Headgear.png
Binary file added public/Otter Pass/Headgear/18-Headgear.png
Binary file added public/Otter Pass/Headgear/19-Headgear.png
Binary file added public/Otter Pass/Headgear/20-Headgear.png
Binary file added public/Otter Pass/Headgear/21-Headgear.png
Binary file added public/Otter Pass/Headgear/22-Headgear.png
Binary file added public/Otter Pass/Headgear/23-Headgear.png
Binary file added public/Otter Pass/Headgear/24-Headgear.png
Binary file added public/Otter Pass/Headgear/25-Headgear.png
Binary file added public/Otter Pass/Headgear/26-Headgear.png
Binary file added public/Otter Pass/Headgear/27-Headgear.png
Binary file added public/Otter Pass/Headgear/28-Headgear.png
Binary file added public/Otter Pass/Headgear/29-Headgear.png
Binary file added public/Otter Pass/Headgear/30-Headgear.png
Binary file added public/Otter Pass/Headgear/31-Headgear.png
Binary file added public/Otter Pass/Headgear/32-Headgear.png
Binary file added public/Otter Pass/Headgear/33-Headgear.png
Binary file added public/Otter Pass/Headgear/34-Headgear.png
Binary file added public/Otter Pass/Headgear/35-Headgear.png
Binary file added public/Otter Pass/Headgear/36-Headgear.png
Binary file added public/Otter Pass/Headgear/37-Headgear.png
Binary file added public/Otter Pass/Headgear/38-Headgear.png
71,794 changes: 71,794 additions & 0 deletions public/Otter Pass/Otter Pass Master.ai

Large diffs are not rendered by default.

Binary file added public/Otter Pass/Otter Pass Traits.zip
Binary file not shown.
6 changes: 3 additions & 3 deletions rewards.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
href="./static/assets/website/favicon.ico"
/>
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Push Chain Rewards S2</title>
<title>Push Chain Rewards S3</title>

<!--Google Fonts-->
<link rel="preconnect" href="https://fonts.googleapis.com">
Expand All @@ -18,7 +18,7 @@
<!-- Open Graph Meta Tags -->
<meta property="og:url" content="https://portal.push.org/rewards" />
<meta property="og:type" content="website" />
<meta property="og:title" content="Push Chain Rewards S2" />
<meta property="og:title" content="Push Chain Rewards S3" />
<meta
property="og:description"
content="Explore Push Chain Devnet, complete quests, bang out multipliers, and earn airdrops."
Expand All @@ -30,7 +30,7 @@

<!-- Twitter Meta Tags -->
<meta name="twitter:card" content="summary_large_image" />
<meta name="twitter:title" content="Push Chain Rewards S2" />
<meta name="twitter:title" content="Push Chain Rewards S3" />
<meta
name="twitter:description"
content="Explore Push Chain Devnet, complete quests, bang out multipliers, and earn airdrops."
Expand Down
103 changes: 84 additions & 19 deletions src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// React + Web3 Essentials
import React, { useState } from "react";
import React, { useState, useEffect } from "react";

// External Packages
import {
Expand All @@ -16,11 +16,11 @@ import {
PushUI,
PushUniversalWalletProvider,
ProviderConfigProps,
usePushWalletContext,
} from '@pushchain/ui-kit';

import { getPreviewBasePath } from "../basePath";
import { ThemeProviderWrapper } from "./context/themeContext";
import { AccountProvider } from "./context/accountContext";
import { RewardsContextProvider } from "./context/rewardsContext";

import { blocksColors, Box, getBlocksCSSVariables } from "../src/blocks";
Expand All @@ -36,6 +36,12 @@ import Header from "./structure/Header";
import SeasonBg from "../static/assets/website/shared/season-bg.webp";
import PreLaunchPage from "./pages/PreLaunchPage";
import AdminPage from "./pages/AdminPage";
import CultLeaderboardPage from "./pages/CultLeaderboardPage";
import SquadsPage from "./pages/SquadsPage";
import { InviteCodeModal } from "./components/InviteCodeModal";
import { walletToFullCAIP10 } from "./helpers/web3helper";
import { useGetSeasonThreeUserByWallet } from "./queries";
import { AuthHeadersProvider } from "./context/authHeadersContext";


const GlobalStyle = createGlobalStyle`
Expand Down Expand Up @@ -111,7 +117,30 @@ const queryClient = new QueryClient({});

const AppContent = () => {
const location = useLocation();
const { connectionStatus, universalAccount } = usePushWalletContext('wallet1');
const [isSidebarOpen, setIsSidebarOpen] = useState(false);
const [isInviteCodeModalOpen, setIsInviteCodeModalOpen] = useState(false);

const caip10WalletAddress = walletToFullCAIP10(
universalAccount?.address as string,
universalAccount?.chain,
);

const { data: seasonThreeDetails, isLoading } = useGetSeasonThreeUserByWallet({
walletAddress: caip10WalletAddress,
});

useEffect(() => {
if (connectionStatus !== 'connected') return;

if (isLoading) return;

if (seasonThreeDetails) {
setIsInviteCodeModalOpen(false);
} else {
setIsInviteCodeModalOpen(true);
}
}, [connectionStatus, seasonThreeDetails, isLoading]);

const toggleSidebar = () => {
setIsSidebarOpen(!isSidebarOpen);
Expand Down Expand Up @@ -172,12 +201,13 @@ const AppContent = () => {
`}
>
<Routes>
<Route path="/" element={<Navigate to="/rewards/pre-launch" replace />} />
<Route path="/rewards" element={<Navigate to="/rewards/pre-launch" replace />} />
{/*<Route path="/rewards" element={<Navigate to="/rewards/pre-launch" replace />} />*/}
<Route path="/" element={<Navigate to="/rewards" replace />} />
<Route path="/admin/controls" element={<AdminPage />} />
{/*<Route path="/rewards" element={<RewardsPage />} />
<Route path="/rewards/pushpass" element={<PushPassPage />} />*/}
<Route path="/rewards/pre-launch" element={<PreLaunchPage />} />
<Route path="/rewards" element={<RewardsPage />} />
<Route path="/rewards/pushpass" element={<PushPassPage />} />
<Route path="/rewards/squads" element={<SquadsPage />} />
{/*<Route path="/rewards/pre-launch" element={<PreLaunchPage />} />*/}
<Route
path="/rewards/pushpass/:id"
element={<PushPassItemPage />}
Expand All @@ -194,6 +224,10 @@ const AppContent = () => {
path="/rewards/leaderboard-s1"
element={<LeaderBoardPage />}
/>
<Route
path="/cult/leaderboard"
element={<CultLeaderboardPage />}
/>
<Route
path="/discord/verification"
element={<DiscordVerificationPage />}
Expand All @@ -202,24 +236,46 @@ const AppContent = () => {
</Routes>
</Box>
</Box>

<InviteCodeModal
isOpen={isInviteCodeModalOpen}
onClose={() => setIsInviteCodeModalOpen(false)}
/>
</Box>
);
};

function App() {

const walletConfig: ProviderConfigProps = {
uid: 'wallet1',
network: PushUI.CONSTANTS.PUSH_NETWORK.TESTNET,
login: {
email: false,
google: false,
phone: false,
socials: {
x: false,
github: false,
discord: false,
bluesky: false
wallet: {
enabled: true,
},
appPreview: true,
},
modal: {
loginLayout: PushUI.CONSTANTS.LOGIN.LAYOUT.SPLIT,
connectedLayout: PushUI.CONSTANTS.CONNECTED.LAYOUT.HOVER,
appPreview: true,
connectedInteraction: PushUI.CONSTANTS.CONNECTED.INTERACTION.BLUR,
},
chainConfig: {
rpcUrls: {
},
},
};

const linkedWalletConfig: ProviderConfigProps = {
uid: 'wallet2',
network: PushUI.CONSTANTS.PUSH_NETWORK.TESTNET,
login: {
email: false,
google: false,
wallet: {
enabled: true,
},
Expand Down Expand Up @@ -249,15 +305,24 @@ function App() {
'--pw-core-font-family': "'DM Sans', sans-serif",
'--pwauth-btn-connected-bg-color': '#D548EC'
}}
>
<AccountProvider>
>
{/*<PushUniversalWalletProvider
config={linkedWalletConfig}
themeMode={PushUI.CONSTANTS.THEME.DARK}
themeOverrides={{
'--pw-core-font-family': "'DM Sans', sans-serif",
'--pwauth-btn-connected-bg-color': '#D548EC'
}}
>*/}
<QueryClientProvider client={queryClient}>
<RewardsContextProvider>
<QueryClientProvider client={queryClient}>
<AuthHeadersProvider>
<AppContent />
<ReactQueryDevtools initialIsOpen={false} />
</QueryClientProvider>
</RewardsContextProvider>
</AccountProvider>
</AuthHeadersProvider>
</RewardsContextProvider>
</QueryClientProvider>
{/*</PushUniversalWalletProvider>*/}
</PushUniversalWalletProvider>
</Router>
</ThemeProviderWrapper>
Expand Down
2 changes: 1 addition & 1 deletion src/blocks/button/Button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export type ButtonProps = {
/* Render an icon after button contents */
trailingIcon?: ReactNode;
/* Sets the variant of the button */
variant?: ButtonVariant;
variant?: ButtonVariant | string;
/* Button takes the full width if enabled */
block?: boolean;
/* Button loading state */
Expand Down
3 changes: 2 additions & 1 deletion src/blocks/button/Button.types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ export type ButtonVariant =
| 'tertiary'
| 'danger'
| 'dangerSecondary'
| 'outline';
| 'outline'
| 'success';

export type ButtonSize = 'extraSmall' | 'small' | 'medium' | 'large';
43 changes: 37 additions & 6 deletions src/blocks/button/Button.utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ export const getButtonVariantStyles = (
color: var(--components-button-secondary-text-disabled);
};`
};

`;
}
case 'tertiary': {
Expand All @@ -83,7 +83,7 @@ export const getButtonVariantStyles = (
color: var(--components-button-tertiary-text-default);
background-color: var(--components-button-tertiary-background-hover);
}

&:active {
background-color: var(--components-button-tertiary-background-pressed);
color: var(--components-button-secondary-text-default);
Expand Down Expand Up @@ -145,7 +145,7 @@ export const getButtonVariantStyles = (
&:hover {
background-color: var(--components-button-danger-secondary-background-hover);
}

&:active {
background-color: var(--components-button-danger-secondary-background-pressed);
}`
Expand All @@ -165,6 +165,35 @@ export const getButtonVariantStyles = (
};
`;
}
case 'success': {
return `
background-color: ${loading ? '#3da876' : '#4AC887'};
color: #fff;
${
!loading &&
`
&:hover {
background-color: #3da876;
}
&:active {
background-color: #349667;
}`
};

&:focus-visible {
background-color: #3da876;
border: var(--border-sm) solid #2d8459;
outline: none;
}
${
!loading &&
`&:disabled {
background-color: #4AC88766;
color: #ffffff99;
}`
};
`;
}
case 'outline': {
return `
background-color: var(--components-button-outline-background-default);
Expand All @@ -178,7 +207,7 @@ export const getButtonVariantStyles = (
border: var(--border-sm) solid var(--components-button-outline-stroke-hover);
background-color: var(--components-button-outline-background-hover);
}

&:active {
border: var(--border-sm) solid var(--components-button-outline-stroke-pressed);
background-color: var(--components-button-outline-background-pressed);
Expand All @@ -194,8 +223,10 @@ export const getButtonVariantStyles = (
!loading &&
`&:disabled {
border: none;
background-color: var(--components-button-tertiary-background-disabled);
color: var(--components-button-outline-text-disabled);
opacity: 0.7;
color: var(--components-button-outline-stroke-default);
background-color: var(--components-button-outline-background-default);
border: var(--border-sm) solid var(--components-button-outline-stroke-default);
}`
};
`;
Expand Down
20 changes: 20 additions & 0 deletions src/blocks/icons/components/SeasonThreeEllipse.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import { FC } from 'react';
import { IconWrapper } from '../IconWrapper';
import { IconProps } from '../Icons.types';

const SeasonThreeEllipse: FC<IconProps> = (allProps) => {
const { svgProps: props, ...restProps } = allProps;
return (
<IconWrapper
componentName='SeasonThreeEllipse'
icon={
<svg xmlns="http://www.w3.org/2000/svg" width="inherit" height="inherit" viewBox="0 0 4 4" fill="none" {...props}>
<circle cx="2" cy="2" r="2" fill="currentColor"/>
</svg>
}
{...restProps}
/>
);
};

export default SeasonThreeEllipse;
20 changes: 20 additions & 0 deletions src/blocks/icons/components/SquadsIcon.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import { FC } from 'react';
import { IconWrapper } from '../IconWrapper';
import { IconProps } from '../Icons.types';

const SquadsIcon: FC<IconProps> = (allProps) => {
const { svgProps: props, ...restProps } = allProps;
return (
<IconWrapper
componentName='Squads'
icon={
<svg xmlns="http://www.w3.org/2000/svg" width="inherit" height="inherit" viewBox="0 0 32 32" fill="none" {...props}>
<path d="M3.4 15.8C3.50506 15.8788 3.62461 15.9361 3.75182 15.9687C3.87903 16.0013 4.01142 16.0085 4.14142 15.9899C4.27142 15.9714 4.39649 15.9274 4.50949 15.8605C4.62249 15.7936 4.72121 15.7051 4.8 15.6C5.40546 14.7927 6.19055 14.1375 7.09311 13.6862C7.99567 13.2349 8.99091 13 10 13C11.0091 13 12.0043 13.2349 12.9069 13.6862C13.8094 14.1375 14.5945 14.7927 15.2 15.6C15.3593 15.812 15.5963 15.952 15.8588 15.9893C16.1214 16.0265 16.388 15.958 16.6 15.7987C16.6756 15.7426 16.7426 15.6756 16.7987 15.6C17.4042 14.7927 18.1893 14.1375 19.0919 13.6862C19.9944 13.2349 20.9897 13 21.9988 13C23.0078 13 24.0031 13.2349 24.9056 13.6862C25.8082 14.1375 26.5933 14.7927 27.1987 15.6C27.358 15.8122 27.5951 15.9524 27.8578 15.9898C28.1204 16.0272 28.3872 15.9587 28.5994 15.7994C28.8115 15.6401 28.9518 15.403 28.9891 15.1404C29.0265 14.8777 28.958 14.6109 28.7987 14.3987C27.9136 13.2121 26.7332 12.2778 25.375 11.6887C26.1196 11.0089 26.6413 10.1199 26.8716 9.13824C27.1019 8.15663 27.03 7.12832 26.6654 6.18827C26.3009 5.24823 25.6606 4.44037 24.8287 3.87071C23.9967 3.30106 23.012 2.99623 22.0037 2.99623C20.9955 2.99623 20.0108 3.30106 19.1788 3.87071C18.3469 4.44037 17.7066 5.24823 17.3421 6.18827C16.9775 7.12832 16.9056 8.15663 17.1359 9.13824C17.3662 10.1199 17.8879 11.0089 18.6325 11.6887C17.6518 12.1129 16.761 12.72 16.0075 13.4775C15.254 12.72 14.3632 12.1129 13.3825 11.6887C14.1271 11.0089 14.6488 10.1199 14.8791 9.13824C15.1094 8.15663 15.0375 7.12832 14.6729 6.18827C14.3084 5.24823 13.6681 4.44037 12.8362 3.87071C12.0042 3.30106 11.0195 2.99623 10.0112 2.99623C9.00298 2.99623 8.01827 3.30106 7.18634 3.87071C6.35442 4.44037 5.71415 5.24823 5.34957 6.18827C4.98499 7.12832 4.91313 8.15663 5.14342 9.13824C5.37371 10.1199 5.89539 11.0089 6.64 11.6887C5.27587 12.276 4.08971 13.2108 3.2 14.4C3.12121 14.5051 3.06388 14.6246 3.03129 14.7518C2.99869 14.879 2.99148 15.0114 3.01005 15.1414C3.02862 15.2714 3.07262 15.3965 3.13953 15.5095C3.20643 15.6225 3.29494 15.7212 3.4 15.8ZM22 5C22.5933 5 23.1734 5.17594 23.6667 5.50559C24.1601 5.83523 24.5446 6.30377 24.7716 6.85195C24.9987 7.40013 25.0581 8.00332 24.9424 8.58527C24.8266 9.16721 24.5409 9.70176 24.1213 10.1213C23.7018 10.5409 23.1672 10.8266 22.5853 10.9424C22.0033 11.0581 21.4001 10.9987 20.8519 10.7716C20.3038 10.5446 19.8352 10.1601 19.5056 9.66671C19.1759 9.17336 19 8.59334 19 8C19 7.20435 19.3161 6.44129 19.8787 5.87868C20.4413 5.31607 21.2044 5 22 5ZM10 5C10.5933 5 11.1734 5.17594 11.6667 5.50559C12.1601 5.83523 12.5446 6.30377 12.7716 6.85195C12.9987 7.40013 13.0581 8.00332 12.9424 8.58527C12.8266 9.16721 12.5409 9.70176 12.1213 10.1213C11.7018 10.5409 11.1672 10.8266 10.5853 10.9424C10.0033 11.0581 9.40013 10.9987 8.85195 10.7716C8.30377 10.5446 7.83524 10.1601 7.50559 9.66671C7.17595 9.17336 7 8.59334 7 8C7 7.20435 7.31607 6.44129 7.87868 5.87868C8.44129 5.31607 9.20435 5 10 5ZM25.375 24.6887C26.1196 24.0089 26.6413 23.1199 26.8716 22.1382C27.1019 21.1566 27.03 20.1283 26.6654 19.1883C26.3009 18.2482 25.6606 17.4404 24.8287 16.8707C23.9967 16.3011 23.012 15.9962 22.0037 15.9962C20.9955 15.9962 20.0108 16.3011 19.1788 16.8707C18.3469 17.4404 17.7066 18.2482 17.3421 19.1883C16.9775 20.1283 16.9056 21.1566 17.1359 22.1382C17.3662 23.1199 17.8879 24.0089 18.6325 24.6887C17.6518 25.1129 16.761 25.72 16.0075 26.4775C15.254 25.72 14.3632 25.1129 13.3825 24.6887C14.1271 24.0089 14.6488 23.1199 14.8791 22.1382C15.1094 21.1566 15.0375 20.1283 14.6729 19.1883C14.3084 18.2482 13.6681 17.4404 12.8362 16.8707C12.0042 16.3011 11.0195 15.9962 10.0112 15.9962C9.00298 15.9962 8.01827 16.3011 7.18634 16.8707C6.35442 17.4404 5.71415 18.2482 5.34957 19.1883C4.98499 20.1283 4.91313 21.1566 5.14342 22.1382C5.37371 23.1199 5.89539 24.0089 6.64 24.6887C5.27587 25.276 4.08971 26.2108 3.2 27.4C3.12121 27.5051 3.06388 27.6246 3.03129 27.7518C2.99869 27.879 2.99148 28.0114 3.01005 28.1414C3.02862 28.2714 3.07262 28.3965 3.13953 28.5095C3.20643 28.6225 3.29494 28.7212 3.4 28.8C3.50506 28.8788 3.62461 28.9361 3.75182 28.9687C3.87903 29.0013 4.01142 29.0085 4.14142 28.9899C4.27142 28.9714 4.39649 28.9274 4.50949 28.8605C4.62249 28.7936 4.72121 28.7051 4.8 28.6C5.40546 27.7927 6.19055 27.1375 7.09311 26.6862C7.99567 26.2349 8.99091 26 10 26C11.0091 26 12.0043 26.2349 12.9069 26.6862C13.8094 27.1375 14.5945 27.7927 15.2 28.6C15.3593 28.812 15.5963 28.952 15.8588 28.9893C16.1214 29.0265 16.388 28.958 16.6 28.7987C16.6756 28.7426 16.7426 28.6756 16.7987 28.6C17.4042 27.7927 18.1893 27.1375 19.0919 26.6862C19.9944 26.2349 20.9897 26 21.9988 26C23.0078 26 24.0031 26.2349 24.9056 26.6862C25.8082 27.1375 26.5933 27.7927 27.1987 28.6C27.358 28.8122 27.5951 28.9524 27.8578 28.9898C28.1204 29.0272 28.3872 28.9587 28.5994 28.7994C28.8115 28.6401 28.9518 28.403 28.9891 28.1404C29.0265 27.8777 28.958 27.6109 28.7987 27.3987C27.9136 26.2121 26.7332 25.2778 25.375 24.6887ZM10 18C10.5933 18 11.1734 18.1759 11.6667 18.5056C12.1601 18.8352 12.5446 19.3038 12.7716 19.8519C12.9987 20.4001 13.0581 21.0033 12.9424 21.5853C12.8266 22.1672 12.5409 22.7018 12.1213 23.1213C11.7018 23.5409 11.1672 23.8266 10.5853 23.9424C10.0033 24.0581 9.40013 23.9987 8.85195 23.7716C8.30377 23.5446 7.83524 23.1601 7.50559 22.6667C7.17595 22.1734 7 21.5933 7 21C7 20.2043 7.31607 19.4413 7.87868 18.8787C8.44129 18.3161 9.20435 18 10 18ZM22 18C22.5933 18 23.1734 18.1759 23.6667 18.5056C24.1601 18.8352 24.5446 19.3038 24.7716 19.8519C24.9987 20.4001 25.0581 21.0033 24.9424 21.5853C24.8266 22.1672 24.5409 22.7018 24.1213 23.1213C23.7018 23.5409 23.1672 23.8266 22.5853 23.9424C22.0033 24.0581 21.4001 23.9987 20.8519 23.7716C20.3038 23.5446 19.8352 23.1601 19.5056 22.6667C19.1759 22.1734 19 21.5933 19 21C19 20.2043 19.3161 19.4413 19.8787 18.8787C20.4413 18.3161 21.2044 18 22 18Z" fill="currentColor"/>
</svg>
}
{...restProps}
/>
);
};

export default SquadsIcon;
8 changes: 8 additions & 0 deletions src/blocks/icons/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -184,21 +184,29 @@ export { default as RewardsStarGradient } from "./components/RewardsStarGradient
export { default as Sale } from "./components/Sale";

export { default as SealCheck } from "./components/SealCheck";

export { default as SealCheckFilled } from "./components/SealCheckFilled";

export { default as Search } from "./components/Search";

export { default as SearchFilled } from "./components/SearchFilled";

export { default as SeasonThreeEllipse } from './components/SeasonThreeEllipse';

export { default as SendFilled } from "./components/SendFilled";

export { default as SendNotification } from "./components/SendNotification";

export { default as SendNotificationFilled } from "./components/SendNotificationFilled";

export { default as Smiley } from "./components/Smiley";

export { default as SquaresFour } from "./components/SquaresFour";

export { default as SquadsIcon } from './components/SquadsIcon';

export { default as Star } from "./components/Star";

export { default as StarFilled } from "./components/StarFilled";

export { default as Settings } from "./components/Settings";
Expand Down
Loading