fixed for reals this time

Fixed hardcoded database name
Made calendar cancel button red
2025-12-17 17:20:28 -05:00 · 2025-12-17 17:15:33 -05:00 · 2025-12-17 13:11:24 -05:00 · 2025-12-17 12:57:09 -05:00
3 changed files with 3 additions and 3 deletions
--- a/api/src/db.ts
+++ b/api/src/db.ts
@@ -12,7 +12,7 @@ const pool = mariadb.createPool({
    connectionLimit: 5,
    connectTimeout: 10000,        // give it more breathing room
    acquireTimeout: 15000,
-    database: 'ranger_unit_tracker',
+    database: process.env.DB_DATABASE,
    ssl: false,
 });

--- a/api/src/services/rolesService.ts
+++ b/api/src/services/rolesService.ts
@@ -21,7 +21,7 @@ export async function getUserRoles(userID: number): Promise<Role[]> {
    const sql = `SELECT r.id, r.name
        FROM members_roles mr
        INNER JOIN roles r ON mr.role_id = r.id
-        WHERE mr.member_id = 190;`;
+        WHERE mr.member_id = ?;`;

    return await pool.query(sql, [userID]);
 }
--- a/ui/src/components/calendar/ViewCalendarEvent.vue
+++ b/ui/src/components/calendar/ViewCalendarEvent.vue
@@ -197,7 +197,7 @@ defineExpose({ forceReload })
                        <DropdownMenuItem v-if="activeEvent.cancelled" @click="setCancel(false)">
                            Un-Cancel
                        </DropdownMenuItem>
-                        <DropdownMenuItem v-else @click="setCancel(true)">
+                        <DropdownMenuItem v-else @click="setCancel(true)" class="text-destructive">
                            Cancel
                        </DropdownMenuItem>
                    </DropdownMenuContent>
Author	SHA1	Message	Date
ajdj100	d7b099ac75	fixed for reals this time All checks were successful Continuous Integration / Update Development (push) Successful in 2m26s Details Continuous Deployment / Update Deployment (push) Successful in 2m26s Details	2025-12-17 17:20:28 -05:00
ajdj100	a6b521a89c	Fixed hardcoded database name All checks were successful Continuous Integration / Update Development (push) Successful in 2m27s Details Continuous Deployment / Update Deployment (push) Successful in 2m24s Details	2025-12-17 17:15:33 -05:00
ajdj100	ad4d28b5dd	Made calendar cancel button red All checks were successful Continuous Integration / Update Development (push) Successful in 2m23s Details	2025-12-17 13:11:24 -05:00
ajdj100	ac22e36202	Fixed everyone getting my roles All checks were successful Continuous Integration / Update Development (push) Successful in 2m23s Details Continuous Deployment / Update Deployment (push) Successful in 2m25s Details	2025-12-17 12:57:09 -05:00