diff --git a/ui/src/components/Navigation/Navbar.vue b/ui/src/components/Navigation/Navbar.vue
index 9aebc3d..b90d84d 100644
--- a/ui/src/components/Navigation/Navbar.vue
+++ b/ui/src/components/Navigation/Navbar.vue
@@ -138,6 +138,12 @@ function blurAfter() {
+
+
+ Member Management
+
+
+
@@ -146,13 +152,6 @@ function blurAfter() {
-
-
-
diff --git a/ui/src/pages/memberList.vue b/ui/src/pages/memberList.vue
index 64ea120..df4bffc 100644
--- a/ui/src/pages/memberList.vue
+++ b/ui/src/pages/memberList.vue
@@ -25,7 +25,8 @@ import {
} from "@/components/ui/dialog"
import Badge from "@/components/ui/badge/Badge.vue";
import { computed, ref } from "vue";
-import { Member, getMembers } from "@/api/member";
+import { getMembers } from "@/api/member";
+import { Member } from "@shared/types/member";
import { useRouter } from 'vue-router';
import { Ellipsis } from "lucide-vue-next";
import Input from "@/components/ui/input/Input.vue";
@@ -55,8 +56,13 @@ const searchedMembers = computed(() => {
-
-
+
@@ -70,24 +76,25 @@ const searchedMembers = computed(() => {
-
+
{{ member.member_name }}
{{ member.rank }}
{{ member.unit }}
{{ member.status }}
- On LOA
+
+ On LOA
+
- Change Rank
- Transfer
- Retire
+
+ Discharge
diff --git a/ui/src/router/index.js b/ui/src/router/index.js
index 4e7050a..3832b51 100644
--- a/ui/src/router/index.js
+++ b/ui/src/router/index.js
@@ -13,7 +13,6 @@ const router = createRouter({
{ path: '/', component: () => import('@/pages/Homepage.vue') },
// MEMBER ROUTES
- { path: '/members', component: () => import('@/pages/memberList.vue'), meta: { requiresAuth: true, memberOnly: true } },
{ path: '/loa', component: () => import('@/pages/SubmitLOA.vue'), meta: { requiresAuth: true, memberOnly: true } },
{ path: '/profile', component: () => import('@/pages/MyProfile.vue'), meta: { requiresAuth: true } },
@@ -39,7 +38,8 @@ const router = createRouter({
{ path: 'applications/:id', component: () => import('@/pages/Application.vue') },
{ path: 'loa', component: () => import('@/pages/ManageLOA.vue') },
{ path: 'roles', component: () => import('@/pages/ManageRoles.vue') },
- { path: 'roles/:id', component: () => import('@/pages/ManageRoles.vue') }
+ { path: 'roles/:id', component: () => import('@/pages/ManageRoles.vue') },
+ { path: 'members', component: () => import('@/pages/memberList.vue') },
]
},