From de13254f0a4860268b105a2745cd7a0f5d23a059 Mon Sep 17 00:00:00 2001
From: Angelina Filippova <linakirsanova@gmail.com>
Date: Tue, 5 Mar 2019 02:13:04 +0300
Subject: [PATCH 1/3] Add filtration for local users

---
 src/api/users.js           | 10 ++++++++--
 src/store/modules/users.js | 18 ++++++++++++++++--
 src/views/users/index.vue  | 17 ++++++++++++++++-
 3 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/src/api/users.js b/src/api/users.js
index bfbfd9f4..4d309194 100644
--- a/src/api/users.js
+++ b/src/api/users.js
@@ -16,9 +16,15 @@ export async function toggleUserActivation(nickname) {
 
 export async function searchUsers(query, page = 1) {
   return await request({
-    url: `/api/pleroma/admin/users/search?query=${query}&page=${page}`,
+    url: `/api/pleroma/admin/users?query=${query}&page=${page}`,
+    method: 'get'
+  })
+}
+
+export async function fetchLocalUsers(page = 1) {
+  return await request({
+    url: `/api/pleroma/admin/users?page=${page}&local_only=true`,
     method: 'get'
   })
 }
 
-export default { fetchUsers, toggleUserActivation }
diff --git a/src/store/modules/users.js b/src/store/modules/users.js
index 3997165a..402bde8d 100644
--- a/src/store/modules/users.js
+++ b/src/store/modules/users.js
@@ -1,4 +1,4 @@
-import { fetchUsers, toggleUserActivation, searchUsers } from '@/api/users'
+import { fetchUsers, toggleUserActivation, searchUsers, fetchLocalUsers } from '@/api/users'
 
 const user = {
   state: {
@@ -6,7 +6,8 @@ const user = {
     loading: true,
     searchQuery: '',
     totalUsersCount: 0,
-    currentPage: 1
+    currentPage: 1,
+    showLocalUsers: false
   },
   mutations: {
     SET_USERS: (state, users) => {
@@ -35,6 +36,9 @@ const user = {
     },
     SET_SEARCH_QUERY: (state, query) => {
       state.searchQuery = query
+    },
+    SET_LOCAL_USERS_FILTER: (state, value) => {
+      state.showLocalUsers = value
     }
   },
   actions: {
@@ -62,6 +66,16 @@ const user = {
 
         loadUsers(commit, page, response.data)
       }
+    },
+    async ToggleLocalUsersFilter({ commit, dispatch }, value) {
+      commit('SET_LOCAL_USERS_FILTER', value)
+
+      if (value) {
+        const response = await fetchLocalUsers()
+        loadUsers(commit, 1, response.data)
+      } else {
+        dispatch('FetchUsers', 1)
+      }
     }
   }
 }
diff --git a/src/views/users/index.vue b/src/views/users/index.vue
index 5dfabdd5..fbd167aa 100644
--- a/src/views/users/index.vue
+++ b/src/views/users/index.vue
@@ -1,7 +1,10 @@
 <template>
   <div class="users-container">
     <h1>Users</h1>
-    <el-input placeholder="Search" class="search" @input="handleDebounceSearchInput"/>
+    <div class="searchContainer">
+      <el-checkbox :value="showLocalUsers" @change="handleLocalUsersCheckbox">Show local users only</el-checkbox>
+      <el-input placeholder="Search" class="search" @input="handleDebounceSearchInput"/>
+    </div>
     <el-table v-loading="loading" :data="users" style="width: 100%">
       <el-table-column prop="id" label="ID" width="180"/>
       <el-table-column prop="nickname" label="Name"/>
@@ -56,6 +59,9 @@ export default {
     },
     currentPage() {
       return this.$store.state.users.currentPage
+    },
+    showLocalUsers() {
+      return this.$store.state.users.showLocalUsers
     }
   },
   created() {
@@ -80,6 +86,9 @@ export default {
     },
     showDeactivatedButton(id) {
       return this.$store.state.user.id !== id
+    },
+    handleLocalUsersCheckbox(e) {
+      this.$store.dispatch('ToggleLocalUsersFilter', e)
     }
   }
 }
@@ -102,5 +111,11 @@ export default {
     margin-right: 15px;
     float: right;
   }
+  .searchContainer {
+    display: flex;
+    justify-content: space-between;
+    align-items: baseline;
+    margin-left: 15px;
+  }
 }
 </style>

From 7652bfcd5811203de756a6848b2f659d5b0da3c7 Mon Sep 17 00:00:00 2001
From: Angelina Filippova <linakirsanova@gmail.com>
Date: Tue, 5 Mar 2019 02:40:42 +0300
Subject: [PATCH 2/3] Implemented local users filtration in fetch and search
 requests

---
 src/api/users.js           | 15 ++++-----------
 src/store/modules/users.js | 20 +++++++-------------
 2 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/src/api/users.js b/src/api/users.js
index 4d309194..a6023f9c 100644
--- a/src/api/users.js
+++ b/src/api/users.js
@@ -1,8 +1,8 @@
 import request from '@/utils/request'
 
-export async function fetchUsers(page = 1) {
+export async function fetchUsers(page = 1, showLocalUsers) {
   return await request({
-    url: `/api/pleroma/admin/users?page=${page}`,
+    url: `/api/pleroma/admin/users?page=${page}&local_only=${showLocalUsers}`,
     method: 'get'
   })
 }
@@ -14,16 +14,9 @@ export async function toggleUserActivation(nickname) {
   })
 }
 
-export async function searchUsers(query, page = 1) {
+export async function searchUsers(query, page = 1, showLocalUsers) {
   return await request({
-    url: `/api/pleroma/admin/users?query=${query}&page=${page}`,
-    method: 'get'
-  })
-}
-
-export async function fetchLocalUsers(page = 1) {
-  return await request({
-    url: `/api/pleroma/admin/users?page=${page}&local_only=true`,
+    url: `/api/pleroma/admin/users?query=${query}&page=${page}&local_only=${showLocalUsers}`,
     method: 'get'
   })
 }
diff --git a/src/store/modules/users.js b/src/store/modules/users.js
index 402bde8d..e8928334 100644
--- a/src/store/modules/users.js
+++ b/src/store/modules/users.js
@@ -1,4 +1,4 @@
-import { fetchUsers, toggleUserActivation, searchUsers, fetchLocalUsers } from '@/api/users'
+import { fetchUsers, toggleUserActivation, searchUsers } from '@/api/users'
 
 const user = {
   state: {
@@ -42,8 +42,8 @@ const user = {
     }
   },
   actions: {
-    async FetchUsers({ commit }, { page }) {
-      const response = await fetchUsers(page)
+    async FetchUsers({ commit, state }, { page }) {
+      const response = await fetchUsers(page, state.showLocalUsers)
 
       commit('SET_LOADING', true)
 
@@ -54,7 +54,7 @@ const user = {
 
       commit('SWAP_USER', response.data)
     },
-    async SearchUsers({ commit, dispatch }, { query, page }) {
+    async SearchUsers({ commit, dispatch, state }, { query, page }) {
       if (query.length === 0) {
         commit('SET_SEARCH_QUERY', query)
         dispatch('FetchUsers', page)
@@ -62,20 +62,14 @@ const user = {
         commit('SET_LOADING', true)
         commit('SET_SEARCH_QUERY', query)
 
-        const response = await searchUsers(query, page)
+        const response = await searchUsers(query, page, state.showLocalUsers)
 
         loadUsers(commit, page, response.data)
       }
     },
-    async ToggleLocalUsersFilter({ commit, dispatch }, value) {
+    async ToggleLocalUsersFilter({ commit, dispatch, state }, value) {
       commit('SET_LOCAL_USERS_FILTER', value)
-
-      if (value) {
-        const response = await fetchLocalUsers()
-        loadUsers(commit, 1, response.data)
-      } else {
-        dispatch('FetchUsers', 1)
-      }
+      dispatch('SearchUsers', { query: state.searchQuery, page: 1 })
     }
   }
 }

From 773793f8f4f99a3d1a2c2ee32724ec762be01bfb Mon Sep 17 00:00:00 2001
From: Angelina Filippova <linakirsanova@gmail.com>
Date: Wed, 6 Mar 2019 01:00:48 +0300
Subject: [PATCH 3/3] Fix logout button issue

---
 src/api/login.js          |  6 +-----
 src/store/modules/user.js | 17 +++++------------
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/src/api/login.js b/src/api/login.js
index caef8d8e..bc1c03ff 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -33,10 +33,6 @@ export function getUserInfo() {
   })
 }
 
-export function logout() {
-
-}
-
-const oauth = { loginByUsername, getUserInfo, logout }
+const oauth = { loginByUsername, getUserInfo }
 
 export default oauth
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 095e47f0..65e51cde 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -1,4 +1,4 @@
-import { loginByUsername, logout, getUserInfo } from '@/api/login'
+import { loginByUsername, getUserInfo } from '@/api/login'
 import { getToken, setToken, removeToken } from '@/utils/auth'
 
 const user = {
@@ -103,17 +103,10 @@ const user = {
     // },
 
     // 登出
-    LogOut({ commit, state }) {
-      return new Promise((resolve, reject) => {
-        logout(state.token).then(() => {
-          commit('SET_TOKEN', '')
-          commit('SET_ROLES', [])
-          removeToken()
-          resolve()
-        }).catch(error => {
-          reject(error)
-        })
-      })
+    LogOut({ commit }) {
+      commit('SET_TOKEN', '')
+      commit('SET_ROLES', [])
+      removeToken()
     },
 
     // 前端 登出