Use theme API in admin.

Author: ibz

admin/index.html

@@ -70,12 +70,17 @@
                 themes.length = 0;
 
                 let endpoint = `${getSiteApiBaseUrl(site.domain)}/api/config`;
-                const res = await fetch(new URL(endpoint), {
-                        headers: { authorization: await getNostrAuthHeader(endpoint, 'GET') }
+                let res = await fetch(new URL(endpoint), {
+                    headers: { authorization: await getNostrAuthHeader(endpoint, 'GET') }
                 });
-                let config = await res.json();
-                for (t of config['available_themes']) {
-                    themes.push({theme: t, selected: t == config['theme']});
+                let configResponse = await res.json();
+                endpoint = `${getSiteApiBaseUrl(site.domain)}/api/themes`;
+                res = await fetch(new URL(endpoint), {
+                    headers: { authorization: await getNostrAuthHeader(endpoint, 'GET') }
+                });
+                let themesResponse = await res.json();
+                for (t of themesResponse['themes']) {
+                    themes.push({name: t.name, selected: t.name == configResponse['theme']});
                 }
             }
 
@@ -148,7 +153,7 @@ <h1 class="text-2xl text-center" x-text="site.domain"></h1>
                                 <div class="w-full mt-24">
                                     <select id="selectTheme">
                                         <template x-for="t in themes">
-                                            <option x-bind:value="t.theme" x-text="t.theme" x-bind:selected="t.selected"></option>
+                                            <option x-bind:value="t.name" x-text="t.name" x-bind:selected="t.selected"></option>
                                         </template>
                                     </select>
                                 </div>

docs/api.md

@@ -8,7 +8,7 @@ A `GET` to `/api/sites` can be used to get a list of all the sites belonging to
 
 ### `/api/config`
 
-A `GET` to `/api/config` will return the list of available themes and the currently selected theme.
+A `GET` to `/api/config` will return the currently selected theme.
 
 A `PUT` to `/api/config` can be used to change the site's theme.
 

src/main.rs

@@ -610,18 +610,9 @@ async fn handle_get_site_config(request: Request<State>) -> tide::Result<Respons
         }
     };
 
-    let themes: Vec<String> = request
-        .state()
-        .themes
-        .read()
-        .unwrap()
-        .keys()
-        .cloned()
-        .collect();
-
     Ok(Response::builder(StatusCode::Ok)
         .content_type(mime::JSON)
-        .body(json!({"theme": site.config.theme, "available_themes": themes}).to_string())
+        .body(json!({"theme": site.config.theme}).to_string())
         .build())
 }
 
@@ -1522,7 +1513,7 @@ mod tests {
         let mut res: Response = app.respond(req).await?;
         assert_eq!(res.status(), StatusCode::Ok);
         let body_json: serde_json::Value = res.body_json().await?;
-        assert_eq!(body_json, json!({"theme": "hyde", "available_themes": []}));
+        assert_eq!(body_json, json!({"theme": "hyde"}));
 
         // Change the theme to an inexistant one
         let mut req = with_nostr_auth_header(