From 0db7fd5a3379369838b7f8d0b90152b54d1657d7 Mon Sep 17 00:00:00 2001 From: Achim Rohn Date: Sat, 15 Nov 2025 12:16:59 +0100 Subject: [PATCH] Update imports --- go.mod | 2 +- starter/about/about.go | 2 +- starter/contact/contact.go | 2 +- starter/create/create.go | 2 +- starter/ent/schema/google_auth.go | 2 +- starter/ent/schema/todo.go | 2 +- starter/ent/schema/user.go | 2 +- starter/go.mod | 4 +--- starter/go.sum | 2 ++ starter/google/database.go | 6 +++--- starter/index/index.go | 2 +- starter/login/login.go | 2 +- starter/main.go | 2 +- starter/routes/routing.go | 6 +++--- starter/todos/todos.go | 2 +- 15 files changed, 20 insertions(+), 20 deletions(-) diff --git a/go.mod b/go.mod index 78b8736..15304c9 100644 --- a/go.mod +++ b/go.mod @@ -12,6 +12,7 @@ require ( github.com/markbates/goth v1.81.0 github.com/mattn/go-sqlite3 v1.14.29 golang.org/x/crypto v0.40.0 + golang.org/x/net v0.41.0 golang.org/x/oauth2 v0.30.0 maragu.dev/gomponents v1.1.0 maragu.dev/gomponents-htmx v0.6.1 @@ -43,7 +44,6 @@ require ( github.com/zclconf/go-cty v1.14.4 // indirect github.com/zclconf/go-cty-yaml v1.1.0 // indirect golang.org/x/mod v0.25.0 // indirect - golang.org/x/net v0.41.0 // indirect golang.org/x/sync v0.16.0 // indirect golang.org/x/sys v0.34.0 // indirect golang.org/x/text v0.27.0 // indirect diff --git a/starter/about/about.go b/starter/about/about.go index 6fd3ebb..550d11c 100644 --- a/starter/about/about.go +++ b/starter/about/about.go @@ -1,7 +1,7 @@ package about import ( - . "ersteller-lib" + . "git.gorlug.de/code/ersteller" . "maragu.dev/gomponents" . "maragu.dev/gomponents/html" diff --git a/starter/contact/contact.go b/starter/contact/contact.go index 3ec5f2f..2fb74c1 100644 --- a/starter/contact/contact.go +++ b/starter/contact/contact.go @@ -1,7 +1,7 @@ package contact import ( - . "ersteller-lib" + . "git.gorlug.de/code/ersteller" . "maragu.dev/gomponents" . "maragu.dev/gomponents/html" diff --git a/starter/create/create.go b/starter/create/create.go index b2ec9cc..f3e764e 100644 --- a/starter/create/create.go +++ b/starter/create/create.go @@ -1,8 +1,8 @@ package create import ( - . "ersteller-lib" "fmt" + . "git.gorlug.de/code/ersteller" "git.gorlug.de/code/ersteller/starter/env" "log" "os" diff --git a/starter/ent/schema/google_auth.go b/starter/ent/schema/google_auth.go index 41221fd..fd4a277 100644 --- a/starter/ent/schema/google_auth.go +++ b/starter/ent/schema/google_auth.go @@ -1,7 +1,7 @@ package schema import ( - ersteller_ent "ersteller-lib/schema/ent" + ersteller_ent "git.gorlug.de/code/ersteller/schema/ent" "entgo.io/ent" "entgo.io/ent/schema/edge" diff --git a/starter/ent/schema/todo.go b/starter/ent/schema/todo.go index 72143a6..0a29067 100644 --- a/starter/ent/schema/todo.go +++ b/starter/ent/schema/todo.go @@ -1,7 +1,7 @@ package schema import ( - "ersteller-lib/schema/ent" + "git.gorlug.de/code/ersteller/schema/ent" "entgo.io/ent" "entgo.io/ent/schema/edge" diff --git a/starter/ent/schema/user.go b/starter/ent/schema/user.go index 145aeb6..84ac46e 100644 --- a/starter/ent/schema/user.go +++ b/starter/ent/schema/user.go @@ -1,7 +1,7 @@ package schema import ( - "ersteller-lib/schema/ent" + "git.gorlug.de/code/ersteller/schema/ent" "entgo.io/ent" "entgo.io/ent/schema/field" diff --git a/starter/go.mod b/starter/go.mod index f591650..3798967 100644 --- a/starter/go.mod +++ b/starter/go.mod @@ -4,7 +4,7 @@ go 1.25.0 require ( entgo.io/ent v0.14.5 - ersteller-lib v0.0.0 + git.gorlug.de/code/ersteller v0.0.0-20251115110439-18d05566e2fc github.com/gorilla/sessions v1.4.0 github.com/joho/godotenv v1.5.1 golang.org/x/oauth2 v0.30.0 @@ -49,5 +49,3 @@ require ( golang.org/x/tools v0.36.0 // indirect maragu.dev/gomponents-htmx v0.6.1 // indirect ) - -replace ersteller-lib => .. diff --git a/starter/go.sum b/starter/go.sum index d2231a0..01e37ff 100644 --- a/starter/go.sum +++ b/starter/go.sum @@ -4,6 +4,8 @@ cloud.google.com/go/compute/metadata v0.3.0 h1:Tz+eQXMEqDIKRsmY3cHTL6FVaynIjX2Qx cloud.google.com/go/compute/metadata v0.3.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k= entgo.io/ent v0.14.5 h1:Rj2WOYJtCkWyFo6a+5wB3EfBRP0rnx1fMk6gGA0UUe4= entgo.io/ent v0.14.5/go.mod h1:zTzLmWtPvGpmSwtkaayM2cm5m819NdM7z7tYPq3vN0U= +git.gorlug.de/code/ersteller v0.0.0-20251115110439-18d05566e2fc h1:oin+Mm/Z9FaR0To40MDGrFsEdK7s7FDaC9vImeyvMdg= +git.gorlug.de/code/ersteller v0.0.0-20251115110439-18d05566e2fc/go.mod h1:1pFeoQnWLWVcAfSPCq0Fwr+cJ6gqiW475B8Mt2Kuk7Y= github.com/DATA-DOG/go-sqlmock v1.5.0 h1:Shsta01QNfFxHCfpW6YH2STWB0MudeXXEWMr20OEh60= github.com/DATA-DOG/go-sqlmock v1.5.0/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= github.com/agext/levenshtein v1.2.3 h1:YB2fHEn0UJagG8T1rrWknE3ZQzWM06O8AMAatNn7lmo= diff --git a/starter/google/database.go b/starter/google/database.go index 30909df..4c5b1f3 100644 --- a/starter/google/database.go +++ b/starter/google/database.go @@ -2,8 +2,8 @@ package google import ( "context" - ersteller_lib "ersteller-lib" - google_http "ersteller-lib/authentication/google/http" + "git.gorlug.de/code/ersteller" + google_http "git.gorlug.de/code/ersteller/authentication/google/http" "git.gorlug.de/code/ersteller/starter/ent" "git.gorlug.de/code/ersteller/starter/ent/user" ) @@ -25,7 +25,7 @@ func (d *Database) GetUserIdByEmail(ctx context.Context, email string) (int, err func (d *Database) CreateUser(ctx context.Context, email string) (int, error) { newUser, err := d.db.User.Create().SetEmail(email).Save(ctx) if err != nil { - ersteller_lib.LogError("Failed to create user: %v", err) + ersteller.LogError("Failed to create user: %v", err) return -1, err } return newUser.ID, nil diff --git a/starter/index/index.go b/starter/index/index.go index 521c6f2..990bc10 100644 --- a/starter/index/index.go +++ b/starter/index/index.go @@ -1,7 +1,7 @@ package index import ( - . "ersteller-lib" + . "git.gorlug.de/code/ersteller" . "maragu.dev/gomponents" . "maragu.dev/gomponents/html" diff --git a/starter/login/login.go b/starter/login/login.go index 2a5bf42..8fbe7c1 100644 --- a/starter/login/login.go +++ b/starter/login/login.go @@ -1,7 +1,7 @@ package login import ( - . "ersteller-lib" + . "git.gorlug.de/code/ersteller" . "maragu.dev/gomponents" . "maragu.dev/gomponents/html" diff --git a/starter/main.go b/starter/main.go index fcc3cb5..7570222 100644 --- a/starter/main.go +++ b/starter/main.go @@ -2,7 +2,7 @@ package main import ( "context" - . "ersteller-lib" + . "git.gorlug.de/code/ersteller" "git.gorlug.de/code/ersteller/starter/ent" "git.gorlug.de/code/ersteller/starter/env" "git.gorlug.de/code/ersteller/starter/routes" diff --git a/starter/routes/routing.go b/starter/routes/routing.go index 2204386..773a4fb 100644 --- a/starter/routes/routing.go +++ b/starter/routes/routing.go @@ -1,9 +1,9 @@ package routes import ( - . "ersteller-lib" - "ersteller-lib/authentication" - google_http "ersteller-lib/authentication/google/http" + . "git.gorlug.de/code/ersteller" + "git.gorlug.de/code/ersteller/authentication" + google_http "git.gorlug.de/code/ersteller/authentication/google/http" "git.gorlug.de/code/ersteller/starter/about" "git.gorlug.de/code/ersteller/starter/contact" "git.gorlug.de/code/ersteller/starter/ent" diff --git a/starter/todos/todos.go b/starter/todos/todos.go index d094132..39fdf79 100644 --- a/starter/todos/todos.go +++ b/starter/todos/todos.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - . "ersteller-lib" + . "git.gorlug.de/code/ersteller" "git.gorlug.de/code/ersteller/starter/ent" "git.gorlug.de/code/ersteller/starter/ent/todo"