update branch and fix merge conflicts

1 files changed, 22 insertions, 0 deletions

diff --git a/src/components/user_finder/user_finder.js b/src/components/user_finder/user_finder.js
new file mode 100644
index 00000000..03205382
--- /dev/null
+++ b/src/components/user_finder/user_finder.js
@@ -0,0 +1,22 @@
+const UserFinder = {
+  data: () => ({
+    username: undefined,
+    hidden: true
+  }),
+  methods: {
+    findUser (username) {
+      this.$store.state.api.backendInteractor.externalProfile(username)
+        .then((user) => {
+          if (!user.error) {
+            this.$store.commit('addNewUsers', [user])
+            this.$router.push({name: 'user-profile', params: {id: user.id}})
+          }
+        })
+    },
+    toggleHidden () {
+      this.hidden = !this.hidden
+    }
+  }
+}
+
+export default UserFinder