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

Develop #1228

Merged
merged 3 commits into from
May 27, 2022
Merged

Develop #1228

Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/components/participant/ActionInputs/MoonbeamErc721.vue
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ export default {
methods: {
checkWeb3Injection() {
try {
if (ethereum && ethereum.isMetaMask) {
if (window.ethereum && window.ethereum.isMetaMask) {
this.web3 = new Web3(window.ethereum);
}

Expand Down
2 changes: 1 addition & 1 deletion src/components/participant/Banner.vue
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export default {
},
methods: {
onBannerError(e) {
console.log(e.message);
console.error(e);
this.brokenUrl = true
}
}
Expand Down
9 changes: 7 additions & 2 deletions src/components/participant/Metrics.vue
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
<style>
.mouse-pointer
{
cursor:pointer;
}</style>
<template>
<b-row class="metrics-info border-bottom-0">
<b-col cols="3" sm="3" class="border-right" md="3">
Expand All @@ -18,8 +23,8 @@
<div class="text">Days Left</div>
</div>
</b-col>
<b-col cols="3" sm="3" md="3">
<div class="py-4" @click="showLeaderBoard()">
<b-col cols="3" sm="3" md="3" >
<div class="py-4 mouse-pointer" @click="showLeaderBoard()" title="Click to see Leaderboard">
<div class="number"><i class="fas fa-table" ></i></div>
<div class="text">Leaderboard</div>
</div>
Expand Down
7 changes: 7 additions & 0 deletions src/router.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,13 @@ const router = new Router({
component: () => import(/* webpackChunkName: "adminLogin" */ './views/admin/AdminLogin.vue'),
meta: () => ({ requiresAuth: true, title: 'Hyperfyre - Admin Login' ,tabbar: false })

},
{
path: "/404",
name: "PageNotFound",

component: () => import(/* webpackChunkName: "adminLogin" */ './views/404.vue'),

},
{
path: "/admin/dashboard",
Expand Down
7 changes: 7 additions & 0 deletions src/views/404.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<template>
<div class=" overflow-hidden" style="text-align:center;padding-top:20px;" >
<h1>404: Page Not Found</h1>
</div>


</template>
2 changes: 1 addition & 1 deletion src/views/admin/CreateApp.vue
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ this.getApp();
this.clearselected();
},
editbtn(row){
console.log(row);
//console.log(row);
this.isEdit= true;
this.app = {...row};
this.app.toggle=false;
Expand Down
3 changes: 2 additions & 1 deletion src/views/admin/Participants.vue
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,8 @@ export default {
this.selectedProjectId = this.$route.query.projectId;
this.selectedProject = this.$route.query.projectId;
this.investor.projectId = this.$route.query.projectId;
this.fetchProjectData(0, this.perPage);
await this.fetchProjectData(0, this.perPage);
this.holdInvestors = this.project.investors;
}

const userProjectStr = localStorage.getItem("userProjects");
Expand Down
10 changes: 3 additions & 7 deletions src/views/participant/Event.vue
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,9 @@ export default {
await this.fetchUserInfoOnLogin();
}
}catch(e){
if(e && e.indexOf("No event found for id or slug =") >= 0){
this.$router.push("/404")
}
this.notifyErr(Messages.EVENT.ERROR_OCCURED+ e.message);
}
},
Expand Down Expand Up @@ -194,15 +197,9 @@ export default {
"Content-Type": "application/json",
};
const resp = await apiClient.makeCall({ method: "GET", url: url, header: headers })

this.eventData = {
...resp.data
}





} else {
this.notifyErr(Messages.EVENT.INVALID_PROJECT_SLUG)
}
Expand Down Expand Up @@ -255,7 +252,6 @@ export default {
header: headers,
method: "GET",
})

if(res.data.length === 0){
// a user can participate in event
// Participate in event
Expand Down