basic app implementation
This commit is contained in:
parent
04e302e7b0
commit
4a268ef8c7
@ -3,9 +3,14 @@ package flags
|
|||||||
// WIP
|
// WIP
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"context"
|
||||||
|
"database/sql"
|
||||||
"embed"
|
"embed"
|
||||||
"encoding/json"
|
"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"
|
"git.tijl.dev/tijl/tijl.dev-core/modules/i18n"
|
||||||
log "git.tijl.dev/tijl/tijl.dev-core/modules/logger"
|
log "git.tijl.dev/tijl/tijl.dev-core/modules/logger"
|
||||||
"git.tijl.dev/tijl/tijl.dev-core/modules/web"
|
"git.tijl.dev/tijl/tijl.dev-core/modules/web"
|
||||||
@ -38,6 +43,46 @@ func Setup() {
|
|||||||
data["SupportedTags"] = supportedTags
|
data["SupportedTags"] = supportedTags
|
||||||
return c.Render("apps/flags/start", data, "layouts/base")
|
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)
|
}, 1000)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -56,7 +56,7 @@ func HandleCallback(c *fiber.Ctx) error {
|
|||||||
|
|
||||||
_, err = db.Queries.GetUser(ctx, idToken.Subject)
|
_, err = db.Queries.GetUser(ctx, idToken.Subject)
|
||||||
if err == nil {
|
if err == nil {
|
||||||
db.Queries.UpdateUserData(ctx, queries.UpdateUserDataParams{
|
err = db.Queries.UpdateUserData(ctx, queries.UpdateUserDataParams{
|
||||||
Uid: idToken.Subject,
|
Uid: idToken.Subject,
|
||||||
Email: claims.Email,
|
Email: claims.Email,
|
||||||
EmailVerified: claims.EmailVerified,
|
EmailVerified: claims.EmailVerified,
|
||||||
@ -64,7 +64,7 @@ func HandleCallback(c *fiber.Ctx) error {
|
|||||||
FullName: claims.Name,
|
FullName: claims.Name,
|
||||||
})
|
})
|
||||||
} else if err == sql.ErrNoRows {
|
} else if err == sql.ErrNoRows {
|
||||||
db.Queries.CreateUser(ctx, queries.CreateUserParams{
|
err = db.Queries.CreateUser(ctx, queries.CreateUserParams{
|
||||||
Uid: idToken.Subject,
|
Uid: idToken.Subject,
|
||||||
Email: claims.Email,
|
Email: claims.Email,
|
||||||
EmailVerified: claims.EmailVerified,
|
EmailVerified: claims.EmailVerified,
|
||||||
@ -75,6 +75,9 @@ func HandleCallback(c *fiber.Ctx) error {
|
|||||||
log.Error().Err(err).Msg("error getting user")
|
log.Error().Err(err).Msg("error getting user")
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
_, err = user.NewSession(idToken.Subject, c)
|
_, err = user.NewSession(idToken.Subject, c)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
-- name: CreateFlagsGame :exec
|
-- name: CreateFlagsGame :one
|
||||||
INSERT INTO app_flags_games (uid, tags, question_amount)
|
INSERT INTO app_flags_games (uid, tags, question_amount)
|
||||||
VALUES ($1, $2, $3)
|
VALUES ($1, $2, $3)
|
||||||
RETURNING (game_id, game_seed);
|
RETURNING game_id, game_seed;
|
||||||
|
|
||||||
-- name: GetFlagsGame :one
|
-- name: GetFlagsGame :one
|
||||||
SELECT * FROM app_flags_games WHERE game_id = $1 LIMIT 1;
|
SELECT * FROM app_flags_games WHERE game_id = $1 LIMIT 1;
|
||||||
|
@ -13,10 +13,10 @@ import (
|
|||||||
"github.com/lib/pq"
|
"github.com/lib/pq"
|
||||||
)
|
)
|
||||||
|
|
||||||
const createFlagsGame = `-- name: CreateFlagsGame :exec
|
const createFlagsGame = `-- name: CreateFlagsGame :one
|
||||||
INSERT INTO app_flags_games (uid, tags, question_amount)
|
INSERT INTO app_flags_games (uid, tags, question_amount)
|
||||||
VALUES ($1, $2, $3)
|
VALUES ($1, $2, $3)
|
||||||
RETURNING (game_id, game_seed)
|
RETURNING game_id, game_seed
|
||||||
`
|
`
|
||||||
|
|
||||||
type CreateFlagsGameParams struct {
|
type CreateFlagsGameParams struct {
|
||||||
@ -25,9 +25,16 @@ type CreateFlagsGameParams struct {
|
|||||||
QuestionAmount int32
|
QuestionAmount int32
|
||||||
}
|
}
|
||||||
|
|
||||||
func (q *Queries) CreateFlagsGame(ctx context.Context, arg CreateFlagsGameParams) error {
|
type CreateFlagsGameRow struct {
|
||||||
_, err := q.db.ExecContext(ctx, createFlagsGame, arg.Uid, pq.Array(arg.Tags), arg.QuestionAmount)
|
GameID uuid.UUID
|
||||||
return err
|
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
|
const getFlagsGame = `-- name: GetFlagsGame :one
|
||||||
|
@ -24,7 +24,7 @@ type AppFlagsGame struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type AppFlagsGamesAnswer struct {
|
type AppFlagsGamesAnswer struct {
|
||||||
GameID uuid.NullUUID
|
GameID uuid.UUID
|
||||||
Question int32
|
Question int32
|
||||||
Correct bool
|
Correct bool
|
||||||
}
|
}
|
||||||
|
@ -12,7 +12,7 @@ CREATE TABLE app_flags_games (
|
|||||||
);
|
);
|
||||||
|
|
||||||
CREATE TABLE app_flags_games_answers (
|
CREATE TABLE app_flags_games_answers (
|
||||||
game_id UUID,
|
game_id UUID NOT NULL,
|
||||||
question INT NOT NULL,
|
question INT NOT NULL,
|
||||||
correct BOOLEAN NOT NULL,
|
correct BOOLEAN NOT NULL,
|
||||||
FOREIGN KEY (game_id) REFERENCES app_flags_games (game_id),
|
FOREIGN KEY (game_id) REFERENCES app_flags_games (game_id),
|
||||||
|
0
web/views/apps/flags/question.html
Normal file
0
web/views/apps/flags/question.html
Normal file
@ -1,8 +1,22 @@
|
|||||||
|
<div hx-boost="true">
|
||||||
|
<form method="post">
|
||||||
|
<input type="text" class="hidden" name="type" value="start" />
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
{{range .SupportedTags}}
|
{{range .SupportedTags}}
|
||||||
<label class="cursor-pointer label">
|
<label class="cursor-pointer label">
|
||||||
<span class="label-text">{{index $.T .}}</span>
|
<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>
|
</label>
|
||||||
{{end}}
|
{{end}}
|
||||||
</div>
|
</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>
|
||||||
|
Loading…
Reference in New Issue
Block a user