basic app implementation

internal/apps/flags/main.go

@@ -3,9 +3,14 @@ package flags
 // WIP
 
 import (
+	"context"
+	"database/sql"
 	"embed"
 	"encoding/json"
+	"strconv"
 
+	"git.tijl.dev/tijl/tijl.dev-core/internal/queries"
+	"git.tijl.dev/tijl/tijl.dev-core/modules/db"
 	"git.tijl.dev/tijl/tijl.dev-core/modules/i18n"
 	log "git.tijl.dev/tijl/tijl.dev-core/modules/logger"
 	"git.tijl.dev/tijl/tijl.dev-core/modules/web"
@@ -38,6 +43,46 @@ func Setup() {
 			data["SupportedTags"] = supportedTags
 			return c.Render("apps/flags/start", data, "layouts/base")
 		})
+
+		a.Post("/app/flags", func(c *fiber.Ctx) error {
+
+			recType := c.FormValue("type")
+
+			if recType == "start" {
+
+				values := c.Request().PostArgs().PeekMulti("tags")
+				var selectedTags []string
+				for _, v := range values {
+					selectedTags = append(selectedTags, string(v))
+				}
+
+				maxQuestions, err := strconv.Atoi(c.FormValue("max_questions"))
+				if err != nil {
+					return err
+				}
+
+				_, err = db.Queries.CreateFlagsGame(context.TODO(), queries.CreateFlagsGameParams{
+					Uid:            sql.NullString{},
+					Tags:           selectedTags,
+					QuestionAmount: int32(maxQuestions),
+				})
+				if err != nil {
+					return err
+				}
+
+				c.Cookie(&fiber.Cookie{
+					Name:  "app_flags_game_session",
+					Value: "",
+				})
+
+				data := *web.Common(c)
+				data["Title"] = "tmp"
+				return c.Render("apps/flags/question", data, "layouts/base")
+
+			}
+
+			return nil
+		})
 	}, 1000)
 }
 

internal/oidc/handler.go

@@ -56,7 +56,7 @@ func HandleCallback(c *fiber.Ctx) error {
 
 	_, err = db.Queries.GetUser(ctx, idToken.Subject)
 	if err == nil {
-		db.Queries.UpdateUserData(ctx, queries.UpdateUserDataParams{
+		err = db.Queries.UpdateUserData(ctx, queries.UpdateUserDataParams{
 			Uid:           idToken.Subject,
 			Email:         claims.Email,
 			EmailVerified: claims.EmailVerified,
@@ -64,7 +64,7 @@ func HandleCallback(c *fiber.Ctx) error {
 			FullName:      claims.Name,
 		})
 	} else if err == sql.ErrNoRows {
-		db.Queries.CreateUser(ctx, queries.CreateUserParams{
+		err = db.Queries.CreateUser(ctx, queries.CreateUserParams{
 			Uid:           idToken.Subject,
 			Email:         claims.Email,
 			EmailVerified: claims.EmailVerified,
@@ -75,6 +75,9 @@ func HandleCallback(c *fiber.Ctx) error {
 		log.Error().Err(err).Msg("error getting user")
 		return err
 	}
+	if err != nil {
+		return err
+	}
 
 	_, err = user.NewSession(idToken.Subject, c)
 	if err != nil {

internal/queries/app_flags.sql

@@ -1,7 +1,7 @@
--- name: CreateFlagsGame :exec
+-- name: CreateFlagsGame :one
 INSERT INTO app_flags_games (uid, tags, question_amount)
 VALUES ($1, $2, $3)
-RETURNING (game_id, game_seed);
+RETURNING game_id, game_seed;
 
 -- name: GetFlagsGame :one
 SELECT * FROM app_flags_games WHERE game_id = $1 LIMIT 1;

internal/queries/app_flags.sql.go

@@ -13,10 +13,10 @@ import (
 	"github.com/lib/pq"
 )
 
-const createFlagsGame = `-- name: CreateFlagsGame :exec
+const createFlagsGame = `-- name: CreateFlagsGame :one
 INSERT INTO app_flags_games (uid, tags, question_amount)
 VALUES ($1, $2, $3)
-RETURNING (game_id, game_seed)
+RETURNING game_id, game_seed
 `
 
 type CreateFlagsGameParams struct {
@@ -25,9 +25,16 @@ type CreateFlagsGameParams struct {
 	QuestionAmount int32
 }
 
-func (q *Queries) CreateFlagsGame(ctx context.Context, arg CreateFlagsGameParams) error {
-	_, err := q.db.ExecContext(ctx, createFlagsGame, arg.Uid, pq.Array(arg.Tags), arg.QuestionAmount)
-	return err
+type CreateFlagsGameRow struct {
+	GameID   uuid.UUID
+	GameSeed uuid.NullUUID
+}
+
+func (q *Queries) CreateFlagsGame(ctx context.Context, arg CreateFlagsGameParams) (CreateFlagsGameRow, error) {
+	row := q.db.QueryRowContext(ctx, createFlagsGame, arg.Uid, pq.Array(arg.Tags), arg.QuestionAmount)
+	var i CreateFlagsGameRow
+	err := row.Scan(&i.GameID, &i.GameSeed)
+	return i, err
 }
 
 const getFlagsGame = `-- name: GetFlagsGame :one

internal/queries/models.go

@@ -24,7 +24,7 @@ type AppFlagsGame struct {
 }
 
 type AppFlagsGamesAnswer struct {
-	GameID   uuid.NullUUID
+	GameID   uuid.UUID
 	Question int32
 	Correct  bool
 }

migrations/00000002_flags.up.sql

@@ -12,7 +12,7 @@ CREATE TABLE app_flags_games (
 );
 
 CREATE TABLE app_flags_games_answers (
-    game_id UUID,
+    game_id UUID NOT NULL,
     question INT NOT NULL,
     correct BOOLEAN NOT NULL,
     FOREIGN KEY (game_id) REFERENCES app_flags_games (game_id),

web/views/apps/flags/start.html

@@ -1,8 +1,22 @@
-<div>
+<div hx-boost="true">
+    <form method="post">
+        <input type="text" class="hidden" name="type" value="start" />
+
+        <div>
             {{range .SupportedTags}}
             <label class="cursor-pointer label">
                 <span class="label-text">{{index $.T .}}</span>
-        <input type="checkbox" class="checkbox checkbox-primary" />
+                <input name="tags" value="{{.}}" type="checkbox" class="checkbox checkbox-primary" />
             </label>
             {{end}}
+        </div>
+
+        <label class="cursor-pointer label">
+            <span class="label-text">Aantal vragen</span>
+            <input name="tags" value="{{.}}" type="checkbox" class="checkbox checkbox-primary" />
+        </label>
+
+        <input value="0" name="max_questions" type="number" class="input input-bordered" />
+        <button type="submit" class="btn btn-primary">Submit</button>
+    </form>
 </div>