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.

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

Develop #1823

Merged
merged 13 commits into from
Jan 5, 2023
Merged

Develop #1823

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
0ecaddc
Merge pull request #1820 from hypersign-protocol/stage
Raj6939 Dec 13, 2022
73a8fd0
initial code for reward distribution at admin side
Raj6939 Dec 21, 2022
a004666
reward claim at participant side done
Raj6939 Dec 23, 2022
a157b93
design fixes ( Partner Info, Slider infobox, Linebreaks
Dec 24, 2022
e7beda5
made some of the input boxes md-12
Dec 24, 2022
347ef84
Fixed the heiht of the textarea and aaded scroll-y
Dec 24, 2022
aec98b0
unfinished algorithm to group
Dec 24, 2022
e947609
Refactored Slider on Marketplace
Jan 2, 2023
ed9b1a3
Sudo Code for categorising based on ActionID for Reward List line 148…
Jan 2, 2023
58f5102
bugs fixed in reward dist
Raj6939 Jan 4, 2023
4f7808c
code improved with dynamic chain selection
Raj6939 Jan 4, 2023
adef427
removed hypersign json from frontend
Raj6939 Jan 5, 2023
586f771
Merge pull request #1822 from hypersign-protocol/market-place-slider
Raj6939 Jan 5, 2023
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
1,032 changes: 1,025 additions & 7 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
"bip39": "^3.0.4",
"bootstrap-vue": "^2.0.0-rc.11",
"browserify": "^17.0.0",
"bs58": "^5.0.0",
"dayjs": "^1.10.6",
"dotenv": "^16.0.0",
"elliptic": "^6.5.4",
Expand Down
18 changes: 14 additions & 4 deletions src/App.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,12 @@ export default {
exactPath: true,
}
]
},
{
href: "/admin/marketplace",
title: "Marketplace",
icon: "fa fa-trophy",
exactPath: true,
},
{
href: "/admin/login",
Expand Down Expand Up @@ -183,7 +189,8 @@ export default {
window.location.pathname.includes("/admin/subscription") ||
window.location.pathname.includes("/admin/teams") ||
window.location.pathname.includes("/admin/setting/org") ||
window.location.pathname.includes("/admin/createapp") ?
window.location.pathname.includes("/admin/createapp") ||
window.location.pathname.includes("/admin/marketplace") ?
true :
false;
}else{
Expand All @@ -200,7 +207,8 @@ export default {
window.location.pathname.includes("/admin/subscription") ||
window.location.pathname.includes("/admin/teams") ||
window.location.pathname.includes("/admin/setting/org") ||
window.location.pathname.includes("/admin/createapp") ?
window.location.pathname.includes("/admin/createapp") ||
window.location.pathname.includes("/admin/marketplace") ?
true :
false;
this.showChat =
Expand All @@ -210,7 +218,8 @@ export default {
window.location.pathname.includes("/admin/subscription") ||
window.location.pathname.includes("/admin/teams") ||
window.location.pathname.includes("/admin/setting/org") ||
window.location.pathname.includes("/admin/createapp") ?
window.location.pathname.includes("/admin/createapp") ||
window.location.pathname.includes("/admin/marketplace") ?
true :
false;
},
Expand Down Expand Up @@ -255,7 +264,8 @@ export default {
window.location.pathname.includes("dashboard") ||
window.location.pathname.includes("/admin/subscription")||
window.location.pathname.includes("/admin/teams") ||
window.location.pathname.includes("/admin/createapp")
window.location.pathname.includes("/admin/createapp") ||
window.location.pathname.includes("/admin/marketplace")
) {
this.showNavbar = true;
} else {
Expand Down
Binary file added src/assets/premium-badge.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading