tijl/tijl.dev-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

basic app implementation
All checks were successful
build / build (push) Successful in 32s
Details
release-tag / release-image (push) Successful in 16m25s
Details

Browse Source
This commit is contained in:
Tijl 2024-08-26 00:18:45 +02:00
parent 04e302e7b0
commit 4a268ef8c7
Signed by: tijl
GPG Key ID: DAE24BFCD722F053
9 changed files with 354 additions and 285 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

534
internal/apps/flags/locales/en.json
View File

@ -1,269 +1,269 @@
{ {
"Asia": "Asia", "Asia": "Asia",
"MiddleEast": "Middle East", "MiddleEast": "Middle East",
"SoutheastAsia": "Southeast Asia", "SoutheastAsia": "Southeast Asia",
"CentralAsia": "Central Asia", "CentralAsia": "Central Asia",
"Europe": "Europe", "Europe": "Europe",
"Balkans": "Balkans", "Balkans": "Balkans",
"NorthAmerica": "North America", "NorthAmerica": "North America",
"SouthAmerica": "South America", "SouthAmerica": "South America",
"CentralAmerica": "Central America", "CentralAmerica": "Central America",
"Caribbean": "Caribbean", "Caribbean": "Caribbean",
"Africa": "Africa", "Africa": "Africa",
"NorthAfrica": "North Africa", "NorthAfrica": "North Africa",
"SouthernAfrica": "Southern Africa", "SouthernAfrica": "Southern Africa",
"WestAfrica": "West Africa", "WestAfrica": "West Africa",
"EastAfrica": "East Africa", "EastAfrica": "East Africa",
"CentralAfrica": "Central Africa", "CentralAfrica": "Central Africa",
"Oceania": "Oceania", "Oceania": "Oceania",
"BD": "Bangladesh", "BD": "Bangladesh",
"BE": "Belgium", "BE": "Belgium",
"BF": "Burkina Faso", "BF": "Burkina Faso",
"BG": "Bulgaria", "BG": "Bulgaria",
"BA": "Bosnia and Herzegovina", "BA": "Bosnia and Herzegovina",
"BB": "Barbados", "BB": "Barbados",
"WF": "Wallis and Futuna", "WF": "Wallis and Futuna",
"BL": "Saint Barthelemy", "BL": "Saint Barthelemy",
"BM": "Bermuda", "BM": "Bermuda",
"BN": "Brunei", "BN": "Brunei",
"BO": "Bolivia", "BO": "Bolivia",
"BH": "Bahrain", "BH": "Bahrain",
"BI": "Burundi", "BI": "Burundi",
"BJ": "Benin", "BJ": "Benin",
"BT": "Bhutan", "BT": "Bhutan",
"JM": "Jamaica", "JM": "Jamaica",
"BV": "Bouvet Island", "BV": "Bouvet Island",
"BW": "Botswana", "BW": "Botswana",
"WS": "Samoa", "WS": "Samoa",
"BQ": "Caribbean Netherlands", "BQ": "Caribbean Netherlands",
"BR": "Brazil", "BR": "Brazil",
"BS": "Bahamas", "BS": "Bahamas",
"JE": "Jersey", "JE": "Jersey",
"BY": "Belarus", "BY": "Belarus",
"BZ": "Belize", "BZ": "Belize",
"RU": "Russia", "RU": "Russia",
"RW": "Rwanda", "RW": "Rwanda",
"RS": "Serbia", "RS": "Serbia",
"TL": "East Timor", "TL": "East Timor",
"RE": "Reunion", "RE": "Reunion",
"TM": "Turkmenistan", "TM": "Turkmenistan",
"TJ": "Tajikistan", "TJ": "Tajikistan",
"RO": "Romania", "RO": "Romania",
"TK": "Tokelau", "TK": "Tokelau",
"GW": "Guinea-Bissau", "GW": "Guinea-Bissau",
"GU": "Guam", "GU": "Guam",
"GT": "Guatemala", "GT": "Guatemala",
"GS": "South Georgia and the South Sandwich Islands", "GS": "South Georgia and the South Sandwich Islands",
"GR": "Greece", "GR": "Greece",
"GQ": "Equatorial Guinea", "GQ": "Equatorial Guinea",
"GP": "Guadeloupe", "GP": "Guadeloupe",
"JP": "Japan", "JP": "Japan",
"GY": "Guyana", "GY": "Guyana",
"GG": "Guernsey", "GG": "Guernsey",
"GF": "French Guiana", "GF": "French Guiana",
"GE": "Georgia", "GE": "Georgia",
"GD": "Grenada", "GD": "Grenada",
"GB": "United Kingdom", "GB": "United Kingdom",
"GA": "Gabon", "GA": "Gabon",
"SV": "El Salvador", "SV": "El Salvador",
"GN": "Guinea", "GN": "Guinea",
"GM": "Gambia", "GM": "Gambia",
"GL": "Greenland", "GL": "Greenland",
"GI": "Gibraltar", "GI": "Gibraltar",
"GH": "Ghana", "GH": "Ghana",
"OM": "Oman", "OM": "Oman",
"TN": "Tunisia", "TN": "Tunisia",
"JO": "Jordan", "JO": "Jordan",
"HR": "Croatia", "HR": "Croatia",
"HT": "Haiti", "HT": "Haiti",
"HU": "Hungary", "HU": "Hungary",
"HK": "Hong Kong", "HK": "Hong Kong",
"HN": "Honduras", "HN": "Honduras",
"HM": "Heard Island and McDonald Islands", "HM": "Heard Island and McDonald Islands",
"VE": "Venezuela", "VE": "Venezuela",
"PR": "Puerto Rico", "PR": "Puerto Rico",
"PS": "Palestine", "PS": "Palestine",
"PW": "Palau", "PW": "Palau",
"PT": "Portugal", "PT": "Portugal",
"SJ": "Svalbard and Jan Mayen", "SJ": "Svalbard and Jan Mayen",
"PY": "Paraguay", "PY": "Paraguay",
"IQ": "Iraq", "IQ": "Iraq",
"PA": "Panama", "PA": "Panama",
"PF": "French Polynesia", "PF": "French Polynesia",
"PG": "Papua New Guinea", "PG": "Papua New Guinea",
"PE": "Peru", "PE": "Peru",
"PK": "Pakistan", "PK": "Pakistan",
"PH": "Philippines", "PH": "Philippines",
"PN": "Pitcairn", "PN": "Pitcairn",
"PL": "Poland", "PL": "Poland",
"PM": "Saint Pierre and Miquelon", "PM": "Saint Pierre and Miquelon",
"ZM": "Zambia", "ZM": "Zambia",
"EH": "Western Sahara", "EH": "Western Sahara",
"EE": "Estonia", "EE": "Estonia",
"EG": "Egypt", "EG": "Egypt",
"ZA": "South Africa", "ZA": "South Africa",
"EC": "Ecuador", "EC": "Ecuador",
"IT": "Italy", "IT": "Italy",
"VN": "Vietnam", "VN": "Vietnam",
"SB": "Solomon Islands", "SB": "Solomon Islands",
"ET": "Ethiopia", "ET": "Ethiopia",
"SO": "Somalia", "SO": "Somalia",
"ZW": "Zimbabwe", "ZW": "Zimbabwe",
"SA": "Saudi Arabia", "SA": "Saudi Arabia",
"ES": "Spain", "ES": "Spain",
"ER": "Eritrea", "ER": "Eritrea",
"ME": "Montenegro", "ME": "Montenegro",
"MD": "Moldova", "MD": "Moldova",
"MG": "Madagascar", "MG": "Madagascar",
"MF": "Saint Martin", "MF": "Saint Martin",
"MA": "Morocco", "MA": "Morocco",
"MC": "Monaco", "MC": "Monaco",
"UZ": "Uzbekistan", "UZ": "Uzbekistan",
"MM": "Myanmar", "MM": "Myanmar",
"ML": "Mali", "ML": "Mali",
"MO": "Macao", "MO": "Macao",
"MN": "Mongolia", "MN": "Mongolia",
"MH": "Marshall Islands", "MH": "Marshall Islands",
"MK": "Macedonia", "MK": "Macedonia",
"MU": "Mauritius", "MU": "Mauritius",
"MT": "Malta", "MT": "Malta",
"MW": "Malawi", "MW": "Malawi",
"MV": "Maldives", "MV": "Maldives",
"MQ": "Martinique", "MQ": "Martinique",
"MP": "Northern Mariana Islands", "MP": "Northern Mariana Islands",
"MS": "Montserrat", "MS": "Montserrat",
"MR": "Mauritania", "MR": "Mauritania",
"IM": "Isle of Man", "IM": "Isle of Man",
"UG": "Uganda", "UG": "Uganda",
"TZ": "Tanzania", "TZ": "Tanzania",
"MY": "Malaysia", "MY": "Malaysia",
"MX": "Mexico", "MX": "Mexico",
"IL": "Israel", "IL": "Israel",
"FR": "France", "FR": "France",
"IO": "British Indian Ocean Territory", "IO": "British Indian Ocean Territory",
"SH": "Saint Helena", "SH": "Saint Helena",
"FI": "Finland", "FI": "Finland",
"FJ": "Fiji", "FJ": "Fiji",
"FK": "Falkland Islands", "FK": "Falkland Islands",
"FM": "Micronesia", "FM": "Micronesia",
"FO": "Faroe Islands", "FO": "Faroe Islands",
"NI": "Nicaragua", "NI": "Nicaragua",
"NL": "Netherlands", "NL": "Netherlands",
"NO": "Norway", "NO": "Norway",
"NA": "Namibia", "NA": "Namibia",
"VU": "Vanuatu", "VU": "Vanuatu",
"NC": "New Caledonia", "NC": "New Caledonia",
"NE": "Niger", "NE": "Niger",
"NF": "Norfolk Island", "NF": "Norfolk Island",
"NG": "Nigeria", "NG": "Nigeria",
"NZ": "New Zealand", "NZ": "New Zealand",
"NP": "Nepal", "NP": "Nepal",
"NR": "Nauru", "NR": "Nauru",
"NU": "Niue", "NU": "Niue",
"CK": "Cook Islands", "CK": "Cook Islands",
"XK": "Kosovo", "XK": "Kosovo",
"CI": "Ivory Coast", "CI": "Ivory Coast",
"CH": "Switzerland", "CH": "Switzerland",
"CO": "Colombia", "CO": "Colombia",
"CN": "China", "CN": "China",
"CM": "Cameroon", "CM": "Cameroon",
"CL": "Chile", "CL": "Chile",
"CC": "Cocos Islands", "CC": "Cocos Islands",
"CA": "Canada", "CA": "Canada",
"CG": "Republic of the Congo", "CG": "Republic of the Congo",
"CF": "Central African Republic", "CF": "Central African Republic",
"CD": "Democratic Republic of the Congo", "CD": "Democratic Republic of the Congo",
"CZ": "Czech Republic", "CZ": "Czech Republic",
"CY": "Cyprus", "CY": "Cyprus",
"CX": "Christmas Island", "CX": "Christmas Island",
"CR": "Costa Rica", "CR": "Costa Rica",
"CW": "Curacao", "CW": "Curacao",
"CV": "Cape Verde", "CV": "Cape Verde",
"CU": "Cuba", "CU": "Cuba",
"SZ": "Swaziland", "SZ": "Swaziland",
"SY": "Syria", "SY": "Syria",
"SX": "Sint Maarten", "SX": "Sint Maarten",
"KG": "Kyrgyzstan", "KG": "Kyrgyzstan",
"KE": "Kenya", "KE": "Kenya",
"SS": "South Sudan", "SS": "South Sudan",
"SR": "Suriname", "SR": "Suriname",
"KI": "Kiribati", "KI": "Kiribati",
"KH": "Cambodia", "KH": "Cambodia",
"KN": "Saint Kitts and Nevis", "KN": "Saint Kitts and Nevis",
"KM": "Comoros", "KM": "Comoros",
"ST": "Sao Tome and Principe", "ST": "Sao Tome and Principe",
"SK": "Slovakia", "SK": "Slovakia",
"KR": "South Korea", "KR": "South Korea",
"SI": "Slovenia", "SI": "Slovenia",
"KP": "North Korea", "KP": "North Korea",
"KW": "Kuwait", "KW": "Kuwait",
"SN": "Senegal", "SN": "Senegal",
"SM": "San Marino", "SM": "San Marino",
"SL": "Sierra Leone", "SL": "Sierra Leone",
"SC": "Seychelles", "SC": "Seychelles",
"KZ": "Kazakhstan", "KZ": "Kazakhstan",
"KY": "Cayman Islands", "KY": "Cayman Islands",
"SG": "Singapore", "SG": "Singapore",
"SE": "Sweden", "SE": "Sweden",
"SD": "Sudan", "SD": "Sudan",
"DO": "Dominican Republic", "DO": "Dominican Republic",
"DM": "Dominica", "DM": "Dominica",
"DJ": "Djibouti", "DJ": "Djibouti",
"DK": "Denmark", "DK": "Denmark",
"VG": "British Virgin Islands", "VG": "British Virgin Islands",
"DE": "Germany", "DE": "Germany",
"YE": "Yemen", "YE": "Yemen",
"DZ": "Algeria", "DZ": "Algeria",
"US": "United States", "US": "United States",
"UY": "Uruguay", "UY": "Uruguay",
"YT": "Mayotte", "YT": "Mayotte",
"UM": "United States Minor Outlying Islands", "UM": "United States Minor Outlying Islands",
"LB": "Lebanon", "LB": "Lebanon",
"LC": "Saint Lucia", "LC": "Saint Lucia",
"LA": "Laos", "LA": "Laos",
"TV": "Tuvalu", "TV": "Tuvalu",
"TW": "Taiwan", "TW": "Taiwan",
"TT": "Trinidad and Tobago", "TT": "Trinidad and Tobago",
"TR": "Turkey", "TR": "Turkey",
"LK": "Sri Lanka", "LK": "Sri Lanka",
"LI": "Liechtenstein", "LI": "Liechtenstein",
"LV": "Latvia", "LV": "Latvia",
"TO": "Tonga", "TO": "Tonga",
"LT": "Lithuania", "LT": "Lithuania",
"LU": "Luxembourg", "LU": "Luxembourg",
"LR": "Liberia", "LR": "Liberia",
"LS": "Lesotho", "LS": "Lesotho",
"TH": "Thailand", "TH": "Thailand",
"TF": "French Southern Territories", "TF": "French Southern Territories",
"TG": "Togo", "TG": "Togo",
"TD": "Chad", "TD": "Chad",
"TC": "Turks and Caicos Islands", "TC": "Turks and Caicos Islands",
"LY": "Libya", "LY": "Libya",
"VA": "Vatican", "VA": "Vatican",
"VC": "Saint Vincent and the Grenadines", "VC": "Saint Vincent and the Grenadines",
"AE": "United Arab Emirates", "AE": "United Arab Emirates",
"AD": "Andorra", "AD": "Andorra",
"AG": "Antigua and Barbuda", "AG": "Antigua and Barbuda",
"AF": "Afghanistan", "AF": "Afghanistan",
"AI": "Anguilla", "AI": "Anguilla",
"VI": "U.S. Virgin Islands", "VI": "U.S. Virgin Islands",
"IS": "Iceland", "IS": "Iceland",
"IR": "Iran", "IR": "Iran",
"AM": "Armenia", "AM": "Armenia",
"AL": "Albania", "AL": "Albania",
"AO": "Angola", "AO": "Angola",
"AQ": "Antarctica", "AQ": "Antarctica",
"AS": "American Samoa", "AS": "American Samoa",
"AR": "Argentina", "AR": "Argentina",
"AU": "Australia", "AU": "Australia",
"AT": "Austria", "AT": "Austria",
"AW": "Aruba", "AW": "Aruba",
"IN": "India", "IN": "India",
"AX": "Aland Islands", "AX": "Aland Islands",
"AZ": "Azerbaijan", "AZ": "Azerbaijan",
"IE": "Ireland", "IE": "Ireland",
"ID": "Indonesia", "ID": "Indonesia",
"UA": "Ukraine", "UA": "Ukraine",
"QA": "Qatar", "QA": "Qatar",
"MZ": "Mozambique" "MZ": "Mozambique"
} }

45
internal/apps/flags/main.go
View File

@ -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)
} }

7
internal/oidc/handler.go
View File

@ -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 {

4
internal/queries/app_flags.sql
View File

@ -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;

17
internal/queries/app_flags.sql.go
View File

@ -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

2
internal/queries/models.go
View File

@ -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
} }

2
migrations/00000002_flags.up.sql
View File

@ -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
View File

28
web/views/apps/flags/start.html
View File

@ -1,8 +1,22 @@
<div> <div hx-boost="true">
{{range .SupportedTags}} <form method="post">
<label class="cursor-pointer label"> <input type="text" class="hidden" name="type" value="start" />
<span class="label-text">{{index $.T .}}</span>
<input type="checkbox" class="checkbox checkbox-primary" /> <div>
</label> {{range .SupportedTags}}
{{end}} <label class="cursor-pointer label">
<span class="label-text">{{index $.T .}}</span>
<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> </div>