From 34d723215b05078e19da68cdae5edf9c8f699b87 Mon Sep 17 00:00:00 2001
From: jasper <jasper92341@hotmail.com>
Date: Thu, 21 Feb 2019 11:20:46 -0800
Subject: Activate user search text field

---
 src/components/user_search/user_search.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/components/user_search/user_search.vue')

diff --git a/src/components/user_search/user_search.vue b/src/components/user_search/user_search.vue
index 3c2bd3fb..d981faee 100644
--- a/src/components/user_search/user_search.vue
+++ b/src/components/user_search/user_search.vue
@@ -4,7 +4,7 @@
       {{$t('nav.user_search')}}
     </div>
     <div class="user-search-input-container">
-      <input class="user-finder-input" @keyup.enter="newQuery(username)" v-model="username" :placeholder="$t('finder.find_user')"/>
+      <input class="user-finder-input" ref="username" @keyup.enter="newQuery(username)" v-model="username" :placeholder="$t('finder.find_user')"/>
       <button class="btn search-button" @click="newQuery(username)">
         <i class="icon-search"/>
       </button>
-- 
cgit v1.2.3-70-g09d2


From 9bedf96b98e114ed3a1910aaaca09b95be2113bf Mon Sep 17 00:00:00 2001
From: dave <starpumadev@gmail.com>
Date: Fri, 22 Feb 2019 13:37:02 -0500
Subject: #389: add loading icon in search panel

---
 src/components/user_search/user_search.js  | 5 ++++-
 src/components/user_search/user_search.vue | 9 ++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

(limited to 'src/components/user_search/user_search.vue')

diff --git a/src/components/user_search/user_search.js b/src/components/user_search/user_search.js
index 9c026276..be6c3bd7 100644
--- a/src/components/user_search/user_search.js
+++ b/src/components/user_search/user_search.js
@@ -10,7 +10,8 @@ const userSearch = {
   data () {
     return {
       username: '',
-      users: []
+      users: [],
+      loading: false
     }
   },
   mounted () {
@@ -30,8 +31,10 @@ const userSearch = {
         this.users = []
         return
       }
+      this.loading = true
       userSearchApi.search({query, store: this.$store})
         .then((res) => {
+          this.loading = false
           this.users = res
         })
     }
diff --git a/src/components/user_search/user_search.vue b/src/components/user_search/user_search.vue
index 3c2bd3fb..0b03d98a 100644
--- a/src/components/user_search/user_search.vue
+++ b/src/components/user_search/user_search.vue
@@ -9,7 +9,10 @@
         <i class="icon-search"/>
       </button>
     </div>
-    <div class="panel-body">
+    <div v-if="loading" class="text-center loading-icon">
+      <i class="icon-spin3 animate-spin"/>
+    </div>
+    <div v-else class="panel-body">
       <user-card v-for="user in users" :key="user.id" :user="user" :showFollows="true"></user-card>
     </div>
   </div>
@@ -27,4 +30,8 @@
     margin-left: 0.5em;
   }
 }
+
+.loading-icon {
+  padding: 1em;
+}
 </style>
-- 
cgit v1.2.3-70-g09d2


From bbd3e6b10fc8de580efde52b8fdf23f0d786a6b6 Mon Sep 17 00:00:00 2001
From: jasper <jasper92341@hotmail.com>
Date: Mon, 25 Feb 2019 06:08:52 -0800
Subject: Update search input name

---
 src/components/user_finder/user_finder.js  | 2 +-
 src/components/user_finder/user_finder.vue | 2 +-
 src/components/user_search/user_search.js  | 2 +-
 src/components/user_search/user_search.vue | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/components/user_search/user_search.vue')

diff --git a/src/components/user_finder/user_finder.js b/src/components/user_finder/user_finder.js
index 64209941..27153f45 100644
--- a/src/components/user_finder/user_finder.js
+++ b/src/components/user_finder/user_finder.js
@@ -8,7 +8,7 @@ const UserFinder = {
   methods: {
     findUser (username) {
       this.$router.push({ name: 'user-search', query: { query: username } })
-      this.$refs.username.focus()
+      this.$refs.userSearchInput.focus()
     },
     toggleHidden () {
       this.hidden = !this.hidden
diff --git a/src/components/user_finder/user_finder.vue b/src/components/user_finder/user_finder.vue
index 2f8b8900..a118ffe2 100644
--- a/src/components/user_finder/user_finder.vue
+++ b/src/components/user_finder/user_finder.vue
@@ -4,7 +4,7 @@
       <i class="icon-spin4 user-finder-icon animate-spin-slow" v-if="loading" />
       <a href="#" v-if="hidden" :title="$t('finder.find_user')"><i class="icon-user-plus user-finder-icon" @click.prevent.stop="toggleHidden" /></a>
       <template v-else>
-        <input class="user-finder-input" ref="username" @keyup.enter="findUser(username)" v-model="username" :placeholder="$t('finder.find_user')" id="user-finder-input" type="text"/>
+        <input class="user-finder-input" ref="userSearchInput" @keyup.enter="findUser(username)" v-model="username" :placeholder="$t('finder.find_user')" id="user-finder-input" type="text"/>
         <button class="btn search-button" @click="findUser(username)">
           <i class="icon-search"/>
         </button>
diff --git a/src/components/user_search/user_search.js b/src/components/user_search/user_search.js
index c8503add..cd14cb8c 100644
--- a/src/components/user_search/user_search.js
+++ b/src/components/user_search/user_search.js
@@ -24,7 +24,7 @@ const userSearch = {
   methods: {
     newQuery (query) {
       this.$router.push({ name: 'user-search', query: { query } })
-      this.$refs.username.focus()
+      this.$refs.userSearchInput.focus()
     },
     search (query) {
       if (!query) {
diff --git a/src/components/user_search/user_search.vue b/src/components/user_search/user_search.vue
index d981faee..f2537f32 100644
--- a/src/components/user_search/user_search.vue
+++ b/src/components/user_search/user_search.vue
@@ -4,7 +4,7 @@
       {{$t('nav.user_search')}}
     </div>
     <div class="user-search-input-container">
-      <input class="user-finder-input" ref="username" @keyup.enter="newQuery(username)" v-model="username" :placeholder="$t('finder.find_user')"/>
+      <input class="user-finder-input" ref="userSearchInput" @keyup.enter="newQuery(username)" v-model="username" :placeholder="$t('finder.find_user')"/>
       <button class="btn search-button" @click="newQuery(username)">
         <i class="icon-search"/>
       </button>
-- 
cgit v1.2.3-70-g09d2


From 3f9fd07f93b470f59a90abc3ee914d03a11efb87 Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Mon, 25 Feb 2019 16:30:27 -0500
Subject: Remove non-existing prop binding

---
 src/components/follow_requests/follow_requests.vue | 2 +-
 src/components/user_search/user_search.vue         | 2 +-
 src/components/who_to_follow/who_to_follow.vue     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/components/user_search/user_search.vue')

diff --git a/src/components/follow_requests/follow_requests.vue b/src/components/follow_requests/follow_requests.vue
index 87dc4194..afa3fcaf 100644
--- a/src/components/follow_requests/follow_requests.vue
+++ b/src/components/follow_requests/follow_requests.vue
@@ -4,7 +4,7 @@
       {{$t('nav.friend_requests')}}
     </div>
     <div class="panel-body">
-      <user-card v-for="request in requests" :key="request.id" :user="request" :showFollows="false" :showApproval="true"></user-card>
+      <user-card v-for="request in requests" :key="request.id" :user="request" :showApproval="true"></user-card>
     </div>
   </div>
 </template>
diff --git a/src/components/user_search/user_search.vue b/src/components/user_search/user_search.vue
index b39e10f4..8e07f62b 100644
--- a/src/components/user_search/user_search.vue
+++ b/src/components/user_search/user_search.vue
@@ -13,7 +13,7 @@
       <i class="icon-spin3 animate-spin"/>
     </div>
     <div v-else class="panel-body">
-      <user-card v-for="user in users" :key="user.id" :user="user" :showFollows="true"></user-card>
+      <user-card v-for="user in users" :key="user.id" :user="user"></user-card>
     </div>
   </div>
 </template>
diff --git a/src/components/who_to_follow/who_to_follow.vue b/src/components/who_to_follow/who_to_follow.vue
index df2e03c8..e148a089 100644
--- a/src/components/who_to_follow/who_to_follow.vue
+++ b/src/components/who_to_follow/who_to_follow.vue
@@ -4,7 +4,7 @@
       {{$t('who_to_follow.who_to_follow')}}
     </div>
     <div class="panel-body">
-      <user-card v-for="user in users" :key="user.id" :user="user" :showFollows="true"></user-card>
+      <user-card v-for="user in users" :key="user.id" :user="user"></user-card>
     </div>
   </div>
 </template>
-- 
cgit v1.2.3-70-g09d2


From 96e7e8235d778605fb934c63b4019d597ab51739 Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Mon, 25 Feb 2019 23:34:40 -0500
Subject: Migrate UserCard to FollowCard and FollowRequestCard

---
 src/components/follow_requests/follow_requests.js  | 4 ++--
 src/components/follow_requests/follow_requests.vue | 2 +-
 src/components/user_search/user_search.js          | 4 ++--
 src/components/user_search/user_search.vue         | 2 +-
 src/components/who_to_follow/who_to_follow.js      | 4 ++--
 src/components/who_to_follow/who_to_follow.vue     | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/components/user_search/user_search.vue')

diff --git a/src/components/follow_requests/follow_requests.js b/src/components/follow_requests/follow_requests.js
index 11a228aa..d57dcbc7 100644
--- a/src/components/follow_requests/follow_requests.js
+++ b/src/components/follow_requests/follow_requests.js
@@ -1,8 +1,8 @@
-import UserCard from '../user_card/user_card.vue'
+import FollowRequestCard from '../follow_request_card/follow_request_card.vue'
 
 const FollowRequests = {
   components: {
-    UserCard
+    FollowRequestCard
   },
   created () {
     this.updateRequests()
diff --git a/src/components/follow_requests/follow_requests.vue b/src/components/follow_requests/follow_requests.vue
index afa3fcaf..b83c2d68 100644
--- a/src/components/follow_requests/follow_requests.vue
+++ b/src/components/follow_requests/follow_requests.vue
@@ -4,7 +4,7 @@
       {{$t('nav.friend_requests')}}
     </div>
     <div class="panel-body">
-      <user-card v-for="request in requests" :key="request.id" :user="request" :showApproval="true"></user-card>
+      <FollowRequestCard v-for="request in requests" :key="request.id" :user="request"/>
     </div>
   </div>
 </template>
diff --git a/src/components/user_search/user_search.js b/src/components/user_search/user_search.js
index fe67b2ad..55040826 100644
--- a/src/components/user_search/user_search.js
+++ b/src/components/user_search/user_search.js
@@ -1,8 +1,8 @@
-import UserCard from '../user_card/user_card.vue'
+import FollowCard from '../follow_card/follow_card.vue'
 import userSearchApi from '../../services/new_api/user_search.js'
 const userSearch = {
   components: {
-    UserCard
+    FollowCard
   },
   props: [
     'query'
diff --git a/src/components/user_search/user_search.vue b/src/components/user_search/user_search.vue
index 8e07f62b..1269eea6 100644
--- a/src/components/user_search/user_search.vue
+++ b/src/components/user_search/user_search.vue
@@ -13,7 +13,7 @@
       <i class="icon-spin3 animate-spin"/>
     </div>
     <div v-else class="panel-body">
-      <user-card v-for="user in users" :key="user.id" :user="user"></user-card>
+      <FollowCard v-for="user in users" :key="user.id" :user="user"/>
     </div>
   </div>
 </template>
diff --git a/src/components/who_to_follow/who_to_follow.js b/src/components/who_to_follow/who_to_follow.js
index 82098fc2..be0b8827 100644
--- a/src/components/who_to_follow/who_to_follow.js
+++ b/src/components/who_to_follow/who_to_follow.js
@@ -1,9 +1,9 @@
 import apiService from '../../services/api/api.service.js'
-import UserCard from '../user_card/user_card.vue'
+import FollowCard from '../follow_card/follow_card.vue'
 
 const WhoToFollow = {
   components: {
-    UserCard
+    FollowCard
   },
   data () {
     return {
diff --git a/src/components/who_to_follow/who_to_follow.vue b/src/components/who_to_follow/who_to_follow.vue
index e148a089..1630f5ac 100644
--- a/src/components/who_to_follow/who_to_follow.vue
+++ b/src/components/who_to_follow/who_to_follow.vue
@@ -4,7 +4,7 @@
       {{$t('who_to_follow.who_to_follow')}}
     </div>
     <div class="panel-body">
-      <user-card v-for="user in users" :key="user.id" :user="user"></user-card>
+      <FollowCard v-for="user in users" :key="user.id" :user="user"/>
     </div>
   </div>
 </template>
-- 
cgit v1.2.3-70-g09d2

