allow selecting a map in editor view

planetwars-server/src/lib.rs

@@ -133,6 +133,7 @@ pub fn api() -> Router {
             "/matches/:match_id/log",
             get(routes::matches::get_match_log),
         )
+        .route("/maps", get(routes::maps::list_maps))
         .route("/leaderboard", get(routes::bots::get_ranking))
         .route("/submit_bot", post(routes::demo::submit_bot))
         .route("/save_bot", post(routes::bots::save_bot))

planetwars-server/src/routes/mod.rs

@@ -1,4 +1,5 @@
 pub mod bots;
 pub mod demo;
+pub mod maps;
 pub mod matches;
 pub mod users;

web/pw-server/src/lib/components/SubmitPane.svelte

@@ -1,9 +1,11 @@
 <script lang="ts">
+  import { ApiClient } from "$lib/api_client";
+
   import { get_session_token } from "$lib/auth";
   import { getBotName, saveBotName } from "$lib/bot_code";
 
   import { currentUser } from "$lib/stores/current_user";
-  import { selectedOpponent } from "$lib/stores/editor_state";
+  import { selectedOpponent, selectedMap } from "$lib/stores/editor_state";
 
   import { createEventDispatcher, onMount } from "svelte";
   import Select from "svelte-select";
@@ -11,6 +13,8 @@
   export let editSession;
 
   let availableBots: object[] = [];
+  let maps: object[] = [];
+
   let botName: string | undefined = undefined;
   // whether to show the "save succesful" message
   let saveSuccesful = false;
@@ -19,26 +23,28 @@
 
   onMount(async () => {
     botName = getBotName();
+    const apiClient = new ApiClient();
 
-    const res = await fetch("/api/bots", {
+    const [_bots, _maps] = await Promise.all([
-      headers: {
+      apiClient.get("/api/bots"),
-        "Content-Type": "application/json",
+      apiClient.get("/api/maps"),
-      },
+    ]);
-    });
+
+    availableBots = _bots;
+    maps = _maps;
 
-    if (res.ok) {
-      availableBots = await res.json();
     if (!$selectedOpponent) {
       selectedOpponent.set(availableBots.find((b) => b["name"] === "simplebot"));
     }
+
+    if (!$selectedMap) {
+      selectedMap.set(maps.find((m) => m["name"] === "hex"));
     }
   });
 
   const dispatch = createEventDispatcher();
 
   async function submitBot() {
-    const opponentName = $selectedOpponent["name"];
-
     let response = await fetch("/api/submit_bot", {
       method: "POST",
       headers: {
@@ -46,7 +52,8 @@
       },
       body: JSON.stringify({
         code: editSession.getDocument().getValue(),
-        opponent_name: opponentName,
+        opponent_name: $selectedOpponent["name"],
+        map_name: $selectedMap["name"],
       }),
     });
 
@@ -103,8 +110,8 @@
 <div class="submit-pane">
   <div class="match-form">
     <h4>Play a match</h4>
-    <div class="play-text">Select an opponent to test your bot</div>
+    <div class="play-text">Opponent</div>
-    <div class="opponentSelect">
+    <div class="opponent-select">
       <Select
         optionIdentifier="name"
         labelIdentifier="name"
@@ -113,6 +120,16 @@
         isClearable={false}
       />
     </div>
+    <span>Map</span>
+    <div class="map-select">
+      <Select
+        optionIdentifier="name"
+        labelIdentifier="name"
+        items={maps}
+        bind:value={$selectedMap}
+        isClearable={false}
+      />
+    </div>
     <button class="submit-button play-button" on:click={submitBot}>Play</button>
   </div>
   <div class="save-form">
@@ -148,8 +165,9 @@
     margin-bottom: 0.3em;
   }
 
-  .opponentSelect {
+  .opponent-select,
-    margin: 20px 0;
+  .map-select {
+    margin: 8px 0;
   }
 
   .save-form {

web/pw-server/src/lib/stores/editor_state.ts

@@ -24,3 +24,4 @@ function createMatchHistory() {
 
 export const matchHistory = createMatchHistory();
 export const selectedOpponent = writable(null);
+export const selectedMap = writable(null);