Merge branch 'main' into multi-room

CharlesTaylor7 · May 18, 2024 · 5b50922 · 5b50922
2 parents e7d38d9 + 05b6ed8
commit 5b50922
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/deploy.sh b/deploy.sh
@@ -1,5 +1,7 @@
 set -eo pipefail
 
+BRANCH=${1:-"main"}
+
 # load .env for supabase env vars
 export $(cat .env | xargs)
 
@@ -14,4 +16,4 @@ node upload-assets.js
 
 # deploy to citadels.fly.dev
 fly secrets set GIT_SHA=$(git show -s --format=%H)
-fly deploy --strategy=immediate -i=ghcr.io/charlestaylor7/citadels:main
+fly deploy --strategy=immediate -i="ghcr.io/charlestaylor7/citadels:${BRANCH}"
diff --git a/templates/base.html b/templates/base.html
@@ -6,11 +6,9 @@
     <link name="viewport" content="width=device-width, initial-scale=1" />
     <link rel="shortcut icon" href={{"htmx.png"|asset}} />
     <link rel="stylesheet" href={{"styles/index.css"|asset}} />
-
     <script src="https://unpkg.com/[email protected]/dist/htmx.js"></script>
     <script src="https://unpkg.com/[email protected]/dist/ext/ws.js"></script>
     <script src="https://unpkg.com/[email protected]/dist/ext/json-enc.js"></script>
-    <script src="https://unpkg.com/[email protected]/dist/ext/client-side-templates.js"></script>
     <script src="https://unpkg.com/[email protected]"></script>
     <script src="https://unpkg.com/interactjs/dist/interact.min.js"></script>
     <!--
@@ -168,6 +166,7 @@
         }
 
         function enableWarrants() {
+          console.log("enable warrants")
           interact('#menu [data-dropzone]').dropzone({
             ondrop(event) {
               let dropzone = event.currentTarget;
@@ -305,9 +304,11 @@
     </script>
   </head>
   <body
+    id="ws"
     data-theme="retro"
     class="h-screen text-base-content text-xl"
-    hx-ext="ws,morph,json-enc,client-side-templates"
+    hx-ext="ws,morph,json-enc"
+    ws-connect="/ws"
     _="init get the theme of localStorage if it exists set my @data-theme to it"
   >
     {% block content %}