From 8f174c37751e17af887c8f783b21077974f90101 Mon Sep 17 00:00:00 2001 From: Alexander Neonxp Kiryukhin Date: Wed, 11 Dec 2024 01:51:46 +0300 Subject: Поправил имя пакета MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmd/app/main.go | 4 ++-- cmd/app/migrator/migrate/init.go | 4 ++-- cmd/app/migrator/migrate/migrate.go | 4 ++-- cmd/app/migrator/migrate/rollback.go | 4 ++-- cmd/app/migrator/migrator.go | 6 +++--- cmd/app/migrator/migrator/migrator.go | 4 ++-- cmd/app/serve/serve.go | 16 ++++++++-------- go.mod | 4 ++-- migrations/20241005143542_init.go | 2 +- migrations/20241010175211_session.go | 2 +- pkg/config/config.go | 2 +- pkg/handler/error.go | 2 +- pkg/handler/user/errors.go | 2 +- pkg/handler/user/handler.go | 2 +- pkg/handler/user/login.go | 4 ++-- pkg/handler/user/logout.go | 2 +- pkg/handler/user/profile.go | 4 ++-- pkg/handler/user/register.go | 4 ++-- pkg/service/user/login.go | 4 ++-- pkg/service/user/register.go | 4 ++-- pkg/tpl/layout.templ | 2 +- pkg/tpl/layout_templ.go | 2 +- pkg/tpl/profile.templ | 2 +- pkg/tpl/profile_templ.go | 2 +- pkg/utils/user.go | 4 ++-- 25 files changed, 46 insertions(+), 46 deletions(-) diff --git a/cmd/app/main.go b/cmd/app/main.go index ab30493..b9e467c 100644 --- a/cmd/app/main.go +++ b/cmd/app/main.go @@ -6,8 +6,8 @@ import ( "github.com/urfave/cli/v2" - "go.neonxp.ru/framework/cmd/app/migrator" - "go.neonxp.ru/framework/cmd/app/serve" + "neonxp.ru/go/framework/cmd/app/migrator" + "neonxp.ru/go/framework/cmd/app/serve" ) func main() { diff --git a/cmd/app/migrator/migrate/init.go b/cmd/app/migrator/migrate/init.go index ec689f8..e3ba40a 100644 --- a/cmd/app/migrator/migrate/init.go +++ b/cmd/app/migrator/migrate/init.go @@ -2,8 +2,8 @@ package migrate import ( "github.com/urfave/cli/v2" - "go.neonxp.ru/framework/cmd/app/migrator/migrator" - "go.neonxp.ru/framework/migrations" + "neonxp.ru/go/framework/cmd/app/migrator/migrator" + "neonxp.ru/go/framework/migrations" ) func Init(c *cli.Context) error { diff --git a/cmd/app/migrator/migrate/migrate.go b/cmd/app/migrator/migrate/migrate.go index 0cef9b4..d24e1a9 100644 --- a/cmd/app/migrator/migrate/migrate.go +++ b/cmd/app/migrator/migrate/migrate.go @@ -4,8 +4,8 @@ import ( "fmt" "github.com/urfave/cli/v2" - "go.neonxp.ru/framework/cmd/app/migrator/migrator" - "go.neonxp.ru/framework/migrations" + "neonxp.ru/go/framework/cmd/app/migrator/migrator" + "neonxp.ru/go/framework/migrations" ) func Migrate(c *cli.Context) error { diff --git a/cmd/app/migrator/migrate/rollback.go b/cmd/app/migrator/migrate/rollback.go index 39f2171..415c7f6 100644 --- a/cmd/app/migrator/migrate/rollback.go +++ b/cmd/app/migrator/migrate/rollback.go @@ -4,8 +4,8 @@ import ( "fmt" "github.com/urfave/cli/v2" - "go.neonxp.ru/framework/cmd/app/migrator/migrator" - "go.neonxp.ru/framework/migrations" + "neonxp.ru/go/framework/cmd/app/migrator/migrator" + "neonxp.ru/go/framework/migrations" ) func Rollback(c *cli.Context) error { diff --git a/cmd/app/migrator/migrator.go b/cmd/app/migrator/migrator.go index fa5b03b..63c5d45 100644 --- a/cmd/app/migrator/migrator.go +++ b/cmd/app/migrator/migrator.go @@ -5,9 +5,9 @@ import ( "strings" "github.com/urfave/cli/v2" - "go.neonxp.ru/framework/cmd/app/migrator/migrate" - "go.neonxp.ru/framework/cmd/app/migrator/migrator" - "go.neonxp.ru/framework/migrations" + "neonxp.ru/go/framework/cmd/app/migrator/migrate" + "neonxp.ru/go/framework/cmd/app/migrator/migrator" + "neonxp.ru/go/framework/migrations" ) func Migrator() *cli.Command { diff --git a/cmd/app/migrator/migrator/migrator.go b/cmd/app/migrator/migrator/migrator.go index cd22dd5..818d1fb 100644 --- a/cmd/app/migrator/migrator/migrator.go +++ b/cmd/app/migrator/migrator/migrator.go @@ -3,8 +3,8 @@ package migrator import ( "github.com/uptrace/bun/migrate" "github.com/urfave/cli/v2" - "go.neonxp.ru/framework/pkg/config" - "go.neonxp.ru/framework/pkg/db" + "neonxp.ru/go/framework/pkg/config" + "neonxp.ru/go/framework/pkg/db" ) func New(c *cli.Context, mig *migrate.Migrations) (*migrate.Migrator, error) { diff --git a/cmd/app/serve/serve.go b/cmd/app/serve/serve.go index fabdb7c..983f58c 100644 --- a/cmd/app/serve/serve.go +++ b/cmd/app/serve/serve.go @@ -6,14 +6,14 @@ import ( echomiddleware "github.com/labstack/echo/v4/middleware" "github.com/uptrace/bun/extra/bundebug" "github.com/urfave/cli/v2" - "go.neonxp.ru/framework/pkg/config" - "go.neonxp.ru/framework/pkg/db" - "go.neonxp.ru/framework/pkg/handler" - "go.neonxp.ru/framework/pkg/handler/user" - "go.neonxp.ru/framework/pkg/middleware" - "go.neonxp.ru/framework/pkg/middleware/session" - userservice "go.neonxp.ru/framework/pkg/service/user" - "go.neonxp.ru/framework/static" + "neonxp.ru/go/framework/pkg/config" + "neonxp.ru/go/framework/pkg/db" + "neonxp.ru/go/framework/pkg/handler" + "neonxp.ru/go/framework/pkg/handler/user" + "neonxp.ru/go/framework/pkg/middleware" + "neonxp.ru/go/framework/pkg/middleware/session" + userservice "neonxp.ru/go/framework/pkg/service/user" + "neonxp.ru/go/framework/static" ) func Run(c *cli.Context) error { diff --git a/go.mod b/go.mod index 96476ce..f9ff6f8 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module go.neonxp.ru/framework +module neonxp.ru/go/framework go 1.23 @@ -45,4 +45,4 @@ require ( golang.org/x/sys v0.24.0 // indirect ) -replace go.neonxp.ru/framework latest => neonxp.ru/go/framework latest +replace neonxp.ru/go/framework latest => neonxp.ru/go/framework latest diff --git a/migrations/20241005143542_init.go b/migrations/20241005143542_init.go index 9487cca..7dd67ff 100644 --- a/migrations/20241005143542_init.go +++ b/migrations/20241005143542_init.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/uptrace/bun" - "go.neonxp.ru/framework/pkg/model" + "neonxp.ru/go/framework/pkg/model" ) //nolint:gochecknoinits diff --git a/migrations/20241010175211_session.go b/migrations/20241010175211_session.go index 8cb91ea..61dd8e8 100644 --- a/migrations/20241010175211_session.go +++ b/migrations/20241010175211_session.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/uptrace/bun" - "go.neonxp.ru/framework/pkg/middleware/session" + "neonxp.ru/go/framework/pkg/middleware/session" ) //nolint:gochecknoinits diff --git a/pkg/config/config.go b/pkg/config/config.go index 6a9d30c..2d97609 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -3,8 +3,8 @@ package config import ( "os" - "go.neonxp.ru/framework/pkg/db" "gopkg.in/yaml.v3" + "neonxp.ru/go/framework/pkg/db" ) type Config struct { diff --git a/pkg/handler/error.go b/pkg/handler/error.go index eac791d..821a3f3 100644 --- a/pkg/handler/error.go +++ b/pkg/handler/error.go @@ -5,7 +5,7 @@ import ( "net/http" "github.com/labstack/echo/v4" - "go.neonxp.ru/framework/pkg/tpl" + "neonxp.ru/go/framework/pkg/tpl" ) func ErrorHandler(err error, c echo.Context) { diff --git a/pkg/handler/user/errors.go b/pkg/handler/user/errors.go index ab8fc4a..875dec5 100644 --- a/pkg/handler/user/errors.go +++ b/pkg/handler/user/errors.go @@ -3,7 +3,7 @@ package user import ( "errors" - "go.neonxp.ru/framework/pkg/service/user" + "neonxp.ru/go/framework/pkg/service/user" ) var UserErrors = Errors{ diff --git a/pkg/handler/user/handler.go b/pkg/handler/user/handler.go index 6bc8bff..b23003f 100644 --- a/pkg/handler/user/handler.go +++ b/pkg/handler/user/handler.go @@ -2,7 +2,7 @@ package user import ( "github.com/labstack/echo/v4" - "go.neonxp.ru/framework/pkg/service/user" + "neonxp.ru/go/framework/pkg/service/user" ) type Handler struct { diff --git a/pkg/handler/user/login.go b/pkg/handler/user/login.go index b3fbdbf..fca8465 100644 --- a/pkg/handler/user/login.go +++ b/pkg/handler/user/login.go @@ -5,8 +5,8 @@ import ( "github.com/labstack/echo/v4" - "go.neonxp.ru/framework/pkg/tpl" - "go.neonxp.ru/framework/pkg/utils" + "neonxp.ru/go/framework/pkg/tpl" + "neonxp.ru/go/framework/pkg/utils" ) const oneyear = 86400 * 365 diff --git a/pkg/handler/user/logout.go b/pkg/handler/user/logout.go index 9b7ea5f..4844ede 100644 --- a/pkg/handler/user/logout.go +++ b/pkg/handler/user/logout.go @@ -4,7 +4,7 @@ import ( "net/http" "github.com/labstack/echo/v4" - "go.neonxp.ru/framework/pkg/utils" + "neonxp.ru/go/framework/pkg/utils" ) func (*Handler) Logout(c echo.Context) error { diff --git a/pkg/handler/user/profile.go b/pkg/handler/user/profile.go index 7181ca7..ab8457b 100644 --- a/pkg/handler/user/profile.go +++ b/pkg/handler/user/profile.go @@ -2,8 +2,8 @@ package user import ( "github.com/labstack/echo/v4" - "go.neonxp.ru/framework/pkg/tpl" - "go.neonxp.ru/framework/pkg/utils" + "neonxp.ru/go/framework/pkg/tpl" + "neonxp.ru/go/framework/pkg/utils" ) func (*Handler) Profile(c echo.Context) error { diff --git a/pkg/handler/user/register.go b/pkg/handler/user/register.go index 2bd810a..40d4265 100644 --- a/pkg/handler/user/register.go +++ b/pkg/handler/user/register.go @@ -4,8 +4,8 @@ import ( "net/http" "github.com/labstack/echo/v4" - "go.neonxp.ru/framework/pkg/tpl" - "go.neonxp.ru/framework/pkg/utils" + "neonxp.ru/go/framework/pkg/tpl" + "neonxp.ru/go/framework/pkg/utils" ) func (h *Handler) RegisterForm(c echo.Context) error { diff --git a/pkg/service/user/login.go b/pkg/service/user/login.go index d1f5c65..c1ef0c0 100644 --- a/pkg/service/user/login.go +++ b/pkg/service/user/login.go @@ -7,8 +7,8 @@ import ( normalizer "github.com/dimuska139/go-email-normalizer/v3" "golang.org/x/crypto/bcrypt" - "go.neonxp.ru/framework/pkg/model" - "go.neonxp.ru/framework/pkg/tpl" + "neonxp.ru/go/framework/pkg/model" + "neonxp.ru/go/framework/pkg/tpl" ) var ErrInvalidUserOrPassword = errors.New("invalid_user_or_password") diff --git a/pkg/service/user/register.go b/pkg/service/user/register.go index 69f19a2..cc47de5 100644 --- a/pkg/service/user/register.go +++ b/pkg/service/user/register.go @@ -9,8 +9,8 @@ import ( "github.com/uptrace/bun/driver/pgdriver" "golang.org/x/crypto/bcrypt" - "go.neonxp.ru/framework/pkg/model" - "go.neonxp.ru/framework/pkg/tpl" + "neonxp.ru/go/framework/pkg/model" + "neonxp.ru/go/framework/pkg/tpl" ) var ( diff --git a/pkg/tpl/layout.templ b/pkg/tpl/layout.templ index 4993b97..d95fcb3 100644 --- a/pkg/tpl/layout.templ +++ b/pkg/tpl/layout.templ @@ -1,6 +1,6 @@ package tpl -import "go.neonxp.ru/framework/pkg/utils" +import "neonxp.ru/go/framework/pkg/utils" templ Layout() { {{ user := utils.GetUserCtx(ctx) }} diff --git a/pkg/tpl/layout_templ.go b/pkg/tpl/layout_templ.go index 1edca5a..6f5f524 100644 --- a/pkg/tpl/layout_templ.go +++ b/pkg/tpl/layout_templ.go @@ -8,7 +8,7 @@ package tpl import "github.com/a-h/templ" import templruntime "github.com/a-h/templ/runtime" -import "go.neonxp.ru/framework/pkg/utils" +import "neonxp.ru/go/framework/pkg/utils" func Layout() templ.Component { return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) { diff --git a/pkg/tpl/profile.templ b/pkg/tpl/profile.templ index 61a9221..0038dd2 100644 --- a/pkg/tpl/profile.templ +++ b/pkg/tpl/profile.templ @@ -1,6 +1,6 @@ package tpl -import "go.neonxp.ru/framework/pkg/model" +import "neonxp.ru/go/framework/pkg/model" templ Profile(user *model.User) { @Layout() { diff --git a/pkg/tpl/profile_templ.go b/pkg/tpl/profile_templ.go index e51ab9a..afc6e86 100644 --- a/pkg/tpl/profile_templ.go +++ b/pkg/tpl/profile_templ.go @@ -8,7 +8,7 @@ package tpl import "github.com/a-h/templ" import templruntime "github.com/a-h/templ/runtime" -import "go.neonxp.ru/framework/pkg/model" +import "neonxp.ru/go/framework/pkg/model" func Profile(user *model.User) templ.Component { return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) { diff --git a/pkg/utils/user.go b/pkg/utils/user.go index 4006b3c..bb6c0bf 100644 --- a/pkg/utils/user.go +++ b/pkg/utils/user.go @@ -6,8 +6,8 @@ import ( "github.com/gorilla/sessions" "github.com/labstack/echo-contrib/session" "github.com/labstack/echo/v4" - "go.neonxp.ru/framework/pkg/middleware" - "go.neonxp.ru/framework/pkg/model" + "neonxp.ru/go/framework/pkg/middleware" + "neonxp.ru/go/framework/pkg/model" ) func GetUserCtx(ctx context.Context) *model.User { -- cgit v1.2.3