From 81a709f0496760c3f54cda67be47990c14b3a925 Mon Sep 17 00:00:00 2001
From: ajdj100 <AJCampbell@conestogac.on.ca>
Date: Sat, 11 May 2024 21:54:22 -0400
Subject: [PATCH 1/5] updated some thing that got mad at me that it wasnt
 updated

---
 17th Website/package-lock.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/17th Website/package-lock.json b/17th Website/package-lock.json
index c5bbcab..0371605 100644
--- a/17th Website/package-lock.json	
+++ b/17th Website/package-lock.json	
@@ -2591,9 +2591,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001486",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001486.tgz",
-      "integrity": "sha512-uv7/gXuHi10Whlj0pp5q/tsK/32J2QSqVRKQhs2j8VsDCjgyruAh/eEXHF822VqO9yT6iZKw3nRwZRSPBE9OQg==",
+      "version": "1.0.30001616",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001616.tgz",
+      "integrity": "sha512-RHVYKov7IcdNjVHJFNY/78RdG4oGVjbayxv8u5IO74Wv7Hlq4PnJE6mo/OjFijjVFNy5ijnCt6H3IIo4t+wfEw==",
       "dev": true,
       "funding": [
         {
@@ -11644,9 +11644,9 @@
       }
     },
     "caniuse-lite": {
-      "version": "1.0.30001486",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001486.tgz",
-      "integrity": "sha512-uv7/gXuHi10Whlj0pp5q/tsK/32J2QSqVRKQhs2j8VsDCjgyruAh/eEXHF822VqO9yT6iZKw3nRwZRSPBE9OQg==",
+      "version": "1.0.30001616",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001616.tgz",
+      "integrity": "sha512-RHVYKov7IcdNjVHJFNY/78RdG4oGVjbayxv8u5IO74Wv7Hlq4PnJE6mo/OjFijjVFNy5ijnCt6H3IIo4t+wfEw==",
       "dev": true
     },
     "case-sensitive-paths-webpack-plugin": {
-- 
2.37.3.windows.1


From ffbf7ca23fd7868cf4671c686b25cb5c9a4bf79b Mon Sep 17 00:00:00 2001
From: ajdj100 <AJCampbell@conestogac.on.ca>
Date: Fri, 24 May 2024 08:47:02 -0400
Subject: [PATCH 2/5] Removed old references to headlessUI listboxes

---
 17th Website/src/views/users.vue | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/17th Website/src/views/users.vue b/17th Website/src/views/users.vue
index a9f9e90..81f014b 100644
--- a/17th Website/src/views/users.vue	
+++ b/17th Website/src/views/users.vue	
@@ -1,7 +1,5 @@
 <script>
-import { Listbox, ListboxButton, ListboxOptions, ListboxOption } from '@headlessui/vue'
 import { Icon } from '@iconify/vue'
-import QueryApolloGraphQL from '../api/request'
 import Dropdown from '../components/dropdown/Dropdown.vue'
 
 export default {
@@ -55,10 +53,6 @@ export default {
         }
     },
     components: {
-        Listbox,
-        ListboxButton,
-        ListboxOption,
-        ListboxOptions,
         Icon,
         Dropdown,
     },
-- 
2.37.3.windows.1


From ec61da96d7d6471a18b97fac23f2db68de5e1f6b Mon Sep 17 00:00:00 2001
From: ajdj100 <AJCampbell@conestogac.on.ca>
Date: Sun, 26 May 2024 10:03:39 -0400
Subject: [PATCH 3/5] integrated new API for fetching members

---
 17th Website/src/views/users.vue | 36 +++++++++++++++++++++-----------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/17th Website/src/views/users.vue b/17th Website/src/views/users.vue
index 81f014b..08f7cb5 100644
--- a/17th Website/src/views/users.vue	
+++ b/17th Website/src/views/users.vue	
@@ -50,23 +50,32 @@ export default {
         },
         filterByRole(item) {    //THIS IS NOT IMPLEMENTED YET
             return true;
-        }
+        },
     },
     components: {
         Icon,
         Dropdown,
     },
     mounted() {
-    //    QueryApolloGraphQL("getPageViewMemberRankStatusAll", "query Query {getPageViewMemberRankStatusAll {items {member_name,rank,status}}}").then(value => { this.items = value }) //console.log(value); for debug reasons
+        //    QueryApolloGraphQL("getPageViewMemberRankStatusAll", "query Query {getPageViewMemberRankStatusAll {items {member_name,rank,status}}}").then(value => { this.items = value }) //console.log(value); for debug reasons
         // this.items = fetch("http://iceberg-gaming.com:1323/api/members");
 
         //make API request here
+
+        fetch('http://iceberg-gaming.com:1323/api/v1/member').then(res => {
+            console.log(res); 
+            res.json().then(list => {
+                this.items = list;
+                console.log(this.items);
+
+            });
+        });
     },
-    computed: {
+    computed: { 
         filteredTable() {
             var newTable = this.items;
-            newTable = newTable.filter(this.filterByUnit);
-            newTable = newTable.filter(this.filterByName);
+            // newTable = newTable.filter(this.filterByUnit);
+            // newTable = newTable.filter(this.filterByName);
             return newTable;
         },
     }
@@ -85,12 +94,12 @@ export default {
                     class="mx-2 max-w-md" />
                 <div id="dropdownWrapper">
 
-                    <Dropdown :values="statusFilters" :currentIndex="currentStatusFilterIndex" display="name" 
-                    @changeSelection="(index) => currentStatusFilterIndex = index" class="w-36 mr-2">
+                    <Dropdown :values="statusFilters" :currentIndex="currentStatusFilterIndex" display="name"
+                        @changeSelection="(index) => currentStatusFilterIndex = index" class="w-36 mr-2">
                     </Dropdown>
 
                     <Dropdown :values="roleFilters" :currentIndex="currentRoleFilter" display="name"
-                    @changeSelection="(index) => currentRoleFilter = index" class="w-36">
+                        @changeSelection="(index) => currentRoleFilter = index" class="w-36">
                     </Dropdown>
 
                     <button @click="resetFilters()"
@@ -104,7 +113,7 @@ export default {
             <thead>
                 <tr>
                     <th>Member</th>
-                    <th>Unit</th>
+                    <th>Status</th>
                     <th>Rank</th>
                     <th>Join Date</th>
                     <th>LOA Until</th>
@@ -114,9 +123,12 @@ export default {
             <tbody id="tableBody">
                 <tr v-for="(item, index) in filteredTable"
                     v-on:click="$router.push({ path: `/profile/${item.member_name}/home` })">
-                    <td>{{ item.member_name }}</td>
-                    <td>{{ item.status }}</td>
-                    <td>{{ item.rank }}</td>
+                    <td>{{ item.name }}</td>
+                    <td>{{ item.company }}</td>
+                    <td>{{ item.rank.name }}</td>
+                    <td>{{ item.created_at }}</td>
+                    <td>hello</td>
+                    <td>hello</td>
                 </tr>
             </tbody>
         </table>
-- 
2.37.3.windows.1


From 40d8edd0a6117bd5541166d20c69f22efe16ee0a Mon Sep 17 00:00:00 2001
From: ajdj100 <AJCampbell@conestogac.on.ca>
Date: Sun, 26 May 2024 11:43:46 -0400
Subject: [PATCH 4/5] Fixed some date formatting for join date

---
 17th Website/src/views/users.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/17th Website/src/views/users.vue b/17th Website/src/views/users.vue
index 08f7cb5..e21d5ef 100644
--- a/17th Website/src/views/users.vue	
+++ b/17th Website/src/views/users.vue	
@@ -122,11 +122,11 @@ export default {
             </thead>
             <tbody id="tableBody">
                 <tr v-for="(item, index) in filteredTable"
-                    v-on:click="$router.push({ path: `/profile/${item.member_name}/home` })">
+                    v-on:click="$router.push({ path: `/profile/${item.id}/home` })">
                     <td>{{ item.name }}</td>
                     <td>{{ item.company }}</td>
                     <td>{{ item.rank.name }}</td>
-                    <td>{{ item.created_at }}</td>
+                    <td>{{ item.created_at.split('T')[0] }}</td>
                     <td>hello</td>
                     <td>hello</td>
                 </tr>
-- 
2.37.3.windows.1


From a4ebd86a2b3692b1a164f65851c361adc143ea79 Mon Sep 17 00:00:00 2001
From: ajdj100 <AJCampbell@conestogac.on.ca>
Date: Sun, 26 May 2024 11:53:39 -0400
Subject: [PATCH 5/5] Fixed the filtering system

---
 17th Website/src/views/users.vue | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/17th Website/src/views/users.vue b/17th Website/src/views/users.vue
index e21d5ef..5b902bd 100644
--- a/17th Website/src/views/users.vue	
+++ b/17th Website/src/views/users.vue	
@@ -11,8 +11,8 @@ export default {
 
             statusFilters: [
                 { id: 1, name: 'All Groups', filter: 'none', disabled: false },
-                { id: 2, name: 'Alpha', filter: 'Alpha Company', disabled: false },
-                { id: 3, name: 'Echo', filter: 'Echo Company', disabled: false },
+                { id: 2, name: 'Alpha', filter: 'Alpha', disabled: false },
+                { id: 3, name: 'Echo', filter: 'Echo', disabled: false },
                 { id: 4, name: 'HHC', filter: 'HHC', disabled: false },
                 { id: 5, name: 'Recruit', filter: 'Recruit', disabled: false },
             ],
@@ -38,14 +38,18 @@ export default {
         },
         filterByName(item) {
             if (this.search != '')
-                return item.member_name.toLowerCase().includes(this.search.toLowerCase());
+                return item.name.toLowerCase().includes(this.search.toLowerCase());
             else
                 return true;
         },
         filterByUnit(item) {
+            // console.log(item, this.statusFilters[this.currentStatusFilterIndex]);
+
             if (this.statusFilters[this.currentStatusFilterIndex].filter != 'none')
-                return item.status == this.unitFilter.filter;
+                //do the filter
+                return item.company.toLowerCase() == this.statusFilters[this.currentStatusFilterIndex].filter.toLowerCase();
             else
+                //no filter applied
                 return true;
         },
         filterByRole(item) {    //THIS IS NOT IMPLEMENTED YET
@@ -74,8 +78,8 @@ export default {
     computed: { 
         filteredTable() {
             var newTable = this.items;
-            // newTable = newTable.filter(this.filterByUnit);
-            // newTable = newTable.filter(this.filterByName);
+            newTable = newTable.filter(this.filterByUnit);
+            newTable = newTable.filter(this.filterByName);
             return newTable;
         },
     }
-- 
2.37.3.windows.1