From fea80ba467dc1cd22f0cec420535b899af37b17a Mon Sep 17 00:00:00 2001 From: tijl Date: Thu, 22 Aug 2024 15:15:16 +0200 Subject: [PATCH] updates --- .air.toml | 2 +- .gitignore | 1 + cmd/server/main.go | 2 +- go.mod | 2 +- internal/assets/svg.go | 4 ++-- internal/config/config.go | 2 +- internal/handlers/account.go | 6 +++--- internal/handlers/auth.go | 8 ++++---- internal/handlers/routes.go | 10 +++++----- internal/handlers/settings.go | 4 ++-- internal/i18n/i18n.go | 4 ++-- internal/oidc/handler.go | 10 +++++----- internal/oidc/oidc.go | 4 ++-- internal/service/main.go | 20 ++++++++++---------- internal/user/sessions.go | 6 +++--- internal/user/users.go | 4 ++-- internal/utils/random.go | 2 +- internal/web/common.go | 6 +++--- justfile | 2 +- modules/db/db.go | 8 ++++---- modules/web/app.go | 2 +- modules/web/common.go | 2 +- package.json | 2 +- 23 files changed, 57 insertions(+), 56 deletions(-) diff --git a/.air.toml b/.air.toml index 863018f..71cf5ad 100644 --- a/.air.toml +++ b/.air.toml @@ -2,7 +2,7 @@ root = "." tmp_dir = ".air-tmp" [build] - bin = "./tijl.dev" + bin = "./tijl.dev-core" cmd = "just build" delay = 1000 exclude_dir = ["node_modules","internal/queries","web/static"] diff --git a/.gitignore b/.gitignore index 42f6b9e..fda3612 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ node_modules/ tijl.dev tijldev +tijl.dev-core web/static/js/interactive.js web/static/css/styles.css config.yaml diff --git a/cmd/server/main.go b/cmd/server/main.go index 7803720..b6a2b6c 100644 --- a/cmd/server/main.go +++ b/cmd/server/main.go @@ -1,7 +1,7 @@ package main import ( - "git.tijl.dev/tijl/tijl.dev/internal/service" + "git.tijl.dev/tijl/tijl.dev-core/internal/service" ) func main() { diff --git a/go.mod b/go.mod index fc8089d..2ab7ecf 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module git.tijl.dev/tijl/tijl.dev +module git.tijl.dev/tijl/tijl.dev-core go 1.22.5 diff --git a/internal/assets/svg.go b/internal/assets/svg.go index b0305a3..e53bd38 100644 --- a/internal/assets/svg.go +++ b/internal/assets/svg.go @@ -5,8 +5,8 @@ import ( "path/filepath" "strings" - "git.tijl.dev/tijl/tijl.dev/assets" - "git.tijl.dev/tijl/tijl.dev/modules/logger" + "git.tijl.dev/tijl/tijl.dev-core/assets" + "git.tijl.dev/tijl/tijl.dev-core/modules/logger" ) var SVGData map[string]string diff --git a/internal/config/config.go b/internal/config/config.go index 9624c3d..8a5e129 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -3,7 +3,7 @@ package config import ( "os" - log "git.tijl.dev/tijl/tijl.dev/modules/logger" + log "git.tijl.dev/tijl/tijl.dev-core/modules/logger" "gopkg.in/yaml.v3" ) diff --git a/internal/handlers/account.go b/internal/handlers/account.go index e0985ba..fccf75c 100644 --- a/internal/handlers/account.go +++ b/internal/handlers/account.go @@ -3,9 +3,9 @@ package handlers import ( "database/sql" - "git.tijl.dev/tijl/tijl.dev/internal/i18n" - "git.tijl.dev/tijl/tijl.dev/internal/user" - "git.tijl.dev/tijl/tijl.dev/modules/web" + "git.tijl.dev/tijl/tijl.dev-core/internal/i18n" + "git.tijl.dev/tijl/tijl.dev-core/internal/user" + "git.tijl.dev/tijl/tijl.dev-core/modules/web" "github.com/gofiber/fiber/v2" ) diff --git a/internal/handlers/auth.go b/internal/handlers/auth.go index 70263d4..fb71c26 100644 --- a/internal/handlers/auth.go +++ b/internal/handlers/auth.go @@ -1,10 +1,10 @@ package handlers import ( - "git.tijl.dev/tijl/tijl.dev/internal/i18n" - "git.tijl.dev/tijl/tijl.dev/internal/oidc" - "git.tijl.dev/tijl/tijl.dev/internal/user" - "git.tijl.dev/tijl/tijl.dev/modules/web" + "git.tijl.dev/tijl/tijl.dev-core/internal/i18n" + "git.tijl.dev/tijl/tijl.dev-core/internal/oidc" + "git.tijl.dev/tijl/tijl.dev-core/internal/user" + "git.tijl.dev/tijl/tijl.dev-core/modules/web" "github.com/gofiber/fiber/v2" ) diff --git a/internal/handlers/routes.go b/internal/handlers/routes.go index 88b2d58..77679fb 100644 --- a/internal/handlers/routes.go +++ b/internal/handlers/routes.go @@ -4,11 +4,11 @@ import ( "io/fs" "net/http" - "git.tijl.dev/tijl/tijl.dev/internal/config" - "git.tijl.dev/tijl/tijl.dev/internal/i18n" - "git.tijl.dev/tijl/tijl.dev/internal/oidc" - "git.tijl.dev/tijl/tijl.dev/modules/web" - webf "git.tijl.dev/tijl/tijl.dev/web" + "git.tijl.dev/tijl/tijl.dev-core/internal/config" + "git.tijl.dev/tijl/tijl.dev-core/internal/i18n" + "git.tijl.dev/tijl/tijl.dev-core/internal/oidc" + "git.tijl.dev/tijl/tijl.dev-core/modules/web" + webf "git.tijl.dev/tijl/tijl.dev-core/web" "github.com/gofiber/fiber/v2" "github.com/gofiber/fiber/v2/middleware/filesystem" ) diff --git a/internal/handlers/settings.go b/internal/handlers/settings.go index 2e23f63..ace88e5 100644 --- a/internal/handlers/settings.go +++ b/internal/handlers/settings.go @@ -1,8 +1,8 @@ package handlers import ( - "git.tijl.dev/tijl/tijl.dev/internal/i18n" - "git.tijl.dev/tijl/tijl.dev/modules/web" + "git.tijl.dev/tijl/tijl.dev-core/internal/i18n" + "git.tijl.dev/tijl/tijl.dev-core/modules/web" "github.com/gofiber/fiber/v2" ) diff --git a/internal/i18n/i18n.go b/internal/i18n/i18n.go index 416f24c..c30b84f 100644 --- a/internal/i18n/i18n.go +++ b/internal/i18n/i18n.go @@ -5,8 +5,8 @@ import ( "path/filepath" "strings" - "git.tijl.dev/tijl/tijl.dev/locales" - log "git.tijl.dev/tijl/tijl.dev/modules/logger" + "git.tijl.dev/tijl/tijl.dev-core/locales" + log "git.tijl.dev/tijl/tijl.dev-core/modules/logger" "github.com/gofiber/fiber/v2" ) diff --git a/internal/oidc/handler.go b/internal/oidc/handler.go index b833b9c..8f9cdee 100644 --- a/internal/oidc/handler.go +++ b/internal/oidc/handler.go @@ -6,11 +6,11 @@ import ( "errors" "net/http" - "git.tijl.dev/tijl/tijl.dev/internal/queries" - "git.tijl.dev/tijl/tijl.dev/internal/user" - "git.tijl.dev/tijl/tijl.dev/internal/utils" - "git.tijl.dev/tijl/tijl.dev/modules/db" - log "git.tijl.dev/tijl/tijl.dev/modules/logger" + "git.tijl.dev/tijl/tijl.dev-core/internal/queries" + "git.tijl.dev/tijl/tijl.dev-core/internal/user" + "git.tijl.dev/tijl/tijl.dev-core/internal/utils" + "git.tijl.dev/tijl/tijl.dev-core/modules/db" + log "git.tijl.dev/tijl/tijl.dev-core/modules/logger" "github.com/gofiber/fiber/v2" ) diff --git a/internal/oidc/oidc.go b/internal/oidc/oidc.go index 4e63667..50678d7 100644 --- a/internal/oidc/oidc.go +++ b/internal/oidc/oidc.go @@ -3,8 +3,8 @@ package oidc import ( "context" - "git.tijl.dev/tijl/tijl.dev/internal/config" - log "git.tijl.dev/tijl/tijl.dev/modules/logger" + "git.tijl.dev/tijl/tijl.dev-core/internal/config" + log "git.tijl.dev/tijl/tijl.dev-core/modules/logger" "github.com/coreos/go-oidc/v3/oidc" "golang.org/x/oauth2" ) diff --git a/internal/service/main.go b/internal/service/main.go index 3e9fe8e..7c0bde9 100644 --- a/internal/service/main.go +++ b/internal/service/main.go @@ -5,16 +5,16 @@ import ( "fmt" "net/http" - "git.tijl.dev/tijl/tijl.dev/internal/assets" - "git.tijl.dev/tijl/tijl.dev/internal/config" - "git.tijl.dev/tijl/tijl.dev/internal/handlers" - "git.tijl.dev/tijl/tijl.dev/internal/i18n" - "git.tijl.dev/tijl/tijl.dev/internal/oidc" - webinternal "git.tijl.dev/tijl/tijl.dev/internal/web" - "git.tijl.dev/tijl/tijl.dev/modules/db" - "git.tijl.dev/tijl/tijl.dev/modules/logger" - "git.tijl.dev/tijl/tijl.dev/modules/web" - webf "git.tijl.dev/tijl/tijl.dev/web" + "git.tijl.dev/tijl/tijl.dev-core/internal/assets" + "git.tijl.dev/tijl/tijl.dev-core/internal/config" + "git.tijl.dev/tijl/tijl.dev-core/internal/handlers" + "git.tijl.dev/tijl/tijl.dev-core/internal/i18n" + "git.tijl.dev/tijl/tijl.dev-core/internal/oidc" + webinternal "git.tijl.dev/tijl/tijl.dev-core/internal/web" + "git.tijl.dev/tijl/tijl.dev-core/modules/db" + "git.tijl.dev/tijl/tijl.dev-core/modules/logger" + "git.tijl.dev/tijl/tijl.dev-core/modules/web" + webf "git.tijl.dev/tijl/tijl.dev-core/web" "github.com/gofiber/contrib/fiberzerolog" "github.com/gofiber/fiber/v2" "github.com/gofiber/template/html/v2" diff --git a/internal/user/sessions.go b/internal/user/sessions.go index ee781a9..09a2d2e 100644 --- a/internal/user/sessions.go +++ b/internal/user/sessions.go @@ -4,9 +4,9 @@ import ( "context" "errors" - "git.tijl.dev/tijl/tijl.dev/internal/queries" - "git.tijl.dev/tijl/tijl.dev/internal/utils" - "git.tijl.dev/tijl/tijl.dev/modules/db" + "git.tijl.dev/tijl/tijl.dev-core/internal/queries" + "git.tijl.dev/tijl/tijl.dev-core/internal/utils" + "git.tijl.dev/tijl/tijl.dev-core/modules/db" "github.com/gofiber/fiber/v2" ) diff --git a/internal/user/users.go b/internal/user/users.go index d1c14b1..98542e2 100644 --- a/internal/user/users.go +++ b/internal/user/users.go @@ -3,8 +3,8 @@ package user import ( "context" - "git.tijl.dev/tijl/tijl.dev/internal/queries" - "git.tijl.dev/tijl/tijl.dev/modules/db" + "git.tijl.dev/tijl/tijl.dev-core/internal/queries" + "git.tijl.dev/tijl/tijl.dev-core/modules/db" ) func GetUser(uid string) (error, queries.User) { diff --git a/internal/utils/random.go b/internal/utils/random.go index 8fcab1f..13eb313 100644 --- a/internal/utils/random.go +++ b/internal/utils/random.go @@ -5,7 +5,7 @@ import ( "encoding/base64" "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 { diff --git a/internal/web/common.go b/internal/web/common.go index 282e805..d79c1b2 100644 --- a/internal/web/common.go +++ b/internal/web/common.go @@ -1,9 +1,9 @@ package web import ( - "git.tijl.dev/tijl/tijl.dev/internal/i18n" - "git.tijl.dev/tijl/tijl.dev/internal/user" - "git.tijl.dev/tijl/tijl.dev/modules/web" + "git.tijl.dev/tijl/tijl.dev-core/internal/i18n" + "git.tijl.dev/tijl/tijl.dev-core/internal/user" + "git.tijl.dev/tijl/tijl.dev-core/modules/web" "github.com/gofiber/fiber/v2" ) diff --git a/justfile b/justfile index 32eb621..061ca8c 100644 --- a/justfile +++ b/justfile @@ -11,7 +11,7 @@ generate-sqlc: sqlc generate 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 diff --git a/modules/db/db.go b/modules/db/db.go index 147d62e..0d98b6f 100644 --- a/modules/db/db.go +++ b/modules/db/db.go @@ -4,10 +4,10 @@ import ( "database/sql" "errors" - "git.tijl.dev/tijl/tijl.dev/internal/config" - "git.tijl.dev/tijl/tijl.dev/internal/queries" - "git.tijl.dev/tijl/tijl.dev/migrations" - log "git.tijl.dev/tijl/tijl.dev/modules/logger" + "git.tijl.dev/tijl/tijl.dev-core/internal/config" + "git.tijl.dev/tijl/tijl.dev-core/internal/queries" + "git.tijl.dev/tijl/tijl.dev-core/migrations" + log "git.tijl.dev/tijl/tijl.dev-core/modules/logger" "github.com/golang-migrate/migrate/v4" "github.com/golang-migrate/migrate/v4/database/pgx/v5" "github.com/golang-migrate/migrate/v4/source/iofs" diff --git a/modules/web/app.go b/modules/web/app.go index 1a1d469..c3ecd21 100644 --- a/modules/web/app.go +++ b/modules/web/app.go @@ -1,7 +1,7 @@ package web 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" ) diff --git a/modules/web/common.go b/modules/web/common.go index 3431a41..6e5f17b 100644 --- a/modules/web/common.go +++ b/modules/web/common.go @@ -1,7 +1,7 @@ package web 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" ) diff --git a/package.json b/package.json index ea97e00..686a287 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "tijldev-next", + "name": "tijldev-core", "scripts": { "dev": "vite", "build": "vite build",