aboutsummaryrefslogtreecommitdiff
path: root/src/components/user_panel
diff options
context:
space:
mode:
authorMaksim <parallel588@gmail.com>2019-06-12 20:16:55 +0000
committerHJ <30-hj@users.noreply.git.pleroma.social>2019-06-12 20:16:55 +0000
commit77eceedbf7a5b53948d7d91b3d228aa303c02081 (patch)
tree560ecc4d370fda07c5da8cde5c60c679fa9c7862 /src/components/user_panel
parent9df99c5205b1cb560bb25c0dd81cc90acbde4d7f (diff)
Revert "add TOTP/Recovery Form for mobile version"
This reverts commit a3811f944819430c278b6da6b08dc322a9b9ff65.
Diffstat (limited to 'src/components/user_panel')
-rw-r--r--src/components/user_panel/user_panel.js8
-rw-r--r--src/components/user_panel/user_panel.vue11
2 files changed, 14 insertions, 5 deletions
diff --git a/src/components/user_panel/user_panel.js b/src/components/user_panel/user_panel.js
index d4478290..c2f51eb6 100644
--- a/src/components/user_panel/user_panel.js
+++ b/src/components/user_panel/user_panel.js
@@ -1,13 +1,15 @@
-import LoginForm from '../login_form/login_form.vue'
+import AuthForm from '../auth_form/auth_form.js'
import PostStatusForm from '../post_status_form/post_status_form.vue'
import UserCard from '../user_card/user_card.vue'
+import { mapState } from 'vuex'
const UserPanel = {
computed: {
- user () { return this.$store.state.users.currentUser }
+ signedIn () { return this.user },
+ ...mapState({ user: state => state.users.currentUser })
},
components: {
- LoginForm,
+ AuthForm,
PostStatusForm,
UserCard
}
diff --git a/src/components/user_panel/user_panel.vue b/src/components/user_panel/user_panel.vue
index 8310f30e..37e28ca5 100644
--- a/src/components/user_panel/user_panel.vue
+++ b/src/components/user_panel/user_panel.vue
@@ -1,13 +1,20 @@
<template>
<div class="user-panel">
- <div v-if='user' class="panel panel-default" style="overflow: visible;">
+
+ <div v-if="signedIn" key="user-panel" class="panel panel-default signed-in">
<UserCard :user="user" :hideBio="true" rounded="top"/>
<div class="panel-footer">
<post-status-form v-if='user'></post-status-form>
</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>