aboutsummaryrefslogtreecommitdiff
path: root/src/components/user_panel/user_panel.vue
diff options
context:
space:
mode:
authorHenry Jameson <me@hjkos.com>2019-07-28 13:30:29 +0300
committerHenry Jameson <me@hjkos.com>2019-07-28 13:30:29 +0300
commitb3aff9bbae77b2fd34b2267ce9196c0ebd3e4691 (patch)
tree1219e00b6bfe6784add1578a3bc986c1dbb5f34d /src/components/user_panel/user_panel.vue
parent7f6f025792dcb3a10c94c8952d0312abd0b46989 (diff)
parent4827e4d972f8ee11e606693e24ae4ca21711c6b1 (diff)
Merge remote-tracking branch 'upstream/develop' into emoji-selector-update
* upstream/develop: (469 commits) Feature/add sticker picker guard more secure routes guard secure routes by redirecting to root closest can returns itself as well find inside status-content div only try to use the closest a tag as target Update es.json Also apply keyword filter to subjects Remove files I accidentally pushed in fix issues caused by merges in usersearch on @ Add user search at fix eslint warnings remove vue-popperjs fix moderation menu partially hidden by usercard boundary migrate popper css rewrite ModerationTools using v-tooltip make popover position for status action dropdow relative to parent node rewrite ExtraButtons using v-tooltip install v-tooltip i18n/Update pedantic Japanese translation ...
Diffstat (limited to 'src/components/user_panel/user_panel.vue')
-rw-r--r--src/components/user_panel/user_panel.vue25
1 files changed, 21 insertions, 4 deletions
diff --git a/src/components/user_panel/user_panel.vue b/src/components/user_panel/user_panel.vue
index 8310f30e..c92630e3 100644
--- a/src/components/user_panel/user_panel.vue
+++ b/src/components/user_panel/user_panel.vue
@@ -1,13 +1,30 @@
<template>
<div class="user-panel">
- <div v-if='user' class="panel panel-default" style="overflow: visible;">
- <UserCard :user="user" :hideBio="true" rounded="top"/>
+ <div
+ v-if="signedIn"
+ key="user-panel"
+ class="panel panel-default signed-in"
+ >
+ <UserCard
+ :user="user"
+ :hide-bio="true"
+ rounded="top"
+ />
<div class="panel-footer">
- <post-status-form v-if='user'></post-status-form>
+ <post-status-form v-if="user" />
</div>
</div>
- <login-form v-if='!user'></login-form>
+ <auth-form
+ v-else
+ key="user-panel"
+ />
</div>
</template>
<script src="./user_panel.js"></script>
+
+<style lang="scss">
+.user-panel .signed-in {
+ overflow: visible;
+}
+</style>