From b90e78e1b76a6ac77fbed4277b38339698660d15 Mon Sep 17 00:00:00 2001 From: styve Lioumba Date: Tue, 23 Dec 2025 09:06:41 +0100 Subject: [PATCH] refacto : restructuration du projet --- .../authentification/auth.facade.ts | 20 ++++----- .../location/location.facade.ts | 2 +- .../profiles/profile.facade.ts | 21 ++++----- .../profiles/profile.presenter.model.ts | 2 +- .../profiles/profile.presenter.ts | 10 ++--- .../projects/project.facade.ts | 14 +++--- .../projects/project.presenter.model.ts | 0 .../projects/project.presenter.ts | 2 +- .../{ui => adapters}/sectors/sector.facade.ts | 10 ++--- .../sectors/sector.presenter.model.ts | 0 .../sectors/sector.presenter.ts | 2 +- .../settings/settings.facade.ts | 8 ++-- .../shared/services/feedback.service.ts | 0 .../shared/services/file-manager.service.ts | 0 src/app/{ui => adapters}/users/user.facade.ts | 10 ++--- .../users/user.presenter.model.ts | 0 .../{ui => adapters}/users/user.presenter.ts | 2 +- src/app/app.component.ts | 2 +- src/app/app.routes.ts | 13 +++--- .../get-current-user.usecase.ts | 0 .../authentification/login.usecase.ts | 0 .../authentification/logout.usecase.ts | 0 .../authentification/register.usecase.ts | 0 .../send-request-password-reset.usecase.ts | 0 .../send-verification-email.usecase.ts | 0 .../verify-authenticated.usecase.ts | 0 .../authentification/verify-email.usecase.ts | 0 .../location/get-current-location.use-case.ts | 0 .../profiles/create-profile.usecase.ts | 0 .../profiles/get-profile.usecase.ts | 0 .../profiles/list-profiles.usecase.ts | 0 .../update-coordinate-profile.usecase.ts | 0 .../profiles/update-profile.usecase.ts | 0 .../update-settings-profile.usecase.ts | 0 .../projects/create-project.usecase.ts | 0 .../projects/get-project.usecase.ts | 0 .../projects/list-project.usecase.ts | 0 .../projects/update-project.usecase.ts | 0 .../sectors/get-sector.usecase.ts | 0 .../sectors/list-sector.usecase.ts | 0 .../settings/apply-theme.usecase.ts | 0 .../get-default-system-theme.usecase.ts | 0 .../settings/get-settings.usecase.ts | 0 .../settings/update-settings.usecase.ts | 0 .../users/get-user.usecase.ts | 0 .../users/update-user.usecase.ts | 0 .../guard/authentication/auth.guard.spec.ts | 2 +- .../core/guard/authentication/auth.guard.ts | 2 +- .../core/services/theme/theme.service.spec.ts | 45 ------------------- src/app/core/services/theme/theme.service.ts | 12 ----- .../btn-loading/btn-loading.component.ts | 2 +- .../components/chips/chips.component.ts | 2 +- .../shared/components/map/map.component.ts | 2 +- .../my-profile-project-item.component.ts | 2 +- .../my-profile-project-list.component.ts | 2 +- ...y-profile-update-cv-form.component.spec.ts | 6 +-- .../my-profile-update-cv-form.component.ts | 6 +-- .../my-profile-update-form.component.ts | 6 +-- ...y-profile-update-project-form.component.ts | 4 +- .../nav-bar/nav-bar.component.spec.ts | 9 ---- .../components/nav-bar/nav-bar.component.ts | 8 +--- .../project-item/project-item.component.ts | 2 +- .../project-list/project-list.component.ts | 2 +- .../project-picture-form.component.spec.ts | 8 ++-- .../project-picture-form.component.ts | 6 +-- .../user-avatar-form.component.spec.ts | 8 ++-- .../user-avatar-form.component.ts | 6 +-- .../user-form/user-form.component.ts | 2 +- .../user-password-form.component.spec.ts | 4 +- .../user-password-form.component.ts | 4 +- .../vertical-profile-item.component.spec.ts | 2 +- .../vertical-profile-item.component.ts | 4 +- .../vertical-profile-list.component.ts | 2 +- .../features/filter/filter.component.ts | 4 +- .../forgot-password.component.spec.ts | 2 +- .../forgot-password.component.ts | 2 +- .../shared/features/login/login.component.ts | 2 +- .../my-profile-map.component.ts | 6 +-- .../pdf-viewer/pdf-viewer.component.spec.ts | 2 +- .../pdf-viewer/pdf-viewer.component.ts | 2 +- .../profile-list-map.component.ts | 4 +- .../features/register/register.component.ts | 2 +- .../settings/settings.component.spec.ts | 2 +- .../features/settings/settings.component.ts | 6 +-- .../update-user/update-user.component.ts | 2 +- .../authentification/.gitkeep | 0 .../authentification/auth.facade.mock.ts | 0 .../profiles/profile.facade.mock.ts | 0 .../profiles/profile.facade.spec.ts | 4 +- .../profiles/profile.presenter.spec.ts | 2 +- .../projects/project.facade.mock.ts | 0 .../projects/project.facade.spec.ts | 2 +- .../projects/project.presenter.spec.ts | 4 +- .../sectors/sector.facade.spec.ts | 2 +- .../sectors/sector.presenter.spec.ts | 2 +- .../shared/file-manager.service.spec.ts | 2 +- .../users/user.facade.mock.ts | 0 .../users/user.facade.spec.ts | 2 +- .../authentification/.gitkeep | 0 .../authentification/get-user.usecase.spec.ts | 2 +- .../authentification/login.usecase.spec.ts | 2 +- .../authentification/logout.usecase.spec.ts | 2 +- .../authentification/register.usecase.spec.ts | 2 +- .../send-request-password.usecase.spec.ts | 2 +- .../send-verification-email.usecase.spec.ts | 2 +- .../verify-auth.usecase.spec.ts | 2 +- .../verify-email.usecase.spec.ts | 2 +- .../profiles/create-profile.usecase.spec.ts | 2 +- .../profiles/get-profile.usecase.spec.ts | 2 +- .../profiles/list-profiles.usecase.spec.ts | 4 +- .../profiles/update-profile.usecase.spec.ts | 2 +- .../projects/create-project.usecase.spec.ts | 2 +- .../projects/get-project.usecase.spec.ts | 2 +- .../projects/list-project.usecase.spec.ts | 2 +- .../projects/update-project.usecase.spec.ts | 2 +- .../sectors/get-sector.usecase.spec.ts | 2 +- .../sectors/list-sector.usecase.spec.ts | 2 +- .../users/get-user.usecase.spec.ts | 2 +- .../users/update-user.usecase.spec.ts | 2 +- .../authentification/auth/auth.component.html | 0 .../authentification/auth/auth.component.scss | 0 .../auth/auth.component.spec.ts | 0 .../authentification/auth/auth.component.ts | 4 +- .../authentification-routing.module.ts | 5 +-- .../authentification.module.ts | 0 .../home/home-routing.module.ts | 2 +- .../home/home.component.html | 0 .../home/home.component.scss | 0 .../home/home.component.spec.ts | 0 .../{routes => views}/home/home.component.ts | 0 src/app/{routes => views}/home/home.module.ts | 0 .../my-profile/my-profile-routing.module.ts | 2 +- .../my-profile/my-profile.component.html | 0 .../my-profile/my-profile.component.scss | 0 .../my-profile/my-profile.component.spec.ts | 0 .../my-profile/my-profile.component.ts | 6 +-- .../my-profile/my-profile.module.ts | 0 .../not-found/not-found-routing.module.ts | 2 +- .../not-found/not-found.component.html | 0 .../not-found/not-found.component.scss | 0 .../not-found/not-found.component.spec.ts | 0 .../not-found/not-found.component.ts | 0 .../not-found/not-found.module.ts | 0 .../profile-detail.component.html | 0 .../profile-detail.component.scss | 0 .../profile-detail.component.spec.ts | 0 .../profile-detail.component.ts | 6 +-- .../profile-list/profile-list.component.html | 0 .../profile-list/profile-list.component.scss | 0 .../profile-list.component.spec.ts | 0 .../profile-list/profile-list.component.ts | 2 +- .../profile/profile-routing.module.ts | 4 +- .../profile/profile.module.ts | 0 tsconfig.json | 6 +-- 154 files changed, 167 insertions(+), 248 deletions(-) rename src/app/{ui => adapters}/authentification/auth.facade.ts (87%) rename src/app/{ui => adapters}/location/location.facade.ts (93%) rename src/app/{ui => adapters}/profiles/profile.facade.ts (90%) rename src/app/{ui => adapters}/profiles/profile.presenter.model.ts (92%) rename src/app/{ui => adapters}/profiles/profile.presenter.ts (91%) rename src/app/{ui => adapters}/projects/project.facade.ts (88%) rename src/app/{ui => adapters}/projects/project.presenter.model.ts (100%) rename src/app/{ui => adapters}/projects/project.presenter.ts (91%) rename src/app/{ui => adapters}/sectors/sector.facade.ts (87%) rename src/app/{ui => adapters}/sectors/sector.presenter.model.ts (100%) rename src/app/{ui => adapters}/sectors/sector.presenter.ts (83%) rename src/app/{ui => adapters}/settings/settings.facade.ts (84%) rename src/app/{ui => adapters}/shared/services/feedback.service.ts (100%) rename src/app/{ui => adapters}/shared/services/file-manager.service.ts (100%) rename src/app/{ui => adapters}/users/user.facade.ts (87%) rename src/app/{ui => adapters}/users/user.presenter.model.ts (100%) rename src/app/{ui => adapters}/users/user.presenter.ts (96%) rename src/app/{usecase => application}/authentification/get-current-user.usecase.ts (100%) rename src/app/{usecase => application}/authentification/login.usecase.ts (100%) rename src/app/{usecase => application}/authentification/logout.usecase.ts (100%) rename src/app/{usecase => application}/authentification/register.usecase.ts (100%) rename src/app/{usecase => application}/authentification/send-request-password-reset.usecase.ts (100%) rename src/app/{usecase => application}/authentification/send-verification-email.usecase.ts (100%) rename src/app/{usecase => application}/authentification/verify-authenticated.usecase.ts (100%) rename src/app/{usecase => application}/authentification/verify-email.usecase.ts (100%) rename src/app/{usecase => application}/location/get-current-location.use-case.ts (100%) rename src/app/{usecase => application}/profiles/create-profile.usecase.ts (100%) rename src/app/{usecase => application}/profiles/get-profile.usecase.ts (100%) rename src/app/{usecase => application}/profiles/list-profiles.usecase.ts (100%) rename src/app/{usecase => application}/profiles/update-coordinate-profile.usecase.ts (100%) rename src/app/{usecase => application}/profiles/update-profile.usecase.ts (100%) rename src/app/{usecase => application}/profiles/update-settings-profile.usecase.ts (100%) rename src/app/{usecase => application}/projects/create-project.usecase.ts (100%) rename src/app/{usecase => application}/projects/get-project.usecase.ts (100%) rename src/app/{usecase => application}/projects/list-project.usecase.ts (100%) rename src/app/{usecase => application}/projects/update-project.usecase.ts (100%) rename src/app/{usecase => application}/sectors/get-sector.usecase.ts (100%) rename src/app/{usecase => application}/sectors/list-sector.usecase.ts (100%) rename src/app/{usecase => application}/settings/apply-theme.usecase.ts (100%) rename src/app/{usecase => application}/settings/get-default-system-theme.usecase.ts (100%) rename src/app/{usecase => application}/settings/get-settings.usecase.ts (100%) rename src/app/{usecase => application}/settings/update-settings.usecase.ts (100%) rename src/app/{usecase => application}/users/get-user.usecase.ts (100%) rename src/app/{usecase => application}/users/update-user.usecase.ts (100%) delete mode 100644 src/app/core/services/theme/theme.service.spec.ts delete mode 100644 src/app/core/services/theme/theme.service.ts rename src/app/testing/{ui => adapters}/authentification/.gitkeep (100%) rename src/app/testing/{ui => adapters}/authentification/auth.facade.mock.ts (100%) rename src/app/testing/{ui => adapters}/profiles/profile.facade.mock.ts (100%) rename src/app/testing/{ui => adapters}/profiles/profile.facade.spec.ts (95%) rename src/app/testing/{ui => adapters}/profiles/profile.presenter.spec.ts (96%) rename src/app/testing/{ui => adapters}/projects/project.facade.mock.ts (100%) rename src/app/testing/{ui => adapters}/projects/project.facade.spec.ts (97%) rename src/app/testing/{ui => adapters}/projects/project.presenter.spec.ts (93%) rename src/app/testing/{ui => adapters}/sectors/sector.facade.spec.ts (96%) rename src/app/testing/{ui => adapters}/sectors/sector.presenter.spec.ts (91%) rename src/app/testing/{ui => adapters}/shared/file-manager.service.spec.ts (97%) rename src/app/testing/{ui => adapters}/users/user.facade.mock.ts (100%) rename src/app/testing/{ui => adapters}/users/user.facade.spec.ts (95%) rename src/app/testing/{usecase => application}/authentification/.gitkeep (100%) rename src/app/testing/{usecase => application}/authentification/get-user.usecase.spec.ts (81%) rename src/app/testing/{usecase => application}/authentification/login.usecase.spec.ts (88%) rename src/app/testing/{usecase => application}/authentification/logout.usecase.spec.ts (85%) rename src/app/testing/{usecase => application}/authentification/register.usecase.spec.ts (88%) rename src/app/testing/{usecase => application}/authentification/send-request-password.usecase.spec.ts (80%) rename src/app/testing/{usecase => application}/authentification/send-verification-email.usecase.spec.ts (81%) rename src/app/testing/{usecase => application}/authentification/verify-auth.usecase.spec.ts (76%) rename src/app/testing/{usecase => application}/authentification/verify-email.usecase.spec.ts (78%) rename src/app/testing/{usecase => application}/profiles/create-profile.usecase.spec.ts (90%) rename src/app/testing/{usecase => application}/profiles/get-profile.usecase.spec.ts (84%) rename src/app/testing/{usecase => application}/profiles/list-profiles.usecase.spec.ts (74%) rename src/app/testing/{usecase => application}/profiles/update-profile.usecase.spec.ts (88%) rename src/app/testing/{usecase => application}/projects/create-project.usecase.spec.ts (90%) rename src/app/testing/{usecase => application}/projects/get-project.usecase.spec.ts (86%) rename src/app/testing/{usecase => application}/projects/list-project.usecase.spec.ts (89%) rename src/app/testing/{usecase => application}/projects/update-project.usecase.spec.ts (88%) rename src/app/testing/{usecase => application}/sectors/get-sector.usecase.spec.ts (87%) rename src/app/testing/{usecase => application}/sectors/list-sector.usecase.spec.ts (86%) rename src/app/testing/{usecase => application}/users/get-user.usecase.spec.ts (86%) rename src/app/testing/{usecase => application}/users/update-user.usecase.spec.ts (88%) rename src/app/{routes => views}/authentification/auth/auth.component.html (100%) rename src/app/{routes => views}/authentification/auth/auth.component.scss (100%) rename src/app/{routes => views}/authentification/auth/auth.component.spec.ts (100%) rename src/app/{routes => views}/authentification/auth/auth.component.ts (68%) rename src/app/{routes => views}/authentification/authentification-routing.module.ts (81%) rename src/app/{routes => views}/authentification/authentification.module.ts (100%) rename src/app/{routes => views}/home/home-routing.module.ts (82%) rename src/app/{routes => views}/home/home.component.html (100%) rename src/app/{routes => views}/home/home.component.scss (100%) rename src/app/{routes => views}/home/home.component.spec.ts (100%) rename src/app/{routes => views}/home/home.component.ts (100%) rename src/app/{routes => views}/home/home.module.ts (100%) rename src/app/{routes => views}/my-profile/my-profile-routing.module.ts (84%) rename src/app/{routes => views}/my-profile/my-profile.component.html (100%) rename src/app/{routes => views}/my-profile/my-profile.component.scss (100%) rename src/app/{routes => views}/my-profile/my-profile.component.spec.ts (100%) rename src/app/{routes => views}/my-profile/my-profile.component.ts (93%) rename src/app/{routes => views}/my-profile/my-profile.module.ts (100%) rename src/app/{routes => views}/not-found/not-found-routing.module.ts (80%) rename src/app/{routes => views}/not-found/not-found.component.html (100%) rename src/app/{routes => views}/not-found/not-found.component.scss (100%) rename src/app/{routes => views}/not-found/not-found.component.spec.ts (100%) rename src/app/{routes => views}/not-found/not-found.component.ts (100%) rename src/app/{routes => views}/not-found/not-found.module.ts (100%) rename src/app/{routes => views}/profile/profile-detail/profile-detail.component.html (100%) rename src/app/{routes => views}/profile/profile-detail/profile-detail.component.scss (100%) rename src/app/{routes => views}/profile/profile-detail/profile-detail.component.spec.ts (100%) rename src/app/{routes => views}/profile/profile-detail/profile-detail.component.ts (93%) rename src/app/{routes => views}/profile/profile-list/profile-list.component.html (100%) rename src/app/{routes => views}/profile/profile-list/profile-list.component.scss (100%) rename src/app/{routes => views}/profile/profile-list/profile-list.component.spec.ts (100%) rename src/app/{routes => views}/profile/profile-list/profile-list.component.ts (96%) rename src/app/{routes => views}/profile/profile-routing.module.ts (77%) rename src/app/{routes => views}/profile/profile.module.ts (100%) diff --git a/src/app/ui/authentification/auth.facade.ts b/src/app/adapters/authentification/auth.facade.ts similarity index 87% rename from src/app/ui/authentification/auth.facade.ts rename to src/app/adapters/authentification/auth.facade.ts index fce4e6e..b3f9303 100644 --- a/src/app/ui/authentification/auth.facade.ts +++ b/src/app/adapters/authentification/auth.facade.ts @@ -3,21 +3,21 @@ import { AUTH_REPOSITORY_TOKEN } from '@app/infrastructure/authentification/auth import { LoaderAction } from '@app/domain/loader-action.util'; import { ActionType } from '@app/domain/action-type.util'; import { ErrorResponse } from '@app/domain/error-response.util'; -import { LoginUseCase } from '@app/usecase/authentification/login.usecase'; -import { RegisterUseCase } from '@app/usecase/authentification/register.usecase'; +import { LoginUseCase } from '../../application/authentification/login.usecase'; +import { RegisterUseCase } from '../../application/authentification/register.usecase'; import { LoginDto } from '@app/domain/authentification/dto/login-dto'; import { RegisterDto } from '@app/domain/authentification/dto/register-dto'; import { User } from '@app/domain/users/user.model'; import { AuthResponse } from '@app/domain/authentification/auth.repository'; import { ProfileDTO } from '@app/domain/profiles/dto/create-profile.dto'; -import { ProfileFacade } from '@app/ui/profiles/profile.facade'; -import { SendVerificationEmailUsecase } from '@app/usecase/authentification/send-verification-email.usecase'; -import { LogoutUseCase } from '@app/usecase/authentification/logout.usecase'; -import { VerifyAuthenticatedUsecase } from '@app/usecase/authentification/verify-authenticated.usecase'; -import { VerifyEmailUseCase } from '@app/usecase/authentification/verify-email.usecase'; -import { GetCurrentUserUseCase } from '@app/usecase/authentification/get-current-user.usecase'; -import { SendRequestPasswordResetUsecase } from '@app/usecase/authentification/send-request-password-reset.usecase'; -import { FeedbackService } from '@app/ui/shared/services/feedback.service'; +import { ProfileFacade } from '../profiles/profile.facade'; +import { SendVerificationEmailUsecase } from '../../application/authentification/send-verification-email.usecase'; +import { LogoutUseCase } from '../../application/authentification/logout.usecase'; +import { VerifyAuthenticatedUsecase } from '../../application/authentification/verify-authenticated.usecase'; +import { VerifyEmailUseCase } from '../../application/authentification/verify-email.usecase'; +import { GetCurrentUserUseCase } from '../../application/authentification/get-current-user.usecase'; +import { SendRequestPasswordResetUsecase } from '../../application/authentification/send-request-password-reset.usecase'; +import { FeedbackService } from '../shared/services/feedback.service'; import { first } from 'rxjs'; @Injectable({ providedIn: 'root' }) diff --git a/src/app/ui/location/location.facade.ts b/src/app/adapters/location/location.facade.ts similarity index 93% rename from src/app/ui/location/location.facade.ts rename to src/app/adapters/location/location.facade.ts index 45b7863..b90b9f0 100644 --- a/src/app/ui/location/location.facade.ts +++ b/src/app/adapters/location/location.facade.ts @@ -1,5 +1,5 @@ import { inject, Injectable, signal } from '@angular/core'; -import { GetCurrentLocationUseCase } from '@app/usecase/location/get-current-location.use-case'; +import { GetCurrentLocationUseCase } from '../../application/location/get-current-location.use-case'; import { Coordinates } from '@app/domain/localisation/coordinates.model'; export interface LocationState { diff --git a/src/app/ui/profiles/profile.facade.ts b/src/app/adapters/profiles/profile.facade.ts similarity index 90% rename from src/app/ui/profiles/profile.facade.ts rename to src/app/adapters/profiles/profile.facade.ts index 73e5788..f8668d4 100644 --- a/src/app/ui/profiles/profile.facade.ts +++ b/src/app/adapters/profiles/profile.facade.ts @@ -1,25 +1,22 @@ -import { ListProfilesUseCase } from '@app/usecase/profiles/list-profiles.usecase'; +import { ListProfilesUseCase } from '../../application/profiles/list-profiles.usecase'; import { inject, Injectable, signal } from '@angular/core'; import { PROFILE_REPOSITORY_TOKEN } from '@app/infrastructure/profiles/profile-repository.token'; import { Profile, ProfilePaginated } from '@app/domain/profiles/profile.model'; -import { ProfilePresenter } from '@app/ui/profiles/profile.presenter'; -import { - ProfileViewModel, - ProfileViewModelPaginated, -} from '@app/ui/profiles/profile.presenter.model'; +import { ProfilePresenter } from '../profiles/profile.presenter'; +import { ProfileViewModel, ProfileViewModelPaginated } from '../profiles/profile.presenter.model'; import { LoaderAction } from '@app/domain/loader-action.util'; import { ActionType } from '@app/domain/action-type.util'; import { ErrorResponse } from '@app/domain/error-response.util'; -import { CreateProfileUseCase } from '@app/usecase/profiles/create-profile.usecase'; -import { UpdateProfileUseCase } from '@app/usecase/profiles/update-profile.usecase'; -import { GetProfileUseCase } from '@app/usecase/profiles/get-profile.usecase'; +import { CreateProfileUseCase } from '../../application/profiles/create-profile.usecase'; +import { UpdateProfileUseCase } from '../../application/profiles/update-profile.usecase'; +import { GetProfileUseCase } from '../../application/profiles/get-profile.usecase'; import { ProfileDTO } from '@app/domain/profiles/dto/create-profile.dto'; import { SearchFilters } from '@app/domain/search/search-filters'; import { SearchService } from '@app/infrastructure/search/search.service'; -import { UpdateCoordinateProfileUseCase } from '@app/usecase/profiles/update-coordinate-profile.usecase'; +import { UpdateCoordinateProfileUseCase } from '../../application/profiles/update-coordinate-profile.usecase'; import { SettingsProfileDto } from '@app/domain/profiles/dto/settings-profile.dto'; -import { UpdateSettingsProfileUseCase } from '@app/usecase/profiles/update-settings-profile.usecase'; -import { FeedbackService } from '@app/ui/shared/services/feedback.service'; +import { UpdateSettingsProfileUseCase } from '../../application/profiles/update-settings-profile.usecase'; +import { FeedbackService } from '../shared/services/feedback.service'; import { first, Subscription } from 'rxjs'; @Injectable({ diff --git a/src/app/ui/profiles/profile.presenter.model.ts b/src/app/adapters/profiles/profile.presenter.model.ts similarity index 92% rename from src/app/ui/profiles/profile.presenter.model.ts rename to src/app/adapters/profiles/profile.presenter.model.ts index 926b3f2..8e01e55 100644 --- a/src/app/ui/profiles/profile.presenter.model.ts +++ b/src/app/adapters/profiles/profile.presenter.model.ts @@ -1,6 +1,6 @@ import { Coordinates } from '@app/domain/localisation/coordinates.model'; import { SettingsProfileDto } from '@app/domain/profiles/dto/settings-profile.dto'; -import { UserViewModel } from '@app/ui/users/user.presenter.model'; +import { UserViewModel } from '../users/user.presenter.model'; export interface ProfileViewModel { id: string; diff --git a/src/app/ui/profiles/profile.presenter.ts b/src/app/adapters/profiles/profile.presenter.ts similarity index 91% rename from src/app/ui/profiles/profile.presenter.ts rename to src/app/adapters/profiles/profile.presenter.ts index 2c36b68..3e1d0a9 100644 --- a/src/app/ui/profiles/profile.presenter.ts +++ b/src/app/adapters/profiles/profile.presenter.ts @@ -1,17 +1,13 @@ -import { - ProfileViewModel, - ProfileViewModelPaginated, -} from '@app/ui/profiles/profile.presenter.model'; +import { ProfileViewModel, ProfileViewModelPaginated } from '../profiles/profile.presenter.model'; import { Profile, ProfilePaginated } from '@app/domain/profiles/profile.model'; import { SettingsProfileDto } from '@app/domain/profiles/dto/settings-profile.dto'; import { User } from '@app/domain/users/user.model'; import { environment } from '@env/environment'; -import { UserPresenter } from '@app/ui/users/user.presenter'; +import { UserPresenter } from '../users/user.presenter'; export class ProfilePresenter { private readonly userPresenter = new UserPresenter(); - private DEFAULT_BIO = `Je suis sur la plateforme Trouve Ton Profil pour partager mon expertise et mes compétences. - N'hésitez pas à me contacter pour en savoir plus sur mon parcours et mes domaines d'intervention.`; + private DEFAULT_BIO = `Je suis sur la plateforme Trouve Ton Profil pour partager mon expertise et mes compétences. N'hésitez pas à me contacter pour en savoir plus sur mon parcours et mes domaines d'intervention.`; toViewModelPaginated(profilePaginated: ProfilePaginated): ProfileViewModelPaginated { return { ...profilePaginated, items: this.toViewModels(profilePaginated.items) }; diff --git a/src/app/ui/projects/project.facade.ts b/src/app/adapters/projects/project.facade.ts similarity index 88% rename from src/app/ui/projects/project.facade.ts rename to src/app/adapters/projects/project.facade.ts index 943e59e..4d11848 100644 --- a/src/app/ui/projects/project.facade.ts +++ b/src/app/adapters/projects/project.facade.ts @@ -1,18 +1,18 @@ import { inject, Injectable, signal } from '@angular/core'; import { PROJECT_REPOSITORY_TOKEN } from '@app/infrastructure/projects/project-repository.token'; -import { CreateProjectUseCase } from '@app/usecase/projects/create-project.usecase'; -import { ListProjectUseCase } from '@app/usecase/projects/list-project.usecase'; -import { GetProjectUseCase } from '@app/usecase/projects/get-project.usecase'; -import { UpdateProjectUseCase } from '@app/usecase/projects/update-project.usecase'; +import { CreateProjectUseCase } from '../../application/projects/create-project.usecase'; +import { ListProjectUseCase } from '../../application/projects/list-project.usecase'; +import { GetProjectUseCase } from '../../application/projects/get-project.usecase'; +import { UpdateProjectUseCase } from '../../application/projects/update-project.usecase'; import { Project } from '@app/domain/projects/project.model'; -import { ProjectViewModel } from '@app/ui/projects/project.presenter.model'; -import { ProjectPresenter } from '@app/ui/projects/project.presenter'; +import { ProjectViewModel } from '../projects/project.presenter.model'; +import { ProjectPresenter } from '../projects/project.presenter'; import { CreateProjectDto } from '@app/domain/projects/dto/create-project.dto'; import { ErrorResponse } from '@app/domain/error-response.util'; import { ActionType } from '@app/domain/action-type.util'; import { LoaderAction } from '@app/domain/loader-action.util'; import { first, Subscription } from 'rxjs'; -import { FeedbackService } from '@app/ui/shared/services/feedback.service'; +import { FeedbackService } from '../shared/services/feedback.service'; @Injectable({ providedIn: 'root', diff --git a/src/app/ui/projects/project.presenter.model.ts b/src/app/adapters/projects/project.presenter.model.ts similarity index 100% rename from src/app/ui/projects/project.presenter.model.ts rename to src/app/adapters/projects/project.presenter.model.ts diff --git a/src/app/ui/projects/project.presenter.ts b/src/app/adapters/projects/project.presenter.ts similarity index 91% rename from src/app/ui/projects/project.presenter.ts rename to src/app/adapters/projects/project.presenter.ts index 314819a..7d6a6cb 100644 --- a/src/app/ui/projects/project.presenter.ts +++ b/src/app/adapters/projects/project.presenter.ts @@ -1,4 +1,4 @@ -import { ProjectViewModel } from '@app/ui/projects/project.presenter.model'; +import { ProjectViewModel } from '../projects/project.presenter.model'; import { Project } from '@app/domain/projects/project.model'; import { environment } from '@env/environment'; diff --git a/src/app/ui/sectors/sector.facade.ts b/src/app/adapters/sectors/sector.facade.ts similarity index 87% rename from src/app/ui/sectors/sector.facade.ts rename to src/app/adapters/sectors/sector.facade.ts index 7e48943..18d738e 100644 --- a/src/app/ui/sectors/sector.facade.ts +++ b/src/app/adapters/sectors/sector.facade.ts @@ -1,15 +1,15 @@ import { inject, Injectable, signal } from '@angular/core'; import { SECTOR_REPOSITORY_TOKEN } from '@app/infrastructure/sectors/sector-repository.token'; -import { ListSectorUsecase } from '@app/usecase/sectors/list-sector.usecase'; -import { GetSectorUseCase } from '@app/usecase/sectors/get-sector.usecase'; +import { ListSectorUsecase } from '../../application/sectors/list-sector.usecase'; +import { GetSectorUseCase } from '../../application/sectors/get-sector.usecase'; import { ActionType } from '@app/domain/action-type.util'; import { LoaderAction } from '@app/domain/loader-action.util'; import { ErrorResponse } from '@app/domain/error-response.util'; -import { SectorPresenterModel } from '@app/ui/sectors/sector.presenter.model'; +import { SectorPresenterModel } from '../sectors/sector.presenter.model'; import { Sector } from '@app/domain/sectors/sector.model'; -import { SectorPresenter } from '@app/ui/sectors/sector.presenter'; +import { SectorPresenter } from '../sectors/sector.presenter'; import { first, Subscription } from 'rxjs'; -import { FeedbackService } from '@app/ui/shared/services/feedback.service'; +import { FeedbackService } from '../shared/services/feedback.service'; @Injectable() export class SectorFacade { diff --git a/src/app/ui/sectors/sector.presenter.model.ts b/src/app/adapters/sectors/sector.presenter.model.ts similarity index 100% rename from src/app/ui/sectors/sector.presenter.model.ts rename to src/app/adapters/sectors/sector.presenter.model.ts diff --git a/src/app/ui/sectors/sector.presenter.ts b/src/app/adapters/sectors/sector.presenter.ts similarity index 83% rename from src/app/ui/sectors/sector.presenter.ts rename to src/app/adapters/sectors/sector.presenter.ts index 5db21b9..cfc0a89 100644 --- a/src/app/ui/sectors/sector.presenter.ts +++ b/src/app/adapters/sectors/sector.presenter.ts @@ -1,4 +1,4 @@ -import { SectorPresenterModel } from '@app/ui/sectors/sector.presenter.model'; +import { SectorPresenterModel } from '../sectors/sector.presenter.model'; import { Sector } from '@app/domain/sectors/sector.model'; export class SectorPresenter { diff --git a/src/app/ui/settings/settings.facade.ts b/src/app/adapters/settings/settings.facade.ts similarity index 84% rename from src/app/ui/settings/settings.facade.ts rename to src/app/adapters/settings/settings.facade.ts index 6c4d5bb..19f8458 100644 --- a/src/app/ui/settings/settings.facade.ts +++ b/src/app/adapters/settings/settings.facade.ts @@ -1,10 +1,10 @@ import { inject, Injectable, signal } from '@angular/core'; import { ThemeType, UserSettings } from '@app/domain/settings/setting.model'; -import { GetSettingsUseCase } from '@app/usecase/settings/get-settings.usecase'; -import { UpdateSettingsUseCase } from '@app/usecase/settings/update-settings.usecase'; +import { GetSettingsUseCase } from '../../application/settings/get-settings.usecase'; +import { UpdateSettingsUseCase } from '../../application/settings/update-settings.usecase'; import { SETTING_REPOSITORY_TOKEN } from '@app/infrastructure/settings/setting-repository.token'; -import { ApplyThemeUsecase } from '@app/usecase/settings/apply-theme.usecase'; -import { GetDefaultSystemThemeUsecase } from '@app/usecase/settings/get-default-system-theme.usecase'; +import { ApplyThemeUsecase } from '../../application/settings/apply-theme.usecase'; +import { GetDefaultSystemThemeUsecase } from '../../application/settings/get-default-system-theme.usecase'; @Injectable({ providedIn: 'root' }) export class SettingsFacade { diff --git a/src/app/ui/shared/services/feedback.service.ts b/src/app/adapters/shared/services/feedback.service.ts similarity index 100% rename from src/app/ui/shared/services/feedback.service.ts rename to src/app/adapters/shared/services/feedback.service.ts diff --git a/src/app/ui/shared/services/file-manager.service.ts b/src/app/adapters/shared/services/file-manager.service.ts similarity index 100% rename from src/app/ui/shared/services/file-manager.service.ts rename to src/app/adapters/shared/services/file-manager.service.ts diff --git a/src/app/ui/users/user.facade.ts b/src/app/adapters/users/user.facade.ts similarity index 87% rename from src/app/ui/users/user.facade.ts rename to src/app/adapters/users/user.facade.ts index 1ea88e3..f0917a3 100644 --- a/src/app/ui/users/user.facade.ts +++ b/src/app/adapters/users/user.facade.ts @@ -1,14 +1,14 @@ import { inject, Injectable, signal } from '@angular/core'; import { USER_REPOSITORY_TOKEN } from '@app/infrastructure/users/user-repository.token'; -import { GetUserUseCase } from '@app/usecase/users/get-user.usecase'; -import { UpdateUserUseCase } from '@app/usecase/users/update-user.usecase'; +import { GetUserUseCase } from '../../application/users/get-user.usecase'; +import { UpdateUserUseCase } from '../../application/users/update-user.usecase'; import { LoaderAction } from '@app/domain/loader-action.util'; import { ActionType } from '@app/domain/action-type.util'; import { ErrorResponse } from '@app/domain/error-response.util'; -import { UserViewModel } from '@app/ui/users/user.presenter.model'; -import { UserPresenter } from '@app/ui/users/user.presenter'; +import { UserViewModel } from '../users/user.presenter.model'; +import { UserPresenter } from '../users/user.presenter'; import { first } from 'rxjs'; -import { FeedbackService } from '@app/ui/shared/services/feedback.service'; +import { FeedbackService } from '../shared/services/feedback.service'; @Injectable({ providedIn: 'root' }) export class UserFacade { diff --git a/src/app/ui/users/user.presenter.model.ts b/src/app/adapters/users/user.presenter.model.ts similarity index 100% rename from src/app/ui/users/user.presenter.model.ts rename to src/app/adapters/users/user.presenter.model.ts diff --git a/src/app/ui/users/user.presenter.ts b/src/app/adapters/users/user.presenter.ts similarity index 96% rename from src/app/ui/users/user.presenter.ts rename to src/app/adapters/users/user.presenter.ts index a99a433..bcfdf3d 100644 --- a/src/app/ui/users/user.presenter.ts +++ b/src/app/adapters/users/user.presenter.ts @@ -1,4 +1,4 @@ -import { UserViewModel } from '@app/ui/users/user.presenter.model'; +import { UserViewModel } from '../users/user.presenter.model'; import { User } from '@app/domain/users/user.model'; import { environment } from '@env/environment'; diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 86eb135..b0b6eda 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -3,7 +3,7 @@ import { CommonModule } from '@angular/common'; import { RouterOutlet } from '@angular/router'; import { NavBarComponent } from '@app/shared/components/nav-bar/nav-bar.component'; import { FooterComponent } from '@app/shared/components/footer/footer.component'; -import { SettingsFacade } from '@app/ui/settings/settings.facade'; +import { SettingsFacade } from './adapters/settings/settings.facade'; @Component({ selector: 'app-root', diff --git a/src/app/app.routes.ts b/src/app/app.routes.ts index 69f3181..168e65b 100644 --- a/src/app/app.routes.ts +++ b/src/app/app.routes.ts @@ -5,23 +5,23 @@ export const routes: Routes = [ { path: '', title: 'Accueil', - loadChildren: () => import('@app/routes/home/home.module').then((m) => m.HomeModule), + loadChildren: () => import('./views/home/home.module').then((m) => m.HomeModule), }, { path: 'home', title: 'Accueil', - loadChildren: () => import('@app/routes/home/home.module').then((m) => m.HomeModule), + loadChildren: () => import('./views/home/home.module').then((m) => m.HomeModule), }, { path: 'profiles', title: 'Liste des profiles', - loadChildren: () => import('@app/routes/profile/profile.module').then((m) => m.ProfileModule), + loadChildren: () => import('./views/profile/profile.module').then((m) => m.ProfileModule), }, { path: 'auth', title: 'Authentification', loadChildren: () => - import('@app/routes/authentification/authentification.module').then( + import('./views/authentification/authentification.module').then( (m) => m.AuthentificationModule ), }, @@ -30,13 +30,12 @@ export const routes: Routes = [ title: 'Mon profile', canActivate: [authGuard], loadChildren: () => - import('@app/routes/my-profile/my-profile.module').then((m) => m.MyProfileModule), + import('./views/my-profile/my-profile.module').then((m) => m.MyProfileModule), }, { path: 'not-found', title: 'Page non trouvée', - loadChildren: () => - import('@app/routes/not-found/not-found.module').then((m) => m.NotFoundModule), + loadChildren: () => import('./views/not-found/not-found.module').then((m) => m.NotFoundModule), }, { path: '', redirectTo: '/', pathMatch: 'full' }, { path: '**', redirectTo: '/not-found' }, diff --git a/src/app/usecase/authentification/get-current-user.usecase.ts b/src/app/application/authentification/get-current-user.usecase.ts similarity index 100% rename from src/app/usecase/authentification/get-current-user.usecase.ts rename to src/app/application/authentification/get-current-user.usecase.ts diff --git a/src/app/usecase/authentification/login.usecase.ts b/src/app/application/authentification/login.usecase.ts similarity index 100% rename from src/app/usecase/authentification/login.usecase.ts rename to src/app/application/authentification/login.usecase.ts diff --git a/src/app/usecase/authentification/logout.usecase.ts b/src/app/application/authentification/logout.usecase.ts similarity index 100% rename from src/app/usecase/authentification/logout.usecase.ts rename to src/app/application/authentification/logout.usecase.ts diff --git a/src/app/usecase/authentification/register.usecase.ts b/src/app/application/authentification/register.usecase.ts similarity index 100% rename from src/app/usecase/authentification/register.usecase.ts rename to src/app/application/authentification/register.usecase.ts diff --git a/src/app/usecase/authentification/send-request-password-reset.usecase.ts b/src/app/application/authentification/send-request-password-reset.usecase.ts similarity index 100% rename from src/app/usecase/authentification/send-request-password-reset.usecase.ts rename to src/app/application/authentification/send-request-password-reset.usecase.ts diff --git a/src/app/usecase/authentification/send-verification-email.usecase.ts b/src/app/application/authentification/send-verification-email.usecase.ts similarity index 100% rename from src/app/usecase/authentification/send-verification-email.usecase.ts rename to src/app/application/authentification/send-verification-email.usecase.ts diff --git a/src/app/usecase/authentification/verify-authenticated.usecase.ts b/src/app/application/authentification/verify-authenticated.usecase.ts similarity index 100% rename from src/app/usecase/authentification/verify-authenticated.usecase.ts rename to src/app/application/authentification/verify-authenticated.usecase.ts diff --git a/src/app/usecase/authentification/verify-email.usecase.ts b/src/app/application/authentification/verify-email.usecase.ts similarity index 100% rename from src/app/usecase/authentification/verify-email.usecase.ts rename to src/app/application/authentification/verify-email.usecase.ts diff --git a/src/app/usecase/location/get-current-location.use-case.ts b/src/app/application/location/get-current-location.use-case.ts similarity index 100% rename from src/app/usecase/location/get-current-location.use-case.ts rename to src/app/application/location/get-current-location.use-case.ts diff --git a/src/app/usecase/profiles/create-profile.usecase.ts b/src/app/application/profiles/create-profile.usecase.ts similarity index 100% rename from src/app/usecase/profiles/create-profile.usecase.ts rename to src/app/application/profiles/create-profile.usecase.ts diff --git a/src/app/usecase/profiles/get-profile.usecase.ts b/src/app/application/profiles/get-profile.usecase.ts similarity index 100% rename from src/app/usecase/profiles/get-profile.usecase.ts rename to src/app/application/profiles/get-profile.usecase.ts diff --git a/src/app/usecase/profiles/list-profiles.usecase.ts b/src/app/application/profiles/list-profiles.usecase.ts similarity index 100% rename from src/app/usecase/profiles/list-profiles.usecase.ts rename to src/app/application/profiles/list-profiles.usecase.ts diff --git a/src/app/usecase/profiles/update-coordinate-profile.usecase.ts b/src/app/application/profiles/update-coordinate-profile.usecase.ts similarity index 100% rename from src/app/usecase/profiles/update-coordinate-profile.usecase.ts rename to src/app/application/profiles/update-coordinate-profile.usecase.ts diff --git a/src/app/usecase/profiles/update-profile.usecase.ts b/src/app/application/profiles/update-profile.usecase.ts similarity index 100% rename from src/app/usecase/profiles/update-profile.usecase.ts rename to src/app/application/profiles/update-profile.usecase.ts diff --git a/src/app/usecase/profiles/update-settings-profile.usecase.ts b/src/app/application/profiles/update-settings-profile.usecase.ts similarity index 100% rename from src/app/usecase/profiles/update-settings-profile.usecase.ts rename to src/app/application/profiles/update-settings-profile.usecase.ts diff --git a/src/app/usecase/projects/create-project.usecase.ts b/src/app/application/projects/create-project.usecase.ts similarity index 100% rename from src/app/usecase/projects/create-project.usecase.ts rename to src/app/application/projects/create-project.usecase.ts diff --git a/src/app/usecase/projects/get-project.usecase.ts b/src/app/application/projects/get-project.usecase.ts similarity index 100% rename from src/app/usecase/projects/get-project.usecase.ts rename to src/app/application/projects/get-project.usecase.ts diff --git a/src/app/usecase/projects/list-project.usecase.ts b/src/app/application/projects/list-project.usecase.ts similarity index 100% rename from src/app/usecase/projects/list-project.usecase.ts rename to src/app/application/projects/list-project.usecase.ts diff --git a/src/app/usecase/projects/update-project.usecase.ts b/src/app/application/projects/update-project.usecase.ts similarity index 100% rename from src/app/usecase/projects/update-project.usecase.ts rename to src/app/application/projects/update-project.usecase.ts diff --git a/src/app/usecase/sectors/get-sector.usecase.ts b/src/app/application/sectors/get-sector.usecase.ts similarity index 100% rename from src/app/usecase/sectors/get-sector.usecase.ts rename to src/app/application/sectors/get-sector.usecase.ts diff --git a/src/app/usecase/sectors/list-sector.usecase.ts b/src/app/application/sectors/list-sector.usecase.ts similarity index 100% rename from src/app/usecase/sectors/list-sector.usecase.ts rename to src/app/application/sectors/list-sector.usecase.ts diff --git a/src/app/usecase/settings/apply-theme.usecase.ts b/src/app/application/settings/apply-theme.usecase.ts similarity index 100% rename from src/app/usecase/settings/apply-theme.usecase.ts rename to src/app/application/settings/apply-theme.usecase.ts diff --git a/src/app/usecase/settings/get-default-system-theme.usecase.ts b/src/app/application/settings/get-default-system-theme.usecase.ts similarity index 100% rename from src/app/usecase/settings/get-default-system-theme.usecase.ts rename to src/app/application/settings/get-default-system-theme.usecase.ts diff --git a/src/app/usecase/settings/get-settings.usecase.ts b/src/app/application/settings/get-settings.usecase.ts similarity index 100% rename from src/app/usecase/settings/get-settings.usecase.ts rename to src/app/application/settings/get-settings.usecase.ts diff --git a/src/app/usecase/settings/update-settings.usecase.ts b/src/app/application/settings/update-settings.usecase.ts similarity index 100% rename from src/app/usecase/settings/update-settings.usecase.ts rename to src/app/application/settings/update-settings.usecase.ts diff --git a/src/app/usecase/users/get-user.usecase.ts b/src/app/application/users/get-user.usecase.ts similarity index 100% rename from src/app/usecase/users/get-user.usecase.ts rename to src/app/application/users/get-user.usecase.ts diff --git a/src/app/usecase/users/update-user.usecase.ts b/src/app/application/users/update-user.usecase.ts similarity index 100% rename from src/app/usecase/users/update-user.usecase.ts rename to src/app/application/users/update-user.usecase.ts diff --git a/src/app/core/guard/authentication/auth.guard.spec.ts b/src/app/core/guard/authentication/auth.guard.spec.ts index fbc7e4b..1394e7c 100644 --- a/src/app/core/guard/authentication/auth.guard.spec.ts +++ b/src/app/core/guard/authentication/auth.guard.spec.ts @@ -2,7 +2,7 @@ import { TestBed } from '@angular/core/testing'; import { authGuard } from './auth.guard'; import { CanActivateFn, Router, UrlTree } from '@angular/router'; -import { AuthFacade } from '@app/ui/authentification/auth.facade'; +import { AuthFacade } from '../../../adapters/authentification/auth.facade'; describe('authGuard', () => { // 1. Définition des variables pour les Mocks diff --git a/src/app/core/guard/authentication/auth.guard.ts b/src/app/core/guard/authentication/auth.guard.ts index 7cf188f..29655ff 100644 --- a/src/app/core/guard/authentication/auth.guard.ts +++ b/src/app/core/guard/authentication/auth.guard.ts @@ -1,6 +1,6 @@ import { CanActivateFn, Router } from '@angular/router'; import { inject } from '@angular/core'; -import { AuthFacade } from '@app/ui/authentification/auth.facade'; +import { AuthFacade } from '../../../adapters/authentification/auth.facade'; export const authGuard: CanActivateFn = (route, state) => { const authFacade = inject(AuthFacade); diff --git a/src/app/core/services/theme/theme.service.spec.ts b/src/app/core/services/theme/theme.service.spec.ts deleted file mode 100644 index c5adc12..0000000 --- a/src/app/core/services/theme/theme.service.spec.ts +++ /dev/null @@ -1,45 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { ThemeService } from './theme.service'; - -describe('ThemeService', () => { - let service: ThemeService; - - beforeEach(() => { - TestBed.configureTestingModule({ - providers: [ThemeService], - }); - service = TestBed.inject(ThemeService); - }); - - it('should be created', () => { - expect(service).toBeTruthy(); - }); - - // Test de la valeur initiale - it('should have initial value "null"', () => { - // Avec les Signals, on accède à la valeur en exécutant la fonction : signal() - expect(service.darkModeSignal()).toBe('null'); - }); - - // Test du basculement vers Dark - it('should switch to "dark" when updateDarkMode is called and current is "null"', () => { - // Action - service.updateDarkMode(); - - // Vérification - expect(service.darkModeSignal()).toBe('dark'); - }); - - // Test du basculement inverse (Dark vers Null) - it('should switch back to "null" when updateDarkMode is called and current is "dark"', () => { - // 1. Préparation : On force l'état à 'dark' pour tester ce cas précis - service.darkModeSignal.set('dark'); - - // 2. Action - service.updateDarkMode(); - - // 3. Vérification - expect(service.darkModeSignal()).toBe('null'); - }); -}); diff --git a/src/app/core/services/theme/theme.service.ts b/src/app/core/services/theme/theme.service.ts deleted file mode 100644 index 3fa910b..0000000 --- a/src/app/core/services/theme/theme.service.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { Injectable, signal } from '@angular/core'; - -@Injectable({ - providedIn: 'root', -}) -export class ThemeService { - darkModeSignal = signal('null'); - - updateDarkMode() { - this.darkModeSignal.update((value) => (value === 'dark' ? 'null' : 'dark')); - } -} diff --git a/src/app/shared/components/btn-loading/btn-loading.component.ts b/src/app/shared/components/btn-loading/btn-loading.component.ts index 8ed38fd..8308f77 100644 --- a/src/app/shared/components/btn-loading/btn-loading.component.ts +++ b/src/app/shared/components/btn-loading/btn-loading.component.ts @@ -1,4 +1,4 @@ -import { Component, Input, output } from '@angular/core'; +import { Component, Input } from '@angular/core'; @Component({ selector: 'app-btn-loading', diff --git a/src/app/shared/components/chips/chips.component.ts b/src/app/shared/components/chips/chips.component.ts index 925d6e3..ae0f55f 100644 --- a/src/app/shared/components/chips/chips.component.ts +++ b/src/app/shared/components/chips/chips.component.ts @@ -1,7 +1,7 @@ import { Component, inject, input, OnChanges, SimpleChanges } from '@angular/core'; import { TitleCasePipe } from '@angular/common'; import { UntilDestroy } from '@ngneat/until-destroy'; -import { SectorFacade } from '@app/ui/sectors/sector.facade'; +import { SectorFacade } from '@app/adapters/sectors/sector.facade'; @Component({ selector: 'app-chips', diff --git a/src/app/shared/components/map/map.component.ts b/src/app/shared/components/map/map.component.ts index 935f876..bec86ae 100644 --- a/src/app/shared/components/map/map.component.ts +++ b/src/app/shared/components/map/map.component.ts @@ -13,7 +13,7 @@ import { import { Coordinates } from '@app/domain/localisation/coordinates.model'; import * as L from 'leaflet'; import { LoadingComponent } from '@app/shared/components/loading/loading.component'; -import { ProfileViewModel } from '@app/ui/profiles/profile.presenter.model'; +import { ProfileViewModel } from '@app/adapters/profiles/profile.presenter.model'; export interface MapMarker { id: string; diff --git a/src/app/shared/components/my-profile-project-item/my-profile-project-item.component.ts b/src/app/shared/components/my-profile-project-item/my-profile-project-item.component.ts index 696c50b..7466bae 100644 --- a/src/app/shared/components/my-profile-project-item/my-profile-project-item.component.ts +++ b/src/app/shared/components/my-profile-project-item/my-profile-project-item.component.ts @@ -1,7 +1,7 @@ import { Component, input, OnInit } from '@angular/core'; import { environment } from '@env/environment'; import { RouterLink } from '@angular/router'; -import { ProjectFacade } from '@app/ui/projects/project.facade'; +import { ProjectFacade } from '@app/adapters/projects/project.facade'; @Component({ selector: 'app-my-profile-project-item', diff --git a/src/app/shared/components/my-profile-project-list/my-profile-project-list.component.ts b/src/app/shared/components/my-profile-project-list/my-profile-project-list.component.ts index b48be03..0d21b4e 100644 --- a/src/app/shared/components/my-profile-project-list/my-profile-project-list.component.ts +++ b/src/app/shared/components/my-profile-project-list/my-profile-project-list.component.ts @@ -3,7 +3,7 @@ import { PaginatorModule } from 'primeng/paginator'; import { ReactiveFormsModule } from '@angular/forms'; import { UntilDestroy } from '@ngneat/until-destroy'; import { MyProfileUpdateProjectFormComponent } from '@app/shared/components/my-profile-update-project-form/my-profile-update-project-form.component'; -import { ProjectFacade } from '@app/ui/projects/project.facade'; +import { ProjectFacade } from '@app/adapters/projects/project.facade'; @Component({ selector: 'app-my-profile-project-list', diff --git a/src/app/shared/components/my-profile-update-cv-form/my-profile-update-cv-form.component.spec.ts b/src/app/shared/components/my-profile-update-cv-form/my-profile-update-cv-form.component.spec.ts index 645d7c5..02383fe 100644 --- a/src/app/shared/components/my-profile-update-cv-form/my-profile-update-cv-form.component.spec.ts +++ b/src/app/shared/components/my-profile-update-cv-form/my-profile-update-cv-form.component.spec.ts @@ -3,9 +3,9 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MyProfileUpdateCvFormComponent } from './my-profile-update-cv-form.component'; import { mockFileManagerSvc } from '@app/testing/file-manager.service.mock'; import { ActionType } from '@app/domain/action-type.util'; -import { ProfileFacade } from '@app/ui/profiles/profile.facade'; -import { FileManagerService } from '@app/ui/shared/services/file-manager.service'; -import { mockProfileFac } from '@app/testing/ui/profiles/profile.facade.mock'; +import { ProfileFacade } from '../../../adapters/profiles/profile.facade'; +import { FileManagerService } from '../../../adapters/shared/services/file-manager.service'; +import { mockProfileFac } from '@app/testing/adapters/profiles/profile.facade.mock'; import { mockProfiles } from '@app/testing/profile.mock'; describe('MyProfileUpdateCvFormComponent', () => { diff --git a/src/app/shared/components/my-profile-update-cv-form/my-profile-update-cv-form.component.ts b/src/app/shared/components/my-profile-update-cv-form/my-profile-update-cv-form.component.ts index 52915a9..a215ebf 100644 --- a/src/app/shared/components/my-profile-update-cv-form/my-profile-update-cv-form.component.ts +++ b/src/app/shared/components/my-profile-update-cv-form/my-profile-update-cv-form.component.ts @@ -1,11 +1,11 @@ import { Component, effect, inject, input } from '@angular/core'; import { NgTemplateOutlet } from '@angular/common'; -import { ProfileViewModel } from '@app/ui/profiles/profile.presenter.model'; -import { ProfileFacade } from '@app/ui/profiles/profile.facade'; +import { ProfileViewModel } from '@app/adapters/profiles/profile.presenter.model'; +import { ProfileFacade } from '@app/adapters/profiles/profile.facade'; import { ActionType } from '@app/domain/action-type.util'; import { Profile } from '@app/domain/profiles/profile.model'; import { LoadingComponent } from '@app/shared/components/loading/loading.component'; -import { FileManagerService } from '@app/ui/shared/services/file-manager.service'; +import { FileManagerService } from '@app/adapters/shared/services/file-manager.service'; @Component({ selector: 'app-my-profile-update-cv-form', diff --git a/src/app/shared/components/my-profile-update-form/my-profile-update-form.component.ts b/src/app/shared/components/my-profile-update-form/my-profile-update-form.component.ts index 1d36eb0..e73a55b 100644 --- a/src/app/shared/components/my-profile-update-form/my-profile-update-form.component.ts +++ b/src/app/shared/components/my-profile-update-form/my-profile-update-form.component.ts @@ -8,11 +8,11 @@ import { } from '@angular/forms'; import { UntilDestroy } from '@ngneat/until-destroy'; import { MyProfileUpdateCvFormComponent } from '@app/shared/components/my-profile-update-cv-form/my-profile-update-cv-form.component'; -import { ProfileViewModel } from '@app/ui/profiles/profile.presenter.model'; -import { ProfileFacade } from '@app/ui/profiles/profile.facade'; +import { ProfileViewModel } from '@app/adapters/profiles/profile.presenter.model'; +import { ProfileFacade } from '@app/adapters/profiles/profile.facade'; import { ActionType } from '@app/domain/action-type.util'; import { Profile } from '@app/domain/profiles/profile.model'; -import { SectorFacade } from '@app/ui/sectors/sector.facade'; +import { SectorFacade } from '@app/adapters/sectors/sector.facade'; import { NgClass, NgTemplateOutlet } from '@angular/common'; import { LoadingComponent } from '@app/shared/components/loading/loading.component'; diff --git a/src/app/shared/components/my-profile-update-project-form/my-profile-update-project-form.component.ts b/src/app/shared/components/my-profile-update-project-form/my-profile-update-project-form.component.ts index 03f41b2..f7ff3c5 100644 --- a/src/app/shared/components/my-profile-update-project-form/my-profile-update-project-form.component.ts +++ b/src/app/shared/components/my-profile-update-project-form/my-profile-update-project-form.component.ts @@ -2,11 +2,11 @@ import { Component, effect, inject, input, output } from '@angular/core'; import { FormBuilder, FormControl, ReactiveFormsModule, Validators } from '@angular/forms'; import { PaginatorModule } from 'primeng/paginator'; import { ProjectPictureFormComponent } from '@app/shared/components/project-picture-form/project-picture-form.component'; -import { ProjectFacade } from '@app/ui/projects/project.facade'; +import { ProjectFacade } from '@app/adapters/projects/project.facade'; import { CreateProjectDto } from '@app/domain/projects/dto/create-project.dto'; import { ActionType } from '@app/domain/action-type.util'; import { LoadingComponent } from '@app/shared/components/loading/loading.component'; -import { AuthFacade } from '@app/ui/authentification/auth.facade'; +import { AuthFacade } from '@app/adapters/authentification/auth.facade'; @Component({ selector: 'app-my-profile-update-project-form', diff --git a/src/app/shared/components/nav-bar/nav-bar.component.spec.ts b/src/app/shared/components/nav-bar/nav-bar.component.spec.ts index 5ca87d6..2f0b1b8 100644 --- a/src/app/shared/components/nav-bar/nav-bar.component.spec.ts +++ b/src/app/shared/components/nav-bar/nav-bar.component.spec.ts @@ -1,7 +1,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { NavBarComponent } from './nav-bar.component'; -import { ThemeService } from '@app/core/services/theme/theme.service'; import { provideRouter } from '@angular/router'; import { User } from '@app/domain/users/user.model'; import { AUTH_REPOSITORY_TOKEN } from '@app/infrastructure/authentification/auth-repository.token'; @@ -10,14 +9,12 @@ import { PROFILE_REPOSITORY_TOKEN } from '@app/infrastructure/profiles/profile-r import { ProfileRepository } from '@app/domain/profiles/profile.repository'; import { mockProfileRepo } from '@app/testing/profile.mock'; import { mockAuthRepo } from '@app/testing/auth.mock'; -import { mockThemeService } from '@app/testing/theme.mock'; import { ToastrService } from 'ngx-toastr'; import { mockToastR } from '@app/testing/toastr.mock'; describe('NavBarComponent', () => { let component: NavBarComponent; let fixture: ComponentFixture; - let mockTheme: jest.Mocked> = mockThemeService; let mockAuthRepository: jest.Mocked> = mockAuthRepo; let mockProfileRepository: jest.Mocked> = mockProfileRepo; @@ -39,7 +36,6 @@ describe('NavBarComponent', () => { imports: [NavBarComponent], providers: [ provideRouter([]), - { provide: ThemeService, useValue: mockTheme }, { provide: ToastrService, useValue: mockToastR }, { provide: AUTH_REPOSITORY_TOKEN, useValue: mockAuthRepository }, { provide: PROFILE_REPOSITORY_TOKEN, useValue: mockProfileRepository }, @@ -54,9 +50,4 @@ describe('NavBarComponent', () => { it('should create', () => { expect(component).toBeTruthy(); }); - - it('should call themeService.updateDarkMode when toggleDarkMode called', () => { - component.toggleDarkMode(); - expect(mockThemeService.updateDarkMode).toHaveBeenCalled(); - }); }); diff --git a/src/app/shared/components/nav-bar/nav-bar.component.ts b/src/app/shared/components/nav-bar/nav-bar.component.ts index 08aa88a..f68767a 100644 --- a/src/app/shared/components/nav-bar/nav-bar.component.ts +++ b/src/app/shared/components/nav-bar/nav-bar.component.ts @@ -1,9 +1,8 @@ import { Component, inject, OnInit } from '@angular/core'; import { RouterLink } from '@angular/router'; -import { ThemeService } from '@app/core/services/theme/theme.service'; import { UntilDestroy } from '@ngneat/until-destroy'; import { environment } from '@env/environment'; -import { AuthFacade } from '@app/ui/authentification/auth.facade'; +import { AuthFacade } from '@app/adapters/authentification/auth.facade'; @Component({ selector: 'app-nav-bar', @@ -14,7 +13,6 @@ import { AuthFacade } from '@app/ui/authentification/auth.facade'; }) @UntilDestroy() export class NavBarComponent implements OnInit { - protected themeService: ThemeService = inject(ThemeService); protected readonly environment = environment; protected authFacade = inject(AuthFacade); @@ -23,10 +21,6 @@ export class NavBarComponent implements OnInit { readonly isEmailVerified = this.authFacade.isEmailVerified; readonly user = this.authFacade.user; - toggleDarkMode() { - this.themeService.updateDarkMode(); - } - ngOnInit(): void { this.authFacade.verifyEmail(); this.authFacade.verifyAuthenticatedUser(); diff --git a/src/app/shared/components/project-item/project-item.component.ts b/src/app/shared/components/project-item/project-item.component.ts index ba070ce..0ea64b3 100644 --- a/src/app/shared/components/project-item/project-item.component.ts +++ b/src/app/shared/components/project-item/project-item.component.ts @@ -1,6 +1,6 @@ import { Component, Input } from '@angular/core'; import { environment } from '@env/environment'; -import { ProjectViewModel } from '@app/ui/projects/project.presenter.model'; +import { ProjectViewModel } from '@app/adapters/projects/project.presenter.model'; import { NgOptimizedImage } from '@angular/common'; @Component({ diff --git a/src/app/shared/components/project-list/project-list.component.ts b/src/app/shared/components/project-list/project-list.component.ts index 1ad8129..711faa2 100644 --- a/src/app/shared/components/project-list/project-list.component.ts +++ b/src/app/shared/components/project-list/project-list.component.ts @@ -1,7 +1,7 @@ import { Component, input, OnChanges, SimpleChanges } from '@angular/core'; import { UntilDestroy } from '@ngneat/until-destroy'; import { ProjectItemComponent } from '@app/shared/components/project-item/project-item.component'; -import { ProjectFacade } from '@app/ui/projects/project.facade'; +import { ProjectFacade } from '@app/adapters/projects/project.facade'; @Component({ selector: 'app-project-list', diff --git a/src/app/shared/components/project-picture-form/project-picture-form.component.spec.ts b/src/app/shared/components/project-picture-form/project-picture-form.component.spec.ts index 1389023..247fb3e 100644 --- a/src/app/shared/components/project-picture-form/project-picture-form.component.spec.ts +++ b/src/app/shared/components/project-picture-form/project-picture-form.component.spec.ts @@ -3,10 +3,10 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ProjectPictureFormComponent } from './project-picture-form.component'; import { mockProjects } from '@app/testing/project.mock'; import { mockFileManagerSvc } from '@app/testing/file-manager.service.mock'; -import { mockProjectFac } from '@app/testing/ui/projects/project.facade.mock'; -import { ProjectViewModel } from '@app/ui/projects/project.presenter.model'; -import { ProjectFacade } from '@app/ui/projects/project.facade'; -import { FileManagerService } from '@app/ui/shared/services/file-manager.service'; +import { mockProjectFac } from '@app/testing/adapters/projects/project.facade.mock'; +import { ProjectViewModel } from '../../../adapters/projects/project.presenter.model'; +import { ProjectFacade } from '../../../adapters/projects/project.facade'; +import { FileManagerService } from '../../../adapters/shared/services/file-manager.service'; import { ActionType } from '@app/domain/action-type.util'; describe('ProjectPictureFormComponent', () => { diff --git a/src/app/shared/components/project-picture-form/project-picture-form.component.ts b/src/app/shared/components/project-picture-form/project-picture-form.component.ts index aac189d..01b8f93 100644 --- a/src/app/shared/components/project-picture-form/project-picture-form.component.ts +++ b/src/app/shared/components/project-picture-form/project-picture-form.component.ts @@ -1,11 +1,11 @@ import { Component, effect, inject, input, output, signal } from '@angular/core'; import { NgTemplateOutlet } from '@angular/common'; import { environment } from '@env/environment'; -import { ProjectViewModel } from '@app/ui/projects/project.presenter.model'; -import { ProjectFacade } from '@app/ui/projects/project.facade'; +import { ProjectViewModel } from '@app/adapters/projects/project.presenter.model'; +import { ProjectFacade } from '@app/adapters/projects/project.facade'; import { ActionType } from '@app/domain/action-type.util'; import { LoadingComponent } from '@app/shared/components/loading/loading.component'; -import { FileManagerService } from '@app/ui/shared/services/file-manager.service'; +import { FileManagerService } from '@app/adapters/shared/services/file-manager.service'; @Component({ selector: 'app-project-picture-form', diff --git a/src/app/shared/components/user-avatar-form/user-avatar-form.component.spec.ts b/src/app/shared/components/user-avatar-form/user-avatar-form.component.spec.ts index 77aaf53..c7b85ad 100644 --- a/src/app/shared/components/user-avatar-form/user-avatar-form.component.spec.ts +++ b/src/app/shared/components/user-avatar-form/user-avatar-form.component.spec.ts @@ -3,15 +3,15 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { UserAvatarFormComponent } from './user-avatar-form.component'; import { ToastrService } from 'ngx-toastr'; import { mockToastR } from '@app/testing/toastr.mock'; -import { UserViewModel } from '@app/ui/users/user.presenter.model'; -import { FileManagerService } from '@app/ui/shared/services/file-manager.service'; -import { UserFacade } from '@app/ui/users/user.facade'; +import { UserViewModel } from '../../../adapters/users/user.presenter.model'; +import { FileManagerService } from '../../../adapters/shared/services/file-manager.service'; +import { UserFacade } from '../../../adapters/users/user.facade'; import { ActionType } from '@app/domain/action-type.util'; import { mockUserRepo, mockUsers } from '@app/testing/user.mock'; import { USER_REPOSITORY_TOKEN } from '@app/infrastructure/users/user-repository.token'; import { provideRouter } from '@angular/router'; import { mockFileManagerSvc } from '@app/testing/file-manager.service.mock'; -import { mockUserFac } from '@app/testing/ui/users/user.facade.mock'; +import { mockUserFac } from '@app/testing/adapters/users/user.facade.mock'; describe('UserAvatarFormComponent', () => { let component: UserAvatarFormComponent; diff --git a/src/app/shared/components/user-avatar-form/user-avatar-form.component.ts b/src/app/shared/components/user-avatar-form/user-avatar-form.component.ts index 53983a8..6b4ac2b 100644 --- a/src/app/shared/components/user-avatar-form/user-avatar-form.component.ts +++ b/src/app/shared/components/user-avatar-form/user-avatar-form.component.ts @@ -3,12 +3,12 @@ import { User } from '@app/domain/users/user.model'; import { ReactiveFormsModule } from '@angular/forms'; import { environment } from '@env/environment'; import { NgTemplateOutlet } from '@angular/common'; -import { UserFacade } from '@app/ui/users/user.facade'; +import { UserFacade } from '@app/adapters/users/user.facade'; import { ActionType } from '@app/domain/action-type.util'; import { LoadingComponent } from '@app/shared/components/loading/loading.component'; import { UntilDestroy } from '@ngneat/until-destroy'; -import { UserViewModel } from '@app/ui/users/user.presenter.model'; -import { FileManagerService } from '@app/ui/shared/services/file-manager.service'; +import { UserViewModel } from '@app/adapters/users/user.presenter.model'; +import { FileManagerService } from '@app/adapters/shared/services/file-manager.service'; @Component({ selector: 'app-user-avatar-form', diff --git a/src/app/shared/components/user-form/user-form.component.ts b/src/app/shared/components/user-form/user-form.component.ts index 82a1a75..c62bf28 100644 --- a/src/app/shared/components/user-form/user-form.component.ts +++ b/src/app/shared/components/user-form/user-form.component.ts @@ -9,7 +9,7 @@ import { import { User } from '@app/domain/users/user.model'; import { UntilDestroy } from '@ngneat/until-destroy'; import { ToastrService } from 'ngx-toastr'; -import { UserFacade } from '@app/ui/users/user.facade'; +import { UserFacade } from '@app/adapters/users/user.facade'; import { ActionType } from '@app/domain/action-type.util'; import { LoadingComponent } from '@app/shared/components/loading/loading.component'; import { NgClass, NgTemplateOutlet } from '@angular/common'; diff --git a/src/app/shared/components/user-password-form/user-password-form.component.spec.ts b/src/app/shared/components/user-password-form/user-password-form.component.spec.ts index 7c74db4..aafc0a6 100644 --- a/src/app/shared/components/user-password-form/user-password-form.component.spec.ts +++ b/src/app/shared/components/user-password-form/user-password-form.component.spec.ts @@ -2,12 +2,12 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { UserPasswordFormComponent } from './user-password-form.component'; import { ToastrService } from 'ngx-toastr'; -import { AuthFacade } from '@app/ui/authentification/auth.facade'; +import { AuthFacade } from '../../../adapters/authentification/auth.facade'; import { By } from '@angular/platform-browser'; import { ActionType } from '@app/domain/action-type.util'; import { signal, WritableSignal } from '@angular/core'; import { mockToastR } from '@app/testing/toastr.mock'; -import { mockAuthenticationFacade } from '@app/testing/ui/authentification/auth.facade.mock'; +import { mockAuthenticationFacade } from '@app/testing/adapters/authentification/auth.facade.mock'; describe('UserPasswordFormComponent', () => { let component: UserPasswordFormComponent; diff --git a/src/app/shared/components/user-password-form/user-password-form.component.ts b/src/app/shared/components/user-password-form/user-password-form.component.ts index db5c583..4403ab9 100644 --- a/src/app/shared/components/user-password-form/user-password-form.component.ts +++ b/src/app/shared/components/user-password-form/user-password-form.component.ts @@ -1,7 +1,7 @@ import { Component, effect, inject, Input, output } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; -import { UserViewModel } from '@app/ui/users/user.presenter.model'; -import { AuthFacade } from '@app/ui/authentification/auth.facade'; +import { UserViewModel } from '@app/adapters/users/user.presenter.model'; +import { AuthFacade } from '@app/adapters/authentification/auth.facade'; import { ActionType } from '@app/domain/action-type.util'; import { ToastrService } from 'ngx-toastr'; import { LoadingComponent } from '@app/shared/components/loading/loading.component'; diff --git a/src/app/shared/components/vertical-profile-item/vertical-profile-item.component.spec.ts b/src/app/shared/components/vertical-profile-item/vertical-profile-item.component.spec.ts index d48dfbc..e8c8a43 100644 --- a/src/app/shared/components/vertical-profile-item/vertical-profile-item.component.spec.ts +++ b/src/app/shared/components/vertical-profile-item/vertical-profile-item.component.spec.ts @@ -8,7 +8,7 @@ import { SECTOR_REPOSITORY_TOKEN } from '@app/infrastructure/sectors/sector-repo import { SectorRepository } from '@app/domain/sectors/sector.repository'; import { mockUserRepo } from '@app/testing/user.mock'; import { mockSectorRepo } from '@app/testing/sector.mock'; -import { ProfileViewModel } from '@app/ui/profiles/profile.presenter.model'; +import { ProfileViewModel } from '../../../adapters/profiles/profile.presenter.model'; import { ToastrService } from 'ngx-toastr'; import { mockToastR } from '@app/testing/toastr.mock'; diff --git a/src/app/shared/components/vertical-profile-item/vertical-profile-item.component.ts b/src/app/shared/components/vertical-profile-item/vertical-profile-item.component.ts index eee37e3..780cf4a 100644 --- a/src/app/shared/components/vertical-profile-item/vertical-profile-item.component.ts +++ b/src/app/shared/components/vertical-profile-item/vertical-profile-item.component.ts @@ -2,8 +2,8 @@ import { Component, computed, inject, input, OnInit } from '@angular/core'; import { Router, RouterLink } from '@angular/router'; import { UntilDestroy } from '@ngneat/until-destroy'; import { environment } from '@env/environment'; -import { ProfileViewModel } from '@app/ui/profiles/profile.presenter.model'; -import { UserFacade } from '@app/ui/users/user.facade'; +import { ProfileViewModel } from '@app/adapters/profiles/profile.presenter.model'; +import { UserFacade } from '@app/adapters/users/user.facade'; @Component({ selector: 'app-vertical-profile-item', diff --git a/src/app/shared/components/vertical-profile-list/vertical-profile-list.component.ts b/src/app/shared/components/vertical-profile-list/vertical-profile-list.component.ts index 64d4319..b2dd1fb 100644 --- a/src/app/shared/components/vertical-profile-list/vertical-profile-list.component.ts +++ b/src/app/shared/components/vertical-profile-list/vertical-profile-list.component.ts @@ -1,6 +1,6 @@ import { Component, Input } from '@angular/core'; import { VerticalProfileItemComponent } from '@app/shared/components/vertical-profile-item/vertical-profile-item.component'; -import { ProfileViewModel } from '@app/ui/profiles/profile.presenter.model'; +import { ProfileViewModel } from '@app/adapters/profiles/profile.presenter.model'; import { NgTemplateOutlet } from '@angular/common'; @Component({ diff --git a/src/app/shared/features/filter/filter.component.ts b/src/app/shared/features/filter/filter.component.ts index 44ba609..d610003 100644 --- a/src/app/shared/features/filter/filter.component.ts +++ b/src/app/shared/features/filter/filter.component.ts @@ -1,6 +1,6 @@ import { Component, inject, OnInit, output } from '@angular/core'; -import { SectorFacade } from '@app/ui/sectors/sector.facade'; -import { ProfileFacade } from '@app/ui/profiles/profile.facade'; +import { SectorFacade } from '@app/adapters/sectors/sector.facade'; +import { ProfileFacade } from '@app/adapters/profiles/profile.facade'; import { SearchService } from '@app/infrastructure/search/search.service'; import { FormBuilder, FormsModule, ReactiveFormsModule } from '@angular/forms'; import { SearchFilters } from '@app/domain/search/search-filters'; diff --git a/src/app/shared/features/forgot-password/forgot-password.component.spec.ts b/src/app/shared/features/forgot-password/forgot-password.component.spec.ts index 90d5fc9..1093e77 100644 --- a/src/app/shared/features/forgot-password/forgot-password.component.spec.ts +++ b/src/app/shared/features/forgot-password/forgot-password.component.spec.ts @@ -4,7 +4,7 @@ import { ForgotPasswordComponent } from './forgot-password.component'; import { ToastrService } from 'ngx-toastr'; import { signal, WritableSignal } from '@angular/core'; import { ActionType } from '@app/domain/action-type.util'; -import { AuthFacade } from '@app/ui/authentification/auth.facade'; +import { AuthFacade } from '../../../adapters/authentification/auth.facade'; import { ActivatedRoute, provideRouter, Router } from '@angular/router'; import { Subject } from 'rxjs'; diff --git a/src/app/shared/features/forgot-password/forgot-password.component.ts b/src/app/shared/features/forgot-password/forgot-password.component.ts index 9e387e3..abd08a6 100644 --- a/src/app/shared/features/forgot-password/forgot-password.component.ts +++ b/src/app/shared/features/forgot-password/forgot-password.component.ts @@ -2,7 +2,7 @@ import { Component, effect, inject } from '@angular/core'; import { BtnLoadingComponent } from '@app/shared/components/btn-loading/btn-loading.component'; import { FormBuilder, FormsModule, ReactiveFormsModule, Validators } from '@angular/forms'; import { Router, RouterLink } from '@angular/router'; -import { AuthFacade } from '@app/ui/authentification/auth.facade'; +import { AuthFacade } from '@app/adapters/authentification/auth.facade'; import { ActionType } from '@app/domain/action-type.util'; @Component({ diff --git a/src/app/shared/features/login/login.component.ts b/src/app/shared/features/login/login.component.ts index 6cab7f3..502d891 100644 --- a/src/app/shared/features/login/login.component.ts +++ b/src/app/shared/features/login/login.component.ts @@ -4,7 +4,7 @@ import { FormBuilder, FormControl, ReactiveFormsModule, Validators } from '@angu import { LoginDto } from '@app/domain/authentification/dto/login-dto'; import { UntilDestroy } from '@ngneat/until-destroy'; import { ProgressBarModule } from 'primeng/progressbar'; -import { AuthFacade } from '@app/ui/authentification/auth.facade'; +import { AuthFacade } from '@app/adapters/authentification/auth.facade'; import { ActionType } from '@app/domain/action-type.util'; import { BtnLoadingComponent } from '@app/shared/components/btn-loading/btn-loading.component'; diff --git a/src/app/shared/features/my-profile-map/my-profile-map.component.ts b/src/app/shared/features/my-profile-map/my-profile-map.component.ts index 60bb285..0ff6d9f 100644 --- a/src/app/shared/features/my-profile-map/my-profile-map.component.ts +++ b/src/app/shared/features/my-profile-map/my-profile-map.component.ts @@ -1,9 +1,9 @@ import { Component, effect, inject, input, OnInit, signal } from '@angular/core'; import { MapComponent, MapMarker } from '@app/shared/components/map/map.component'; import { Coordinates, CoordinatesValidator } from '@app/domain/localisation/coordinates.model'; -import { LocationFacade } from '@app/ui/location/location.facade'; -import { ProfileFacade } from '@app/ui/profiles/profile.facade'; -import { ProfileViewModel } from '@app/ui/profiles/profile.presenter.model'; +import { LocationFacade } from '@app/adapters/location/location.facade'; +import { ProfileFacade } from '@app/adapters/profiles/profile.facade'; +import { ProfileViewModel } from '@app/adapters/profiles/profile.presenter.model'; import { ActionType } from '@app/domain/action-type.util'; @Component({ diff --git a/src/app/shared/features/pdf-viewer/pdf-viewer.component.spec.ts b/src/app/shared/features/pdf-viewer/pdf-viewer.component.spec.ts index 2f61f18..42b4419 100644 --- a/src/app/shared/features/pdf-viewer/pdf-viewer.component.spec.ts +++ b/src/app/shared/features/pdf-viewer/pdf-viewer.component.spec.ts @@ -1,7 +1,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { PdfViewerComponent } from './pdf-viewer.component'; -import { ProfileViewModel } from '@app/ui/profiles/profile.presenter.model'; +import { ProfileViewModel } from '../../../adapters/profiles/profile.presenter.model'; describe('PdfViewerComponent', () => { let component: PdfViewerComponent; diff --git a/src/app/shared/features/pdf-viewer/pdf-viewer.component.ts b/src/app/shared/features/pdf-viewer/pdf-viewer.component.ts index f8d4aa3..9b4b8f9 100644 --- a/src/app/shared/features/pdf-viewer/pdf-viewer.component.ts +++ b/src/app/shared/features/pdf-viewer/pdf-viewer.component.ts @@ -1,7 +1,7 @@ import { Component, computed, input } from '@angular/core'; import { PdfViewerModule } from 'ng2-pdf-viewer'; import { environment } from '@env/environment'; -import { ProfileViewModel } from '@app/ui/profiles/profile.presenter.model'; +import { ProfileViewModel } from '@app/adapters/profiles/profile.presenter.model'; @Component({ selector: 'app-pdf-viewer', diff --git a/src/app/shared/features/profile-list-map/profile-list-map.component.ts b/src/app/shared/features/profile-list-map/profile-list-map.component.ts index c33c84c..fe0ac45 100644 --- a/src/app/shared/features/profile-list-map/profile-list-map.component.ts +++ b/src/app/shared/features/profile-list-map/profile-list-map.component.ts @@ -1,7 +1,7 @@ import { Component, effect, inject, input, OnInit, signal } from '@angular/core'; import { MapComponent, MapMarker } from '@app/shared/components/map/map.component'; -import { ProfileViewModel } from '@app/ui/profiles/profile.presenter.model'; -import { LocationFacade } from '@app/ui/location/location.facade'; +import { ProfileViewModel } from '@app/adapters/profiles/profile.presenter.model'; +import { LocationFacade } from '@app/adapters/location/location.facade'; import { Router } from '@angular/router'; @Component({ diff --git a/src/app/shared/features/register/register.component.ts b/src/app/shared/features/register/register.component.ts index dd498aa..f8c1e3a 100644 --- a/src/app/shared/features/register/register.component.ts +++ b/src/app/shared/features/register/register.component.ts @@ -5,7 +5,7 @@ import { RegisterDto } from '@app/domain/authentification/dto/register-dto'; import { UntilDestroy } from '@ngneat/until-destroy'; import { ProgressBarModule } from 'primeng/progressbar'; import { ActionType } from '@app/domain/action-type.util'; -import { AuthFacade } from '@app/ui/authentification/auth.facade'; +import { AuthFacade } from '@app/adapters/authentification/auth.facade'; import { BtnLoadingComponent } from '@app/shared/components/btn-loading/btn-loading.component'; @Component({ diff --git a/src/app/shared/features/settings/settings.component.spec.ts b/src/app/shared/features/settings/settings.component.spec.ts index 0be5657..00c5166 100644 --- a/src/app/shared/features/settings/settings.component.spec.ts +++ b/src/app/shared/features/settings/settings.component.spec.ts @@ -10,7 +10,7 @@ import { mockSettingRepo } from '@app/testing/setting.mock'; import { PROFILE_REPOSITORY_TOKEN } from '@app/infrastructure/profiles/profile-repository.token'; import { ProfileRepository } from '@app/domain/profiles/profile.repository'; import { mockProfileRepo } from '@app/testing/profile.mock'; -import { ProfileViewModel } from '@app/ui/profiles/profile.presenter.model'; +import { ProfileViewModel } from '../../../adapters/profiles/profile.presenter.model'; describe('SettingsComponent', () => { let component: SettingsComponent; diff --git a/src/app/shared/features/settings/settings.component.ts b/src/app/shared/features/settings/settings.component.ts index f7e1176..1152680 100644 --- a/src/app/shared/features/settings/settings.component.ts +++ b/src/app/shared/features/settings/settings.component.ts @@ -1,9 +1,9 @@ import { Component, effect, inject, input, OnInit } from '@angular/core'; import { FormBuilder, ReactiveFormsModule, Validators } from '@angular/forms'; import { ThemeType } from '@app/domain/settings/setting.model'; -import { SettingsFacade } from '@app/ui/settings/settings.facade'; -import { ProfileViewModel } from '@app/ui/profiles/profile.presenter.model'; -import { ProfileFacade } from '@app/ui/profiles/profile.facade'; +import { SettingsFacade } from '@app/adapters/settings/settings.facade'; +import { ProfileViewModel } from '@app/adapters/profiles/profile.presenter.model'; +import { ProfileFacade } from '@app/adapters/profiles/profile.facade'; import { ActionType } from '@app/domain/action-type.util'; import { SettingsProfileDto } from '@app/domain/profiles/dto/settings-profile.dto'; diff --git a/src/app/shared/features/update-user/update-user.component.ts b/src/app/shared/features/update-user/update-user.component.ts index a117e17..bc0d21a 100644 --- a/src/app/shared/features/update-user/update-user.component.ts +++ b/src/app/shared/features/update-user/update-user.component.ts @@ -1,7 +1,7 @@ import { Component, Input } from '@angular/core'; import { UserFormComponent } from '@app/shared/components/user-form/user-form.component'; import { UserAvatarFormComponent } from '@app/shared/components/user-avatar-form/user-avatar-form.component'; -import { UserViewModel } from '@app/ui/users/user.presenter.model'; +import { UserViewModel } from '@app/adapters/users/user.presenter.model'; import { UserPasswordFormComponent } from '@app/shared/components/user-password-form/user-password-form.component'; @Component({ diff --git a/src/app/testing/ui/authentification/.gitkeep b/src/app/testing/adapters/authentification/.gitkeep similarity index 100% rename from src/app/testing/ui/authentification/.gitkeep rename to src/app/testing/adapters/authentification/.gitkeep diff --git a/src/app/testing/ui/authentification/auth.facade.mock.ts b/src/app/testing/adapters/authentification/auth.facade.mock.ts similarity index 100% rename from src/app/testing/ui/authentification/auth.facade.mock.ts rename to src/app/testing/adapters/authentification/auth.facade.mock.ts diff --git a/src/app/testing/ui/profiles/profile.facade.mock.ts b/src/app/testing/adapters/profiles/profile.facade.mock.ts similarity index 100% rename from src/app/testing/ui/profiles/profile.facade.mock.ts rename to src/app/testing/adapters/profiles/profile.facade.mock.ts diff --git a/src/app/testing/ui/profiles/profile.facade.spec.ts b/src/app/testing/adapters/profiles/profile.facade.spec.ts similarity index 95% rename from src/app/testing/ui/profiles/profile.facade.spec.ts rename to src/app/testing/adapters/profiles/profile.facade.spec.ts index 63a1a89..3d537a2 100644 --- a/src/app/testing/ui/profiles/profile.facade.spec.ts +++ b/src/app/testing/adapters/profiles/profile.facade.spec.ts @@ -1,4 +1,4 @@ -import { ProfileFacade } from '@app/ui/profiles/profile.facade'; +import { ProfileFacade } from '@app/adapters/profiles/profile.facade'; import { TestBed } from '@angular/core/testing'; import { PROFILE_REPOSITORY_TOKEN } from '@app/infrastructure/profiles/profile-repository.token'; import { FakeProfileRepository } from '@app/testing/domain/profiles/fake-profile.repository'; @@ -9,7 +9,7 @@ import { ToastrService } from 'ngx-toastr'; import { mockToastR } from '@app/testing/toastr.mock'; import { SearchService } from '@app/infrastructure/search/search.service'; import { mockSearchService } from '@app/testing/search.service.mock'; -import { FeedbackService } from '@app/ui/shared/services/feedback.service'; +import { FeedbackService } from '@app/adapters/shared/services/feedback.service'; import { mockFeedbackService } from '@app/testing/feedback.service.mock'; describe('ProfileFacade', () => { diff --git a/src/app/testing/ui/profiles/profile.presenter.spec.ts b/src/app/testing/adapters/profiles/profile.presenter.spec.ts similarity index 96% rename from src/app/testing/ui/profiles/profile.presenter.spec.ts rename to src/app/testing/adapters/profiles/profile.presenter.spec.ts index 342ade3..f5cc9a1 100644 --- a/src/app/testing/ui/profiles/profile.presenter.spec.ts +++ b/src/app/testing/adapters/profiles/profile.presenter.spec.ts @@ -1,4 +1,4 @@ -import { ProfilePresenter } from '@app/ui/profiles/profile.presenter'; +import { ProfilePresenter } from '@app/adapters/profiles/profile.presenter'; import { Profile } from '@app/domain/profiles/profile.model'; import { mockProfiles } from '@app/testing/profile.mock'; import { Coordinates } from '@app/domain/localisation/coordinates.model'; diff --git a/src/app/testing/ui/projects/project.facade.mock.ts b/src/app/testing/adapters/projects/project.facade.mock.ts similarity index 100% rename from src/app/testing/ui/projects/project.facade.mock.ts rename to src/app/testing/adapters/projects/project.facade.mock.ts diff --git a/src/app/testing/ui/projects/project.facade.spec.ts b/src/app/testing/adapters/projects/project.facade.spec.ts similarity index 97% rename from src/app/testing/ui/projects/project.facade.spec.ts rename to src/app/testing/adapters/projects/project.facade.spec.ts index 0c8793b..0a8bf62 100644 --- a/src/app/testing/ui/projects/project.facade.spec.ts +++ b/src/app/testing/adapters/projects/project.facade.spec.ts @@ -1,5 +1,5 @@ import { TestBed } from '@angular/core/testing'; -import { ProjectFacade } from '@app/ui/projects/project.facade'; +import { ProjectFacade } from '@app/adapters/projects/project.facade'; import { FakeProjectRepository } from '@app/testing/domain/projects/fake-project.repository'; import { PROJECT_REPOSITORY_TOKEN } from '@app/infrastructure/projects/project-repository.token'; import { mockProjects } from '@app/testing/project.mock'; diff --git a/src/app/testing/ui/projects/project.presenter.spec.ts b/src/app/testing/adapters/projects/project.presenter.spec.ts similarity index 93% rename from src/app/testing/ui/projects/project.presenter.spec.ts rename to src/app/testing/adapters/projects/project.presenter.spec.ts index 820475b..cd3aba5 100644 --- a/src/app/testing/ui/projects/project.presenter.spec.ts +++ b/src/app/testing/adapters/projects/project.presenter.spec.ts @@ -1,7 +1,7 @@ import { Project } from '@app/domain/projects/project.model'; -import { ProjectPresenter } from '@app/ui/projects/project.presenter'; +import { ProjectPresenter } from '@app/adapters/projects/project.presenter'; import { mockProjects } from '@app/testing/project.mock'; -import { ProjectViewModel } from '@app/ui/projects/project.presenter.model'; +import { ProjectViewModel } from '@app/adapters/projects/project.presenter.model'; describe('ProjectPresenter', () => { let presenter: ProjectPresenter; diff --git a/src/app/testing/ui/sectors/sector.facade.spec.ts b/src/app/testing/adapters/sectors/sector.facade.spec.ts similarity index 96% rename from src/app/testing/ui/sectors/sector.facade.spec.ts rename to src/app/testing/adapters/sectors/sector.facade.spec.ts index 87d88a4..01043ac 100644 --- a/src/app/testing/ui/sectors/sector.facade.spec.ts +++ b/src/app/testing/adapters/sectors/sector.facade.spec.ts @@ -1,5 +1,5 @@ import { TestBed } from '@angular/core/testing'; -import { SectorFacade } from '@app/ui/sectors/sector.facade'; +import { SectorFacade } from '@app/adapters/sectors/sector.facade'; import { SECTOR_REPOSITORY_TOKEN } from '@app/infrastructure/sectors/sector-repository.token'; import { FakeSectorRepository } from '@app/testing/domain/sectors/fake-sector.repository'; import { fakeSectors } from '@app/testing/sector.mock'; diff --git a/src/app/testing/ui/sectors/sector.presenter.spec.ts b/src/app/testing/adapters/sectors/sector.presenter.spec.ts similarity index 91% rename from src/app/testing/ui/sectors/sector.presenter.spec.ts rename to src/app/testing/adapters/sectors/sector.presenter.spec.ts index 4650340..68628a4 100644 --- a/src/app/testing/ui/sectors/sector.presenter.spec.ts +++ b/src/app/testing/adapters/sectors/sector.presenter.spec.ts @@ -1,4 +1,4 @@ -import { SectorPresenter } from '@app/ui/sectors/sector.presenter'; +import { SectorPresenter } from '@app/adapters/sectors/sector.presenter'; import { Sector } from '@app/domain/sectors/sector.model'; import { fakeSectors } from '@app/testing/sector.mock'; diff --git a/src/app/testing/ui/shared/file-manager.service.spec.ts b/src/app/testing/adapters/shared/file-manager.service.spec.ts similarity index 97% rename from src/app/testing/ui/shared/file-manager.service.spec.ts rename to src/app/testing/adapters/shared/file-manager.service.spec.ts index 9732706..210ceb0 100644 --- a/src/app/testing/ui/shared/file-manager.service.spec.ts +++ b/src/app/testing/adapters/shared/file-manager.service.spec.ts @@ -1,4 +1,4 @@ -import { FileManagerService } from '@app/ui/shared/services/file-manager.service'; +import { FileManagerService } from '@app/adapters/shared/services/file-manager.service'; import { TestBed } from '@angular/core/testing'; // 1. Mock de la librairie externe diff --git a/src/app/testing/ui/users/user.facade.mock.ts b/src/app/testing/adapters/users/user.facade.mock.ts similarity index 100% rename from src/app/testing/ui/users/user.facade.mock.ts rename to src/app/testing/adapters/users/user.facade.mock.ts diff --git a/src/app/testing/ui/users/user.facade.spec.ts b/src/app/testing/adapters/users/user.facade.spec.ts similarity index 95% rename from src/app/testing/ui/users/user.facade.spec.ts rename to src/app/testing/adapters/users/user.facade.spec.ts index b73c57b..2eed4bd 100644 --- a/src/app/testing/ui/users/user.facade.spec.ts +++ b/src/app/testing/adapters/users/user.facade.spec.ts @@ -1,4 +1,4 @@ -import { UserFacade } from '@app/ui/users/user.facade'; +import { UserFacade } from '@app/adapters/users/user.facade'; import { TestBed } from '@angular/core/testing'; import { USER_REPOSITORY_TOKEN } from '@app/infrastructure/users/user-repository.token'; import { FakeUserRepository } from '@app/testing/domain/users/fake-user.repository'; diff --git a/src/app/testing/usecase/authentification/.gitkeep b/src/app/testing/application/authentification/.gitkeep similarity index 100% rename from src/app/testing/usecase/authentification/.gitkeep rename to src/app/testing/application/authentification/.gitkeep diff --git a/src/app/testing/usecase/authentification/get-user.usecase.spec.ts b/src/app/testing/application/authentification/get-user.usecase.spec.ts similarity index 81% rename from src/app/testing/usecase/authentification/get-user.usecase.spec.ts rename to src/app/testing/application/authentification/get-user.usecase.spec.ts index 4807e79..88d8bfa 100644 --- a/src/app/testing/usecase/authentification/get-user.usecase.spec.ts +++ b/src/app/testing/application/authentification/get-user.usecase.spec.ts @@ -1,5 +1,5 @@ import { FakeAuthRepository } from '@app/testing/domain/authentification/fake-auth.repository'; -import { GetCurrentUserUseCase } from '@app/usecase/authentification/get-current-user.usecase'; +import { GetCurrentUserUseCase } from '@app/application/authentification/get-current-user.usecase'; import { mockUsers } from '@app/testing/user.mock'; describe('GetUserUsecase', () => { diff --git a/src/app/testing/usecase/authentification/login.usecase.spec.ts b/src/app/testing/application/authentification/login.usecase.spec.ts similarity index 88% rename from src/app/testing/usecase/authentification/login.usecase.spec.ts rename to src/app/testing/application/authentification/login.usecase.spec.ts index 35e58a0..cfa4a89 100644 --- a/src/app/testing/usecase/authentification/login.usecase.spec.ts +++ b/src/app/testing/application/authentification/login.usecase.spec.ts @@ -1,5 +1,5 @@ import { FakeAuthRepository } from '@app/testing/domain/authentification/fake-auth.repository'; -import { LoginUseCase } from '@app/usecase/authentification/login.usecase'; +import { LoginUseCase } from '@app/application/authentification/login.usecase'; import { LoginDto } from '@app/domain/authentification/dto/login-dto'; import { firstValueFrom } from 'rxjs'; diff --git a/src/app/testing/usecase/authentification/logout.usecase.spec.ts b/src/app/testing/application/authentification/logout.usecase.spec.ts similarity index 85% rename from src/app/testing/usecase/authentification/logout.usecase.spec.ts rename to src/app/testing/application/authentification/logout.usecase.spec.ts index 14c4bf5..7dfc8fa 100644 --- a/src/app/testing/usecase/authentification/logout.usecase.spec.ts +++ b/src/app/testing/application/authentification/logout.usecase.spec.ts @@ -1,5 +1,5 @@ import { FakeAuthRepository } from '@app/testing/domain/authentification/fake-auth.repository'; -import { LogoutUseCase } from '@app/usecase/authentification/logout.usecase'; +import { LogoutUseCase } from '@app/application/authentification/logout.usecase'; import { mockUsers } from '@app/testing/user.mock'; describe('LogoutUsecase', () => { diff --git a/src/app/testing/usecase/authentification/register.usecase.spec.ts b/src/app/testing/application/authentification/register.usecase.spec.ts similarity index 88% rename from src/app/testing/usecase/authentification/register.usecase.spec.ts rename to src/app/testing/application/authentification/register.usecase.spec.ts index ee0aa57..b36ffef 100644 --- a/src/app/testing/usecase/authentification/register.usecase.spec.ts +++ b/src/app/testing/application/authentification/register.usecase.spec.ts @@ -1,5 +1,5 @@ import { FakeAuthRepository } from '@app/testing/domain/authentification/fake-auth.repository'; -import { RegisterUseCase } from '@app/usecase/authentification/register.usecase'; +import { RegisterUseCase } from '@app/application/authentification/register.usecase'; import { RegisterDto } from '@app/domain/authentification/dto/register-dto'; import { firstValueFrom } from 'rxjs'; diff --git a/src/app/testing/usecase/authentification/send-request-password.usecase.spec.ts b/src/app/testing/application/authentification/send-request-password.usecase.spec.ts similarity index 80% rename from src/app/testing/usecase/authentification/send-request-password.usecase.spec.ts rename to src/app/testing/application/authentification/send-request-password.usecase.spec.ts index 881ad0f..e91623f 100644 --- a/src/app/testing/usecase/authentification/send-request-password.usecase.spec.ts +++ b/src/app/testing/application/authentification/send-request-password.usecase.spec.ts @@ -1,5 +1,5 @@ import { FakeAuthRepository } from '@app/testing/domain/authentification/fake-auth.repository'; -import { SendRequestPasswordResetUsecase } from '@app/usecase/authentification/send-request-password-reset.usecase'; +import { SendRequestPasswordResetUsecase } from '@app/application/authentification/send-request-password-reset.usecase'; import { firstValueFrom } from 'rxjs'; describe('SendRequestPasswordUsecase', () => { diff --git a/src/app/testing/usecase/authentification/send-verification-email.usecase.spec.ts b/src/app/testing/application/authentification/send-verification-email.usecase.spec.ts similarity index 81% rename from src/app/testing/usecase/authentification/send-verification-email.usecase.spec.ts rename to src/app/testing/application/authentification/send-verification-email.usecase.spec.ts index a12b78d..a313b31 100644 --- a/src/app/testing/usecase/authentification/send-verification-email.usecase.spec.ts +++ b/src/app/testing/application/authentification/send-verification-email.usecase.spec.ts @@ -1,5 +1,5 @@ import { FakeAuthRepository } from '@app/testing/domain/authentification/fake-auth.repository'; -import { SendVerificationEmailUsecase } from '@app/usecase/authentification/send-verification-email.usecase'; +import { SendVerificationEmailUsecase } from '@app/application/authentification/send-verification-email.usecase'; import { firstValueFrom } from 'rxjs'; describe('SendVerificationEmailUsecase', () => { diff --git a/src/app/testing/usecase/authentification/verify-auth.usecase.spec.ts b/src/app/testing/application/authentification/verify-auth.usecase.spec.ts similarity index 76% rename from src/app/testing/usecase/authentification/verify-auth.usecase.spec.ts rename to src/app/testing/application/authentification/verify-auth.usecase.spec.ts index fa926be..03a6f6f 100644 --- a/src/app/testing/usecase/authentification/verify-auth.usecase.spec.ts +++ b/src/app/testing/application/authentification/verify-auth.usecase.spec.ts @@ -1,5 +1,5 @@ import { FakeAuthRepository } from '@app/testing/domain/authentification/fake-auth.repository'; -import { VerifyAuthenticatedUsecase } from '@app/usecase/authentification/verify-authenticated.usecase'; +import { VerifyAuthenticatedUsecase } from '@app/application/authentification/verify-authenticated.usecase'; describe('VerifyAuthenticationUseCase', () => { it("devrait retourner l'utilisateur authentifier ", () => { diff --git a/src/app/testing/usecase/authentification/verify-email.usecase.spec.ts b/src/app/testing/application/authentification/verify-email.usecase.spec.ts similarity index 78% rename from src/app/testing/usecase/authentification/verify-email.usecase.spec.ts rename to src/app/testing/application/authentification/verify-email.usecase.spec.ts index 1a7da32..0d1940d 100644 --- a/src/app/testing/usecase/authentification/verify-email.usecase.spec.ts +++ b/src/app/testing/application/authentification/verify-email.usecase.spec.ts @@ -1,5 +1,5 @@ import { FakeAuthRepository } from '@app/testing/domain/authentification/fake-auth.repository'; -import { VerifyEmailUseCase } from '@app/usecase/authentification/verify-email.usecase'; +import { VerifyEmailUseCase } from '@app/application/authentification/verify-email.usecase'; describe('VerifyEmailUseCase', () => { it("devrait verifier le mail de l'utilisateur ", () => { diff --git a/src/app/testing/usecase/profiles/create-profile.usecase.spec.ts b/src/app/testing/application/profiles/create-profile.usecase.spec.ts similarity index 90% rename from src/app/testing/usecase/profiles/create-profile.usecase.spec.ts rename to src/app/testing/application/profiles/create-profile.usecase.spec.ts index 6aaff3a..b10ec1d 100644 --- a/src/app/testing/usecase/profiles/create-profile.usecase.spec.ts +++ b/src/app/testing/application/profiles/create-profile.usecase.spec.ts @@ -1,6 +1,6 @@ import { FakeProfileRepository } from '@app/testing/domain/profiles/fake-profile.repository'; import { mockProfiles } from '@app/testing/profile.mock'; -import { CreateProfileUseCase } from '@app/usecase/profiles/create-profile.usecase'; +import { CreateProfileUseCase } from '@app/application/profiles/create-profile.usecase'; import { ProfileDTO } from '@app/domain/profiles/dto/create-profile.dto'; describe('CreateProfileUseCase', () => { diff --git a/src/app/testing/usecase/profiles/get-profile.usecase.spec.ts b/src/app/testing/application/profiles/get-profile.usecase.spec.ts similarity index 84% rename from src/app/testing/usecase/profiles/get-profile.usecase.spec.ts rename to src/app/testing/application/profiles/get-profile.usecase.spec.ts index 936e645..21fe094 100644 --- a/src/app/testing/usecase/profiles/get-profile.usecase.spec.ts +++ b/src/app/testing/application/profiles/get-profile.usecase.spec.ts @@ -1,6 +1,6 @@ import { FakeProfileRepository } from '@app/testing/domain/profiles/fake-profile.repository'; import { mockProfiles } from '@app/testing/profile.mock'; -import { GetProfileUseCase } from '@app/usecase/profiles/get-profile.usecase'; +import { GetProfileUseCase } from '@app/application/profiles/get-profile.usecase'; describe('GetProfileUseCase', () => { it('doit retourner un profile', () => { diff --git a/src/app/testing/usecase/profiles/list-profiles.usecase.spec.ts b/src/app/testing/application/profiles/list-profiles.usecase.spec.ts similarity index 74% rename from src/app/testing/usecase/profiles/list-profiles.usecase.spec.ts rename to src/app/testing/application/profiles/list-profiles.usecase.spec.ts index 9943e8d..a658f42 100644 --- a/src/app/testing/usecase/profiles/list-profiles.usecase.spec.ts +++ b/src/app/testing/application/profiles/list-profiles.usecase.spec.ts @@ -1,6 +1,6 @@ -import { ListProfilesUseCase } from '@app/usecase/profiles/list-profiles.usecase'; +import { ListProfilesUseCase } from '@app/application/profiles/list-profiles.usecase'; import { FakeProfileRepository } from '@app/testing/domain/profiles/fake-profile.repository'; -import { mockProfilePaginated, mockProfiles } from '@app/testing/profile.mock'; +import { mockProfilePaginated } from '@app/testing/profile.mock'; describe('ListProfilesUseCase', () => { it('doit retourner la liste des profils', () => { diff --git a/src/app/testing/usecase/profiles/update-profile.usecase.spec.ts b/src/app/testing/application/profiles/update-profile.usecase.spec.ts similarity index 88% rename from src/app/testing/usecase/profiles/update-profile.usecase.spec.ts rename to src/app/testing/application/profiles/update-profile.usecase.spec.ts index 4f65f8d..c07319f 100644 --- a/src/app/testing/usecase/profiles/update-profile.usecase.spec.ts +++ b/src/app/testing/application/profiles/update-profile.usecase.spec.ts @@ -1,6 +1,6 @@ import { FakeProfileRepository } from '@app/testing/domain/profiles/fake-profile.repository'; import { mockProfiles } from '@app/testing/profile.mock'; -import { UpdateProfileUseCase } from '@app/usecase/profiles/update-profile.usecase'; +import { UpdateProfileUseCase } from '@app/application/profiles/update-profile.usecase'; describe('UpdateProfileUseCase', () => { it('doit retourner un profile modifier', () => { diff --git a/src/app/testing/usecase/projects/create-project.usecase.spec.ts b/src/app/testing/application/projects/create-project.usecase.spec.ts similarity index 90% rename from src/app/testing/usecase/projects/create-project.usecase.spec.ts rename to src/app/testing/application/projects/create-project.usecase.spec.ts index 6bf50cd..273e801 100644 --- a/src/app/testing/usecase/projects/create-project.usecase.spec.ts +++ b/src/app/testing/application/projects/create-project.usecase.spec.ts @@ -1,4 +1,4 @@ -import { CreateProjectUseCase } from '@app/usecase/projects/create-project.usecase'; +import { CreateProjectUseCase } from '@app/application/projects/create-project.usecase'; import { CreateProjectDto } from '@app/domain/projects/dto/create-project.dto'; import { FakeProjectRepository } from '@app/testing/domain/projects/fake-project.repository'; diff --git a/src/app/testing/usecase/projects/get-project.usecase.spec.ts b/src/app/testing/application/projects/get-project.usecase.spec.ts similarity index 86% rename from src/app/testing/usecase/projects/get-project.usecase.spec.ts rename to src/app/testing/application/projects/get-project.usecase.spec.ts index 0cf2e6e..31e1a86 100644 --- a/src/app/testing/usecase/projects/get-project.usecase.spec.ts +++ b/src/app/testing/application/projects/get-project.usecase.spec.ts @@ -1,5 +1,5 @@ import { FakeProjectRepository } from '@app/testing/domain/projects/fake-project.repository'; -import { GetProjectUseCase } from '@app/usecase/projects/get-project.usecase'; +import { GetProjectUseCase } from '@app/application/projects/get-project.usecase'; describe('GetProjectUseCase', () => { let useCase: GetProjectUseCase; diff --git a/src/app/testing/usecase/projects/list-project.usecase.spec.ts b/src/app/testing/application/projects/list-project.usecase.spec.ts similarity index 89% rename from src/app/testing/usecase/projects/list-project.usecase.spec.ts rename to src/app/testing/application/projects/list-project.usecase.spec.ts index 0ce7006..032057e 100644 --- a/src/app/testing/usecase/projects/list-project.usecase.spec.ts +++ b/src/app/testing/application/projects/list-project.usecase.spec.ts @@ -1,5 +1,5 @@ import { FakeProjectRepository } from '@app/testing/domain/projects/fake-project.repository'; -import { ListProjectUseCase } from '@app/usecase/projects/list-project.usecase'; +import { ListProjectUseCase } from '@app/application/projects/list-project.usecase'; import { mockProjects } from '@app/testing/project.mock'; describe('ListProjectUseCase', () => { diff --git a/src/app/testing/usecase/projects/update-project.usecase.spec.ts b/src/app/testing/application/projects/update-project.usecase.spec.ts similarity index 88% rename from src/app/testing/usecase/projects/update-project.usecase.spec.ts rename to src/app/testing/application/projects/update-project.usecase.spec.ts index 9b58088..e6df61e 100644 --- a/src/app/testing/usecase/projects/update-project.usecase.spec.ts +++ b/src/app/testing/application/projects/update-project.usecase.spec.ts @@ -1,5 +1,5 @@ import { FakeProjectRepository } from '@app/testing/domain/projects/fake-project.repository'; -import { UpdateProjectUseCase } from '@app/usecase/projects/update-project.usecase'; +import { UpdateProjectUseCase } from '@app/application/projects/update-project.usecase'; describe('UpdateProjectUseCase', () => { let useCase: UpdateProjectUseCase; diff --git a/src/app/testing/usecase/sectors/get-sector.usecase.spec.ts b/src/app/testing/application/sectors/get-sector.usecase.spec.ts similarity index 87% rename from src/app/testing/usecase/sectors/get-sector.usecase.spec.ts rename to src/app/testing/application/sectors/get-sector.usecase.spec.ts index b14aa80..a6f1f85 100644 --- a/src/app/testing/usecase/sectors/get-sector.usecase.spec.ts +++ b/src/app/testing/application/sectors/get-sector.usecase.spec.ts @@ -1,6 +1,6 @@ import { FakeSectorRepository } from '@app/testing/domain/sectors/fake-sector.repository'; import { fakeSectors } from '@app/testing/sector.mock'; -import { GetSectorUseCase } from '@app/usecase/sectors/get-sector.usecase'; +import { GetSectorUseCase } from '@app/application/sectors/get-sector.usecase'; describe('ListSectorUsecase', () => { let useCase: GetSectorUseCase; diff --git a/src/app/testing/usecase/sectors/list-sector.usecase.spec.ts b/src/app/testing/application/sectors/list-sector.usecase.spec.ts similarity index 86% rename from src/app/testing/usecase/sectors/list-sector.usecase.spec.ts rename to src/app/testing/application/sectors/list-sector.usecase.spec.ts index 9a121fb..abb85b9 100644 --- a/src/app/testing/usecase/sectors/list-sector.usecase.spec.ts +++ b/src/app/testing/application/sectors/list-sector.usecase.spec.ts @@ -1,4 +1,4 @@ -import { ListSectorUsecase } from '@app/usecase/sectors/list-sector.usecase'; +import { ListSectorUsecase } from '@app/application/sectors/list-sector.usecase'; import { FakeSectorRepository } from '@app/testing/domain/sectors/fake-sector.repository'; import { fakeSectors } from '@app/testing/sector.mock'; diff --git a/src/app/testing/usecase/users/get-user.usecase.spec.ts b/src/app/testing/application/users/get-user.usecase.spec.ts similarity index 86% rename from src/app/testing/usecase/users/get-user.usecase.spec.ts rename to src/app/testing/application/users/get-user.usecase.spec.ts index 85a6871..574de84 100644 --- a/src/app/testing/usecase/users/get-user.usecase.spec.ts +++ b/src/app/testing/application/users/get-user.usecase.spec.ts @@ -1,5 +1,5 @@ import { FakeUserRepository } from '@app/testing/domain/users/fake-user.repository'; -import { GetUserUseCase } from '@app/usecase/users/get-user.usecase'; +import { GetUserUseCase } from '@app/application/users/get-user.usecase'; describe('GetUserUseCase', () => { let useCase: GetUserUseCase; diff --git a/src/app/testing/usecase/users/update-user.usecase.spec.ts b/src/app/testing/application/users/update-user.usecase.spec.ts similarity index 88% rename from src/app/testing/usecase/users/update-user.usecase.spec.ts rename to src/app/testing/application/users/update-user.usecase.spec.ts index adc7bee..d8e34e8 100644 --- a/src/app/testing/usecase/users/update-user.usecase.spec.ts +++ b/src/app/testing/application/users/update-user.usecase.spec.ts @@ -1,4 +1,4 @@ -import { UpdateUserUseCase } from '@app/usecase/users/update-user.usecase'; +import { UpdateUserUseCase } from '@app/application/users/update-user.usecase'; import { FakeUserRepository } from '@app/testing/domain/users/fake-user.repository'; describe('UpdateUserUsecase', () => { diff --git a/src/app/routes/authentification/auth/auth.component.html b/src/app/views/authentification/auth/auth.component.html similarity index 100% rename from src/app/routes/authentification/auth/auth.component.html rename to src/app/views/authentification/auth/auth.component.html diff --git a/src/app/routes/authentification/auth/auth.component.scss b/src/app/views/authentification/auth/auth.component.scss similarity index 100% rename from src/app/routes/authentification/auth/auth.component.scss rename to src/app/views/authentification/auth/auth.component.scss diff --git a/src/app/routes/authentification/auth/auth.component.spec.ts b/src/app/views/authentification/auth/auth.component.spec.ts similarity index 100% rename from src/app/routes/authentification/auth/auth.component.spec.ts rename to src/app/views/authentification/auth/auth.component.spec.ts diff --git a/src/app/routes/authentification/auth/auth.component.ts b/src/app/views/authentification/auth/auth.component.ts similarity index 68% rename from src/app/routes/authentification/auth/auth.component.ts rename to src/app/views/authentification/auth/auth.component.ts index 274f609..922bb96 100644 --- a/src/app/routes/authentification/auth/auth.component.ts +++ b/src/app/views/authentification/auth/auth.component.ts @@ -1,10 +1,10 @@ import { Component } from '@angular/core'; -import { RouterLink, RouterOutlet } from '@angular/router'; +import { RouterOutlet } from '@angular/router'; @Component({ selector: 'app-auth', standalone: true, - imports: [RouterOutlet, RouterLink], + imports: [RouterOutlet], templateUrl: './auth.component.html', styleUrl: './auth.component.scss', }) diff --git a/src/app/routes/authentification/authentification-routing.module.ts b/src/app/views/authentification/authentification-routing.module.ts similarity index 81% rename from src/app/routes/authentification/authentification-routing.module.ts rename to src/app/views/authentification/authentification-routing.module.ts index 607e3f2..a26be57 100644 --- a/src/app/routes/authentification/authentification-routing.module.ts +++ b/src/app/views/authentification/authentification-routing.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; import { RegisterComponent } from '@app/shared/features/register/register.component'; -import { AuthComponent } from '@app/routes/authentification/auth/auth.component'; +import { AuthComponent } from '../authentification/auth/auth.component'; import { LoginComponent } from '@app/shared/features/login/login.component'; import { ForgotPasswordComponent } from '@app/shared/features/forgot-password/forgot-password.component'; @@ -17,8 +17,7 @@ const routes: Routes = [ }, { path: 'not-found', - loadChildren: () => - import('@app/routes/not-found/not-found.module').then((m) => m.NotFoundModule), + loadChildren: () => import('../not-found/not-found.module').then((m) => m.NotFoundModule), }, { path: '**', redirectTo: 'not-found' }, ]; diff --git a/src/app/routes/authentification/authentification.module.ts b/src/app/views/authentification/authentification.module.ts similarity index 100% rename from src/app/routes/authentification/authentification.module.ts rename to src/app/views/authentification/authentification.module.ts diff --git a/src/app/routes/home/home-routing.module.ts b/src/app/views/home/home-routing.module.ts similarity index 82% rename from src/app/routes/home/home-routing.module.ts rename to src/app/views/home/home-routing.module.ts index b3a3c91..f7da49e 100644 --- a/src/app/routes/home/home-routing.module.ts +++ b/src/app/views/home/home-routing.module.ts @@ -1,6 +1,6 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { HomeComponent } from '@app/routes/home/home.component'; +import { HomeComponent } from '../home/home.component'; const routes: Routes = [{ path: '', component: HomeComponent, title: 'Accueil' }]; diff --git a/src/app/routes/home/home.component.html b/src/app/views/home/home.component.html similarity index 100% rename from src/app/routes/home/home.component.html rename to src/app/views/home/home.component.html diff --git a/src/app/routes/home/home.component.scss b/src/app/views/home/home.component.scss similarity index 100% rename from src/app/routes/home/home.component.scss rename to src/app/views/home/home.component.scss diff --git a/src/app/routes/home/home.component.spec.ts b/src/app/views/home/home.component.spec.ts similarity index 100% rename from src/app/routes/home/home.component.spec.ts rename to src/app/views/home/home.component.spec.ts diff --git a/src/app/routes/home/home.component.ts b/src/app/views/home/home.component.ts similarity index 100% rename from src/app/routes/home/home.component.ts rename to src/app/views/home/home.component.ts diff --git a/src/app/routes/home/home.module.ts b/src/app/views/home/home.module.ts similarity index 100% rename from src/app/routes/home/home.module.ts rename to src/app/views/home/home.module.ts diff --git a/src/app/routes/my-profile/my-profile-routing.module.ts b/src/app/views/my-profile/my-profile-routing.module.ts similarity index 84% rename from src/app/routes/my-profile/my-profile-routing.module.ts rename to src/app/views/my-profile/my-profile-routing.module.ts index 470fea7..1988d88 100644 --- a/src/app/routes/my-profile/my-profile-routing.module.ts +++ b/src/app/views/my-profile/my-profile-routing.module.ts @@ -1,6 +1,6 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { MyProfileComponent } from '@app/routes/my-profile/my-profile.component'; +import { MyProfileComponent } from '../my-profile/my-profile.component'; import { myProfileResolver } from '@app/core/resolvers/my-profile/my-profile.resolver'; const routes: Routes = [ diff --git a/src/app/routes/my-profile/my-profile.component.html b/src/app/views/my-profile/my-profile.component.html similarity index 100% rename from src/app/routes/my-profile/my-profile.component.html rename to src/app/views/my-profile/my-profile.component.html diff --git a/src/app/routes/my-profile/my-profile.component.scss b/src/app/views/my-profile/my-profile.component.scss similarity index 100% rename from src/app/routes/my-profile/my-profile.component.scss rename to src/app/views/my-profile/my-profile.component.scss diff --git a/src/app/routes/my-profile/my-profile.component.spec.ts b/src/app/views/my-profile/my-profile.component.spec.ts similarity index 100% rename from src/app/routes/my-profile/my-profile.component.spec.ts rename to src/app/views/my-profile/my-profile.component.spec.ts diff --git a/src/app/routes/my-profile/my-profile.component.ts b/src/app/views/my-profile/my-profile.component.ts similarity index 93% rename from src/app/routes/my-profile/my-profile.component.ts rename to src/app/views/my-profile/my-profile.component.ts index 97cb833..d6cfdc1 100644 --- a/src/app/routes/my-profile/my-profile.component.ts +++ b/src/app/views/my-profile/my-profile.component.ts @@ -1,7 +1,7 @@ import { Component, computed, inject, OnInit, signal } from '@angular/core'; import { ActivatedRoute, RouterOutlet } from '@angular/router'; import { User } from '@app/domain/users/user.model'; -import { Location, NgTemplateOutlet, UpperCasePipe } from '@angular/common'; +import { Location, NgTemplateOutlet } from '@angular/common'; import { UntilDestroy } from '@ngneat/until-destroy'; import { environment } from '@env/environment'; import { ChipsComponent } from '@app/shared/components/chips/chips.component'; @@ -10,8 +10,8 @@ import { UpdateUserComponent } from '@app/shared/features/update-user/update-use import { MyProfileProjectListComponent } from '@app/shared/components/my-profile-project-list/my-profile-project-list.component'; import { MyProfileUpdateFormComponent } from '@app/shared/components/my-profile-update-form/my-profile-update-form.component'; import { PdfViewerComponent } from '@app/shared/features/pdf-viewer/pdf-viewer.component'; -import { ProfileFacade } from '@app/ui/profiles/profile.facade'; -import { UserFacade } from '@app/ui/users/user.facade'; +import { ProfileFacade } from '@app/adapters/profiles/profile.facade'; +import { UserFacade } from '@app/adapters/users/user.facade'; import { LoadingComponent } from '@app/shared/components/loading/loading.component'; import { SettingsComponent } from '@app/shared/features/settings/settings.component'; import { MyProfileMapComponent } from '@app/shared/features/my-profile-map/my-profile-map.component'; diff --git a/src/app/routes/my-profile/my-profile.module.ts b/src/app/views/my-profile/my-profile.module.ts similarity index 100% rename from src/app/routes/my-profile/my-profile.module.ts rename to src/app/views/my-profile/my-profile.module.ts diff --git a/src/app/routes/not-found/not-found-routing.module.ts b/src/app/views/not-found/not-found-routing.module.ts similarity index 80% rename from src/app/routes/not-found/not-found-routing.module.ts rename to src/app/views/not-found/not-found-routing.module.ts index c017551..1c54978 100644 --- a/src/app/routes/not-found/not-found-routing.module.ts +++ b/src/app/views/not-found/not-found-routing.module.ts @@ -1,6 +1,6 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { NotFoundComponent } from '@app/routes/not-found/not-found.component'; +import { NotFoundComponent } from '../not-found/not-found.component'; const routes: Routes = [{ path: '', component: NotFoundComponent, title: 'Page non trouvée' }]; diff --git a/src/app/routes/not-found/not-found.component.html b/src/app/views/not-found/not-found.component.html similarity index 100% rename from src/app/routes/not-found/not-found.component.html rename to src/app/views/not-found/not-found.component.html diff --git a/src/app/routes/not-found/not-found.component.scss b/src/app/views/not-found/not-found.component.scss similarity index 100% rename from src/app/routes/not-found/not-found.component.scss rename to src/app/views/not-found/not-found.component.scss diff --git a/src/app/routes/not-found/not-found.component.spec.ts b/src/app/views/not-found/not-found.component.spec.ts similarity index 100% rename from src/app/routes/not-found/not-found.component.spec.ts rename to src/app/views/not-found/not-found.component.spec.ts diff --git a/src/app/routes/not-found/not-found.component.ts b/src/app/views/not-found/not-found.component.ts similarity index 100% rename from src/app/routes/not-found/not-found.component.ts rename to src/app/views/not-found/not-found.component.ts diff --git a/src/app/routes/not-found/not-found.module.ts b/src/app/views/not-found/not-found.module.ts similarity index 100% rename from src/app/routes/not-found/not-found.module.ts rename to src/app/views/not-found/not-found.module.ts diff --git a/src/app/routes/profile/profile-detail/profile-detail.component.html b/src/app/views/profile/profile-detail/profile-detail.component.html similarity index 100% rename from src/app/routes/profile/profile-detail/profile-detail.component.html rename to src/app/views/profile/profile-detail/profile-detail.component.html diff --git a/src/app/routes/profile/profile-detail/profile-detail.component.scss b/src/app/views/profile/profile-detail/profile-detail.component.scss similarity index 100% rename from src/app/routes/profile/profile-detail/profile-detail.component.scss rename to src/app/views/profile/profile-detail/profile-detail.component.scss diff --git a/src/app/routes/profile/profile-detail/profile-detail.component.spec.ts b/src/app/views/profile/profile-detail/profile-detail.component.spec.ts similarity index 100% rename from src/app/routes/profile/profile-detail/profile-detail.component.spec.ts rename to src/app/views/profile/profile-detail/profile-detail.component.spec.ts diff --git a/src/app/routes/profile/profile-detail/profile-detail.component.ts b/src/app/views/profile/profile-detail/profile-detail.component.ts similarity index 93% rename from src/app/routes/profile/profile-detail/profile-detail.component.ts rename to src/app/views/profile/profile-detail/profile-detail.component.ts index 2401080..ca2c327 100644 --- a/src/app/routes/profile/profile-detail/profile-detail.component.ts +++ b/src/app/views/profile/profile-detail/profile-detail.component.ts @@ -8,10 +8,10 @@ import { UntilDestroy } from '@ngneat/until-destroy'; import { ProjectListComponent } from '@app/shared/components/project-list/project-list.component'; import { environment } from '@env/environment'; import { WebShareService } from '@app/infrastructure/shareData/web-share.service'; -import { ProfileFacade } from '@app/ui/profiles/profile.facade'; -import { ProfileViewModel } from '@app/ui/profiles/profile.presenter.model'; +import { ProfileFacade } from '@app/adapters/profiles/profile.facade'; +import { ProfileViewModel } from '@app/adapters/profiles/profile.presenter.model'; import { ActionType } from '@app/domain/action-type.util'; -import { UserFacade } from '@app/ui/users/user.facade'; +import { UserFacade } from '@app/adapters/users/user.facade'; @Component({ selector: 'app-profile-detail', diff --git a/src/app/routes/profile/profile-list/profile-list.component.html b/src/app/views/profile/profile-list/profile-list.component.html similarity index 100% rename from src/app/routes/profile/profile-list/profile-list.component.html rename to src/app/views/profile/profile-list/profile-list.component.html diff --git a/src/app/routes/profile/profile-list/profile-list.component.scss b/src/app/views/profile/profile-list/profile-list.component.scss similarity index 100% rename from src/app/routes/profile/profile-list/profile-list.component.scss rename to src/app/views/profile/profile-list/profile-list.component.scss diff --git a/src/app/routes/profile/profile-list/profile-list.component.spec.ts b/src/app/views/profile/profile-list/profile-list.component.spec.ts similarity index 100% rename from src/app/routes/profile/profile-list/profile-list.component.spec.ts rename to src/app/views/profile/profile-list/profile-list.component.spec.ts diff --git a/src/app/routes/profile/profile-list/profile-list.component.ts b/src/app/views/profile/profile-list/profile-list.component.ts similarity index 96% rename from src/app/routes/profile/profile-list/profile-list.component.ts rename to src/app/views/profile/profile-list/profile-list.component.ts index 979201b..93009da 100644 --- a/src/app/routes/profile/profile-list/profile-list.component.ts +++ b/src/app/views/profile/profile-list/profile-list.component.ts @@ -2,7 +2,7 @@ import { Component, inject, signal } from '@angular/core'; import { SearchComponent } from '@app/shared/features/search/search.component'; import { VerticalProfileListComponent } from '@app/shared/components/vertical-profile-list/vertical-profile-list.component'; import { UntilDestroy } from '@ngneat/until-destroy'; -import { ProfileFacade } from '@app/ui/profiles/profile.facade'; +import { ProfileFacade } from '@app/adapters/profiles/profile.facade'; import { LoadingComponent } from '@app/shared/components/loading/loading.component'; import { Router } from '@angular/router'; import { SearchFilters } from '@app/domain/search/search-filters'; diff --git a/src/app/routes/profile/profile-routing.module.ts b/src/app/views/profile/profile-routing.module.ts similarity index 77% rename from src/app/routes/profile/profile-routing.module.ts rename to src/app/views/profile/profile-routing.module.ts index fe2f6b5..a0f1832 100644 --- a/src/app/routes/profile/profile-routing.module.ts +++ b/src/app/views/profile/profile-routing.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { ProfileListComponent } from '@app/routes/profile/profile-list/profile-list.component'; -import { ProfileDetailComponent } from '@app/routes/profile/profile-detail/profile-detail.component'; +import { ProfileListComponent } from '../profile/profile-list/profile-list.component'; +import { ProfileDetailComponent } from '../profile/profile-detail/profile-detail.component'; import { listResolver } from '@app/core/resolvers/profile/list/list.resolver'; import { detailResolver } from '@app/core/resolvers/profile/detail/detail.resolver'; diff --git a/src/app/routes/profile/profile.module.ts b/src/app/views/profile/profile.module.ts similarity index 100% rename from src/app/routes/profile/profile.module.ts rename to src/app/views/profile/profile.module.ts diff --git a/tsconfig.json b/tsconfig.json index e8d3149..f703d20 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -7,12 +7,12 @@ "resolveJsonModule": true, "paths": { "@app/core/*":["src/app/core/*"], - "@app/routes/*":["src/app/routes/*"], + "@app/views/*":["src/app/views/*"], "@app/shared/*":["src/app/shared/*"], "@app/domain/*":["src/app/domain/*"], "@app/infrastructure/*":["src/app/infrastructure/*"], - "@app/usecase/*":["src/app/usecase/*"], - "@app/ui/*":["src/app/ui/*"], + "@app/application/*":["src/app/application/*"], + "@app/adapters/*":["src/app/adapters/*"], "@app/testing/*":["src/app/testing/*"], "@assets/*":["src/assets/*"], "@env/*":["src/environments/*"],