Merge branch 'master' into enha/sse-try
This commit is contained in:
		| @@ -18,7 +18,7 @@ | ||||
|   if (!window.actionHistoryScrollSet) { | ||||
|     htmx.onLoad(function(target) { | ||||
|       if (target.id === 'actionHistoryContainer') { | ||||
|         target.scrollTop = target.scrollHeight; | ||||
|         target.scrollToBottom(); | ||||
|       } | ||||
|     }); | ||||
|     window.actionHistoryScrollSet = true; | ||||
|   | ||||
| @@ -1,6 +1,7 @@ | ||||
| {{define "room"}} | ||||
| <div id="room-interier" class=space-y-2> | ||||
|   <div id="meta"> | ||||
|   <div id="headwrapper" class="grid grid-cols-1 md:grid-cols-5 md:gap-4"> | ||||
|   <div id="meta" class="md:col-span-1 border-2 rounded-lg text-center space-y-2"> | ||||
|     <p>Hello {{.State.Username}};</p> | ||||
|     <p>Room created by {{.Room.CreatorName}};</p> | ||||
|     <p>Room link:</p> | ||||
| @@ -16,13 +17,13 @@ | ||||
|     {{end}} | ||||
|     <p> | ||||
|       {{if eq .State.Team ""}} | ||||
|       join the team! | ||||
|         you don't have a role! join the team -> | ||||
|       {{else}} | ||||
|       you're on the team <span class="text-{{.State.Team}}-500">{{.State.Team}}</span>! | ||||
|       {{end}} | ||||
|     </p> | ||||
|   </div> | ||||
|   <hr /> | ||||
|   <div id="infopatch"   class="md:col-span-3"> | ||||
|   {{if .Room.IsRunning}} | ||||
|     <p>Turn of the <span class="text-{{.Room.TeamTurn}}-500">{{.Room.TeamTurn}}</span> team</p> | ||||
| {{template "turntimer" .Room}} | ||||
| @@ -48,7 +49,18 @@ | ||||
|     <!-- Right Panel --> | ||||
|     {{template "teamlist" .Room.RedTeam}} | ||||
|   </div> | ||||
|   </div> | ||||
|   </div> | ||||
|   <hr/> | ||||
|   <div class="grid grid-cols-1 md:grid-cols-5 md:gap-4"> | ||||
|     <div hx-get="/actionhistory" hx-trigger="sse:backlog_{{.Room.ID}}" class="md:col-span-1"> | ||||
|       {{template "actionhistory" .Room.ActionHistory}} | ||||
|     </div> | ||||
|     <div id="cardtable" class="md:col-span-3"> | ||||
|       {{template "cardtable" .Room}} | ||||
|     </div> | ||||
|     <div class="hidden md:block md:col-span-1"></div> <!-- Spacer --> | ||||
|   </div> | ||||
|   <div id="systembox" class="overflow-y-auto max-h-96 border-2 border-gray-300 p-4 rounded-lg space-y-2"> | ||||
|     bot thought: <br> | ||||
|     <ul> | ||||
| @@ -57,13 +69,6 @@ | ||||
|     {{end}} | ||||
|     </ul> | ||||
|   </div> | ||||
|   <div hx-get="/actionhistory" hx-trigger="sse:backlog_{{.Room.ID}}"> | ||||
|   {{template "actionhistory" .Room.ActionHistory}} | ||||
|   </div> | ||||
|   <hr/> | ||||
|   <div id="cardtable"> | ||||
|     {{template "cardtable" .Room}} | ||||
|   </div> | ||||
|   <div> | ||||
|     {{if .Room.IsRunning}} | ||||
|     {{if and (eq .State.Role "guesser") (eq .State.Team .Room.TeamTurn)}} | ||||
| @@ -74,7 +79,7 @@ | ||||
|     {{end}} | ||||
|   </div> | ||||
|   <div> | ||||
|     {{if and (eq .State.Username .Room.CreatorName) (.Room.IsRunning)}} | ||||
|     {{if and (eq .State.Username .Room.CreatorName) (.Room.BotFailed)}} | ||||
|       <button hx-get="/renotify-bot" hx-swap="none" class="bg-gray-100 text-black px-1 py-1 rounded">Btn in case llm call failed</button> | ||||
|     {{end}} | ||||
|   </div> | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Grail Finder
					Grail Finder