mainly looks changes

This commit is contained in:
Evert Prants 2017-12-06 20:59:04 +02:00
parent efeca0d5bd
commit e938ac5ab9
Signed by: evert
GPG Key ID: 1688DA83D222D0B5
7 changed files with 53 additions and 37 deletions

View File

@ -21,7 +21,9 @@
span.value(v-if='expires_at') {{ new Date(expires_at).toString() }} span.value(v-if='expires_at') {{ new Date(expires_at).toString() }}
span.value(v-else='v-else') span.value(v-else='v-else')
b This ban is permanent. b This ban is permanent.
.button.remove(@click='$parent.$emit("pardon", id)') Pardon .button.remove(@click='$parent.$emit("pardon", id)')
i.fa.fa-fw.fa-check
| Pardon
</template> </template>
<script type="text/javascript"> <script type="text/javascript">

View File

@ -3,9 +3,9 @@
h3 Bans ({{pagination.total}}) h3 Bans ({{pagination.total}})
.message.error(v-if='error') {{ error }} .message.error(v-if='error') {{ error }}
.entry(v-else) .entry(v-else)
pagination(v-bind="pagination" v-on:page="getBans") pagination(:page="pagination.page" :pages="pagination.pages" v-on:page="getBans")
.list.bans .list.bans
ban(v-for='ban in bans' v-bind="ban") ban(v-for='ban in bans' v-bind="ban" :key="ban.id")
</template> </template>
<script type="text/javascript"> <script type="text/javascript">

View File

@ -11,7 +11,7 @@
.dropdown-wrapper.stamp(@click="dropdown = !dropdown" v-on-clickaway='away') .dropdown-wrapper.stamp(@click="dropdown = !dropdown" v-on-clickaway='away')
i.fa.fa-fw.fa-ellipsis-v i.fa.fa-fw.fa-ellipsis-v
transition(name="modal") transition(name="pop")
.dropdown(v-show="dropdown") .dropdown(v-show="dropdown")
.title Actions .title Actions
.action(@click="$parent.$emit('edit', id)") .action(@click="$parent.$emit('edit', id)")
@ -41,18 +41,21 @@
span(v-show="!secretShown") Click here to reveal secret span(v-show="!secretShown") Click here to reveal secret
#hiddensecret(v-show="secretShown") {{ secret }} #hiddensecret(v-show="secretShown") {{ secret }}
.section .section
span.key Created span.key Grants
span.value {{ new Date(created_at).toString() }} span.value {{ grants }}
.section .section
span.key Owner span.key Owner
span.value {{ user.display_name }} span.value {{ user.display_name }}
.section
span.key Created
span.value {{ new Date(created_at).toString() }}
</template> </template>
<script type="text/javascript"> <script type="text/javascript">
import { directive as onClickaway } from 'vue-clickaway' import { directive as onClickaway } from 'vue-clickaway'
export default { export default {
props: ['icon', 'verified', 'title', 'description', 'url', 'scope', 'redirect_url', 'id', 'secret', 'created_at', 'user'], props: ['icon', 'verified', 'title', 'description', 'url', 'scope', 'redirect_url', 'id', 'secret', 'created_at', 'user', 'grants'],
data: function () { data: function () {
return { return {
dropdown: false, dropdown: false,

View File

@ -3,9 +3,9 @@
button(@click="editing = -1") New Client button(@click="editing = -1") New Client
.message.error(v-if="error") {{ error }} .message.error(v-if="error") {{ error }}
.entry(v-else) .entry(v-else)
pagination(v-bind="pagination" v-on:page="getClients") pagination(:page="pagination.page" :pages="pagination.pages" v-on:page="getClients")
.list.client .list.client
o-auth-client(v-for="client in clients" v-bind="client") o-auth-client(v-for="client in clients" v-bind="client" :key="client.id")
client-modal(:show="editing != 0" @close='editing = 0', :id='editing') client-modal(:show="editing != 0" @close='editing = 0', :id='editing')
</template> </template>

View File

@ -5,12 +5,15 @@
img(v-else='v-else', src='/static/image/avatar.png') img(v-else='v-else', src='/static/image/avatar.png')
.info .info
.stamps .stamps
.stamp(title="Used an external login" v-if="!password")
i.fa.fa-fw.fa-sign-out
.noactive.stamp(v-if='activated == false', title='Not activated.') .noactive.stamp(v-if='activated == false', title='Not activated.')
i.fa.fa-fw.fa-envelope i.fa.fa-fw.fa-envelope
.dropdown-wrapper.stamp(@click="dropdown = !dropdown" v-on-clickaway='away') .dropdown-wrapper.stamp(@click="dropdown = !dropdown" v-on-clickaway='away')
i.fa.fa-fw.fa-ellipsis-v i.fa.fa-fw.fa-ellipsis-v
transition(name="modal") transition(name="pop")
.dropdown(v-show="dropdown") .dropdown(v-show="dropdown")
.title Actions .title Actions
.action(v-if='bannable' v-on:click='$parent.$emit("ban", id)') .action(v-if='bannable' v-on:click='$parent.$emit("ban", id)')
@ -18,19 +21,26 @@
|&nbsp;Ban User |&nbsp;Ban User
.display_name {{ display_name }} .display_name {{ display_name }}
.ame {{ id }} - {{ username }} ({{ uuid }}) .name {{ id }} - {{ username }} ({{ uuid }})
.email {{ email }} .section
.privilege Privilege: level {{ nw_privilege }} span.key Email
.timestamp {{ new Date(created_at).toString() }} span.value {{ email }}
.external(v-if='!password') .section
b Used external login span.key Privilege
span.value {{ nw_privilege }}
.section
span.key Last IP
span.value {{ ip_address }}
.section
span.key Registered
span.value {{ new Date(created_at).toString() }}
</template> </template>
<script type="text/javascript"> <script type="text/javascript">
import { directive as onClickaway } from 'vue-clickaway'; import { directive as onClickaway } from 'vue-clickaway'
export default { export default {
props: ['avatar_file', 'activated', 'display_name', 'id', 'username', 'uuid', 'email', 'nw_privilege', 'created_at', 'password', 'bannable'], props: ['avatar_file', 'activated', 'display_name', 'id', 'username', 'uuid', 'email', 'nw_privilege', 'created_at', 'password', 'bannable', 'ip_address'],
directives: { directives: {
onClickaway: onClickaway, onClickaway: onClickaway,
}, },

View File

@ -1,9 +1,9 @@
<template lang="pug"> <template lang="pug">
#userlist #userlist
h3 Registered Users ({{ pagination.total }}) h3 Registered Users ({{ pagination.total }})
pagination(v-bind="pagination" v-on:page="getUsers") pagination(:page="pagination.page" :pages="pagination.pages" v-on:page="getUsers")
.list.users .list.users
user(v-for='user in users' v-bind="user") user(v-for='user in users' v-bind="user" :key="user.id")
ban-modal(:show='banning' @close='banning = 0' :id='banning') ban-modal(:show='banning' @close='banning = 0' :id='banning')
</template> </template>

View File

@ -43,10 +43,14 @@ nav
.stamps .stamps
float: right float: right
.stamp .stamp
color: #2196F3
padding: 5px padding: 5px
font-size: 120% font-size: 120%
display: inline-block display: inline-block
&.noactive.stamp
color: #f70000
.user .user
min-height: 160px min-height: 160px
.avatar .avatar
@ -75,7 +79,7 @@ nav
background-color: #fff background-color: #fff
.application .application
min-height: 200px min-height: 220px
#hiddensecret #hiddensecret
color: #ff796f color: #ff796f
@ -93,15 +97,16 @@ nav
display: inline-block display: inline-block
.dropdown-wrapper .dropdown-wrapper
padding: 3px 0px
border-radius: 5px border-radius: 5px
position: relative position: relative
cursor: pointer cursor: pointer
color: #000 !important
.dropdown .dropdown
transition: all .2s ease
cursor: default cursor: default
position: absolute position: absolute
top: 25px top: 30px
right: 0 right: 0
background-color: #fff background-color: #fff
border: 1px solid #ddd border: 1px solid #ddd
@ -170,24 +175,20 @@ nav
&.text-align &.text-align
text-align: center text-align: center
/*
* The following styles are auto-applied to elements with
* transition="modal" when their visibility is toggled
* by Vue.js.
*
* You can easily play with the modal transition by editing
* these styles.
*/
.fade-enter-active, .fade-leave-active .fade-enter-active, .fade-leave-active
transition-property: opacity transition-property: opacity
transition-duration: .25s transition-duration: .25s
.fade-enter-active .fade-enter-active
transition-delay: .25s transition-delay: .25s
.fade-enter, .fade-leave-active .fade-enter, .fade-leave-active,
opacity: 0 .pop-enter, .pop-leave-active
opacity: 0
.pop-enter, .pop-leave-active
-webkit-transform: scale(1.1)
transform: scale(1.1)
.modal-enter .modal-enter
opacity: 0 opacity: 0