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

V5.11.0 #1865

Merged
merged 52 commits into from
Jan 11, 2023
Merged

V5.11.0 #1865

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
119cb4d
tile breaking bug fixed by reducing icon height
Raj6939 Nov 29, 2022
f532fb1
Merge pull request #1810 from hypersign-protocol/issues/1749
Raj6939 Nov 29, 2022
ab362ef
attribute tile breaking fixed
Raj6939 Nov 29, 2022
870bbc7
Merge pull request #1811 from hypersign-protocol/issues/1749
Raj6939 Nov 29, 2022
d1b1f8e
validation added for custom contract
Raj6939 Nov 29, 2022
ffa8ef0
Merge pull request #1812 from hypersign-protocol/issues/1741
Raj6939 Nov 29, 2022
579ac0d
validation added for prize type
Raj6939 Nov 29, 2022
629b91a
Merge pull request #1813 from hypersign-protocol/issues/1723
Raj6939 Nov 29, 2022
debd512
added validation for expiry date
Raj6939 Nov 29, 2022
7ebbaa3
Merge pull request #1814 from hypersign-protocol/issues/1747
Raj6939 Nov 29, 2022
7322eff
Merge pull request #1815 from hypersign-protocol/develop
Raj6939 Nov 29, 2022
f907c89
sumsub css issue fixed
Raj6939 Dec 9, 2022
5743294
Merge pull request #1818 from hypersign-protocol/issues/1817
Raj6939 Dec 9, 2022
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
052b51b
Merge pull request #1823 from hypersign-protocol/develop
Raj6939 Jan 5, 2023
d1626b5
added code for switching/adding network to metamask and UI changes
Raj6939 Jan 5, 2023
ac50f0e
flag added while creation of distribution,action show after expiry,te…
Raj6939 Jan 6, 2023
3217ac3
Merge pull request #1834 from hypersign-protocol/issues/1824
Raj6939 Jan 6, 2023
797edee
Merge pull request #1835 from hypersign-protocol/develop
Raj6939 Jan 6, 2023
4b972fd
fixed issues/1838
Raj6939 Jan 6, 2023
98ed9a9
Merge pull request #1839 from hypersign-protocol/issues/1838
Raj6939 Jan 6, 2023
915500a
Merge pull request #1840 from hypersign-protocol/develop
Raj6939 Jan 6, 2023
46281d3
Bug fix : MarketPlaceSLide ( Design Breakin, Auto Calculate, Error Me…
Jan 7, 2023
be49b30
Bug fix : MarketPlaceSLide ( Design Breakin, Auto Calculate, Error Me…
Jan 7, 2023
88a60a1
Feature: Admin Events, Added Icon to redirect to reward page 🏆
Jan 7, 2023
289d6e5
BugFix: 🐞MarketPlaceSlider Auto Select on ProjectID on url
Jan 8, 2023
682e2a0
Merge pull request #1841 from hypersign-protocol/develop
Raj6939 Jan 9, 2023
33a5fa8
All bugs are fixed for reward distribution
Raj6939 Jan 9, 2023
684dbd4
Merge pull request #1855 from hypersign-protocol/issues/1854
Raj6939 Jan 9, 2023
748ce1c
Merge pull request #1856 from hypersign-protocol/develop
Raj6939 Jan 9, 2023
82e277e
little Css changes fixed
Raj6939 Jan 9, 2023
d7c52db
bug fixed for reward-dist
Raj6939 Jan 10, 2023
60b4da4
Merge pull request #1857 from hypersign-protocol/reward-dist-bug-fix
Raj6939 Jan 10, 2023
5cb9b6c
Merge pull request #1858 from hypersign-protocol/stage
varsha766 Jan 10, 2023
95e23c4
Merge pull request #1859 from hypersign-protocol/develop
varsha766 Jan 10, 2023
0c071c2
fixed UI bugs for reward-dist
Raj6939 Jan 10, 2023
25f5b00
Merge pull request #1860 from hypersign-protocol/final-bug-fix-for-re…
Raj6939 Jan 10, 2023
7004226
added info tool-tip in reward dist slider and removed console
Raj6939 Jan 11, 2023
55276a6
Merge pull request #1862 from hypersign-protocol/issues/1861
Raj6939 Jan 11, 2023
238e5a6
updated version
varsha766 Jan 11, 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

Large diffs are not rendered by default.

231 changes: 116 additions & 115 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,120 +1,121 @@
{
"name": "hyperfye-frontend",
"version": "v5.10.0",
"private": true,
"scripts": {
"serve": "vue-cli-service serve --mode production",
"watch": "watchify src/serviceWorker.js -o public/service-worker.js -v [ babelify --presets [es2015] ]",
"start:dev": " vue-cli-service serve --mode staging ",
"dev": "npm run watch & npm run start:dev",
"setEnv": "cp env.staging .env",
"serviceworker": "browserify src/serviceWorker.js -o public/service-worker.js -v [ babelify --presets [es2015] ]",
"build": " npm run serviceworker & vue-cli-service build ",
"build-stage": "vue-cli-service build --mode staging",
"lint": "vue-cli-service lint",
"test:unit": "vue-cli-service test:unit",
"predeploy": "npm run build"
},
"dependencies": {
"@cosmjs/launchpad": "^0.27.1",
"@mdi/font": "^6.2.95",
"@mdi/light-font": "^0.2.63",
"@sumsub/websdk": "^1.3.0",
"auth0-js": "^9.16.2",
"axios": "^0.21.1",
"bip39": "^3.0.4",
"bootstrap-vue": "^2.0.0-rc.11",
"browserify": "^17.0.0",
"dayjs": "^1.10.6",
"dotenv": "^16.0.0",
"elliptic": "^6.5.4",
"file": "^0.2.2",
"hdkey": "^2.0.1",
"js-file-download": "^0.4.12",
"jshint": "^2.13.4",
"jsonlint": "^1.6.3",
"marked": "^3.0.8",
"multicoin-address-validator": "^0.5.10",
"node-fetch": "^2.6.0",
"simple-vue-validator": "^0.16.0",
"system": "^2.0.1",
"v-markdown-editor": "^1.2.6",
"valid-url": "^1.0.9",
"validator": "^13.7.0",
"vue": "^2.5.16",
"vue-codemirror": "^4.0.6",
"vue-css-donut-chart": "^1.3.0",
"vue-easytable": "^2.11.0",
"vue-loading-overlay": "^3.4.0",
"vue-meta": "^2.4.0",
"vue-multiselect": "^2.1.6",
"vue-notification": "^1.3.20",
"vue-qr": "^2.4.0",
"vue-recaptcha": "^1.3.0",
"vue-router": "^3.0.1",
"vue-sidebar-menu": "^4.7.4",
"vue-stepper": "^1.4.2",
"vue-sweetalert2": "^5.0.2",
"vuedraggable": "^2.24.3",
"vuejs-datepicker": "^1.6.2",
"vuejs-datetimepicker": "^1.1.13",
"vuejs-paginate": "^2.1.0",
"vuex": "^3.0.0",
"watchify": "^4.0.0",
"web3": "^1.6.0"
},
"devDependencies": {
"@vue/cli-plugin-babel": "^3.0.0-rc.10",
"@vue/cli-plugin-eslint": "^3.0.0-rc.10",
"@vue/cli-plugin-unit-mocha": "^3.0.0-rc.10",
"@vue/cli-service": "^3.0.0-rc.10",
"@vue/test-utils": "^1.0.0-beta.20",
"babel-preset-es2015": "^6.24.1",
"babelify": "^7.2.0",
"chai": "^4.1.2",
"eslint": "^5.16.0",
"eslint-loader": "^3.0.2",
"eslint-plugin-vue": "^5.2.3",
"prettier": "^2.4.1",
"vue-cli": "^2.9.6",
"vue-template-compiler": "^2.5.16"
},
"browserify": {
"transform": [
[
"babelify",
{
"presets": [
"es2015"
]
}
]
]
},
"eslintConfig": {
"root": true,
"env": {
"node": true
},
"extends": [
"plugin:vue/essential",
"eslint:recommended"
],
"rules": {
"no-console": "off"
},
"parserOptions": {
"parser": "babel-eslint"
"name": "hyperfye-frontend",
"version": "v5.11.0",
"private": true,
"scripts": {
"serve": "vue-cli-service serve --mode production",
"watch": "watchify src/serviceWorker.js -o public/service-worker.js -v [ babelify --presets [es2015] ]",
"start:dev": " vue-cli-service serve --mode staging ",
"dev": "npm run watch & npm run start:dev",
"setEnv": "cp env.staging .env",
"serviceworker": "browserify src/serviceWorker.js -o public/service-worker.js -v [ babelify --presets [es2015] ]",
"build": " npm run serviceworker & vue-cli-service build ",
"build-stage": "vue-cli-service build --mode staging",
"lint": "vue-cli-service lint",
"test:unit": "vue-cli-service test:unit",
"predeploy": "npm run build"
},
"dependencies": {
"@cosmjs/launchpad": "^0.27.1",
"@mdi/font": "^6.2.95",
"@mdi/light-font": "^0.2.63",
"@sumsub/websdk": "^1.3.0",
"auth0-js": "^9.16.2",
"axios": "^0.21.1",
"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",
"file": "^0.2.2",
"hdkey": "^2.0.1",
"js-file-download": "^0.4.12",
"jshint": "^2.13.4",
"jsonlint": "^1.6.3",
"marked": "^3.0.8",
"multicoin-address-validator": "^0.5.10",
"node-fetch": "^2.6.0",
"simple-vue-validator": "^0.16.0",
"system": "^2.0.1",
"v-markdown-editor": "^1.2.6",
"valid-url": "^1.0.9",
"validator": "^13.7.0",
"vue": "^2.5.16",
"vue-codemirror": "^4.0.6",
"vue-css-donut-chart": "^1.3.0",
"vue-easytable": "^2.11.0",
"vue-loading-overlay": "^3.4.0",
"vue-meta": "^2.4.0",
"vue-multiselect": "^2.1.6",
"vue-notification": "^1.3.20",
"vue-qr": "^2.4.0",
"vue-recaptcha": "^1.3.0",
"vue-router": "^3.0.1",
"vue-sidebar-menu": "^4.7.4",
"vue-stepper": "^1.4.2",
"vue-sweetalert2": "^5.0.2",
"vuedraggable": "^2.24.3",
"vuejs-datepicker": "^1.6.2",
"vuejs-datetimepicker": "^1.1.13",
"vuejs-paginate": "^2.1.0",
"vuex": "^3.0.0",
"watchify": "^4.0.0",
"web3": "^1.6.0"
},
"devDependencies": {
"@vue/cli-plugin-babel": "^3.0.0-rc.10",
"@vue/cli-plugin-eslint": "^3.0.0-rc.10",
"@vue/cli-plugin-unit-mocha": "^3.0.0-rc.10",
"@vue/cli-service": "^3.0.0-rc.10",
"@vue/test-utils": "^1.0.0-beta.20",
"babel-preset-es2015": "^6.24.1",
"babelify": "^7.2.0",
"chai": "^4.1.2",
"eslint": "^5.16.0",
"eslint-loader": "^3.0.2",
"eslint-plugin-vue": "^5.2.3",
"prettier": "^2.4.1",
"vue-cli": "^2.9.6",
"vue-template-compiler": "^2.5.16"
},
"browserify": {
"transform": [
[
"babelify",
{
"presets": [
"es2015"
]
}
]
]
},
"eslintConfig": {
"root": true,
"env": {
"node": true
},
"postcss": {
"plugins": {
"autoprefixer": {}
}
"extends": [
"plugin:vue/essential",
"eslint:recommended"
],
"rules": {
"no-console": "off"
},
"browserslist": [
"> 1%",
"last 2 versions",
"not ie <= 8"
]
"parserOptions": {
"parser": "babel-eslint"
}
},
"postcss": {
"plugins": {
"autoprefixer": {}
}
},
"browserslist": [
"> 1%",
"last 2 versions",
"not ie <= 8"
]
}
18 changes: 14 additions & 4 deletions src/App.vue
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: "fas fa-store",
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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<img
style="padding-right: 5px"
src="../../../../assets/filled-rest-api-50.png"
height="22px"
height="18px"
/>
</span>
<span>{{ truncate1(eventAction.title, 6) }}</span>
Expand Down Expand Up @@ -138,7 +138,7 @@
style="min-width:90px;"
:title="attr.fieldName"
>
{{ truncate1(attr.fieldName,6) }}
{{ truncate1(attr.fieldName,8) }}
<span style="color: gray; padding-left: 5px">
<i style="" class="fas fa-minus-circle"></i>
</span>
Expand Down Expand Up @@ -230,7 +230,7 @@
style="min-width:90px;"
:title="attr.fieldName"
>
{{ truncate1(attr.fieldName,6) }}
{{ truncate1(attr.fieldName,8) }}
<span style="color: gray; padding-left: 5px">
<i style="" class="fas fa-minus-circle"></i>
</span>
Expand Down Expand Up @@ -1184,7 +1184,7 @@ export default {
},
handleEventActionValidation() {
let isvalid = true;

const ToDate = new Date();
//////
//// WARNINGS: This is worst way of handeling validation
//// You should return or break the moment first error occured
Expand All @@ -1193,6 +1193,9 @@ export default {
if(this.project.projectStatus ==false){
isvalid = false;
return this.notifyErr(Messages.EVENTS.EVENT_CLOSED)
} if(new Date(this.project.toDate).getTime() <= ToDate.getTime()) {
isvalid = false
return this.notifyErr(Messages.EVENTS.EVENT_EXPIRY_DATE)
}
if (isEmpty(this.selected.title)) {
isvalid = false;
Expand Down
Loading