Skip to content

Commit

Permalink
Merge pull request #1254 from hypersign-protocol/v5.3.0
Browse files Browse the repository at this point in the history
V5.3.0
  • Loading branch information
Pratap2018 authored May 30, 2022
2 parents a01d3d5 + de33036 commit a7e4420
Show file tree
Hide file tree
Showing 57 changed files with 58,262 additions and 22,434 deletions.
73,474 changes: 51,109 additions & 22,365 deletions package-lock.json

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "hyperfye-frontend",
"version": "v5.2.0",
"version": "v5.3.0",
"private": true,
"scripts": {
"serve": "vue-cli-service serve --mode production",
Expand Down Expand Up @@ -30,6 +30,7 @@
"hdkey": "^2.0.1",
"js-file-download": "^0.4.12",
"marked": "^3.0.8",
"multicoin-address-validator": "^0.5.10",
"node-fetch": "^2.6.0",
"simple-vue-validator": "^0.16.0",
"v-markdown-editor": "^1.2.6",
Expand All @@ -47,6 +48,7 @@
"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",
Expand Down Expand Up @@ -106,4 +108,4 @@
"last 2 versions",
"not ie <= 8"
]
}
}
Binary file added src/assets/cardano_128.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
129 changes: 118 additions & 11 deletions src/components/admin/createProjectSlider/CreateProjectSlide.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,16 @@
.b-sidebar > .b-sidebar-header {
border: 1px solid #000 !important;
}
.previewshow{
display: block !important;
}
/* .show.collapse{
display: block !important;
} */
/* .show.collapse{
transition: height 1s;
} */
.button-theme {
background-color: #f1b319;
border-collapse: #f1b319;
Expand Down Expand Up @@ -68,7 +77,48 @@
backdrop-variant="dark"
>
<div class="px-3 py-2">
<div class="accordion" role="tablist">
<div class="accordion" role="tablist" v-if="preview">
<b-card no-body class="mb-1">
<b-card-header
header-tag="header"
class="p-1 border-0 accordin-header accordion-header-theme"
role="tab"
>
<b-button
v-b-toggle.accordion-1
style="pointer-events:none;"
variant="info"
class="bg-transparent border-0 text-left text-primary"
title="Preview"
><i class="fas fa-file-contract"></i> Preview

</b-button>
<b-button
variant="info"
style="float:right"
class="bg-transparent border-0 text-left text-primary"
title="Close"
@click="closePreview"
>
<i class="fas fa-close">Close</i>
</b-button>
</b-card-header>
<b-collapse

visible
class="previewshow"
id="accordion-1"
accordion="my-accordion1"
role="tabpanel"
>
<b-card-body>

<preview-config :eventData="project" />
</b-card-body>
</b-collapse>
</b-card>
</div>
<div class="accordion" role="tablist" v-else>
<b-card no-body class="mb-1">
<b-card-header
header-tag="header"
Expand Down Expand Up @@ -121,13 +171,10 @@
><i class="fa fa-user-plus"></i> Referral Configurations
<!-- <a class="tool" data-position="right" draggable="false" title="Creates a unique referral URL for each campaign participants, set points of each referral"><i class='fas fa-exclamation-circle'></i></a> -->
</b-button>
<div class="info">
<i class='fas fa-exclamation-circle'>
<p class="tooltiptext">Creates a unique referral URL for each campaign participants and sets points of each referral</p>
</i>
</div>

</b-card-header>
<b-collapse

id="accordion-2"
accordion="my-accordion"
role="tabpanel"
Expand Down Expand Up @@ -159,8 +206,8 @@
</b-button>
</b-card-header>
<b-collapse
id="accordion-3"
visible

id="accordion-3"
accordion="my-accordion"
role="tabpanel"
>
Expand Down Expand Up @@ -193,7 +240,7 @@
</b-card-header>
<b-collapse
id="accordion-8"
visible

accordion="my-accordion"
role="tabpanel"
>
Expand Down Expand Up @@ -226,6 +273,7 @@
</b-button>
</b-card-header>
<b-collapse

id="accordion-4"
accordion="my-accordion"
role="tabpanel"
Expand Down Expand Up @@ -257,6 +305,7 @@
</b-button>
</b-card-header>
<b-collapse

id="accordion-5"
accordion="my-accordion"
role="tabpanel"
Expand Down Expand Up @@ -288,6 +337,7 @@
</b-button>
</b-card-header>
<b-collapse

id="accordion-6"
accordion="my-accordion"
role="tabpanel"
Expand Down Expand Up @@ -320,6 +370,7 @@
</b-button>
</b-card-header>
<b-collapse

id="accordion-7"
accordion="my-accordion"
role="tabpanel"
Expand All @@ -334,6 +385,33 @@
</b-card-body>
</b-collapse>
</b-card>

<!-- <b-card no-body class="mb-1">
<b-card-header
header-tag="header"
class="p-1 accordin-header accordion-header-theme"
role="tab"
>
<b-button
block
v-b-toggle.accordion-9
variant="info"
class="bg-transparent border-0 text-left text-primary"
title="Create Smart contract configuration for your event"
><i class="fas fa-file-contract"></i> Preview
</b-button>
</b-card-header>
<b-collapse
id="accordion-9"
accordion="my-accordion"
role="tabpanel"
>
<b-card-body>
<preview-config :eventData="project"/>
</b-card-body>
</b-collapse>
</b-card> -->

<!-- -->
<!-- Tags Config -->
<!-- <b-card no-body class="mb-1">
Expand Down Expand Up @@ -368,12 +446,20 @@
</b-collapse>
</b-card> -->
</div>

<button
class="btn btn-primary mt-3 button-theme mr-3"
type="button"
@click="openPreview"
>
Preview
</button>
<button
class="btn btn-primary mt-3 button-theme"
type="button"
@click="saveProject"
>
Submit
Save
</button>
</div>
</b-sidebar>
Expand All @@ -382,6 +468,7 @@

<script>
import EventActionConfig from "./components/EventActionConfig.vue";
import PreviewConfig from "./components/PreviewConfig.vue";
import GeneralConfig from "./components/GeneralConfig.vue";
import ReferralConfig from "./components/ReferralConfig.vue";
export default {
Expand All @@ -390,9 +477,11 @@ export default {
GeneralConfig,
EventActionConfig,
ReferralConfig,
PreviewConfig,
},
props: {
project: {
type: Object,
},
Expand All @@ -414,6 +503,9 @@ export default {
contractType: {
type: String,
},
openPreview:{
type:Function
},
saveProject: {
type: Function,
},
Expand Down Expand Up @@ -529,7 +621,6 @@ export default {
}
},
},
data() {
return {
/// TODO: Need to do it in a neat way
Expand Down Expand Up @@ -562,6 +653,7 @@ export default {
{ text: "Avalanche", value: "BLOCKCHAIN_AVAX" },
{ text: "Reef", value: "BLOCKCHAIN_REEF" },
{ text: "Tezos", value: "BLOCKCHAIN_TEZ" },
{ text: "Cardano", value: "BLOCKCHAIN_CARDANO" },
],
smartContractAction: [
{ text: "Select Contract Type", value: null },
Expand Down Expand Up @@ -590,7 +682,22 @@ export default {
],
tagDetails: [{ text: "Select Tag Type", value: null }],
},
preview:false
};
},
mounted(){
this.$root.$on("openPreview",()=>{
this.preview=true
})
this.$root.$on("closePreview",this.closePreview)
}
,
methods: {
closePreview () {
this.preview= false
}
},
};
</script>
Loading

0 comments on commit a7e4420

Please sign in to comment.