Skip to content

Commit

Permalink
Merge pull request #1313 from hypersign-protocol/stage
Browse files Browse the repository at this point in the history
Stage
  • Loading branch information
Pratap2018 authored Jun 9, 2022
2 parents 0fe2741 + 75f7e09 commit a5f87a0
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 2 deletions.
6 changes: 6 additions & 0 deletions src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,12 @@ export default {
}
],
unsubsSubscribedMenu: [
{
href: "/admin/dashboard",
title: "Dashboard",
icon: "fas fa-tachometer-alt",
exactPath:true,
},
{
href: "/admin/subscription",
title: "Subscriptions",
Expand Down
2 changes: 1 addition & 1 deletion src/router.js
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ router.beforeEach((to, from, next) => {
if (
to.meta.admin &&
!json.message.isSubscribed &&
to.path != "/admin/subscription"
(to.path != "/admin/subscription" && to.path != "/admin/dashboard")
) {
eventBus.$emit("UpdateAdminNav", false);
next({
Expand Down
11 changes: 10 additions & 1 deletion src/views/participant/Home.vue
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,21 @@
</h2>
</div>

<div>
<div v-if="Object.values(eventList).length>0">
<div>
<HomeEvents :userEventList="eventList"></HomeEvents>
</div>

<div class="flex-row flex-nowrap kdJiCp">
<button class="btn btn-warning" @click="prevT" style="margin-right: 2px">Previous</button>
<Button class="btn btn-warning" @click="nextT" style="margin-right: 2px">Next</Button>
</div>

</div>
<div v-else class="row flex-row flex-nowrap kdJiCp alert alert-warning">
No events found
</div>

<!--- List view ends -->
<div>
<h2 class="llcnwK kdJiCp" style="text-align: left"><i class="fa fa-trophy"></i> Your events</h2>
Expand Down Expand Up @@ -279,6 +287,7 @@ export default {
this.eventList = {
...resp.data.eventList,
};
} else {
this.notifyErr(Messages.EVENT.INVALID_PROJECT_SLUG);
}
Expand Down

0 comments on commit a5f87a0

Please sign in to comment.