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.

Sign up for GitHub

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

Jump to bottom

UI changes made #886

Merged
merged 1 commit into from
Feb 7, 2022
Merged

UI changes made #886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 5 additions & 10 deletions src/views/Invitation.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
</div> -->
</div>
<div class="row content">
<div class="col-md-12" style="">
<h1 class="bold" style="color:#ffc107">HyperFyre</h1>
<div class="col-md-12" >
<img class="align-center" style="margin-bottom: 20px" width="auto" height="auto" src="../assets/Hyperfyre_BY.svg"/>
<div class="typewriter">
<h4>Viral Marketing Tools For Web3</h4>
</div>
<button class="btn btn-default btn-lg" style="margin-top:2%">
<a href="/app" target="_blank">Click here to Log in</a>
<a href="/app" target="_blank">Click here to Login to admin dashboard</a>
</button>
</div>
</div>
Expand All @@ -38,7 +38,6 @@ export default {
name:"Invitation",
async mounted(){
if(await this.$route.query.auth){
console.log(this.$route.query.auth);
await this.invokeStatus();
}
},
Expand All @@ -58,17 +57,13 @@ methods:{
}
else{
const msg = await resp.json();
console.log(msg.message);
return this.$swal.fire({
position: 'center',
icon: 'success',
title: `${msg.message}`,
showConfirmButton: false,
timer: 2000
})
// return this.notifySuccess(msg.message);


timer: 5000
})
}
}
},
Expand Down
4 changes: 2 additions & 2 deletions src/views/admin/Dashboard.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
</style>
<template>
<div class="home marginLeft marginRight">
<h3 v-if="accessuser.adminName && accessuser.adminName!=='Self'" class="leftAlign">Welcome, {{user.name}} You have logged in as {{accessuser.adminName}} ! </h3>
<h3 v-else class="leftAlign">Welcome, {{user.name}} </h3>
<h3 v-if="accessuser.adminName && accessuser.adminName!=='Self'" class="leftAlign">Welcome {{user.name}}, you have logged in as {{accessuser.adminName}} ! </h3>
<h3 v-else class="leftAlign">Welcome {{user.name}} </h3>
<div class="row">
<div class="col-md-6">
<Profile/>
Expand Down
28 changes: 14 additions & 14 deletions src/views/admin/TeamMate.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<!--h3 v-if="teammates.length" class="leftAlign">Hi {{ user.name }}, Your Teams and Admins</h3-->
<div class="text-right">
<button @click="invite()" class="btn btn-warning button-theme">
<i class="fas fa-plus text-black"></i> Invite
Invite <i class="fas fa-plus text-black"></i>
</button>
</div>
<h3 v-if="teammates.length">Your Team</h3>
Expand All @@ -53,7 +53,7 @@
<th>Name</th>
<th>Email</th>
<th>Status</th>
<th>Remove</th>
<th></th>
</tr>
</thead>
<tbody>
Expand All @@ -67,13 +67,15 @@
<b-badge
style="text-transform: uppercase"
variant="success"
title="Teammate has accepted the invitation"
>{{ row.status }}</b-badge
>
</h5>
</td>
<td v-else>
<h5>
<b-badge style="text-transform: uppercase" variant="danger">{{
<b-badge style="text-transform: uppercase" variant="danger"
title="Teammate has not yet accepted the invitation">{{
row.status
}}</b-badge>
</h5>
Expand All @@ -82,8 +84,9 @@
<button
style="text-transform: uppercase"
class="btn btn-danger button-theme btn-sm"
title="Click to remove the teammate"
>
<i class="fas fa-trash"></i> Remove
<i class="fas fa-trash"></i>
</button>
</td>
</tr>
Expand All @@ -99,7 +102,7 @@
<th>Admin Name</th>
<th>Admin Email</th>

<th>Login</th>
<th>Login As</th>
</tr>
</thead>
<tbody>
Expand All @@ -115,7 +118,6 @@
style="text-transform: uppercase"
class="btn btn-success button-theme btn-sm"
>
<i class="fa fa-refresh"> </i>
Active
</button>
</td>
Expand All @@ -124,8 +126,8 @@
<button
style="text-transform: uppercase"
class="btn btn-danger button-theme btn-sm"
title="Click to switch to this account"
>
<i class="fa fa-refresh"> </i>
Switch
</button>
</td>
Expand Down Expand Up @@ -233,7 +235,7 @@ export default {
title: "Invite Form",
html: `<input type="email" id="email" class="swal2-input" placeholder="Email">
<input type="name" id="name" class="swal2-input" placeholder="Name">`,
confirmButtonText: '<span style="color:black">Invite</span>',
confirmButtonText: '<span style="color:black">Send Invitation</span>',
confirmButtonColor: "#f1b319",
focusConfirm: false,
showCloseButton: true,
Expand All @@ -243,7 +245,7 @@ export default {
this.name = this.$swal.getPopup().querySelector("#name").value;
if (!this.email || !this.isEmail(this.email)|| !this.name || isValidURL(this.name)) {
this.$swal.showValidationMessage(
`Please enter valid email and name`
`Please enter valid email and name`
);
}
return { name: this.name, email: this.email };
Expand All @@ -269,7 +271,7 @@ export default {
if (!resp.ok) {
return this.notifyErr(json);
} else {
this.notifySuccess("sent Successfully");
this.notifySuccess("Invitation Sent");
await this.getTeammates();
}
} else {
Expand All @@ -280,7 +282,6 @@ export default {
},
async remove(id) {
if (id) {
console.log(id);
const url = `${this.$config.studioServer.BASE_URL}api/v1/admin/team/delete`;
let headers = {
"Content-Type": "application/json",
Expand All @@ -298,12 +299,11 @@ export default {
if (!resp.ok) {
return this.notifyErr(json);
} else {
this.notifySuccess("Removed Successfully");
console.log(json);
this.notifySuccess("Removed teammate Successfully");
await this.getTeammates();
}
} else {
throw new Error("Error while Removing ");
throw new Error("Error while Removing");
}
}
},
Expand Down