refactor client file structure

AntoineBuirey · AntoineBuirey · commit d4134a157773 · 2025-07-19T22:33:53.000+02:00
diff --git a/client/src/account/account.scss b/client/src/account/account.scss
@@ -1,5 +1,4 @@
-@use './common.scss';
-@use './header.scss';
+@use '../common.scss';
 
 main {
     text-align: center;
diff --git a/client/src/account/account.ts b/client/src/account/account.ts
@@ -1,6 +1,5 @@
-import ensure_token from "./ensure_token.js";
-import Cookies from "./cookie.js";
-import API from "./api.js";
+import ensure_token from "../scripts/ensure_token.js";
+import API from "../scripts/api.js";
 
 ensure_token();
 
diff --git a/client/src/account/index.template.html b/client/src/account/index.template.html
@@ -7,7 +7,7 @@
 </head>
 
 <body>
-    {{ insert("header") }}
+    {{ insert("header/header") }}
     <main>
         <h1>Account Management</h1>
         <div id="account-info">
diff --git a/client/src/dashboard/dashboard.scss b/client/src/dashboard/dashboard.scss
@@ -1,6 +1,4 @@
-@use './common.scss';
-@use './header.scss';
-
+@use '../common.scss';
 
 #server-list {
     display: flex;
diff --git a/client/src/dashboard/dashboard.ts b/client/src/dashboard/dashboard.ts
@@ -1,6 +1,6 @@
-import ensure_token from "./ensure_token.js";
-import API from "./api.js";
-import { AccessLevel, ServerInfo } from "./types.js";
+import ensure_token from "../scripts/ensure_token.js";
+import API from "../scripts/api.js";
+import { AccessLevel, ServerInfo } from "../scripts/types.js";
 
 ensure_token();
 
diff --git a/client/src/dashboard/index.template.html b/client/src/dashboard/index.template.html
@@ -7,7 +7,7 @@
 </head>
 
 <body>
-    {{ insert("header") }}
+    {{ insert("header/header") }}
     <main>
         <div id="server-list">
 
diff --git a/client/src/header/header.scss b/client/src/header/header.scss
@@ -1,4 +1,4 @@
-@use './common.scss';
+@use '../common.scss';
 
 // === Dashboard Header ===
 .dashboard-header {
diff --git a/client/src/header/header.template b/client/src/header/header.template
@@ -1,3 +1,4 @@
+<link rel="stylesheet" href="header.css" />
 <header class="dashboard-header">
     <button id="dashboard" onclick="window.location.href='dashboard.html'" {{"disabled" if page.name == "dashboard" else ""}}>
         Dashboard
diff --git a/client/src/header/header.ts b/client/src/header/header.ts
@@ -1,5 +1,5 @@
-import API from "./api.js";
-import Cookies from "./cookie.js";
+import API from "../scripts/api.js";
+import Cookies from "../scripts/cookie.js";
 
 const disconnectBtn = document.getElementById('disconnect') as HTMLButtonElement;
 
diff --git a/client/src/login/index.template.html b/client/src/login/index.template.html
@@ -3,7 +3,7 @@
 
 <head>
     {{ insert("metadata") }}
-    <link rel="stylesheet" href="login.css" />
+    <link rel="stylesheet" href="./login.css" />
 </head>
 
 <body>
diff --git a/client/src/login/login.scss b/client/src/login/login.scss
@@ -1,4 +1,4 @@
-@use './common.scss';
+@use '../common.scss';
 
 body {
     display: flex;
diff --git a/client/src/login/login.ts b/client/src/login/login.ts
@@ -1,5 +1,5 @@
-import Cookies from './cookie.js';
-import API from './api.js';
+import Cookies from '../scripts/cookie.js';
+import API from '../scripts/api.js';
 
 // Check if the user is already logged in
 const token = Cookies.get('token');
diff --git a/client/src/scripts/api.ts b/client/src/scripts/api.ts
diff --git a/client/src/scripts/cookie.ts b/client/src/scripts/cookie.ts
diff --git a/client/src/scripts/ensure_token.ts b/client/src/scripts/ensure_token.ts
diff --git a/client/src/scripts/types.ts b/client/src/scripts/types.ts
diff --git a/client/src/server.scss b/client/src/server.scss
diff --git a/client/src/server/index.template.html b/client/src/server/index.template.html
@@ -7,7 +7,7 @@
 </head>
 
 <body>
-    {{ insert("header") }}
+    {{ insert("header/header") }}
     <main>
 
     </main>
diff --git a/client/src/server/server.scss b/client/src/server/server.scss
@@ -0,0 +1 @@
+@use '../common.scss';
diff --git a/client/src/server/server.ts b/client/src/server/server.ts
@@ -1,5 +1,5 @@
-import ensure_token from "./ensure_token.js";
-import API from "./api.js";
+import ensure_token from "../scripts/ensure_token.js";
+import API from "../scripts/api.js";
 
 ensure_token();
 
diff --git a/html_template.py b/html_template.py
@@ -47,8 +47,12 @@ def parse(self) -> str:
 
         for match in RE_INSTRUCTION.finditer(template):
             instruction = match.group('instruction')
-            result = self.eval(instruction, self.page)
-            template = template.replace(match.group(0), str(result))
+            try:
+                result = self.eval(instruction, self.page)
+            except Exception as e:
+                raise RuntimeError(f"Error evaluating instruction '{instruction}' in template '{self.template_name}': {e}")
+            else:
+                template = template.replace(match.group(0), str(result))
         return template
 
 
diff --git a/makefile b/makefile
@@ -1,14 +1,12 @@
-
-
 .PHONY: all build clean client server tests
 
 all: build
 
 TEMP_DIR = build
 
-WEB_SRC_TS = $(wildcard client/src/*.ts)
-WEB_SRC_HTML = $(wildcard client/src/*.template.html)
-WEB_SRC_SASS = $(wildcard client/src/*.scss)
+WEB_SRC_TS = $(wildcard client/src/**/*.ts)
+WEB_SRC_HTML = $(wildcard client/src/**/*.template.html)
+WEB_SRC_SASS = $(wildcard client/src/**/*.scss)
 WEB_ASSETS = $(wildcard client/src/assets/*)
 
 WEB_DIST_JS = $(patsubst client/src/%.ts,mc_srv_manager/client/%.js,$(WEB_SRC_TS))
@@ -34,10 +32,10 @@ TESTS_PY = $(wildcard tests/*.py) $(wildcard tests/**/*.py)
 
 
 # HTML TEMPLATES DEPENDENCIES
-mc_srv_manager/client/account.html: client/src/metadata.template client/src/header.template
-mc_srv_manager/client/dashboard.html: client/src/metadata.template client/src/header.template
-mc_srv_manager/client/server.html: client/src/metadata.template client/src/header.template
-mc_srv_manager/client/login.html: client/src/metadata.template
+mc_srv_manager/client/account/index.html:   client/src/metadata.template client/src/header/header.template
+mc_srv_manager/client/dashboard/index.html: client/src/metadata.template client/src/header/header.template
+mc_srv_manager/client/server/index.html:    client/src/metadata.template client/src/header/header.template
+mc_srv_manager/client/login/index.html:     client/src/metadata.template client/src/header/header.template
 
 
 
@@ -76,14 +74,14 @@ mc_srv_manager/client/%.html: client/src/%.template.html
 	@python html_template.py client/src $(subst .template.html,,$(subst client/src/,,$<)) -o $@
 
 mc_srv_manager/client/%.js: client/src/%.ts
-	@mkdir -p $(@D)
+	@mkdir -p $(dir $@)
 	@echo "Compiling $< to $@"
-	@tsc --outDir $(@D) $< --module es6 --target es6 --strict --sourceMap
+	@tsc --outDir mc_srv_manager/client $< --module es6 --target es6 --strict
 
 mc_srv_manager/client/%.css: client/src/%.scss
 	@mkdir -p $(@D)
 	@echo "Compiling $< to $@"
-	@sass $< $@
+	@sass $< $@ --no-source-map
 
 mc_srv_manager/%.py: server/src/%.py
 	@mkdir -p $(@D)
@@ -155,37 +153,6 @@ start: install
 # tests: clean-tests test-report.xml
 
 
-
-# client dev
-client/dist/%.js: client/src/%.ts
-	@mkdir -p $(@D)
-	@echo "Compiling $< to $@"
-	@tsc --outDir $(@D) $< --module es6 --target es6 --strict
-
-client/dist/%.css: client/src/%.scss
-	@mkdir -p $(@D)
-	@echo "Compiling $< to $@"
-	@sass $< $@
-
-client/dist/assets/%: client/src/assets/%
-	@mkdir -p $(@D)
-	@echo "Copying $< to $@"
-	@cp $< $@
-
-client/dist/%.html: client/src/%.template.html
-	@mkdir -p $(@D)
-	@echo "Compiling $< to $@"
-	@python html_template.py client/src $(subst .template.html,,$(subst client/src/,,$<)) -o $@
-
-
-client-dev: $(WEB_DEV_DIST)
-	@echo "Client dev build complete."
-	@npm run start --prefix client
-
-client-dev-clean:
-	rm -rf client/dist
-
-
 clean:
 	rm -rf mc_srv_manager
 	rm -rf dist
diff --git a/server/src/user_interface/web_server/http_server.py b/server/src/user_interface/web_server/http_server.py
@@ -134,8 +134,8 @@ def root():
 
         @self.__app.route('/app/') #pyright: ignore[reportArgumentType, reportUntypedFunctionDecorator]
         def index():
-            Logger.trace("asking for index.html, redirecting to /app/dashboard.html")
-            return static_proxy('dashboard.html')
+            Logger.trace("asking for index.html, redirecting to /app/dashboard")
+            return static_proxy('dashboard')
 
         @self.__app.route('/app/<path:path>') #pyright: ignore[reportArgumentType, reportUntypedFunctionDecorator]
         def static_proxy(path : str):
@@ -156,9 +156,27 @@ def static_proxy(path : str):
                 if not os.path.exists(full_path):
                     if os.path.exists(f"{full_path}.html"):
                         full_path = f"{full_path}.html"
+                    # elif full_path.endswith('.css') or full_path.endswith('.js'):
+                    elif any(full_path.endswith(ext) for ext in ['.css', '.js', '.css.map']):
+                        # /client/login.js -> /client/login/login.js
+                        filename = '.'.join(os.path.basename(full_path).split('.')[:-1])
+                        full_path = os.path.join(os.path.dirname(full_path), filename, os.path.basename(full_path))
+                        if not os.path.exists(full_path):
+                            Logger.trace(f"File not found: {full_path}")
+                            return "File not found", HTTP.NOT_FOUND
                     else:
                         Logger.trace(f"File not found: {full_path}")
                         return "File not found", HTTP.NOT_FOUND
+                
+                if os.path.isdir(full_path):
+                    # If the path is a directory, serve the index.html file inside it
+                    index_file = os.path.join(full_path, 'index.html')
+                    if os.path.exists(index_file):
+                        full_path = index_file
+                    else:
+                        Logger.trace(f"Directory requested without index file: {full_path}")
+                        return "Directory requested without index file", HTTP.BAD_REQUEST
+                Logger.trace(f"Serving file: {full_path}")
 
                 content = pathlib.Path(full_path).read_bytes()
                 mimetype = guess_type(path)[0] or 'text/html'
@@ -168,6 +186,14 @@ def static_proxy(path : str):
                 Logger.error(f"Error serving file {path}: {e}")
                 return "Internal Server Error", HTTP.INTERNAL_SERVER_ERROR
 
+        @self.__app.route('/<path:path>') #pyright: ignore[reportArgumentType, reportUntypedFunctionDecorator]
+        def static_fallback(path: str):
+            """
+            Fallback route for static files.
+            This will serve files from the static folder if they exist.
+            """
+            Logger.trace(f"Fallback for static file: {path}")
+            return static_proxy(path)
 
     def __config_api_route(self):
         self.__config_api_route_user()

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-@use './common.scss';`
	`1`	`+@use '../common.scss';`
`2`	`2`
`3`	`3`	`// === Dashboard Header ===`
`4`	`4`	`.dashboard-header {`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+<link rel="stylesheet" href="header.css" />`
`1`	`2`	`<header class="dashboard-header">`
`2`	`3`	`<button id="dashboard" onclick="window.location.href='dashboard.html'" {{"disabled" if page.name == "dashboard" else ""}}>`
`3`	`4`	`Dashboard`