Use theme path to change theme.

Author: ibz

admin/index.html

@@ -96,12 +96,12 @@
             });
             let themesResponse = await res.json();
             for (t of themesResponse['themes']) {
-                themes.push({ name: t.name, license: t.license, description: t.description, selected: t.name == configResponse['theme'] });
+                themes.push({ id: t.id, name: t.name, license: t.license, description: t.description, selected: t.name == configResponse['theme'] });
             }
             themes.sort((a, b) => a.name.localeCompare(b.name));
         }
 
-        async function saveConfig(themes, desiredThemeName) {
+        async function saveConfig(themes, desiredThemeId) {
             let endpoint = `${getApiBaseUrl()}/api/config`;
             let headers = {
                 ...{
@@ -114,11 +114,11 @@
             let response = await fetch(endpoint, {
                 method: 'PUT',
                 headers: headers,
-                body: JSON.stringify({ theme: desiredThemeName }),
+                body: JSON.stringify({ theme: desiredThemeId }),
             });
             if (response.ok) {
                 for (let theme of themes) {
-                    theme.selected = theme.name === desiredThemeName;
+                    theme.selected = theme.id === desiredThemeId;
                 }
             } else {
                 alert("Error changing theme!");
@@ -188,7 +188,7 @@ <h2 class="card-title" x-text="theme.name"></h2>
                                             <p>License: <span x-text="theme.license"></span></p>
                                             <div class="justify-end card-actions">
                                                 <button :class="{'btn-primary': !theme.selected}" class="btn"
-                                                    x-on:click="await saveConfig(themes, theme.name);">Select</button>
+                                                    x-on:click="await saveConfig(themes, theme.id);">Select</button>
                                             </div>
                                         </div>
                                     </div>

src/main.rs

@@ -93,6 +93,25 @@ struct PutSiteConfigRequestBody {
     theme: String,
 }
 
+#[derive(Deserialize, Serialize)]
+struct ThemeMetadata {
+    pub id: String,
+    pub name: String,
+    pub description: String,
+    pub license: Option<String>,
+}
+
+impl ThemeMetadata {
+    fn from_config_with_id(c: ThemeConfig, id: String) -> Self {
+        ThemeMetadata {
+            id,
+            name: c.name,
+            description: c.description,
+            license: c.license,
+        }
+    }
+}
+
 static BLOSSOM_CONTENT_TYPES: phf::Set<&'static str> = phf_set! {
     "audio/mpeg",
     "image/gif",
@@ -586,11 +605,16 @@ async fn handle_get_themes(request: Request<State>) -> tide::Result<Response> {
         return Err(tide::Error::from_str(StatusCode::InternalServerError, ""));
     };
 
+    let themes = themes
+        .iter()
+        .map(|(k, t)| ThemeMetadata::from_config_with_id(t.config.clone(), k.to_string()))
+        .collect::<Vec<ThemeMetadata>>();
+
     Ok(Response::builder(StatusCode::Ok)
-            .content_type(mime::JSON)
-            .header("Access-Control-Allow-Origin", "*")
-            .body(serde_json::to_string(&json!({"themes": themes.values().map(|t| t.config.clone()).collect::<Vec<ThemeConfig>>()}))?)
-            .build())
+        .content_type(mime::JSON)
+        .header("Access-Control-Allow-Origin", "*")
+        .body(serde_json::to_string(&json!({"themes": themes}))?)
+        .build())
 }
 
 async fn handle_get_theme(request: Request<State>) -> tide::Result<Response> {