diff --git a/cmd/stbackend/main.go b/cmd/stbackend/main.go index f88d66a..1344efb 100755 --- a/cmd/stbackend/main.go +++ b/cmd/stbackend/main.go @@ -28,8 +28,8 @@ import ( "fmt" "log" - "git.zervo.org/scheduletogether/scheduletogetherbackend/internal/api" - "git.zervo.org/scheduletogether/scheduletogetherbackend/pkg/helpers/config" + "git.zervo.org/scheduletogether/backend/internal/api" + "git.zervo.org/scheduletogether/backend/pkg/helpers/config" ) // main starts the server diff --git a/go.mod b/go.mod index 2ed9df4..31d4a92 100755 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module git.zervo.org/scheduletogether/scheduletogetherbackend +module git.zervo.org/scheduletogether/backend go 1.22.1 diff --git a/internal/api/handlers/account_handler.go b/internal/api/handlers/account_handler.go index 1daecf7..15a274c 100755 --- a/internal/api/handlers/account_handler.go +++ b/internal/api/handlers/account_handler.go @@ -27,10 +27,10 @@ package handlers import ( "github.com/kataras/iris/v12" - "git.zervo.org/scheduletogether/scheduletogetherbackend/internal/api/middlewares" - "git.zervo.org/scheduletogether/scheduletogetherbackend/internal/api/services/accounts" - perms "git.zervo.org/scheduletogether/scheduletogetherbackend/pkg/permissions" - "git.zervo.org/scheduletogether/scheduletogetherbackend/pkg/types" + "git.zervo.org/scheduletogether/backend/internal/api/middlewares" + "git.zervo.org/scheduletogether/backend/internal/api/services/accounts" + perms "git.zervo.org/scheduletogether/backend/pkg/permissions" + "git.zervo.org/scheduletogether/backend/pkg/types" ) // AccountHandler_RegisterRoutes registers routes for the AccountHandler diff --git a/internal/api/handlers/friends_handler.go b/internal/api/handlers/friends_handler.go index aa276b8..44ff4d0 100755 --- a/internal/api/handlers/friends_handler.go +++ b/internal/api/handlers/friends_handler.go @@ -27,11 +27,11 @@ package handlers import ( "github.com/kataras/iris/v12" - "git.zervo.org/scheduletogether/scheduletogetherbackend/internal/api/middlewares" - "git.zervo.org/scheduletogether/scheduletogetherbackend/internal/api/services/friends" - "git.zervo.org/scheduletogether/scheduletogetherbackend/pkg/helpers/request" - perms "git.zervo.org/scheduletogether/scheduletogetherbackend/pkg/permissions" - "git.zervo.org/scheduletogether/scheduletogetherbackend/pkg/types" + "git.zervo.org/scheduletogether/backend/internal/api/middlewares" + "git.zervo.org/scheduletogether/backend/internal/api/services/friends" + "git.zervo.org/scheduletogether/backend/pkg/helpers/request" + perms "git.zervo.org/scheduletogether/backend/pkg/permissions" + "git.zervo.org/scheduletogether/backend/pkg/types" ) // FriendHandler_RegisterRoutes registers routes for the AccountHandler diff --git a/internal/api/handlers/ping_handler.go b/internal/api/handlers/ping_handler.go index f6cd80a..c9e7cdd 100755 --- a/internal/api/handlers/ping_handler.go +++ b/internal/api/handlers/ping_handler.go @@ -29,7 +29,7 @@ import ( "github.com/kataras/iris/v12" - "git.zervo.org/scheduletogether/scheduletogetherbackend/pkg/types" + "git.zervo.org/scheduletogether/backend/pkg/types" ) // PingHandler_RegisterRoutes registers routes for the PingHandler diff --git a/internal/api/handlers/users_handler.go b/internal/api/handlers/users_handler.go index 02fe4b9..779e827 100755 --- a/internal/api/handlers/users_handler.go +++ b/internal/api/handlers/users_handler.go @@ -27,9 +27,9 @@ package handlers import ( "github.com/kataras/iris/v12" - "git.zervo.org/scheduletogether/scheduletogetherbackend/internal/api/middlewares" - "git.zervo.org/scheduletogether/scheduletogetherbackend/internal/api/services/users" - perms "git.zervo.org/scheduletogether/scheduletogetherbackend/pkg/permissions" + "git.zervo.org/scheduletogether/backend/internal/api/middlewares" + "git.zervo.org/scheduletogether/backend/internal/api/services/users" + perms "git.zervo.org/scheduletogether/backend/pkg/permissions" ) // UserHandler_RegisterRoutes registers routes for the UserHandler diff --git a/internal/api/middlewares/authenticate.go b/internal/api/middlewares/authenticate.go index 5110a36..64fbc5e 100755 --- a/internal/api/middlewares/authenticate.go +++ b/internal/api/middlewares/authenticate.go @@ -30,8 +30,8 @@ import ( "github.com/kataras/iris/v12" "github.com/kataras/iris/v12/middleware/jwt" - "git.zervo.org/scheduletogether/scheduletogetherbackend/pkg/helpers/cryptography" - "git.zervo.org/scheduletogether/scheduletogetherbackend/pkg/types" + "git.zervo.org/scheduletogether/backend/pkg/helpers/cryptography" + "git.zervo.org/scheduletogether/backend/pkg/types" ) var ( diff --git a/internal/api/middlewares/authorize.go b/internal/api/middlewares/authorize.go index df39a10..b09b287 100755 --- a/internal/api/middlewares/authorize.go +++ b/internal/api/middlewares/authorize.go @@ -29,9 +29,9 @@ import ( "github.com/kataras/iris/v12" - "git.zervo.org/scheduletogether/scheduletogetherbackend/pkg/helpers/request" - "git.zervo.org/scheduletogether/scheduletogetherbackend/pkg/permissions" - "git.zervo.org/scheduletogether/scheduletogetherbackend/pkg/types" + "git.zervo.org/scheduletogether/backend/pkg/helpers/request" + "git.zervo.org/scheduletogether/backend/pkg/permissions" + "git.zervo.org/scheduletogether/backend/pkg/types" ) // Authorize checks users permissions to access a resource diff --git a/internal/api/middlewares/shared.go b/internal/api/middlewares/shared.go index c79f6e3..610ad45 100755 --- a/internal/api/middlewares/shared.go +++ b/internal/api/middlewares/shared.go @@ -1,5 +1,5 @@ package middlewares -import "git.zervo.org/scheduletogether/scheduletogetherbackend/pkg/helpers/logging" +import "git.zervo.org/scheduletogether/backend/pkg/helpers/logging" var logboi = logging.NewLogger("api.middlewares") diff --git a/internal/api/server.go b/internal/api/server.go index cb308f7..425fd84 100755 --- a/internal/api/server.go +++ b/internal/api/server.go @@ -32,11 +32,11 @@ import ( "github.com/kataras/iris/v12/middleware/logger" "github.com/kataras/iris/v12/middleware/recover" - "git.zervo.org/scheduletogether/scheduletogetherbackend/internal/api/handlers" - "git.zervo.org/scheduletogether/scheduletogetherbackend/internal/database" - "git.zervo.org/scheduletogether/scheduletogetherbackend/internal/workers" - "git.zervo.org/scheduletogether/scheduletogetherbackend/pkg/helpers/config" - "git.zervo.org/scheduletogether/scheduletogetherbackend/pkg/helpers/logging" + "git.zervo.org/scheduletogether/backend/internal/api/handlers" + "git.zervo.org/scheduletogether/backend/internal/database" + "git.zervo.org/scheduletogether/backend/internal/workers" + "git.zervo.org/scheduletogether/backend/pkg/helpers/config" + "git.zervo.org/scheduletogether/backend/pkg/helpers/logging" ) var logboi = logging.NewLogger("api.server") diff --git a/internal/api/services/accounts/accounts_register.go b/internal/api/services/accounts/accounts_register.go index 90d059c..b3cd601 100755 --- a/internal/api/services/accounts/accounts_register.go +++ b/internal/api/services/accounts/accounts_register.go @@ -27,9 +27,9 @@ package accounts import ( "github.com/kataras/iris/v12" - db "git.zervo.org/scheduletogether/scheduletogetherbackend/internal/database" - "git.zervo.org/scheduletogether/scheduletogetherbackend/pkg/helpers/cryptography" - "git.zervo.org/scheduletogether/scheduletogetherbackend/pkg/types" + db "git.zervo.org/scheduletogether/backend/internal/database" + "git.zervo.org/scheduletogether/backend/pkg/helpers/cryptography" + "git.zervo.org/scheduletogether/backend/pkg/types" ) // AccountRegister_Service registers a new user diff --git a/internal/api/services/accounts/accounts_signin.go b/internal/api/services/accounts/accounts_signin.go index 02f4605..5796173 100755 --- a/internal/api/services/accounts/accounts_signin.go +++ b/internal/api/services/accounts/accounts_signin.go @@ -32,9 +32,9 @@ import ( "github.com/kataras/iris/v12/middleware/jwt" "golang.org/x/crypto/bcrypt" - db "git.zervo.org/scheduletogether/scheduletogetherbackend/internal/database" - "git.zervo.org/scheduletogether/scheduletogetherbackend/pkg/helpers/config" - "git.zervo.org/scheduletogether/scheduletogetherbackend/pkg/types" + db "git.zervo.org/scheduletogether/backend/internal/database" + "git.zervo.org/scheduletogether/backend/pkg/helpers/config" + "git.zervo.org/scheduletogether/backend/pkg/types" ) // AccountSignin_Service signs in a user and returns a jwt token diff --git a/internal/api/services/accounts/accounts_signout.go b/internal/api/services/accounts/accounts_signout.go index a5b6484..63e55ab 100755 --- a/internal/api/services/accounts/accounts_signout.go +++ b/internal/api/services/accounts/accounts_signout.go @@ -27,7 +27,7 @@ package accounts import ( "github.com/kataras/iris/v12" - "git.zervo.org/scheduletogether/scheduletogetherbackend/pkg/types" + "git.zervo.org/scheduletogether/backend/pkg/types" ) // AccountSignout_Service signs out a user by invalidating the jwt token diff --git a/internal/api/services/accounts/accounts_verify.go b/internal/api/services/accounts/accounts_verify.go index 8030d5e..84d4bd1 100755 --- a/internal/api/services/accounts/accounts_verify.go +++ b/internal/api/services/accounts/accounts_verify.go @@ -27,8 +27,8 @@ package accounts import ( "github.com/kataras/iris/v12" - db "git.zervo.org/scheduletogether/scheduletogetherbackend/internal/database" - "git.zervo.org/scheduletogether/scheduletogetherbackend/pkg/types" + db "git.zervo.org/scheduletogether/backend/internal/database" + "git.zervo.org/scheduletogether/backend/pkg/types" ) // AccountVerify_Service verifies an account diff --git a/internal/api/services/accounts/shared.go b/internal/api/services/accounts/shared.go index a98e7a0..19b893b 100755 --- a/internal/api/services/accounts/shared.go +++ b/internal/api/services/accounts/shared.go @@ -33,10 +33,10 @@ import ( "github.com/kataras/iris/v12/middleware/jwt" "gorm.io/gorm" - db "git.zervo.org/scheduletogether/scheduletogetherbackend/internal/database" - "git.zervo.org/scheduletogether/scheduletogetherbackend/pkg/helpers/logging" - "git.zervo.org/scheduletogether/scheduletogetherbackend/pkg/helpers/validation" - "git.zervo.org/scheduletogether/scheduletogetherbackend/pkg/types" + db "git.zervo.org/scheduletogether/backend/internal/database" + "git.zervo.org/scheduletogether/backend/pkg/helpers/logging" + "git.zervo.org/scheduletogether/backend/pkg/helpers/validation" + "git.zervo.org/scheduletogether/backend/pkg/types" ) var logboi = logging.NewLogger("api.services.accounts") diff --git a/internal/api/services/friends/friend_accept.go b/internal/api/services/friends/friend_accept.go index 095f97a..08d45da 100755 --- a/internal/api/services/friends/friend_accept.go +++ b/internal/api/services/friends/friend_accept.go @@ -29,9 +29,9 @@ import ( "github.com/kataras/iris/v12" - db "git.zervo.org/scheduletogether/scheduletogetherbackend/internal/database" - "git.zervo.org/scheduletogether/scheduletogetherbackend/pkg/helpers/request" - "git.zervo.org/scheduletogether/scheduletogetherbackend/pkg/types" + db "git.zervo.org/scheduletogether/backend/internal/database" + "git.zervo.org/scheduletogether/backend/pkg/helpers/request" + "git.zervo.org/scheduletogether/backend/pkg/types" ) func FriendAccept_Service(ctx iris.Context, req types.FriendsAcceptRequest) { diff --git a/internal/api/services/friends/friend_add.go b/internal/api/services/friends/friend_add.go index a15ba64..6344704 100755 --- a/internal/api/services/friends/friend_add.go +++ b/internal/api/services/friends/friend_add.go @@ -29,9 +29,9 @@ import ( "github.com/kataras/iris/v12" - db "git.zervo.org/scheduletogether/scheduletogetherbackend/internal/database" - "git.zervo.org/scheduletogether/scheduletogetherbackend/pkg/helpers/request" - "git.zervo.org/scheduletogether/scheduletogetherbackend/pkg/types" + db "git.zervo.org/scheduletogether/backend/internal/database" + "git.zervo.org/scheduletogether/backend/pkg/helpers/request" + "git.zervo.org/scheduletogether/backend/pkg/types" ) func FriendAdd_Service(ctx iris.Context, req types.FriendsAddRequest) { diff --git a/internal/api/services/friends/friend_cancel.go b/internal/api/services/friends/friend_cancel.go index a0f6c5c..74ccda0 100755 --- a/internal/api/services/friends/friend_cancel.go +++ b/internal/api/services/friends/friend_cancel.go @@ -29,9 +29,9 @@ import ( "github.com/kataras/iris/v12" - db "git.zervo.org/scheduletogether/scheduletogetherbackend/internal/database" - "git.zervo.org/scheduletogether/scheduletogetherbackend/pkg/helpers/request" - "git.zervo.org/scheduletogether/scheduletogetherbackend/pkg/types" + db "git.zervo.org/scheduletogether/backend/internal/database" + "git.zervo.org/scheduletogether/backend/pkg/helpers/request" + "git.zervo.org/scheduletogether/backend/pkg/types" ) func FriendCancel_Service(ctx iris.Context, req types.FriendsAcceptRequest) { diff --git a/internal/api/services/friends/friends_get_requests.go b/internal/api/services/friends/friends_get_requests.go index fc91ed4..baa45c5 100755 --- a/internal/api/services/friends/friends_get_requests.go +++ b/internal/api/services/friends/friends_get_requests.go @@ -27,8 +27,8 @@ package friends import ( "github.com/kataras/iris/v12" - db "git.zervo.org/scheduletogether/scheduletogetherbackend/internal/database" - "git.zervo.org/scheduletogether/scheduletogetherbackend/pkg/types" + db "git.zervo.org/scheduletogether/backend/internal/database" + "git.zervo.org/scheduletogether/backend/pkg/types" ) func FriendsGetRequests_Service(ctx iris.Context, id uint) { diff --git a/internal/api/services/friends/shared.go b/internal/api/services/friends/shared.go index f0e6199..3c50bee 100755 --- a/internal/api/services/friends/shared.go +++ b/internal/api/services/friends/shared.go @@ -25,7 +25,7 @@ along with this program. If not, see . package friends import ( - "git.zervo.org/scheduletogether/scheduletogetherbackend/pkg/helpers/logging" + "git.zervo.org/scheduletogether/backend/pkg/helpers/logging" ) var logboi = logging.NewLogger("api.services.friends") diff --git a/internal/api/services/users/shared.go b/internal/api/services/users/shared.go index 9d83c1e..69db5e5 100755 --- a/internal/api/services/users/shared.go +++ b/internal/api/services/users/shared.go @@ -25,7 +25,7 @@ along with this program. If not, see . package users import ( - "git.zervo.org/scheduletogether/scheduletogetherbackend/pkg/helpers/logging" + "git.zervo.org/scheduletogether/backend/pkg/helpers/logging" ) var logboi = logging.NewLogger("api.services.users") diff --git a/internal/api/services/users/users_get.go b/internal/api/services/users/users_get.go index 61fe7e3..d83bfb8 100755 --- a/internal/api/services/users/users_get.go +++ b/internal/api/services/users/users_get.go @@ -27,8 +27,8 @@ package users import ( "github.com/kataras/iris/v12" - db "git.zervo.org/scheduletogether/scheduletogetherbackend/internal/database" - "git.zervo.org/scheduletogether/scheduletogetherbackend/pkg/types" + db "git.zervo.org/scheduletogether/backend/internal/database" + "git.zervo.org/scheduletogether/backend/pkg/types" ) // UsersGet_Service gets all users from the database diff --git a/internal/api/services/users/users_getbyid.go b/internal/api/services/users/users_getbyid.go index f83df72..cb10aa7 100755 --- a/internal/api/services/users/users_getbyid.go +++ b/internal/api/services/users/users_getbyid.go @@ -27,8 +27,8 @@ package users import ( "github.com/kataras/iris/v12" - db "git.zervo.org/scheduletogether/scheduletogetherbackend/internal/database" - "git.zervo.org/scheduletogether/scheduletogetherbackend/pkg/types" + db "git.zervo.org/scheduletogether/backend/internal/database" + "git.zervo.org/scheduletogether/backend/pkg/types" ) // UsersGetById_Service gets a single user from the database by id diff --git a/internal/api/services/users/users_getbyuuid.go b/internal/api/services/users/users_getbyuuid.go index cd2f797..7d17e58 100755 --- a/internal/api/services/users/users_getbyuuid.go +++ b/internal/api/services/users/users_getbyuuid.go @@ -27,8 +27,8 @@ package users import ( "github.com/kataras/iris/v12" - db "git.zervo.org/scheduletogether/scheduletogetherbackend/internal/database" - "git.zervo.org/scheduletogether/scheduletogetherbackend/pkg/types" + db "git.zervo.org/scheduletogether/backend/internal/database" + "git.zervo.org/scheduletogether/backend/pkg/types" ) // UsersGetByUuid_Service gets all users from the database by uuid diff --git a/internal/api/services/users/users_getself.go b/internal/api/services/users/users_getself.go index b10fd02..1ebdcfc 100755 --- a/internal/api/services/users/users_getself.go +++ b/internal/api/services/users/users_getself.go @@ -27,9 +27,9 @@ package users import ( "github.com/kataras/iris/v12" - db "git.zervo.org/scheduletogether/scheduletogetherbackend/internal/database" - "git.zervo.org/scheduletogether/scheduletogetherbackend/pkg/helpers/request" - "git.zervo.org/scheduletogether/scheduletogetherbackend/pkg/types" + db "git.zervo.org/scheduletogether/backend/internal/database" + "git.zervo.org/scheduletogether/backend/pkg/helpers/request" + "git.zervo.org/scheduletogether/backend/pkg/types" ) // UsersGetSelf_Service gets all users from the database diff --git a/internal/database/database.go b/internal/database/database.go index d331ce2..26a019f 100755 --- a/internal/database/database.go +++ b/internal/database/database.go @@ -30,8 +30,8 @@ import ( "gorm.io/driver/sqlite" "gorm.io/gorm" - "git.zervo.org/scheduletogether/scheduletogetherbackend/pkg/helpers/config" - "git.zervo.org/scheduletogether/scheduletogetherbackend/pkg/helpers/logging" + "git.zervo.org/scheduletogether/backend/pkg/helpers/config" + "git.zervo.org/scheduletogether/backend/pkg/helpers/logging" ) var logboi = logging.NewLogger("database") diff --git a/internal/workers/coordinator.go b/internal/workers/coordinator.go index 44cd55e..24fd555 100755 --- a/internal/workers/coordinator.go +++ b/internal/workers/coordinator.go @@ -29,7 +29,7 @@ import ( "github.com/robfig/cron/v3" - "git.zervo.org/scheduletogether/scheduletogetherbackend/pkg/helpers/logging" + "git.zervo.org/scheduletogether/backend/pkg/helpers/logging" ) var logboi = logging.NewLogger("workers") diff --git a/internal/workers/worker_friends.go b/internal/workers/worker_friends.go index d74f4fe..a0d60b0 100755 --- a/internal/workers/worker_friends.go +++ b/internal/workers/worker_friends.go @@ -5,7 +5,7 @@ import ( "gorm.io/gorm" - db "git.zervo.org/scheduletogether/scheduletogetherbackend/internal/database" + db "git.zervo.org/scheduletogether/backend/internal/database" ) func workerFriends_PurgeAbandonedRequests() { diff --git a/internal/workers/worker_schedules.go b/internal/workers/worker_schedules.go index 2d55d8b..1724cc0 100755 --- a/internal/workers/worker_schedules.go +++ b/internal/workers/worker_schedules.go @@ -5,7 +5,7 @@ import ( "gorm.io/gorm" - db "git.zervo.org/scheduletogether/scheduletogetherbackend/internal/database" + db "git.zervo.org/scheduletogether/backend/internal/database" ) func workerSchedules_PurgeAbandonedData() { diff --git a/pkg/helpers/config/config.go b/pkg/helpers/config/config.go index 2c1beb4..b91778d 100755 --- a/pkg/helpers/config/config.go +++ b/pkg/helpers/config/config.go @@ -29,7 +29,7 @@ import ( "os" "strconv" - "git.zervo.org/scheduletogether/scheduletogetherbackend/pkg/types" + "git.zervo.org/scheduletogether/backend/pkg/types" ) // Required environment variables diff --git a/pkg/helpers/cryptography/cryptography.go b/pkg/helpers/cryptography/cryptography.go index f487adc..38324d5 100755 --- a/pkg/helpers/cryptography/cryptography.go +++ b/pkg/helpers/cryptography/cryptography.go @@ -29,8 +29,8 @@ import ( "golang.org/x/crypto/bcrypt" - "git.zervo.org/scheduletogether/scheduletogetherbackend/pkg/helpers/config" - "git.zervo.org/scheduletogether/scheduletogetherbackend/pkg/helpers/logging" + "git.zervo.org/scheduletogether/backend/pkg/helpers/config" + "git.zervo.org/scheduletogether/backend/pkg/helpers/logging" ) var logboi = logging.NewLogger("crypto") diff --git a/pkg/helpers/request/jwt.go b/pkg/helpers/request/jwt.go index 6960d4e..2d29336 100755 --- a/pkg/helpers/request/jwt.go +++ b/pkg/helpers/request/jwt.go @@ -28,7 +28,7 @@ import ( "github.com/kataras/iris/v12" "github.com/kataras/iris/v12/middleware/jwt" - "git.zervo.org/scheduletogether/scheduletogetherbackend/pkg/types" + "git.zervo.org/scheduletogether/backend/pkg/types" ) func GetUserClaims(ctx iris.Context) *types.Claims { diff --git a/pkg/permissions/core.go b/pkg/permissions/core.go index ec9b57d..feca93f 100755 --- a/pkg/permissions/core.go +++ b/pkg/permissions/core.go @@ -1,7 +1,7 @@ package permissions import ( - "git.zervo.org/scheduletogether/scheduletogetherbackend/pkg/types" + "git.zervo.org/scheduletogether/backend/pkg/types" ) const (