From 4c76f6b3674543a7821d4309b9167f209a4812eb Mon Sep 17 00:00:00 2001 From: Hayden <64056131+hay-kot@users.noreply.github.com> Date: Mon, 29 Aug 2022 18:40:54 -0800 Subject: [PATCH] update imports --- .github/workflows/publish.yaml | 4 +- README.md | 10 +-- backend/app/api/app.go | 14 ++-- backend/app/api/base/base_ctrl.go | 6 +- backend/app/api/base/base_ctrl_test.go | 2 +- backend/app/api/main.go | 14 ++-- backend/app/api/middleware.go | 10 +-- backend/app/api/routes.go | 8 +- backend/app/api/seed.go | 8 +- backend/app/api/v1/controller.go | 4 +- backend/app/api/v1/main_test.go | 6 +- backend/app/api/v1/v1_ctrl_admin.go | 10 +-- backend/app/api/v1/v1_ctrl_admin_test.go | 8 +- backend/app/api/v1/v1_ctrl_auth.go | 8 +- backend/app/api/v1/v1_ctrl_user.go | 8 +- backend/app/generator/main.go | 6 +- backend/ent/authtokens.go | 4 +- backend/ent/authtokens/where.go | 2 +- backend/ent/authtokens_create.go | 4 +- backend/ent/authtokens_delete.go | 4 +- backend/ent/authtokens_query.go | 6 +- backend/ent/authtokens_update.go | 6 +- backend/ent/client.go | 6 +- backend/ent/ent.go | 4 +- backend/ent/enttest/enttest.go | 4 +- backend/ent/hook/hook.go | 2 +- backend/ent/mutation.go | 6 +- backend/ent/runtime.go | 6 +- backend/ent/runtime/runtime.go | 2 +- backend/ent/user.go | 2 +- backend/ent/user/where.go | 2 +- backend/ent/user_create.go | 4 +- backend/ent/user_delete.go | 4 +- backend/ent/user_query.go | 6 +- backend/ent/user_update.go | 6 +- backend/go.mod | 2 +- backend/go.sum | 77 +------------------ backend/internal/mapper/users_automapper.go | 4 +- backend/internal/mocks/factories/users.go | 4 +- backend/internal/mocks/mock_logger.go | 2 +- backend/internal/mocks/mocker_services.go | 4 +- backend/internal/mocks/mocks_ent_repo.go | 4 +- backend/internal/repo/main_test.go | 2 +- backend/internal/repo/repos_all.go | 2 +- backend/internal/repo/token_ent.go | 8 +- backend/internal/repo/token_ent_test.go | 4 +- backend/internal/repo/token_interface.go | 2 +- backend/internal/repo/users_ent.go | 6 +- backend/internal/repo/users_ent_test.go | 4 +- backend/internal/repo/users_interface.go | 2 +- backend/internal/services/all.go | 2 +- backend/internal/services/contexts.go | 2 +- backend/internal/services/contexts_test.go | 2 +- backend/internal/services/service_admin.go | 4 +- backend/internal/services/service_user.go | 6 +- .../server/response_error_builder_test.go | 2 +- 56 files changed, 139 insertions(+), 212 deletions(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index d1f25e9..53499bf 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -18,6 +18,6 @@ jobs: env: CR_PAT: ${{ secrets.CR_PAT }} - name: Build Docker Image - run: cd backend && docker build -t ghcr.io/hay-kot/go-web-template:latest . + run: cd backend && docker build -t ghcr.io/hay-kot/content:latest . - name: push to container registry - run: docker push ghcr.io/hay-kot/go-web-template:latest + run: docker push ghcr.io/hay-kot/content:latest diff --git a/README.md b/README.md index 9042c20..9bad2ec 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,13 @@

Go Web Template

- - + + - - + +

- + This Go Web Template is a simple starter template for a Go web application. It includes a web server API, as well as a starter CLI to manage the web server/database inside the container. It should be noted that while while use of the standard library is a high priority, this template does make use of multiple external packages. It does however abide by the standard http handler pattern. - [Template Features](#template-features) diff --git a/backend/app/api/app.go b/backend/app/api/app.go index 5a062b0..8d087e4 100644 --- a/backend/app/api/app.go +++ b/backend/app/api/app.go @@ -3,13 +3,13 @@ package main import ( "time" - "github.com/hay-kot/git-web-template/backend/ent" - "github.com/hay-kot/git-web-template/backend/internal/config" - "github.com/hay-kot/git-web-template/backend/internal/repo" - "github.com/hay-kot/git-web-template/backend/internal/services" - "github.com/hay-kot/git-web-template/backend/pkgs/logger" - "github.com/hay-kot/git-web-template/backend/pkgs/mailer" - "github.com/hay-kot/git-web-template/backend/pkgs/server" + "github.com/hay-kot/content/backend/ent" + "github.com/hay-kot/content/backend/internal/config" + "github.com/hay-kot/content/backend/internal/repo" + "github.com/hay-kot/content/backend/internal/services" + "github.com/hay-kot/content/backend/pkgs/logger" + "github.com/hay-kot/content/backend/pkgs/mailer" + "github.com/hay-kot/content/backend/pkgs/server" ) type app struct { diff --git a/backend/app/api/base/base_ctrl.go b/backend/app/api/base/base_ctrl.go index 7649b8e..9f41d06 100644 --- a/backend/app/api/base/base_ctrl.go +++ b/backend/app/api/base/base_ctrl.go @@ -3,9 +3,9 @@ package base import ( "net/http" - "github.com/hay-kot/git-web-template/backend/internal/types" - "github.com/hay-kot/git-web-template/backend/pkgs/logger" - "github.com/hay-kot/git-web-template/backend/pkgs/server" + "github.com/hay-kot/content/backend/internal/types" + "github.com/hay-kot/content/backend/pkgs/logger" + "github.com/hay-kot/content/backend/pkgs/server" ) type ReadyFunc func() bool diff --git a/backend/app/api/base/base_ctrl_test.go b/backend/app/api/base/base_ctrl_test.go index 972f55e..71dca76 100644 --- a/backend/app/api/base/base_ctrl_test.go +++ b/backend/app/api/base/base_ctrl_test.go @@ -5,7 +5,7 @@ import ( "net/http/httptest" "testing" - "github.com/hay-kot/git-web-template/backend/internal/mocks" + "github.com/hay-kot/content/backend/internal/mocks" ) func GetTestHandler(t *testing.T) *BaseController { diff --git a/backend/app/api/main.go b/backend/app/api/main.go index 12570bd..cfd59fb 100644 --- a/backend/app/api/main.go +++ b/backend/app/api/main.go @@ -7,13 +7,13 @@ import ( "os" "time" - "github.com/hay-kot/git-web-template/backend/app/api/docs" - "github.com/hay-kot/git-web-template/backend/ent" - "github.com/hay-kot/git-web-template/backend/internal/config" - "github.com/hay-kot/git-web-template/backend/internal/repo" - "github.com/hay-kot/git-web-template/backend/internal/services" - "github.com/hay-kot/git-web-template/backend/pkgs/logger" - "github.com/hay-kot/git-web-template/backend/pkgs/server" + "github.com/hay-kot/content/backend/app/api/docs" + "github.com/hay-kot/content/backend/ent" + "github.com/hay-kot/content/backend/internal/config" + "github.com/hay-kot/content/backend/internal/repo" + "github.com/hay-kot/content/backend/internal/services" + "github.com/hay-kot/content/backend/pkgs/logger" + "github.com/hay-kot/content/backend/pkgs/server" _ "github.com/mattn/go-sqlite3" ) diff --git a/backend/app/api/middleware.go b/backend/app/api/middleware.go index 1a0d813..3e2da68 100644 --- a/backend/app/api/middleware.go +++ b/backend/app/api/middleware.go @@ -8,11 +8,11 @@ import ( "github.com/go-chi/chi/v5" "github.com/go-chi/chi/v5/middleware" - "github.com/hay-kot/git-web-template/backend/internal/config" - "github.com/hay-kot/git-web-template/backend/internal/services" - "github.com/hay-kot/git-web-template/backend/pkgs/hasher" - "github.com/hay-kot/git-web-template/backend/pkgs/logger" - "github.com/hay-kot/git-web-template/backend/pkgs/server" + "github.com/hay-kot/content/backend/internal/config" + "github.com/hay-kot/content/backend/internal/services" + "github.com/hay-kot/content/backend/pkgs/hasher" + "github.com/hay-kot/content/backend/pkgs/logger" + "github.com/hay-kot/content/backend/pkgs/server" ) func (a *app) setGlobalMiddleware(r *chi.Mux) { diff --git a/backend/app/api/routes.go b/backend/app/api/routes.go index e8887a5..b784c26 100644 --- a/backend/app/api/routes.go +++ b/backend/app/api/routes.go @@ -5,10 +5,10 @@ import ( "net/http" "github.com/go-chi/chi/v5" - "github.com/hay-kot/git-web-template/backend/app/api/base" - _ "github.com/hay-kot/git-web-template/backend/app/api/docs" - v1 "github.com/hay-kot/git-web-template/backend/app/api/v1" - "github.com/hay-kot/git-web-template/backend/internal/repo" + "github.com/hay-kot/content/backend/app/api/base" + _ "github.com/hay-kot/content/backend/app/api/docs" + v1 "github.com/hay-kot/content/backend/app/api/v1" + "github.com/hay-kot/content/backend/internal/repo" httpSwagger "github.com/swaggo/http-swagger" // http-swagger middleware ) diff --git a/backend/app/api/seed.go b/backend/app/api/seed.go index 3fbea74..7d66774 100644 --- a/backend/app/api/seed.go +++ b/backend/app/api/seed.go @@ -4,10 +4,10 @@ import ( "context" "github.com/google/uuid" - "github.com/hay-kot/git-web-template/backend/internal/repo" - "github.com/hay-kot/git-web-template/backend/internal/types" - "github.com/hay-kot/git-web-template/backend/pkgs/hasher" - "github.com/hay-kot/git-web-template/backend/pkgs/logger" + "github.com/hay-kot/content/backend/internal/repo" + "github.com/hay-kot/content/backend/internal/types" + "github.com/hay-kot/content/backend/pkgs/hasher" + "github.com/hay-kot/content/backend/pkgs/logger" ) const ( diff --git a/backend/app/api/v1/controller.go b/backend/app/api/v1/controller.go index 2d13045..b72cde7 100644 --- a/backend/app/api/v1/controller.go +++ b/backend/app/api/v1/controller.go @@ -1,8 +1,8 @@ package v1 import ( - "github.com/hay-kot/git-web-template/backend/internal/services" - "github.com/hay-kot/git-web-template/backend/pkgs/logger" + "github.com/hay-kot/content/backend/internal/services" + "github.com/hay-kot/content/backend/pkgs/logger" ) type V1Controller struct { diff --git a/backend/app/api/v1/main_test.go b/backend/app/api/v1/main_test.go index c9a1276..3713dee 100644 --- a/backend/app/api/v1/main_test.go +++ b/backend/app/api/v1/main_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - "github.com/hay-kot/git-web-template/backend/internal/mocks" - "github.com/hay-kot/git-web-template/backend/internal/mocks/factories" - "github.com/hay-kot/git-web-template/backend/internal/types" + "github.com/hay-kot/content/backend/internal/mocks" + "github.com/hay-kot/content/backend/internal/mocks/factories" + "github.com/hay-kot/content/backend/internal/types" ) var mockHandler = &V1Controller{} diff --git a/backend/app/api/v1/v1_ctrl_admin.go b/backend/app/api/v1/v1_ctrl_admin.go index 81afd43..4961c6b 100644 --- a/backend/app/api/v1/v1_ctrl_admin.go +++ b/backend/app/api/v1/v1_ctrl_admin.go @@ -6,11 +6,11 @@ import ( "github.com/go-chi/chi/v5" "github.com/google/uuid" - "github.com/hay-kot/git-web-template/backend/internal/services" - "github.com/hay-kot/git-web-template/backend/internal/types" - "github.com/hay-kot/git-web-template/backend/pkgs/hasher" - "github.com/hay-kot/git-web-template/backend/pkgs/logger" - "github.com/hay-kot/git-web-template/backend/pkgs/server" + "github.com/hay-kot/content/backend/internal/services" + "github.com/hay-kot/content/backend/internal/types" + "github.com/hay-kot/content/backend/pkgs/hasher" + "github.com/hay-kot/content/backend/pkgs/logger" + "github.com/hay-kot/content/backend/pkgs/server" ) // HandleAdminUserGetAll godoc diff --git a/backend/app/api/v1/v1_ctrl_admin_test.go b/backend/app/api/v1/v1_ctrl_admin_test.go index c0066c7..6c0d8e9 100644 --- a/backend/app/api/v1/v1_ctrl_admin_test.go +++ b/backend/app/api/v1/v1_ctrl_admin_test.go @@ -9,10 +9,10 @@ import ( "net/http/httptest" "testing" - "github.com/hay-kot/git-web-template/backend/internal/mocks/chimocker" - "github.com/hay-kot/git-web-template/backend/internal/mocks/factories" - "github.com/hay-kot/git-web-template/backend/internal/types" - "github.com/hay-kot/git-web-template/backend/pkgs/server" + "github.com/hay-kot/content/backend/internal/mocks/chimocker" + "github.com/hay-kot/content/backend/internal/mocks/factories" + "github.com/hay-kot/content/backend/internal/types" + "github.com/hay-kot/content/backend/pkgs/server" "github.com/stretchr/testify/assert" ) diff --git a/backend/app/api/v1/v1_ctrl_auth.go b/backend/app/api/v1/v1_ctrl_auth.go index f204e1e..c09e3f4 100644 --- a/backend/app/api/v1/v1_ctrl_auth.go +++ b/backend/app/api/v1/v1_ctrl_auth.go @@ -4,10 +4,10 @@ import ( "errors" "net/http" - "github.com/hay-kot/git-web-template/backend/internal/services" - "github.com/hay-kot/git-web-template/backend/internal/types" - "github.com/hay-kot/git-web-template/backend/pkgs/logger" - "github.com/hay-kot/git-web-template/backend/pkgs/server" + "github.com/hay-kot/content/backend/internal/services" + "github.com/hay-kot/content/backend/internal/types" + "github.com/hay-kot/content/backend/pkgs/logger" + "github.com/hay-kot/content/backend/pkgs/server" ) var ( diff --git a/backend/app/api/v1/v1_ctrl_user.go b/backend/app/api/v1/v1_ctrl_user.go index aed64b6..68c6be2 100644 --- a/backend/app/api/v1/v1_ctrl_user.go +++ b/backend/app/api/v1/v1_ctrl_user.go @@ -4,10 +4,10 @@ import ( "errors" "net/http" - "github.com/hay-kot/git-web-template/backend/internal/services" - "github.com/hay-kot/git-web-template/backend/internal/types" - "github.com/hay-kot/git-web-template/backend/pkgs/logger" - "github.com/hay-kot/git-web-template/backend/pkgs/server" + "github.com/hay-kot/content/backend/internal/services" + "github.com/hay-kot/content/backend/internal/types" + "github.com/hay-kot/content/backend/pkgs/logger" + "github.com/hay-kot/content/backend/pkgs/server" ) // HandleUserSelf godoc diff --git a/backend/app/generator/main.go b/backend/app/generator/main.go index d1d6efb..3cc45a6 100644 --- a/backend/app/generator/main.go +++ b/backend/app/generator/main.go @@ -4,9 +4,9 @@ import ( "time" "github.com/google/uuid" - "github.com/hay-kot/git-web-template/backend/ent" - "github.com/hay-kot/git-web-template/backend/internal/types" - "github.com/hay-kot/git-web-template/backend/pkgs/automapper" + "github.com/hay-kot/content/backend/ent" + "github.com/hay-kot/content/backend/internal/types" + "github.com/hay-kot/content/backend/pkgs/automapper" "github.com/tkrajina/typescriptify-golang-structs/typescriptify" ) diff --git a/backend/ent/authtokens.go b/backend/ent/authtokens.go index ecf611c..d318a43 100644 --- a/backend/ent/authtokens.go +++ b/backend/ent/authtokens.go @@ -9,8 +9,8 @@ import ( "entgo.io/ent/dialect/sql" "github.com/google/uuid" - "github.com/hay-kot/git-web-template/backend/ent/authtokens" - "github.com/hay-kot/git-web-template/backend/ent/user" + "github.com/hay-kot/content/backend/ent/authtokens" + "github.com/hay-kot/content/backend/ent/user" ) // AuthTokens is the model entity for the AuthTokens schema. diff --git a/backend/ent/authtokens/where.go b/backend/ent/authtokens/where.go index 5fda3f0..c38121f 100644 --- a/backend/ent/authtokens/where.go +++ b/backend/ent/authtokens/where.go @@ -7,7 +7,7 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" - "github.com/hay-kot/git-web-template/backend/ent/predicate" + "github.com/hay-kot/content/backend/ent/predicate" ) // ID filters vertices based on their ID field. diff --git a/backend/ent/authtokens_create.go b/backend/ent/authtokens_create.go index 4cca125..aa64a3a 100644 --- a/backend/ent/authtokens_create.go +++ b/backend/ent/authtokens_create.go @@ -11,8 +11,8 @@ import ( "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" "github.com/google/uuid" - "github.com/hay-kot/git-web-template/backend/ent/authtokens" - "github.com/hay-kot/git-web-template/backend/ent/user" + "github.com/hay-kot/content/backend/ent/authtokens" + "github.com/hay-kot/content/backend/ent/user" ) // AuthTokensCreate is the builder for creating a AuthTokens entity. diff --git a/backend/ent/authtokens_delete.go b/backend/ent/authtokens_delete.go index 123ee17..9cc1ee4 100644 --- a/backend/ent/authtokens_delete.go +++ b/backend/ent/authtokens_delete.go @@ -9,8 +9,8 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/hay-kot/git-web-template/backend/ent/authtokens" - "github.com/hay-kot/git-web-template/backend/ent/predicate" + "github.com/hay-kot/content/backend/ent/authtokens" + "github.com/hay-kot/content/backend/ent/predicate" ) // AuthTokensDelete is the builder for deleting a AuthTokens entity. diff --git a/backend/ent/authtokens_query.go b/backend/ent/authtokens_query.go index 9e309c8..7c3041b 100644 --- a/backend/ent/authtokens_query.go +++ b/backend/ent/authtokens_query.go @@ -12,9 +12,9 @@ import ( "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" "github.com/google/uuid" - "github.com/hay-kot/git-web-template/backend/ent/authtokens" - "github.com/hay-kot/git-web-template/backend/ent/predicate" - "github.com/hay-kot/git-web-template/backend/ent/user" + "github.com/hay-kot/content/backend/ent/authtokens" + "github.com/hay-kot/content/backend/ent/predicate" + "github.com/hay-kot/content/backend/ent/user" ) // AuthTokensQuery is the builder for querying AuthTokens entities. diff --git a/backend/ent/authtokens_update.go b/backend/ent/authtokens_update.go index 243db3f..f5a99c7 100644 --- a/backend/ent/authtokens_update.go +++ b/backend/ent/authtokens_update.go @@ -12,9 +12,9 @@ import ( "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" "github.com/google/uuid" - "github.com/hay-kot/git-web-template/backend/ent/authtokens" - "github.com/hay-kot/git-web-template/backend/ent/predicate" - "github.com/hay-kot/git-web-template/backend/ent/user" + "github.com/hay-kot/content/backend/ent/authtokens" + "github.com/hay-kot/content/backend/ent/predicate" + "github.com/hay-kot/content/backend/ent/user" ) // AuthTokensUpdate is the builder for updating AuthTokens entities. diff --git a/backend/ent/client.go b/backend/ent/client.go index c6cf533..2b31566 100644 --- a/backend/ent/client.go +++ b/backend/ent/client.go @@ -8,10 +8,10 @@ import ( "log" "github.com/google/uuid" - "github.com/hay-kot/git-web-template/backend/ent/migrate" + "github.com/hay-kot/content/backend/ent/migrate" - "github.com/hay-kot/git-web-template/backend/ent/authtokens" - "github.com/hay-kot/git-web-template/backend/ent/user" + "github.com/hay-kot/content/backend/ent/authtokens" + "github.com/hay-kot/content/backend/ent/user" "entgo.io/ent/dialect" "entgo.io/ent/dialect/sql" diff --git a/backend/ent/ent.go b/backend/ent/ent.go index 2568a4e..9e5990e 100644 --- a/backend/ent/ent.go +++ b/backend/ent/ent.go @@ -8,8 +8,8 @@ import ( "entgo.io/ent" "entgo.io/ent/dialect/sql" - "github.com/hay-kot/git-web-template/backend/ent/authtokens" - "github.com/hay-kot/git-web-template/backend/ent/user" + "github.com/hay-kot/content/backend/ent/authtokens" + "github.com/hay-kot/content/backend/ent/user" ) // ent aliases to avoid import conflicts in user's code. diff --git a/backend/ent/enttest/enttest.go b/backend/ent/enttest/enttest.go index cc6930e..4c398dc 100644 --- a/backend/ent/enttest/enttest.go +++ b/backend/ent/enttest/enttest.go @@ -5,9 +5,9 @@ package enttest import ( "context" - "github.com/hay-kot/git-web-template/backend/ent" + "github.com/hay-kot/content/backend/ent" // required by schema hooks. - _ "github.com/hay-kot/git-web-template/backend/ent/runtime" + _ "github.com/hay-kot/content/backend/ent/runtime" "entgo.io/ent/dialect/sql/schema" ) diff --git a/backend/ent/hook/hook.go b/backend/ent/hook/hook.go index 1eefec3..362c3cf 100644 --- a/backend/ent/hook/hook.go +++ b/backend/ent/hook/hook.go @@ -6,7 +6,7 @@ import ( "context" "fmt" - "github.com/hay-kot/git-web-template/backend/ent" + "github.com/hay-kot/content/backend/ent" ) // The AuthTokensFunc type is an adapter to allow the use of ordinary diff --git a/backend/ent/mutation.go b/backend/ent/mutation.go index 3705cb4..851990d 100644 --- a/backend/ent/mutation.go +++ b/backend/ent/mutation.go @@ -10,9 +10,9 @@ import ( "time" "github.com/google/uuid" - "github.com/hay-kot/git-web-template/backend/ent/authtokens" - "github.com/hay-kot/git-web-template/backend/ent/predicate" - "github.com/hay-kot/git-web-template/backend/ent/user" + "github.com/hay-kot/content/backend/ent/authtokens" + "github.com/hay-kot/content/backend/ent/predicate" + "github.com/hay-kot/content/backend/ent/user" "entgo.io/ent" ) diff --git a/backend/ent/runtime.go b/backend/ent/runtime.go index 828477f..9df6038 100644 --- a/backend/ent/runtime.go +++ b/backend/ent/runtime.go @@ -6,9 +6,9 @@ import ( "time" "github.com/google/uuid" - "github.com/hay-kot/git-web-template/backend/ent/authtokens" - "github.com/hay-kot/git-web-template/backend/ent/schema" - "github.com/hay-kot/git-web-template/backend/ent/user" + "github.com/hay-kot/content/backend/ent/authtokens" + "github.com/hay-kot/content/backend/ent/schema" + "github.com/hay-kot/content/backend/ent/user" ) // The init function reads all schema descriptors with runtime code diff --git a/backend/ent/runtime/runtime.go b/backend/ent/runtime/runtime.go index 31da890..3fc430e 100644 --- a/backend/ent/runtime/runtime.go +++ b/backend/ent/runtime/runtime.go @@ -2,7 +2,7 @@ package runtime -// The schema-stitching logic is generated in github.com/hay-kot/git-web-template/backend/ent/runtime.go +// The schema-stitching logic is generated in github.com/hay-kot/content/backend/ent/runtime.go const ( Version = "v0.10.0" // Version of ent codegen. diff --git a/backend/ent/user.go b/backend/ent/user.go index 62eaf8f..bb6f0b3 100644 --- a/backend/ent/user.go +++ b/backend/ent/user.go @@ -8,7 +8,7 @@ import ( "entgo.io/ent/dialect/sql" "github.com/google/uuid" - "github.com/hay-kot/git-web-template/backend/ent/user" + "github.com/hay-kot/content/backend/ent/user" ) // User is the model entity for the User schema. diff --git a/backend/ent/user/where.go b/backend/ent/user/where.go index 36db52a..e17ff3a 100644 --- a/backend/ent/user/where.go +++ b/backend/ent/user/where.go @@ -6,7 +6,7 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "github.com/google/uuid" - "github.com/hay-kot/git-web-template/backend/ent/predicate" + "github.com/hay-kot/content/backend/ent/predicate" ) // ID filters vertices based on their ID field. diff --git a/backend/ent/user_create.go b/backend/ent/user_create.go index 95ad932..696290d 100644 --- a/backend/ent/user_create.go +++ b/backend/ent/user_create.go @@ -10,8 +10,8 @@ import ( "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" "github.com/google/uuid" - "github.com/hay-kot/git-web-template/backend/ent/authtokens" - "github.com/hay-kot/git-web-template/backend/ent/user" + "github.com/hay-kot/content/backend/ent/authtokens" + "github.com/hay-kot/content/backend/ent/user" ) // UserCreate is the builder for creating a User entity. diff --git a/backend/ent/user_delete.go b/backend/ent/user_delete.go index 6c5aafc..96d5d52 100644 --- a/backend/ent/user_delete.go +++ b/backend/ent/user_delete.go @@ -9,8 +9,8 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/hay-kot/git-web-template/backend/ent/predicate" - "github.com/hay-kot/git-web-template/backend/ent/user" + "github.com/hay-kot/content/backend/ent/predicate" + "github.com/hay-kot/content/backend/ent/user" ) // UserDelete is the builder for deleting a User entity. diff --git a/backend/ent/user_query.go b/backend/ent/user_query.go index 804688d..a40d95d 100644 --- a/backend/ent/user_query.go +++ b/backend/ent/user_query.go @@ -13,9 +13,9 @@ import ( "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" "github.com/google/uuid" - "github.com/hay-kot/git-web-template/backend/ent/authtokens" - "github.com/hay-kot/git-web-template/backend/ent/predicate" - "github.com/hay-kot/git-web-template/backend/ent/user" + "github.com/hay-kot/content/backend/ent/authtokens" + "github.com/hay-kot/content/backend/ent/predicate" + "github.com/hay-kot/content/backend/ent/user" ) // UserQuery is the builder for querying User entities. diff --git a/backend/ent/user_update.go b/backend/ent/user_update.go index d532fc5..9a6a3cb 100644 --- a/backend/ent/user_update.go +++ b/backend/ent/user_update.go @@ -10,9 +10,9 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/hay-kot/git-web-template/backend/ent/authtokens" - "github.com/hay-kot/git-web-template/backend/ent/predicate" - "github.com/hay-kot/git-web-template/backend/ent/user" + "github.com/hay-kot/content/backend/ent/authtokens" + "github.com/hay-kot/content/backend/ent/predicate" + "github.com/hay-kot/content/backend/ent/user" ) // UserUpdate is the builder for updating User entities. diff --git a/backend/go.mod b/backend/go.mod index 71654b3..7549d09 100644 --- a/backend/go.mod +++ b/backend/go.mod @@ -1,4 +1,4 @@ -module github.com/hay-kot/git-web-template/backend +module github.com/hay-kot/content/backend go 1.18 diff --git a/backend/go.sum b/backend/go.sum index 980a7f8..cc23f5f 100644 --- a/backend/go.sum +++ b/backend/go.sum @@ -1,20 +1,12 @@ -ariga.io/atlas v0.3.2-0.20220120225051-c3fac7d636dd h1:YxnJl3ySvwQ3C7Rspa4CrQtwrftTZ0F8WJ36CvY7nWE= -ariga.io/atlas v0.3.2-0.20220120225051-c3fac7d636dd/go.mod h1:XcLUpQX7Cq4qtagEHIleq3MJaBeeJ76BS8doc4gkOJk= ariga.io/atlas v0.6.3 h1:MtT4OxHqkW0XgYRjvqU4bmmv+42U1lvw9u8HzJ8yK9c= ariga.io/atlas v0.6.3/go.mod h1:ft47uSh5hWGDCmQC9DsztZg6Xk+KagM5Ts/mZYKb9JE= -entgo.io/ent v0.10.0 h1:9cBomE1fh+WX34DPYQL7tDNAIvhKa3tXvwxuLyhYCMo= -entgo.io/ent v0.10.0/go.mod h1:5bjIYdTizykmdtPY3knXrrGpxAh0cMjFfxdNnlNiUGU= entgo.io/ent v0.11.2 h1:UM2/BUhF2FfsxPHRxLjQbhqJNaDdVlOwNIAMLs2jyto= entgo.io/ent v0.11.2/go.mod h1:YGHEQnmmIUgtD5b1ICD5vg74dS3npkNnmC5K+0J+IHU= github.com/DATA-DOG/go-sqlmock v1.5.0 h1:Shsta01QNfFxHCfpW6YH2STWB0MudeXXEWMr20OEh60= github.com/KyleBanks/depth v1.2.1 h1:5h8fQADFrWtarTdtDudMmGsC7GPbOAu6RVB3ffsVFHc= github.com/KyleBanks/depth v1.2.1/go.mod h1:jzSb9d0L43HxTQfT+oSA1EEp2q+ne2uh6XgeJcm8brE= -github.com/agext/levenshtein v1.2.1 h1:QmvMAjj2aEICytGiWzmxoE0x2KZvE0fvmqMOfy2tjT8= -github.com/agext/levenshtein v1.2.1/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558= github.com/agext/levenshtein v1.2.3 h1:YB2fHEn0UJagG8T1rrWknE3ZQzWM06O8AMAatNn7lmo= github.com/agext/levenshtein v1.2.3/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558= -github.com/apparentlymart/go-dump v0.0.0-20180507223929-23540a00eaa3/go.mod h1:oL81AME2rN47vu18xqj1S1jPIPuN7afo62yKTNn3XMM= -github.com/apparentlymart/go-textseg v1.0.0/go.mod h1:z96Txxhf3xSFMPmb5X/1W05FF/Nj9VFpLOpjS5yuumk= github.com/apparentlymart/go-textseg/v13 v13.0.0 h1:Y+KvPE1NYz0xl601PVImeQfFyEy6iT90AvPUL1NNfNw= github.com/apparentlymart/go-textseg/v13 v13.0.0/go.mod h1:ZK2fH7c4NqDTLtiYLvIkEghdlcqw7yxLeM89kiTRPUo= github.com/ardanlabs/conf/v2 v2.2.0 h1:ar1+TYIYAh2Tdeg2DQroh7ruR56/vJR8BDfzDIrXgtk= @@ -32,30 +24,18 @@ github.com/go-openapi/jsonpointer v0.19.5 h1:gZr+CIYByUqjcgeLXnQu2gHYQC9o73G2XUe github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= github.com/go-openapi/jsonreference v0.20.0 h1:MYlu0sBgChmCfJxxUKZ8g1cPWFOB37YSZqewK7OKeyA= github.com/go-openapi/jsonreference v0.20.0/go.mod h1:Ag74Ico3lPc+zR+qjn4XBUmXymS4zJbYVCZmcgkasdo= -github.com/go-openapi/spec v0.20.6 h1:ich1RQ3WDbfoeTqTAb+5EIxNmpKVJZWBNah9RAT0jIQ= -github.com/go-openapi/spec v0.20.6/go.mod h1:2OpW+JddWPrpXSCIX8eOx7lZ5iyuWj3RYR6VaaBKcWA= github.com/go-openapi/spec v0.20.7 h1:1Rlu/ZrOCCob0n+JKKJAWhNWMPW8bOZRg8FJaY+0SKI= github.com/go-openapi/spec v0.20.7/go.mod h1:2OpW+JddWPrpXSCIX8eOx7lZ5iyuWj3RYR6VaaBKcWA= github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-openapi/swag v0.19.15/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= -github.com/go-openapi/swag v0.21.1 h1:wm0rhTb5z7qpJRHBdPOMuY4QjVUMbF6/kwoYeRAOrKU= -github.com/go-openapi/swag v0.21.1/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= github.com/go-openapi/swag v0.22.3 h1:yMBqmnQ0gyZvEb/+KzuWZOXgllrXT4SADYbvDaXHv/g= github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14= github.com/go-test/deep v1.0.3 h1:ZrJSEWsXzPOxaZnFteGEfooLba+ju3FYIbOrS+rQd68= -github.com/go-test/deep v1.0.3/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA= -github.com/golang/protobuf v1.1.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ= -github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/hashicorp/hcl/v2 v2.10.0 h1:1S1UnuhDGlv3gRFV4+0EdwB+znNP5HmcGbIqwnSCByg= -github.com/hashicorp/hcl/v2 v2.10.0/go.mod h1:FwWsfWEjyV/CMj8s/gqAuiviY72rJ1/oayI9WftqcKg= github.com/hashicorp/hcl/v2 v2.13.0 h1:0Apadu1w6M11dyGFxWnmhhcMjkbAiKCv7G1r/2QgCNc= github.com/hashicorp/hcl/v2 v2.13.0/go.mod h1:e4z5nxYlWNPdDSNYX+ph14EvWYMFm3eP0zIUqPc2jr0= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= @@ -68,119 +48,66 @@ github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348 h1:MtvEpTB6LX3vkb4ax0b5D2DHbNAUsen0Gx5wZoq3lV4= -github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k= github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= -github.com/mattn/go-sqlite3 v1.14.10 h1:MLn+5bFRlWMGoSRmJour3CL1w/qL96mvipqpwQW/Sfk= -github.com/mattn/go-sqlite3 v1.14.10/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= github.com/mattn/go-sqlite3 v1.14.15 h1:vfoHhTN1af61xCRSWzFIWzx2YskyMTwHLrExkBOjvxI= github.com/mattn/go-sqlite3 v1.14.15/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg= -github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7 h1:DpOJ2HYzCv8LZP15IdmG+YdwD2luVPHITV96TkirNBM= -github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo= github.com/mitchellh/go-wordwrap v1.0.1 h1:TLuKupo69TCn6TQSyGxwI1EblZZEsQ0vMlAFQflz0v0= github.com/mitchellh/go-wordwrap v1.0.1/go.mod h1:R62XHJLzvMFRBbcrT7m7WgmE1eOyTSsCt+hzestvNj0= -github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ= -github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= -github.com/spf13/pflag v1.0.2/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= -github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.1-0.20210427113832-6241f9ab9942 h1:t0lM6y/M5IiUZyvbBTcngso8SZEZICH7is9B6g/obVU= -github.com/stretchr/testify v1.7.1-0.20210427113832-6241f9ab9942/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/swaggo/files v0.0.0-20220610200504-28940afbdbfe h1:K8pHPVoTgxFJt1lXuIzzOX7zZhZFldJQK/CgKx9BFIc= -github.com/swaggo/files v0.0.0-20220610200504-28940afbdbfe/go.mod h1:lKJPbtWzJ9JhsTN1k1gZgleJWY/cqq0psdoMmaThG3w= github.com/swaggo/files v0.0.0-20220728132757-551d4a08d97a h1:kAe4YSu0O0UFn1DowNo2MY5p6xzqtJ/wQ7LZynSvGaY= github.com/swaggo/files v0.0.0-20220728132757-551d4a08d97a/go.mod h1:lKJPbtWzJ9JhsTN1k1gZgleJWY/cqq0psdoMmaThG3w= -github.com/swaggo/http-swagger v1.3.0 h1:1+6M4qRorIbdyTWTsGrwnb0r9jGK5dcWN82O6oY/yHQ= -github.com/swaggo/http-swagger v1.3.0/go.mod h1:9glekdg40lwclrrKNRGgj/IMDxpNPZ3kzab4oPcF8EM= github.com/swaggo/http-swagger v1.3.3 h1:Hu5Z0L9ssyBLofaama21iYaF2VbWyA8jdohaaCGpHsc= github.com/swaggo/http-swagger v1.3.3/go.mod h1:sE+4PjD89IxMPm77FnkDz0sdO+p5lbXzrVWT6OTVVGo= -github.com/swaggo/swag v1.8.3 h1:3pZSSCQ//gAH88lfmxM3Cd1+JCsxV8Md6f36b9hrZ5s= -github.com/swaggo/swag v1.8.3/go.mod h1:jMLeXOOmYyjk8PvHTsXBdrubsNd9gUJTTCzL5iBnseg= github.com/swaggo/swag v1.8.5 h1:7NgtfXsXE+jrcOwRyiftGKW7Ppydj7tZiVenuRf1fE4= github.com/swaggo/swag v1.8.5/go.mod h1:jMLeXOOmYyjk8PvHTsXBdrubsNd9gUJTTCzL5iBnseg= -github.com/tkrajina/go-reflector v0.5.5 h1:gwoQFNye30Kk7NrExj8zm3zFtrGPqOkzFMLuQZg1DtQ= github.com/tkrajina/go-reflector v0.5.5/go.mod h1:ECbqLgccecY5kPmPmXg1MrHW585yMcDkVl6IvJe64T4= github.com/tkrajina/go-reflector v0.5.6 h1:hKQ0gyocG7vgMD2M3dRlYN6WBBOmdoOzJ6njQSepKdE= github.com/tkrajina/go-reflector v0.5.6/go.mod h1:ECbqLgccecY5kPmPmXg1MrHW585yMcDkVl6IvJe64T4= -github.com/tkrajina/typescriptify-golang-structs v0.1.7 h1:72jmiT/brlgtCPpwu4X0HkhMeUMtx8+xDiTMS93rFqY= -github.com/tkrajina/typescriptify-golang-structs v0.1.7/go.mod h1:sjU00nti/PMEOZb07KljFlR+lJ+RotsC0GBQMv9EKls= github.com/tkrajina/typescriptify-golang-structs v0.1.8 h1:p7nZ9GP86w5Jh/sWamy9NP7BM03NrHqAAm7elHa/PdA= github.com/tkrajina/typescriptify-golang-structs v0.1.8/go.mod h1:sjU00nti/PMEOZb07KljFlR+lJ+RotsC0GBQMv9EKls= -github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk= -github.com/vmihailenco/msgpack/v4 v4.3.12/go.mod h1:gborTTJjAo/GWTqqRjrLCn9pgNN+NXzzngzBKDPIqw4= -github.com/vmihailenco/tagparser v0.1.1/go.mod h1:OeAg3pn3UbLjkWt+rN9oFYB6u/cQgqMEUPoW2WPyhdI= -github.com/zclconf/go-cty v1.2.0/go.mod h1:hOPWgoHbaTUnI5k4D2ld+GRpFJSCe6bCM7m1q/N4PQ8= -github.com/zclconf/go-cty v1.8.0 h1:s4AvqaeQzJIu3ndv4gVIhplVD0krU+bgrcLSVUnaWuA= -github.com/zclconf/go-cty v1.8.0/go.mod h1:vVKLxnk3puL4qRAv72AO+W99LUD4da90g3uUAzyuvAk= github.com/zclconf/go-cty v1.11.0 h1:726SxLdi2SDnjY+BStqB9J1hNp4+2WlzyXLuimibIe0= github.com/zclconf/go-cty v1.11.0/go.mod h1:s9IfD1LK5ccNMSWCVFCE2rJfHiZgi7JijgeWIMfhLvA= -github.com/zclconf/go-cty-debug v0.0.0-20191215020915-b22d67c1ba0b/go.mod h1:ZRKQfBXbGkpdV6QMzT3rU1kSTAnfu1dO8dPKjYprgj8= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 h1:7I4JAnoQBe7ZtJcBaYHi5UtiO8tQHbUSXxL+pnGRANg= -golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90 h1:Y/gsMcFOcR+6S6f3YeMKl5g+dZMEWqcz5Czj/GWYbkM= golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/net v0.0.0-20180811021610-c39426892332/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= -golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20220706163947-c90051bbdb60 h1:8NSylCMxLW4JvserAndSgFL7aPli6A68yf0bYFTcWCM= -golang.org/x/net v0.0.0-20220706163947-c90051bbdb60/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.0.0-20220826154423-83b083e8dc8b h1:ZmngSVLe/wycRns9MKikG9OWIEjGcGAkacif7oYQaUY= golang.org/x/net v0.0.0-20220826154423-83b083e8dc8b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= -golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190502175342-a43fa875dd82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e h1:CsOuNlbOuf0mzxJIefr6Q4uAUetRUwZE4qt7VfzP+xo= -golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220829200755-d48e67d00261 h1:v6hYoSR9T5oet+pMXwUWkbiVqx/63mlHjefrHmxwfeY= golang.org/x/sys v0.0.0-20220829200755-d48e67d00261/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= -golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.1.11 h1:loJ25fNOEhSXfHrpoGj91eCUThwdNX6u24rO1xnNteY= -golang.org/x/tools v0.1.11/go.mod h1:SgwaegtQh8clINPpECJMqnxLv9I09HLqnW3RMqW0CA4= golang.org/x/tools v0.1.13-0.20220804200503-81c7dc4e4efa h1:uKcci2q7Qtp6nMTC/AAvfNUAldFtJuHWV9/5QWiypts= golang.org/x/tools v0.1.13-0.20220804200503-81c7dc4e4efa/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= -google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= -google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU= gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= -gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/backend/internal/mapper/users_automapper.go b/backend/internal/mapper/users_automapper.go index 4f97e09..78392f1 100644 --- a/backend/internal/mapper/users_automapper.go +++ b/backend/internal/mapper/users_automapper.go @@ -2,8 +2,8 @@ package mapper import ( - "github.com/hay-kot/git-web-template/backend/ent" - "github.com/hay-kot/git-web-template/backend/internal/types" + "github.com/hay-kot/content/backend/ent" + "github.com/hay-kot/content/backend/internal/types" ) func UserOutFromModel(from ent.User) types.UserOut { diff --git a/backend/internal/mocks/factories/users.go b/backend/internal/mocks/factories/users.go index 1642a7a..438b2d8 100644 --- a/backend/internal/mocks/factories/users.go +++ b/backend/internal/mocks/factories/users.go @@ -1,8 +1,8 @@ package factories import ( - "github.com/hay-kot/git-web-template/backend/internal/types" - "github.com/hay-kot/git-web-template/backend/pkgs/faker" + "github.com/hay-kot/content/backend/internal/types" + "github.com/hay-kot/content/backend/pkgs/faker" ) func UserFactory() types.UserCreate { diff --git a/backend/internal/mocks/mock_logger.go b/backend/internal/mocks/mock_logger.go index d367161..c3f0a1f 100644 --- a/backend/internal/mocks/mock_logger.go +++ b/backend/internal/mocks/mock_logger.go @@ -3,7 +3,7 @@ package mocks import ( "os" - "github.com/hay-kot/git-web-template/backend/pkgs/logger" + "github.com/hay-kot/content/backend/pkgs/logger" ) func GetStructLogger() *logger.Logger { diff --git a/backend/internal/mocks/mocker_services.go b/backend/internal/mocks/mocker_services.go index 3011fb1..e44b464 100644 --- a/backend/internal/mocks/mocker_services.go +++ b/backend/internal/mocks/mocker_services.go @@ -1,8 +1,8 @@ package mocks import ( - "github.com/hay-kot/git-web-template/backend/internal/repo" - "github.com/hay-kot/git-web-template/backend/internal/services" + "github.com/hay-kot/content/backend/internal/repo" + "github.com/hay-kot/content/backend/internal/services" ) func GetMockServices(repos *repo.AllRepos) *services.AllServices { diff --git a/backend/internal/mocks/mocks_ent_repo.go b/backend/internal/mocks/mocks_ent_repo.go index 9273502..e0b7e81 100644 --- a/backend/internal/mocks/mocks_ent_repo.go +++ b/backend/internal/mocks/mocks_ent_repo.go @@ -3,8 +3,8 @@ package mocks import ( "context" - "github.com/hay-kot/git-web-template/backend/ent" - "github.com/hay-kot/git-web-template/backend/internal/repo" + "github.com/hay-kot/content/backend/ent" + "github.com/hay-kot/content/backend/internal/repo" _ "github.com/mattn/go-sqlite3" ) diff --git a/backend/internal/repo/main_test.go b/backend/internal/repo/main_test.go index f516bc5..a28d0ef 100644 --- a/backend/internal/repo/main_test.go +++ b/backend/internal/repo/main_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/hay-kot/git-web-template/backend/ent" + "github.com/hay-kot/content/backend/ent" _ "github.com/mattn/go-sqlite3" ) diff --git a/backend/internal/repo/repos_all.go b/backend/internal/repo/repos_all.go index faf50ee..7703aa3 100644 --- a/backend/internal/repo/repos_all.go +++ b/backend/internal/repo/repos_all.go @@ -1,6 +1,6 @@ package repo -import "github.com/hay-kot/git-web-template/backend/ent" +import "github.com/hay-kot/content/backend/ent" // AllRepos is a container for all the repository interfaces type AllRepos struct { diff --git a/backend/internal/repo/token_ent.go b/backend/internal/repo/token_ent.go index f96ed7c..7f3807d 100644 --- a/backend/internal/repo/token_ent.go +++ b/backend/internal/repo/token_ent.go @@ -4,10 +4,10 @@ import ( "context" "time" - "github.com/hay-kot/git-web-template/backend/ent" - "github.com/hay-kot/git-web-template/backend/ent/authtokens" - "github.com/hay-kot/git-web-template/backend/internal/mapper" - "github.com/hay-kot/git-web-template/backend/internal/types" + "github.com/hay-kot/content/backend/ent" + "github.com/hay-kot/content/backend/ent/authtokens" + "github.com/hay-kot/content/backend/internal/mapper" + "github.com/hay-kot/content/backend/internal/types" ) type EntTokenRepository struct { diff --git a/backend/internal/repo/token_ent_test.go b/backend/internal/repo/token_ent_test.go index ae01a5a..88584ef 100644 --- a/backend/internal/repo/token_ent_test.go +++ b/backend/internal/repo/token_ent_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - "github.com/hay-kot/git-web-template/backend/internal/types" - "github.com/hay-kot/git-web-template/backend/pkgs/hasher" + "github.com/hay-kot/content/backend/internal/types" + "github.com/hay-kot/content/backend/pkgs/hasher" "github.com/stretchr/testify/assert" ) diff --git a/backend/internal/repo/token_interface.go b/backend/internal/repo/token_interface.go index 4396063..f610d9d 100644 --- a/backend/internal/repo/token_interface.go +++ b/backend/internal/repo/token_interface.go @@ -3,7 +3,7 @@ package repo import ( "context" - "github.com/hay-kot/git-web-template/backend/internal/types" + "github.com/hay-kot/content/backend/internal/types" ) type TokenRepository interface { diff --git a/backend/internal/repo/users_ent.go b/backend/internal/repo/users_ent.go index 0131ea7..632c0fb 100644 --- a/backend/internal/repo/users_ent.go +++ b/backend/internal/repo/users_ent.go @@ -4,9 +4,9 @@ import ( "context" "github.com/google/uuid" - "github.com/hay-kot/git-web-template/backend/ent" - "github.com/hay-kot/git-web-template/backend/ent/user" - "github.com/hay-kot/git-web-template/backend/internal/types" + "github.com/hay-kot/content/backend/ent" + "github.com/hay-kot/content/backend/ent/user" + "github.com/hay-kot/content/backend/internal/types" ) type EntUserRepository struct { diff --git a/backend/internal/repo/users_ent_test.go b/backend/internal/repo/users_ent_test.go index 01a228e..2bf9687 100644 --- a/backend/internal/repo/users_ent_test.go +++ b/backend/internal/repo/users_ent_test.go @@ -5,8 +5,8 @@ import ( "fmt" "testing" - "github.com/hay-kot/git-web-template/backend/internal/types" - "github.com/hay-kot/git-web-template/backend/pkgs/faker" + "github.com/hay-kot/content/backend/internal/types" + "github.com/hay-kot/content/backend/pkgs/faker" "github.com/stretchr/testify/assert" ) diff --git a/backend/internal/repo/users_interface.go b/backend/internal/repo/users_interface.go index 161850d..2e594ba 100644 --- a/backend/internal/repo/users_interface.go +++ b/backend/internal/repo/users_interface.go @@ -4,7 +4,7 @@ import ( "context" "github.com/google/uuid" - "github.com/hay-kot/git-web-template/backend/internal/types" + "github.com/hay-kot/content/backend/internal/types" ) type UserRepository interface { diff --git a/backend/internal/services/all.go b/backend/internal/services/all.go index 3d4273d..39bc690 100644 --- a/backend/internal/services/all.go +++ b/backend/internal/services/all.go @@ -1,6 +1,6 @@ package services -import "github.com/hay-kot/git-web-template/backend/internal/repo" +import "github.com/hay-kot/content/backend/internal/repo" type AllServices struct { User *UserService diff --git a/backend/internal/services/contexts.go b/backend/internal/services/contexts.go index d6a0968..bc18fcc 100644 --- a/backend/internal/services/contexts.go +++ b/backend/internal/services/contexts.go @@ -3,7 +3,7 @@ package services import ( "context" - "github.com/hay-kot/git-web-template/backend/internal/types" + "github.com/hay-kot/content/backend/internal/types" ) type contextKeys struct { diff --git a/backend/internal/services/contexts_test.go b/backend/internal/services/contexts_test.go index 9cae289..cf5a862 100644 --- a/backend/internal/services/contexts_test.go +++ b/backend/internal/services/contexts_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/google/uuid" - "github.com/hay-kot/git-web-template/backend/internal/types" + "github.com/hay-kot/content/backend/internal/types" "github.com/stretchr/testify/assert" ) diff --git a/backend/internal/services/service_admin.go b/backend/internal/services/service_admin.go index 3d60c18..6fda029 100644 --- a/backend/internal/services/service_admin.go +++ b/backend/internal/services/service_admin.go @@ -4,8 +4,8 @@ import ( "context" "github.com/google/uuid" - "github.com/hay-kot/git-web-template/backend/internal/repo" - "github.com/hay-kot/git-web-template/backend/internal/types" + "github.com/hay-kot/content/backend/internal/repo" + "github.com/hay-kot/content/backend/internal/types" ) type AdminService struct { diff --git a/backend/internal/services/service_user.go b/backend/internal/services/service_user.go index 4dfbc74..0bb8d5f 100644 --- a/backend/internal/services/service_user.go +++ b/backend/internal/services/service_user.go @@ -6,9 +6,9 @@ import ( "time" "github.com/google/uuid" - "github.com/hay-kot/git-web-template/backend/internal/repo" - "github.com/hay-kot/git-web-template/backend/internal/types" - "github.com/hay-kot/git-web-template/backend/pkgs/hasher" + "github.com/hay-kot/content/backend/internal/repo" + "github.com/hay-kot/content/backend/internal/types" + "github.com/hay-kot/content/backend/pkgs/hasher" ) var ( diff --git a/backend/pkgs/server/response_error_builder_test.go b/backend/pkgs/server/response_error_builder_test.go index 012e744..b556a18 100644 --- a/backend/pkgs/server/response_error_builder_test.go +++ b/backend/pkgs/server/response_error_builder_test.go @@ -7,7 +7,7 @@ import ( "net/http/httptest" "testing" - "github.com/hay-kot/git-web-template/backend/pkgs/faker" + "github.com/hay-kot/content/backend/pkgs/faker" "github.com/stretchr/testify/assert" )