diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2019-06-12 20:16:55 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2019-06-12 20:16:55 +0000 |
| commit | e53f11c30fb2eedd0a437d3cfe9592c555de6a95 (patch) | |
| tree | 560ecc4d370fda07c5da8cde5c60c679fa9c7862 /src/components/user_panel/user_panel.js | |
| parent | 9df99c5205b1cb560bb25c0dd81cc90acbde4d7f (diff) | |
| parent | 77eceedbf7a5b53948d7d91b3d228aa303c02081 (diff) | |
Merge branch 'feature/2fa' into 'develop'
adds 2FA/two_factor_authentication support
See merge request pleroma/pleroma-fe!556
Diffstat (limited to 'src/components/user_panel/user_panel.js')
| -rw-r--r-- | src/components/user_panel/user_panel.js | 8 |
1 files changed, 5 insertions, 3 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 } |
