From 358a7834e0f6fb32b6931f854bc3e536488f6216 Mon Sep 17 00:00:00 2001 From: "Patrik J. Braun" Date: Tue, 10 Dec 2019 10:44:35 +0100 Subject: [PATCH] restucturing project --- .gitignore | 14 ++++---- angular.json | 30 +++++++++--------- benchmark/Benchmarks.ts | 22 ++++++------- benchmark/index.ts | 10 +++--- frontend/test.ts | 30 ------------------ gulpfile.ts | 26 +++++++-------- package.json | 8 ++--- {backend => src/backend}/Logger.ts | 0 {backend => src/backend}/ProjectPath.ts | 2 +- {backend => src/backend}/index.ts | 0 .../backend}/middlewares/GalleryMWs.ts | 0 .../backend}/middlewares/NotificationMWs.ts | 0 .../backend}/middlewares/PersonMWs.ts | 0 .../backend}/middlewares/RenderingMWs.ts | 0 .../backend}/middlewares/SharingMWs.ts | 0 .../backend}/middlewares/VersionMWs.ts | 0 .../backend}/middlewares/VideoConverterMWs.ts | 0 .../backend}/middlewares/admin/AdminMWs.ts | 0 .../backend}/middlewares/admin/SettingsMWs.ts | 0 .../customtypings/ExtendedRequest.d.ts | 0 .../thumbnail/ThumbnailGeneratorMWs.ts | 0 .../middlewares/user/AuthenticationMWs.ts | 0 .../backend}/middlewares/user/UserMWs.ts | 0 .../user/UserRequestConstrainsMWs.ts | 0 {backend => src/backend}/model/DiskManger.ts | 0 .../backend}/model/FFmpegFactory.ts | 0 .../backend}/model/Localizations.ts | 0 .../backend}/model/NotifocationManager.ts | 0 .../backend}/model/ObjectManagers.ts | 0 .../backend}/model/PasswordHelper.ts | 0 .../model/diagnostics/ConfigDiagnostics.ts | 2 +- .../backend}/model/diagnostics/blank.jpg | Bin .../model/interfaces/IGalleryManager.ts | 0 .../model/interfaces/IIndexingManager.ts | 0 .../model/interfaces/IPersonManager.ts | 0 .../model/interfaces/ISearchManager.ts | 0 .../model/interfaces/ISharingManager.ts | 0 .../backend}/model/interfaces/ITaskManager.ts | 0 .../backend}/model/interfaces/IUserManager.ts | 0 .../model/interfaces/IVersionManager.ts | 0 .../backend}/model/memory/GalleryManager.ts | 0 .../backend}/model/memory/IndexingManager.ts | 0 .../backend}/model/memory/PersonManager.ts | 0 .../backend}/model/memory/SearchManager.ts | 0 .../backend}/model/memory/SharingManager.ts | 0 .../backend}/model/memory/UserManager.ts | 0 .../backend}/model/memory/VersionManager.ts | 0 .../backend}/model/sql/GalleryManager.ts | 0 .../backend}/model/sql/IGalleryManager.ts | 0 .../backend}/model/sql/IndexingManager.ts | 0 .../backend}/model/sql/PersonManager.ts | 0 .../backend}/model/sql/SQLConnection.ts | 0 .../backend}/model/sql/SearchManager.ts | 0 .../backend}/model/sql/SharingManager.ts | 0 .../backend}/model/sql/UserManager.ts | 0 .../backend}/model/sql/VersionManager.ts | 0 .../model/sql/enitites/DirectoryEntity.ts | 0 .../model/sql/enitites/EntityUtils.ts | 0 .../model/sql/enitites/FaceRegionEntry.ts | 0 .../backend}/model/sql/enitites/FileEntity.ts | 0 .../model/sql/enitites/MediaEntity.ts | 0 .../model/sql/enitites/PersonEntry.ts | 0 .../model/sql/enitites/PhotoEntity.ts | 0 .../model/sql/enitites/SharingEntity.ts | 0 .../backend}/model/sql/enitites/UserEntity.ts | 0 .../model/sql/enitites/VersionEntity.ts | 0 .../model/sql/enitites/VideoEntity.ts | 0 .../backend}/model/tasks/TaskManager.ts | 0 .../backend}/model/tasks/TaskRepository.ts | 0 .../backend}/model/tasks/tasks/DBResetTask.ts | 0 .../backend}/model/tasks/tasks/ITask.ts | 2 ++ .../model/tasks/tasks/IndexingTask.ts | 3 +- .../backend}/model/tasks/tasks/Task.ts | 9 +++++- .../model/tasks/tasks/VideoConvertingTask.ts | 0 .../model/threading/DiskMangerWorker.ts | 0 .../model/threading/MetadataLoader.ts | 0 .../backend}/model/threading/TaskExecuter.ts | 0 .../backend}/model/threading/TaskQue.ts | 0 .../backend}/model/threading/ThreadPool.ts | 0 .../model/threading/ThumbnailWorker.ts | 0 .../model/threading/VideoConverterWorker.ts | 0 .../backend}/model/threading/Worker.ts | 0 .../backend}/routes/ErrorRouter.ts | 0 .../backend}/routes/GalleryRouter.ts | 0 .../backend}/routes/LoggerRouter.ts | 0 .../backend}/routes/NotificationRouter.ts | 0 .../backend}/routes/PersonRouter.ts | 0 .../backend}/routes/PublicRouter.ts | 0 {backend => src/backend}/routes/Router.ts | 0 .../backend}/routes/SharingRouter.ts | 0 {backend => src/backend}/routes/UserRouter.ts | 0 .../backend}/routes/admin/AdminRouter.ts | 0 .../backend}/routes/admin/SettingsRouter.ts | 0 {backend => src/backend}/server.ts | 7 ++-- {common => src/common}/CookieNames.ts | 0 {common => src/common}/CostumHeaders.ts | 0 .../common}/DataStructureVersion.ts | 0 {common => src/common}/QueryParams.ts | 0 {common => src/common}/SupportedFormats.ts | 0 {common => src/common}/Utils.ts | 0 .../common}/config/private/Config.ts | 0 .../common}/config/private/IPrivateConfig.ts | 0 .../config/private/PrivateConfigClass.ts | 8 ++--- .../common}/config/public/Config.ts | 0 .../common}/config/public/ConfigClass.ts | 0 .../common}/entities/AutoCompleteItem.ts | 0 .../common}/entities/ConentWrapper.ts | 0 .../common}/entities/DirectoryDTO.ts | 0 .../common}/entities/DuplicatesDTO.ts | 0 {common => src/common}/entities/Error.ts | 0 {common => src/common}/entities/FileDTO.ts | 0 .../common}/entities/LoginCredential.ts | 0 {common => src/common}/entities/MediaDTO.ts | 0 {common => src/common}/entities/Message.ts | 0 .../common}/entities/NotificationDTO.ts | 0 .../common}/entities/PasswordChangeRequest.ts | 0 {common => src/common}/entities/PersonDTO.ts | 0 {common => src/common}/entities/PhotoDTO.ts | 0 .../common}/entities/RandomQueryDTO.ts | 0 .../common}/entities/SearchResultDTO.ts | 0 {common => src/common}/entities/SharingDTO.ts | 0 .../common}/entities/SortingMethods.ts | 0 {common => src/common}/entities/UserDTO.ts | 0 .../entities/UserModificationRequest.ts | 0 {common => src/common}/entities/VideoDTO.ts | 0 .../entities/settings/BasicConfigDTO.ts | 0 .../common}/entities/settings/IndexingDTO.ts | 0 .../entities/settings/OtherConfigDTO.ts | 0 .../common}/entities/settings/StatisticDTO.ts | 0 .../entities/settings/TaskProgressDTO.ts | 0 .../common}/entities/task/TaskDTO.ts | 0 .../common}/entities/task/TaskScheduleDTO.ts | 0 {common => src/common}/event/Event.ts | 0 {common => src/common}/event/Event2Args.ts | 0 {common => src/common}/event/EventLimit.ts | 0 .../frontend}/app/app.component.ts | 0 {frontend => src/frontend}/app/app.module.ts | 0 {frontend => src/frontend}/app/app.routing.ts | 0 .../frontend}/app/model/IRenderable.ts | 0 .../frontend}/app/model/navigation.service.ts | 0 .../network/autehentication.service.spec.ts | 0 .../model/network/authentication.service.ts | 0 .../app/model/network/network.service.spec.ts | 0 .../app/model/network/network.service.ts | 0 .../app/model/network/user.service.spec.ts | 0 .../app/model/network/user.service.ts | 0 .../app/model/notification.service.ts | 0 .../frontend}/app/model/page.helper.ts | 0 .../frontend}/app/model/query.service.ts | 0 .../app/model/seededRandom.service.ts | 0 .../frontend}/app/model/version.service.ts | 0 .../frontend}/app/pipes/DurationPipe.ts | 0 .../frontend}/app/pipes/FileSizePipe.ts | 0 .../frontend}/app/pipes/FixOrientationPipe.ts | 0 .../app/pipes/IconizeSortingMethod.ts | 0 .../frontend}/app/pipes/StringifyRolePipe.ts | 0 .../app/pipes/StringifySortingMethod.ts | 0 .../app/ui/admin/admin.component.css | 0 .../app/ui/admin/admin.component.html | 0 .../frontend}/app/ui/admin/admin.component.ts | 0 .../ui/duplicates/duplicates.component.css | 0 .../ui/duplicates/duplicates.component.html | 0 .../app/ui/duplicates/duplicates.component.ts | 0 .../app/ui/duplicates/duplicates.service.ts | 0 .../photo/photo.duplicates.component.css | 0 .../photo/photo.duplicates.component.html | 0 .../photo/photo.duplicates.component.ts | 0 .../app/ui/faces/face/face.component.css | 0 .../app/ui/faces/face/face.component.html | 0 .../app/ui/faces/face/face.component.ts | 0 .../app/ui/faces/faces.component.css | 0 .../app/ui/faces/faces.component.html | 0 .../frontend}/app/ui/faces/faces.component.ts | 0 .../frontend}/app/ui/faces/faces.service.ts | 0 .../app/ui/frame/frame.component.css | 0 .../app/ui/frame/frame.component.html | 0 .../frontend}/app/ui/frame/frame.component.ts | 0 .../frontend}/app/ui/gallery/Media.ts | 0 .../frontend}/app/ui/gallery/MediaIcon.ts | 0 .../app/ui/gallery/cache.gallery.service.ts | 0 .../directories/directories.component.css | 0 .../directories/directories.component.html | 0 .../directories/directories.component.ts | 0 .../directory/directory.gallery.component.css | 0 .../directory.gallery.component.html | 0 .../directory/directory.gallery.component.ts | 0 .../app/ui/gallery/fullscreen.service.ts | 0 .../app/ui/gallery/gallery.component.css | 0 .../app/ui/gallery/gallery.component.html | 0 .../app/ui/gallery/gallery.component.ts | 0 .../app/ui/gallery/gallery.service.ts | 0 .../app/ui/gallery/grid/GridMedia.ts | 0 .../app/ui/gallery/grid/GridRowBuilder.ts | 0 .../gallery/grid/grid.gallery.component.css | 0 .../gallery/grid/grid.gallery.component.html | 0 .../ui/gallery/grid/grid.gallery.component.ts | 0 .../loading.photo.grid.gallery.component.css | 0 .../loading.photo.grid.gallery.component.html | 0 .../loading.photo.grid.gallery.component.ts | 0 .../photo/photo.grid.gallery.component.css | 0 .../photo/photo.grid.gallery.component.html | 0 .../photo/photo.grid.gallery.component.ts | 0 .../controls.lightbox.gallery.component.css | 0 .../controls.lightbox.gallery.component.html | 0 .../controls.lightbox.gallery.component.ts | 0 .../gallery/lightbox/controls/inputrange.css | 0 .../info-panel.lightbox.gallery.component.css | 0 ...info-panel.lightbox.gallery.component.html | 0 .../info-panel.lightbox.gallery.component.ts | 0 .../lightbox/lightbox.gallery.component.css | 0 .../lightbox/lightbox.gallery.component.html | 0 .../lightbox/lightbox.gallery.component.ts | 0 .../media.lightbox.gallery.component.css | 0 .../media.lightbox.gallery.component.html | 0 .../media/media.lightbox.gallery.component.ts | 0 .../lightbox.map.gallery.component.css | 0 .../lightbox.map.gallery.component.html | 0 .../lightbox.map.gallery.component.ts | 0 .../ui/gallery/map/map.gallery.component.css | 0 .../ui/gallery/map/map.gallery.component.html | 0 .../ui/gallery/map/map.gallery.component.ts | 0 .../app/ui/gallery/map/map.service.ts | 0 .../navigator/navigator.gallery.component.css | 0 .../navigator.gallery.component.html | 0 .../navigator/navigator.gallery.component.ts | 0 .../app/ui/gallery/overlay.service.ts | 0 ...random-query-builder.gallery.component.css | 0 ...andom-query-builder.gallery.component.html | 0 .../random-query-builder.gallery.component.ts | 0 .../ui/gallery/search/autocomplete.service.ts | 0 .../search/search.gallery.component.css | 0 .../search/search.gallery.component.html | 0 .../search/search.gallery.component.ts | 0 .../frontend}/app/ui/gallery/share.service.ts | 0 .../gallery/share/share.gallery.component.css | 0 .../share/share.gallery.component.html | 0 .../gallery/share/share.gallery.component.ts | 0 .../app/ui/gallery/thumbnailLoader.service.ts | 0 .../ui/gallery/thumbnailManager.service.ts | 0 .../app/ui/language/language.component.css | 0 .../app/ui/language/language.component.html | 0 .../app/ui/language/language.component.ts | 0 .../app/ui/login/login.component.css | 0 .../app/ui/login/login.component.html | 0 .../frontend}/app/ui/login/login.component.ts | 0 .../_abstract/abstract.settings.component.css | 0 .../_abstract/abstract.settings.component.ts | 0 .../_abstract/abstract.settings.service.ts | 0 .../basic/basic.settings.component.css | 0 .../basic/basic.settings.component.html | 0 .../basic/basic.settings.component.ts | 2 +- .../settings/basic/basic.settings.service.ts | 0 .../database/database.settings.component.css | 0 .../database/database.settings.component.html | 0 .../database/database.settings.component.ts | 2 +- .../database/database.settings.service.ts | 0 .../faces/faces.settings.component.css | 0 .../faces/faces.settings.component.html | 0 .../faces/faces.settings.component.ts | 2 +- .../settings/faces/faces.settings.service.ts | 0 .../indexing/indexing.settings.component.css | 0 .../indexing/indexing.settings.component.html | 0 .../indexing/indexing.settings.component.ts | 2 +- .../indexing/indexing.settings.service.ts | 4 +-- .../settings/map/map.settings.component.css | 0 .../settings/map/map.settings.component.html | 0 .../ui/settings/map/map.settings.component.ts | 2 +- .../ui/settings/map/map.settings.service.ts | 0 .../metafiles/metafile.settings.component.css | 0 .../metafile.settings.component.html | 0 .../metafiles/metafile.settings.component.ts | 2 +- .../metafiles/metafile.settings.service.ts | 0 .../other/other.settings.component.css | 0 .../other/other.settings.component.html | 0 .../other/other.settings.component.ts | 2 +- .../settings/other/other.settings.service.ts | 0 .../random-photo.settings.component.css | 0 .../random-photo.settings.component.html | 0 .../random-photo.settings.component.ts | 2 +- .../random-photo.settings.service.ts | 0 .../ui/settings/scheduled-tasks.service.ts | 0 .../search/search.settings.component.css | 0 .../search/search.settings.component.html | 0 .../search/search.settings.component.ts | 2 +- .../search/search.settings.service.ts | 0 .../app/ui/settings/settings.service.ts | 0 .../share/share.settings.component.css | 0 .../share/share.settings.component.html | 0 .../share/share.settings.component.ts | 2 +- .../settings/share/share.settings.service.ts | 0 .../tasks/tasks.settings.component.css | 0 .../tasks/tasks.settings.component.html | 0 .../tasks/tasks.settings.component.ts | 2 +- .../settings/tasks/tasks.settings.service.ts | 0 .../thumbnail.settings.component.css | 0 .../thumbnail.settings.component.html | 0 .../thumbnail/thumbnail.settings.component.ts | 2 +- .../thumbnail/thumbnail.settings.service.ts | 0 .../usermanager.settings.component.css | 0 .../usermanager.settings.component.html | 0 .../usermanager.settings.component.ts | 2 +- .../usermanager.settings.service.ts | 0 .../video/video.settings.component.css | 0 .../video/video.settings.component.html | 0 .../video/video.settings.component.ts | 2 +- .../settings/video/video.settings.service.ts | 0 .../ui/sharelogin/share-login.component.css | 0 .../ui/sharelogin/share-login.component.html | 0 .../ui/sharelogin/share-login.component.ts | 0 .../datepicker.component.html | 0 .../datepicker.component.ts | 0 .../timepicker.component.html | 0 .../timepicker.component.ts | 0 {frontend => src/frontend}/assets/icon.png | Bin .../frontend}/assets/icon_inv.png | Bin .../environments/environment.prod.ts | 0 .../frontend}/environments/environment.ts | 0 {frontend => src/frontend}/index.html | 0 {frontend => src/frontend}/main.ts | 0 {frontend => src/frontend}/polyfills.ts | 0 {frontend => src/frontend}/styles.css | 0 .../frontend}/translate/messages.en.xlf | 0 .../frontend}/translate/messages.fr.xlf | 0 .../frontend}/translate/messages.hu.xlf | 2 +- .../frontend}/translate/messages.ro.xlf | 0 .../frontend}/translate/messages.ru.xlf | 0 {frontend => src/frontend}/tsconfig.app.json | 6 ++-- {frontend => src/frontend}/tsconfig.spec.json | 6 ++-- {frontend => src/frontend}/typings.d.ts | 0 test/backend/SQLTestHelper.ts | 6 ++-- test/backend/integration/model/sql/typeorm.ts | 20 ++++++------ .../middlewares/user/AuthenticationMWs.ts | 14 ++++---- test/backend/unit/model/sql/GalleryManager.ts | 16 +++++----- .../backend/unit/model/sql/IndexingManager.ts | 28 ++++++++-------- test/backend/unit/model/sql/PersonManager.ts | 4 +-- test/backend/unit/model/sql/SearchManager.ts | 24 +++++++------- test/backend/unit/model/sql/SharingManager.ts | 10 +++--- test/backend/unit/model/sql/TestHelper.ts | 18 +++++------ .../unit/model/tasks/TaskManager.spec.ts | 4 +-- .../model/threading/DiskMangerWorker.spec.ts | 8 ++--- .../model/threading/MetaDataLoader.spec.ts | 4 +-- .../unit/model/threading/TaskExecuter.spec.ts | 2 +- .../unit/model/threading/TaskQue.spec.ts | 2 +- test/common/unit/UserDTO.ts | 2 +- test/common/unit/Utils.spec.ts | 2 +- 345 files changed, 181 insertions(+), 202 deletions(-) delete mode 100644 frontend/test.ts rename {backend => src/backend}/Logger.ts (100%) rename {backend => src/backend}/ProjectPath.ts (96%) rename {backend => src/backend}/index.ts (100%) rename {backend => src/backend}/middlewares/GalleryMWs.ts (100%) rename {backend => src/backend}/middlewares/NotificationMWs.ts (100%) rename {backend => src/backend}/middlewares/PersonMWs.ts (100%) rename {backend => src/backend}/middlewares/RenderingMWs.ts (100%) rename {backend => src/backend}/middlewares/SharingMWs.ts (100%) rename {backend => src/backend}/middlewares/VersionMWs.ts (100%) rename {backend => src/backend}/middlewares/VideoConverterMWs.ts (100%) rename {backend => src/backend}/middlewares/admin/AdminMWs.ts (100%) rename {backend => src/backend}/middlewares/admin/SettingsMWs.ts (100%) rename {backend => src/backend}/middlewares/customtypings/ExtendedRequest.d.ts (100%) rename {backend => src/backend}/middlewares/thumbnail/ThumbnailGeneratorMWs.ts (100%) rename {backend => src/backend}/middlewares/user/AuthenticationMWs.ts (100%) rename {backend => src/backend}/middlewares/user/UserMWs.ts (100%) rename {backend => src/backend}/middlewares/user/UserRequestConstrainsMWs.ts (100%) rename {backend => src/backend}/model/DiskManger.ts (100%) rename {backend => src/backend}/model/FFmpegFactory.ts (100%) rename {backend => src/backend}/model/Localizations.ts (100%) rename {backend => src/backend}/model/NotifocationManager.ts (100%) rename {backend => src/backend}/model/ObjectManagers.ts (100%) rename {backend => src/backend}/model/PasswordHelper.ts (100%) rename {backend => src/backend}/model/diagnostics/ConfigDiagnostics.ts (99%) rename {backend => src/backend}/model/diagnostics/blank.jpg (100%) rename {backend => src/backend}/model/interfaces/IGalleryManager.ts (100%) rename {backend => src/backend}/model/interfaces/IIndexingManager.ts (100%) rename {backend => src/backend}/model/interfaces/IPersonManager.ts (100%) rename {backend => src/backend}/model/interfaces/ISearchManager.ts (100%) rename {backend => src/backend}/model/interfaces/ISharingManager.ts (100%) rename {backend => src/backend}/model/interfaces/ITaskManager.ts (100%) rename {backend => src/backend}/model/interfaces/IUserManager.ts (100%) rename {backend => src/backend}/model/interfaces/IVersionManager.ts (100%) rename {backend => src/backend}/model/memory/GalleryManager.ts (100%) rename {backend => src/backend}/model/memory/IndexingManager.ts (100%) rename {backend => src/backend}/model/memory/PersonManager.ts (100%) rename {backend => src/backend}/model/memory/SearchManager.ts (100%) rename {backend => src/backend}/model/memory/SharingManager.ts (100%) rename {backend => src/backend}/model/memory/UserManager.ts (100%) rename {backend => src/backend}/model/memory/VersionManager.ts (100%) rename {backend => src/backend}/model/sql/GalleryManager.ts (100%) rename {backend => src/backend}/model/sql/IGalleryManager.ts (100%) rename {backend => src/backend}/model/sql/IndexingManager.ts (100%) rename {backend => src/backend}/model/sql/PersonManager.ts (100%) rename {backend => src/backend}/model/sql/SQLConnection.ts (100%) rename {backend => src/backend}/model/sql/SearchManager.ts (100%) rename {backend => src/backend}/model/sql/SharingManager.ts (100%) rename {backend => src/backend}/model/sql/UserManager.ts (100%) rename {backend => src/backend}/model/sql/VersionManager.ts (100%) rename {backend => src/backend}/model/sql/enitites/DirectoryEntity.ts (100%) rename {backend => src/backend}/model/sql/enitites/EntityUtils.ts (100%) rename {backend => src/backend}/model/sql/enitites/FaceRegionEntry.ts (100%) rename {backend => src/backend}/model/sql/enitites/FileEntity.ts (100%) rename {backend => src/backend}/model/sql/enitites/MediaEntity.ts (100%) rename {backend => src/backend}/model/sql/enitites/PersonEntry.ts (100%) rename {backend => src/backend}/model/sql/enitites/PhotoEntity.ts (100%) rename {backend => src/backend}/model/sql/enitites/SharingEntity.ts (100%) rename {backend => src/backend}/model/sql/enitites/UserEntity.ts (100%) rename {backend => src/backend}/model/sql/enitites/VersionEntity.ts (100%) rename {backend => src/backend}/model/sql/enitites/VideoEntity.ts (100%) rename {backend => src/backend}/model/tasks/TaskManager.ts (100%) rename {backend => src/backend}/model/tasks/TaskRepository.ts (100%) rename {backend => src/backend}/model/tasks/tasks/DBResetTask.ts (100%) rename {backend => src/backend}/model/tasks/tasks/ITask.ts (93%) rename {backend => src/backend}/model/tasks/tasks/IndexingTask.ts (96%) rename {backend => src/backend}/model/tasks/tasks/Task.ts (90%) rename {backend => src/backend}/model/tasks/tasks/VideoConvertingTask.ts (100%) rename {backend => src/backend}/model/threading/DiskMangerWorker.ts (100%) rename {backend => src/backend}/model/threading/MetadataLoader.ts (100%) rename {backend => src/backend}/model/threading/TaskExecuter.ts (100%) rename {backend => src/backend}/model/threading/TaskQue.ts (100%) rename {backend => src/backend}/model/threading/ThreadPool.ts (100%) rename {backend => src/backend}/model/threading/ThumbnailWorker.ts (100%) rename {backend => src/backend}/model/threading/VideoConverterWorker.ts (100%) rename {backend => src/backend}/model/threading/Worker.ts (100%) rename {backend => src/backend}/routes/ErrorRouter.ts (100%) rename {backend => src/backend}/routes/GalleryRouter.ts (100%) rename {backend => src/backend}/routes/LoggerRouter.ts (100%) rename {backend => src/backend}/routes/NotificationRouter.ts (100%) rename {backend => src/backend}/routes/PersonRouter.ts (100%) rename {backend => src/backend}/routes/PublicRouter.ts (100%) rename {backend => src/backend}/routes/Router.ts (100%) rename {backend => src/backend}/routes/SharingRouter.ts (100%) rename {backend => src/backend}/routes/UserRouter.ts (100%) rename {backend => src/backend}/routes/admin/AdminRouter.ts (100%) rename {backend => src/backend}/routes/admin/SettingsRouter.ts (100%) rename {backend => src/backend}/server.ts (96%) rename {common => src/common}/CookieNames.ts (100%) rename {common => src/common}/CostumHeaders.ts (100%) rename {common => src/common}/DataStructureVersion.ts (100%) rename {common => src/common}/QueryParams.ts (100%) rename {common => src/common}/SupportedFormats.ts (100%) rename {common => src/common}/Utils.ts (100%) rename {common => src/common}/config/private/Config.ts (100%) rename {common => src/common}/config/private/IPrivateConfig.ts (100%) rename {common => src/common}/config/private/PrivateConfigClass.ts (93%) rename {common => src/common}/config/public/Config.ts (100%) rename {common => src/common}/config/public/ConfigClass.ts (100%) rename {common => src/common}/entities/AutoCompleteItem.ts (100%) rename {common => src/common}/entities/ConentWrapper.ts (100%) rename {common => src/common}/entities/DirectoryDTO.ts (100%) rename {common => src/common}/entities/DuplicatesDTO.ts (100%) rename {common => src/common}/entities/Error.ts (100%) rename {common => src/common}/entities/FileDTO.ts (100%) rename {common => src/common}/entities/LoginCredential.ts (100%) rename {common => src/common}/entities/MediaDTO.ts (100%) rename {common => src/common}/entities/Message.ts (100%) rename {common => src/common}/entities/NotificationDTO.ts (100%) rename {common => src/common}/entities/PasswordChangeRequest.ts (100%) rename {common => src/common}/entities/PersonDTO.ts (100%) rename {common => src/common}/entities/PhotoDTO.ts (100%) rename {common => src/common}/entities/RandomQueryDTO.ts (100%) rename {common => src/common}/entities/SearchResultDTO.ts (100%) rename {common => src/common}/entities/SharingDTO.ts (100%) rename {common => src/common}/entities/SortingMethods.ts (100%) rename {common => src/common}/entities/UserDTO.ts (100%) rename {common => src/common}/entities/UserModificationRequest.ts (100%) rename {common => src/common}/entities/VideoDTO.ts (100%) rename {common => src/common}/entities/settings/BasicConfigDTO.ts (100%) rename {common => src/common}/entities/settings/IndexingDTO.ts (100%) rename {common => src/common}/entities/settings/OtherConfigDTO.ts (100%) rename {common => src/common}/entities/settings/StatisticDTO.ts (100%) rename {common => src/common}/entities/settings/TaskProgressDTO.ts (100%) rename {common => src/common}/entities/task/TaskDTO.ts (100%) rename {common => src/common}/entities/task/TaskScheduleDTO.ts (100%) rename {common => src/common}/event/Event.ts (100%) rename {common => src/common}/event/Event2Args.ts (100%) rename {common => src/common}/event/EventLimit.ts (100%) rename {frontend => src/frontend}/app/app.component.ts (100%) rename {frontend => src/frontend}/app/app.module.ts (100%) rename {frontend => src/frontend}/app/app.routing.ts (100%) rename {frontend => src/frontend}/app/model/IRenderable.ts (100%) rename {frontend => src/frontend}/app/model/navigation.service.ts (100%) rename {frontend => src/frontend}/app/model/network/autehentication.service.spec.ts (100%) rename {frontend => src/frontend}/app/model/network/authentication.service.ts (100%) rename {frontend => src/frontend}/app/model/network/network.service.spec.ts (100%) rename {frontend => src/frontend}/app/model/network/network.service.ts (100%) rename {frontend => src/frontend}/app/model/network/user.service.spec.ts (100%) rename {frontend => src/frontend}/app/model/network/user.service.ts (100%) rename {frontend => src/frontend}/app/model/notification.service.ts (100%) rename {frontend => src/frontend}/app/model/page.helper.ts (100%) rename {frontend => src/frontend}/app/model/query.service.ts (100%) rename {frontend => src/frontend}/app/model/seededRandom.service.ts (100%) rename {frontend => src/frontend}/app/model/version.service.ts (100%) rename {frontend => src/frontend}/app/pipes/DurationPipe.ts (100%) rename {frontend => src/frontend}/app/pipes/FileSizePipe.ts (100%) rename {frontend => src/frontend}/app/pipes/FixOrientationPipe.ts (100%) rename {frontend => src/frontend}/app/pipes/IconizeSortingMethod.ts (100%) rename {frontend => src/frontend}/app/pipes/StringifyRolePipe.ts (100%) rename {frontend => src/frontend}/app/pipes/StringifySortingMethod.ts (100%) rename {frontend => src/frontend}/app/ui/admin/admin.component.css (100%) rename {frontend => src/frontend}/app/ui/admin/admin.component.html (100%) rename {frontend => src/frontend}/app/ui/admin/admin.component.ts (100%) rename {frontend => src/frontend}/app/ui/duplicates/duplicates.component.css (100%) rename {frontend => src/frontend}/app/ui/duplicates/duplicates.component.html (100%) rename {frontend => src/frontend}/app/ui/duplicates/duplicates.component.ts (100%) rename {frontend => src/frontend}/app/ui/duplicates/duplicates.service.ts (100%) rename {frontend => src/frontend}/app/ui/duplicates/photo/photo.duplicates.component.css (100%) rename {frontend => src/frontend}/app/ui/duplicates/photo/photo.duplicates.component.html (100%) rename {frontend => src/frontend}/app/ui/duplicates/photo/photo.duplicates.component.ts (100%) rename {frontend => src/frontend}/app/ui/faces/face/face.component.css (100%) rename {frontend => src/frontend}/app/ui/faces/face/face.component.html (100%) rename {frontend => src/frontend}/app/ui/faces/face/face.component.ts (100%) rename {frontend => src/frontend}/app/ui/faces/faces.component.css (100%) rename {frontend => src/frontend}/app/ui/faces/faces.component.html (100%) rename {frontend => src/frontend}/app/ui/faces/faces.component.ts (100%) rename {frontend => src/frontend}/app/ui/faces/faces.service.ts (100%) rename {frontend => src/frontend}/app/ui/frame/frame.component.css (100%) rename {frontend => src/frontend}/app/ui/frame/frame.component.html (100%) rename {frontend => src/frontend}/app/ui/frame/frame.component.ts (100%) rename {frontend => src/frontend}/app/ui/gallery/Media.ts (100%) rename {frontend => src/frontend}/app/ui/gallery/MediaIcon.ts (100%) rename {frontend => src/frontend}/app/ui/gallery/cache.gallery.service.ts (100%) rename {frontend => src/frontend}/app/ui/gallery/directories/directories.component.css (100%) rename {frontend => src/frontend}/app/ui/gallery/directories/directories.component.html (100%) rename {frontend => src/frontend}/app/ui/gallery/directories/directories.component.ts (100%) rename {frontend => src/frontend}/app/ui/gallery/directories/directory/directory.gallery.component.css (100%) rename {frontend => src/frontend}/app/ui/gallery/directories/directory/directory.gallery.component.html (100%) rename {frontend => src/frontend}/app/ui/gallery/directories/directory/directory.gallery.component.ts (100%) rename {frontend => src/frontend}/app/ui/gallery/fullscreen.service.ts (100%) rename {frontend => src/frontend}/app/ui/gallery/gallery.component.css (100%) rename {frontend => src/frontend}/app/ui/gallery/gallery.component.html (100%) rename {frontend => src/frontend}/app/ui/gallery/gallery.component.ts (100%) rename {frontend => src/frontend}/app/ui/gallery/gallery.service.ts (100%) rename {frontend => src/frontend}/app/ui/gallery/grid/GridMedia.ts (100%) rename {frontend => src/frontend}/app/ui/gallery/grid/GridRowBuilder.ts (100%) rename {frontend => src/frontend}/app/ui/gallery/grid/grid.gallery.component.css (100%) rename {frontend => src/frontend}/app/ui/gallery/grid/grid.gallery.component.html (100%) rename {frontend => src/frontend}/app/ui/gallery/grid/grid.gallery.component.ts (100%) rename {frontend => src/frontend}/app/ui/gallery/grid/photo/loading/loading.photo.grid.gallery.component.css (100%) rename {frontend => src/frontend}/app/ui/gallery/grid/photo/loading/loading.photo.grid.gallery.component.html (100%) rename {frontend => src/frontend}/app/ui/gallery/grid/photo/loading/loading.photo.grid.gallery.component.ts (100%) rename {frontend => src/frontend}/app/ui/gallery/grid/photo/photo.grid.gallery.component.css (100%) rename {frontend => src/frontend}/app/ui/gallery/grid/photo/photo.grid.gallery.component.html (100%) rename {frontend => src/frontend}/app/ui/gallery/grid/photo/photo.grid.gallery.component.ts (100%) rename {frontend => src/frontend}/app/ui/gallery/lightbox/controls/controls.lightbox.gallery.component.css (100%) rename {frontend => src/frontend}/app/ui/gallery/lightbox/controls/controls.lightbox.gallery.component.html (100%) rename {frontend => src/frontend}/app/ui/gallery/lightbox/controls/controls.lightbox.gallery.component.ts (100%) rename {frontend => src/frontend}/app/ui/gallery/lightbox/controls/inputrange.css (100%) rename {frontend => src/frontend}/app/ui/gallery/lightbox/infopanel/info-panel.lightbox.gallery.component.css (100%) rename {frontend => src/frontend}/app/ui/gallery/lightbox/infopanel/info-panel.lightbox.gallery.component.html (100%) rename {frontend => src/frontend}/app/ui/gallery/lightbox/infopanel/info-panel.lightbox.gallery.component.ts (100%) rename {frontend => src/frontend}/app/ui/gallery/lightbox/lightbox.gallery.component.css (100%) rename {frontend => src/frontend}/app/ui/gallery/lightbox/lightbox.gallery.component.html (100%) rename {frontend => src/frontend}/app/ui/gallery/lightbox/lightbox.gallery.component.ts (100%) rename {frontend => src/frontend}/app/ui/gallery/lightbox/media/media.lightbox.gallery.component.css (100%) rename {frontend => src/frontend}/app/ui/gallery/lightbox/media/media.lightbox.gallery.component.html (100%) rename {frontend => src/frontend}/app/ui/gallery/lightbox/media/media.lightbox.gallery.component.ts (100%) rename {frontend => src/frontend}/app/ui/gallery/map/lightbox/lightbox.map.gallery.component.css (100%) rename {frontend => src/frontend}/app/ui/gallery/map/lightbox/lightbox.map.gallery.component.html (100%) rename {frontend => src/frontend}/app/ui/gallery/map/lightbox/lightbox.map.gallery.component.ts (100%) rename {frontend => src/frontend}/app/ui/gallery/map/map.gallery.component.css (100%) rename {frontend => src/frontend}/app/ui/gallery/map/map.gallery.component.html (100%) rename {frontend => src/frontend}/app/ui/gallery/map/map.gallery.component.ts (100%) rename {frontend => src/frontend}/app/ui/gallery/map/map.service.ts (100%) rename {frontend => src/frontend}/app/ui/gallery/navigator/navigator.gallery.component.css (100%) rename {frontend => src/frontend}/app/ui/gallery/navigator/navigator.gallery.component.html (100%) rename {frontend => src/frontend}/app/ui/gallery/navigator/navigator.gallery.component.ts (100%) rename {frontend => src/frontend}/app/ui/gallery/overlay.service.ts (100%) rename {frontend => src/frontend}/app/ui/gallery/random-query-builder/random-query-builder.gallery.component.css (100%) rename {frontend => src/frontend}/app/ui/gallery/random-query-builder/random-query-builder.gallery.component.html (100%) rename {frontend => src/frontend}/app/ui/gallery/random-query-builder/random-query-builder.gallery.component.ts (100%) rename {frontend => src/frontend}/app/ui/gallery/search/autocomplete.service.ts (100%) rename {frontend => src/frontend}/app/ui/gallery/search/search.gallery.component.css (100%) rename {frontend => src/frontend}/app/ui/gallery/search/search.gallery.component.html (100%) rename {frontend => src/frontend}/app/ui/gallery/search/search.gallery.component.ts (100%) rename {frontend => src/frontend}/app/ui/gallery/share.service.ts (100%) rename {frontend => src/frontend}/app/ui/gallery/share/share.gallery.component.css (100%) rename {frontend => src/frontend}/app/ui/gallery/share/share.gallery.component.html (100%) rename {frontend => src/frontend}/app/ui/gallery/share/share.gallery.component.ts (100%) rename {frontend => src/frontend}/app/ui/gallery/thumbnailLoader.service.ts (100%) rename {frontend => src/frontend}/app/ui/gallery/thumbnailManager.service.ts (100%) rename {frontend => src/frontend}/app/ui/language/language.component.css (100%) rename {frontend => src/frontend}/app/ui/language/language.component.html (100%) rename {frontend => src/frontend}/app/ui/language/language.component.ts (100%) rename {frontend => src/frontend}/app/ui/login/login.component.css (100%) rename {frontend => src/frontend}/app/ui/login/login.component.html (100%) rename {frontend => src/frontend}/app/ui/login/login.component.ts (100%) rename {frontend => src/frontend}/app/ui/settings/_abstract/abstract.settings.component.css (100%) rename {frontend => src/frontend}/app/ui/settings/_abstract/abstract.settings.component.ts (100%) rename {frontend => src/frontend}/app/ui/settings/_abstract/abstract.settings.service.ts (100%) rename {frontend => src/frontend}/app/ui/settings/basic/basic.settings.component.css (100%) rename {frontend => src/frontend}/app/ui/settings/basic/basic.settings.component.html (100%) rename {frontend => src/frontend}/app/ui/settings/basic/basic.settings.component.ts (97%) rename {frontend => src/frontend}/app/ui/settings/basic/basic.settings.service.ts (100%) rename {frontend => src/frontend}/app/ui/settings/database/database.settings.component.css (100%) rename {frontend => src/frontend}/app/ui/settings/database/database.settings.component.html (100%) rename {frontend => src/frontend}/app/ui/settings/database/database.settings.component.ts (96%) rename {frontend => src/frontend}/app/ui/settings/database/database.settings.service.ts (100%) rename {frontend => src/frontend}/app/ui/settings/faces/faces.settings.component.css (100%) rename {frontend => src/frontend}/app/ui/settings/faces/faces.settings.component.html (100%) rename {frontend => src/frontend}/app/ui/settings/faces/faces.settings.component.ts (96%) rename {frontend => src/frontend}/app/ui/settings/faces/faces.settings.service.ts (100%) rename {frontend => src/frontend}/app/ui/settings/indexing/indexing.settings.component.css (100%) rename {frontend => src/frontend}/app/ui/settings/indexing/indexing.settings.component.html (100%) rename {frontend => src/frontend}/app/ui/settings/indexing/indexing.settings.component.ts (98%) rename {frontend => src/frontend}/app/ui/settings/indexing/indexing.settings.service.ts (94%) rename {frontend => src/frontend}/app/ui/settings/map/map.settings.component.css (100%) rename {frontend => src/frontend}/app/ui/settings/map/map.settings.component.html (100%) rename {frontend => src/frontend}/app/ui/settings/map/map.settings.component.ts (96%) rename {frontend => src/frontend}/app/ui/settings/map/map.settings.service.ts (100%) rename {frontend => src/frontend}/app/ui/settings/metafiles/metafile.settings.component.css (100%) rename {frontend => src/frontend}/app/ui/settings/metafiles/metafile.settings.component.html (100%) rename {frontend => src/frontend}/app/ui/settings/metafiles/metafile.settings.component.ts (95%) rename {frontend => src/frontend}/app/ui/settings/metafiles/metafile.settings.service.ts (100%) rename {frontend => src/frontend}/app/ui/settings/other/other.settings.component.css (100%) rename {frontend => src/frontend}/app/ui/settings/other/other.settings.component.html (100%) rename {frontend => src/frontend}/app/ui/settings/other/other.settings.component.ts (97%) rename {frontend => src/frontend}/app/ui/settings/other/other.settings.service.ts (100%) rename {frontend => src/frontend}/app/ui/settings/random-photo/random-photo.settings.component.css (100%) rename {frontend => src/frontend}/app/ui/settings/random-photo/random-photo.settings.component.html (100%) rename {frontend => src/frontend}/app/ui/settings/random-photo/random-photo.settings.component.ts (95%) rename {frontend => src/frontend}/app/ui/settings/random-photo/random-photo.settings.service.ts (100%) rename {frontend => src/frontend}/app/ui/settings/scheduled-tasks.service.ts (100%) rename {frontend => src/frontend}/app/ui/settings/search/search.settings.component.css (100%) rename {frontend => src/frontend}/app/ui/settings/search/search.settings.component.html (100%) rename {frontend => src/frontend}/app/ui/settings/search/search.settings.component.ts (95%) rename {frontend => src/frontend}/app/ui/settings/search/search.settings.service.ts (100%) rename {frontend => src/frontend}/app/ui/settings/settings.service.ts (100%) rename {frontend => src/frontend}/app/ui/settings/share/share.settings.component.css (100%) rename {frontend => src/frontend}/app/ui/settings/share/share.settings.component.html (100%) rename {frontend => src/frontend}/app/ui/settings/share/share.settings.component.ts (95%) rename {frontend => src/frontend}/app/ui/settings/share/share.settings.service.ts (100%) rename {frontend => src/frontend}/app/ui/settings/tasks/tasks.settings.component.css (100%) rename {frontend => src/frontend}/app/ui/settings/tasks/tasks.settings.component.html (100%) rename {frontend => src/frontend}/app/ui/settings/tasks/tasks.settings.component.ts (98%) rename {frontend => src/frontend}/app/ui/settings/tasks/tasks.settings.service.ts (100%) rename {frontend => src/frontend}/app/ui/settings/thumbnail/thumbnail.settings.component.css (100%) rename {frontend => src/frontend}/app/ui/settings/thumbnail/thumbnail.settings.component.html (100%) rename {frontend => src/frontend}/app/ui/settings/thumbnail/thumbnail.settings.component.ts (97%) rename {frontend => src/frontend}/app/ui/settings/thumbnail/thumbnail.settings.service.ts (100%) rename {frontend => src/frontend}/app/ui/settings/usermanager/usermanager.settings.component.css (100%) rename {frontend => src/frontend}/app/ui/settings/usermanager/usermanager.settings.component.html (100%) rename {frontend => src/frontend}/app/ui/settings/usermanager/usermanager.settings.component.ts (98%) rename {frontend => src/frontend}/app/ui/settings/usermanager/usermanager.settings.service.ts (100%) rename {frontend => src/frontend}/app/ui/settings/video/video.settings.component.css (100%) rename {frontend => src/frontend}/app/ui/settings/video/video.settings.component.html (100%) rename {frontend => src/frontend}/app/ui/settings/video/video.settings.component.ts (98%) rename {frontend => src/frontend}/app/ui/settings/video/video.settings.service.ts (100%) rename {frontend => src/frontend}/app/ui/sharelogin/share-login.component.css (100%) rename {frontend => src/frontend}/app/ui/sharelogin/share-login.component.html (100%) rename {frontend => src/frontend}/app/ui/sharelogin/share-login.component.ts (100%) rename {frontend => src/frontend}/app/ui/utils/timestamp-datepicker/datepicker.component.html (100%) rename {frontend => src/frontend}/app/ui/utils/timestamp-datepicker/datepicker.component.ts (100%) rename {frontend => src/frontend}/app/ui/utils/timestamp-timepicker/timepicker.component.html (100%) rename {frontend => src/frontend}/app/ui/utils/timestamp-timepicker/timepicker.component.ts (100%) rename {frontend => src/frontend}/assets/icon.png (100%) rename {frontend => src/frontend}/assets/icon_inv.png (100%) rename {frontend => src/frontend}/environments/environment.prod.ts (100%) rename {frontend => src/frontend}/environments/environment.ts (100%) rename {frontend => src/frontend}/index.html (100%) rename {frontend => src/frontend}/main.ts (100%) rename {frontend => src/frontend}/polyfills.ts (100%) rename {frontend => src/frontend}/styles.css (100%) rename {frontend => src/frontend}/translate/messages.en.xlf (100%) rename {frontend => src/frontend}/translate/messages.fr.xlf (100%) rename {frontend => src/frontend}/translate/messages.hu.xlf (99%) rename {frontend => src/frontend}/translate/messages.ro.xlf (100%) rename {frontend => src/frontend}/translate/messages.ru.xlf (100%) rename {frontend => src/frontend}/tsconfig.app.json (60%) rename {frontend => src/frontend}/tsconfig.spec.json (69%) rename {frontend => src/frontend}/typings.d.ts (100%) diff --git a/.gitignore b/.gitignore index 5d71de2d..1f797b89 100644 --- a/.gitignore +++ b/.gitignore @@ -2,13 +2,13 @@ PiGallery2.iml node_modules/ pigallery2.zip -frontend/**/*.js -frontend/**/*.js.map -frontend/dist -backend/**/*.js -backend/**/*.js.map -common/**/*.js -common/**/*.js.map +src/frontend/**/*.js +src/frontend/**/*.js.map +src/frontend/dist +src/backend/**/*.js +src/backend/**/*.js.map +src/common/**/*.js +src/common/**/*.js.map test/coverage test/backend/**/*.js test/backend/**/*.js.map diff --git a/angular.json b/angular.json index 1fcee511..b86f1509 100644 --- a/angular.json +++ b/angular.json @@ -5,26 +5,26 @@ "projects": { "pigallery2": { "root": "", - "sourceRoot": "frontend", + "sourceRoot": "src/frontend", "projectType": "application", "architect": { "build": { "builder": "@angular-devkit/build-angular:browser", "options": { "outputPath": "dist", - "index": "frontend/index.html", - "main": "frontend/main.ts", - "tsConfig": "frontend/tsconfig.app.json", - "polyfills": "frontend/polyfills.ts", + "index": "src/frontend/index.html", + "main": "src/frontend/main.ts", + "tsConfig": "src/frontend/tsconfig.app.json", + "polyfills": "src/frontend/polyfills.ts", "assets": [ - "frontend/assets" + "src/frontend/assets" ], "styles": [ "./node_modules/bootstrap/dist/css/bootstrap.min.css", "./node_modules/ngx-bootstrap/datepicker/bs-datepicker.css", "./node_modules/open-iconic/font/css/open-iconic-bootstrap.css", "./node_modules/ngx-toastr/toastr.css", - "frontend/styles.css" + "src/frontend/styles.css" ], "scripts": [] }, @@ -41,8 +41,8 @@ "buildOptimizer": true, "fileReplacements": [ { - "replace": "frontend/environments/environment.ts", - "with": "frontend/environments/environment.prod.ts" + "replace": "src/frontend/environments/environment.ts", + "with": "src/frontend/environments/environment.prod.ts" } ] } @@ -68,10 +68,10 @@ "test": { "builder": "@angular-devkit/build-angular:karma", "options": { - "main": "frontend/test.ts", + "main": "src/frontend/test.ts", "karmaConfig": "./karma.conf.js", - "polyfills": "frontend/polyfills.ts", - "tsConfig": "frontend/tsconfig.spec.json", + "polyfills": "src/frontend/polyfills.ts", + "tsConfig": "src/frontend/tsconfig.spec.json", "scripts": [], "styles": [ "./node_modules/bootstrap/dist/css/bootstrap.min.css", @@ -79,10 +79,10 @@ "node_modules/bootstrap/dist/css/bootstrap.css", "node_modules/open-iconic/font/css/open-iconic-bootstrap.css", "node_modules/ngx-bootstrap/datepicker/bs-datepicker.css", - "frontend/styles.css" + "src/frontend/styles.css" ], "assets": [ - "frontend/assets" + "src/frontend/assets" ] } }, @@ -132,4 +132,4 @@ "prefix": "app" } } -} \ No newline at end of file +} diff --git a/benchmark/Benchmarks.ts b/benchmark/Benchmarks.ts index 024cbf0d..53509cfe 100644 --- a/benchmark/Benchmarks.ts +++ b/benchmark/Benchmarks.ts @@ -1,15 +1,15 @@ -import {SQLConnection} from '../backend/model/sql/SQLConnection'; -import {Config} from '../common/config/private/Config'; -import {ObjectManagers} from '../backend/model/ObjectManagers'; -import {DiskMangerWorker} from '../backend/model/threading/DiskMangerWorker'; -import {IndexingManager} from '../backend/model/sql/IndexingManager'; -import {SearchManager} from '../backend/model/sql/SearchManager'; +import {SQLConnection} from '../src/backend/model/sql/SQLConnection'; +import {Config} from '../src/common/config/private/Config'; +import {ObjectManagers} from '../src/backend/model/ObjectManagers'; +import {DiskMangerWorker} from '../src/backend/model/threading/DiskMangerWorker'; +import {IndexingManager} from '../src/backend/model/sql/IndexingManager'; +import {SearchManager} from '../src/backend/model/sql/SearchManager'; import * as fs from 'fs'; -import {SearchTypes} from '../common/entities/AutoCompleteItem'; -import {Utils} from '../common/Utils'; -import {GalleryManager} from '../backend/model/sql/GalleryManager'; -import {DirectoryDTO} from '../common/entities/DirectoryDTO'; -import {ServerConfig} from '../common/config/private/IPrivateConfig'; +import {SearchTypes} from '../src/common/entities/AutoCompleteItem'; +import {Utils} from '../src/common/Utils'; +import {GalleryManager} from '../src/backend/model/sql/GalleryManager'; +import {DirectoryDTO} from '../src/common/entities/DirectoryDTO'; +import {ServerConfig} from '../src/common/config/private/IPrivateConfig'; export interface BenchmarkResult { duration: number; diff --git a/benchmark/index.ts b/benchmark/index.ts index b2aaf471..85ad957f 100644 --- a/benchmark/index.ts +++ b/benchmark/index.ts @@ -1,10 +1,10 @@ -import {Config} from '../common/config/private/Config'; +import {Config} from '../src/common/config/private/Config'; import * as path from 'path'; -import {ProjectPath} from '../backend/ProjectPath'; +import {ProjectPath} from '../src/backend/ProjectPath'; import {BenchmarkResult, Benchmarks} from './Benchmarks'; -import {SearchTypes} from '../common/entities/AutoCompleteItem'; -import {Utils} from '../common/Utils'; -import {DiskMangerWorker} from '../backend/model/threading/DiskMangerWorker'; +import {SearchTypes} from '../src/common/entities/AutoCompleteItem'; +import {Utils} from '../src/common/Utils'; +import {DiskMangerWorker} from '../src/backend/model/threading/DiskMangerWorker'; const config: { path: string, system: string } = require(path.join(__dirname, 'config.json')); Config.Server.imagesFolder = config.path; diff --git a/frontend/test.ts b/frontend/test.ts deleted file mode 100644 index ece343b9..00000000 --- a/frontend/test.ts +++ /dev/null @@ -1,30 +0,0 @@ -// This file is required by karma.conf.js and loads recursively all the .spec and framework files - -import 'zone.js/dist/long-stack-trace-zone'; -import 'zone.js/dist/proxy.js'; -import 'zone.js/dist/sync-test'; -import 'zone.js/dist/jasmine-patch'; -import 'zone.js/dist/async-test'; -import 'zone.js/dist/fake-async-test'; -import {getTestBed} from '@angular/core/testing'; -import {BrowserDynamicTestingModule, platformBrowserDynamicTesting} from '@angular/platform-browser-dynamic/testing'; - -// Unfortunately there's no typing for the `__karma__` variable. Just declare it as any. -declare const __karma__: any; -declare const require: any; - -// Prevent Karma from running prematurely. -__karma__.loaded = function () { -}; - -// First, initialize the Angular testing environment. -getTestBed().initTestEnvironment( - BrowserDynamicTestingModule, - platformBrowserDynamicTesting() -); -// Then we find all the tests. -const context = require.context('./', true, /\.spec\.ts$/); -// And load the modules. -context.keys().map(context); -// Finally, start Karma to run the tests. -__karma__.start(); diff --git a/gulpfile.ts b/gulpfile.ts index e1400c7e..508e61b4 100644 --- a/gulpfile.ts +++ b/gulpfile.ts @@ -13,8 +13,8 @@ const tsBackendProject = ts.createProject('tsconfig.json'); gulp.task('build-backend', function () { return gulp.src([ - 'common/**/*.ts', - 'backend/**/*.ts'], {base: '.'}) + 'src/common/**/*.ts', + 'src/backend/**/*.ts'], {base: '.'}) .pipe(tsBackendProject()) .js .pipe(gulp.dest('./release')); @@ -36,10 +36,10 @@ const createFrontendTask = (type: string, script: string) => { }; const getLanguages = () => { - if (!fs.existsSync('./frontend/' + translationFolder)) { + if (!fs.existsSync('./src/frontend/' + translationFolder)) { return []; } - const dirCont = fs.readdirSync('./frontend/' + translationFolder); + const dirCont = fs.readdirSync('./src/frontend/' + translationFolder); const files: string[] = dirCont.filter((elm) => { return elm.match(/.*\.[a-zA-Z]+\.(xlf)/ig); }); @@ -71,14 +71,14 @@ gulp.task('build-frontend', (() => { const tasks = []; createFrontendTask('build-frontend-release default', 'ng build --aot --prod --output-path=./release/dist --no-progress --i18n-locale=en' + - ' --i18n-format xlf --i18n-file frontend/' + translationFolder + '/messages.en.xlf' + + ' --i18n-format xlf --i18n-file src/frontend/' + translationFolder + '/messages.en.xlf' + ' --i18n-missing-translation warning'); tasks.push('build-frontend-release default'); for (let i = 0; i < languages.length; i++) { createFrontendTask('build-frontend-release ' + languages[i], 'ng build --aot --prod --output-path=./release/dist/' + languages[i] + ' --no-progress --i18n-locale=' + languages[i] + - ' --i18n-format xlf --i18n-file frontend/' + translationFolder + '/messages.' + languages[i] + '.xlf' + + ' --i18n-format xlf --i18n-file src/frontend/' + translationFolder + '/messages.' + languages[i] + '.xlf' + ' --i18n-missing-translation warning'); tasks.push('build-frontend-release ' + languages[i]); } @@ -87,7 +87,7 @@ gulp.task('build-frontend', (() => { gulp.task('copy-static', function () { return gulp.src([ - 'backend/model/diagnostics/blank.jpg', + 'src/backend/model/diagnostics/blank.jpg', 'README.md', 'LICENSE'], {base: '.'}) .pipe(gulp.dest('./release')); @@ -102,7 +102,7 @@ gulp.task('copy-package', function () { })) .pipe(jsonModify({ key: 'scripts', - value: {'start': 'node ./backend/index.js'} + value: {'start': 'node ./src/backend/index.js'} })) .pipe(gulp.dest('./release')); }); @@ -127,14 +127,14 @@ const simpleBuild = (isProd: boolean) => { cmd += ' --prod --no-extract-licenses '; } createFrontendTask('build-frontend default', cmd + '--output-path=./dist --no-progress --no-progress --i18n-locale en' + - ' --i18n-format=xlf --i18n-file=frontend/' + translationFolder + '/messages.en.xlf' + ' --i18n-missing-translation warning'); + ' --i18n-format=xlf --i18n-file=src/frontend/' + translationFolder + '/messages.en.xlf' + ' --i18n-missing-translation warning'); tasks.push('build-frontend default'); if (!process.env.CI) { // don't build languages if running in CI for (let i = 0; i < languages.length; i++) { createFrontendTask('build-frontend ' + languages[i], cmd + '--output-path=./dist/' + languages[i] + ' --no-progress --i18n-locale ' + languages[i] + - ' --i18n-format=xlf --i18n-file=frontend/' + translationFolder + + ' --i18n-format=xlf --i18n-file=src/frontend/' + translationFolder + '/messages.' + languages[i] + '.xlf' + ' --i18n-missing-translation warning'); tasks.push('build-frontend ' + languages[i]); } @@ -151,20 +151,20 @@ gulp.task('extract-locale', (cb) => { if (error) { return cb(error); } - exec('ngx-extractor -i frontend/**/*.ts -f xlf --out-file locale.source.xlf', + exec('ngx-extractor -i src/frontend/**/*.ts -f xlf --out-file locale.source.xlf', handleError(cb)); }); }); const translate = (list: any[], cb: (err: any) => void) => { const localsStr = '"[\\"' + list.join('\\",\\"') + '\\"]"'; - exec('xlf-google-translate --source-lang="en" --source-file="./locale.source.xlf" --destination-folder="./frontend/"' + + exec('xlf-google-translate --source-lang="en" --source-file="./locale.source.xlf" --destination-folder="./src/frontend/"' + translationFolder + ' --destination-languages=' + localsStr, handleError(cb)); }; const merge = (list: any[], cb: (err: any) => void) => { const localsStr = '"[\\"' + list.join('\\",\\"') + '\\"]"'; - exec('xlf-google-translate --method="extend-only" --source-lang="en" --source-file="./locale.source.xlf" --destination-folder="./frontend/"' + + exec('xlf-google-translate --method="extend-only" --source-lang="en" --source-file="./locale.source.xlf" --destination-folder="./src/frontend/"' + translationFolder + ' --destination-languages=' + localsStr, handleError(cb)); }; diff --git a/package.json b/package.json index a5b5acea..6627a316 100644 --- a/package.json +++ b/package.json @@ -5,8 +5,8 @@ "author": "Patrik J. Braun", "homepage": "https://github.com/bpatrik/PiGallery2", "license": "MIT", - "main": "./backend/index.js", - "bin": "./backend/index.js", + "main": "./src/backend/index.js", + "bin": "./src/backend/index.js", "scripts": { "install": "npm run build-prod", "build-prod": "tsc && gulp build-prod", @@ -15,8 +15,8 @@ "pretest": "tsc", "test": "ng test && mocha --recursive test/backend/unit && mocha --recursive test/backend/integration && mocha --recursive test/common/unit ", "start": "node ./backend/index", - "run-dev": "ng build --aot --watch --output-path=./dist --i18n-locale en --i18n-file frontend/translate/messages.en.xlf --i18n-missing-translation warning", - "build-stats": "ng build --aot --prod --stats-json --output-path=./dist --i18n-locale en --i18n-file frontend/translate/messages.en.xlf --i18n-missing-translation warning", + "run-dev": "ng build --aot --watch --output-path=./dist --i18n-locale en --i18n-file src/frontend/translate/messages.en.xlf --i18n-missing-translation warning", + "build-stats": "ng build --aot --prod --stats-json --output-path=./dist --i18n-locale en --i18n-file src/frontend/translate/messages.en.xlf --i18n-missing-translation warning", "merge-new-translation": "gulp merge-new-translation", "add-translation": "gulp add-translation" }, diff --git a/backend/Logger.ts b/src/backend/Logger.ts similarity index 100% rename from backend/Logger.ts rename to src/backend/Logger.ts diff --git a/backend/ProjectPath.ts b/src/backend/ProjectPath.ts similarity index 96% rename from backend/ProjectPath.ts rename to src/backend/ProjectPath.ts index f74ace3e..e6a74210 100644 --- a/backend/ProjectPath.ts +++ b/src/backend/ProjectPath.ts @@ -30,7 +30,7 @@ class ProjectPathClass { } reset() { - this.Root = path.join(__dirname, '/../'); + this.Root = path.join(__dirname, '/../../'); this.ImageFolder = this.getAbsolutePath(Config.Server.imagesFolder); this.ThumbnailFolder = this.getAbsolutePath(Config.Server.Thumbnail.folder); this.TranscendedFolder = path.join(this.ThumbnailFolder, 'tc'); diff --git a/backend/index.ts b/src/backend/index.ts similarity index 100% rename from backend/index.ts rename to src/backend/index.ts diff --git a/backend/middlewares/GalleryMWs.ts b/src/backend/middlewares/GalleryMWs.ts similarity index 100% rename from backend/middlewares/GalleryMWs.ts rename to src/backend/middlewares/GalleryMWs.ts diff --git a/backend/middlewares/NotificationMWs.ts b/src/backend/middlewares/NotificationMWs.ts similarity index 100% rename from backend/middlewares/NotificationMWs.ts rename to src/backend/middlewares/NotificationMWs.ts diff --git a/backend/middlewares/PersonMWs.ts b/src/backend/middlewares/PersonMWs.ts similarity index 100% rename from backend/middlewares/PersonMWs.ts rename to src/backend/middlewares/PersonMWs.ts diff --git a/backend/middlewares/RenderingMWs.ts b/src/backend/middlewares/RenderingMWs.ts similarity index 100% rename from backend/middlewares/RenderingMWs.ts rename to src/backend/middlewares/RenderingMWs.ts diff --git a/backend/middlewares/SharingMWs.ts b/src/backend/middlewares/SharingMWs.ts similarity index 100% rename from backend/middlewares/SharingMWs.ts rename to src/backend/middlewares/SharingMWs.ts diff --git a/backend/middlewares/VersionMWs.ts b/src/backend/middlewares/VersionMWs.ts similarity index 100% rename from backend/middlewares/VersionMWs.ts rename to src/backend/middlewares/VersionMWs.ts diff --git a/backend/middlewares/VideoConverterMWs.ts b/src/backend/middlewares/VideoConverterMWs.ts similarity index 100% rename from backend/middlewares/VideoConverterMWs.ts rename to src/backend/middlewares/VideoConverterMWs.ts diff --git a/backend/middlewares/admin/AdminMWs.ts b/src/backend/middlewares/admin/AdminMWs.ts similarity index 100% rename from backend/middlewares/admin/AdminMWs.ts rename to src/backend/middlewares/admin/AdminMWs.ts diff --git a/backend/middlewares/admin/SettingsMWs.ts b/src/backend/middlewares/admin/SettingsMWs.ts similarity index 100% rename from backend/middlewares/admin/SettingsMWs.ts rename to src/backend/middlewares/admin/SettingsMWs.ts diff --git a/backend/middlewares/customtypings/ExtendedRequest.d.ts b/src/backend/middlewares/customtypings/ExtendedRequest.d.ts similarity index 100% rename from backend/middlewares/customtypings/ExtendedRequest.d.ts rename to src/backend/middlewares/customtypings/ExtendedRequest.d.ts diff --git a/backend/middlewares/thumbnail/ThumbnailGeneratorMWs.ts b/src/backend/middlewares/thumbnail/ThumbnailGeneratorMWs.ts similarity index 100% rename from backend/middlewares/thumbnail/ThumbnailGeneratorMWs.ts rename to src/backend/middlewares/thumbnail/ThumbnailGeneratorMWs.ts diff --git a/backend/middlewares/user/AuthenticationMWs.ts b/src/backend/middlewares/user/AuthenticationMWs.ts similarity index 100% rename from backend/middlewares/user/AuthenticationMWs.ts rename to src/backend/middlewares/user/AuthenticationMWs.ts diff --git a/backend/middlewares/user/UserMWs.ts b/src/backend/middlewares/user/UserMWs.ts similarity index 100% rename from backend/middlewares/user/UserMWs.ts rename to src/backend/middlewares/user/UserMWs.ts diff --git a/backend/middlewares/user/UserRequestConstrainsMWs.ts b/src/backend/middlewares/user/UserRequestConstrainsMWs.ts similarity index 100% rename from backend/middlewares/user/UserRequestConstrainsMWs.ts rename to src/backend/middlewares/user/UserRequestConstrainsMWs.ts diff --git a/backend/model/DiskManger.ts b/src/backend/model/DiskManger.ts similarity index 100% rename from backend/model/DiskManger.ts rename to src/backend/model/DiskManger.ts diff --git a/backend/model/FFmpegFactory.ts b/src/backend/model/FFmpegFactory.ts similarity index 100% rename from backend/model/FFmpegFactory.ts rename to src/backend/model/FFmpegFactory.ts diff --git a/backend/model/Localizations.ts b/src/backend/model/Localizations.ts similarity index 100% rename from backend/model/Localizations.ts rename to src/backend/model/Localizations.ts diff --git a/backend/model/NotifocationManager.ts b/src/backend/model/NotifocationManager.ts similarity index 100% rename from backend/model/NotifocationManager.ts rename to src/backend/model/NotifocationManager.ts diff --git a/backend/model/ObjectManagers.ts b/src/backend/model/ObjectManagers.ts similarity index 100% rename from backend/model/ObjectManagers.ts rename to src/backend/model/ObjectManagers.ts diff --git a/backend/model/PasswordHelper.ts b/src/backend/model/PasswordHelper.ts similarity index 100% rename from backend/model/PasswordHelper.ts rename to src/backend/model/PasswordHelper.ts diff --git a/backend/model/diagnostics/ConfigDiagnostics.ts b/src/backend/model/diagnostics/ConfigDiagnostics.ts similarity index 99% rename from backend/model/diagnostics/ConfigDiagnostics.ts rename to src/backend/model/diagnostics/ConfigDiagnostics.ts index 0cc669c0..b23a1d32 100644 --- a/backend/model/diagnostics/ConfigDiagnostics.ts +++ b/src/backend/model/diagnostics/ConfigDiagnostics.ts @@ -231,7 +231,7 @@ export class ConfigDiagnostics { try { - await ConfigDiagnostics.testClientVideoConfig(Config.Server.Video); + await ConfigDiagnostics.testClientVideoConfig(Config.Client.Video); await ConfigDiagnostics.testServerVideoConfig(Config.Server.Video, Config); } catch (ex) { const err: Error = ex; diff --git a/backend/model/diagnostics/blank.jpg b/src/backend/model/diagnostics/blank.jpg similarity index 100% rename from backend/model/diagnostics/blank.jpg rename to src/backend/model/diagnostics/blank.jpg diff --git a/backend/model/interfaces/IGalleryManager.ts b/src/backend/model/interfaces/IGalleryManager.ts similarity index 100% rename from backend/model/interfaces/IGalleryManager.ts rename to src/backend/model/interfaces/IGalleryManager.ts diff --git a/backend/model/interfaces/IIndexingManager.ts b/src/backend/model/interfaces/IIndexingManager.ts similarity index 100% rename from backend/model/interfaces/IIndexingManager.ts rename to src/backend/model/interfaces/IIndexingManager.ts diff --git a/backend/model/interfaces/IPersonManager.ts b/src/backend/model/interfaces/IPersonManager.ts similarity index 100% rename from backend/model/interfaces/IPersonManager.ts rename to src/backend/model/interfaces/IPersonManager.ts diff --git a/backend/model/interfaces/ISearchManager.ts b/src/backend/model/interfaces/ISearchManager.ts similarity index 100% rename from backend/model/interfaces/ISearchManager.ts rename to src/backend/model/interfaces/ISearchManager.ts diff --git a/backend/model/interfaces/ISharingManager.ts b/src/backend/model/interfaces/ISharingManager.ts similarity index 100% rename from backend/model/interfaces/ISharingManager.ts rename to src/backend/model/interfaces/ISharingManager.ts diff --git a/backend/model/interfaces/ITaskManager.ts b/src/backend/model/interfaces/ITaskManager.ts similarity index 100% rename from backend/model/interfaces/ITaskManager.ts rename to src/backend/model/interfaces/ITaskManager.ts diff --git a/backend/model/interfaces/IUserManager.ts b/src/backend/model/interfaces/IUserManager.ts similarity index 100% rename from backend/model/interfaces/IUserManager.ts rename to src/backend/model/interfaces/IUserManager.ts diff --git a/backend/model/interfaces/IVersionManager.ts b/src/backend/model/interfaces/IVersionManager.ts similarity index 100% rename from backend/model/interfaces/IVersionManager.ts rename to src/backend/model/interfaces/IVersionManager.ts diff --git a/backend/model/memory/GalleryManager.ts b/src/backend/model/memory/GalleryManager.ts similarity index 100% rename from backend/model/memory/GalleryManager.ts rename to src/backend/model/memory/GalleryManager.ts diff --git a/backend/model/memory/IndexingManager.ts b/src/backend/model/memory/IndexingManager.ts similarity index 100% rename from backend/model/memory/IndexingManager.ts rename to src/backend/model/memory/IndexingManager.ts diff --git a/backend/model/memory/PersonManager.ts b/src/backend/model/memory/PersonManager.ts similarity index 100% rename from backend/model/memory/PersonManager.ts rename to src/backend/model/memory/PersonManager.ts diff --git a/backend/model/memory/SearchManager.ts b/src/backend/model/memory/SearchManager.ts similarity index 100% rename from backend/model/memory/SearchManager.ts rename to src/backend/model/memory/SearchManager.ts diff --git a/backend/model/memory/SharingManager.ts b/src/backend/model/memory/SharingManager.ts similarity index 100% rename from backend/model/memory/SharingManager.ts rename to src/backend/model/memory/SharingManager.ts diff --git a/backend/model/memory/UserManager.ts b/src/backend/model/memory/UserManager.ts similarity index 100% rename from backend/model/memory/UserManager.ts rename to src/backend/model/memory/UserManager.ts diff --git a/backend/model/memory/VersionManager.ts b/src/backend/model/memory/VersionManager.ts similarity index 100% rename from backend/model/memory/VersionManager.ts rename to src/backend/model/memory/VersionManager.ts diff --git a/backend/model/sql/GalleryManager.ts b/src/backend/model/sql/GalleryManager.ts similarity index 100% rename from backend/model/sql/GalleryManager.ts rename to src/backend/model/sql/GalleryManager.ts diff --git a/backend/model/sql/IGalleryManager.ts b/src/backend/model/sql/IGalleryManager.ts similarity index 100% rename from backend/model/sql/IGalleryManager.ts rename to src/backend/model/sql/IGalleryManager.ts diff --git a/backend/model/sql/IndexingManager.ts b/src/backend/model/sql/IndexingManager.ts similarity index 100% rename from backend/model/sql/IndexingManager.ts rename to src/backend/model/sql/IndexingManager.ts diff --git a/backend/model/sql/PersonManager.ts b/src/backend/model/sql/PersonManager.ts similarity index 100% rename from backend/model/sql/PersonManager.ts rename to src/backend/model/sql/PersonManager.ts diff --git a/backend/model/sql/SQLConnection.ts b/src/backend/model/sql/SQLConnection.ts similarity index 100% rename from backend/model/sql/SQLConnection.ts rename to src/backend/model/sql/SQLConnection.ts diff --git a/backend/model/sql/SearchManager.ts b/src/backend/model/sql/SearchManager.ts similarity index 100% rename from backend/model/sql/SearchManager.ts rename to src/backend/model/sql/SearchManager.ts diff --git a/backend/model/sql/SharingManager.ts b/src/backend/model/sql/SharingManager.ts similarity index 100% rename from backend/model/sql/SharingManager.ts rename to src/backend/model/sql/SharingManager.ts diff --git a/backend/model/sql/UserManager.ts b/src/backend/model/sql/UserManager.ts similarity index 100% rename from backend/model/sql/UserManager.ts rename to src/backend/model/sql/UserManager.ts diff --git a/backend/model/sql/VersionManager.ts b/src/backend/model/sql/VersionManager.ts similarity index 100% rename from backend/model/sql/VersionManager.ts rename to src/backend/model/sql/VersionManager.ts diff --git a/backend/model/sql/enitites/DirectoryEntity.ts b/src/backend/model/sql/enitites/DirectoryEntity.ts similarity index 100% rename from backend/model/sql/enitites/DirectoryEntity.ts rename to src/backend/model/sql/enitites/DirectoryEntity.ts diff --git a/backend/model/sql/enitites/EntityUtils.ts b/src/backend/model/sql/enitites/EntityUtils.ts similarity index 100% rename from backend/model/sql/enitites/EntityUtils.ts rename to src/backend/model/sql/enitites/EntityUtils.ts diff --git a/backend/model/sql/enitites/FaceRegionEntry.ts b/src/backend/model/sql/enitites/FaceRegionEntry.ts similarity index 100% rename from backend/model/sql/enitites/FaceRegionEntry.ts rename to src/backend/model/sql/enitites/FaceRegionEntry.ts diff --git a/backend/model/sql/enitites/FileEntity.ts b/src/backend/model/sql/enitites/FileEntity.ts similarity index 100% rename from backend/model/sql/enitites/FileEntity.ts rename to src/backend/model/sql/enitites/FileEntity.ts diff --git a/backend/model/sql/enitites/MediaEntity.ts b/src/backend/model/sql/enitites/MediaEntity.ts similarity index 100% rename from backend/model/sql/enitites/MediaEntity.ts rename to src/backend/model/sql/enitites/MediaEntity.ts diff --git a/backend/model/sql/enitites/PersonEntry.ts b/src/backend/model/sql/enitites/PersonEntry.ts similarity index 100% rename from backend/model/sql/enitites/PersonEntry.ts rename to src/backend/model/sql/enitites/PersonEntry.ts diff --git a/backend/model/sql/enitites/PhotoEntity.ts b/src/backend/model/sql/enitites/PhotoEntity.ts similarity index 100% rename from backend/model/sql/enitites/PhotoEntity.ts rename to src/backend/model/sql/enitites/PhotoEntity.ts diff --git a/backend/model/sql/enitites/SharingEntity.ts b/src/backend/model/sql/enitites/SharingEntity.ts similarity index 100% rename from backend/model/sql/enitites/SharingEntity.ts rename to src/backend/model/sql/enitites/SharingEntity.ts diff --git a/backend/model/sql/enitites/UserEntity.ts b/src/backend/model/sql/enitites/UserEntity.ts similarity index 100% rename from backend/model/sql/enitites/UserEntity.ts rename to src/backend/model/sql/enitites/UserEntity.ts diff --git a/backend/model/sql/enitites/VersionEntity.ts b/src/backend/model/sql/enitites/VersionEntity.ts similarity index 100% rename from backend/model/sql/enitites/VersionEntity.ts rename to src/backend/model/sql/enitites/VersionEntity.ts diff --git a/backend/model/sql/enitites/VideoEntity.ts b/src/backend/model/sql/enitites/VideoEntity.ts similarity index 100% rename from backend/model/sql/enitites/VideoEntity.ts rename to src/backend/model/sql/enitites/VideoEntity.ts diff --git a/backend/model/tasks/TaskManager.ts b/src/backend/model/tasks/TaskManager.ts similarity index 100% rename from backend/model/tasks/TaskManager.ts rename to src/backend/model/tasks/TaskManager.ts diff --git a/backend/model/tasks/TaskRepository.ts b/src/backend/model/tasks/TaskRepository.ts similarity index 100% rename from backend/model/tasks/TaskRepository.ts rename to src/backend/model/tasks/TaskRepository.ts diff --git a/backend/model/tasks/tasks/DBResetTask.ts b/src/backend/model/tasks/tasks/DBResetTask.ts similarity index 100% rename from backend/model/tasks/tasks/DBResetTask.ts rename to src/backend/model/tasks/tasks/DBResetTask.ts diff --git a/backend/model/tasks/tasks/ITask.ts b/src/backend/model/tasks/tasks/ITask.ts similarity index 93% rename from backend/model/tasks/tasks/ITask.ts rename to src/backend/model/tasks/tasks/ITask.ts index 06406008..7369a43e 100644 --- a/backend/model/tasks/tasks/ITask.ts +++ b/src/backend/model/tasks/tasks/ITask.ts @@ -9,4 +9,6 @@ export interface ITask extends TaskDTO { start(config: T): Promise; stop(): void; + + toJSON(): TaskDTO; } diff --git a/backend/model/tasks/tasks/IndexingTask.ts b/src/backend/model/tasks/tasks/IndexingTask.ts similarity index 96% rename from backend/model/tasks/tasks/IndexingTask.ts rename to src/backend/model/tasks/tasks/IndexingTask.ts index 7df86b83..d96d4e23 100644 --- a/backend/model/tasks/tasks/IndexingTask.ts +++ b/src/backend/model/tasks/tasks/IndexingTask.ts @@ -9,7 +9,7 @@ import {MediaDTO} from '../../../../common/entities/MediaDTO'; import {ProjectPath} from '../../../ProjectPath'; import {ThumbnailGeneratorMWs} from '../../../middlewares/thumbnail/ThumbnailGeneratorMWs'; import {Task} from './Task'; -import {ConfigTemplateEntry, DefaultsTasks} from '../../../../common/entities/task/TaskDTO'; +import {ConfigTemplateEntry, DefaultsTasks, TaskDTO} from '../../../../common/entities/task/TaskDTO'; import {ServerConfig} from '../../../../common/config/private/IPrivateConfig'; declare const global: any; @@ -29,6 +29,7 @@ export class IndexingTask extends Task<{ createThumbnails: boolean }> { return Config.Server.Database.type !== ServerConfig.DatabaseType.memory; } + protected async init() { this.directoriesToIndex.push('/'); } diff --git a/backend/model/tasks/tasks/Task.ts b/src/backend/model/tasks/tasks/Task.ts similarity index 90% rename from backend/model/tasks/tasks/Task.ts rename to src/backend/model/tasks/tasks/Task.ts index 94c4a01e..8312af25 100644 --- a/backend/model/tasks/tasks/Task.ts +++ b/src/backend/model/tasks/tasks/Task.ts @@ -1,7 +1,7 @@ import {TaskProgressDTO} from '../../../../common/entities/settings/TaskProgressDTO'; import {Logger} from '../../../Logger'; import {ITask} from './ITask'; -import {ConfigTemplateEntry} from '../../../../common/entities/task/TaskDTO'; +import {ConfigTemplateEntry, TaskDTO} from '../../../../common/entities/task/TaskDTO'; declare const process: any; @@ -55,6 +55,13 @@ export abstract class Task implements ITask { this.onFinish(); } + public toJSON(): TaskDTO { + return { + Name: this.Name, + ConfigTemplate: this.ConfigTemplate + }; + } + protected abstract async step(): Promise; protected abstract async init(): Promise; diff --git a/backend/model/tasks/tasks/VideoConvertingTask.ts b/src/backend/model/tasks/tasks/VideoConvertingTask.ts similarity index 100% rename from backend/model/tasks/tasks/VideoConvertingTask.ts rename to src/backend/model/tasks/tasks/VideoConvertingTask.ts diff --git a/backend/model/threading/DiskMangerWorker.ts b/src/backend/model/threading/DiskMangerWorker.ts similarity index 100% rename from backend/model/threading/DiskMangerWorker.ts rename to src/backend/model/threading/DiskMangerWorker.ts diff --git a/backend/model/threading/MetadataLoader.ts b/src/backend/model/threading/MetadataLoader.ts similarity index 100% rename from backend/model/threading/MetadataLoader.ts rename to src/backend/model/threading/MetadataLoader.ts diff --git a/backend/model/threading/TaskExecuter.ts b/src/backend/model/threading/TaskExecuter.ts similarity index 100% rename from backend/model/threading/TaskExecuter.ts rename to src/backend/model/threading/TaskExecuter.ts diff --git a/backend/model/threading/TaskQue.ts b/src/backend/model/threading/TaskQue.ts similarity index 100% rename from backend/model/threading/TaskQue.ts rename to src/backend/model/threading/TaskQue.ts diff --git a/backend/model/threading/ThreadPool.ts b/src/backend/model/threading/ThreadPool.ts similarity index 100% rename from backend/model/threading/ThreadPool.ts rename to src/backend/model/threading/ThreadPool.ts diff --git a/backend/model/threading/ThumbnailWorker.ts b/src/backend/model/threading/ThumbnailWorker.ts similarity index 100% rename from backend/model/threading/ThumbnailWorker.ts rename to src/backend/model/threading/ThumbnailWorker.ts diff --git a/backend/model/threading/VideoConverterWorker.ts b/src/backend/model/threading/VideoConverterWorker.ts similarity index 100% rename from backend/model/threading/VideoConverterWorker.ts rename to src/backend/model/threading/VideoConverterWorker.ts diff --git a/backend/model/threading/Worker.ts b/src/backend/model/threading/Worker.ts similarity index 100% rename from backend/model/threading/Worker.ts rename to src/backend/model/threading/Worker.ts diff --git a/backend/routes/ErrorRouter.ts b/src/backend/routes/ErrorRouter.ts similarity index 100% rename from backend/routes/ErrorRouter.ts rename to src/backend/routes/ErrorRouter.ts diff --git a/backend/routes/GalleryRouter.ts b/src/backend/routes/GalleryRouter.ts similarity index 100% rename from backend/routes/GalleryRouter.ts rename to src/backend/routes/GalleryRouter.ts diff --git a/backend/routes/LoggerRouter.ts b/src/backend/routes/LoggerRouter.ts similarity index 100% rename from backend/routes/LoggerRouter.ts rename to src/backend/routes/LoggerRouter.ts diff --git a/backend/routes/NotificationRouter.ts b/src/backend/routes/NotificationRouter.ts similarity index 100% rename from backend/routes/NotificationRouter.ts rename to src/backend/routes/NotificationRouter.ts diff --git a/backend/routes/PersonRouter.ts b/src/backend/routes/PersonRouter.ts similarity index 100% rename from backend/routes/PersonRouter.ts rename to src/backend/routes/PersonRouter.ts diff --git a/backend/routes/PublicRouter.ts b/src/backend/routes/PublicRouter.ts similarity index 100% rename from backend/routes/PublicRouter.ts rename to src/backend/routes/PublicRouter.ts diff --git a/backend/routes/Router.ts b/src/backend/routes/Router.ts similarity index 100% rename from backend/routes/Router.ts rename to src/backend/routes/Router.ts diff --git a/backend/routes/SharingRouter.ts b/src/backend/routes/SharingRouter.ts similarity index 100% rename from backend/routes/SharingRouter.ts rename to src/backend/routes/SharingRouter.ts diff --git a/backend/routes/UserRouter.ts b/src/backend/routes/UserRouter.ts similarity index 100% rename from backend/routes/UserRouter.ts rename to src/backend/routes/UserRouter.ts diff --git a/backend/routes/admin/AdminRouter.ts b/src/backend/routes/admin/AdminRouter.ts similarity index 100% rename from backend/routes/admin/AdminRouter.ts rename to src/backend/routes/admin/AdminRouter.ts diff --git a/backend/routes/admin/SettingsRouter.ts b/src/backend/routes/admin/SettingsRouter.ts similarity index 100% rename from backend/routes/admin/SettingsRouter.ts rename to src/backend/routes/admin/SettingsRouter.ts diff --git a/backend/server.ts b/src/backend/server.ts similarity index 96% rename from backend/server.ts rename to src/backend/server.ts index 12b835e6..62905cf2 100644 --- a/backend/server.ts +++ b/src/backend/server.ts @@ -30,15 +30,14 @@ export class Server { if (!(process.env.NODE_ENV === 'production')) { Logger.info(LOG_TAG, 'Running in DEBUG mode, set env variable NODE_ENV=production to disable '); } - this.init(); + this.init().catch(console.error); } - async init() { + async init(): Promise { Logger.info(LOG_TAG, 'running diagnostics...'); await ConfigDiagnostics.runDiagnostics(); Logger.verbose(LOG_TAG, 'using config:'); - const appVer = require('../package.json').version; - Config.Client.appVersion = appVer; + Config.Client.appVersion = require('../../package.json').version; Logger.verbose(LOG_TAG, JSON.stringify(Config, null, '\t')); this.app = _express(); diff --git a/common/CookieNames.ts b/src/common/CookieNames.ts similarity index 100% rename from common/CookieNames.ts rename to src/common/CookieNames.ts diff --git a/common/CostumHeaders.ts b/src/common/CostumHeaders.ts similarity index 100% rename from common/CostumHeaders.ts rename to src/common/CostumHeaders.ts diff --git a/common/DataStructureVersion.ts b/src/common/DataStructureVersion.ts similarity index 100% rename from common/DataStructureVersion.ts rename to src/common/DataStructureVersion.ts diff --git a/common/QueryParams.ts b/src/common/QueryParams.ts similarity index 100% rename from common/QueryParams.ts rename to src/common/QueryParams.ts diff --git a/common/SupportedFormats.ts b/src/common/SupportedFormats.ts similarity index 100% rename from common/SupportedFormats.ts rename to src/common/SupportedFormats.ts diff --git a/common/Utils.ts b/src/common/Utils.ts similarity index 100% rename from common/Utils.ts rename to src/common/Utils.ts diff --git a/common/config/private/Config.ts b/src/common/config/private/Config.ts similarity index 100% rename from common/config/private/Config.ts rename to src/common/config/private/Config.ts diff --git a/common/config/private/IPrivateConfig.ts b/src/common/config/private/IPrivateConfig.ts similarity index 100% rename from common/config/private/IPrivateConfig.ts rename to src/common/config/private/IPrivateConfig.ts diff --git a/common/config/private/PrivateConfigClass.ts b/src/common/config/private/PrivateConfigClass.ts similarity index 93% rename from common/config/private/PrivateConfigClass.ts rename to src/common/config/private/PrivateConfigClass.ts index f7f70a29..3b78b8f0 100644 --- a/common/config/private/PrivateConfigClass.ts +++ b/src/common/config/private/PrivateConfigClass.ts @@ -1,5 +1,5 @@ import {PublicConfigClass} from '../public/ConfigClass'; -import {IPrivateConfig, ServerConfig,} from './IPrivateConfig'; +import {IPrivateConfig, ServerConfig} from './IPrivateConfig'; import * as path from 'path'; import {ConfigLoader} from 'typeconfig'; import {Utils} from '../../Utils'; @@ -12,6 +12,7 @@ import {DefaultsTasks} from '../../entities/task/TaskDTO'; */ export class PrivateConfigClass extends PublicConfigClass implements IPrivateConfig { + private static readonly CONFIG_PATH = path.join(__dirname, './../../../../config.json'); public Server: ServerConfig.Config = { port: 80, host: '0.0.0.0', @@ -95,8 +96,7 @@ export class PrivateConfigClass extends PublicConfigClass implements IPrivateCon public load() { this.addComment(); - ConfigLoader.loadBackendConfig(this, - path.join(__dirname, './../../../config.json'), + ConfigLoader.loadBackendConfig(this, PrivateConfigClass.CONFIG_PATH, [['PORT', 'Server-port'], ['MYSQL_HOST', 'Server-Database-mysql-host'], ['MYSQL_PASSWORD', 'Server-Database-mysql-password'], @@ -119,7 +119,7 @@ export class PrivateConfigClass extends PublicConfigClass implements IPrivateCon public save() { try { this.addComment(); - ConfigLoader.saveConfigFile(path.join(__dirname, './../../../config.json'), this); + ConfigLoader.saveConfigFile(PrivateConfigClass.CONFIG_PATH, this); this.removeComment(); } catch (e) { throw new Error('Error during saving config: ' + e.toString()); diff --git a/common/config/public/Config.ts b/src/common/config/public/Config.ts similarity index 100% rename from common/config/public/Config.ts rename to src/common/config/public/Config.ts diff --git a/common/config/public/ConfigClass.ts b/src/common/config/public/ConfigClass.ts similarity index 100% rename from common/config/public/ConfigClass.ts rename to src/common/config/public/ConfigClass.ts diff --git a/common/entities/AutoCompleteItem.ts b/src/common/entities/AutoCompleteItem.ts similarity index 100% rename from common/entities/AutoCompleteItem.ts rename to src/common/entities/AutoCompleteItem.ts diff --git a/common/entities/ConentWrapper.ts b/src/common/entities/ConentWrapper.ts similarity index 100% rename from common/entities/ConentWrapper.ts rename to src/common/entities/ConentWrapper.ts diff --git a/common/entities/DirectoryDTO.ts b/src/common/entities/DirectoryDTO.ts similarity index 100% rename from common/entities/DirectoryDTO.ts rename to src/common/entities/DirectoryDTO.ts diff --git a/common/entities/DuplicatesDTO.ts b/src/common/entities/DuplicatesDTO.ts similarity index 100% rename from common/entities/DuplicatesDTO.ts rename to src/common/entities/DuplicatesDTO.ts diff --git a/common/entities/Error.ts b/src/common/entities/Error.ts similarity index 100% rename from common/entities/Error.ts rename to src/common/entities/Error.ts diff --git a/common/entities/FileDTO.ts b/src/common/entities/FileDTO.ts similarity index 100% rename from common/entities/FileDTO.ts rename to src/common/entities/FileDTO.ts diff --git a/common/entities/LoginCredential.ts b/src/common/entities/LoginCredential.ts similarity index 100% rename from common/entities/LoginCredential.ts rename to src/common/entities/LoginCredential.ts diff --git a/common/entities/MediaDTO.ts b/src/common/entities/MediaDTO.ts similarity index 100% rename from common/entities/MediaDTO.ts rename to src/common/entities/MediaDTO.ts diff --git a/common/entities/Message.ts b/src/common/entities/Message.ts similarity index 100% rename from common/entities/Message.ts rename to src/common/entities/Message.ts diff --git a/common/entities/NotificationDTO.ts b/src/common/entities/NotificationDTO.ts similarity index 100% rename from common/entities/NotificationDTO.ts rename to src/common/entities/NotificationDTO.ts diff --git a/common/entities/PasswordChangeRequest.ts b/src/common/entities/PasswordChangeRequest.ts similarity index 100% rename from common/entities/PasswordChangeRequest.ts rename to src/common/entities/PasswordChangeRequest.ts diff --git a/common/entities/PersonDTO.ts b/src/common/entities/PersonDTO.ts similarity index 100% rename from common/entities/PersonDTO.ts rename to src/common/entities/PersonDTO.ts diff --git a/common/entities/PhotoDTO.ts b/src/common/entities/PhotoDTO.ts similarity index 100% rename from common/entities/PhotoDTO.ts rename to src/common/entities/PhotoDTO.ts diff --git a/common/entities/RandomQueryDTO.ts b/src/common/entities/RandomQueryDTO.ts similarity index 100% rename from common/entities/RandomQueryDTO.ts rename to src/common/entities/RandomQueryDTO.ts diff --git a/common/entities/SearchResultDTO.ts b/src/common/entities/SearchResultDTO.ts similarity index 100% rename from common/entities/SearchResultDTO.ts rename to src/common/entities/SearchResultDTO.ts diff --git a/common/entities/SharingDTO.ts b/src/common/entities/SharingDTO.ts similarity index 100% rename from common/entities/SharingDTO.ts rename to src/common/entities/SharingDTO.ts diff --git a/common/entities/SortingMethods.ts b/src/common/entities/SortingMethods.ts similarity index 100% rename from common/entities/SortingMethods.ts rename to src/common/entities/SortingMethods.ts diff --git a/common/entities/UserDTO.ts b/src/common/entities/UserDTO.ts similarity index 100% rename from common/entities/UserDTO.ts rename to src/common/entities/UserDTO.ts diff --git a/common/entities/UserModificationRequest.ts b/src/common/entities/UserModificationRequest.ts similarity index 100% rename from common/entities/UserModificationRequest.ts rename to src/common/entities/UserModificationRequest.ts diff --git a/common/entities/VideoDTO.ts b/src/common/entities/VideoDTO.ts similarity index 100% rename from common/entities/VideoDTO.ts rename to src/common/entities/VideoDTO.ts diff --git a/common/entities/settings/BasicConfigDTO.ts b/src/common/entities/settings/BasicConfigDTO.ts similarity index 100% rename from common/entities/settings/BasicConfigDTO.ts rename to src/common/entities/settings/BasicConfigDTO.ts diff --git a/common/entities/settings/IndexingDTO.ts b/src/common/entities/settings/IndexingDTO.ts similarity index 100% rename from common/entities/settings/IndexingDTO.ts rename to src/common/entities/settings/IndexingDTO.ts diff --git a/common/entities/settings/OtherConfigDTO.ts b/src/common/entities/settings/OtherConfigDTO.ts similarity index 100% rename from common/entities/settings/OtherConfigDTO.ts rename to src/common/entities/settings/OtherConfigDTO.ts diff --git a/common/entities/settings/StatisticDTO.ts b/src/common/entities/settings/StatisticDTO.ts similarity index 100% rename from common/entities/settings/StatisticDTO.ts rename to src/common/entities/settings/StatisticDTO.ts diff --git a/common/entities/settings/TaskProgressDTO.ts b/src/common/entities/settings/TaskProgressDTO.ts similarity index 100% rename from common/entities/settings/TaskProgressDTO.ts rename to src/common/entities/settings/TaskProgressDTO.ts diff --git a/common/entities/task/TaskDTO.ts b/src/common/entities/task/TaskDTO.ts similarity index 100% rename from common/entities/task/TaskDTO.ts rename to src/common/entities/task/TaskDTO.ts diff --git a/common/entities/task/TaskScheduleDTO.ts b/src/common/entities/task/TaskScheduleDTO.ts similarity index 100% rename from common/entities/task/TaskScheduleDTO.ts rename to src/common/entities/task/TaskScheduleDTO.ts diff --git a/common/event/Event.ts b/src/common/event/Event.ts similarity index 100% rename from common/event/Event.ts rename to src/common/event/Event.ts diff --git a/common/event/Event2Args.ts b/src/common/event/Event2Args.ts similarity index 100% rename from common/event/Event2Args.ts rename to src/common/event/Event2Args.ts diff --git a/common/event/EventLimit.ts b/src/common/event/EventLimit.ts similarity index 100% rename from common/event/EventLimit.ts rename to src/common/event/EventLimit.ts diff --git a/frontend/app/app.component.ts b/src/frontend/app/app.component.ts similarity index 100% rename from frontend/app/app.component.ts rename to src/frontend/app/app.component.ts diff --git a/frontend/app/app.module.ts b/src/frontend/app/app.module.ts similarity index 100% rename from frontend/app/app.module.ts rename to src/frontend/app/app.module.ts diff --git a/frontend/app/app.routing.ts b/src/frontend/app/app.routing.ts similarity index 100% rename from frontend/app/app.routing.ts rename to src/frontend/app/app.routing.ts diff --git a/frontend/app/model/IRenderable.ts b/src/frontend/app/model/IRenderable.ts similarity index 100% rename from frontend/app/model/IRenderable.ts rename to src/frontend/app/model/IRenderable.ts diff --git a/frontend/app/model/navigation.service.ts b/src/frontend/app/model/navigation.service.ts similarity index 100% rename from frontend/app/model/navigation.service.ts rename to src/frontend/app/model/navigation.service.ts diff --git a/frontend/app/model/network/autehentication.service.spec.ts b/src/frontend/app/model/network/autehentication.service.spec.ts similarity index 100% rename from frontend/app/model/network/autehentication.service.spec.ts rename to src/frontend/app/model/network/autehentication.service.spec.ts diff --git a/frontend/app/model/network/authentication.service.ts b/src/frontend/app/model/network/authentication.service.ts similarity index 100% rename from frontend/app/model/network/authentication.service.ts rename to src/frontend/app/model/network/authentication.service.ts diff --git a/frontend/app/model/network/network.service.spec.ts b/src/frontend/app/model/network/network.service.spec.ts similarity index 100% rename from frontend/app/model/network/network.service.spec.ts rename to src/frontend/app/model/network/network.service.spec.ts diff --git a/frontend/app/model/network/network.service.ts b/src/frontend/app/model/network/network.service.ts similarity index 100% rename from frontend/app/model/network/network.service.ts rename to src/frontend/app/model/network/network.service.ts diff --git a/frontend/app/model/network/user.service.spec.ts b/src/frontend/app/model/network/user.service.spec.ts similarity index 100% rename from frontend/app/model/network/user.service.spec.ts rename to src/frontend/app/model/network/user.service.spec.ts diff --git a/frontend/app/model/network/user.service.ts b/src/frontend/app/model/network/user.service.ts similarity index 100% rename from frontend/app/model/network/user.service.ts rename to src/frontend/app/model/network/user.service.ts diff --git a/frontend/app/model/notification.service.ts b/src/frontend/app/model/notification.service.ts similarity index 100% rename from frontend/app/model/notification.service.ts rename to src/frontend/app/model/notification.service.ts diff --git a/frontend/app/model/page.helper.ts b/src/frontend/app/model/page.helper.ts similarity index 100% rename from frontend/app/model/page.helper.ts rename to src/frontend/app/model/page.helper.ts diff --git a/frontend/app/model/query.service.ts b/src/frontend/app/model/query.service.ts similarity index 100% rename from frontend/app/model/query.service.ts rename to src/frontend/app/model/query.service.ts diff --git a/frontend/app/model/seededRandom.service.ts b/src/frontend/app/model/seededRandom.service.ts similarity index 100% rename from frontend/app/model/seededRandom.service.ts rename to src/frontend/app/model/seededRandom.service.ts diff --git a/frontend/app/model/version.service.ts b/src/frontend/app/model/version.service.ts similarity index 100% rename from frontend/app/model/version.service.ts rename to src/frontend/app/model/version.service.ts diff --git a/frontend/app/pipes/DurationPipe.ts b/src/frontend/app/pipes/DurationPipe.ts similarity index 100% rename from frontend/app/pipes/DurationPipe.ts rename to src/frontend/app/pipes/DurationPipe.ts diff --git a/frontend/app/pipes/FileSizePipe.ts b/src/frontend/app/pipes/FileSizePipe.ts similarity index 100% rename from frontend/app/pipes/FileSizePipe.ts rename to src/frontend/app/pipes/FileSizePipe.ts diff --git a/frontend/app/pipes/FixOrientationPipe.ts b/src/frontend/app/pipes/FixOrientationPipe.ts similarity index 100% rename from frontend/app/pipes/FixOrientationPipe.ts rename to src/frontend/app/pipes/FixOrientationPipe.ts diff --git a/frontend/app/pipes/IconizeSortingMethod.ts b/src/frontend/app/pipes/IconizeSortingMethod.ts similarity index 100% rename from frontend/app/pipes/IconizeSortingMethod.ts rename to src/frontend/app/pipes/IconizeSortingMethod.ts diff --git a/frontend/app/pipes/StringifyRolePipe.ts b/src/frontend/app/pipes/StringifyRolePipe.ts similarity index 100% rename from frontend/app/pipes/StringifyRolePipe.ts rename to src/frontend/app/pipes/StringifyRolePipe.ts diff --git a/frontend/app/pipes/StringifySortingMethod.ts b/src/frontend/app/pipes/StringifySortingMethod.ts similarity index 100% rename from frontend/app/pipes/StringifySortingMethod.ts rename to src/frontend/app/pipes/StringifySortingMethod.ts diff --git a/frontend/app/ui/admin/admin.component.css b/src/frontend/app/ui/admin/admin.component.css similarity index 100% rename from frontend/app/ui/admin/admin.component.css rename to src/frontend/app/ui/admin/admin.component.css diff --git a/frontend/app/ui/admin/admin.component.html b/src/frontend/app/ui/admin/admin.component.html similarity index 100% rename from frontend/app/ui/admin/admin.component.html rename to src/frontend/app/ui/admin/admin.component.html diff --git a/frontend/app/ui/admin/admin.component.ts b/src/frontend/app/ui/admin/admin.component.ts similarity index 100% rename from frontend/app/ui/admin/admin.component.ts rename to src/frontend/app/ui/admin/admin.component.ts diff --git a/frontend/app/ui/duplicates/duplicates.component.css b/src/frontend/app/ui/duplicates/duplicates.component.css similarity index 100% rename from frontend/app/ui/duplicates/duplicates.component.css rename to src/frontend/app/ui/duplicates/duplicates.component.css diff --git a/frontend/app/ui/duplicates/duplicates.component.html b/src/frontend/app/ui/duplicates/duplicates.component.html similarity index 100% rename from frontend/app/ui/duplicates/duplicates.component.html rename to src/frontend/app/ui/duplicates/duplicates.component.html diff --git a/frontend/app/ui/duplicates/duplicates.component.ts b/src/frontend/app/ui/duplicates/duplicates.component.ts similarity index 100% rename from frontend/app/ui/duplicates/duplicates.component.ts rename to src/frontend/app/ui/duplicates/duplicates.component.ts diff --git a/frontend/app/ui/duplicates/duplicates.service.ts b/src/frontend/app/ui/duplicates/duplicates.service.ts similarity index 100% rename from frontend/app/ui/duplicates/duplicates.service.ts rename to src/frontend/app/ui/duplicates/duplicates.service.ts diff --git a/frontend/app/ui/duplicates/photo/photo.duplicates.component.css b/src/frontend/app/ui/duplicates/photo/photo.duplicates.component.css similarity index 100% rename from frontend/app/ui/duplicates/photo/photo.duplicates.component.css rename to src/frontend/app/ui/duplicates/photo/photo.duplicates.component.css diff --git a/frontend/app/ui/duplicates/photo/photo.duplicates.component.html b/src/frontend/app/ui/duplicates/photo/photo.duplicates.component.html similarity index 100% rename from frontend/app/ui/duplicates/photo/photo.duplicates.component.html rename to src/frontend/app/ui/duplicates/photo/photo.duplicates.component.html diff --git a/frontend/app/ui/duplicates/photo/photo.duplicates.component.ts b/src/frontend/app/ui/duplicates/photo/photo.duplicates.component.ts similarity index 100% rename from frontend/app/ui/duplicates/photo/photo.duplicates.component.ts rename to src/frontend/app/ui/duplicates/photo/photo.duplicates.component.ts diff --git a/frontend/app/ui/faces/face/face.component.css b/src/frontend/app/ui/faces/face/face.component.css similarity index 100% rename from frontend/app/ui/faces/face/face.component.css rename to src/frontend/app/ui/faces/face/face.component.css diff --git a/frontend/app/ui/faces/face/face.component.html b/src/frontend/app/ui/faces/face/face.component.html similarity index 100% rename from frontend/app/ui/faces/face/face.component.html rename to src/frontend/app/ui/faces/face/face.component.html diff --git a/frontend/app/ui/faces/face/face.component.ts b/src/frontend/app/ui/faces/face/face.component.ts similarity index 100% rename from frontend/app/ui/faces/face/face.component.ts rename to src/frontend/app/ui/faces/face/face.component.ts diff --git a/frontend/app/ui/faces/faces.component.css b/src/frontend/app/ui/faces/faces.component.css similarity index 100% rename from frontend/app/ui/faces/faces.component.css rename to src/frontend/app/ui/faces/faces.component.css diff --git a/frontend/app/ui/faces/faces.component.html b/src/frontend/app/ui/faces/faces.component.html similarity index 100% rename from frontend/app/ui/faces/faces.component.html rename to src/frontend/app/ui/faces/faces.component.html diff --git a/frontend/app/ui/faces/faces.component.ts b/src/frontend/app/ui/faces/faces.component.ts similarity index 100% rename from frontend/app/ui/faces/faces.component.ts rename to src/frontend/app/ui/faces/faces.component.ts diff --git a/frontend/app/ui/faces/faces.service.ts b/src/frontend/app/ui/faces/faces.service.ts similarity index 100% rename from frontend/app/ui/faces/faces.service.ts rename to src/frontend/app/ui/faces/faces.service.ts diff --git a/frontend/app/ui/frame/frame.component.css b/src/frontend/app/ui/frame/frame.component.css similarity index 100% rename from frontend/app/ui/frame/frame.component.css rename to src/frontend/app/ui/frame/frame.component.css diff --git a/frontend/app/ui/frame/frame.component.html b/src/frontend/app/ui/frame/frame.component.html similarity index 100% rename from frontend/app/ui/frame/frame.component.html rename to src/frontend/app/ui/frame/frame.component.html diff --git a/frontend/app/ui/frame/frame.component.ts b/src/frontend/app/ui/frame/frame.component.ts similarity index 100% rename from frontend/app/ui/frame/frame.component.ts rename to src/frontend/app/ui/frame/frame.component.ts diff --git a/frontend/app/ui/gallery/Media.ts b/src/frontend/app/ui/gallery/Media.ts similarity index 100% rename from frontend/app/ui/gallery/Media.ts rename to src/frontend/app/ui/gallery/Media.ts diff --git a/frontend/app/ui/gallery/MediaIcon.ts b/src/frontend/app/ui/gallery/MediaIcon.ts similarity index 100% rename from frontend/app/ui/gallery/MediaIcon.ts rename to src/frontend/app/ui/gallery/MediaIcon.ts diff --git a/frontend/app/ui/gallery/cache.gallery.service.ts b/src/frontend/app/ui/gallery/cache.gallery.service.ts similarity index 100% rename from frontend/app/ui/gallery/cache.gallery.service.ts rename to src/frontend/app/ui/gallery/cache.gallery.service.ts diff --git a/frontend/app/ui/gallery/directories/directories.component.css b/src/frontend/app/ui/gallery/directories/directories.component.css similarity index 100% rename from frontend/app/ui/gallery/directories/directories.component.css rename to src/frontend/app/ui/gallery/directories/directories.component.css diff --git a/frontend/app/ui/gallery/directories/directories.component.html b/src/frontend/app/ui/gallery/directories/directories.component.html similarity index 100% rename from frontend/app/ui/gallery/directories/directories.component.html rename to src/frontend/app/ui/gallery/directories/directories.component.html diff --git a/frontend/app/ui/gallery/directories/directories.component.ts b/src/frontend/app/ui/gallery/directories/directories.component.ts similarity index 100% rename from frontend/app/ui/gallery/directories/directories.component.ts rename to src/frontend/app/ui/gallery/directories/directories.component.ts diff --git a/frontend/app/ui/gallery/directories/directory/directory.gallery.component.css b/src/frontend/app/ui/gallery/directories/directory/directory.gallery.component.css similarity index 100% rename from frontend/app/ui/gallery/directories/directory/directory.gallery.component.css rename to src/frontend/app/ui/gallery/directories/directory/directory.gallery.component.css diff --git a/frontend/app/ui/gallery/directories/directory/directory.gallery.component.html b/src/frontend/app/ui/gallery/directories/directory/directory.gallery.component.html similarity index 100% rename from frontend/app/ui/gallery/directories/directory/directory.gallery.component.html rename to src/frontend/app/ui/gallery/directories/directory/directory.gallery.component.html diff --git a/frontend/app/ui/gallery/directories/directory/directory.gallery.component.ts b/src/frontend/app/ui/gallery/directories/directory/directory.gallery.component.ts similarity index 100% rename from frontend/app/ui/gallery/directories/directory/directory.gallery.component.ts rename to src/frontend/app/ui/gallery/directories/directory/directory.gallery.component.ts diff --git a/frontend/app/ui/gallery/fullscreen.service.ts b/src/frontend/app/ui/gallery/fullscreen.service.ts similarity index 100% rename from frontend/app/ui/gallery/fullscreen.service.ts rename to src/frontend/app/ui/gallery/fullscreen.service.ts diff --git a/frontend/app/ui/gallery/gallery.component.css b/src/frontend/app/ui/gallery/gallery.component.css similarity index 100% rename from frontend/app/ui/gallery/gallery.component.css rename to src/frontend/app/ui/gallery/gallery.component.css diff --git a/frontend/app/ui/gallery/gallery.component.html b/src/frontend/app/ui/gallery/gallery.component.html similarity index 100% rename from frontend/app/ui/gallery/gallery.component.html rename to src/frontend/app/ui/gallery/gallery.component.html diff --git a/frontend/app/ui/gallery/gallery.component.ts b/src/frontend/app/ui/gallery/gallery.component.ts similarity index 100% rename from frontend/app/ui/gallery/gallery.component.ts rename to src/frontend/app/ui/gallery/gallery.component.ts diff --git a/frontend/app/ui/gallery/gallery.service.ts b/src/frontend/app/ui/gallery/gallery.service.ts similarity index 100% rename from frontend/app/ui/gallery/gallery.service.ts rename to src/frontend/app/ui/gallery/gallery.service.ts diff --git a/frontend/app/ui/gallery/grid/GridMedia.ts b/src/frontend/app/ui/gallery/grid/GridMedia.ts similarity index 100% rename from frontend/app/ui/gallery/grid/GridMedia.ts rename to src/frontend/app/ui/gallery/grid/GridMedia.ts diff --git a/frontend/app/ui/gallery/grid/GridRowBuilder.ts b/src/frontend/app/ui/gallery/grid/GridRowBuilder.ts similarity index 100% rename from frontend/app/ui/gallery/grid/GridRowBuilder.ts rename to src/frontend/app/ui/gallery/grid/GridRowBuilder.ts diff --git a/frontend/app/ui/gallery/grid/grid.gallery.component.css b/src/frontend/app/ui/gallery/grid/grid.gallery.component.css similarity index 100% rename from frontend/app/ui/gallery/grid/grid.gallery.component.css rename to src/frontend/app/ui/gallery/grid/grid.gallery.component.css diff --git a/frontend/app/ui/gallery/grid/grid.gallery.component.html b/src/frontend/app/ui/gallery/grid/grid.gallery.component.html similarity index 100% rename from frontend/app/ui/gallery/grid/grid.gallery.component.html rename to src/frontend/app/ui/gallery/grid/grid.gallery.component.html diff --git a/frontend/app/ui/gallery/grid/grid.gallery.component.ts b/src/frontend/app/ui/gallery/grid/grid.gallery.component.ts similarity index 100% rename from frontend/app/ui/gallery/grid/grid.gallery.component.ts rename to src/frontend/app/ui/gallery/grid/grid.gallery.component.ts diff --git a/frontend/app/ui/gallery/grid/photo/loading/loading.photo.grid.gallery.component.css b/src/frontend/app/ui/gallery/grid/photo/loading/loading.photo.grid.gallery.component.css similarity index 100% rename from frontend/app/ui/gallery/grid/photo/loading/loading.photo.grid.gallery.component.css rename to src/frontend/app/ui/gallery/grid/photo/loading/loading.photo.grid.gallery.component.css diff --git a/frontend/app/ui/gallery/grid/photo/loading/loading.photo.grid.gallery.component.html b/src/frontend/app/ui/gallery/grid/photo/loading/loading.photo.grid.gallery.component.html similarity index 100% rename from frontend/app/ui/gallery/grid/photo/loading/loading.photo.grid.gallery.component.html rename to src/frontend/app/ui/gallery/grid/photo/loading/loading.photo.grid.gallery.component.html diff --git a/frontend/app/ui/gallery/grid/photo/loading/loading.photo.grid.gallery.component.ts b/src/frontend/app/ui/gallery/grid/photo/loading/loading.photo.grid.gallery.component.ts similarity index 100% rename from frontend/app/ui/gallery/grid/photo/loading/loading.photo.grid.gallery.component.ts rename to src/frontend/app/ui/gallery/grid/photo/loading/loading.photo.grid.gallery.component.ts diff --git a/frontend/app/ui/gallery/grid/photo/photo.grid.gallery.component.css b/src/frontend/app/ui/gallery/grid/photo/photo.grid.gallery.component.css similarity index 100% rename from frontend/app/ui/gallery/grid/photo/photo.grid.gallery.component.css rename to src/frontend/app/ui/gallery/grid/photo/photo.grid.gallery.component.css diff --git a/frontend/app/ui/gallery/grid/photo/photo.grid.gallery.component.html b/src/frontend/app/ui/gallery/grid/photo/photo.grid.gallery.component.html similarity index 100% rename from frontend/app/ui/gallery/grid/photo/photo.grid.gallery.component.html rename to src/frontend/app/ui/gallery/grid/photo/photo.grid.gallery.component.html diff --git a/frontend/app/ui/gallery/grid/photo/photo.grid.gallery.component.ts b/src/frontend/app/ui/gallery/grid/photo/photo.grid.gallery.component.ts similarity index 100% rename from frontend/app/ui/gallery/grid/photo/photo.grid.gallery.component.ts rename to src/frontend/app/ui/gallery/grid/photo/photo.grid.gallery.component.ts diff --git a/frontend/app/ui/gallery/lightbox/controls/controls.lightbox.gallery.component.css b/src/frontend/app/ui/gallery/lightbox/controls/controls.lightbox.gallery.component.css similarity index 100% rename from frontend/app/ui/gallery/lightbox/controls/controls.lightbox.gallery.component.css rename to src/frontend/app/ui/gallery/lightbox/controls/controls.lightbox.gallery.component.css diff --git a/frontend/app/ui/gallery/lightbox/controls/controls.lightbox.gallery.component.html b/src/frontend/app/ui/gallery/lightbox/controls/controls.lightbox.gallery.component.html similarity index 100% rename from frontend/app/ui/gallery/lightbox/controls/controls.lightbox.gallery.component.html rename to src/frontend/app/ui/gallery/lightbox/controls/controls.lightbox.gallery.component.html diff --git a/frontend/app/ui/gallery/lightbox/controls/controls.lightbox.gallery.component.ts b/src/frontend/app/ui/gallery/lightbox/controls/controls.lightbox.gallery.component.ts similarity index 100% rename from frontend/app/ui/gallery/lightbox/controls/controls.lightbox.gallery.component.ts rename to src/frontend/app/ui/gallery/lightbox/controls/controls.lightbox.gallery.component.ts diff --git a/frontend/app/ui/gallery/lightbox/controls/inputrange.css b/src/frontend/app/ui/gallery/lightbox/controls/inputrange.css similarity index 100% rename from frontend/app/ui/gallery/lightbox/controls/inputrange.css rename to src/frontend/app/ui/gallery/lightbox/controls/inputrange.css diff --git a/frontend/app/ui/gallery/lightbox/infopanel/info-panel.lightbox.gallery.component.css b/src/frontend/app/ui/gallery/lightbox/infopanel/info-panel.lightbox.gallery.component.css similarity index 100% rename from frontend/app/ui/gallery/lightbox/infopanel/info-panel.lightbox.gallery.component.css rename to src/frontend/app/ui/gallery/lightbox/infopanel/info-panel.lightbox.gallery.component.css diff --git a/frontend/app/ui/gallery/lightbox/infopanel/info-panel.lightbox.gallery.component.html b/src/frontend/app/ui/gallery/lightbox/infopanel/info-panel.lightbox.gallery.component.html similarity index 100% rename from frontend/app/ui/gallery/lightbox/infopanel/info-panel.lightbox.gallery.component.html rename to src/frontend/app/ui/gallery/lightbox/infopanel/info-panel.lightbox.gallery.component.html diff --git a/frontend/app/ui/gallery/lightbox/infopanel/info-panel.lightbox.gallery.component.ts b/src/frontend/app/ui/gallery/lightbox/infopanel/info-panel.lightbox.gallery.component.ts similarity index 100% rename from frontend/app/ui/gallery/lightbox/infopanel/info-panel.lightbox.gallery.component.ts rename to src/frontend/app/ui/gallery/lightbox/infopanel/info-panel.lightbox.gallery.component.ts diff --git a/frontend/app/ui/gallery/lightbox/lightbox.gallery.component.css b/src/frontend/app/ui/gallery/lightbox/lightbox.gallery.component.css similarity index 100% rename from frontend/app/ui/gallery/lightbox/lightbox.gallery.component.css rename to src/frontend/app/ui/gallery/lightbox/lightbox.gallery.component.css diff --git a/frontend/app/ui/gallery/lightbox/lightbox.gallery.component.html b/src/frontend/app/ui/gallery/lightbox/lightbox.gallery.component.html similarity index 100% rename from frontend/app/ui/gallery/lightbox/lightbox.gallery.component.html rename to src/frontend/app/ui/gallery/lightbox/lightbox.gallery.component.html diff --git a/frontend/app/ui/gallery/lightbox/lightbox.gallery.component.ts b/src/frontend/app/ui/gallery/lightbox/lightbox.gallery.component.ts similarity index 100% rename from frontend/app/ui/gallery/lightbox/lightbox.gallery.component.ts rename to src/frontend/app/ui/gallery/lightbox/lightbox.gallery.component.ts diff --git a/frontend/app/ui/gallery/lightbox/media/media.lightbox.gallery.component.css b/src/frontend/app/ui/gallery/lightbox/media/media.lightbox.gallery.component.css similarity index 100% rename from frontend/app/ui/gallery/lightbox/media/media.lightbox.gallery.component.css rename to src/frontend/app/ui/gallery/lightbox/media/media.lightbox.gallery.component.css diff --git a/frontend/app/ui/gallery/lightbox/media/media.lightbox.gallery.component.html b/src/frontend/app/ui/gallery/lightbox/media/media.lightbox.gallery.component.html similarity index 100% rename from frontend/app/ui/gallery/lightbox/media/media.lightbox.gallery.component.html rename to src/frontend/app/ui/gallery/lightbox/media/media.lightbox.gallery.component.html diff --git a/frontend/app/ui/gallery/lightbox/media/media.lightbox.gallery.component.ts b/src/frontend/app/ui/gallery/lightbox/media/media.lightbox.gallery.component.ts similarity index 100% rename from frontend/app/ui/gallery/lightbox/media/media.lightbox.gallery.component.ts rename to src/frontend/app/ui/gallery/lightbox/media/media.lightbox.gallery.component.ts diff --git a/frontend/app/ui/gallery/map/lightbox/lightbox.map.gallery.component.css b/src/frontend/app/ui/gallery/map/lightbox/lightbox.map.gallery.component.css similarity index 100% rename from frontend/app/ui/gallery/map/lightbox/lightbox.map.gallery.component.css rename to src/frontend/app/ui/gallery/map/lightbox/lightbox.map.gallery.component.css diff --git a/frontend/app/ui/gallery/map/lightbox/lightbox.map.gallery.component.html b/src/frontend/app/ui/gallery/map/lightbox/lightbox.map.gallery.component.html similarity index 100% rename from frontend/app/ui/gallery/map/lightbox/lightbox.map.gallery.component.html rename to src/frontend/app/ui/gallery/map/lightbox/lightbox.map.gallery.component.html diff --git a/frontend/app/ui/gallery/map/lightbox/lightbox.map.gallery.component.ts b/src/frontend/app/ui/gallery/map/lightbox/lightbox.map.gallery.component.ts similarity index 100% rename from frontend/app/ui/gallery/map/lightbox/lightbox.map.gallery.component.ts rename to src/frontend/app/ui/gallery/map/lightbox/lightbox.map.gallery.component.ts diff --git a/frontend/app/ui/gallery/map/map.gallery.component.css b/src/frontend/app/ui/gallery/map/map.gallery.component.css similarity index 100% rename from frontend/app/ui/gallery/map/map.gallery.component.css rename to src/frontend/app/ui/gallery/map/map.gallery.component.css diff --git a/frontend/app/ui/gallery/map/map.gallery.component.html b/src/frontend/app/ui/gallery/map/map.gallery.component.html similarity index 100% rename from frontend/app/ui/gallery/map/map.gallery.component.html rename to src/frontend/app/ui/gallery/map/map.gallery.component.html diff --git a/frontend/app/ui/gallery/map/map.gallery.component.ts b/src/frontend/app/ui/gallery/map/map.gallery.component.ts similarity index 100% rename from frontend/app/ui/gallery/map/map.gallery.component.ts rename to src/frontend/app/ui/gallery/map/map.gallery.component.ts diff --git a/frontend/app/ui/gallery/map/map.service.ts b/src/frontend/app/ui/gallery/map/map.service.ts similarity index 100% rename from frontend/app/ui/gallery/map/map.service.ts rename to src/frontend/app/ui/gallery/map/map.service.ts diff --git a/frontend/app/ui/gallery/navigator/navigator.gallery.component.css b/src/frontend/app/ui/gallery/navigator/navigator.gallery.component.css similarity index 100% rename from frontend/app/ui/gallery/navigator/navigator.gallery.component.css rename to src/frontend/app/ui/gallery/navigator/navigator.gallery.component.css diff --git a/frontend/app/ui/gallery/navigator/navigator.gallery.component.html b/src/frontend/app/ui/gallery/navigator/navigator.gallery.component.html similarity index 100% rename from frontend/app/ui/gallery/navigator/navigator.gallery.component.html rename to src/frontend/app/ui/gallery/navigator/navigator.gallery.component.html diff --git a/frontend/app/ui/gallery/navigator/navigator.gallery.component.ts b/src/frontend/app/ui/gallery/navigator/navigator.gallery.component.ts similarity index 100% rename from frontend/app/ui/gallery/navigator/navigator.gallery.component.ts rename to src/frontend/app/ui/gallery/navigator/navigator.gallery.component.ts diff --git a/frontend/app/ui/gallery/overlay.service.ts b/src/frontend/app/ui/gallery/overlay.service.ts similarity index 100% rename from frontend/app/ui/gallery/overlay.service.ts rename to src/frontend/app/ui/gallery/overlay.service.ts diff --git a/frontend/app/ui/gallery/random-query-builder/random-query-builder.gallery.component.css b/src/frontend/app/ui/gallery/random-query-builder/random-query-builder.gallery.component.css similarity index 100% rename from frontend/app/ui/gallery/random-query-builder/random-query-builder.gallery.component.css rename to src/frontend/app/ui/gallery/random-query-builder/random-query-builder.gallery.component.css diff --git a/frontend/app/ui/gallery/random-query-builder/random-query-builder.gallery.component.html b/src/frontend/app/ui/gallery/random-query-builder/random-query-builder.gallery.component.html similarity index 100% rename from frontend/app/ui/gallery/random-query-builder/random-query-builder.gallery.component.html rename to src/frontend/app/ui/gallery/random-query-builder/random-query-builder.gallery.component.html diff --git a/frontend/app/ui/gallery/random-query-builder/random-query-builder.gallery.component.ts b/src/frontend/app/ui/gallery/random-query-builder/random-query-builder.gallery.component.ts similarity index 100% rename from frontend/app/ui/gallery/random-query-builder/random-query-builder.gallery.component.ts rename to src/frontend/app/ui/gallery/random-query-builder/random-query-builder.gallery.component.ts diff --git a/frontend/app/ui/gallery/search/autocomplete.service.ts b/src/frontend/app/ui/gallery/search/autocomplete.service.ts similarity index 100% rename from frontend/app/ui/gallery/search/autocomplete.service.ts rename to src/frontend/app/ui/gallery/search/autocomplete.service.ts diff --git a/frontend/app/ui/gallery/search/search.gallery.component.css b/src/frontend/app/ui/gallery/search/search.gallery.component.css similarity index 100% rename from frontend/app/ui/gallery/search/search.gallery.component.css rename to src/frontend/app/ui/gallery/search/search.gallery.component.css diff --git a/frontend/app/ui/gallery/search/search.gallery.component.html b/src/frontend/app/ui/gallery/search/search.gallery.component.html similarity index 100% rename from frontend/app/ui/gallery/search/search.gallery.component.html rename to src/frontend/app/ui/gallery/search/search.gallery.component.html diff --git a/frontend/app/ui/gallery/search/search.gallery.component.ts b/src/frontend/app/ui/gallery/search/search.gallery.component.ts similarity index 100% rename from frontend/app/ui/gallery/search/search.gallery.component.ts rename to src/frontend/app/ui/gallery/search/search.gallery.component.ts diff --git a/frontend/app/ui/gallery/share.service.ts b/src/frontend/app/ui/gallery/share.service.ts similarity index 100% rename from frontend/app/ui/gallery/share.service.ts rename to src/frontend/app/ui/gallery/share.service.ts diff --git a/frontend/app/ui/gallery/share/share.gallery.component.css b/src/frontend/app/ui/gallery/share/share.gallery.component.css similarity index 100% rename from frontend/app/ui/gallery/share/share.gallery.component.css rename to src/frontend/app/ui/gallery/share/share.gallery.component.css diff --git a/frontend/app/ui/gallery/share/share.gallery.component.html b/src/frontend/app/ui/gallery/share/share.gallery.component.html similarity index 100% rename from frontend/app/ui/gallery/share/share.gallery.component.html rename to src/frontend/app/ui/gallery/share/share.gallery.component.html diff --git a/frontend/app/ui/gallery/share/share.gallery.component.ts b/src/frontend/app/ui/gallery/share/share.gallery.component.ts similarity index 100% rename from frontend/app/ui/gallery/share/share.gallery.component.ts rename to src/frontend/app/ui/gallery/share/share.gallery.component.ts diff --git a/frontend/app/ui/gallery/thumbnailLoader.service.ts b/src/frontend/app/ui/gallery/thumbnailLoader.service.ts similarity index 100% rename from frontend/app/ui/gallery/thumbnailLoader.service.ts rename to src/frontend/app/ui/gallery/thumbnailLoader.service.ts diff --git a/frontend/app/ui/gallery/thumbnailManager.service.ts b/src/frontend/app/ui/gallery/thumbnailManager.service.ts similarity index 100% rename from frontend/app/ui/gallery/thumbnailManager.service.ts rename to src/frontend/app/ui/gallery/thumbnailManager.service.ts diff --git a/frontend/app/ui/language/language.component.css b/src/frontend/app/ui/language/language.component.css similarity index 100% rename from frontend/app/ui/language/language.component.css rename to src/frontend/app/ui/language/language.component.css diff --git a/frontend/app/ui/language/language.component.html b/src/frontend/app/ui/language/language.component.html similarity index 100% rename from frontend/app/ui/language/language.component.html rename to src/frontend/app/ui/language/language.component.html diff --git a/frontend/app/ui/language/language.component.ts b/src/frontend/app/ui/language/language.component.ts similarity index 100% rename from frontend/app/ui/language/language.component.ts rename to src/frontend/app/ui/language/language.component.ts diff --git a/frontend/app/ui/login/login.component.css b/src/frontend/app/ui/login/login.component.css similarity index 100% rename from frontend/app/ui/login/login.component.css rename to src/frontend/app/ui/login/login.component.css diff --git a/frontend/app/ui/login/login.component.html b/src/frontend/app/ui/login/login.component.html similarity index 100% rename from frontend/app/ui/login/login.component.html rename to src/frontend/app/ui/login/login.component.html diff --git a/frontend/app/ui/login/login.component.ts b/src/frontend/app/ui/login/login.component.ts similarity index 100% rename from frontend/app/ui/login/login.component.ts rename to src/frontend/app/ui/login/login.component.ts diff --git a/frontend/app/ui/settings/_abstract/abstract.settings.component.css b/src/frontend/app/ui/settings/_abstract/abstract.settings.component.css similarity index 100% rename from frontend/app/ui/settings/_abstract/abstract.settings.component.css rename to src/frontend/app/ui/settings/_abstract/abstract.settings.component.css diff --git a/frontend/app/ui/settings/_abstract/abstract.settings.component.ts b/src/frontend/app/ui/settings/_abstract/abstract.settings.component.ts similarity index 100% rename from frontend/app/ui/settings/_abstract/abstract.settings.component.ts rename to src/frontend/app/ui/settings/_abstract/abstract.settings.component.ts diff --git a/frontend/app/ui/settings/_abstract/abstract.settings.service.ts b/src/frontend/app/ui/settings/_abstract/abstract.settings.service.ts similarity index 100% rename from frontend/app/ui/settings/_abstract/abstract.settings.service.ts rename to src/frontend/app/ui/settings/_abstract/abstract.settings.service.ts diff --git a/frontend/app/ui/settings/basic/basic.settings.component.css b/src/frontend/app/ui/settings/basic/basic.settings.component.css similarity index 100% rename from frontend/app/ui/settings/basic/basic.settings.component.css rename to src/frontend/app/ui/settings/basic/basic.settings.component.css diff --git a/frontend/app/ui/settings/basic/basic.settings.component.html b/src/frontend/app/ui/settings/basic/basic.settings.component.html similarity index 100% rename from frontend/app/ui/settings/basic/basic.settings.component.html rename to src/frontend/app/ui/settings/basic/basic.settings.component.html diff --git a/frontend/app/ui/settings/basic/basic.settings.component.ts b/src/frontend/app/ui/settings/basic/basic.settings.component.ts similarity index 97% rename from frontend/app/ui/settings/basic/basic.settings.component.ts rename to src/frontend/app/ui/settings/basic/basic.settings.component.ts index 58b96214..8b390b2d 100644 --- a/frontend/app/ui/settings/basic/basic.settings.component.ts +++ b/src/frontend/app/ui/settings/basic/basic.settings.component.ts @@ -11,7 +11,7 @@ import {I18n} from '@ngx-translate/i18n-polyfill'; selector: 'app-settings-basic', templateUrl: './basic.settings.component.html', styleUrls: ['./basic.settings.component.css', - './../_abstract/abstract.settings.component.css'], + '../_abstract/abstract.settings.component.css'], providers: [BasicSettingsService], }) export class BasicSettingsComponent extends SettingsComponent { diff --git a/frontend/app/ui/settings/basic/basic.settings.service.ts b/src/frontend/app/ui/settings/basic/basic.settings.service.ts similarity index 100% rename from frontend/app/ui/settings/basic/basic.settings.service.ts rename to src/frontend/app/ui/settings/basic/basic.settings.service.ts diff --git a/frontend/app/ui/settings/database/database.settings.component.css b/src/frontend/app/ui/settings/database/database.settings.component.css similarity index 100% rename from frontend/app/ui/settings/database/database.settings.component.css rename to src/frontend/app/ui/settings/database/database.settings.component.css diff --git a/frontend/app/ui/settings/database/database.settings.component.html b/src/frontend/app/ui/settings/database/database.settings.component.html similarity index 100% rename from frontend/app/ui/settings/database/database.settings.component.html rename to src/frontend/app/ui/settings/database/database.settings.component.html diff --git a/frontend/app/ui/settings/database/database.settings.component.ts b/src/frontend/app/ui/settings/database/database.settings.component.ts similarity index 96% rename from frontend/app/ui/settings/database/database.settings.component.ts rename to src/frontend/app/ui/settings/database/database.settings.component.ts index 20a089be..72568fdd 100644 --- a/frontend/app/ui/settings/database/database.settings.component.ts +++ b/src/frontend/app/ui/settings/database/database.settings.component.ts @@ -12,7 +12,7 @@ import {ServerConfig} from '../../../../../common/config/private/IPrivateConfig' selector: 'app-settings-database', templateUrl: './database.settings.component.html', styleUrls: ['./database.settings.component.css', - './../_abstract/abstract.settings.component.css'], + '../_abstract/abstract.settings.component.css'], providers: [DatabaseSettingsService], }) export class DatabaseSettingsComponent extends SettingsComponent implements OnInit { diff --git a/frontend/app/ui/settings/database/database.settings.service.ts b/src/frontend/app/ui/settings/database/database.settings.service.ts similarity index 100% rename from frontend/app/ui/settings/database/database.settings.service.ts rename to src/frontend/app/ui/settings/database/database.settings.service.ts diff --git a/frontend/app/ui/settings/faces/faces.settings.component.css b/src/frontend/app/ui/settings/faces/faces.settings.component.css similarity index 100% rename from frontend/app/ui/settings/faces/faces.settings.component.css rename to src/frontend/app/ui/settings/faces/faces.settings.component.css diff --git a/frontend/app/ui/settings/faces/faces.settings.component.html b/src/frontend/app/ui/settings/faces/faces.settings.component.html similarity index 100% rename from frontend/app/ui/settings/faces/faces.settings.component.html rename to src/frontend/app/ui/settings/faces/faces.settings.component.html diff --git a/frontend/app/ui/settings/faces/faces.settings.component.ts b/src/frontend/app/ui/settings/faces/faces.settings.component.ts similarity index 96% rename from frontend/app/ui/settings/faces/faces.settings.component.ts rename to src/frontend/app/ui/settings/faces/faces.settings.component.ts index 30c09968..a407017c 100644 --- a/frontend/app/ui/settings/faces/faces.settings.component.ts +++ b/src/frontend/app/ui/settings/faces/faces.settings.component.ts @@ -13,7 +13,7 @@ import {UserRoles} from '../../../../../common/entities/UserDTO'; selector: 'app-settings-faces', templateUrl: './faces.settings.component.html', styleUrls: ['./faces.settings.component.css', - './../_abstract/abstract.settings.component.css'], + '../_abstract/abstract.settings.component.css'], providers: [FacesSettingsService], }) export class FacesSettingsComponent extends SettingsComponent { diff --git a/frontend/app/ui/settings/faces/faces.settings.service.ts b/src/frontend/app/ui/settings/faces/faces.settings.service.ts similarity index 100% rename from frontend/app/ui/settings/faces/faces.settings.service.ts rename to src/frontend/app/ui/settings/faces/faces.settings.service.ts diff --git a/frontend/app/ui/settings/indexing/indexing.settings.component.css b/src/frontend/app/ui/settings/indexing/indexing.settings.component.css similarity index 100% rename from frontend/app/ui/settings/indexing/indexing.settings.component.css rename to src/frontend/app/ui/settings/indexing/indexing.settings.component.css diff --git a/frontend/app/ui/settings/indexing/indexing.settings.component.html b/src/frontend/app/ui/settings/indexing/indexing.settings.component.html similarity index 100% rename from frontend/app/ui/settings/indexing/indexing.settings.component.html rename to src/frontend/app/ui/settings/indexing/indexing.settings.component.html diff --git a/frontend/app/ui/settings/indexing/indexing.settings.component.ts b/src/frontend/app/ui/settings/indexing/indexing.settings.component.ts similarity index 98% rename from frontend/app/ui/settings/indexing/indexing.settings.component.ts rename to src/frontend/app/ui/settings/indexing/indexing.settings.component.ts index 0f646207..24416cb0 100644 --- a/frontend/app/ui/settings/indexing/indexing.settings.component.ts +++ b/src/frontend/app/ui/settings/indexing/indexing.settings.component.ts @@ -15,7 +15,7 @@ import {ServerConfig} from '../../../../../common/config/private/IPrivateConfig' selector: 'app-settings-indexing', templateUrl: './indexing.settings.component.html', styleUrls: ['./indexing.settings.component.css', - './../_abstract/abstract.settings.component.css'], + '../_abstract/abstract.settings.component.css'], providers: [IndexingSettingsService], }) export class IndexingSettingsComponent extends SettingsComponent diff --git a/frontend/app/ui/settings/indexing/indexing.settings.service.ts b/src/frontend/app/ui/settings/indexing/indexing.settings.service.ts similarity index 94% rename from frontend/app/ui/settings/indexing/indexing.settings.service.ts rename to src/frontend/app/ui/settings/indexing/indexing.settings.service.ts index 45801ffe..06809f7f 100644 --- a/frontend/app/ui/settings/indexing/indexing.settings.service.ts +++ b/src/frontend/app/ui/settings/indexing/indexing.settings.service.ts @@ -7,6 +7,7 @@ import {StatisticDTO} from '../../../../../common/entities/settings/StatisticDTO import {ScheduledTasksService} from '../scheduled-tasks.service'; import {DefaultsTasks} from '../../../../../common/entities/task/TaskDTO'; import {ServerConfig} from '../../../../../common/config/private/IPrivateConfig'; +import {first} from 'rxjs/operators'; @Injectable() export class IndexingSettingsService extends AbstractSettingsService { @@ -19,10 +20,9 @@ export class IndexingSettingsService extends AbstractSettingsService { + _settingsService.settings.pipe(first()).subscribe(() => { if (this.isSupported()) { this.loadStatistic(); - sub.unsubscribe(); } }); this._tasksService.onTaskFinish.subscribe((taskName: string) => { diff --git a/frontend/app/ui/settings/map/map.settings.component.css b/src/frontend/app/ui/settings/map/map.settings.component.css similarity index 100% rename from frontend/app/ui/settings/map/map.settings.component.css rename to src/frontend/app/ui/settings/map/map.settings.component.css diff --git a/frontend/app/ui/settings/map/map.settings.component.html b/src/frontend/app/ui/settings/map/map.settings.component.html similarity index 100% rename from frontend/app/ui/settings/map/map.settings.component.html rename to src/frontend/app/ui/settings/map/map.settings.component.html diff --git a/frontend/app/ui/settings/map/map.settings.component.ts b/src/frontend/app/ui/settings/map/map.settings.component.ts similarity index 96% rename from frontend/app/ui/settings/map/map.settings.component.ts rename to src/frontend/app/ui/settings/map/map.settings.component.ts index 2864f1e2..97b025bf 100644 --- a/frontend/app/ui/settings/map/map.settings.component.ts +++ b/src/frontend/app/ui/settings/map/map.settings.component.ts @@ -13,7 +13,7 @@ import {Utils} from '../../../../../common/Utils'; selector: 'app-settings-map', templateUrl: './map.settings.component.html', styleUrls: ['./map.settings.component.css', - './../_abstract/abstract.settings.component.css'], + '../_abstract/abstract.settings.component.css'], providers: [MapSettingsService], }) export class MapSettingsComponent extends SettingsComponent { diff --git a/frontend/app/ui/settings/map/map.settings.service.ts b/src/frontend/app/ui/settings/map/map.settings.service.ts similarity index 100% rename from frontend/app/ui/settings/map/map.settings.service.ts rename to src/frontend/app/ui/settings/map/map.settings.service.ts diff --git a/frontend/app/ui/settings/metafiles/metafile.settings.component.css b/src/frontend/app/ui/settings/metafiles/metafile.settings.component.css similarity index 100% rename from frontend/app/ui/settings/metafiles/metafile.settings.component.css rename to src/frontend/app/ui/settings/metafiles/metafile.settings.component.css diff --git a/frontend/app/ui/settings/metafiles/metafile.settings.component.html b/src/frontend/app/ui/settings/metafiles/metafile.settings.component.html similarity index 100% rename from frontend/app/ui/settings/metafiles/metafile.settings.component.html rename to src/frontend/app/ui/settings/metafiles/metafile.settings.component.html diff --git a/frontend/app/ui/settings/metafiles/metafile.settings.component.ts b/src/frontend/app/ui/settings/metafiles/metafile.settings.component.ts similarity index 95% rename from frontend/app/ui/settings/metafiles/metafile.settings.component.ts rename to src/frontend/app/ui/settings/metafiles/metafile.settings.component.ts index 1314af50..eefeeded 100644 --- a/frontend/app/ui/settings/metafiles/metafile.settings.component.ts +++ b/src/frontend/app/ui/settings/metafiles/metafile.settings.component.ts @@ -12,7 +12,7 @@ import {I18n} from '@ngx-translate/i18n-polyfill'; selector: 'app-settings-meta-file', templateUrl: './metafile.settings.component.html', styleUrls: ['./metafile.settings.component.css', - './../_abstract/abstract.settings.component.css'], + '../_abstract/abstract.settings.component.css'], providers: [MetaFileSettingsService], }) export class MetaFileSettingsComponent extends SettingsComponent { diff --git a/frontend/app/ui/settings/metafiles/metafile.settings.service.ts b/src/frontend/app/ui/settings/metafiles/metafile.settings.service.ts similarity index 100% rename from frontend/app/ui/settings/metafiles/metafile.settings.service.ts rename to src/frontend/app/ui/settings/metafiles/metafile.settings.service.ts diff --git a/frontend/app/ui/settings/other/other.settings.component.css b/src/frontend/app/ui/settings/other/other.settings.component.css similarity index 100% rename from frontend/app/ui/settings/other/other.settings.component.css rename to src/frontend/app/ui/settings/other/other.settings.component.css diff --git a/frontend/app/ui/settings/other/other.settings.component.html b/src/frontend/app/ui/settings/other/other.settings.component.html similarity index 100% rename from frontend/app/ui/settings/other/other.settings.component.html rename to src/frontend/app/ui/settings/other/other.settings.component.html diff --git a/frontend/app/ui/settings/other/other.settings.component.ts b/src/frontend/app/ui/settings/other/other.settings.component.ts similarity index 97% rename from frontend/app/ui/settings/other/other.settings.component.ts rename to src/frontend/app/ui/settings/other/other.settings.component.ts index 57e0e99a..661edbfc 100644 --- a/frontend/app/ui/settings/other/other.settings.component.ts +++ b/src/frontend/app/ui/settings/other/other.settings.component.ts @@ -13,7 +13,7 @@ import {SortingMethods} from '../../../../../common/entities/SortingMethods'; selector: 'app-settings-other', templateUrl: './other.settings.component.html', styleUrls: ['./other.settings.component.css', - './../_abstract/abstract.settings.component.css'], + '../_abstract/abstract.settings.component.css'], providers: [OtherSettingsService], }) export class OtherSettingsComponent extends SettingsComponent implements OnChanges { diff --git a/frontend/app/ui/settings/other/other.settings.service.ts b/src/frontend/app/ui/settings/other/other.settings.service.ts similarity index 100% rename from frontend/app/ui/settings/other/other.settings.service.ts rename to src/frontend/app/ui/settings/other/other.settings.service.ts diff --git a/frontend/app/ui/settings/random-photo/random-photo.settings.component.css b/src/frontend/app/ui/settings/random-photo/random-photo.settings.component.css similarity index 100% rename from frontend/app/ui/settings/random-photo/random-photo.settings.component.css rename to src/frontend/app/ui/settings/random-photo/random-photo.settings.component.css diff --git a/frontend/app/ui/settings/random-photo/random-photo.settings.component.html b/src/frontend/app/ui/settings/random-photo/random-photo.settings.component.html similarity index 100% rename from frontend/app/ui/settings/random-photo/random-photo.settings.component.html rename to src/frontend/app/ui/settings/random-photo/random-photo.settings.component.html diff --git a/frontend/app/ui/settings/random-photo/random-photo.settings.component.ts b/src/frontend/app/ui/settings/random-photo/random-photo.settings.component.ts similarity index 95% rename from frontend/app/ui/settings/random-photo/random-photo.settings.component.ts rename to src/frontend/app/ui/settings/random-photo/random-photo.settings.component.ts index f60d0eaa..e9a4cc89 100644 --- a/frontend/app/ui/settings/random-photo/random-photo.settings.component.ts +++ b/src/frontend/app/ui/settings/random-photo/random-photo.settings.component.ts @@ -11,7 +11,7 @@ import {I18n} from '@ngx-translate/i18n-polyfill'; selector: 'app-settings-random-photo', templateUrl: './random-photo.settings.component.html', styleUrls: ['./random-photo.settings.component.css', - './../_abstract/abstract.settings.component.css'], + '../_abstract/abstract.settings.component.css'], providers: [RandomPhotoSettingsService], }) export class RandomPhotoSettingsComponent extends SettingsComponent { diff --git a/frontend/app/ui/settings/random-photo/random-photo.settings.service.ts b/src/frontend/app/ui/settings/random-photo/random-photo.settings.service.ts similarity index 100% rename from frontend/app/ui/settings/random-photo/random-photo.settings.service.ts rename to src/frontend/app/ui/settings/random-photo/random-photo.settings.service.ts diff --git a/frontend/app/ui/settings/scheduled-tasks.service.ts b/src/frontend/app/ui/settings/scheduled-tasks.service.ts similarity index 100% rename from frontend/app/ui/settings/scheduled-tasks.service.ts rename to src/frontend/app/ui/settings/scheduled-tasks.service.ts diff --git a/frontend/app/ui/settings/search/search.settings.component.css b/src/frontend/app/ui/settings/search/search.settings.component.css similarity index 100% rename from frontend/app/ui/settings/search/search.settings.component.css rename to src/frontend/app/ui/settings/search/search.settings.component.css diff --git a/frontend/app/ui/settings/search/search.settings.component.html b/src/frontend/app/ui/settings/search/search.settings.component.html similarity index 100% rename from frontend/app/ui/settings/search/search.settings.component.html rename to src/frontend/app/ui/settings/search/search.settings.component.html diff --git a/frontend/app/ui/settings/search/search.settings.component.ts b/src/frontend/app/ui/settings/search/search.settings.component.ts similarity index 95% rename from frontend/app/ui/settings/search/search.settings.component.ts rename to src/frontend/app/ui/settings/search/search.settings.component.ts index b32aae03..67cf5c5d 100644 --- a/frontend/app/ui/settings/search/search.settings.component.ts +++ b/src/frontend/app/ui/settings/search/search.settings.component.ts @@ -11,7 +11,7 @@ import {I18n} from '@ngx-translate/i18n-polyfill'; selector: 'app-settings-search', templateUrl: './search.settings.component.html', styleUrls: ['./search.settings.component.css', - './../_abstract/abstract.settings.component.css'], + '../_abstract/abstract.settings.component.css'], providers: [SearchSettingsService], }) export class SearchSettingsComponent extends SettingsComponent { diff --git a/frontend/app/ui/settings/search/search.settings.service.ts b/src/frontend/app/ui/settings/search/search.settings.service.ts similarity index 100% rename from frontend/app/ui/settings/search/search.settings.service.ts rename to src/frontend/app/ui/settings/search/search.settings.service.ts diff --git a/frontend/app/ui/settings/settings.service.ts b/src/frontend/app/ui/settings/settings.service.ts similarity index 100% rename from frontend/app/ui/settings/settings.service.ts rename to src/frontend/app/ui/settings/settings.service.ts diff --git a/frontend/app/ui/settings/share/share.settings.component.css b/src/frontend/app/ui/settings/share/share.settings.component.css similarity index 100% rename from frontend/app/ui/settings/share/share.settings.component.css rename to src/frontend/app/ui/settings/share/share.settings.component.css diff --git a/frontend/app/ui/settings/share/share.settings.component.html b/src/frontend/app/ui/settings/share/share.settings.component.html similarity index 100% rename from frontend/app/ui/settings/share/share.settings.component.html rename to src/frontend/app/ui/settings/share/share.settings.component.html diff --git a/frontend/app/ui/settings/share/share.settings.component.ts b/src/frontend/app/ui/settings/share/share.settings.component.ts similarity index 95% rename from frontend/app/ui/settings/share/share.settings.component.ts rename to src/frontend/app/ui/settings/share/share.settings.component.ts index be39f350..09543349 100644 --- a/frontend/app/ui/settings/share/share.settings.component.ts +++ b/src/frontend/app/ui/settings/share/share.settings.component.ts @@ -11,7 +11,7 @@ import {I18n} from '@ngx-translate/i18n-polyfill'; selector: 'app-settings-share', templateUrl: './share.settings.component.html', styleUrls: ['./share.settings.component.css', - './../_abstract/abstract.settings.component.css'], + '../_abstract/abstract.settings.component.css'], providers: [ShareSettingsService], }) export class ShareSettingsComponent extends SettingsComponent { diff --git a/frontend/app/ui/settings/share/share.settings.service.ts b/src/frontend/app/ui/settings/share/share.settings.service.ts similarity index 100% rename from frontend/app/ui/settings/share/share.settings.service.ts rename to src/frontend/app/ui/settings/share/share.settings.service.ts diff --git a/frontend/app/ui/settings/tasks/tasks.settings.component.css b/src/frontend/app/ui/settings/tasks/tasks.settings.component.css similarity index 100% rename from frontend/app/ui/settings/tasks/tasks.settings.component.css rename to src/frontend/app/ui/settings/tasks/tasks.settings.component.css diff --git a/frontend/app/ui/settings/tasks/tasks.settings.component.html b/src/frontend/app/ui/settings/tasks/tasks.settings.component.html similarity index 100% rename from frontend/app/ui/settings/tasks/tasks.settings.component.html rename to src/frontend/app/ui/settings/tasks/tasks.settings.component.html diff --git a/frontend/app/ui/settings/tasks/tasks.settings.component.ts b/src/frontend/app/ui/settings/tasks/tasks.settings.component.ts similarity index 98% rename from frontend/app/ui/settings/tasks/tasks.settings.component.ts rename to src/frontend/app/ui/settings/tasks/tasks.settings.component.ts index cb3b8edb..f06121e9 100644 --- a/frontend/app/ui/settings/tasks/tasks.settings.component.ts +++ b/src/frontend/app/ui/settings/tasks/tasks.settings.component.ts @@ -21,7 +21,7 @@ import {ServerConfig} from '../../../../../common/config/private/IPrivateConfig' selector: 'app-settings-tasks', templateUrl: './tasks.settings.component.html', styleUrls: ['./tasks.settings.component.css', - './../_abstract/abstract.settings.component.css'], + '../_abstract/abstract.settings.component.css'], providers: [TasksSettingsService] }) export class TasksSettingsComponent extends SettingsComponent diff --git a/frontend/app/ui/settings/tasks/tasks.settings.service.ts b/src/frontend/app/ui/settings/tasks/tasks.settings.service.ts similarity index 100% rename from frontend/app/ui/settings/tasks/tasks.settings.service.ts rename to src/frontend/app/ui/settings/tasks/tasks.settings.service.ts diff --git a/frontend/app/ui/settings/thumbnail/thumbnail.settings.component.css b/src/frontend/app/ui/settings/thumbnail/thumbnail.settings.component.css similarity index 100% rename from frontend/app/ui/settings/thumbnail/thumbnail.settings.component.css rename to src/frontend/app/ui/settings/thumbnail/thumbnail.settings.component.css diff --git a/frontend/app/ui/settings/thumbnail/thumbnail.settings.component.html b/src/frontend/app/ui/settings/thumbnail/thumbnail.settings.component.html similarity index 100% rename from frontend/app/ui/settings/thumbnail/thumbnail.settings.component.html rename to src/frontend/app/ui/settings/thumbnail/thumbnail.settings.component.html diff --git a/frontend/app/ui/settings/thumbnail/thumbnail.settings.component.ts b/src/frontend/app/ui/settings/thumbnail/thumbnail.settings.component.ts similarity index 97% rename from frontend/app/ui/settings/thumbnail/thumbnail.settings.component.ts rename to src/frontend/app/ui/settings/thumbnail/thumbnail.settings.component.ts index daede9ef..5df8688f 100644 --- a/frontend/app/ui/settings/thumbnail/thumbnail.settings.component.ts +++ b/src/frontend/app/ui/settings/thumbnail/thumbnail.settings.component.ts @@ -13,7 +13,7 @@ import {ServerConfig} from '../../../../../common/config/private/IPrivateConfig' selector: 'app-settings-thumbnail', templateUrl: './thumbnail.settings.component.html', styleUrls: ['./thumbnail.settings.component.css', - './../_abstract/abstract.settings.component.css'], + '../_abstract/abstract.settings.component.css'], providers: [ThumbnailSettingsService], }) export class ThumbnailSettingsComponent diff --git a/frontend/app/ui/settings/thumbnail/thumbnail.settings.service.ts b/src/frontend/app/ui/settings/thumbnail/thumbnail.settings.service.ts similarity index 100% rename from frontend/app/ui/settings/thumbnail/thumbnail.settings.service.ts rename to src/frontend/app/ui/settings/thumbnail/thumbnail.settings.service.ts diff --git a/frontend/app/ui/settings/usermanager/usermanager.settings.component.css b/src/frontend/app/ui/settings/usermanager/usermanager.settings.component.css similarity index 100% rename from frontend/app/ui/settings/usermanager/usermanager.settings.component.css rename to src/frontend/app/ui/settings/usermanager/usermanager.settings.component.css diff --git a/frontend/app/ui/settings/usermanager/usermanager.settings.component.html b/src/frontend/app/ui/settings/usermanager/usermanager.settings.component.html similarity index 100% rename from frontend/app/ui/settings/usermanager/usermanager.settings.component.html rename to src/frontend/app/ui/settings/usermanager/usermanager.settings.component.html diff --git a/frontend/app/ui/settings/usermanager/usermanager.settings.component.ts b/src/frontend/app/ui/settings/usermanager/usermanager.settings.component.ts similarity index 98% rename from frontend/app/ui/settings/usermanager/usermanager.settings.component.ts rename to src/frontend/app/ui/settings/usermanager/usermanager.settings.component.ts index e5acd917..b680d13f 100644 --- a/frontend/app/ui/settings/usermanager/usermanager.settings.component.ts +++ b/src/frontend/app/ui/settings/usermanager/usermanager.settings.component.ts @@ -13,7 +13,7 @@ import {I18n} from '@ngx-translate/i18n-polyfill'; selector: 'app-settings-usermanager', templateUrl: './usermanager.settings.component.html', styleUrls: ['./usermanager.settings.component.css', - './../_abstract/abstract.settings.component.css'], + '../_abstract/abstract.settings.component.css'], providers: [UserManagerSettingsService], }) export class UserMangerSettingsComponent implements OnInit { diff --git a/frontend/app/ui/settings/usermanager/usermanager.settings.service.ts b/src/frontend/app/ui/settings/usermanager/usermanager.settings.service.ts similarity index 100% rename from frontend/app/ui/settings/usermanager/usermanager.settings.service.ts rename to src/frontend/app/ui/settings/usermanager/usermanager.settings.service.ts diff --git a/frontend/app/ui/settings/video/video.settings.component.css b/src/frontend/app/ui/settings/video/video.settings.component.css similarity index 100% rename from frontend/app/ui/settings/video/video.settings.component.css rename to src/frontend/app/ui/settings/video/video.settings.component.css diff --git a/frontend/app/ui/settings/video/video.settings.component.html b/src/frontend/app/ui/settings/video/video.settings.component.html similarity index 100% rename from frontend/app/ui/settings/video/video.settings.component.html rename to src/frontend/app/ui/settings/video/video.settings.component.html diff --git a/frontend/app/ui/settings/video/video.settings.component.ts b/src/frontend/app/ui/settings/video/video.settings.component.ts similarity index 98% rename from frontend/app/ui/settings/video/video.settings.component.ts rename to src/frontend/app/ui/settings/video/video.settings.component.ts index 41363364..5b12ae4e 100644 --- a/frontend/app/ui/settings/video/video.settings.component.ts +++ b/src/frontend/app/ui/settings/video/video.settings.component.ts @@ -16,7 +16,7 @@ import {ServerConfig} from '../../../../../common/config/private/IPrivateConfig' selector: 'app-settings-video', templateUrl: './video.settings.component.html', styleUrls: ['./video.settings.component.css', - './../_abstract/abstract.settings.component.css'], + '../_abstract/abstract.settings.component.css'], providers: [VideoSettingsService], }) export class VideoSettingsComponent extends SettingsComponent<{ server: ServerConfig.VideoConfig, client: ClientConfig.VideoConfig }> { diff --git a/frontend/app/ui/settings/video/video.settings.service.ts b/src/frontend/app/ui/settings/video/video.settings.service.ts similarity index 100% rename from frontend/app/ui/settings/video/video.settings.service.ts rename to src/frontend/app/ui/settings/video/video.settings.service.ts diff --git a/frontend/app/ui/sharelogin/share-login.component.css b/src/frontend/app/ui/sharelogin/share-login.component.css similarity index 100% rename from frontend/app/ui/sharelogin/share-login.component.css rename to src/frontend/app/ui/sharelogin/share-login.component.css diff --git a/frontend/app/ui/sharelogin/share-login.component.html b/src/frontend/app/ui/sharelogin/share-login.component.html similarity index 100% rename from frontend/app/ui/sharelogin/share-login.component.html rename to src/frontend/app/ui/sharelogin/share-login.component.html diff --git a/frontend/app/ui/sharelogin/share-login.component.ts b/src/frontend/app/ui/sharelogin/share-login.component.ts similarity index 100% rename from frontend/app/ui/sharelogin/share-login.component.ts rename to src/frontend/app/ui/sharelogin/share-login.component.ts diff --git a/frontend/app/ui/utils/timestamp-datepicker/datepicker.component.html b/src/frontend/app/ui/utils/timestamp-datepicker/datepicker.component.html similarity index 100% rename from frontend/app/ui/utils/timestamp-datepicker/datepicker.component.html rename to src/frontend/app/ui/utils/timestamp-datepicker/datepicker.component.html diff --git a/frontend/app/ui/utils/timestamp-datepicker/datepicker.component.ts b/src/frontend/app/ui/utils/timestamp-datepicker/datepicker.component.ts similarity index 100% rename from frontend/app/ui/utils/timestamp-datepicker/datepicker.component.ts rename to src/frontend/app/ui/utils/timestamp-datepicker/datepicker.component.ts diff --git a/frontend/app/ui/utils/timestamp-timepicker/timepicker.component.html b/src/frontend/app/ui/utils/timestamp-timepicker/timepicker.component.html similarity index 100% rename from frontend/app/ui/utils/timestamp-timepicker/timepicker.component.html rename to src/frontend/app/ui/utils/timestamp-timepicker/timepicker.component.html diff --git a/frontend/app/ui/utils/timestamp-timepicker/timepicker.component.ts b/src/frontend/app/ui/utils/timestamp-timepicker/timepicker.component.ts similarity index 100% rename from frontend/app/ui/utils/timestamp-timepicker/timepicker.component.ts rename to src/frontend/app/ui/utils/timestamp-timepicker/timepicker.component.ts diff --git a/frontend/assets/icon.png b/src/frontend/assets/icon.png similarity index 100% rename from frontend/assets/icon.png rename to src/frontend/assets/icon.png diff --git a/frontend/assets/icon_inv.png b/src/frontend/assets/icon_inv.png similarity index 100% rename from frontend/assets/icon_inv.png rename to src/frontend/assets/icon_inv.png diff --git a/frontend/environments/environment.prod.ts b/src/frontend/environments/environment.prod.ts similarity index 100% rename from frontend/environments/environment.prod.ts rename to src/frontend/environments/environment.prod.ts diff --git a/frontend/environments/environment.ts b/src/frontend/environments/environment.ts similarity index 100% rename from frontend/environments/environment.ts rename to src/frontend/environments/environment.ts diff --git a/frontend/index.html b/src/frontend/index.html similarity index 100% rename from frontend/index.html rename to src/frontend/index.html diff --git a/frontend/main.ts b/src/frontend/main.ts similarity index 100% rename from frontend/main.ts rename to src/frontend/main.ts diff --git a/frontend/polyfills.ts b/src/frontend/polyfills.ts similarity index 100% rename from frontend/polyfills.ts rename to src/frontend/polyfills.ts diff --git a/frontend/styles.css b/src/frontend/styles.css similarity index 100% rename from frontend/styles.css rename to src/frontend/styles.css diff --git a/frontend/translate/messages.en.xlf b/src/frontend/translate/messages.en.xlf similarity index 100% rename from frontend/translate/messages.en.xlf rename to src/frontend/translate/messages.en.xlf diff --git a/frontend/translate/messages.fr.xlf b/src/frontend/translate/messages.fr.xlf similarity index 100% rename from frontend/translate/messages.fr.xlf rename to src/frontend/translate/messages.fr.xlf diff --git a/frontend/translate/messages.hu.xlf b/src/frontend/translate/messages.hu.xlf similarity index 99% rename from frontend/translate/messages.hu.xlf rename to src/frontend/translate/messages.hu.xlf index e3baa05d..4eb6f080 100644 --- a/frontend/translate/messages.hu.xlf +++ b/src/frontend/translate/messages.hu.xlf @@ -1078,7 +1078,7 @@ app/ui/settings/video/video.settings.component.html 115 - >Kézzel is át lehet konvertálni a videókat, de haladó módban autómatikus feladatként is be lehet ütemezni. + Kézzel is át lehet konvertálni a videókat, de haladó módban autómatikus feladatként is be lehet ütemezni. Transcode videos now diff --git a/frontend/translate/messages.ro.xlf b/src/frontend/translate/messages.ro.xlf similarity index 100% rename from frontend/translate/messages.ro.xlf rename to src/frontend/translate/messages.ro.xlf diff --git a/frontend/translate/messages.ru.xlf b/src/frontend/translate/messages.ru.xlf similarity index 100% rename from frontend/translate/messages.ru.xlf rename to src/frontend/translate/messages.ru.xlf diff --git a/frontend/tsconfig.app.json b/src/frontend/tsconfig.app.json similarity index 60% rename from frontend/tsconfig.app.json rename to src/frontend/tsconfig.app.json index c3d0dedb..35d00ed1 100644 --- a/frontend/tsconfig.app.json +++ b/src/frontend/tsconfig.app.json @@ -1,9 +1,9 @@ { - "extends": "../tsconfig.json", + "extends": "../../tsconfig.json", "compilerOptions": { - "outDir": "../out-tsc/app", + "outDir": "../../out-tsc/app", "module": "es2015", - "baseUrl": "", + "baseUrl": "tsconfig.app", "types": [] }, "exclude": [ diff --git a/frontend/tsconfig.spec.json b/src/frontend/tsconfig.spec.json similarity index 69% rename from frontend/tsconfig.spec.json rename to src/frontend/tsconfig.spec.json index 15458edb..caa73357 100644 --- a/frontend/tsconfig.spec.json +++ b/src/frontend/tsconfig.spec.json @@ -1,10 +1,10 @@ { - "extends": "../tsconfig.json", + "extends": "../../tsconfig.json", "compilerOptions": { - "outDir": "../out-tsc/spec", + "outDir": "../../out-tsc/spec", "module": "commonjs", "target": "es5", - "baseUrl": "", + "baseUrl": "tsconfig.spec", "types": [ "jasmine", "node" diff --git a/frontend/typings.d.ts b/src/frontend/typings.d.ts similarity index 100% rename from frontend/typings.d.ts rename to src/frontend/typings.d.ts diff --git a/test/backend/SQLTestHelper.ts b/test/backend/SQLTestHelper.ts index f0abf17d..51c43dc0 100644 --- a/test/backend/SQLTestHelper.ts +++ b/test/backend/SQLTestHelper.ts @@ -1,8 +1,8 @@ -import {Config} from '../../common/config/private/Config'; +import {Config} from '../../src/common/config/private/Config'; import * as fs from 'fs'; import * as path from 'path'; -import {SQLConnection} from '../../backend/model/sql/SQLConnection'; -import {ServerConfig} from '../../common/config/private/IPrivateConfig'; +import {SQLConnection} from '../../src/backend/model/sql/SQLConnection'; +import {ServerConfig} from '../../src/common/config/private/IPrivateConfig'; declare let describe: any; const savedDescribe = describe; diff --git a/test/backend/integration/model/sql/typeorm.ts b/test/backend/integration/model/sql/typeorm.ts index 09ec2133..b7c05d8c 100644 --- a/test/backend/integration/model/sql/typeorm.ts +++ b/test/backend/integration/model/sql/typeorm.ts @@ -1,22 +1,22 @@ import {expect} from 'chai'; import * as fs from 'fs'; import * as path from 'path'; -import {Config} from '../../../../../common/config/private/Config'; -import {SQLConnection} from '../../../../../backend/model/sql/SQLConnection'; -import {UserEntity} from '../../../../../backend/model/sql/enitites/UserEntity'; -import {UserRoles} from '../../../../../common/entities/UserDTO'; -import {PasswordHelper} from '../../../../../backend/model/PasswordHelper'; -import {DirectoryEntity} from '../../../../../backend/model/sql/enitites/DirectoryEntity'; +import {Config} from '../../../../../src/common/config/private/Config'; +import {SQLConnection} from '../../../../../src/backend/model/sql/SQLConnection'; +import {UserEntity} from '../../../../../src/backend/model/sql/enitites/UserEntity'; +import {UserRoles} from '../../../../../src/common/entities/UserDTO'; +import {PasswordHelper} from '../../../../../src/backend/model/PasswordHelper'; +import {DirectoryEntity} from '../../../../../src/backend/model/sql/enitites/DirectoryEntity'; import { CameraMetadataEntity, GPSMetadataEntity, PhotoEntity, PhotoMetadataEntity, PositionMetaDataEntity -} from '../../../../../backend/model/sql/enitites/PhotoEntity'; -import {MediaDimensionEntity} from '../../../../../backend/model/sql/enitites/MediaEntity'; -import {VersionEntity} from '../../../../../backend/model/sql/enitites/VersionEntity'; -import {ServerConfig} from '../../../../../common/config/private/IPrivateConfig'; +} from '../../../../../src/backend/model/sql/enitites/PhotoEntity'; +import {MediaDimensionEntity} from '../../../../../src/backend/model/sql/enitites/MediaEntity'; +import {VersionEntity} from '../../../../../src/backend/model/sql/enitites/VersionEntity'; +import {ServerConfig} from '../../../../../src/common/config/private/IPrivateConfig'; describe('Typeorm integration', () => { diff --git a/test/backend/unit/middlewares/user/AuthenticationMWs.ts b/test/backend/unit/middlewares/user/AuthenticationMWs.ts index e45cdb14..f6427259 100644 --- a/test/backend/unit/middlewares/user/AuthenticationMWs.ts +++ b/test/backend/unit/middlewares/user/AuthenticationMWs.ts @@ -1,11 +1,11 @@ import {expect} from 'chai'; -import {AuthenticationMWs} from '../../../../../backend/middlewares/user/AuthenticationMWs'; -import {ErrorCodes, ErrorDTO} from '../../../../../common/entities/Error'; -import {UserDTO, UserRoles} from '../../../../../common/entities/UserDTO'; -import {ObjectManagers} from '../../../../../backend/model/ObjectManagers'; -import {UserManager} from '../../../../../backend/model/memory/UserManager'; -import {Config} from '../../../../../common/config/private/Config'; -import {IUserManager} from '../../../../../backend/model/interfaces/IUserManager'; +import {AuthenticationMWs} from '../../../../../src/backend/middlewares/user/AuthenticationMWs'; +import {ErrorCodes, ErrorDTO} from '../../../../../src/common/entities/Error'; +import {UserDTO, UserRoles} from '../../../../../src/common/entities/UserDTO'; +import {ObjectManagers} from '../../../../../src/backend/model/ObjectManagers'; +import {UserManager} from '../../../../../src/backend/model/memory/UserManager'; +import {Config} from '../../../../../src/common/config/private/Config'; +import {IUserManager} from '../../../../../src/backend/model/interfaces/IUserManager'; import * as path from 'path'; diff --git a/test/backend/unit/model/sql/GalleryManager.ts b/test/backend/unit/model/sql/GalleryManager.ts index 0d5f1371..3e22c9b8 100644 --- a/test/backend/unit/model/sql/GalleryManager.ts +++ b/test/backend/unit/model/sql/GalleryManager.ts @@ -1,14 +1,14 @@ import {expect} from 'chai'; import {TestHelper} from './TestHelper'; import {SQLTestHelper} from '../../../SQLTestHelper'; -import {GalleryManager} from '../../../../../backend/model/sql/GalleryManager'; -import {IndexingManager} from '../../../../../backend/model/sql/IndexingManager'; -import {DirectoryDTO} from '../../../../../common/entities/DirectoryDTO'; -import {Utils} from '../../../../../common/Utils'; -import {ObjectManagers} from '../../../../../backend/model/ObjectManagers'; -import {PersonManager} from '../../../../../backend/model/sql/PersonManager'; -import {MediaEntity} from '../../../../../backend/model/sql/enitites/MediaEntity'; -import {VersionManager} from '../../../../../backend/model/sql/VersionManager'; +import {GalleryManager} from '../../../../../src/backend/model/sql/GalleryManager'; +import {IndexingManager} from '../../../../../src/backend/model/sql/IndexingManager'; +import {DirectoryDTO} from '../../../../../src/common/entities/DirectoryDTO'; +import {Utils} from '../../../../../src/common/Utils'; +import {ObjectManagers} from '../../../../../src/backend/model/ObjectManagers'; +import {PersonManager} from '../../../../../src/backend/model/sql/PersonManager'; +import {MediaEntity} from '../../../../../src/backend/model/sql/enitites/MediaEntity'; +import {VersionManager} from '../../../../../src/backend/model/sql/VersionManager'; class IndexingManagerTest extends IndexingManager { diff --git a/test/backend/unit/model/sql/IndexingManager.ts b/test/backend/unit/model/sql/IndexingManager.ts index 84bb87d9..9bcf93a3 100644 --- a/test/backend/unit/model/sql/IndexingManager.ts +++ b/test/backend/unit/model/sql/IndexingManager.ts @@ -1,22 +1,22 @@ import {expect} from 'chai'; import * as fs from 'fs'; -import {Config} from '../../../../../common/config/private/Config'; -import {SQLConnection} from '../../../../../backend/model/sql/SQLConnection'; -import {GalleryManager} from '../../../../../backend/model/sql/GalleryManager'; -import {DirectoryDTO} from '../../../../../common/entities/DirectoryDTO'; +import {Config} from '../../../../../src/common/config/private/Config'; +import {SQLConnection} from '../../../../../src/backend/model/sql/SQLConnection'; +import {GalleryManager} from '../../../../../src/backend/model/sql/GalleryManager'; +import {DirectoryDTO} from '../../../../../src/common/entities/DirectoryDTO'; import {TestHelper} from './TestHelper'; import {Connection} from 'typeorm'; -import {DirectoryEntity} from '../../../../../backend/model/sql/enitites/DirectoryEntity'; -import {Utils} from '../../../../../common/Utils'; -import {MediaDTO} from '../../../../../common/entities/MediaDTO'; -import {FileDTO} from '../../../../../common/entities/FileDTO'; -import {IndexingManager} from '../../../../../backend/model/sql/IndexingManager'; -import {ObjectManagers} from '../../../../../backend/model/ObjectManagers'; -import {PersonManager} from '../../../../../backend/model/sql/PersonManager'; +import {DirectoryEntity} from '../../../../../src/backend/model/sql/enitites/DirectoryEntity'; +import {Utils} from '../../../../../src/common/Utils'; +import {MediaDTO} from '../../../../../src/common/entities/MediaDTO'; +import {FileDTO} from '../../../../../src/common/entities/FileDTO'; +import {IndexingManager} from '../../../../../src/backend/model/sql/IndexingManager'; +import {ObjectManagers} from '../../../../../src/backend/model/ObjectManagers'; +import {PersonManager} from '../../../../../src/backend/model/sql/PersonManager'; import {SQLTestHelper} from '../../../SQLTestHelper'; -import {VersionManager} from '../../../../../backend/model/sql/VersionManager'; -import {DiskMangerWorker} from '../../../../../backend/model/threading/DiskMangerWorker'; -import {ServerConfig} from '../../../../../common/config/private/IPrivateConfig'; +import {VersionManager} from '../../../../../src/backend/model/sql/VersionManager'; +import {DiskMangerWorker} from '../../../../../src/backend/model/threading/DiskMangerWorker'; +import {ServerConfig} from '../../../../../src/common/config/private/IPrivateConfig'; class GalleryManagerTest extends GalleryManager { diff --git a/test/backend/unit/model/sql/PersonManager.ts b/test/backend/unit/model/sql/PersonManager.ts index 7e55ded5..161a0a33 100644 --- a/test/backend/unit/model/sql/PersonManager.ts +++ b/test/backend/unit/model/sql/PersonManager.ts @@ -1,6 +1,6 @@ import {expect} from 'chai'; -import {PersonManager} from '../../../../../backend/model/sql/PersonManager'; -import {FaceRegion, PhotoDTO} from '../../../../../common/entities/PhotoDTO'; +import {PersonManager} from '../../../../../src/backend/model/sql/PersonManager'; +import {FaceRegion, PhotoDTO} from '../../../../../src/common/entities/PhotoDTO'; // to help WebStorm to handle the test cases diff --git a/test/backend/unit/model/sql/SearchManager.ts b/test/backend/unit/model/sql/SearchManager.ts index a92c3629..ef584ca5 100644 --- a/test/backend/unit/model/sql/SearchManager.ts +++ b/test/backend/unit/model/sql/SearchManager.ts @@ -1,18 +1,18 @@ import {expect} from 'chai'; -import {SQLConnection} from '../../../../../backend/model/sql/SQLConnection'; -import {PhotoEntity} from '../../../../../backend/model/sql/enitites/PhotoEntity'; -import {SearchManager} from '../../../../../backend/model/sql/SearchManager'; -import {AutoCompleteItem, SearchTypes} from '../../../../../common/entities/AutoCompleteItem'; -import {SearchResultDTO} from '../../../../../common/entities/SearchResultDTO'; -import {DirectoryEntity} from '../../../../../backend/model/sql/enitites/DirectoryEntity'; -import {Utils} from '../../../../../common/Utils'; +import {SQLConnection} from '../../../../../src/backend/model/sql/SQLConnection'; +import {PhotoEntity} from '../../../../../src/backend/model/sql/enitites/PhotoEntity'; +import {SearchManager} from '../../../../../src/backend/model/sql/SearchManager'; +import {AutoCompleteItem, SearchTypes} from '../../../../../src/common/entities/AutoCompleteItem'; +import {SearchResultDTO} from '../../../../../src/common/entities/SearchResultDTO'; +import {DirectoryEntity} from '../../../../../src/backend/model/sql/enitites/DirectoryEntity'; +import {Utils} from '../../../../../src/common/Utils'; import {TestHelper} from './TestHelper'; -import {VideoEntity} from '../../../../../backend/model/sql/enitites/VideoEntity'; -import {PersonEntry} from '../../../../../backend/model/sql/enitites/PersonEntry'; -import {FaceRegionEntry} from '../../../../../backend/model/sql/enitites/FaceRegionEntry'; -import {PhotoDTO} from '../../../../../common/entities/PhotoDTO'; +import {VideoEntity} from '../../../../../src/backend/model/sql/enitites/VideoEntity'; +import {PersonEntry} from '../../../../../src/backend/model/sql/enitites/PersonEntry'; +import {FaceRegionEntry} from '../../../../../src/backend/model/sql/enitites/FaceRegionEntry'; +import {PhotoDTO} from '../../../../../src/common/entities/PhotoDTO'; import {SQLTestHelper} from '../../../SQLTestHelper'; -import {Config} from '../../../../../common/config/private/Config'; +import {Config} from '../../../../../src/common/config/private/Config'; // to help WebStorm to handle the test cases declare let describe: any; diff --git a/test/backend/unit/model/sql/SharingManager.ts b/test/backend/unit/model/sql/SharingManager.ts index c866a4ad..86d05499 100644 --- a/test/backend/unit/model/sql/SharingManager.ts +++ b/test/backend/unit/model/sql/SharingManager.ts @@ -1,9 +1,9 @@ import {expect} from 'chai'; -import {SQLConnection} from '../../../../../backend/model/sql/SQLConnection'; -import {SharingManager} from '../../../../../backend/model/sql/SharingManager'; -import {SharingDTO} from '../../../../../common/entities/SharingDTO'; -import {UserEntity} from '../../../../../backend/model/sql/enitites/UserEntity'; -import {UserDTO, UserRoles} from '../../../../../common/entities/UserDTO'; +import {SQLConnection} from '../../../../../src/backend/model/sql/SQLConnection'; +import {SharingManager} from '../../../../../src/backend/model/sql/SharingManager'; +import {SharingDTO} from '../../../../../src/common/entities/SharingDTO'; +import {UserEntity} from '../../../../../src/backend/model/sql/enitites/UserEntity'; +import {UserDTO, UserRoles} from '../../../../../src/common/entities/UserDTO'; import {SQLTestHelper} from '../../../SQLTestHelper'; // to help WebStorm to handle the test cases diff --git a/test/backend/unit/model/sql/TestHelper.ts b/test/backend/unit/model/sql/TestHelper.ts index 9d145d8d..cae95d79 100644 --- a/test/backend/unit/model/sql/TestHelper.ts +++ b/test/backend/unit/model/sql/TestHelper.ts @@ -1,19 +1,19 @@ -import {MediaDimensionEntity} from '../../../../../backend/model/sql/enitites/MediaEntity'; +import {MediaDimensionEntity} from '../../../../../src/backend/model/sql/enitites/MediaEntity'; import { CameraMetadataEntity, GPSMetadataEntity, PhotoEntity, PhotoMetadataEntity, PositionMetaDataEntity -} from '../../../../../backend/model/sql/enitites/PhotoEntity'; +} from '../../../../../src/backend/model/sql/enitites/PhotoEntity'; import {OrientationTypes} from 'ts-exif-parser'; -import {DirectoryEntity} from '../../../../../backend/model/sql/enitites/DirectoryEntity'; -import {VideoEntity, VideoMetadataEntity} from '../../../../../backend/model/sql/enitites/VideoEntity'; -import {MediaDimension} from '../../../../../common/entities/MediaDTO'; -import {CameraMetadata, FaceRegion, GPSMetadata, PhotoDTO, PhotoMetadata, PositionMetaData} from '../../../../../common/entities/PhotoDTO'; -import {DirectoryDTO} from '../../../../../common/entities/DirectoryDTO'; -import {FileDTO} from '../../../../../common/entities/FileDTO'; -import {DiskMangerWorker} from '../../../../../backend/model/threading/DiskMangerWorker'; +import {DirectoryEntity} from '../../../../../src/backend/model/sql/enitites/DirectoryEntity'; +import {VideoEntity, VideoMetadataEntity} from '../../../../../src/backend/model/sql/enitites/VideoEntity'; +import {MediaDimension} from '../../../../../src/common/entities/MediaDTO'; +import {CameraMetadata, FaceRegion, GPSMetadata, PhotoDTO, PhotoMetadata, PositionMetaData} from '../../../../../src/common/entities/PhotoDTO'; +import {DirectoryDTO} from '../../../../../src/common/entities/DirectoryDTO'; +import {FileDTO} from '../../../../../src/common/entities/FileDTO'; +import {DiskMangerWorker} from '../../../../../src/backend/model/threading/DiskMangerWorker'; export class TestHelper { diff --git a/test/backend/unit/model/tasks/TaskManager.spec.ts b/test/backend/unit/model/tasks/TaskManager.spec.ts index 811850ac..51399a79 100644 --- a/test/backend/unit/model/tasks/TaskManager.spec.ts +++ b/test/backend/unit/model/tasks/TaskManager.spec.ts @@ -1,6 +1,6 @@ import {expect} from 'chai'; -import {TaskManager} from '../../../../../backend/model/tasks/TaskManager'; -import {TaskScheduleDTO, TaskTriggerType} from '../../../../../common/entities/task/TaskScheduleDTO'; +import {TaskManager} from '../../../../../src/backend/model/tasks/TaskManager'; +import {TaskScheduleDTO, TaskTriggerType} from '../../../../../src/common/entities/task/TaskScheduleDTO'; class TaskManagerSpec extends TaskManager { diff --git a/test/backend/unit/model/threading/DiskMangerWorker.spec.ts b/test/backend/unit/model/threading/DiskMangerWorker.spec.ts index 6ca7997e..91cbd8b9 100644 --- a/test/backend/unit/model/threading/DiskMangerWorker.spec.ts +++ b/test/backend/unit/model/threading/DiskMangerWorker.spec.ts @@ -1,9 +1,9 @@ import {expect} from 'chai'; -import {DiskMangerWorker} from '../../../../../backend/model/threading/DiskMangerWorker'; +import {DiskMangerWorker} from '../../../../../src/backend/model/threading/DiskMangerWorker'; import * as path from 'path'; -import {Config} from '../../../../../common/config/private/Config'; -import {ProjectPath} from '../../../../../backend/ProjectPath'; -import {Utils} from '../../../../../common/Utils'; +import {Config} from '../../../../../src/common/config/private/Config'; +import {ProjectPath} from '../../../../../src/backend/ProjectPath'; +import {Utils} from '../../../../../src/common/Utils'; describe('DiskMangerWorker', () => { diff --git a/test/backend/unit/model/threading/MetaDataLoader.spec.ts b/test/backend/unit/model/threading/MetaDataLoader.spec.ts index e271bec4..17506154 100644 --- a/test/backend/unit/model/threading/MetaDataLoader.spec.ts +++ b/test/backend/unit/model/threading/MetaDataLoader.spec.ts @@ -1,6 +1,6 @@ import {expect} from 'chai'; -import {MetadataLoader} from '../../../../../backend/model/threading/MetadataLoader'; -import {Utils} from '../../../../../common/Utils'; +import {MetadataLoader} from '../../../../../src/backend/model/threading/MetadataLoader'; +import {Utils} from '../../../../../src/common/Utils'; import * as path from 'path'; describe('MetadataLoader', () => { diff --git a/test/backend/unit/model/threading/TaskExecuter.spec.ts b/test/backend/unit/model/threading/TaskExecuter.spec.ts index a00ff498..17bf3424 100644 --- a/test/backend/unit/model/threading/TaskExecuter.spec.ts +++ b/test/backend/unit/model/threading/TaskExecuter.spec.ts @@ -1,5 +1,5 @@ import {expect} from 'chai'; -import {TaskExecuter} from '../../../../../backend/model/threading/TaskExecuter'; +import {TaskExecuter} from '../../../../../src/backend/model/threading/TaskExecuter'; describe('TaskExecuter', () => { diff --git a/test/backend/unit/model/threading/TaskQue.spec.ts b/test/backend/unit/model/threading/TaskQue.spec.ts index ff1c7cd7..d33f44ba 100644 --- a/test/backend/unit/model/threading/TaskQue.spec.ts +++ b/test/backend/unit/model/threading/TaskQue.spec.ts @@ -1,5 +1,5 @@ import {expect} from 'chai'; -import {TaskQue} from '../../../../../backend/model/threading/TaskQue'; +import {TaskQue} from '../../../../../src/backend/model/threading/TaskQue'; describe('TaskQue', () => { diff --git a/test/common/unit/UserDTO.ts b/test/common/unit/UserDTO.ts index 11463516..469d4968 100644 --- a/test/common/unit/UserDTO.ts +++ b/test/common/unit/UserDTO.ts @@ -1,5 +1,5 @@ import {expect} from 'chai'; -import {UserDTO} from '../../../common/entities/UserDTO'; +import {UserDTO} from '../../../src/common/entities/UserDTO'; describe('UserDTO', () => { diff --git a/test/common/unit/Utils.spec.ts b/test/common/unit/Utils.spec.ts index 6895a564..56831ed5 100644 --- a/test/common/unit/Utils.spec.ts +++ b/test/common/unit/Utils.spec.ts @@ -1,5 +1,5 @@ import {expect} from 'chai'; -import {Utils} from '../../../common/Utils'; +import {Utils} from '../../../src/common/Utils'; describe('Utils', () => { it('should concat urls', () => {