Skip to content

Commit

Permalink
added info tool-tip in reward dist slider and removed console
Browse files Browse the repository at this point in the history
  • Loading branch information
@Raj6939
Raj6939 committed Jan 11, 2023
1 parent 25f5b00 commit 7004226
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 12 deletions.
23 changes: 19 additions & 4 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,6 +220,7 @@ 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">
Expand All @@ -217,6 +230,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="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
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
9 changes: 3 additions & 6 deletions src/views/admin/MarketPlace.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,10 +148,8 @@ async mounted() {
this.accessToken = localStorage.getItem("accessToken");
}
const userProjectStr = localStorage.getItem("userProjects");
const userProjectsData = JSON.parse(userProjectStr).projects;
console.log(userProjectsData);
this.projects = [...userProjectsData];
console.log(this.projects);
const userProjectsData = JSON.parse(userProjectStr).projects;
this.projects = [...userProjectsData];
this.projects.unshift({
_id: null,
projectName: "Select an event",
Expand Down Expand Up @@ -181,8 +179,7 @@ async mounted() {
return this.notifyErr(resp.statusText);
}
const json = await resp.json();
this.tools = [...json]
console.log(this.tools)
this.tools = [...json]
},
openMPSidebar(tool) {
this.selectedTool = { ...tool}
Expand Down

0 comments on commit 7004226

Please sign in to comment.