diff --git a/api/v1/acl.go b/server/route/api/v1/acl.go similarity index 99% rename from api/v1/acl.go rename to server/route/api/v1/acl.go index ae030a8..6b0b508 100644 --- a/api/v1/acl.go +++ b/server/route/api/v1/acl.go @@ -12,9 +12,9 @@ import ( "google.golang.org/grpc/metadata" "google.golang.org/grpc/status" - "github.com/yourselfhosted/slash/api/auth" "github.com/yourselfhosted/slash/internal/util" storepb "github.com/yourselfhosted/slash/proto/gen/store" + "github.com/yourselfhosted/slash/server/route/auth" "github.com/yourselfhosted/slash/store" ) diff --git a/api/v1/acl_config.go b/server/route/api/v1/acl_config.go similarity index 100% rename from api/v1/acl_config.go rename to server/route/api/v1/acl_config.go diff --git a/api/v1/auth_service.go b/server/route/api/v1/auth_service.go similarity index 99% rename from api/v1/auth_service.go rename to server/route/api/v1/auth_service.go index f572385..c5be51f 100644 --- a/api/v1/auth_service.go +++ b/server/route/api/v1/auth_service.go @@ -11,10 +11,10 @@ import ( "google.golang.org/grpc/metadata" "google.golang.org/grpc/status" - "github.com/yourselfhosted/slash/api/auth" apiv1pb "github.com/yourselfhosted/slash/proto/gen/api/v1" storepb "github.com/yourselfhosted/slash/proto/gen/store" "github.com/yourselfhosted/slash/server/metric" + "github.com/yourselfhosted/slash/server/route/auth" "github.com/yourselfhosted/slash/server/service/license" "github.com/yourselfhosted/slash/store" ) diff --git a/api/v1/collection_service.go b/server/route/api/v1/collection_service.go similarity index 100% rename from api/v1/collection_service.go rename to server/route/api/v1/collection_service.go diff --git a/api/v1/common.go b/server/route/api/v1/common.go similarity index 100% rename from api/v1/common.go rename to server/route/api/v1/common.go diff --git a/api/v1/memo_service.go b/server/route/api/v1/memo_service.go similarity index 100% rename from api/v1/memo_service.go rename to server/route/api/v1/memo_service.go diff --git a/api/v1/shortcut_service.go b/server/route/api/v1/shortcut_service.go similarity index 100% rename from api/v1/shortcut_service.go rename to server/route/api/v1/shortcut_service.go diff --git a/api/v1/subscription_service.go b/server/route/api/v1/subscription_service.go similarity index 100% rename from api/v1/subscription_service.go rename to server/route/api/v1/subscription_service.go diff --git a/api/v1/user_service.go b/server/route/api/v1/user_service.go similarity index 99% rename from api/v1/user_service.go rename to server/route/api/v1/user_service.go index 048195b..b33a965 100644 --- a/api/v1/user_service.go +++ b/server/route/api/v1/user_service.go @@ -12,9 +12,9 @@ import ( "google.golang.org/grpc/status" "google.golang.org/protobuf/types/known/timestamppb" - "github.com/yourselfhosted/slash/api/auth" apiv1pb "github.com/yourselfhosted/slash/proto/gen/api/v1" storepb "github.com/yourselfhosted/slash/proto/gen/store" + "github.com/yourselfhosted/slash/server/route/auth" "github.com/yourselfhosted/slash/server/service/license" "github.com/yourselfhosted/slash/store" ) diff --git a/api/v1/user_setting_service.go b/server/route/api/v1/user_setting_service.go similarity index 100% rename from api/v1/user_setting_service.go rename to server/route/api/v1/user_setting_service.go diff --git a/api/v1/v1.go b/server/route/api/v1/v1.go similarity index 100% rename from api/v1/v1.go rename to server/route/api/v1/v1.go diff --git a/api/v1/workspace_service.go b/server/route/api/v1/workspace_service.go similarity index 100% rename from api/v1/workspace_service.go rename to server/route/api/v1/workspace_service.go diff --git a/api/auth/auth.go b/server/route/auth/auth.go similarity index 100% rename from api/auth/auth.go rename to server/route/auth/auth.go diff --git a/server/server.go b/server/server.go index ffc5a75..ac92b3d 100644 --- a/server/server.go +++ b/server/server.go @@ -14,11 +14,11 @@ import ( "github.com/pkg/errors" "go.uber.org/zap" - apiv1 "github.com/yourselfhosted/slash/api/v1" "github.com/yourselfhosted/slash/internal/log" storepb "github.com/yourselfhosted/slash/proto/gen/store" "github.com/yourselfhosted/slash/server/metric" "github.com/yourselfhosted/slash/server/profile" + apiv1 "github.com/yourselfhosted/slash/server/route/api/v1" "github.com/yourselfhosted/slash/server/service/license" "github.com/yourselfhosted/slash/server/service/resource" "github.com/yourselfhosted/slash/store"