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.3.0 #1254

Merged
merged 103 commits into from
May 30, 2022
Merged

V5.3.0 #1254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
103 commits
Select commit Hold shift + click to select a range
f2a9ae5
Merge pull request #1162 from hypersign-protocol/stage
Vishwas1 May 16, 2022
e669dc0
cardano added
Pratap2018 May 24, 2022
cb31be8
Merge pull request #1176 from hypersign-protocol/caradano
Pratap2018 May 24, 2022
0906add
Merge pull request #1177 from hypersign-protocol/develop
Pratap2018 May 24, 2022
5f5a7f9
added slug
Vishwas1 May 24, 2022
b43bb2b
clonning
varsha766 May 24, 2022
a8798d8
Merge pull request #1178 from hypersign-protocol/backlog
Vishwas1 May 24, 2022
d61c330
initial
May 25, 2022
e451581
fixed
Pratap2018 May 25, 2022
7daa3a5
previe-accordion
May 25, 2022
faa1370
implemented
Pratap2018 May 25, 2022
73bf140
Merge branch 'preview-action' into preview-v2
Pratap2018 May 25, 2022
b40fb20
Merge pull request #1180 from hypersign-protocol/preview-v2
Pratap2018 May 25, 2022
69183db
event clonning complete
varsha766 May 25, 2022
eddb7a2
Revert "implemented"
Pratap2018 May 25, 2022
c0e63e7
Merge pull request #1182 from hypersign-protocol/revert-1180-preview-v2
Pratap2018 May 25, 2022
fcfdb2a
Merge pull request #1181 from hypersign-protocol/issues#1171
Pratap2018 May 25, 2022
1cf7210
Merge pull request #1183 from hypersign-protocol/backlog
Pratap2018 May 25, 2022
6609640
Merge pull request #1184 from hypersign-protocol/develop
Pratap2018 May 25, 2022
eb8ab95
fixed
Pratap2018 May 25, 2022
9ed3896
Merge branch 'preview-action' into preview-v2
Pratap2018 May 25, 2022
0a750b8
Merge pull request #1186 from hypersign-protocol/preview-v2
Pratap2018 May 25, 2022
b2db20f
fixed
Pratap2018 May 25, 2022
90719a3
Merge pull request #1187 from hypersign-protocol/preview-fresh
Pratap2018 May 25, 2022
a68301f
disclamer added
varsha766 May 25, 2022
c40b766
code of event delete
varsha766 May 26, 2022
89b2d82
fixed bug
Pratap2018 May 26, 2022
ca01083
Merge pull request #1188 from hypersign-protocol/issues#1173
Pratap2018 May 26, 2022
5f7441c
Merge pull request #1190 from hypersign-protocol/issues#1171
Pratap2018 May 26, 2022
a6a792e
Merge pull request #1193 from hypersign-protocol/backlog
Pratap2018 May 26, 2022
fba19ce
Merge branch 'develop' of https://github.com/hypersign-protocol/hyper…
Pratap2018 May 26, 2022
a705409
Merge pull request #1192 from hypersign-protocol/preview-action
Pratap2018 May 26, 2022
06c2ae8
Merge pull request #1194 from hypersign-protocol/develop
Pratap2018 May 26, 2022
51eb8aa
fixed console.log
Pratap2018 May 26, 2022
dad6ff3
Merge pull request #1195 from hypersign-protocol/develop
Pratap2018 May 26, 2022
e646de5
packge.json update
Pratap2018 May 26, 2022
e460bba
Merge pull request #1196 from hypersign-protocol/develop
Pratap2018 May 26, 2022
f9846f9
small change in event name of cloning
varsha766 May 26, 2022
5485316
link will open in new tab
varsha766 May 26, 2022
4276252
fix
Pratap2018 May 26, 2022
c65f412
Merge pull request #1199 from hypersign-protocol/preview-action
Pratap2018 May 26, 2022
68903a2
Merge pull request #1200 from hypersign-protocol/develop
Pratap2018 May 26, 2022
07d523e
Merge pull request #1197 from hypersign-protocol/issues#1171
Pratap2018 May 26, 2022
89a7a88
Merge pull request #1198 from hypersign-protocol/issues#1170
Pratap2018 May 26, 2022
cdbb502
Merge pull request #1201 from hypersign-protocol/develop
Pratap2018 May 26, 2022
9c1e5eb
fixs
Pratap2018 May 26, 2022
60d6bc1
Merge pull request #1202 from hypersign-protocol/develop
Pratap2018 May 26, 2022
b7e8c94
basic UI changes
varsha766 May 26, 2022
0f50a9e
fixed
Pratap2018 May 26, 2022
73a5c2d
Merge branch 'develop' into issues#1191
Pratap2018 May 26, 2022
df7588f
Merge pull request #1203 from hypersign-protocol/issues#1191
Pratap2018 May 26, 2022
b403fe9
Merge pull request #1207 from hypersign-protocol/develop
Pratap2018 May 26, 2022
872030e
hoverable
Pratap2018 May 27, 2022
01d9a34
Merge pull request #1209 from hypersign-protocol/develop
Pratap2018 May 27, 2022
517a94f
added plus
Pratap2018 May 27, 2022
8199e7f
Merge pull request #1211 from hypersign-protocol/develop
Pratap2018 May 27, 2022
5bfb070
hide slug at the time of creating event
varsha766 May 27, 2022
ec12a53
Merge pull request #1214 from hypersign-protocol/bug-fixing
Pratap2018 May 27, 2022
5d20ddc
fix
Pratap2018 May 27, 2022
ceeef93
delete added bug fixed
Pratap2018 May 27, 2022
56c1307
Merge pull request #1217 from hypersign-protocol/develop
Pratap2018 May 27, 2022
68dd08a
fixing ux
Pratap2018 May 27, 2022
049d430
Merge pull request #1218 from hypersign-protocol/develop
Pratap2018 May 27, 2022
adbfed4
fixd preview flicker
Pratap2018 May 27, 2022
f8c1bc0
Merge pull request #1221 from hypersign-protocol/develop
Pratap2018 May 27, 2022
01528fa
fixed bug
Pratap2018 May 27, 2022
96b456e
Merge pull request #1222 from hypersign-protocol/develop
Pratap2018 May 27, 2022
65235a7
alligned event Id with other fields
varsha766 May 27, 2022
e15e022
changed validation message
varsha766 May 27, 2022
e1b6cda
fixed ux
Pratap2018 May 27, 2022
d09441f
fixed
Pratap2018 May 27, 2022
c56b26d
Merge pull request #1223 from hypersign-protocol/issues1205
Pratap2018 May 27, 2022
e248477
Merge pull request #1224 from hypersign-protocol/develop
Pratap2018 May 27, 2022
94fa433
fixed
Pratap2018 May 27, 2022
e2e2d3c
Merge pull request #1225 from hypersign-protocol/develop
Pratap2018 May 27, 2022
9338384
added 404 page
varsha766 May 27, 2022
c8b3a09
Merge pull request #1226 from hypersign-protocol/issues1205
Pratap2018 May 27, 2022
42d497a
fixed bug
Pratap2018 May 27, 2022
0da1a11
Merge pull request #1228 from hypersign-protocol/develop
Pratap2018 May 27, 2022
9ea6a0a
fixed
Pratap2018 May 27, 2022
47e5829
Merge pull request #1229 from hypersign-protocol/develop
Pratap2018 May 27, 2022
8002b16
CreateProjectSLider: added close preview when we hit SAVE button
May 27, 2022
1a503d1
fixed
Pratap2018 May 27, 2022
d8d1d9d
fixed
Pratap2018 May 27, 2022
2da8065
Merge pull request #1230 from hypersign-protocol/develop
Pratap2018 May 27, 2022
dcd176a
Uncomment User-home route
May 27, 2022
91a5695
Merge branch 'develop' of https://github.com/hypersign-protocol/hyper…
May 27, 2022
b3ad351
fixed
Pratap2018 May 30, 2022
ee5dee0
Merge pull request #1246 from hypersign-protocol/issues#1234
Pratap2018 May 30, 2022
7135f9f
Merge pull request #1247 from hypersign-protocol/develop
Pratap2018 May 30, 2022
0ee9ec6
fixed bug
Pratap2018 May 30, 2022
cd3d5d9
Merge pull request #1248 from hypersign-protocol/issues#1243
Pratap2018 May 30, 2022
489f44f
Merge pull request #1249 from hypersign-protocol/develop
Pratap2018 May 30, 2022
d6498ab
fixed
Pratap2018 May 30, 2022
655ceae
Merge pull request #1250 from hypersign-protocol/develop
Pratap2018 May 30, 2022
a8682f9
increased number of event per page
varsha766 May 30, 2022
2e36e51
Merge pull request #1251 from hypersign-protocol/develop
varsha766 May 30, 2022
15a6be9
fixed
Pratap2018 May 30, 2022
d2f3e5c
fix
Pratap2018 May 30, 2022
0c724a2
fix bug
Pratap2018 May 30, 2022
d716ad3
Merge pull request #1252 from hypersign-protocol/develop
Pratap2018 May 30, 2022
deb7fa8
version update
Pratap2018 May 30, 2022
de33036
Merge pull request #1253 from hypersign-protocol/develop
Pratap2018 May 30, 2022
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
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