From f2d32fe72e8859833bddec13cf411d1e12914e2a Mon Sep 17 00:00:00 2001
From: iamBadgers <jmosrael@gmail.com>
Date: Sat, 18 May 2024 19:03:13 -0700
Subject: [PATCH] filter for character list

---
 backend/src/app.ts                  | 13 ++++++++++---
 frontend/src/App.vue                |  1 +
 frontend/src/vues/CharacterList.vue | 22 ++++++++++++++++++++--
 frontend/src/vues/GameList.vue      |  8 +++++++-
 4 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/backend/src/app.ts b/backend/src/app.ts
index ccdf91d..6450863 100644
--- a/backend/src/app.ts
+++ b/backend/src/app.ts
@@ -20,14 +20,21 @@ app.get('/api/character/:characterId', async (req, res) => {
 
 app.post('/api/character', jsonParser, async (req, res) => {
   const page = req.body.page
-  const orderBy = req.body.orderBy
+  const orderBy = req.body.orderBy ? obp.parse(req.body.orderBy) : ['id']
   const count = req.body.count
+  const filter = req.body.filter ? fp.parse(req.body.filter) : {}
 
   const characterData = await Character.findAll({
     offset: page * count,
-    limit: count
+    limit: count,
+    order: orderBy,
+    where: filter
   })
-  const pageCount = Math.ceil((await Character.count()) / count)
+  const pageCount = Math.ceil(
+    (await Character.count({
+      where: filter
+    })) / count
+  )
 
   res.setHeader('Content-Type', 'application/json')
   res.json({ characterData, pageCount })
diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 0833ea6..e37e74e 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -2,6 +2,7 @@
   <v-app>
     <v-main>
       <v-app-bar>
+        <v-btn to="/serverstats">Server Stats</v-btn>
         <v-btn to="/games">Games</v-btn>
         <v-btn to="/characters">Characters</v-btn>
         <v-btn to="/gms">GMs</v-btn>
diff --git a/frontend/src/vues/CharacterList.vue b/frontend/src/vues/CharacterList.vue
index 621b1ea..1a332ae 100644
--- a/frontend/src/vues/CharacterList.vue
+++ b/frontend/src/vues/CharacterList.vue
@@ -1,4 +1,11 @@
 <template>
+  <div class="d-flex flex-row">
+    <v-text-field
+      class="filter flex-1-0"
+      placeholder="Filter by Name"
+      v-model="filtervalue"
+    ></v-text-field>
+  </div>
   <v-table>
     <thead>
       <tr>
@@ -48,11 +55,14 @@ const page = ref(1)
 
 let count = 10
 
+const filtervalue = ref('')
+
 async function loadData() {
   const response = await axios.post('/api/character', {
     page: `${page.value - 1}`,
     count: `10`,
-    orderBy: 'id'
+    orderBy: 'id',
+    filter: filtervalue.value ? `characterName:"${filtervalue.value}"` : ''
   })
 
   characters.value = response.data.characterData
@@ -63,7 +73,7 @@ function setPage(targetPage: number) {
   router.replace({ query: { page: targetPage } })
 }
 
-watch(route, (newValue, oldValue) => {  
+watch(route, (newValue, oldValue) => {
   if (!route.query.page) {
     router.replace({ query: { page: 1 } })
     page.value = 1
@@ -74,6 +84,14 @@ watch(route, (newValue, oldValue) => {
   loadData()
 })
 
+let debounce = null
+watch(filtervalue, (oldFilter, newFilter) => {
+  debounce = clearTimeout(debounce)
+  debounce = setTimeout(() => {
+    loadData()
+  }, 500)
+})
+
 onMounted(async () => {
   if (!route.query.page) {
     router.replace({ query: { page: 1 } })
diff --git a/frontend/src/vues/GameList.vue b/frontend/src/vues/GameList.vue
index 064a5ad..993a77d 100644
--- a/frontend/src/vues/GameList.vue
+++ b/frontend/src/vues/GameList.vue
@@ -43,7 +43,7 @@ async function loadData() {
   const response = await axios.post('/api/game', {
     page: `${page.value - 1}`,
     count: `${count}`,
-    filter: filtervalue.value ? `title:${filtervalue.value}` : '',
+    filter: filtervalue.value ? `title:"${filtervalue.value}"` : '',
     orderBy: 'id'
   })
 
@@ -74,6 +74,12 @@ watch(filtervalue, (oldFilter, newFilter) => {
 })
 
 onMounted(async () => {
+  if (!route.query.page) {
+    router.replace({ query: { page: 1 } })
+    page.value = 1
+  } else {
+    page.value = Number(route.query.page)
+  }
   loadData()
 })
 </script>