grail/golias
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Feat: create room

Browse Source
This commit is contained in:
Grail Finder
2025-05-09 11:24:33 +03:00
parent e20118acea
commit 2b4bf2ec29
6 changed files with 39 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
components/createroomform.html
View File

@ -4,15 +4,13 @@
Create a room <br/>
or<br/>
<button button class="justify-center rounded-md bg-indigo-600 px-3 py-1.5 text-sm font-semibold leading-6 text-white shadow-sm hover:bg-indigo-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-indigo-600" hx-get="/room/hideform" hx-target=".create-room-div" >Hide Form</button>
<form hx-post="/room/create" hx-target="#ancestor">
<label For="room_name">Room Name</label><br/>
<input type="text" id="room_name" name="room_name" class="text-center text-black" value={utils.MakeDefaultRoomName(utils.GetUsername(c))}/><br/>
<form hx-post="/room-create" hx-target="#ancestor">
<label For="game_time">Game Time:</label><br/>
<input type="number" id="game_time" name="game_time" class="text-center text-black" value="300"/><br/>
<input type="number" id="game_time" name="game_time" class="text-center text-white" value="300"/><br/>
<label For="language">Language:</label><br/>
<input type="text" id="language" name="language" class="text-center text-black" value="en"/><br/>
<input type="text" id="language" name="language" class="text-center text-white" value="en"/><br/>
<label For="password">Password:</label><br/>
<input type="text" id="password" name="room_pass" class="text-center text-black" value="" placeholder="Leave empty for open room"/><br/>
<input type="text" id="password" name="room_pass" class="text-center text-white" value="" placeholder="Leave empty for open room"/><br/>
<button button class="justify-center rounded-md bg-indigo-600 px-3 py-1.5 text-sm font-semibold leading-6 text-white shadow-sm hover:bg-indigo-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-indigo-600" type="submit" >Create Room</button>
</form>
</div>

17
handlers/actions.go
View File

@ -75,6 +75,10 @@ func saveFullInfo(fi *models.FullInfo) error {
if err := saveState(fi.State.Username, fi.State); err != nil {
return err
}
// can room be nil?
// if fi.Room == nil {
// return nil
// }
if err := saveRoom(fi.Room); err != nil {
return err
}
@ -126,19 +130,24 @@ func getAllNames() []string {
return names
}
// can room exists without state? I think no
func getFullInfoByCtx(ctx context.Context) (*models.FullInfo, error) {
resp := &models.FullInfo{}
state, err := getStateByCtx(ctx)
if err != nil {
return nil, err
}
resp.State = state
if state.RoomID == "" {
return resp, nil
}
room, err := getRoomByID(state.RoomID)
if err != nil {
log.Warn("failed to find room despite knowing room_id;",
"room_id", state.RoomID)
return nil, err
}
resp := &models.FullInfo{
State: state,
Room: room,
}
resp.Room = room
return resp, nil
}

16
handlers/auth.go
View File

@ -72,16 +72,20 @@ func HandleFrontLogin(w http.ResponseWriter, r *http.Request) {
abortWithError(w, err.Error())
return
}
state := models.MakeTestState(cleanName)
state.State.Username = cleanName
// state := models.MakeTestState(cleanName)
// state.State.Username = cleanName
userstate := models.InitState(cleanName)
fi := &models.FullInfo{
State: userstate,
}
// save state to cache
// if err := saveState(cleanName, state.State); err != nil {
if err := saveFullInfo(state); err != nil {
if err := saveState(cleanName, userstate); err != nil {
// if err := saveFullInfo(fi); err != nil {
log.Error("failed to save state", "error", err)
abortWithError(w, err.Error())
return
}
tmpl.ExecuteTemplate(w, "base", state)
tmpl.ExecuteTemplate(w, "base", fi)
}
func makeCookie(username string, remote string) (*http.Cookie, error) {
@ -152,7 +156,7 @@ func cacheSetSession(key string, session *models.Session) error {
}
func updateRoomInSession(ctx context.Context, roomID string) (context.Context, error) {
s, ok := ctx.Value("session").(models.Session)
s, ok := ctx.Value(models.CtxSessionKey).(*models.Session)
if !ok {
return context.TODO(), errors.New("failed to extract session from ctx")
}

12
handlers/game.go
View File

@ -23,8 +23,16 @@ func HandleCreateRoom(w http.ResponseWriter, r *http.Request) {
return
}
ctx := context.WithValue(r.Context(), "current_room", room.ID)
ctx, err = updateRoomInSession(ctx, room.ID)
fi, err := getFullInfoByCtx(ctx)
if err != nil {
msg := "failed to get full info from ctx"
log.Error(msg, "error", err)
abortWithError(w, msg)
return
}
fi.State.RoomID = room.ID
fi.Room = room
if err := saveFullInfo(fi); err != nil {
msg := "failed to set current room to session"
log.Error(msg, "error", err)
abortWithError(w, msg)
@ -41,7 +49,7 @@ func HandleCreateRoom(w http.ResponseWriter, r *http.Request) {
abortWithError(w, err.Error())
return
}
tmpl.ExecuteTemplate(w, "base", nil)
tmpl.ExecuteTemplate(w, "base", fi)
}
func HandleRoomEnter(w http.ResponseWriter, r *http.Request) {

1
handlers/middleware.go
View File

@ -41,6 +41,7 @@ func LogRequests(next http.Handler) http.Handler {
func GetSession(next http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
// TODO: move
cookieName := "session_token"
sessionCookie, err := r.Cookie(cookieName)
if err != nil {

1
main.go
View File

@ -25,6 +25,7 @@ func ListenToRequests(port string) error {
mux.HandleFunc("GET /room", handlers.HandleRoomEnter)
mux.HandleFunc("POST /join-team", handlers.HandleJoinTeam)
mux.HandleFunc("GET /end-turn", handlers.HandleEndTurn)
mux.HandleFunc("POST /room-create", handlers.HandleCreateRoom)
//elements
mux.HandleFunc("GET /room/createform", handlers.HandleShowCreateForm)
mux.HandleFunc("GET /room/hideform", handlers.HandleHideCreateForm)