Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
frontend
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
vicotor
frontend
Commits
aeb5635c
Unverified
Commit
aeb5635c
authored
Feb 17, 2025
by
Max Alekseenko
Committed by
GitHub
Feb 17, 2025
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
change Merits dashboard path (#2575)
parent
c97e3f9d
Changes
12
Show whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
15 additions
and
11 deletions
+15
-11
getPageOgType.ts
lib/metadata/getPageOgType.ts
+1
-1
description.ts
lib/metadata/templates/description.ts
+1
-1
title.ts
lib/metadata/templates/title.ts
+1
-1
getPageType.ts
lib/mixpanel/getPageType.ts
+1
-1
nextjs-routes.d.ts
nextjs/nextjs-routes.d.ts
+1
-1
redirects.js
nextjs/redirects.js
+4
-0
merits.tsx
pages/account/merits.tsx
+1
-1
RewardsButton.tsx
ui/rewards/RewardsButton.tsx
+1
-1
CongratsStepContent.tsx
ui/rewards/login/steps/CongratsStepContent.tsx
+1
-1
LoginStepContent.tsx
ui/rewards/login/steps/LoginStepContent.tsx
+1
-1
useLogout.ts
ui/snippets/auth/useLogout.ts
+1
-1
NavLinkRewards.tsx
ui/snippets/navigation/vertical/NavLinkRewards.tsx
+1
-1
No files found.
lib/metadata/getPageOgType.ts
View file @
aeb5635c
...
@@ -28,7 +28,7 @@ const OG_TYPE_DICT: Record<Route['pathname'], OGPageType> = {
...
@@ -28,7 +28,7 @@ const OG_TYPE_DICT: Record<Route['pathname'], OGPageType> = {
'
/graphiql
'
:
'
Regular page
'
,
'
/graphiql
'
:
'
Regular page
'
,
'
/search-results
'
:
'
Regular page
'
,
'
/search-results
'
:
'
Regular page
'
,
'
/auth/profile
'
:
'
Root page
'
,
'
/auth/profile
'
:
'
Root page
'
,
'
/account/
reward
s
'
:
'
Regular page
'
,
'
/account/
merit
s
'
:
'
Regular page
'
,
'
/account/watchlist
'
:
'
Regular page
'
,
'
/account/watchlist
'
:
'
Regular page
'
,
'
/account/api-key
'
:
'
Regular page
'
,
'
/account/api-key
'
:
'
Regular page
'
,
'
/account/custom-abi
'
:
'
Regular page
'
,
'
/account/custom-abi
'
:
'
Regular page
'
,
...
...
lib/metadata/templates/description.ts
View file @
aeb5635c
...
@@ -31,7 +31,7 @@ const TEMPLATE_MAP: Record<Route['pathname'], string> = {
...
@@ -31,7 +31,7 @@ const TEMPLATE_MAP: Record<Route['pathname'], string> = {
'
/graphiql
'
:
DEFAULT_TEMPLATE
,
'
/graphiql
'
:
DEFAULT_TEMPLATE
,
'
/search-results
'
:
DEFAULT_TEMPLATE
,
'
/search-results
'
:
DEFAULT_TEMPLATE
,
'
/auth/profile
'
:
DEFAULT_TEMPLATE
,
'
/auth/profile
'
:
DEFAULT_TEMPLATE
,
'
/account/
reward
s
'
:
DEFAULT_TEMPLATE
,
'
/account/
merit
s
'
:
DEFAULT_TEMPLATE
,
'
/account/watchlist
'
:
DEFAULT_TEMPLATE
,
'
/account/watchlist
'
:
DEFAULT_TEMPLATE
,
'
/account/api-key
'
:
DEFAULT_TEMPLATE
,
'
/account/api-key
'
:
DEFAULT_TEMPLATE
,
'
/account/custom-abi
'
:
DEFAULT_TEMPLATE
,
'
/account/custom-abi
'
:
DEFAULT_TEMPLATE
,
...
...
lib/metadata/templates/title.ts
View file @
aeb5635c
...
@@ -28,7 +28,7 @@ const TEMPLATE_MAP: Record<Route['pathname'], string> = {
...
@@ -28,7 +28,7 @@ const TEMPLATE_MAP: Record<Route['pathname'], string> = {
'
/graphiql
'
:
'
GraphQL for %network_name% - %network_name% data query
'
,
'
/graphiql
'
:
'
GraphQL for %network_name% - %network_name% data query
'
,
'
/search-results
'
:
'
%network_name% search result for %q%
'
,
'
/search-results
'
:
'
%network_name% search result for %q%
'
,
'
/auth/profile
'
:
'
%network_name% - my profile
'
,
'
/auth/profile
'
:
'
%network_name% - my profile
'
,
'
/account/
rewards
'
:
'
%network_name% - reward
s
'
,
'
/account/
merits
'
:
'
%network_name% - Merit
s
'
,
'
/account/watchlist
'
:
'
%network_name% - watchlist
'
,
'
/account/watchlist
'
:
'
%network_name% - watchlist
'
,
'
/account/api-key
'
:
'
%network_name% - API keys
'
,
'
/account/api-key
'
:
'
%network_name% - API keys
'
,
'
/account/custom-abi
'
:
'
%network_name% - custom ABI
'
,
'
/account/custom-abi
'
:
'
%network_name% - custom ABI
'
,
...
...
lib/mixpanel/getPageType.ts
View file @
aeb5635c
...
@@ -26,7 +26,7 @@ export const PAGE_TYPE_DICT: Record<Route['pathname'], string> = {
...
@@ -26,7 +26,7 @@ export const PAGE_TYPE_DICT: Record<Route['pathname'], string> = {
'
/graphiql
'
:
'
GraphQL
'
,
'
/graphiql
'
:
'
GraphQL
'
,
'
/search-results
'
:
'
Search results
'
,
'
/search-results
'
:
'
Search results
'
,
'
/auth/profile
'
:
'
Profile
'
,
'
/auth/profile
'
:
'
Profile
'
,
'
/account/
reward
s
'
:
'
Merits
'
,
'
/account/
merit
s
'
:
'
Merits
'
,
'
/account/watchlist
'
:
'
Watchlist
'
,
'
/account/watchlist
'
:
'
Watchlist
'
,
'
/account/api-key
'
:
'
API keys
'
,
'
/account/api-key
'
:
'
API keys
'
,
'
/account/custom-abi
'
:
'
Custom ABI
'
,
'
/account/custom-abi
'
:
'
Custom ABI
'
,
...
...
nextjs/nextjs-routes.d.ts
View file @
aeb5635c
...
@@ -9,7 +9,7 @@ declare module "nextjs-routes" {
...
@@ -9,7 +9,7 @@ declare module "nextjs-routes" {
|
StaticRoute
<
"
/404
"
>
|
StaticRoute
<
"
/404
"
>
|
StaticRoute
<
"
/account/api-key
"
>
|
StaticRoute
<
"
/account/api-key
"
>
|
StaticRoute
<
"
/account/custom-abi
"
>
|
StaticRoute
<
"
/account/custom-abi
"
>
|
StaticRoute
<
"
/account/
reward
s
"
>
|
StaticRoute
<
"
/account/
merit
s
"
>
|
StaticRoute
<
"
/account/tag-address
"
>
|
StaticRoute
<
"
/account/tag-address
"
>
|
StaticRoute
<
"
/account/verified-addresses
"
>
|
StaticRoute
<
"
/account/verified-addresses
"
>
|
StaticRoute
<
"
/account/watchlist
"
>
|
StaticRoute
<
"
/account/watchlist
"
>
...
...
nextjs/redirects.js
View file @
aeb5635c
...
@@ -52,6 +52,10 @@ const oldUrls = [
...
@@ -52,6 +52,10 @@ const oldUrls = [
source
:
'
/account/public-tags-request
'
,
source
:
'
/account/public-tags-request
'
,
destination
:
'
/public-tags/submit
'
,
destination
:
'
/public-tags/submit
'
,
},
},
{
source
:
'
/account/rewards
'
,
destination
:
'
/account/merits
'
,
},
// TRANSACTIONS
// TRANSACTIONS
{
{
...
...
pages/account/
reward
s.tsx
→
pages/account/
merit
s.tsx
View file @
aeb5635c
...
@@ -8,7 +8,7 @@ const RewardsDashboard = dynamic(() => import('ui/pages/RewardsDashboard'), { ss
...
@@ -8,7 +8,7 @@ const RewardsDashboard = dynamic(() => import('ui/pages/RewardsDashboard'), { ss
const
Page
:
NextPage
=
()
=>
{
const
Page
:
NextPage
=
()
=>
{
return
(
return
(
<
PageNextJs
pathname=
"/account/
reward
s"
>
<
PageNextJs
pathname=
"/account/
merit
s"
>
<
RewardsDashboard
/>
<
RewardsDashboard
/>
</
PageNextJs
>
</
PageNextJs
>
);
);
...
...
ui/rewards/RewardsButton.tsx
View file @
aeb5635c
...
@@ -37,7 +37,7 @@ const RewardsButton = ({ variant = 'header', size }: Props) => {
...
@@ -37,7 +37,7 @@ const RewardsButton = ({ variant = 'header', size }: Props) => {
data
-
selected=
{
!
isLoading
&&
Boolean
(
apiToken
)
}
data
-
selected=
{
!
isLoading
&&
Boolean
(
apiToken
)
}
flexShrink=
{
0
}
flexShrink=
{
0
}
as=
{
apiToken
?
LinkInternal
:
'
button
'
}
as=
{
apiToken
?
LinkInternal
:
'
button
'
}
{
...
(
apiToken
?
{
href
:
route
({
pathname
:
'/
account
/
reward
s
'
})
}
:
{})
}
{
...
(
apiToken
?
{
href
:
route
({
pathname
:
'/
account
/
merit
s
'
})
}
:
{})
}
onClick=
{
apiToken
?
undefined
:
openLoginModal
}
onClick=
{
apiToken
?
undefined
:
openLoginModal
}
onFocus=
{
handleFocus
}
onFocus=
{
handleFocus
}
fontSize=
"sm"
fontSize=
"sm"
...
...
ui/rewards/login/steps/CongratsStepContent.tsx
View file @
aeb5635c
...
@@ -122,7 +122,7 @@ const CongratsStepContent = ({ isReferral }: Props) => {
...
@@ -122,7 +122,7 @@ const CongratsStepContent = ({ isReferral }: Props) => {
Explore your current Merits balance, find activities to boost your Merits,
Explore your current Merits balance, find activities to boost your Merits,
and view your capybara NFT badge collection on the dashboard
and view your capybara NFT badge collection on the dashboard
</
Text
>
</
Text
>
<
Button
mt=
{
3
}
as=
"a"
href=
{
route
({
pathname
:
'
/account/
reward
s
'
})
}
>
<
Button
mt=
{
3
}
as=
"a"
href=
{
route
({
pathname
:
'
/account/
merit
s
'
})
}
>
Open
Open
</
Button
>
</
Button
>
</
Flex
>
</
Flex
>
...
...
ui/rewards/login/steps/LoginStepContent.tsx
View file @
aeb5635c
...
@@ -61,7 +61,7 @@ const LoginStepContent = ({ goNext, closeModal, openAuthModal }: Props) => {
...
@@ -61,7 +61,7 @@ const LoginStepContent = ({ goNext, closeModal, openAuthModal }: Props) => {
goNext
(
isRefCodeUsed
);
goNext
(
isRefCodeUsed
);
}
else
{
}
else
{
closeModal
();
closeModal
();
router
.
push
({
pathname
:
'
/account/
reward
s
'
},
undefined
,
{
shallow
:
true
});
router
.
push
({
pathname
:
'
/account/
merit
s
'
},
undefined
,
{
shallow
:
true
});
}
}
}
}
}
catch
(
error
)
{}
}
catch
(
error
)
{}
...
...
ui/snippets/auth/useLogout.ts
View file @
aeb5635c
...
@@ -14,7 +14,7 @@ import * as mixpanel from 'lib/mixpanel';
...
@@ -14,7 +14,7 @@ import * as mixpanel from 'lib/mixpanel';
const
PROTECTED_ROUTES
:
Array
<
Route
[
'
pathname
'
]
>
=
[
const
PROTECTED_ROUTES
:
Array
<
Route
[
'
pathname
'
]
>
=
[
'
/account/api-key
'
,
'
/account/api-key
'
,
'
/account/custom-abi
'
,
'
/account/custom-abi
'
,
'
/account/
reward
s
'
,
'
/account/
merit
s
'
,
'
/account/tag-address
'
,
'
/account/tag-address
'
,
'
/account/verified-addresses
'
,
'
/account/verified-addresses
'
,
'
/account/watchlist
'
,
'
/account/watchlist
'
,
...
...
ui/snippets/navigation/vertical/NavLinkRewards.tsx
View file @
aeb5635c
...
@@ -17,7 +17,7 @@ const NavLinkRewards = ({ isCollapsed, onClick }: Props) => {
...
@@ -17,7 +17,7 @@ const NavLinkRewards = ({ isCollapsed, onClick }: Props) => {
const
router
=
useRouter
();
const
router
=
useRouter
();
const
{
openLoginModal
,
dailyRewardQuery
,
apiToken
,
isInitialized
}
=
useRewardsContext
();
const
{
openLoginModal
,
dailyRewardQuery
,
apiToken
,
isInitialized
}
=
useRewardsContext
();
const
pathname
=
'
/account/
reward
s
'
;
const
pathname
=
'
/account/
merit
s
'
;
const
nextRoute
=
{
pathname
}
as
Route
;
const
nextRoute
=
{
pathname
}
as
Route
;
const
handleClick
=
useCallback
((
e
:
React
.
MouseEvent
)
=>
{
const
handleClick
=
useCallback
((
e
:
React
.
MouseEvent
)
=>
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment