restructure directories

* set log level based on env

apps/server/src/core/attachment/attachment.controller.ts

@@ -18,16 +18,16 @@ import { AttachmentService } from './services/attachment.service';
 import { FastifyReply } from 'fastify';
 import { AttachmentInterceptor } from './interceptors/attachment.interceptor';
 import * as bytes from 'bytes';
-import { AuthUser } from '../../decorators/auth-user.decorator';
-import { AuthWorkspace } from '../../decorators/auth-workspace.decorator';
-import { JwtAuthGuard } from '../../guards/jwt-auth.guard';
+import { AuthUser } from '../../common/decorators/auth-user.decorator';
+import { AuthWorkspace } from '../../common/decorators/auth-workspace.decorator';
+import { JwtAuthGuard } from '../../common/guards/jwt-auth.guard';
 import { User, Workspace } from '@docmost/db/types/entity.types';
 import { StorageService } from '../../integrations/storage/storage.service';
 import {
   getAttachmentFolderPath,
   validAttachmentTypes,
 } from './attachment.utils';
-import { getMimeType } from '../../helpers';
+import { getMimeType } from '../../common/helpers';
 import {
   AttachmentType,
   MAX_AVATAR_SIZE,

apps/server/src/core/auth/auth.controller.ts

@@ -15,10 +15,10 @@ import { SetupGuard } from './guards/setup.guard';
 import { EnvironmentService } from '../../integrations/environment/environment.service';
 import { CreateAdminUserDto } from './dto/create-admin-user.dto';
 import { ChangePasswordDto } from './dto/change-password.dto';
-import { AuthUser } from '../../decorators/auth-user.decorator';
+import { AuthUser } from '../../common/decorators/auth-user.decorator';
 import { User, Workspace } from '@docmost/db/types/entity.types';
-import { AuthWorkspace } from '../../decorators/auth-workspace.decorator';
-import { JwtAuthGuard } from '../../guards/jwt-auth.guard';
+import { AuthWorkspace } from '../../common/decorators/auth-workspace.decorator';
+import { JwtAuthGuard } from '../../common/guards/jwt-auth.guard';
 
 @Controller('auth')
 export class AuthController {

apps/server/src/core/auth/services/auth.service.ts

@@ -11,7 +11,7 @@ import { TokensDto } from '../dto/tokens.dto';
 import { SignupService } from './signup.service';
 import { CreateAdminUserDto } from '../dto/create-admin-user.dto';
 import { UserRepo } from '@docmost/db/repos/user/user.repo';
-import { comparePasswordHash, hashPassword } from '../../../helpers';
+import { comparePasswordHash, hashPassword } from '../../../common/helpers';
 import { ChangePasswordDto } from '../dto/change-password.dto';
 import { MailService } from '../../../integrations/mail/mail.service';
 import ChangePasswordEmail from '@docmost/transactional/emails/change-password-email';

apps/server/src/core/auth/services/signup.service.ts

@@ -9,7 +9,7 @@ import { executeTx } from '@docmost/db/utils';
 import { InjectKysely } from 'nestjs-kysely';
 import { User } from '@docmost/db/types/entity.types';
 import { GroupUserRepo } from '@docmost/db/repos/group/group-user.repo';
-import { UserRole } from '../../../helpers/types/permission';
+import { UserRole } from '../../../common/helpers/types/permission';
 
 @Injectable()
 export class SignupService {

apps/server/src/core/casl/abilities/space-ability.factory.ts

@@ -4,7 +4,7 @@ import {
   createMongoAbility,
   MongoAbility,
 } from '@casl/ability';
-import { SpaceRole } from '../../../helpers/types/permission';
+import { SpaceRole } from '../../../common/helpers/types/permission';
 import { User } from '@docmost/db/types/entity.types';
 import { SpaceMemberRepo } from '@docmost/db/repos/space/space-member.repo';
 import {

apps/server/src/core/casl/abilities/workspace-ability.factory.ts

@@ -4,7 +4,7 @@ import {
   createMongoAbility,
   MongoAbility,
 } from '@casl/ability';
-import { UserRole } from '../../../helpers/types/permission';
+import { UserRole } from '../../../common/helpers/types/permission';
 import { User, Workspace } from '@docmost/db/types/entity.types';
 import {
   IWorkspaceAbility,

apps/server/src/core/comment/comment.controller.ts

@@ -12,9 +12,9 @@ import { CommentService } from './comment.service';
 import { CreateCommentDto } from './dto/create-comment.dto';
 import { UpdateCommentDto } from './dto/update-comment.dto';
 import { PageIdDto, CommentIdDto } from './dto/comments.input';
-import { AuthUser } from '../../decorators/auth-user.decorator';
-import { AuthWorkspace } from '../../decorators/auth-workspace.decorator';
-import { JwtAuthGuard } from '../../guards/jwt-auth.guard';
+import { AuthUser } from '../../common/decorators/auth-user.decorator';
+import { AuthWorkspace } from '../../common/decorators/auth-workspace.decorator';
+import { JwtAuthGuard } from '../../common/guards/jwt-auth.guard';
 import { PaginationOptions } from '@docmost/db/pagination/pagination-options';
 import { User, Workspace } from '@docmost/db/types/entity.types';
 import SpaceAbilityFactory from '../casl/abilities/space-ability.factory';

apps/server/src/core/core.module.ts

@@ -14,7 +14,7 @@ import { SearchModule } from './search/search.module';
 import { SpaceModule } from './space/space.module';
 import { GroupModule } from './group/group.module';
 import { CaslModule } from './casl/casl.module';
-import { DomainMiddleware } from '../middlewares/domain.middleware';
+import { DomainMiddleware } from '../common/middlewares/domain.middleware';
 
 @Module({
   imports: [

apps/server/src/core/group/group.controller.ts

@@ -9,15 +9,15 @@ import {
 } from '@nestjs/common';
 import { GroupService } from './services/group.service';
 import { CreateGroupDto } from './dto/create-group.dto';
-import { AuthUser } from '../../decorators/auth-user.decorator';
-import { AuthWorkspace } from '../../decorators/auth-workspace.decorator';
+import { AuthUser } from '../../common/decorators/auth-user.decorator';
+import { AuthWorkspace } from '../../common/decorators/auth-workspace.decorator';
 import { GroupUserService } from './services/group-user.service';
 import { GroupIdDto } from './dto/group-id.dto';
 import { PaginationOptions } from '@docmost/db/pagination/pagination-options';
 import { AddGroupUserDto } from './dto/add-group-user.dto';
 import { RemoveGroupUserDto } from './dto/remove-group-user.dto';
 import { UpdateGroupDto } from './dto/update-group.dto';
-import { JwtAuthGuard } from '../../guards/jwt-auth.guard';
+import { JwtAuthGuard } from '../../common/guards/jwt-auth.guard';
 import { User, Workspace } from '@docmost/db/types/entity.types';
 import WorkspaceAbilityFactory from '../casl/abilities/workspace-ability.factory';
 import {

apps/server/src/core/page/page.controller.ts

@@ -14,9 +14,9 @@ import { UpdatePageDto } from './dto/update-page.dto';
 import { MovePageDto } from './dto/move-page.dto';
 import { PageHistoryIdDto, PageIdDto, PageInfoDto } from './dto/page.dto';
 import { PageHistoryService } from './services/page-history.service';
-import { AuthUser } from '../../decorators/auth-user.decorator';
-import { AuthWorkspace } from '../../decorators/auth-workspace.decorator';
-import { JwtAuthGuard } from '../../guards/jwt-auth.guard';
+import { AuthUser } from '../../common/decorators/auth-user.decorator';
+import { AuthWorkspace } from '../../common/decorators/auth-workspace.decorator';
+import { JwtAuthGuard } from '../../common/guards/jwt-auth.guard';
 import { PaginationOptions } from '@docmost/db/pagination/pagination-options';
 import { User, Workspace } from '@docmost/db/types/entity.types';
 import { SidebarPageDto } from './dto/sidebar-page.dto';

apps/server/src/core/page/services/page.service.ts

@@ -18,7 +18,7 @@ import { generateJitteredKeyBetween } from 'fractional-indexing-jittered';
 import { MovePageDto } from '../dto/move-page.dto';
 import { ExpressionBuilder } from 'kysely';
 import { DB } from '@docmost/db/types/db';
-import { generateSlugId } from '../../../helpers';
+import { generateSlugId } from '../../../common/helpers';
 
 @Injectable()
 export class PageService {

apps/server/src/core/search/search.controller.ts

@@ -10,15 +10,15 @@ import {
 } from '@nestjs/common';
 import { SearchService } from './search.service';
 import { SearchDTO, SearchSuggestionDTO } from './dto/search.dto';
-import { AuthWorkspace } from '../../decorators/auth-workspace.decorator';
-import { JwtAuthGuard } from '../../guards/jwt-auth.guard';
+import { AuthWorkspace } from '../../common/decorators/auth-workspace.decorator';
+import { JwtAuthGuard } from '../../common/guards/jwt-auth.guard';
 import { User, Workspace } from '@docmost/db/types/entity.types';
 import SpaceAbilityFactory from '../casl/abilities/space-ability.factory';
 import {
   SpaceCaslAction,
   SpaceCaslSubject,
 } from '../casl/interfaces/space-ability.type';
-import { AuthUser } from '../../decorators/auth-user.decorator';
+import { AuthUser } from '../../common/decorators/auth-user.decorator';
 
 @UseGuards(JwtAuthGuard)
 @Controller('search')

apps/server/src/core/space/dto/add-space-members.dto.ts

@@ -1,11 +1,6 @@
-import {
-  ArrayMaxSize,
-  IsArray,
-  IsEnum,
-  IsUUID,
-} from 'class-validator';
+import { ArrayMaxSize, IsArray, IsEnum, IsUUID } from 'class-validator';
 import { SpaceIdDto } from './space-id.dto';
-import { SpaceRole } from '../../../helpers/types/permission';
+import { SpaceRole } from '../../../common/helpers/types/permission';
 
 export class AddSpaceMembersDto extends SpaceIdDto {
   // @IsOptional()

apps/server/src/core/space/dto/update-space-member-role.dto.ts

@@ -1,6 +1,6 @@
 import { IsEnum, IsNotEmpty, IsOptional, IsUUID } from 'class-validator';
 import { SpaceIdDto } from './space-id.dto';
-import { SpaceRole } from '../../../helpers/types/permission';
+import { SpaceRole } from '../../../common/helpers/types/permission';
 
 export class UpdateSpaceMemberRoleDto extends SpaceIdDto {
   @IsOptional()

apps/server/src/core/space/services/space-member.service.ts

@@ -12,7 +12,7 @@ import { Space, SpaceMember, User } from '@docmost/db/types/entity.types';
 import { SpaceRepo } from '@docmost/db/repos/space/space.repo';
 import { RemoveSpaceMemberDto } from '../dto/remove-space-member.dto';
 import { UpdateSpaceMemberRoleDto } from '../dto/update-space-member-role.dto';
-import { SpaceRole } from '../../../helpers/types/permission';
+import { SpaceRole } from '../../../common/helpers/types/permission';
 import { PaginationResult } from '@docmost/db/pagination/pagination';
 
 @Injectable()

apps/server/src/core/space/space.controller.ts

@@ -10,9 +10,9 @@ import {
   UseGuards,
 } from '@nestjs/common';
 import { SpaceService } from './services/space.service';
-import { AuthUser } from '../../decorators/auth-user.decorator';
-import { AuthWorkspace } from '../../decorators/auth-workspace.decorator';
-import { JwtAuthGuard } from '../../guards/jwt-auth.guard';
+import { AuthUser } from '../../common/decorators/auth-user.decorator';
+import { AuthWorkspace } from '../../common/decorators/auth-workspace.decorator';
+import { JwtAuthGuard } from '../../common/guards/jwt-auth.guard';
 import { SpaceIdDto } from './dto/space-id.dto';
 import { PaginationOptions } from '@docmost/db/pagination/pagination-options';
 import { SpaceMemberService } from './services/space-member.service';

apps/server/src/core/user/user.controller.ts

@@ -8,9 +8,9 @@ import {
 } from '@nestjs/common';
 import { UserService } from './user.service';
 import { UpdateUserDto } from './dto/update-user.dto';
-import { AuthUser } from '../../decorators/auth-user.decorator';
-import { JwtAuthGuard } from '../../guards/jwt-auth.guard';
-import { AuthWorkspace } from '../../decorators/auth-workspace.decorator';
+import { AuthUser } from '../../common/decorators/auth-user.decorator';
+import { JwtAuthGuard } from '../../common/guards/jwt-auth.guard';
+import { AuthWorkspace } from '../../common/decorators/auth-workspace.decorator';
 import { User, Workspace } from '@docmost/db/types/entity.types';
 
 @UseGuards(JwtAuthGuard)

apps/server/src/core/workspace/controllers/workspace.controller.ts

@@ -11,18 +11,18 @@ import {
 import { WorkspaceService } from '../services/workspace.service';
 import { UpdateWorkspaceDto } from '../dto/update-workspace.dto';
 import { UpdateWorkspaceUserRoleDto } from '../dto/update-workspace-user-role.dto';
-import { AuthUser } from '../../../decorators/auth-user.decorator';
-import { AuthWorkspace } from '../../../decorators/auth-workspace.decorator';
+import { AuthUser } from '../../../common/decorators/auth-user.decorator';
+import { AuthWorkspace } from '../../../common/decorators/auth-workspace.decorator';
 import { PaginationOptions } from '@docmost/db/pagination/pagination-options';
 import { WorkspaceInvitationService } from '../services/workspace-invitation.service';
-import { Public } from '../../../decorators/public.decorator';
+import { Public } from '../../../common/decorators/public.decorator';
 import {
   AcceptInviteDto,
   InvitationIdDto,
   InviteUserDto,
   RevokeInviteDto,
 } from '../dto/invitation.dto';
-import { JwtAuthGuard } from '../../../guards/jwt-auth.guard';
+import { JwtAuthGuard } from '../../../common/guards/jwt-auth.guard';
 import { User, Workspace } from '@docmost/db/types/entity.types';
 import WorkspaceAbilityFactory from '../../casl/abilities/workspace-ability.factory';
 import {

apps/server/src/core/workspace/dto/invitation.dto.ts

@@ -11,7 +11,7 @@ import {
   MaxLength,
   MinLength,
 } from 'class-validator';
-import { UserRole } from '../../../helpers/types/permission';
+import { UserRole } from '../../../common/helpers/types/permission';
 
 export class InviteUserDto {
   @IsArray()

apps/server/src/core/workspace/services/workspace-invitation.service.ts

@@ -16,12 +16,12 @@ import {
 } from '@docmost/db/types/entity.types';
 import { MailService } from '../../../integrations/mail/mail.service';
 import InvitationEmail from '@docmost/transactional/emails/invitation-email';
-import { hashPassword } from '../../../helpers';
+import { hashPassword } from '../../../common/helpers';
 import { GroupUserRepo } from '@docmost/db/repos/group/group-user.repo';
 import InvitationAcceptedEmail from '@docmost/transactional/emails/invitation-accepted-email';
 import { EnvironmentService } from '../../../integrations/environment/environment.service';
 import { TokenService } from '../../auth/services/token.service';
-import { nanoIdGen } from '../../../helpers/nanoid.utils';
+import { nanoIdGen } from '../../../common/helpers/nanoid.utils';
 import { PaginationOptions } from '@docmost/db/pagination/pagination-options';
 import { executeWithPagination } from '@docmost/db/pagination/pagination';
 import { TokensDto } from '../../auth/dto/tokens.dto';

apps/server/src/core/workspace/services/workspace.service.ts

@@ -7,7 +7,7 @@ import { CreateWorkspaceDto } from '../dto/create-workspace.dto';
 import { UpdateWorkspaceDto } from '../dto/update-workspace.dto';
 import { SpaceService } from '../../space/services/space.service';
 import { CreateSpaceDto } from '../../space/dto/create-space.dto';
-import { SpaceRole, UserRole } from '../../../helpers/types/permission';
+import { SpaceRole, UserRole } from '../../../common/helpers/types/permission';
 import { SpaceMemberService } from '../../space/services/space-member.service';
 import { WorkspaceRepo } from '@docmost/db/repos/workspace/workspace.repo';
 import { KyselyDB, KyselyTransaction } from '@docmost/db/types/kysely.types';