From 0980ee41cfa7c71a21b0e155b530d4132d8e0ac6 Mon Sep 17 00:00:00 2001 From: Matthew Kilgore Date: Tue, 18 Jun 2024 19:22:15 -0400 Subject: [PATCH] chore(backend): update go namespaces --- Dockerfile.rootless | 2 +- backend/app/api/app.go | 12 +++---- backend/app/api/demo.go | 2 +- backend/app/api/handlers/v1/controller.go | 6 ++-- backend/app/api/handlers/v1/partials.go | 2 +- .../app/api/handlers/v1/v1_ctrl_actions.go | 4 +-- backend/app/api/handlers/v1/v1_ctrl_assets.go | 6 ++-- backend/app/api/handlers/v1/v1_ctrl_auth.go | 4 +-- backend/app/api/handlers/v1/v1_ctrl_group.go | 8 ++--- backend/app/api/handlers/v1/v1_ctrl_items.go | 8 ++--- .../handlers/v1/v1_ctrl_items_attachments.go | 8 ++--- backend/app/api/handlers/v1/v1_ctrl_labels.go | 6 ++-- .../app/api/handlers/v1/v1_ctrl_locations.go | 6 ++-- .../api/handlers/v1/v1_ctrl_maint_entry.go | 6 ++-- .../app/api/handlers/v1/v1_ctrl_notifiers.go | 6 ++-- backend/app/api/handlers/v1/v1_ctrl_qrcode.go | 2 +- .../app/api/handlers/v1/v1_ctrl_reporting.go | 2 +- .../app/api/handlers/v1/v1_ctrl_statistics.go | 8 ++--- backend/app/api/handlers/v1/v1_ctrl_user.go | 6 ++-- backend/app/api/logger.go | 2 +- backend/app/api/main.go | 20 +++++------ backend/app/api/middleware.go | 8 ++--- backend/app/api/providers/extractors.go | 2 +- backend/app/api/providers/local.go | 2 +- backend/app/api/routes.go | 12 +++---- backend/app/tools/migrations/main.go | 2 +- backend/go.mod | 2 +- backend/internal/core/services/all.go | 2 +- backend/internal/core/services/contexts.go | 2 +- .../internal/core/services/contexts_test.go | 2 +- backend/internal/core/services/main_test.go | 10 +++--- .../core/services/reporting/io_row.go | 2 +- .../core/services/reporting/io_sheet_test.go | 2 +- .../core/services/service_background.go | 4 +-- .../internal/core/services/service_group.go | 4 +-- .../internal/core/services/service_items.go | 4 +-- .../services/service_items_attachments.go | 2 +- .../service_items_attachments_test.go | 2 +- .../internal/core/services/service_user.go | 6 ++-- .../core/services/service_user_defaults.go | 2 +- backend/internal/web/adapters/decoders.go | 2 +- backend/internal/web/mid/errors.go | 4 +-- frontend/pnpm-lock.yaml | 36 ------------------- 43 files changed, 102 insertions(+), 138 deletions(-) diff --git a/Dockerfile.rootless b/Dockerfile.rootless index 27077833..bfa056ee 100644 --- a/Dockerfile.rootless +++ b/Dockerfile.rootless @@ -1,6 +1,6 @@ # Build Nuxt -FROM node:17-alpine as frontend-builder +FROM node:18-alpine as frontend-builder WORKDIR /app RUN npm install -g pnpm COPY frontend/package.json frontend/pnpm-lock.yaml ./ diff --git a/backend/app/api/app.go b/backend/app/api/app.go index 5d285d3c..31910750 100644 --- a/backend/app/api/app.go +++ b/backend/app/api/app.go @@ -1,12 +1,12 @@ package main import ( - "github.com/hay-kot/homebox/backend/internal/core/services" - "github.com/hay-kot/homebox/backend/internal/core/services/reporting/eventbus" - "github.com/hay-kot/homebox/backend/internal/data/ent" - "github.com/hay-kot/homebox/backend/internal/data/repo" - "github.com/hay-kot/homebox/backend/internal/sys/config" - "github.com/hay-kot/homebox/backend/pkgs/mailer" + "github.com/sysadminsmedia/homebox/backend/internal/core/services" + "github.com/sysadminsmedia/homebox/backend/internal/core/services/reporting/eventbus" + "github.com/sysadminsmedia/homebox/backend/internal/data/ent" + "github.com/sysadminsmedia/homebox/backend/internal/data/repo" + "github.com/sysadminsmedia/homebox/backend/internal/sys/config" + "github.com/sysadminsmedia/homebox/backend/pkgs/mailer" ) type app struct { diff --git a/backend/app/api/demo.go b/backend/app/api/demo.go index 183e0e00..7a62b558 100644 --- a/backend/app/api/demo.go +++ b/backend/app/api/demo.go @@ -5,8 +5,8 @@ import ( "strings" "time" - "github.com/hay-kot/homebox/backend/internal/core/services" "github.com/rs/zerolog/log" + "github.com/sysadminsmedia/homebox/backend/internal/core/services" ) func (a *app) SetupDemo() { diff --git a/backend/app/api/handlers/v1/controller.go b/backend/app/api/handlers/v1/controller.go index eb602125..36dd5539 100644 --- a/backend/app/api/handlers/v1/controller.go +++ b/backend/app/api/handlers/v1/controller.go @@ -7,12 +7,12 @@ import ( "time" "github.com/google/uuid" - "github.com/hay-kot/homebox/backend/internal/core/services" - "github.com/hay-kot/homebox/backend/internal/core/services/reporting/eventbus" - "github.com/hay-kot/homebox/backend/internal/data/repo" "github.com/hay-kot/httpkit/errchain" "github.com/hay-kot/httpkit/server" "github.com/rs/zerolog/log" + "github.com/sysadminsmedia/homebox/backend/internal/core/services" + "github.com/sysadminsmedia/homebox/backend/internal/core/services/reporting/eventbus" + "github.com/sysadminsmedia/homebox/backend/internal/data/repo" "github.com/olahol/melody" ) diff --git a/backend/app/api/handlers/v1/partials.go b/backend/app/api/handlers/v1/partials.go index 5c81ad5f..f9e3841f 100644 --- a/backend/app/api/handlers/v1/partials.go +++ b/backend/app/api/handlers/v1/partials.go @@ -5,7 +5,7 @@ import ( "github.com/go-chi/chi/v5" "github.com/google/uuid" - "github.com/hay-kot/homebox/backend/internal/sys/validate" + "github.com/sysadminsmedia/homebox/backend/internal/sys/validate" ) // routeID extracts the ID from the request URL. If the ID is not in a valid diff --git a/backend/app/api/handlers/v1/v1_ctrl_actions.go b/backend/app/api/handlers/v1/v1_ctrl_actions.go index 75f39a58..2ae25f02 100644 --- a/backend/app/api/handlers/v1/v1_ctrl_actions.go +++ b/backend/app/api/handlers/v1/v1_ctrl_actions.go @@ -5,11 +5,11 @@ import ( "net/http" "github.com/google/uuid" - "github.com/hay-kot/homebox/backend/internal/core/services" - "github.com/hay-kot/homebox/backend/internal/sys/validate" "github.com/hay-kot/httpkit/errchain" "github.com/hay-kot/httpkit/server" "github.com/rs/zerolog/log" + "github.com/sysadminsmedia/homebox/backend/internal/core/services" + "github.com/sysadminsmedia/homebox/backend/internal/sys/validate" ) type ActionAmountResult struct { diff --git a/backend/app/api/handlers/v1/v1_ctrl_assets.go b/backend/app/api/handlers/v1/v1_ctrl_assets.go index 39cbc75c..9e3e8ab5 100644 --- a/backend/app/api/handlers/v1/v1_ctrl_assets.go +++ b/backend/app/api/handlers/v1/v1_ctrl_assets.go @@ -6,11 +6,11 @@ import ( "strings" "github.com/go-chi/chi/v5" - "github.com/hay-kot/homebox/backend/internal/core/services" - "github.com/hay-kot/homebox/backend/internal/data/repo" - "github.com/hay-kot/homebox/backend/internal/sys/validate" "github.com/hay-kot/httpkit/errchain" "github.com/hay-kot/httpkit/server" + "github.com/sysadminsmedia/homebox/backend/internal/core/services" + "github.com/sysadminsmedia/homebox/backend/internal/data/repo" + "github.com/sysadminsmedia/homebox/backend/internal/sys/validate" "github.com/rs/zerolog/log" ) diff --git a/backend/app/api/handlers/v1/v1_ctrl_auth.go b/backend/app/api/handlers/v1/v1_ctrl_auth.go index 47b69fdc..de5b6c2b 100644 --- a/backend/app/api/handlers/v1/v1_ctrl_auth.go +++ b/backend/app/api/handlers/v1/v1_ctrl_auth.go @@ -7,11 +7,11 @@ import ( "strings" "time" - "github.com/hay-kot/homebox/backend/internal/core/services" - "github.com/hay-kot/homebox/backend/internal/sys/validate" "github.com/hay-kot/httpkit/errchain" "github.com/hay-kot/httpkit/server" "github.com/rs/zerolog/log" + "github.com/sysadminsmedia/homebox/backend/internal/core/services" + "github.com/sysadminsmedia/homebox/backend/internal/sys/validate" ) const ( diff --git a/backend/app/api/handlers/v1/v1_ctrl_group.go b/backend/app/api/handlers/v1/v1_ctrl_group.go index 69bc0249..62de9165 100644 --- a/backend/app/api/handlers/v1/v1_ctrl_group.go +++ b/backend/app/api/handlers/v1/v1_ctrl_group.go @@ -4,11 +4,11 @@ import ( "net/http" "time" - "github.com/hay-kot/homebox/backend/internal/core/services" - "github.com/hay-kot/homebox/backend/internal/data/repo" - "github.com/hay-kot/homebox/backend/internal/sys/validate" - "github.com/hay-kot/homebox/backend/internal/web/adapters" "github.com/hay-kot/httpkit/errchain" + "github.com/sysadminsmedia/homebox/backend/internal/core/services" + "github.com/sysadminsmedia/homebox/backend/internal/data/repo" + "github.com/sysadminsmedia/homebox/backend/internal/sys/validate" + "github.com/sysadminsmedia/homebox/backend/internal/web/adapters" ) type ( diff --git a/backend/app/api/handlers/v1/v1_ctrl_items.go b/backend/app/api/handlers/v1/v1_ctrl_items.go index 6a25663f..272011f8 100644 --- a/backend/app/api/handlers/v1/v1_ctrl_items.go +++ b/backend/app/api/handlers/v1/v1_ctrl_items.go @@ -8,13 +8,13 @@ import ( "strings" "github.com/google/uuid" - "github.com/hay-kot/homebox/backend/internal/core/services" - "github.com/hay-kot/homebox/backend/internal/data/repo" - "github.com/hay-kot/homebox/backend/internal/sys/validate" - "github.com/hay-kot/homebox/backend/internal/web/adapters" "github.com/hay-kot/httpkit/errchain" "github.com/hay-kot/httpkit/server" "github.com/rs/zerolog/log" + "github.com/sysadminsmedia/homebox/backend/internal/core/services" + "github.com/sysadminsmedia/homebox/backend/internal/data/repo" + "github.com/sysadminsmedia/homebox/backend/internal/sys/validate" + "github.com/sysadminsmedia/homebox/backend/internal/web/adapters" ) // HandleItemsGetAll godoc diff --git a/backend/app/api/handlers/v1/v1_ctrl_items_attachments.go b/backend/app/api/handlers/v1/v1_ctrl_items_attachments.go index ae2782af..61b3b9a5 100644 --- a/backend/app/api/handlers/v1/v1_ctrl_items_attachments.go +++ b/backend/app/api/handlers/v1/v1_ctrl_items_attachments.go @@ -6,13 +6,13 @@ import ( "path/filepath" "strings" - "github.com/hay-kot/homebox/backend/internal/core/services" - "github.com/hay-kot/homebox/backend/internal/data/ent/attachment" - "github.com/hay-kot/homebox/backend/internal/data/repo" - "github.com/hay-kot/homebox/backend/internal/sys/validate" "github.com/hay-kot/httpkit/errchain" "github.com/hay-kot/httpkit/server" "github.com/rs/zerolog/log" + "github.com/sysadminsmedia/homebox/backend/internal/core/services" + "github.com/sysadminsmedia/homebox/backend/internal/data/ent/attachment" + "github.com/sysadminsmedia/homebox/backend/internal/data/repo" + "github.com/sysadminsmedia/homebox/backend/internal/sys/validate" ) type ( diff --git a/backend/app/api/handlers/v1/v1_ctrl_labels.go b/backend/app/api/handlers/v1/v1_ctrl_labels.go index dae23db0..888be19d 100644 --- a/backend/app/api/handlers/v1/v1_ctrl_labels.go +++ b/backend/app/api/handlers/v1/v1_ctrl_labels.go @@ -4,10 +4,10 @@ import ( "net/http" "github.com/google/uuid" - "github.com/hay-kot/homebox/backend/internal/core/services" - "github.com/hay-kot/homebox/backend/internal/data/repo" - "github.com/hay-kot/homebox/backend/internal/web/adapters" "github.com/hay-kot/httpkit/errchain" + "github.com/sysadminsmedia/homebox/backend/internal/core/services" + "github.com/sysadminsmedia/homebox/backend/internal/data/repo" + "github.com/sysadminsmedia/homebox/backend/internal/web/adapters" ) // HandleLabelsGetAll godoc diff --git a/backend/app/api/handlers/v1/v1_ctrl_locations.go b/backend/app/api/handlers/v1/v1_ctrl_locations.go index d84ce313..2686b5c0 100644 --- a/backend/app/api/handlers/v1/v1_ctrl_locations.go +++ b/backend/app/api/handlers/v1/v1_ctrl_locations.go @@ -4,10 +4,10 @@ import ( "net/http" "github.com/google/uuid" - "github.com/hay-kot/homebox/backend/internal/core/services" - "github.com/hay-kot/homebox/backend/internal/data/repo" - "github.com/hay-kot/homebox/backend/internal/web/adapters" "github.com/hay-kot/httpkit/errchain" + "github.com/sysadminsmedia/homebox/backend/internal/core/services" + "github.com/sysadminsmedia/homebox/backend/internal/data/repo" + "github.com/sysadminsmedia/homebox/backend/internal/web/adapters" ) // HandleLocationTreeQuery godoc diff --git a/backend/app/api/handlers/v1/v1_ctrl_maint_entry.go b/backend/app/api/handlers/v1/v1_ctrl_maint_entry.go index e94c12a9..267dbb87 100644 --- a/backend/app/api/handlers/v1/v1_ctrl_maint_entry.go +++ b/backend/app/api/handlers/v1/v1_ctrl_maint_entry.go @@ -4,10 +4,10 @@ import ( "net/http" "github.com/google/uuid" - "github.com/hay-kot/homebox/backend/internal/core/services" - "github.com/hay-kot/homebox/backend/internal/data/repo" - "github.com/hay-kot/homebox/backend/internal/web/adapters" "github.com/hay-kot/httpkit/errchain" + "github.com/sysadminsmedia/homebox/backend/internal/core/services" + "github.com/sysadminsmedia/homebox/backend/internal/data/repo" + "github.com/sysadminsmedia/homebox/backend/internal/web/adapters" ) // HandleMaintenanceLogGet godoc diff --git a/backend/app/api/handlers/v1/v1_ctrl_notifiers.go b/backend/app/api/handlers/v1/v1_ctrl_notifiers.go index 3c64dc7f..f46b9102 100644 --- a/backend/app/api/handlers/v1/v1_ctrl_notifiers.go +++ b/backend/app/api/handlers/v1/v1_ctrl_notifiers.go @@ -5,10 +5,10 @@ import ( "github.com/containrrr/shoutrrr" "github.com/google/uuid" - "github.com/hay-kot/homebox/backend/internal/core/services" - "github.com/hay-kot/homebox/backend/internal/data/repo" - "github.com/hay-kot/homebox/backend/internal/web/adapters" "github.com/hay-kot/httpkit/errchain" + "github.com/sysadminsmedia/homebox/backend/internal/core/services" + "github.com/sysadminsmedia/homebox/backend/internal/data/repo" + "github.com/sysadminsmedia/homebox/backend/internal/web/adapters" ) // HandleGetUserNotifiers godoc diff --git a/backend/app/api/handlers/v1/v1_ctrl_qrcode.go b/backend/app/api/handlers/v1/v1_ctrl_qrcode.go index 25f7c75a..b348420a 100644 --- a/backend/app/api/handlers/v1/v1_ctrl_qrcode.go +++ b/backend/app/api/handlers/v1/v1_ctrl_qrcode.go @@ -7,8 +7,8 @@ import ( "net/http" "net/url" - "github.com/hay-kot/homebox/backend/internal/web/adapters" "github.com/hay-kot/httpkit/errchain" + "github.com/sysadminsmedia/homebox/backend/internal/web/adapters" "github.com/yeqown/go-qrcode/v2" "github.com/yeqown/go-qrcode/writer/standard" diff --git a/backend/app/api/handlers/v1/v1_ctrl_reporting.go b/backend/app/api/handlers/v1/v1_ctrl_reporting.go index 40f0d22c..e19288f0 100644 --- a/backend/app/api/handlers/v1/v1_ctrl_reporting.go +++ b/backend/app/api/handlers/v1/v1_ctrl_reporting.go @@ -3,8 +3,8 @@ package v1 import ( "net/http" - "github.com/hay-kot/homebox/backend/internal/core/services" "github.com/hay-kot/httpkit/errchain" + "github.com/sysadminsmedia/homebox/backend/internal/core/services" ) // HandleBillOfMaterialsExport godoc diff --git a/backend/app/api/handlers/v1/v1_ctrl_statistics.go b/backend/app/api/handlers/v1/v1_ctrl_statistics.go index 0a5a319c..d66bd908 100644 --- a/backend/app/api/handlers/v1/v1_ctrl_statistics.go +++ b/backend/app/api/handlers/v1/v1_ctrl_statistics.go @@ -4,12 +4,12 @@ import ( "net/http" "time" - "github.com/hay-kot/homebox/backend/internal/core/services" - "github.com/hay-kot/homebox/backend/internal/data/repo" - "github.com/hay-kot/homebox/backend/internal/sys/validate" - "github.com/hay-kot/homebox/backend/internal/web/adapters" "github.com/hay-kot/httpkit/errchain" "github.com/hay-kot/httpkit/server" + "github.com/sysadminsmedia/homebox/backend/internal/core/services" + "github.com/sysadminsmedia/homebox/backend/internal/data/repo" + "github.com/sysadminsmedia/homebox/backend/internal/sys/validate" + "github.com/sysadminsmedia/homebox/backend/internal/web/adapters" ) // HandleGroupStatisticsLocations godoc diff --git a/backend/app/api/handlers/v1/v1_ctrl_user.go b/backend/app/api/handlers/v1/v1_ctrl_user.go index 8708d24c..5704fd91 100644 --- a/backend/app/api/handlers/v1/v1_ctrl_user.go +++ b/backend/app/api/handlers/v1/v1_ctrl_user.go @@ -5,12 +5,12 @@ import ( "net/http" "github.com/google/uuid" - "github.com/hay-kot/homebox/backend/internal/core/services" - "github.com/hay-kot/homebox/backend/internal/data/repo" - "github.com/hay-kot/homebox/backend/internal/sys/validate" "github.com/hay-kot/httpkit/errchain" "github.com/hay-kot/httpkit/server" "github.com/rs/zerolog/log" + "github.com/sysadminsmedia/homebox/backend/internal/core/services" + "github.com/sysadminsmedia/homebox/backend/internal/data/repo" + "github.com/sysadminsmedia/homebox/backend/internal/sys/validate" ) // HandleUserRegistration godoc diff --git a/backend/app/api/logger.go b/backend/app/api/logger.go index 34659c64..714cba44 100644 --- a/backend/app/api/logger.go +++ b/backend/app/api/logger.go @@ -3,9 +3,9 @@ package main import ( "os" - "github.com/hay-kot/homebox/backend/internal/sys/config" "github.com/rs/zerolog" "github.com/rs/zerolog/log" + "github.com/sysadminsmedia/homebox/backend/internal/sys/config" ) // setupLogger initializes the zerolog config diff --git a/backend/app/api/main.go b/backend/app/api/main.go index 4811bfa0..2ba6eb6e 100644 --- a/backend/app/api/main.go +++ b/backend/app/api/main.go @@ -14,21 +14,21 @@ import ( "github.com/go-chi/chi/v5" "github.com/go-chi/chi/v5/middleware" - "github.com/hay-kot/homebox/backend/internal/core/currencies" - "github.com/hay-kot/homebox/backend/internal/core/services" - "github.com/hay-kot/homebox/backend/internal/core/services/reporting/eventbus" - "github.com/hay-kot/homebox/backend/internal/data/ent" - "github.com/hay-kot/homebox/backend/internal/data/migrations" - "github.com/hay-kot/homebox/backend/internal/data/repo" - "github.com/hay-kot/homebox/backend/internal/sys/config" - "github.com/hay-kot/homebox/backend/internal/web/mid" "github.com/hay-kot/httpkit/errchain" "github.com/hay-kot/httpkit/graceful" "github.com/rs/zerolog" "github.com/rs/zerolog/log" "github.com/rs/zerolog/pkgerrors" - - _ "github.com/hay-kot/homebox/backend/pkgs/cgofreesqlite" + "github.com/sysadminsmedia/homebox/backend/internal/core/currencies" + "github.com/sysadminsmedia/homebox/backend/internal/core/services" + "github.com/sysadminsmedia/homebox/backend/internal/core/services/reporting/eventbus" + "github.com/sysadminsmedia/homebox/backend/internal/data/ent" + "github.com/sysadminsmedia/homebox/backend/internal/data/migrations" + "github.com/sysadminsmedia/homebox/backend/internal/data/repo" + "github.com/sysadminsmedia/homebox/backend/internal/sys/config" + "github.com/sysadminsmedia/homebox/backend/internal/web/mid" + + _ "github.com/sysadminsmedia/homebox/backend/pkgs/cgofreesqlite" ) var ( diff --git a/backend/app/api/middleware.go b/backend/app/api/middleware.go index 02b3a6ca..45495933 100644 --- a/backend/app/api/middleware.go +++ b/backend/app/api/middleware.go @@ -7,11 +7,11 @@ import ( "net/url" "strings" - v1 "github.com/hay-kot/homebox/backend/app/api/handlers/v1" - "github.com/hay-kot/homebox/backend/internal/core/services" - "github.com/hay-kot/homebox/backend/internal/data/ent" - "github.com/hay-kot/homebox/backend/internal/sys/validate" "github.com/hay-kot/httpkit/errchain" + v1 "github.com/sysadminsmedia/homebox/backend/app/api/handlers/v1" + "github.com/sysadminsmedia/homebox/backend/internal/core/services" + "github.com/sysadminsmedia/homebox/backend/internal/data/ent" + "github.com/sysadminsmedia/homebox/backend/internal/sys/validate" ) type tokenHasKey struct { diff --git a/backend/app/api/providers/extractors.go b/backend/app/api/providers/extractors.go index bc042a49..c7b8fd66 100644 --- a/backend/app/api/providers/extractors.go +++ b/backend/app/api/providers/extractors.go @@ -4,9 +4,9 @@ import ( "errors" "net/http" - "github.com/hay-kot/homebox/backend/internal/sys/validate" "github.com/hay-kot/httpkit/server" "github.com/rs/zerolog/log" + "github.com/sysadminsmedia/homebox/backend/internal/sys/validate" ) type LoginForm struct { diff --git a/backend/app/api/providers/local.go b/backend/app/api/providers/local.go index 991f51a6..b60dbf2f 100644 --- a/backend/app/api/providers/local.go +++ b/backend/app/api/providers/local.go @@ -3,7 +3,7 @@ package providers import ( "net/http" - "github.com/hay-kot/homebox/backend/internal/core/services" + "github.com/sysadminsmedia/homebox/backend/internal/core/services" ) type LocalProvider struct { diff --git a/backend/app/api/routes.go b/backend/app/api/routes.go index de10942e..dde61772 100644 --- a/backend/app/api/routes.go +++ b/backend/app/api/routes.go @@ -10,14 +10,14 @@ import ( "path/filepath" "github.com/go-chi/chi/v5" - "github.com/hay-kot/homebox/backend/app/api/handlers/debughandlers" - v1 "github.com/hay-kot/homebox/backend/app/api/handlers/v1" - "github.com/hay-kot/homebox/backend/app/api/providers" - _ "github.com/hay-kot/homebox/backend/app/api/static/docs" - "github.com/hay-kot/homebox/backend/internal/data/ent/authroles" - "github.com/hay-kot/homebox/backend/internal/data/repo" "github.com/hay-kot/httpkit/errchain" httpSwagger "github.com/swaggo/http-swagger/v2" // http-swagger middleware + "github.com/sysadminsmedia/homebox/backend/app/api/handlers/debughandlers" + v1 "github.com/sysadminsmedia/homebox/backend/app/api/handlers/v1" + "github.com/sysadminsmedia/homebox/backend/app/api/providers" + _ "github.com/sysadminsmedia/homebox/backend/app/api/static/docs" + "github.com/sysadminsmedia/homebox/backend/internal/data/ent/authroles" + "github.com/sysadminsmedia/homebox/backend/internal/data/repo" ) const prefix = "/api" diff --git a/backend/app/tools/migrations/main.go b/backend/app/tools/migrations/main.go index e53e7ba7..f0bd2c6d 100644 --- a/backend/app/tools/migrations/main.go +++ b/backend/app/tools/migrations/main.go @@ -6,7 +6,7 @@ import ( "log" "os" - "github.com/hay-kot/homebox/backend/internal/data/ent/migrate" + "github.com/sysadminsmedia/homebox/backend/internal/data/ent/migrate" atlas "ariga.io/atlas/sql/migrate" _ "ariga.io/atlas/sql/sqlite" diff --git a/backend/go.mod b/backend/go.mod index 8a0f9d95..cd8c46ba 100644 --- a/backend/go.mod +++ b/backend/go.mod @@ -1,4 +1,4 @@ -module github.com/hay-kot/homebox/backend +module github.com/sysadminsmedia/homebox/backend go 1.22 diff --git a/backend/internal/core/services/all.go b/backend/internal/core/services/all.go index 3c03a4e9..d053ba00 100644 --- a/backend/internal/core/services/all.go +++ b/backend/internal/core/services/all.go @@ -2,8 +2,8 @@ package services import ( - "github.com/hay-kot/homebox/backend/internal/core/currencies" "github.com/hay-kot/homebox/backend/internal/data/repo" + "github.com/sysadminsmedia/homebox/backend/internal/core/currencies" ) type AllServices struct { diff --git a/backend/internal/core/services/contexts.go b/backend/internal/core/services/contexts.go index d82dcfa7..096b3866 100644 --- a/backend/internal/core/services/contexts.go +++ b/backend/internal/core/services/contexts.go @@ -4,7 +4,7 @@ import ( "context" "github.com/google/uuid" - "github.com/hay-kot/homebox/backend/internal/data/repo" + "github.com/sysadminsmedia/homebox/backend/internal/data/repo" ) type contextKeys struct { diff --git a/backend/internal/core/services/contexts_test.go b/backend/internal/core/services/contexts_test.go index 8b7dfa44..b489b487 100644 --- a/backend/internal/core/services/contexts_test.go +++ b/backend/internal/core/services/contexts_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/google/uuid" - "github.com/hay-kot/homebox/backend/internal/data/repo" "github.com/stretchr/testify/assert" + "github.com/sysadminsmedia/homebox/backend/internal/data/repo" ) func Test_SetAuthContext(t *testing.T) { diff --git a/backend/internal/core/services/main_test.go b/backend/internal/core/services/main_test.go index ecb07b0b..2bc0cc84 100644 --- a/backend/internal/core/services/main_test.go +++ b/backend/internal/core/services/main_test.go @@ -6,12 +6,12 @@ import ( "os" "testing" - "github.com/hay-kot/homebox/backend/internal/core/currencies" - "github.com/hay-kot/homebox/backend/internal/core/services/reporting/eventbus" - "github.com/hay-kot/homebox/backend/internal/data/ent" - "github.com/hay-kot/homebox/backend/internal/data/repo" - "github.com/hay-kot/homebox/backend/pkgs/faker" _ "github.com/mattn/go-sqlite3" + "github.com/sysadminsmedia/homebox/backend/internal/core/currencies" + "github.com/sysadminsmedia/homebox/backend/internal/core/services/reporting/eventbus" + "github.com/sysadminsmedia/homebox/backend/internal/data/ent" + "github.com/sysadminsmedia/homebox/backend/internal/data/repo" + "github.com/sysadminsmedia/homebox/backend/pkgs/faker" ) var ( diff --git a/backend/internal/core/services/reporting/io_row.go b/backend/internal/core/services/reporting/io_row.go index c80e00dd..7a82fd26 100644 --- a/backend/internal/core/services/reporting/io_row.go +++ b/backend/internal/core/services/reporting/io_row.go @@ -3,8 +3,8 @@ package reporting import ( "strings" - "github.com/hay-kot/homebox/backend/internal/data/repo" "github.com/hay-kot/homebox/backend/internal/data/types" + "github.com/sysadminsmedia/homebox/backend/internal/data/repo" ) type ExportItemFields struct { diff --git a/backend/internal/core/services/reporting/io_sheet_test.go b/backend/internal/core/services/reporting/io_sheet_test.go index f056e31f..5bdbc898 100644 --- a/backend/internal/core/services/reporting/io_sheet_test.go +++ b/backend/internal/core/services/reporting/io_sheet_test.go @@ -7,9 +7,9 @@ import ( _ "embed" - "github.com/hay-kot/homebox/backend/internal/data/repo" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "github.com/sysadminsmedia/homebox/backend/internal/data/repo" ) var ( diff --git a/backend/internal/core/services/service_background.go b/backend/internal/core/services/service_background.go index 21ae4c36..1af8e1ba 100644 --- a/backend/internal/core/services/service_background.go +++ b/backend/internal/core/services/service_background.go @@ -6,9 +6,9 @@ import ( "time" "github.com/containrrr/shoutrrr" - "github.com/hay-kot/homebox/backend/internal/data/repo" - "github.com/hay-kot/homebox/backend/internal/data/types" "github.com/rs/zerolog/log" + "github.com/sysadminsmedia/homebox/backend/internal/data/repo" + "github.com/sysadminsmedia/homebox/backend/internal/data/types" ) type BackgroundService struct { diff --git a/backend/internal/core/services/service_group.go b/backend/internal/core/services/service_group.go index 2ca3f86f..7b90fa29 100644 --- a/backend/internal/core/services/service_group.go +++ b/backend/internal/core/services/service_group.go @@ -4,8 +4,8 @@ import ( "errors" "time" - "github.com/hay-kot/homebox/backend/internal/data/repo" - "github.com/hay-kot/homebox/backend/pkgs/hasher" + "github.com/sysadminsmedia/homebox/backend/internal/data/repo" + "github.com/sysadminsmedia/homebox/backend/pkgs/hasher" ) type GroupService struct { diff --git a/backend/internal/core/services/service_items.go b/backend/internal/core/services/service_items.go index 4d510e5c..55136cef 100644 --- a/backend/internal/core/services/service_items.go +++ b/backend/internal/core/services/service_items.go @@ -8,8 +8,8 @@ import ( "strings" "github.com/google/uuid" - "github.com/hay-kot/homebox/backend/internal/core/services/reporting" - "github.com/hay-kot/homebox/backend/internal/data/repo" + "github.com/sysadminsmedia/homebox/backend/internal/core/services/reporting" + "github.com/sysadminsmedia/homebox/backend/internal/data/repo" ) var ( diff --git a/backend/internal/core/services/service_items_attachments.go b/backend/internal/core/services/service_items_attachments.go index 43835c63..827001ad 100644 --- a/backend/internal/core/services/service_items_attachments.go +++ b/backend/internal/core/services/service_items_attachments.go @@ -6,10 +6,10 @@ import ( "os" "github.com/google/uuid" - "github.com/hay-kot/homebox/backend/internal/data/ent" "github.com/hay-kot/homebox/backend/internal/data/ent/attachment" "github.com/hay-kot/homebox/backend/internal/data/repo" "github.com/rs/zerolog/log" + "github.com/sysadminsmedia/homebox/backend/internal/data/ent" ) func (svc *ItemService) AttachmentPath(ctx context.Context, attachmentID uuid.UUID) (*ent.Document, error) { diff --git a/backend/internal/core/services/service_items_attachments_test.go b/backend/internal/core/services/service_items_attachments_test.go index 4e2315eb..e5addae4 100644 --- a/backend/internal/core/services/service_items_attachments_test.go +++ b/backend/internal/core/services/service_items_attachments_test.go @@ -7,9 +7,9 @@ import ( "strings" "testing" - "github.com/hay-kot/homebox/backend/internal/data/repo" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "github.com/sysadminsmedia/homebox/backend/internal/data/repo" ) func TestItemService_AddAttachment(t *testing.T) { diff --git a/backend/internal/core/services/service_user.go b/backend/internal/core/services/service_user.go index d86c39b4..da5d893f 100644 --- a/backend/internal/core/services/service_user.go +++ b/backend/internal/core/services/service_user.go @@ -6,10 +6,10 @@ import ( "time" "github.com/google/uuid" - "github.com/hay-kot/homebox/backend/internal/data/ent/authroles" - "github.com/hay-kot/homebox/backend/internal/data/repo" - "github.com/hay-kot/homebox/backend/pkgs/hasher" "github.com/rs/zerolog/log" + "github.com/sysadminsmedia/homebox/backend/internal/data/ent/authroles" + "github.com/sysadminsmedia/homebox/backend/internal/data/repo" + "github.com/sysadminsmedia/homebox/backend/pkgs/hasher" ) var ( diff --git a/backend/internal/core/services/service_user_defaults.go b/backend/internal/core/services/service_user_defaults.go index 34344d16..62a429dc 100644 --- a/backend/internal/core/services/service_user_defaults.go +++ b/backend/internal/core/services/service_user_defaults.go @@ -1,7 +1,7 @@ package services import ( - "github.com/hay-kot/homebox/backend/internal/data/repo" + "github.com/sysadminsmedia/homebox/backend/internal/data/repo" ) func defaultLocations() []repo.LocationCreate { diff --git a/backend/internal/web/adapters/decoders.go b/backend/internal/web/adapters/decoders.go index ad5b82b2..e9c9b348 100644 --- a/backend/internal/web/adapters/decoders.go +++ b/backend/internal/web/adapters/decoders.go @@ -8,8 +8,8 @@ import ( "github.com/go-chi/chi/v5" "github.com/google/uuid" "github.com/gorilla/schema" - "github.com/hay-kot/homebox/backend/internal/sys/validate" "github.com/hay-kot/httpkit/server" + "github.com/sysadminsmedia/homebox/backend/internal/sys/validate" ) var queryDecoder = schema.NewDecoder() diff --git a/backend/internal/web/mid/errors.go b/backend/internal/web/mid/errors.go index c8b04d67..f9a98cec 100644 --- a/backend/internal/web/mid/errors.go +++ b/backend/internal/web/mid/errors.go @@ -4,11 +4,11 @@ import ( "net/http" "github.com/go-chi/chi/v5/middleware" - "github.com/hay-kot/homebox/backend/internal/data/ent" - "github.com/hay-kot/homebox/backend/internal/sys/validate" "github.com/hay-kot/httpkit/errchain" "github.com/hay-kot/httpkit/server" "github.com/rs/zerolog" + "github.com/sysadminsmedia/homebox/backend/internal/data/ent" + "github.com/sysadminsmedia/homebox/backend/internal/sys/validate" ) type ErrorResponse struct { diff --git a/frontend/pnpm-lock.yaml b/frontend/pnpm-lock.yaml index 0c12eda3..37567058 100644 --- a/frontend/pnpm-lock.yaml +++ b/frontend/pnpm-lock.yaml @@ -2388,12 +2388,6 @@ packages: '@jridgewell/resolve-uri': 3.1.2 '@jridgewell/sourcemap-codec': 1.4.15 - /@jridgewell/trace-mapping@0.3.25: - resolution: {integrity: sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==} - dependencies: - '@jridgewell/resolve-uri': 3.1.2 - '@jridgewell/sourcemap-codec': 1.4.15 - /@jridgewell/trace-mapping@0.3.25: resolution: {integrity: sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==} dependencies: @@ -9993,36 +9987,6 @@ packages: vue: 3.4.8(typescript@5.3.3) dev: false - /vue-demi@0.14.7(vue@3.4.8): - resolution: {integrity: sha512-EOG8KXDQNwkJILkx/gPcoL/7vH+hORoBaKgGe+6W7VFMvCYJfmF2dGbvgDroVnI8LU7/kTu8mbjRZGBU1z9NTA==} - engines: {node: '>=12'} - hasBin: true - requiresBuild: true - peerDependencies: - '@vue/composition-api': ^1.0.0-rc.1 - vue: ^3.0.0-0 || ^2.6.0 - peerDependenciesMeta: - '@vue/composition-api': - optional: true - dependencies: - vue: 3.4.8(typescript@5.3.3) - dev: false - - /vue-demi@0.14.7(vue@3.4.8): - resolution: {integrity: sha512-EOG8KXDQNwkJILkx/gPcoL/7vH+hORoBaKgGe+6W7VFMvCYJfmF2dGbvgDroVnI8LU7/kTu8mbjRZGBU1z9NTA==} - engines: {node: '>=12'} - hasBin: true - requiresBuild: true - peerDependencies: - '@vue/composition-api': ^1.0.0-rc.1 - vue: ^3.0.0-0 || ^2.6.0 - peerDependenciesMeta: - '@vue/composition-api': - optional: true - dependencies: - vue: 3.4.8(typescript@5.3.3) - dev: false - /vue-devtools-stub@0.1.0: resolution: {integrity: sha512-RutnB7X8c5hjq39NceArgXg28WZtZpGc3+J16ljMiYnFhKvd8hITxSWQSQ5bvldxMDU6gG5mkxl1MTQLXckVSQ==}