Improved admin dashboard, added config generator

Author: RedstoneWizard08

.gitignore

@@ -30,7 +30,8 @@ pb_data
 minio_data
 ModHost.toml
 ModHost.toml.*
-config.pkl
+/config.pkl
+/default-config.pkl
 config.kjspkg.pkl
 config.astro.pkl
 !apps/server/ModHost.toml

.vscode/settings.json

@@ -9,5 +9,6 @@
     "i18n-ally.displayLanguage": "en-US",
     "i18n-ally.keystyle": "nested",
     "pkl.lsp.java.path": "/usr/local/sdkman/candidates/java/current/bin/java",
-    "biome.enabled": false
+    "biome.enabled": false,
+    "editor.linkedEditing": true
 }

Cargo.lock

@@ -12,6 +12,7 @@ readme = "README.md"
 
 [workspace.dependencies]
 anyhow = "1.0.98"
+askama = "0.14.0"
 axum = { version = "0.8.3", features = ["macros", "multipart", "ws"] }
 axum-core = "0.5.2"
 axum-extra = { version = "0.10.1", features = ["cookie", "typed-header"] }

Cargo.toml

@@ -33,6 +33,8 @@ pub async fn main() -> Result<()> {
     let user = NewUser {
         github_id: -1,
         username: "ModHost Migrator".into(),
+        admin: false,
+        moderator: false,
     };
 
     let id = insert_into(users::table)

apps/astro-migrator/src/main.rs

@@ -86,6 +86,8 @@ pub async fn run() -> Result<()> {
                 let user = NewUser {
                     github_id: author_id as i32,
                     username: author_name,
+                    admin: false,
+                    moderator: false,
                 };
 
                 let user: User = insert_into(users::table)

apps/kjspkg-migrator/src/migrator.rs

@@ -9,6 +9,7 @@ authors.workspace = true
 readme.workspace = true
 
 [dependencies]
+askama.workspace = true
 config.workspace = true
 duration-str.workspace = true
 modhost-core = { workspace = true, features = ["url", "config", "s3", "toml"] }

crates/modhost-config/Cargo.toml

@@ -21,6 +21,13 @@ impl Default for AdminConfig {
     }
 }
 
+impl AdminConfig {
+    /// Get the formatted stats interval for pkl.
+    pub fn fmt_stats_interval(&self) -> String {
+        format!("{}.s", self.stats_interval.as_secs())
+    }
+}
+
 /// Serialize a duration as a human-readable format.
 pub fn serialize_duration<S: Serializer>(val: &Duration, ser: S) -> Result<S::Ok, S::Error> {
     ser.serialize_str(&val.human_format())

crates/modhost-config/src/admin.rs

@@ -1,11 +1,13 @@
 //! The main config models.
 
 use crate::{AdminConfig, AuthConfigs, MeilisearchConfig, PostgresConfig, StorageConfig, UIConfig};
+use askama::Template;
 use modhost_core::Result;
 use std::fs;
 
 /// The main ModHost configuration.
-#[derive(Debug, Clone, Serialize, Deserialize, Default)]
+#[derive(Debug, Clone, Serialize, Deserialize, Default, Template)]
+#[template(path = "config.pkl", escape = "yml")]
 pub struct AppConfig {
     /// The ModHost server configuration.
     pub server: ServerConfig,
@@ -57,4 +59,9 @@ impl AppConfig {
 
         Ok(())
     }
+
+    /// Render the config as a pkl-formatted config.
+    pub fn render(&self) -> askama::Result<String> {
+        Template::render(self)
+    }
 }

crates/modhost-config/src/config.rs

@@ -0,0 +1,88 @@
+import "./pkl/ModHost.pkl"
+
+app: ModHost.AppConfig = new {
+    server {
+        host = "{{ server.host }}"
+        port = {{ server.port }}
+    }
+
+    postgres {
+        host = "{{ postgres.host }}""
+        port = {{ postgres.port }}
+        user = "{{ postgres.user }}"
+        {% if let Some(pass) = postgres.pass %}pass = "{{ pass }}"{% endif %}
+        database = "{{ postgres.database }}"
+    }
+
+    meilisearch {
+        host = "{{ meilisearch.host }}"
+        port = {{ meilisearch.port }}
+        protocol = "{{ meilisearch.protocol }}"
+        key = "{{ meilisearch.key }}"
+
+        indexes {
+            projects = "{{ meilisearch.project_index }}"
+        }
+    }
+
+    auth {
+        github {
+            client_id = "{{ auth.github.client_id }}"
+            client_secret = "{{ auth.github.client_secret }}"
+        }
+    }
+
+    storage {
+        s3 {
+            region = "{{ storage.s3_region }}"
+            endpoint = "{{ storage.s3_endpoint }}"
+            access_key = "{{ storage.s3_access_key }}"
+            secret_key = "{{ storage.s3_secret_key }}"
+        }
+
+        buckets {
+            projects = "{{ storage.projects_bucket }}"
+            gallery = "{{ storage.gallery_bucket }}"
+        }
+    }
+
+    ui {
+        app = "{{ ui.app }}"
+        tagline = "{{ ui.tagline }}"
+        show_beta = {{ ui.show_beta }}
+        default_theme = "{{ ui.default_theme }}"
+        theme_color = "{{ ui.theme_color }}"
+        badge_base = "{{ ui.badge_base }}"
+        badge_secondary = "{{ ui.badge_secondary }}"
+        
+        favicon {
+            ico = "{{ ui.favicon_ico }}"
+            png = "{{ ui.favicon_png }}"
+        }
+
+        game {
+            beta_name = "{{ ui.game_beta_name.stringify() }}"
+        }
+
+        projects {
+            kind = "{{ ui.project_kind.stringify() }}"
+
+            file_formats = List(
+                {% for fmt in ui.project_file_formats -%}
+                "{{ fmt }}",
+                {% endfor %}
+            )
+        }
+    }
+
+    admin {
+        stats {
+            interval = {{ admin.fmt_stats_interval() }}
+        }
+    }
+}
+
+output {
+    value = app
+    renderer = ModHost.renderer()
+}