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

updates
All checks were successful
build / build (push) Successful in 33s
Details

Browse Source
This commit is contained in:
Tijl 2024-08-22 15:15:16 +02:00
parent 862ff1ff7b
commit fea80ba467
Signed by: tijl
GPG Key ID: DAE24BFCD722F053
23 changed files with 57 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.air.toml
View File

@ -2,7 +2,7 @@ root = "."
tmp_dir = ".air-tmp" tmp_dir = ".air-tmp"
[build] [build]
bin = "./tijl.dev" bin = "./tijl.dev-core"
cmd = "just build" cmd = "just build"
delay = 1000 delay = 1000
exclude_dir = ["node_modules","internal/queries","web/static"] exclude_dir = ["node_modules","internal/queries","web/static"]

1
.gitignore vendored
View File

@ -1,6 +1,7 @@
node_modules/ node_modules/
tijl.dev tijl.dev
tijldev tijldev
tijl.dev-core
web/static/js/interactive.js web/static/js/interactive.js
web/static/css/styles.css web/static/css/styles.css
config.yaml config.yaml

2
cmd/server/main.go
View File

@ -1,7 +1,7 @@
package main package main
import ( import (
"git.tijl.dev/tijl/tijl.dev/internal/service" "git.tijl.dev/tijl/tijl.dev-core/internal/service"
) )
func main() { func main() {

2
go.mod
View File

@ -1,4 +1,4 @@
module git.tijl.dev/tijl/tijl.dev module git.tijl.dev/tijl/tijl.dev-core
go 1.22.5 go 1.22.5

4
internal/assets/svg.go
View File

@ -5,8 +5,8 @@ import (
"path/filepath" "path/filepath"
"strings" "strings"
"git.tijl.dev/tijl/tijl.dev/assets" "git.tijl.dev/tijl/tijl.dev-core/assets"
"git.tijl.dev/tijl/tijl.dev/modules/logger" "git.tijl.dev/tijl/tijl.dev-core/modules/logger"
) )
var SVGData map[string]string var SVGData map[string]string

2
internal/config/config.go
View File

@ -3,7 +3,7 @@ package config
import ( import (
"os" "os"
log "git.tijl.dev/tijl/tijl.dev/modules/logger" log "git.tijl.dev/tijl/tijl.dev-core/modules/logger"
"gopkg.in/yaml.v3" "gopkg.in/yaml.v3"
) )

6
internal/handlers/account.go
View File

@ -3,9 +3,9 @@ package handlers
import ( import (
"database/sql" "database/sql"
"git.tijl.dev/tijl/tijl.dev/internal/i18n" "git.tijl.dev/tijl/tijl.dev-core/internal/i18n"
"git.tijl.dev/tijl/tijl.dev/internal/user" "git.tijl.dev/tijl/tijl.dev-core/internal/user"
"git.tijl.dev/tijl/tijl.dev/modules/web" "git.tijl.dev/tijl/tijl.dev-core/modules/web"
"github.com/gofiber/fiber/v2" "github.com/gofiber/fiber/v2"
) )

8
internal/handlers/auth.go
View File

@ -1,10 +1,10 @@
package handlers package handlers
import ( import (
"git.tijl.dev/tijl/tijl.dev/internal/i18n" "git.tijl.dev/tijl/tijl.dev-core/internal/i18n"
"git.tijl.dev/tijl/tijl.dev/internal/oidc" "git.tijl.dev/tijl/tijl.dev-core/internal/oidc"
"git.tijl.dev/tijl/tijl.dev/internal/user" "git.tijl.dev/tijl/tijl.dev-core/internal/user"
"git.tijl.dev/tijl/tijl.dev/modules/web" "git.tijl.dev/tijl/tijl.dev-core/modules/web"
"github.com/gofiber/fiber/v2" "github.com/gofiber/fiber/v2"
) )

10
internal/handlers/routes.go
View File

@ -4,11 +4,11 @@ import (
"io/fs" "io/fs"
"net/http" "net/http"
"git.tijl.dev/tijl/tijl.dev/internal/config" "git.tijl.dev/tijl/tijl.dev-core/internal/config"
"git.tijl.dev/tijl/tijl.dev/internal/i18n" "git.tijl.dev/tijl/tijl.dev-core/internal/i18n"
"git.tijl.dev/tijl/tijl.dev/internal/oidc" "git.tijl.dev/tijl/tijl.dev-core/internal/oidc"
"git.tijl.dev/tijl/tijl.dev/modules/web" "git.tijl.dev/tijl/tijl.dev-core/modules/web"
webf "git.tijl.dev/tijl/tijl.dev/web" webf "git.tijl.dev/tijl/tijl.dev-core/web"
"github.com/gofiber/fiber/v2" "github.com/gofiber/fiber/v2"
"github.com/gofiber/fiber/v2/middleware/filesystem" "github.com/gofiber/fiber/v2/middleware/filesystem"
) )

4
internal/handlers/settings.go
View File

@ -1,8 +1,8 @@
package handlers package handlers
import ( import (
"git.tijl.dev/tijl/tijl.dev/internal/i18n" "git.tijl.dev/tijl/tijl.dev-core/internal/i18n"
"git.tijl.dev/tijl/tijl.dev/modules/web" "git.tijl.dev/tijl/tijl.dev-core/modules/web"
"github.com/gofiber/fiber/v2" "github.com/gofiber/fiber/v2"
) )

4
internal/i18n/i18n.go
View File

@ -5,8 +5,8 @@ import (
"path/filepath" "path/filepath"
"strings" "strings"
"git.tijl.dev/tijl/tijl.dev/locales" "git.tijl.dev/tijl/tijl.dev-core/locales"
log "git.tijl.dev/tijl/tijl.dev/modules/logger" log "git.tijl.dev/tijl/tijl.dev-core/modules/logger"
"github.com/gofiber/fiber/v2" "github.com/gofiber/fiber/v2"
) )

10
internal/oidc/handler.go
View File

@ -6,11 +6,11 @@ import (
"errors" "errors"
"net/http" "net/http"
"git.tijl.dev/tijl/tijl.dev/internal/queries" "git.tijl.dev/tijl/tijl.dev-core/internal/queries"
"git.tijl.dev/tijl/tijl.dev/internal/user" "git.tijl.dev/tijl/tijl.dev-core/internal/user"
"git.tijl.dev/tijl/tijl.dev/internal/utils" "git.tijl.dev/tijl/tijl.dev-core/internal/utils"
"git.tijl.dev/tijl/tijl.dev/modules/db" "git.tijl.dev/tijl/tijl.dev-core/modules/db"
log "git.tijl.dev/tijl/tijl.dev/modules/logger" log "git.tijl.dev/tijl/tijl.dev-core/modules/logger"
"github.com/gofiber/fiber/v2" "github.com/gofiber/fiber/v2"
) )

4
internal/oidc/oidc.go
View File

@ -3,8 +3,8 @@ package oidc
import ( import (
"context" "context"
"git.tijl.dev/tijl/tijl.dev/internal/config" "git.tijl.dev/tijl/tijl.dev-core/internal/config"
log "git.tijl.dev/tijl/tijl.dev/modules/logger" log "git.tijl.dev/tijl/tijl.dev-core/modules/logger"
"github.com/coreos/go-oidc/v3/oidc" "github.com/coreos/go-oidc/v3/oidc"
"golang.org/x/oauth2" "golang.org/x/oauth2"
) )

20
internal/service/main.go
View File

@ -5,16 +5,16 @@ import (
"fmt" "fmt"
"net/http" "net/http"
"git.tijl.dev/tijl/tijl.dev/internal/assets" "git.tijl.dev/tijl/tijl.dev-core/internal/assets"
"git.tijl.dev/tijl/tijl.dev/internal/config" "git.tijl.dev/tijl/tijl.dev-core/internal/config"
"git.tijl.dev/tijl/tijl.dev/internal/handlers" "git.tijl.dev/tijl/tijl.dev-core/internal/handlers"
"git.tijl.dev/tijl/tijl.dev/internal/i18n" "git.tijl.dev/tijl/tijl.dev-core/internal/i18n"
"git.tijl.dev/tijl/tijl.dev/internal/oidc" "git.tijl.dev/tijl/tijl.dev-core/internal/oidc"
webinternal "git.tijl.dev/tijl/tijl.dev/internal/web" webinternal "git.tijl.dev/tijl/tijl.dev-core/internal/web"
"git.tijl.dev/tijl/tijl.dev/modules/db" "git.tijl.dev/tijl/tijl.dev-core/modules/db"
"git.tijl.dev/tijl/tijl.dev/modules/logger" "git.tijl.dev/tijl/tijl.dev-core/modules/logger"
"git.tijl.dev/tijl/tijl.dev/modules/web" "git.tijl.dev/tijl/tijl.dev-core/modules/web"
webf "git.tijl.dev/tijl/tijl.dev/web" webf "git.tijl.dev/tijl/tijl.dev-core/web"
"github.com/gofiber/contrib/fiberzerolog" "github.com/gofiber/contrib/fiberzerolog"
"github.com/gofiber/fiber/v2" "github.com/gofiber/fiber/v2"
"github.com/gofiber/template/html/v2" "github.com/gofiber/template/html/v2"

6
internal/user/sessions.go
View File

@ -4,9 +4,9 @@ import (
"context" "context"
"errors" "errors"
"git.tijl.dev/tijl/tijl.dev/internal/queries" "git.tijl.dev/tijl/tijl.dev-core/internal/queries"
"git.tijl.dev/tijl/tijl.dev/internal/utils" "git.tijl.dev/tijl/tijl.dev-core/internal/utils"
"git.tijl.dev/tijl/tijl.dev/modules/db" "git.tijl.dev/tijl/tijl.dev-core/modules/db"
"github.com/gofiber/fiber/v2" "github.com/gofiber/fiber/v2"
) )

4
internal/user/users.go
View File

@ -3,8 +3,8 @@ package user
import ( import (
"context" "context"
"git.tijl.dev/tijl/tijl.dev/internal/queries" "git.tijl.dev/tijl/tijl.dev-core/internal/queries"
"git.tijl.dev/tijl/tijl.dev/modules/db" "git.tijl.dev/tijl/tijl.dev-core/modules/db"
) )
func GetUser(uid string) (error, queries.User) { func GetUser(uid string) (error, queries.User) {

2
internal/utils/random.go
View File

@ -5,7 +5,7 @@ import (
"encoding/base64" "encoding/base64"
"io" "io"
log "git.tijl.dev/tijl/tijl.dev/modules/logger" log "git.tijl.dev/tijl/tijl.dev-core/modules/logger"
) )
func RandString(nByte int) string { func RandString(nByte int) string {

6
internal/web/common.go
View File

@ -1,9 +1,9 @@
package web package web
import ( import (
"git.tijl.dev/tijl/tijl.dev/internal/i18n" "git.tijl.dev/tijl/tijl.dev-core/internal/i18n"
"git.tijl.dev/tijl/tijl.dev/internal/user" "git.tijl.dev/tijl/tijl.dev-core/internal/user"
"git.tijl.dev/tijl/tijl.dev/modules/web" "git.tijl.dev/tijl/tijl.dev-core/modules/web"
"github.com/gofiber/fiber/v2" "github.com/gofiber/fiber/v2"
) )

2
justfile
View File

@ -11,7 +11,7 @@ generate-sqlc:
sqlc generate sqlc generate
go-build: go-build:
go build -o tijl.dev cmd/server/main.go go build -o tijl.dev-core cmd/server/main.go
build: npm-build-css npm-build generate-sqlc go-build build: npm-build-css npm-build generate-sqlc go-build

8
modules/db/db.go
View File

@ -4,10 +4,10 @@ import (
"database/sql" "database/sql"
"errors" "errors"
"git.tijl.dev/tijl/tijl.dev/internal/config" "git.tijl.dev/tijl/tijl.dev-core/internal/config"
"git.tijl.dev/tijl/tijl.dev/internal/queries" "git.tijl.dev/tijl/tijl.dev-core/internal/queries"
"git.tijl.dev/tijl/tijl.dev/migrations" "git.tijl.dev/tijl/tijl.dev-core/migrations"
log "git.tijl.dev/tijl/tijl.dev/modules/logger" log "git.tijl.dev/tijl/tijl.dev-core/modules/logger"
"github.com/golang-migrate/migrate/v4" "github.com/golang-migrate/migrate/v4"
"github.com/golang-migrate/migrate/v4/database/pgx/v5" "github.com/golang-migrate/migrate/v4/database/pgx/v5"
"github.com/golang-migrate/migrate/v4/source/iofs" "github.com/golang-migrate/migrate/v4/source/iofs"

2
modules/web/app.go
View File

@ -1,7 +1,7 @@
package web package web
import ( import (
log "git.tijl.dev/tijl/tijl.dev/modules/logger" log "git.tijl.dev/tijl/tijl.dev-core/modules/logger"
"github.com/gofiber/fiber/v2" "github.com/gofiber/fiber/v2"
) )

2
modules/web/common.go
View File

@ -1,7 +1,7 @@
package web package web
import ( import (
log "git.tijl.dev/tijl/tijl.dev/modules/logger" log "git.tijl.dev/tijl/tijl.dev-core/modules/logger"
"github.com/gofiber/fiber/v2" "github.com/gofiber/fiber/v2"
) )

2
package.json
View File

@ -1,5 +1,5 @@
{ {
"name": "tijldev-next", "name": "tijldev-core",
"scripts": { "scripts": {
"dev": "vite", "dev": "vite",
"build": "vite build", "build": "vite build",