Skip to content

Commit

Permalink
Merge pull request #1864 from hypersign-protocol/stage
Browse files Browse the repository at this point in the history 
Stage=>develop
  • Loading branch information
@Raj6939
Raj6939 authored Jan 11, 2023
2 parents 5cb9b6c + 238e5a6 commit 1346623
Show file tree
Hide file tree
Showing 6 changed files with 157 additions and 155 deletions.
232 changes: 116 additions & 116 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,121 +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",
"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
},
"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"
]
}
2 changes: 1 addition & 1 deletion src/App.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ export default {
{
href: "/admin/marketplace",
title: "Marketplace",
icon: "fa fa-trophy",
icon: "fas fa-store",
exactPath: true,
},
{
Expand Down
33 changes: 24 additions & 9 deletions src/components/admin/marketPlaceSlider/marketPlaceSlide.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ allButtons {
<div class="col-md-12">
<div class="row g-3 align-items-center w-100 mt-4">
<div class="text-left col-lg-3 col-md-3 text-left">
<tool-tips infoMessage="Select Event for the reward distribution"></tool-tips>
<label for="type" class="col-form-label">Select Event<span style="color: red">*</span>:
</label>
</div>
Expand All @@ -94,7 +95,17 @@ allButtons {
</div>
</div>
</div>
<h6 class="mt-2" v-if="selectedEvent!==null && prizeList.length ">Prize Details</h6>

<div class="row" style="margin-top: 1%">
<div class="col-md-12">
<div class="row g-3 align-items-center w-100 mt-2">
<div class="text-left col-lg-3 col-md-3 text-left">
<tool-tips v-if="selectedEvent!==null && prizeList.length " infoMessage="Below Prize details are of token type that you configured in the Prize Configurations"></tool-tips>
<label class="col-form-label" v-if="selectedEvent!==null && prizeList.length ">Prize Details:</label>
</div>
</div>
</div>
</div>
<div class="row scroll mt-2">
<div class="col-lg-4" v-for="eachPrize in prizeList" :key="eachPrize._id">
<div :title="eachPrize.title">
Expand Down Expand Up @@ -142,7 +153,7 @@ allButtons {
</div>
<div class="row g-3 align-items-center w-100 mt-4 ml-2" v-if="showContractField">
<div class="col-lg-9 col-md-9 px-0">
<tool-tips infoMessage="Select blockchain for the distribution"></tool-tips>
<tool-tips infoMessage="Chain for the distribution"></tool-tips>
<label for="placeHolder" class="col-form-label">Select Your chain<span style="color: red">*</span>: </label>
</div>
<div class="col-lg-12 col-md-12 px-0">
Expand All @@ -162,15 +173,15 @@ allButtons {
</div>
<div class="row g-3 align-items-center w-100 mt-4 ml-2" v-if="showContractField">
<div class="col-lg-12 col-md-12 px-0">
<tool-tips infoMessage="Enter Wallet address and token amount(token amount should be positive numbers)"></tool-tips>
<tool-tips infoMessage="Enter Wallet address and token amount(token amount should be positive numbers) ex:1,5,6.5,etc."></tool-tips>
<label for="placeHolder" class="col-form-label">Recipients and Amounts<span style="color: red">*</span>:</label>
<b-alert v-model="showDismissibleAlert.status" variant="danger" dismissible>
{{ showDismissibleAlert.text }}
</b-alert>
</div>
<div class="col-lg-12 col-md-12 px-0" style="max-height: 200px;overflow-y: scroll;">

<b-form-textarea id="textarea" v-model="simpleData" placeholder="address,tokenvalue(in positive numbers)"
<b-form-textarea id="textarea" v-model="simpleData" placeholder="address,tokenvalue(in positive numbers) ex:1,5,6.5,etc."
:rows="JSON.parse(flash.value).winners" :max-rows="JSON.parse(flash.value).winners"
@input="calculateFee()" ></b-form-textarea>
</div>
Expand All @@ -189,6 +200,7 @@ allButtons {
</div>
<div class="row g-3 align-items-center w-100 mt-2 ml-2">
<div class="col-lg-6 col-md-6 px-0">
<tool-tips infoMessage="Wallet addresses in the whitelisting list for the distribution"></tool-tips>
<label for="placeHolder" class="col-form-label">Address: </label>
</div>
<div class="col-lg-6 col-md-6 px-0">
Expand All @@ -208,15 +220,17 @@ allButtons {

<div class="row g-3 align-items-center w-100 mt-4 ml-2">
<div class="col-lg-6 col-md-6 px-0" >
<tool-tips infoMessage="Total amount for the distribution"></tool-tips>
<label for="placeHolder" class="col-form-label">Total:</label>
</div>
<div class="col-lg-6 col-md-6 px-0">
<span v-if="feeStructure.fyrePlatformCommision!==''" style="float:right">{{ getFriendlyValue(feeStructure.totalAmountToDistribute) - getFriendlyValue(feeStructure.fyrePlatformCommision)}}
<span v-if="feeStructure.fyrePlatformCommision!==''" style="float:right">{{ (getFriendlyValue(feeStructure.totalAmountToDistribute) - getFriendlyValue(feeStructure.fyrePlatformCommision)).toFixed(4)}}
{{feeStructure.symbol}} Tokens</span>
</div>
</div>
<div class="row g-3 align-items-center w-100 mt-2 ml-2">
<div class="col-lg-6 col-md-6 px-0" >
<tool-tips infoMessage="0.5% as a Fyre platform fee on total distribution"></tool-tips>
<label for="placeHolder" class="col-form-label">Platform Fee:</label>
</div>
<div class="col-lg-6 col-md-6 px-0">
Expand All @@ -226,6 +240,7 @@ allButtons {
</div>
<div class="row g-3 align-items-center w-100 mt-2 ml-2">
<div class="col-lg-6 col-md-6 px-0" >
<tool-tips infoMessage="Total payable amount for the distribution"></tool-tips>
<label for="placeHolder" class="col-form-label">Total Payable:</label>
</div>
<div class="col-lg-6 col-md-6 px-0">
Expand Down Expand Up @@ -427,9 +442,9 @@ export default {
selectedProjectId:{
deep:true,
handler: function () {
if (this.$route.query.projectId) {
// this.selectedProjectId = this.$route.query.projectId
this.selectedEvent = this.$route.query.projectId
if (this.$route.params.project) {
// this.selectedProjectId = this.$route.params.project
this.selectedEvent = this.$route.params.project
this.flash = null
this.showContractField = false
this.prizeList = [];
Expand Down Expand Up @@ -772,7 +787,7 @@ export default {
this.showContractField = true
}
},
selectOption(e) {
selectOption() {
this.isCheckEveryThing = false
this.flash = null
this.simpleData = ''
Expand Down
3 changes: 1 addition & 2 deletions src/mixins/rewardDistUtils.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ function buf2hex(buffer) {
.join("");
}
export function ipfsHashToBytes32(ipfsHash) {
const bytes = "0x" + buf2hex(bs58.decode(ipfsHash)).slice(4);
console.log(bytes);
const bytes = "0x" + buf2hex(bs58.decode(ipfsHash)).slice(4);
return bytes;
}
export function bytes32ToIpfsHash(bytes32Hex) {
Expand Down
Loading

0 comments on commit 1346623

Please sign in to comment.