diff --git a/client/App.vue b/client/App.vue index 69b03da477cf13b1b0711de534ed0785b1f38217..60ae20c4ff0443a8813e734b5a1d00c139069d59 100644 --- a/client/App.vue +++ b/client/App.vue @@ -101,7 +101,6 @@ export default { axios.get('/auth') .then((response) => { console.log("Signed in as " + response.data.username); - console.log(response.data); this.user = response.data; }, (err) => { this.user = null; @@ -112,12 +111,10 @@ export default { methods: { closeCreator (ev) { - console.log("User creator closed with:"); - console.log(ev); this.showCreationForm = false; if (ev && typeof(ev) === 'object') { - this.external.unshift(ev); + this.external.push(this.$model('user', {id: ev.id})); } } }, diff --git a/client/ExternalUser.vue b/client/ExternalUser.vue index 6c3ecd83a8f097e08cf0017ab8a23b43bac7beb0..f7e9eae922090545406b2664337d85903b84c03e 100644 --- a/client/ExternalUser.vue +++ b/client/ExternalUser.vue @@ -1,16 +1,16 @@ <template> - <li class="media mt-2 user-object"> + <li class="media mt-2 user-object" @mouseover="adminTools = true" @mouseleave="adminTools = false"> <img v-bind:src="user.avatar_url" class="d-flex align-self-center mr-3 rounded-circle user-avatar" alt="Avatar"/> <div class="media-body"> <h4 class="mt-0">{{ user.name }} <<a :href="'mailto:'+user.name+' <'+user.email+'>'">{{ user.email }}</a>></h4> <p class="text-muted"><a v-bind:href="user.web_url">@{{ user.username }}</a> - <span :class="{'text-danger': user.state != 'active'}">{{ user.state }}</span> - Created at {{ user.created_at | readable_date }}</p> - <!-- Read if current user is an admin, show advanced features --> - <template v-if="false"> - <a href="#" @click.prevent="user.http.fetch()" class="btn btn-sm btn-outline-primary" title="Reload User Data"><i class="fa fa-cog"></i></a> - <a href="#" @click.prevent="user.state == 'blocked' ? user.http.unblock() : user.http.block()" class="btn btn-sm btn-outline-warning" :title="user.state == 'blocked' ? 'Unblock' : 'Block'"><i class="fa" :class="{ 'fa-lock': user.state != 'blocked', 'fa-unlock': user.state == 'blocked' }"></i></a> - <a href="#" @click.prevent="user.http.destroy()" class="btn btn-sm btn-outline-danger" title="Remove User"><i class="fa fa-eraser"></i></a> - </template> + </div> + <!-- Read if current user is an admin, show advanced features --> + <div id="adminTools" class="btn-group btn-group-lg" v-show="adminTools" v-if="false"> + <a href="#" @click.prevent="user.http.fetch()" class="btn btn-sm btn-outline-primary" title="Reload User Data"><i class="fa fa-cog"></i></a> + <a href="#" @click.prevent="user.state == 'blocked' ? user.http.unblock() : user.http.block()" class="btn btn-sm btn-outline-warning" :title="(user.state == 'blocked' ? 'Unblock' : 'Block') + ' User'"><i class="fa" :class="{ 'fa-lock': user.state != 'blocked', 'fa-unlock': user.state == 'blocked' }"></i></a> + <a href="#" @click.prevent="user.http.destroy()" class="btn btn-sm btn-outline-danger" title="Remove User"><i class="fa fa-eraser"></i></a> </div> </li> </template> @@ -25,7 +25,8 @@ export default { data () { return { - user: {} + user: {}, + adminTools: false } }, @@ -47,6 +48,11 @@ export default { </script> <style scoped> +#adminTools { + margin-top: 1em; + margin-right: 1em; +} + .user-avatar { width: 64px; height: 64px; diff --git a/client/UserCreation.vue b/client/UserCreation.vue index 341949d33a230df0a02c731b3084c15067423f6a..bc44a4e83886c9d0fa13f0bc64b084ab6ae88df0 100644 --- a/client/UserCreation.vue +++ b/client/UserCreation.vue @@ -131,8 +131,7 @@ export default { try { var res = await this.user.http.store(); - console.log("Result:"); - console.log(res); + this.user = Object.assign({}, this.user, res.data); } catch(err) { console.log(err); if (err.response.status === 401) { @@ -149,8 +148,6 @@ export default { return false; } - console.log(this.user); - this.close(this.user); } }