17th-Ranger-Battalion-ORG/milsim-site-v4
8
1
Fork 0
Code Issues 33 Pull Requests Actions 3 Packages Projects Releases 4 Wiki Activity

Revert "more typescript changes/conversion nonsense (this broke a lot of stuff)"

Browse Source 
This reverts commit 74151dbf2d.
This commit is contained in:
ajdj100
2025-11-17 17:16:37 -05:00
parent 74151dbf2d
commit cbefff34f5
5 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ui/src/router/index.ts → ui/src/router/index.js
View File

@@ -17,7 +17,7 @@ const router = createRouter({
{ path: '/transfer', component: () => import('@/pages/Transfer.vue'), meta: { requiresAuth: true, memberOnly: true } },
{ path: '/calendar', component: () => import('@/pages/Calendar.vue'), meta: { requiresAuth: true, memberOnly: true } },
{ path: '/trainingReport', component: () => import('@/pages/TrainingReport.vue'), meta: { requiresAuth: true, memberOnly: true } },
// ADMIN / STAFF ROUTES
{
path: '/administration',
@@ -47,12 +47,12 @@ router.beforeEach(async (to) => {
}
// Not logged in
// if (to.meta.requiresAuth && !user.isLoggedIn) {
// // Redirect back to original page after login
// const redirectUrl = encodeURIComponent(window.location.origin + to.fullPath)
// window.location.href = `https://aj17thdevapi.nexuszone.net/login?redirect=${redirectUrl}`
// return false // Prevent Vue Router from continuing
// }
if (to.meta.requiresAuth && !user.isLoggedIn) {
// Redirect back to original page after login
const redirectUrl = encodeURIComponent(window.location.origin + to.fullPath)
window.location.href = `https://aj17thdevapi.nexuszone.net/login?redirect=${redirectUrl}`
return false // Prevent Vue Router from continuing
}
// // Must be a member