Merge branch 'develop' into feature/new-user-routes

2018-12-17 02:39:37 +03:00 · 2018-12-17 02:39:37 +03:00 · 2211c533dd
commit 2211c533dd
parent 5fc0fe28e4 ada4bd0d98
93 changed files with 5123 additions and 894 deletions
--- a/src/components/user_card/user_card.js
+++ b/src/components/user_card/user_card.js
@ -15,6 +15,9 @@ const UserCard = {
  components: {
    UserCardContent
  },
+  computed: {
+    currentUser () { return this.$store.state.users.currentUser }
+  },
  methods: {
    toggleUserExpanded () {
      this.userExpanded = !this.userExpanded