From 83fbc483f0c8b3a3077c09b7ac93cfcf7673b2f0 Mon Sep 17 00:00:00 2001
From: Michel Roux <xefir@crystalyx.net>
Date: Sun, 3 Nov 2024 23:10:21 +0100
Subject: [PATCH] fix: :truck: remove alias and cleanup

---
 backend/pilotwings.py                   | 30 ++++++++++++-------------
 frontend/components/Loading.vue         |  2 +-
 frontend/main.ts                        |  2 +-
 frontend/{router.ts => router/index.ts} |  4 ++--
 frontend/types.ts                       | 10 +++++++++
 frontend/views/Home.vue                 |  9 ++++----
 tsconfig.json                           |  4 ----
 vite.config.ts                          |  8 -------
 8 files changed, 33 insertions(+), 36 deletions(-)
 rename frontend/{router.ts => router/index.ts} (78%)
 create mode 100644 frontend/types.ts

diff --git a/backend/pilotwings.py b/backend/pilotwings.py
index 6095c6d..8bb7109 100644
--- a/backend/pilotwings.py
+++ b/backend/pilotwings.py
@@ -42,20 +42,6 @@ async def check_auth(
     return credentials
 
 
-class AuthStaticFiles(StaticFiles):
-    async def __call__(
-        self, scope: types.Scope, receive: types.Receive, send: types.Send
-    ) -> None:
-        request = Request(scope, receive)
-        credentials = await security(request)
-
-        if not credentials:
-            raise http_401()
-
-        await check_auth(credentials)
-        await super().__call__(scope, receive, send)
-
-
 app = FastAPI(dependencies=[Depends(check_auth)])
 
 
@@ -66,7 +52,6 @@ class SerializedContainer(BaseModel):
     labels: dict[str, str]
     status: str
     health: str
-    ports: dict[str, str]
     owner: str | None
     environment: list[str]
 
@@ -79,7 +64,6 @@ def serialize_container(container: Container) -> SerializedContainer:
         labels=container.labels,
         status=container.status,
         health=container.health,
-        ports=container.ports,
         owner=container.labels.get("owner"),
         environment=container.attrs["Config"]["Env"],
     )
@@ -182,6 +166,20 @@ def update_container(
     )
 
 
+class AuthStaticFiles(StaticFiles):
+    async def __call__(
+        self, scope: types.Scope, receive: types.Receive, send: types.Send
+    ) -> None:
+        request = Request(scope, receive)
+        credentials = await security(request)
+
+        if not credentials:
+            raise http_401()
+
+        await check_auth(credentials)
+        await super().__call__(scope, receive, send)
+
+
 app.mount(
     "/",
     AuthStaticFiles(
diff --git a/frontend/components/Loading.vue b/frontend/components/Loading.vue
index 56e91b6..2790c7a 100644
--- a/frontend/components/Loading.vue
+++ b/frontend/components/Loading.vue
@@ -6,7 +6,7 @@
 </template>
 
 <script lang="ts">
-import Message from '@/components/Message.vue'
+import Message from './Message.vue'
 
 export default {
   name: 'Loading',
diff --git a/frontend/main.ts b/frontend/main.ts
index 3d119a1..7d55fea 100644
--- a/frontend/main.ts
+++ b/frontend/main.ts
@@ -2,7 +2,7 @@ import 'bulma/css/bulma.min.css'
 import 'font-awesome/css/font-awesome.min.css'
 import App from './App.vue'
 import { createApp } from 'vue'
-import router from './router.ts'
+import router from './router'
 
 const app = createApp(App)
 app.use(router)
diff --git a/frontend/router.ts b/frontend/router/index.ts
similarity index 78%
rename from frontend/router.ts
rename to frontend/router/index.ts
index 8737e76..d7a6798 100644
--- a/frontend/router.ts
+++ b/frontend/router/index.ts
@@ -1,6 +1,6 @@
 import { createRouter, createWebHistory } from 'vue-router'
-import Container from './views/Container.vue'
-import Home from './views/Home.vue'
+import Container from '../views/Container.vue'
+import Home from '../views/Home.vue'
 
 const router = createRouter({
   history: createWebHistory(import.meta.env.BASE_URL),
diff --git a/frontend/types.ts b/frontend/types.ts
new file mode 100644
index 0000000..2a8a298
--- /dev/null
+++ b/frontend/types.ts
@@ -0,0 +1,10 @@
+export interface Container {
+  id: number
+  name: string | null
+  image: string | null
+  labels: Record<string, string>
+  status: string
+  health: string
+  owner: string
+  environment: string[]
+}
diff --git a/frontend/views/Home.vue b/frontend/views/Home.vue
index 4d38125..3e2d802 100644
--- a/frontend/views/Home.vue
+++ b/frontend/views/Home.vue
@@ -19,8 +19,9 @@
 
 <script lang="ts">
 import axios, { AxiosError } from 'axios'
-import Icon from '@/components/Icon.vue'
-import Loading from '@/components/Loading.vue'
+import type { Container } from '../types'
+import Icon from '../components/Icon.vue'
+import Loading from '../components/Loading.vue'
 
 export default {
   name: 'Home',
@@ -30,14 +31,14 @@ export default {
   },
   data() {
     return {
-      containers: [],
+      containers: [] as Container[],
       error: '',
       loading: true,
     }
   },
   async mounted() {
     try {
-      const response = await axios.get('/api/containers')
+      const response = await axios.get<Container[]>('/api/containers')
       this.containers = response.data
     } catch (error) {
       console.error(error)
diff --git a/tsconfig.json b/tsconfig.json
index 49b7eb6..50692cb 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -5,9 +5,5 @@
     "composite": true,
     "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo",
     "baseUrl": ".",
-    "paths": {
-      "@/*": ["frontend/*"]
-    },
-    "allowImportingTsExtensions": true,
   }
 }
diff --git a/vite.config.ts b/vite.config.ts
index 6c25174..525b502 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -1,16 +1,8 @@
-import { URL, fileURLToPath } from 'node:url'
-
 import { defineConfig } from 'vite'
 import vue from '@vitejs/plugin-vue'
 
-// https://vite.dev/config/
 export default defineConfig({
   plugins: [vue()],
-  resolve: {
-    alias: {
-      '@': fileURLToPath(new URL('./frontend', import.meta.url)),
-    },
-  },
   build: {
     outDir: 'backend/dist',
   },