Pass only needed parameters for template

nyxx-discord · Nov 21, 2024 · 6eebd16 · 6eebd16
1 parent d2856f7
commit 6eebd16
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 8 deletions.
diff --git a/lib/src/settings.dart b/lib/src/settings.dart
@@ -67,6 +67,8 @@ __Package repositories__:
 ${docsPackages.map((packageName) => '- $packageName: <https://github.com/nyxx-discord/$packageName>').join('\n')}
 ''');
 
+final String webServerAlertContent = getEnv('WEB_SERVER_ALERT_CONTENT', '<span class="bold">Experimental version</span>');
+
 /// The GitHub account to use when no other account is specified.
 final String githubAccount = getEnv('ROD_GITHUB_ACCOUNT', 'nyxx-discord');
 

diff --git a/lib/src/web_app/api_server.dart b/lib/src/web_app/api_server.dart
@@ -51,10 +51,21 @@ class WebServer {
       return shelf.Response.badRequest();
     }
 
+    final additionalParameters = switch (templateName) {
+      'navigation' => {
+        'clientId': clientId,
+        'redirectUri': clientRedirectUri,
+      },
+      'alert' => {
+        'inner_content': webServerAlertContent,
+      },
+      _ => {},
+    };
+
+
     return createTwigResponse('component/$templateName.html', parameters: {
       ...getCustomDataFromSession(request),
-      'clientId': clientId,
-      'redirectUri': clientRedirectUri,
+      ...additionalParameters,
     });
   }
 

diff --git a/templates/component/alert.html b/templates/component/alert.html
@@ -0,0 +1,3 @@
+<div class="alert alert-danger mt-4" role="alert">
+    {{inner_content}}
+</div>
diff --git a/templates/guilds.html b/templates/guilds.html
@@ -11,9 +11,7 @@
 <nav hx-get="/hx?c=navigation" hx-swap="outerHTML" hx-trigger="load"></nav>
 
 <div class="container">
-    <div class="alert alert-danger mt-4" role="alert">
-        <span class="bold">Experimental version</span>
-    </div>
+    <div hx-get="/hx?c=alert" hx-swap="outerHTML" hx-trigger="load"></div>
 
     <div class="container">
         <div class="grid">

diff --git a/templates/index.html b/templates/index.html
@@ -11,9 +11,7 @@
 <nav hx-get="/hx?c=navigation" hx-swap="outerHTML" hx-trigger="load"></nav>
 
 <div class="container">
-    <div class="alert alert-danger mt-4" role="alert">
-        <span class="bold">Experimental version</span>
-    </div>
+    <div hx-get="/hx?c=alert" hx-swap="outerHTML" hx-trigger="load"></div>
 
     <div class="container">
         <div class="m-1">