ui

Author: kdudkov

cmd/goatak_server/admin_api.go

@@ -422,7 +422,7 @@ func getApiAllMissionChangesHandler(app *App) fiber.Handler {
 
 func getApiFilesHandler(app *App) fiber.Handler {
 	return func(ctx *fiber.Ctx) error {
-		data := app.dbm.ResourceQuery().Order("created_at DESC").Get()
+		data := app.dbm.ResourceQuery().Order("scope, created_at DESC").Get()
 
 		return ctx.JSON(data)
 	}

cmd/goatak_server/templates/devices.html

@@ -37,9 +37,8 @@ <h4>Device</h4>
                     <tr>
                         <th>Scope</th>
                         <td>
-                            <span class="badge text-bg-success"
-                                >{{ current.scope }}</span
-                            >
+                            <span class="badge text-bg-success">
+                                {{ current.scope }}</span>
                         </td>
                     </tr>
                     <tr>

cmd/goatak_server/templates/files.html

@@ -8,7 +8,7 @@ <h4>Resources</h4>
                 <th>File</th>
                 <th>Size</th>
             </tr>
-            <tr v-for="p in all" @click="current = p">
+            <tr v-for="p in all" @click="current = p" :class="{ 'table-active': p === current }">
                 <td>{{ dt(p.CreatedAt) }}</td>
                 <td>{{ p.Scope }}</td>
                 <td>{{ p.FileName }}</td>

cmd/goatak_server/templates/missions.html

@@ -7,7 +7,7 @@ <h4>Missions</h4>
                 <th>Scope</th>
                 <th>Creator</th>
             </tr>
-            <tr v-for="c in missions" @click="current = c">
+            <tr v-for="c in missions" @click="current = c" :class="{ 'table-active': c === current }">
                 <td>{{ c.name }}</td>
                 <td>{{ c.scope }}</td>
                 <td>{{ c.creatorUid }}</td>

cmd/goatak_server/templates/points.html

@@ -10,7 +10,7 @@ <h4>Points</h4>
                 <th>Coords</th>
                 <th>Created</th>
             </tr>
-            <tr v-for="p in all" @click="current = p">
+            <tr v-for="p in all" @click="current = p" :class="{ 'table-active': p === current }">
                 <td>{{ p.Scope }}</td>
                 <td>{{ p.UID }}</td>
                 <td>{{ p.Callsign }}</td>

cmd/goatak_server/templates/profiles.html

@@ -14,7 +14,7 @@ <h4>Profiles</h4>
                 <th>CotType</th>
                 <th>Options</th>
             </tr>
-            <tr v-for="p in profiles" @click="current = p">
+            <tr v-for="p in profiles" @click="current = p" :class="{ 'table-active': p === current }">
                 <td>{{ p.login }}</td>
                 <td>{{ p.uid }}</td>
                 <td>{{ p.callsign }}</td>

staticfiles/static/js/files.js

@@ -28,7 +28,7 @@ const app = Vue.createApp({
                     return resp.json();
                 })
                 .then(data => {
-                    vm.data = data.sort((a, b) => a.Scope.localeCompare(b.Scope) || a.FileName.toLowerCase().localeCompare(b.FileName.toLowerCase()));
+                    vm.data = data;
                     vm.ts += 1;
                 });
         },