From c3a52b3989baef2acb6298df8d24831055059991 Mon Sep 17 00:00:00 2001 From: Alex Inkin Date: Sat, 3 Jun 2023 23:21:27 +0400 Subject: [PATCH] refactor: break ui up further down (#2292) * refactor: break ui up further down * permit loading even when authed --------- Co-authored-by: Matt Hill --- .../components/markdown/markdown.component.ts | 11 +++++++-- .../responsive-col-viewport.directive.ts | 3 +-- frontend/projects/shared/src/util/unused.ts | 3 +-- frontend/projects/ui/src/app/app.module.ts | 12 ++++------ .../connection-bar.component.html | 0 .../connection-bar.component.module.ts | 0 .../connection-bar.component.scss | 0 .../connection-bar.component.ts | 0 .../ui/src/app/app/footer/footer.component.ts | 4 ++-- .../ui/src/app/app/menu/menu.module.ts | 2 +- .../snake => app/snek}/snake.page.html | 0 .../snake => app/snek}/snake.page.scss | 0 .../{modals/snake => app/snek}/snake.page.ts | 2 +- .../ui/src/app/app/snek/snek.directive.ts | 2 +- .../ui/src/app/app/snek/snek.module.ts | 10 ++++---- .../backup-report/backup-report.module.ts | 7 ++---- .../backup-report/backup-report.page.html | 13 +++++----- .../backup-report/backup-report.page.ts | 1 - .../{ => apps/ui}/modals/form/form.module.ts | 2 +- .../{ => apps/ui}/modals/form/form.page.html | 0 .../{ => apps/ui}/modals/form/form.page.scss | 0 .../{ => apps/ui}/modals/form/form.page.ts | 4 ++-- .../generic-input.component.html | 0 .../generic-input.component.module.ts | 0 .../generic-input/generic-input.component.ts | 11 +++------ .../app-interfaces/app-interfaces.page.scss | 3 --- .../backups.module.ts} | 2 +- .../backing-up/backing-up.component.html | 0 .../backing-up/backing-up.component.ts | 3 +-- .../directives/backup-create.directive.ts | 2 +- .../directives/backup-restore.directive.ts | 4 ++-- .../backup-select/backup-select.module.ts | 0 .../backup-select/backup-select.page.html | 0 .../backup-select/backup-select.page.scss | 0 .../backup-select/backup-select.page.ts | 5 ++-- .../recover-select/recover-select.module.ts | 0 .../recover-select/recover-select.page.html | 0 .../recover-select/recover-select.page.scss | 0 .../recover-select/recover-select.page.ts | 0 .../modals/recover-select/to-options.pipe.ts | 3 +-- .../target-select/target-select.module.ts | 0 .../target-select/target-select.page.html | 0 .../target-select/target-select.page.scss | 0 .../target-select/target-select.page.ts | 0 .../target-status.component.html | 0 .../backup-history/backup-history.module.ts | 6 +++-- .../backup-history/backup-history.page.html | 0 .../backup-history/backup-history.page.scss | 0 .../backup-history/backup-history.page.ts | 2 +- .../pages/backup-jobs/backup-jobs.module.ts | 0 .../pages/backup-jobs/backup-jobs.page.html | 0 .../pages/backup-jobs/backup-jobs.page.scss | 0 .../pages/backup-jobs/backup-jobs.page.ts | 0 .../backup-jobs/edit-job/edit-job.page.html | 0 .../backup-jobs/edit-job/edit-job.page.scss | 0 .../backup-jobs/edit-job/edit-job.page.ts | 0 .../job-options/job-options.component.html | 0 .../job-options/job-options.component.scss | 0 .../job-options/job-options.component.ts | 0 .../backup-jobs/new-job/new-job.page.html | 0 .../backup-jobs/new-job/new-job.page.scss | 0 .../pages/backup-jobs/new-job/new-job.page.ts | 0 .../pages/backup-jobs/pipes.ts | 0 .../backup-targets/backup-targets.module.ts | 8 ++++--- .../backup-targets/backup-targets.page.html | 0 .../backup-targets/backup-targets.page.scss | 0 .../backup-targets/backup-targets.page.ts | 10 ++++---- .../pages/backups/backups.module.ts | 8 ++++--- .../pages/backups/backups.page.html | 0 .../pages/backups/backups.page.scss | 0 .../pages/backups/backups.page.ts | 0 .../pipes/get-display-info.pipe.ts | 0 .../pipes/has-valid-backup.pipe.ts | 0 .../pipes/target-pipes.module.ts | 0 .../types/target-types.ts | 0 .../src/app/apps/ui/pages/home/home.module.ts | 4 ++-- .../marketplace-list.module.ts | 6 ++--- .../marketplace-list.page.html | 0 .../marketplace-list.page.scss | 0 .../marketplace-list/marketplace-list.page.ts | 2 +- .../marketplace-settings.module.ts | 6 +++-- .../marketplace-settings.page.html | 0 .../marketplace-settings.page.scss | 0 .../marketplace-settings.page.ts | 13 +++++----- .../marketplace-show-components.module.ts | 0 .../marketplace-show-controls.component.html | 0 .../marketplace-show-controls.component.ts | 0 .../marketplace-show-controls.page.scss | 0 .../marketplace-show-dependent.component.html | 0 .../marketplace-show-dependent.component.scss | 0 .../marketplace-show-dependent.component.ts | 0 .../marketplace-show-header.component.html | 0 .../marketplace-show-header.component.ts | 0 .../marketplace-show.module.ts | 0 .../marketplace-show.page.html | 0 .../marketplace-show.page.scss | 0 .../marketplace-show/marketplace-show.page.ts | 3 +-- .../marketplace-status.component.html | 0 .../marketplace-status.component.scss | 0 .../marketplace-status.component.ts | 0 .../marketplace-status.module.ts | 3 +-- .../marketplace.module.ts} | 2 +- .../release-notes/release-notes.module.ts | 0 .../release-notes/release-notes.page.html | 0 .../release-notes/release-notes.page.ts | 0 .../notifications/notifications.module.ts | 4 ++-- .../pages/notifications/notifications.page.ts | 2 +- .../action-success/action-success.module.ts | 11 ++++----- .../action-success/action-success.page.html | 8 +++---- .../action-success/action-success.page.ts | 1 - .../app-actions-item.component.html | 0 .../app-actions/app-actions.module.ts | 10 ++++---- .../app-actions/app-actions.page.html | 0 .../app-actions/app-actions.page.scss | 0 .../app-actions/app-actions.page.ts | 6 ++--- .../app-credentials/app-credentials.module.ts | 6 +---- .../app-credentials/app-credentials.page.html | 2 +- .../app-credentials/app-credentials.page.scss | 0 .../app-credentials/app-credentials.page.ts | 6 ++++- .../app-interfaces-item.component.html | 0 .../app-interfaces/app-interfaces.module.ts | 9 ++++--- .../app-interfaces/app-interfaces.page.html | 0 .../app-interfaces/app-interfaces.page.scss | 3 +++ .../app-interfaces/app-interfaces.page.ts | 2 +- .../services/app-interfaces}/qr.component.ts | 3 +-- .../app-list-icon.component.html | 0 .../app-list-icon.component.scss | 0 .../app-list-icon/app-list-icon.component.ts | 2 +- .../app-list-pkg/app-list-pkg.component.html | 0 .../app-list-pkg/app-list-pkg.component.scss | 0 .../app-list-pkg/app-list-pkg.component.ts | 4 ++-- .../app-list/app-list.module.ts | 12 +++++----- .../app-list/app-list.page.html | 0 .../app-list/app-list.page.scss | 0 .../app-list/app-list.page.ts | 2 +- .../app-list/package-info.pipe.ts | 8 +++---- .../app-logs/app-logs.module.ts | 2 +- .../app-logs/app-logs.page.html | 0 .../app-logs/app-logs.page.scss | 0 .../app-logs/app-logs.page.ts | 0 .../app-show/app-show.module.ts | 12 +++++----- .../app-show/app-show.page.html | 0 .../app-show/app-show.page.ts | 6 ++--- .../app-show-additional.component.html | 0 .../app-show-additional.component.ts | 0 .../app-show-dependencies.component.html | 0 .../app-show-dependencies.component.scss | 0 .../app-show-dependencies.component.ts | 0 .../app-show-header.component.html | 0 .../app-show-header.component.scss | 0 .../app-show-header.component.ts | 0 .../app-show-health-checks.component.html | 0 .../app-show-health-checks.component.scss | 0 .../app-show-health-checks.component.ts | 0 .../app-show-menu.component.html | 0 .../app-show-menu.component.scss | 0 .../app-show-menu/app-show-menu.component.ts | 0 .../app-show-progress.component.html | 0 .../app-show-progress.component.scss | 0 .../app-show-progress.component.ts | 0 .../app-show-status.component.html | 0 .../app-show-status.component.scss | 0 .../app-show-status.component.ts | 4 ++-- .../app-config/app-config-dep.component.ts | 0 .../modals/app-config/app-config.module.ts | 3 ++- .../modals/app-config/app-config.page.html | 0 .../modals/app-config/app-config.page.scss | 0 .../modals/app-config/app-config.page.ts | 8 +++---- .../app-show/pipes/health-color.pipe.ts | 0 .../app-show/pipes/progress-data.pipe.ts | 0 .../app-show/pipes/to-buttons.pipe.ts | 2 +- .../app-show/pipes/to-dependencies.pipe.ts | 2 +- .../app-show/pipes/to-status.pipe.ts | 0 .../launch-menu/launch-menu.component.html | 0 .../launch-menu/launch-menu.component.scss | 0 .../launch-menu/launch-menu.component.ts | 0 .../launch-menu/launch-menu.module.ts | 4 ++-- .../services.module.ts} | 2 +- .../services}/status/status.component.html | 0 .../status/status.component.module.ts | 2 +- .../services}/status/status.component.scss | 0 .../services}/status/status.component.ts | 0 .../ui/pages/services/ui-pipes}/ui.module.ts | 2 +- .../ui/pages/services/ui-pipes}/ui.pipe.ts | 0 .../email/email.module.ts | 2 +- .../email/email.page.html | 0 .../email/email.page.scss | 0 .../email/email.page.ts | 14 +++++------ .../kernel-logs/kernel-logs.module.ts | 2 +- .../kernel-logs/kernel-logs.page.html | 0 .../kernel-logs/kernel-logs.page.scss | 0 .../kernel-logs/kernel-logs.page.ts | 0 .../lan/lan.module.ts | 0 .../lan/lan.page.html | 0 .../lan/lan.page.scss | 0 .../{server-routes => system}/lan/lan.page.ts | 2 +- .../server-logs/server-logs.module.ts | 2 +- .../server-logs/server-logs.page.html | 0 .../server-logs/server-logs.page.scss | 0 .../server-logs/server-logs.page.ts | 0 .../server-metrics/server-metrics.module.ts | 2 +- .../server-metrics/server-metrics.page.html | 0 .../server-metrics/server-metrics.page.scss | 0 .../server-metrics/server-metrics.page.ts | 0 .../system/server-show}/backup-color.pipe.ts | 0 .../os-update/os-update.page.html | 0 .../os-update/os-update.page.module.ts | 0 .../os-update/os-update.page.scss | 0 .../server-show}/os-update/os-update.page.ts | 2 +- .../server-show/server-show.module.ts | 15 ++++++------ .../server-show/server-show.page.html | 0 .../server-show/server-show.page.scss | 0 .../server-show/server-show.page.ts | 6 ++--- .../server-specs/server-specs.module.ts | 0 .../server-specs/server-specs.page.html | 0 .../server-specs/server-specs.page.scss | 0 .../server-specs/server-specs.page.ts | 0 .../sessions/sessions.module.ts | 0 .../sessions/sessions.page.html | 0 .../sessions/sessions.page.scss | 0 .../sessions/sessions.page.ts | 0 .../sideload/dnd.directive.ts | 0 .../sideload/sideload.module.ts | 3 ++- .../sideload/sideload.page.html | 0 .../sideload/sideload.page.scss | 0 .../sideload/sideload.page.ts | 0 .../ssh-keys/ssh-keys.module.ts | 6 +++-- .../ssh-keys/ssh-keys.page.html | 0 .../ssh-keys/ssh-keys.page.scss | 0 .../ssh-keys/ssh-keys.page.ts | 6 ++--- .../system.module.ts} | 2 +- .../theme-switcher.component.html | 0 .../theme-switcher.component.ts | 0 .../theme-switcher/theme-switcher.module.ts | 0 .../wifi/wifi.const.ts | 0 .../wifi/wifi.module.ts | 6 +++-- .../wifi/wifi.page.html | 0 .../wifi/wifi.page.scss | 0 .../wifi/wifi.page.ts | 4 ++-- .../ui/pages/updates/filter-updates.pipe.ts | 24 +++++++++++++++++++ .../pages/updates}/install-progress.pipe.ts | 12 ---------- .../apps/ui/pages/updates/updates.module.ts | 16 ++++++------- .../app/apps/ui/pages/updates/updates.page.ts | 24 +------------------ .../built-in/health/health.component.ts | 5 ++-- .../app/apps/ui/pages/widgets/widgets.page.ts | 2 +- .../projects/ui/src/app/apps/ui/ui.module.ts | 16 ++++--------- .../badge-menu.component.html | 0 .../badge-menu.component.module.ts | 0 .../badge-menu.component.scss | 0 .../badge-menu-button/badge-menu.component.ts | 0 .../form/control.directive.ts | 0 .../{components => common}/form/control.ts | 0 .../form/form-array/form-array.component.html | 0 .../form/form-array/form-array.component.scss | 0 .../form/form-array/form-array.component.ts | 0 .../form/form-color/form-color.component.html | 0 .../form/form-color/form-color.component.scss | 0 .../form/form-color/form-color.component.ts | 0 .../form-control/form-control.component.html | 0 .../form-control/form-control.component.scss | 0 .../form-control/form-control.component.ts | 0 .../form-control/form-control.providers.ts | 0 .../form-datetime.component.html | 0 .../form-datetime/form-datetime.component.ts | 0 .../form/form-file/form-file.component.html | 0 .../form/form-file/form-file.component.scss | 0 .../form/form-file/form-file.component.ts | 0 .../form/form-group/form-group.component.html | 0 .../form/form-group/form-group.component.scss | 0 .../form/form-group/form-group.component.ts | 0 .../form/form-group/form-group.providers.ts | 0 .../form-multiselect.component.html | 0 .../form-multiselect.component.ts | 0 .../form-number/form-number.component.html | 0 .../form/form-number/form-number.component.ts | 0 .../form-object/form-object.component.html | 0 .../form-object/form-object.component.scss | 0 .../form/form-object/form-object.component.ts | 0 .../form-select/form-select.component.html | 0 .../form/form-select/form-select.component.ts | 0 .../form/form-text/form-text.component.html | 0 .../form/form-text/form-text.component.scss | 0 .../form/form-text/form-text.component.ts | 0 .../form-textarea.component.html | 0 .../form-textarea/form-textarea.component.ts | 0 .../form-toggle/form-toggle.component.html | 0 .../form-toggle/form-toggle.component.scss | 0 .../form/form-toggle/form-toggle.component.ts | 0 .../form/form-union/form-union.component.html | 0 .../form/form-union/form-union.component.scss | 0 .../form/form-union/form-union.component.ts | 0 .../form/form.module.ts | 0 .../{components => common}/form/hint.pipe.ts | 0 .../form/invalid.service.ts | 0 .../form/mustache.pipe.ts | 0 .../insecure-warning.component.html | 0 .../insecure-warning.component.scss | 0 .../insecure-warning.component.ts | 0 .../insecure-warning.module.ts | 0 .../install-progress.module.ts | 8 +++++++ .../install-progress/install-progress.pipe.ts | 15 ++++++++++++ .../loading/loading.component.scss | 0 .../loading/loading.component.ts | 0 .../loading/loading.module.ts | 0 .../loading/loading.service.ts | 0 .../logs/logs.component.html | 0 .../logs/logs.component.module.ts | 0 .../logs/logs.component.scss | 0 .../logs/logs.component.ts | 0 .../os-welcome/os-welcome.module.ts | 2 +- .../os-welcome/os-welcome.page.html | 0 .../os-welcome/os-welcome.page.scss | 0 .../os-welcome/os-welcome.page.ts | 0 .../skeleton-list.component.html | 0 .../skeleton-list.component.module.ts | 12 +++------- .../skeleton-list/skeleton-list.component.ts | 1 - .../store-icon/store-icon.component.html | 0 .../store-icon/store-icon.component.module.ts | 0 .../store-icon/store-icon.component.scss | 0 .../store-icon/store-icon.component.ts | 0 .../notifications-toast.component.html | 0 .../notifications-toast.component.ts | 0 .../notifications-toast.service.ts | 3 +-- .../refresh-alert.component.html | 10 ++++++-- .../refresh-alert/refresh-alert.component.ts | 0 .../refresh-alert/refresh-alert.service.ts | 3 +-- .../toast-container.component.html | 0 .../toast-container.component.ts | 0 .../toast-container/toast-container.module.ts | 0 .../update-toast/update-toast.component.html | 0 .../update-toast/update-toast.component.ts | 0 .../update-toast/update-toast.service.ts | 3 +-- .../any-link/any-link.component.html | 0 .../any-link/any-link.component.scss | 0 .../any-link/any-link.component.ts | 0 .../widget-card/widget-card.component.html | 0 .../widget-card/widget-card.component.scss | 5 ++-- .../widget-card/widget-card.component.ts | 0 .../widget-list/widget-list.component.html | 0 .../widget-list.component.module.ts | 15 ++++-------- .../widget-list/widget-list.component.scss | 0 .../widget-list/widget-list.component.ts | 2 +- .../any-link/any-link.component.module.ts | 11 --------- .../src/app/components/qr/qr.component.html | 1 - .../app/components/qr/qr.component.module.ts | 18 -------------- .../src/app/components/qr/qr.component.scss | 0 .../skeleton-list.component.scss | 0 .../widget-card.component.module.ts | 18 -------------- .../projects/ui/src/app/guards/auth.guard.ts | 3 +-- .../ui/src/app/guards/unauth.guard.ts | 3 +-- .../action-success/action-success.page.scss | 0 .../backup-report/backup-report.page.scss | 0 .../generic-input.component.scss | 0 .../ui/src/app/modals/snake/snake.module.ts | 12 ---------- .../pipes/backup-color/backup-color.module.ts | 8 ------- .../install-progress.module.ts | 11 --------- .../ui/src/app/pipes/mask/mask.module.ts | 8 ------- .../ui/src/app/pipes/mask/mask.pipe.ts | 11 --------- .../projects/ui/src/app/routing.module.ts | 1 - .../ui/src/app/services/auth.service.ts | 3 +-- .../ui/src/app/services/connection.service.ts | 11 +++++++-- .../ui/src/app/services/eos.service.ts | 5 ++-- .../src/app/services/marketplace.service.ts | 14 +++++------ .../ui/src/app/services/patch-data.service.ts | 5 ++-- .../app/services/patch-db/patch-db.factory.ts | 11 ++++++--- .../src/app/services/patch-monitor.service.ts | 3 +-- .../app/services/theme-switcher.service.ts | 3 +-- .../ui/src/app/services/time-service.ts | 11 +++++++-- .../projects/ui/src/app/types/pkg-info.ts | 22 +++++++++++++++++ .../ui/src/app/util/get-package-info.ts | 21 ++-------------- frontend/projects/ui/src/app/util/mask.ts | 3 +++ .../projects/ui/src/app/util/rxjs.util.ts | 3 ++- 372 files changed, 361 insertions(+), 443 deletions(-) rename frontend/projects/ui/src/app/{components => app}/connection-bar/connection-bar.component.html (100%) rename frontend/projects/ui/src/app/{components => app}/connection-bar/connection-bar.component.module.ts (100%) rename frontend/projects/ui/src/app/{components => app}/connection-bar/connection-bar.component.scss (100%) rename frontend/projects/ui/src/app/{components => app}/connection-bar/connection-bar.component.ts (100%) rename frontend/projects/ui/src/app/{modals/snake => app/snek}/snake.page.html (100%) rename frontend/projects/ui/src/app/{modals/snake => app/snek}/snake.page.scss (100%) rename frontend/projects/ui/src/app/{modals/snake => app/snek}/snake.page.ts (99%) rename frontend/projects/ui/src/app/{ => apps/ui}/modals/backup-report/backup-report.module.ts (74%) rename frontend/projects/ui/src/app/{ => apps/ui}/modals/backup-report/backup-report.page.html (82%) rename frontend/projects/ui/src/app/{ => apps/ui}/modals/backup-report/backup-report.page.ts (96%) rename frontend/projects/ui/src/app/{ => apps/ui}/modals/form/form.module.ts (89%) rename frontend/projects/ui/src/app/{ => apps/ui}/modals/form/form.page.html (100%) rename frontend/projects/ui/src/app/{ => apps/ui}/modals/form/form.page.scss (100%) rename frontend/projects/ui/src/app/{ => apps/ui}/modals/form/form.page.ts (97%) rename frontend/projects/ui/src/app/{ => apps/ui}/modals/generic-input/generic-input.component.html (100%) rename frontend/projects/ui/src/app/{ => apps/ui}/modals/generic-input/generic-input.component.module.ts (100%) rename frontend/projects/ui/src/app/{ => apps/ui}/modals/generic-input/generic-input.component.ts (86%) delete mode 100644 frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-interfaces/app-interfaces.page.scss rename frontend/projects/ui/src/app/apps/ui/pages/{backups-routes/backups-routing.module.ts => backups/backups.module.ts} (95%) rename frontend/projects/ui/src/app/apps/ui/pages/{backups-routes => backups}/components/backing-up/backing-up.component.html (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{backups-routes => backups}/components/backing-up/backing-up.component.ts (93%) rename frontend/projects/ui/src/app/apps/ui/pages/{backups-routes => backups}/directives/backup-create.directive.ts (94%) rename frontend/projects/ui/src/app/apps/ui/pages/{backups-routes => backups}/directives/backup-restore.directive.ts (94%) rename frontend/projects/ui/src/app/apps/ui/pages/{backups-routes => backups}/modals/backup-select/backup-select.module.ts (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{backups-routes => backups}/modals/backup-select/backup-select.page.html (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{backups-routes => backups}/modals/backup-select/backup-select.page.scss (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{backups-routes => backups}/modals/backup-select/backup-select.page.ts (95%) rename frontend/projects/ui/src/app/apps/ui/pages/{backups-routes => backups}/modals/recover-select/recover-select.module.ts (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{backups-routes => backups}/modals/recover-select/recover-select.page.html (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{backups-routes => backups}/modals/recover-select/recover-select.page.scss (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{backups-routes => backups}/modals/recover-select/recover-select.page.ts (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{backups-routes => backups}/modals/recover-select/to-options.pipe.ts (95%) rename frontend/projects/ui/src/app/apps/ui/pages/{backups-routes => backups}/modals/target-select/target-select.module.ts (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{backups-routes => backups}/modals/target-select/target-select.page.html (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{backups-routes => backups}/modals/target-select/target-select.page.scss (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{backups-routes => backups}/modals/target-select/target-select.page.ts (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{backups-routes => backups}/modals/target-select/target-status.component.html (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{backups-routes => backups}/pages/backup-history/backup-history.module.ts (83%) rename frontend/projects/ui/src/app/apps/ui/pages/{backups-routes => backups}/pages/backup-history/backup-history.page.html (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{backups-routes => backups}/pages/backup-history/backup-history.page.scss (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{backups-routes => backups}/pages/backup-history/backup-history.page.ts (96%) rename frontend/projects/ui/src/app/apps/ui/pages/{backups-routes => backups}/pages/backup-jobs/backup-jobs.module.ts (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{backups-routes => backups}/pages/backup-jobs/backup-jobs.page.html (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{backups-routes => backups}/pages/backup-jobs/backup-jobs.page.scss (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{backups-routes => backups}/pages/backup-jobs/backup-jobs.page.ts (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{backups-routes => backups}/pages/backup-jobs/edit-job/edit-job.page.html (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{backups-routes => backups}/pages/backup-jobs/edit-job/edit-job.page.scss (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{backups-routes => backups}/pages/backup-jobs/edit-job/edit-job.page.ts (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{backups-routes => backups}/pages/backup-jobs/job-options/job-options.component.html (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{backups-routes => backups}/pages/backup-jobs/job-options/job-options.component.scss (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{backups-routes => backups}/pages/backup-jobs/job-options/job-options.component.ts (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{backups-routes => backups}/pages/backup-jobs/new-job/new-job.page.html (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{backups-routes => backups}/pages/backup-jobs/new-job/new-job.page.scss (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{backups-routes => backups}/pages/backup-jobs/new-job/new-job.page.ts (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{backups-routes => backups}/pages/backup-jobs/pipes.ts (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{backups-routes => backups}/pages/backup-targets/backup-targets.module.ts (76%) rename frontend/projects/ui/src/app/apps/ui/pages/{backups-routes => backups}/pages/backup-targets/backup-targets.page.html (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{backups-routes => backups}/pages/backup-targets/backup-targets.page.scss (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{backups-routes => backups}/pages/backup-targets/backup-targets.page.ts (97%) rename frontend/projects/ui/src/app/apps/ui/pages/{backups-routes => backups}/pages/backups/backups.module.ts (77%) rename frontend/projects/ui/src/app/apps/ui/pages/{backups-routes => backups}/pages/backups/backups.page.html (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{backups-routes => backups}/pages/backups/backups.page.scss (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{backups-routes => backups}/pages/backups/backups.page.ts (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{backups-routes => backups}/pipes/get-display-info.pipe.ts (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{backups-routes => backups}/pipes/has-valid-backup.pipe.ts (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{backups-routes => backups}/pipes/target-pipes.module.ts (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{backups-routes => backups}/types/target-types.ts (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{marketplace-routes => marketplace}/marketplace-list/marketplace-list.module.ts (79%) rename frontend/projects/ui/src/app/apps/ui/pages/{marketplace-routes => marketplace}/marketplace-list/marketplace-list.page.html (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{marketplace-routes => marketplace}/marketplace-list/marketplace-list.page.scss (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{marketplace-routes => marketplace}/marketplace-list/marketplace-list.page.ts (97%) rename frontend/projects/ui/src/app/{modals => apps/ui/pages/marketplace/marketplace-list}/marketplace-settings/marketplace-settings.module.ts (76%) rename frontend/projects/ui/src/app/{modals => apps/ui/pages/marketplace/marketplace-list}/marketplace-settings/marketplace-settings.page.html (100%) rename frontend/projects/ui/src/app/{modals => apps/ui/pages/marketplace/marketplace-list}/marketplace-settings/marketplace-settings.page.scss (100%) rename frontend/projects/ui/src/app/{modals => apps/ui/pages/marketplace/marketplace-list}/marketplace-settings/marketplace-settings.page.ts (96%) rename frontend/projects/ui/src/app/apps/ui/pages/{marketplace-routes => marketplace}/marketplace-show/components/marketplace-show-components.module.ts (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{marketplace-routes => marketplace}/marketplace-show/components/marketplace-show-controls/marketplace-show-controls.component.html (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{marketplace-routes => marketplace}/marketplace-show/components/marketplace-show-controls/marketplace-show-controls.component.ts (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{marketplace-routes => marketplace}/marketplace-show/components/marketplace-show-controls/marketplace-show-controls.page.scss (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{marketplace-routes => marketplace}/marketplace-show/components/marketplace-show-dependent/marketplace-show-dependent.component.html (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{marketplace-routes => marketplace}/marketplace-show/components/marketplace-show-dependent/marketplace-show-dependent.component.scss (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{marketplace-routes => marketplace}/marketplace-show/components/marketplace-show-dependent/marketplace-show-dependent.component.ts (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{marketplace-routes => marketplace}/marketplace-show/components/marketplace-show-header/marketplace-show-header.component.html (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{marketplace-routes => marketplace}/marketplace-show/components/marketplace-show-header/marketplace-show-header.component.ts (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{marketplace-routes => marketplace}/marketplace-show/marketplace-show.module.ts (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{marketplace-routes => marketplace}/marketplace-show/marketplace-show.page.html (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{marketplace-routes => marketplace}/marketplace-show/marketplace-show.page.scss (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{marketplace-routes => marketplace}/marketplace-show/marketplace-show.page.ts (92%) rename frontend/projects/ui/src/app/apps/ui/pages/{marketplace-routes => marketplace}/marketplace-status/marketplace-status.component.html (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{marketplace-routes => marketplace}/marketplace-status/marketplace-status.component.scss (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{marketplace-routes => marketplace}/marketplace-status/marketplace-status.component.ts (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{marketplace-routes => marketplace}/marketplace-status/marketplace-status.module.ts (83%) rename frontend/projects/ui/src/app/apps/ui/pages/{marketplace-routes/marketplace-routing.module.ts => marketplace/marketplace.module.ts} (94%) rename frontend/projects/ui/src/app/apps/ui/pages/{marketplace-routes => marketplace}/release-notes/release-notes.module.ts (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{marketplace-routes => marketplace}/release-notes/release-notes.page.html (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{marketplace-routes => marketplace}/release-notes/release-notes.page.ts (100%) rename frontend/projects/ui/src/app/{modals => apps/ui/pages/services/app-actions}/action-success/action-success.module.ts (73%) rename frontend/projects/ui/src/app/{modals => apps/ui/pages/services/app-actions}/action-success/action-success.page.html (93%) rename frontend/projects/ui/src/app/{modals => apps/ui/pages/services/app-actions}/action-success/action-success.page.ts (95%) rename frontend/projects/ui/src/app/apps/ui/pages/{apps-routes => services}/app-actions/app-actions-item.component.html (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{apps-routes => services}/app-actions/app-actions.module.ts (78%) rename frontend/projects/ui/src/app/apps/ui/pages/{apps-routes => services}/app-actions/app-actions.page.html (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{apps-routes => services}/app-actions/app-actions.page.scss (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{apps-routes => services}/app-actions/app-actions.page.ts (96%) rename frontend/projects/ui/src/app/apps/ui/pages/{apps-routes => services}/app-credentials/app-credentials.module.ts (70%) rename frontend/projects/ui/src/app/apps/ui/pages/{apps-routes => services}/app-credentials/app-credentials.page.html (95%) rename frontend/projects/ui/src/app/apps/ui/pages/{apps-routes => services}/app-credentials/app-credentials.page.scss (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{apps-routes => services}/app-credentials/app-credentials.page.ts (94%) rename frontend/projects/ui/src/app/apps/ui/pages/{apps-routes => services}/app-interfaces/app-interfaces-item.component.html (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{apps-routes => services}/app-interfaces/app-interfaces.module.ts (69%) rename frontend/projects/ui/src/app/apps/ui/pages/{apps-routes => services}/app-interfaces/app-interfaces.page.html (100%) create mode 100644 frontend/projects/ui/src/app/apps/ui/pages/services/app-interfaces/app-interfaces.page.scss rename frontend/projects/ui/src/app/apps/ui/pages/{apps-routes => services}/app-interfaces/app-interfaces.page.ts (96%) rename frontend/projects/ui/src/app/{components/qr => apps/ui/pages/services/app-interfaces}/qr.component.ts (64%) rename frontend/projects/ui/src/app/apps/ui/pages/{apps-routes => services}/app-list/app-list-icon/app-list-icon.component.html (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{apps-routes => services}/app-list/app-list-icon/app-list-icon.component.scss (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{apps-routes => services}/app-list/app-list-icon/app-list-icon.component.ts (90%) rename frontend/projects/ui/src/app/apps/ui/pages/{apps-routes => services}/app-list/app-list-pkg/app-list-pkg.component.html (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{apps-routes => services}/app-list/app-list-pkg/app-list-pkg.component.scss (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{apps-routes => services}/app-list/app-list-pkg/app-list-pkg.component.ts (83%) rename frontend/projects/ui/src/app/apps/ui/pages/{apps-routes => services}/app-list/app-list.module.ts (70%) rename frontend/projects/ui/src/app/apps/ui/pages/{apps-routes => services}/app-list/app-list.page.html (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{apps-routes => services}/app-list/app-list.page.scss (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{apps-routes => services}/app-list/app-list.page.ts (92%) rename frontend/projects/ui/src/app/apps/ui/pages/{apps-routes => services}/app-list/package-info.pipe.ts (75%) rename frontend/projects/ui/src/app/apps/ui/pages/{apps-routes => services}/app-logs/app-logs.module.ts (85%) rename frontend/projects/ui/src/app/apps/ui/pages/{apps-routes => services}/app-logs/app-logs.page.html (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{apps-routes => services}/app-logs/app-logs.page.scss (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{apps-routes => services}/app-logs/app-logs.page.ts (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{apps-routes => services}/app-show/app-show.module.ts (82%) rename frontend/projects/ui/src/app/apps/ui/pages/{apps-routes => services}/app-show/app-show.page.html (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{apps-routes => services}/app-show/app-show.page.ts (97%) rename frontend/projects/ui/src/app/apps/ui/pages/{apps-routes => services}/app-show/components/app-show-additional/app-show-additional.component.html (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{apps-routes => services}/app-show/components/app-show-additional/app-show-additional.component.ts (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{apps-routes => services}/app-show/components/app-show-dependencies/app-show-dependencies.component.html (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{apps-routes => services}/app-show/components/app-show-dependencies/app-show-dependencies.component.scss (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{apps-routes => services}/app-show/components/app-show-dependencies/app-show-dependencies.component.ts (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{apps-routes => services}/app-show/components/app-show-header/app-show-header.component.html (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{apps-routes => services}/app-show/components/app-show-header/app-show-header.component.scss (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{apps-routes => services}/app-show/components/app-show-header/app-show-header.component.ts (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{apps-routes => services}/app-show/components/app-show-health-checks/app-show-health-checks.component.html (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{apps-routes => services}/app-show/components/app-show-health-checks/app-show-health-checks.component.scss (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{apps-routes => services}/app-show/components/app-show-health-checks/app-show-health-checks.component.ts (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{apps-routes => services}/app-show/components/app-show-menu/app-show-menu.component.html (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{apps-routes => services}/app-show/components/app-show-menu/app-show-menu.component.scss (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{apps-routes => services}/app-show/components/app-show-menu/app-show-menu.component.ts (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{apps-routes => services}/app-show/components/app-show-progress/app-show-progress.component.html (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{apps-routes => services}/app-show/components/app-show-progress/app-show-progress.component.scss (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{apps-routes => services}/app-show/components/app-show-progress/app-show-progress.component.ts (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{apps-routes => services}/app-show/components/app-show-status/app-show-status.component.html (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{apps-routes => services}/app-show/components/app-show-status/app-show-status.component.scss (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{apps-routes => services}/app-show/components/app-show-status/app-show-status.component.ts (97%) rename frontend/projects/ui/src/app/{ => apps/ui/pages/services/app-show}/modals/app-config/app-config-dep.component.ts (100%) rename frontend/projects/ui/src/app/{ => apps/ui/pages/services/app-show}/modals/app-config/app-config.module.ts (90%) rename frontend/projects/ui/src/app/{ => apps/ui/pages/services/app-show}/modals/app-config/app-config.page.html (100%) rename frontend/projects/ui/src/app/{ => apps/ui/pages/services/app-show}/modals/app-config/app-config.page.scss (100%) rename frontend/projects/ui/src/app/{ => apps/ui/pages/services/app-show}/modals/app-config/app-config.page.ts (95%) rename frontend/projects/ui/src/app/apps/ui/pages/{apps-routes => services}/app-show/pipes/health-color.pipe.ts (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{apps-routes => services}/app-show/pipes/progress-data.pipe.ts (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{apps-routes => services}/app-show/pipes/to-buttons.pipe.ts (98%) rename frontend/projects/ui/src/app/apps/ui/pages/{apps-routes => services}/app-show/pipes/to-dependencies.pipe.ts (98%) rename frontend/projects/ui/src/app/apps/ui/pages/{apps-routes => services}/app-show/pipes/to-status.pipe.ts (100%) rename frontend/projects/ui/src/app/{components => apps/ui/pages/services}/launch-menu/launch-menu.component.html (100%) rename frontend/projects/ui/src/app/{components => apps/ui/pages/services}/launch-menu/launch-menu.component.scss (100%) rename frontend/projects/ui/src/app/{components => apps/ui/pages/services}/launch-menu/launch-menu.component.ts (100%) rename frontend/projects/ui/src/app/{components => apps/ui/pages/services}/launch-menu/launch-menu.module.ts (74%) rename frontend/projects/ui/src/app/apps/ui/pages/{apps-routes/apps-routing.module.ts => services/services.module.ts} (97%) rename frontend/projects/ui/src/app/{components => apps/ui/pages/services}/status/status.component.html (100%) rename frontend/projects/ui/src/app/{components => apps/ui/pages/services}/status/status.component.module.ts (82%) rename frontend/projects/ui/src/app/{components => apps/ui/pages/services}/status/status.component.scss (100%) rename frontend/projects/ui/src/app/{components => apps/ui/pages/services}/status/status.component.ts (100%) rename frontend/projects/ui/src/app/{pipes/ui => apps/ui/pages/services/ui-pipes}/ui.module.ts (88%) rename frontend/projects/ui/src/app/{pipes/ui => apps/ui/pages/services/ui-pipes}/ui.pipe.ts (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{server-routes => system}/email/email.module.ts (92%) rename frontend/projects/ui/src/app/apps/ui/pages/{server-routes => system}/email/email.page.html (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{server-routes => system}/email/email.page.scss (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{server-routes => system}/email/email.page.ts (95%) rename frontend/projects/ui/src/app/apps/ui/pages/{server-routes => system}/kernel-logs/kernel-logs.module.ts (86%) rename frontend/projects/ui/src/app/apps/ui/pages/{server-routes => system}/kernel-logs/kernel-logs.page.html (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{server-routes => system}/kernel-logs/kernel-logs.page.scss (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{server-routes => system}/kernel-logs/kernel-logs.page.ts (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{server-routes => system}/lan/lan.module.ts (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{server-routes => system}/lan/lan.page.html (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{server-routes => system}/lan/lan.page.scss (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{server-routes => system}/lan/lan.page.ts (88%) rename frontend/projects/ui/src/app/apps/ui/pages/{server-routes => system}/server-logs/server-logs.module.ts (86%) rename frontend/projects/ui/src/app/apps/ui/pages/{server-routes => system}/server-logs/server-logs.page.html (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{server-routes => system}/server-logs/server-logs.page.scss (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{server-routes => system}/server-logs/server-logs.page.ts (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{server-routes => system}/server-metrics/server-metrics.module.ts (84%) rename frontend/projects/ui/src/app/apps/ui/pages/{server-routes => system}/server-metrics/server-metrics.page.html (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{server-routes => system}/server-metrics/server-metrics.page.scss (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{server-routes => system}/server-metrics/server-metrics.page.ts (100%) rename frontend/projects/ui/src/app/{pipes/backup-color => apps/ui/pages/system/server-show}/backup-color.pipe.ts (100%) rename frontend/projects/ui/src/app/{modals => apps/ui/pages/system/server-show}/os-update/os-update.page.html (100%) rename frontend/projects/ui/src/app/{modals => apps/ui/pages/system/server-show}/os-update/os-update.page.module.ts (100%) rename frontend/projects/ui/src/app/{modals => apps/ui/pages/system/server-show}/os-update/os-update.page.scss (100%) rename frontend/projects/ui/src/app/{modals => apps/ui/pages/system/server-show}/os-update/os-update.page.ts (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{server-routes => system}/server-show/server-show.module.ts (60%) rename frontend/projects/ui/src/app/apps/ui/pages/{server-routes => system}/server-show/server-show.page.html (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{server-routes => system}/server-show/server-show.page.scss (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{server-routes => system}/server-show/server-show.page.ts (99%) rename frontend/projects/ui/src/app/apps/ui/pages/{server-routes => system}/server-specs/server-specs.module.ts (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{server-routes => system}/server-specs/server-specs.page.html (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{server-routes => system}/server-specs/server-specs.page.scss (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{server-routes => system}/server-specs/server-specs.page.ts (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{server-routes => system}/sessions/sessions.module.ts (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{server-routes => system}/sessions/sessions.page.html (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{server-routes => system}/sessions/sessions.page.scss (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{server-routes => system}/sessions/sessions.page.ts (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{server-routes => system}/sideload/dnd.directive.ts (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{server-routes => system}/sideload/sideload.module.ts (89%) rename frontend/projects/ui/src/app/apps/ui/pages/{server-routes => system}/sideload/sideload.page.html (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{server-routes => system}/sideload/sideload.page.scss (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{server-routes => system}/sideload/sideload.page.ts (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{server-routes => system}/ssh-keys/ssh-keys.module.ts (79%) rename frontend/projects/ui/src/app/apps/ui/pages/{server-routes => system}/ssh-keys/ssh-keys.page.html (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{server-routes => system}/ssh-keys/ssh-keys.page.scss (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{server-routes => system}/ssh-keys/ssh-keys.page.ts (97%) rename frontend/projects/ui/src/app/apps/ui/pages/{server-routes/server-routing.module.ts => system/system.module.ts} (98%) rename frontend/projects/ui/src/app/apps/ui/pages/{server-routes => system}/theme-switcher/theme-switcher.component.html (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{server-routes => system}/theme-switcher/theme-switcher.component.ts (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{server-routes => system}/theme-switcher/theme-switcher.module.ts (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{server-routes => system}/wifi/wifi.const.ts (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{server-routes => system}/wifi/wifi.module.ts (87%) rename frontend/projects/ui/src/app/apps/ui/pages/{server-routes => system}/wifi/wifi.page.html (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{server-routes => system}/wifi/wifi.page.scss (100%) rename frontend/projects/ui/src/app/apps/ui/pages/{server-routes => system}/wifi/wifi.page.ts (98%) create mode 100644 frontend/projects/ui/src/app/apps/ui/pages/updates/filter-updates.pipe.ts rename frontend/projects/ui/src/app/{pipes/install-progress => apps/ui/pages/updates}/install-progress.pipe.ts (56%) rename frontend/projects/ui/src/app/{components => common}/badge-menu-button/badge-menu.component.html (100%) rename frontend/projects/ui/src/app/{components => common}/badge-menu-button/badge-menu.component.module.ts (100%) rename frontend/projects/ui/src/app/{components => common}/badge-menu-button/badge-menu.component.scss (100%) rename frontend/projects/ui/src/app/{components => common}/badge-menu-button/badge-menu.component.ts (100%) rename frontend/projects/ui/src/app/{components => common}/form/control.directive.ts (100%) rename frontend/projects/ui/src/app/{components => common}/form/control.ts (100%) rename frontend/projects/ui/src/app/{components => common}/form/form-array/form-array.component.html (100%) rename frontend/projects/ui/src/app/{components => common}/form/form-array/form-array.component.scss (100%) rename frontend/projects/ui/src/app/{components => common}/form/form-array/form-array.component.ts (100%) rename frontend/projects/ui/src/app/{components => common}/form/form-color/form-color.component.html (100%) rename frontend/projects/ui/src/app/{components => common}/form/form-color/form-color.component.scss (100%) rename frontend/projects/ui/src/app/{components => common}/form/form-color/form-color.component.ts (100%) rename frontend/projects/ui/src/app/{components => common}/form/form-control/form-control.component.html (100%) rename frontend/projects/ui/src/app/{components => common}/form/form-control/form-control.component.scss (100%) rename frontend/projects/ui/src/app/{components => common}/form/form-control/form-control.component.ts (100%) rename frontend/projects/ui/src/app/{components => common}/form/form-control/form-control.providers.ts (100%) rename frontend/projects/ui/src/app/{components => common}/form/form-datetime/form-datetime.component.html (100%) rename frontend/projects/ui/src/app/{components => common}/form/form-datetime/form-datetime.component.ts (100%) rename frontend/projects/ui/src/app/{components => common}/form/form-file/form-file.component.html (100%) rename frontend/projects/ui/src/app/{components => common}/form/form-file/form-file.component.scss (100%) rename frontend/projects/ui/src/app/{components => common}/form/form-file/form-file.component.ts (100%) rename frontend/projects/ui/src/app/{components => common}/form/form-group/form-group.component.html (100%) rename frontend/projects/ui/src/app/{components => common}/form/form-group/form-group.component.scss (100%) rename frontend/projects/ui/src/app/{components => common}/form/form-group/form-group.component.ts (100%) rename frontend/projects/ui/src/app/{components => common}/form/form-group/form-group.providers.ts (100%) rename frontend/projects/ui/src/app/{components => common}/form/form-multiselect/form-multiselect.component.html (100%) rename frontend/projects/ui/src/app/{components => common}/form/form-multiselect/form-multiselect.component.ts (100%) rename frontend/projects/ui/src/app/{components => common}/form/form-number/form-number.component.html (100%) rename frontend/projects/ui/src/app/{components => common}/form/form-number/form-number.component.ts (100%) rename frontend/projects/ui/src/app/{components => common}/form/form-object/form-object.component.html (100%) rename frontend/projects/ui/src/app/{components => common}/form/form-object/form-object.component.scss (100%) rename frontend/projects/ui/src/app/{components => common}/form/form-object/form-object.component.ts (100%) rename frontend/projects/ui/src/app/{components => common}/form/form-select/form-select.component.html (100%) rename frontend/projects/ui/src/app/{components => common}/form/form-select/form-select.component.ts (100%) rename frontend/projects/ui/src/app/{components => common}/form/form-text/form-text.component.html (100%) rename frontend/projects/ui/src/app/{components => common}/form/form-text/form-text.component.scss (100%) rename frontend/projects/ui/src/app/{components => common}/form/form-text/form-text.component.ts (100%) rename frontend/projects/ui/src/app/{components => common}/form/form-textarea/form-textarea.component.html (100%) rename frontend/projects/ui/src/app/{components => common}/form/form-textarea/form-textarea.component.ts (100%) rename frontend/projects/ui/src/app/{components => common}/form/form-toggle/form-toggle.component.html (100%) rename frontend/projects/ui/src/app/{components => common}/form/form-toggle/form-toggle.component.scss (100%) rename frontend/projects/ui/src/app/{components => common}/form/form-toggle/form-toggle.component.ts (100%) rename frontend/projects/ui/src/app/{components => common}/form/form-union/form-union.component.html (100%) rename frontend/projects/ui/src/app/{components => common}/form/form-union/form-union.component.scss (100%) rename frontend/projects/ui/src/app/{components => common}/form/form-union/form-union.component.ts (100%) rename frontend/projects/ui/src/app/{components => common}/form/form.module.ts (100%) rename frontend/projects/ui/src/app/{components => common}/form/hint.pipe.ts (100%) rename frontend/projects/ui/src/app/{components => common}/form/invalid.service.ts (100%) rename frontend/projects/ui/src/app/{components => common}/form/mustache.pipe.ts (100%) rename frontend/projects/ui/src/app/{components => common}/insecure-warning/insecure-warning.component.html (100%) rename frontend/projects/ui/src/app/{components => common}/insecure-warning/insecure-warning.component.scss (100%) rename frontend/projects/ui/src/app/{components => common}/insecure-warning/insecure-warning.component.ts (100%) rename frontend/projects/ui/src/app/{components => common}/insecure-warning/insecure-warning.module.ts (100%) create mode 100644 frontend/projects/ui/src/app/common/install-progress/install-progress.module.ts create mode 100644 frontend/projects/ui/src/app/common/install-progress/install-progress.pipe.ts rename frontend/projects/ui/src/app/{modals => common}/loading/loading.component.scss (100%) rename frontend/projects/ui/src/app/{modals => common}/loading/loading.component.ts (100%) rename frontend/projects/ui/src/app/{modals => common}/loading/loading.module.ts (100%) rename frontend/projects/ui/src/app/{modals => common}/loading/loading.service.ts (100%) rename frontend/projects/ui/src/app/{components => common}/logs/logs.component.html (100%) rename frontend/projects/ui/src/app/{components => common}/logs/logs.component.module.ts (100%) rename frontend/projects/ui/src/app/{components => common}/logs/logs.component.scss (100%) rename frontend/projects/ui/src/app/{components => common}/logs/logs.component.ts (100%) rename frontend/projects/ui/src/app/{modals => common}/os-welcome/os-welcome.module.ts (100%) rename frontend/projects/ui/src/app/{modals => common}/os-welcome/os-welcome.page.html (100%) rename frontend/projects/ui/src/app/{modals => common}/os-welcome/os-welcome.page.scss (100%) rename frontend/projects/ui/src/app/{modals => common}/os-welcome/os-welcome.page.ts (100%) rename frontend/projects/ui/src/app/{components => common}/skeleton-list/skeleton-list.component.html (100%) rename frontend/projects/ui/src/app/{components => common}/skeleton-list/skeleton-list.component.module.ts (62%) rename frontend/projects/ui/src/app/{components => common}/skeleton-list/skeleton-list.component.ts (89%) rename frontend/projects/ui/src/app/{components => common}/store-icon/store-icon.component.html (100%) rename frontend/projects/ui/src/app/{components => common}/store-icon/store-icon.component.module.ts (100%) rename frontend/projects/ui/src/app/{components => common}/store-icon/store-icon.component.scss (100%) rename frontend/projects/ui/src/app/{components => common}/store-icon/store-icon.component.ts (100%) rename frontend/projects/ui/src/app/{components => common}/toast-container/notifications-toast/notifications-toast.component.html (100%) rename frontend/projects/ui/src/app/{components => common}/toast-container/notifications-toast/notifications-toast.component.ts (100%) rename frontend/projects/ui/src/app/{components => common}/toast-container/notifications-toast/notifications-toast.service.ts (86%) rename frontend/projects/ui/src/app/{components => common}/toast-container/refresh-alert/refresh-alert.component.html (65%) rename frontend/projects/ui/src/app/{components => common}/toast-container/refresh-alert/refresh-alert.component.ts (100%) rename frontend/projects/ui/src/app/{components => common}/toast-container/refresh-alert/refresh-alert.service.ts (90%) rename frontend/projects/ui/src/app/{components => common}/toast-container/toast-container.component.html (100%) rename frontend/projects/ui/src/app/{components => common}/toast-container/toast-container.component.ts (100%) rename frontend/projects/ui/src/app/{components => common}/toast-container/toast-container.module.ts (100%) rename frontend/projects/ui/src/app/{components => common}/toast-container/update-toast/update-toast.component.html (100%) rename frontend/projects/ui/src/app/{components => common}/toast-container/update-toast/update-toast.component.ts (100%) rename frontend/projects/ui/src/app/{components => common}/toast-container/update-toast/update-toast.service.ts (83%) rename frontend/projects/ui/src/app/{components => common/widget-list}/any-link/any-link.component.html (100%) rename frontend/projects/ui/src/app/{components => common/widget-list}/any-link/any-link.component.scss (100%) rename frontend/projects/ui/src/app/{components => common/widget-list}/any-link/any-link.component.ts (100%) rename frontend/projects/ui/src/app/{components => common/widget-list}/widget-card/widget-card.component.html (100%) rename frontend/projects/ui/src/app/{components => common/widget-list}/widget-card/widget-card.component.scss (94%) rename frontend/projects/ui/src/app/{components => common/widget-list}/widget-card/widget-card.component.ts (100%) rename frontend/projects/ui/src/app/{components => common}/widget-list/widget-list.component.html (100%) rename frontend/projects/ui/src/app/{components => common}/widget-list/widget-list.component.module.ts (51%) rename frontend/projects/ui/src/app/{components => common}/widget-list/widget-list.component.scss (100%) rename frontend/projects/ui/src/app/{components => common}/widget-list/widget-list.component.ts (96%) delete mode 100644 frontend/projects/ui/src/app/components/any-link/any-link.component.module.ts delete mode 100644 frontend/projects/ui/src/app/components/qr/qr.component.html delete mode 100644 frontend/projects/ui/src/app/components/qr/qr.component.module.ts delete mode 100644 frontend/projects/ui/src/app/components/qr/qr.component.scss delete mode 100644 frontend/projects/ui/src/app/components/skeleton-list/skeleton-list.component.scss delete mode 100644 frontend/projects/ui/src/app/components/widget-card/widget-card.component.module.ts delete mode 100644 frontend/projects/ui/src/app/modals/action-success/action-success.page.scss delete mode 100644 frontend/projects/ui/src/app/modals/backup-report/backup-report.page.scss delete mode 100644 frontend/projects/ui/src/app/modals/generic-input/generic-input.component.scss delete mode 100644 frontend/projects/ui/src/app/modals/snake/snake.module.ts delete mode 100644 frontend/projects/ui/src/app/pipes/backup-color/backup-color.module.ts delete mode 100644 frontend/projects/ui/src/app/pipes/install-progress/install-progress.module.ts delete mode 100644 frontend/projects/ui/src/app/pipes/mask/mask.module.ts delete mode 100644 frontend/projects/ui/src/app/pipes/mask/mask.pipe.ts create mode 100644 frontend/projects/ui/src/app/types/pkg-info.ts create mode 100644 frontend/projects/ui/src/app/util/mask.ts diff --git a/frontend/projects/shared/src/components/markdown/markdown.component.ts b/frontend/projects/shared/src/components/markdown/markdown.component.ts index d560f7537..7e47acc39 100644 --- a/frontend/projects/shared/src/components/markdown/markdown.component.ts +++ b/frontend/projects/shared/src/components/markdown/markdown.component.ts @@ -1,7 +1,14 @@ import { Component, Input } from '@angular/core' import { ModalController } from '@ionic/angular' -import { defer, isObservable, Observable, of } from 'rxjs' -import { catchError, ignoreElements, share } from 'rxjs/operators' +import { + catchError, + ignoreElements, + share, + defer, + isObservable, + Observable, + of, +} from 'rxjs' import { getErrorMessage } from '../../services/error-toast.service' diff --git a/frontend/projects/shared/src/directives/responsive-col/responsive-col-viewport.directive.ts b/frontend/projects/shared/src/directives/responsive-col/responsive-col-viewport.directive.ts index f85e19517..0ebb564c8 100644 --- a/frontend/projects/shared/src/directives/responsive-col/responsive-col-viewport.directive.ts +++ b/frontend/projects/shared/src/directives/responsive-col/responsive-col-viewport.directive.ts @@ -7,8 +7,7 @@ import { NgZone, } from '@angular/core' import { ResizeObserverService } from '@ng-web-apis/resize-observer' -import { distinctUntilChanged, Observable } from 'rxjs' -import { map } from 'rxjs/operators' +import { distinctUntilChanged, map, Observable } from 'rxjs' import { tuiZonefree } from '@taiga-ui/cdk' export type Step = 'xs' | 'sm' | 'md' | 'lg' | 'xl' diff --git a/frontend/projects/shared/src/util/unused.ts b/frontend/projects/shared/src/util/unused.ts index bbf3f5666..1a5509c69 100644 --- a/frontend/projects/shared/src/util/unused.ts +++ b/frontend/projects/shared/src/util/unused.ts @@ -1,5 +1,4 @@ -import { OperatorFunction } from 'rxjs' -import { map } from 'rxjs/operators' +import { map, OperatorFunction } from 'rxjs' /** * These utils are not used anywhere diff --git a/frontend/projects/ui/src/app/app.module.ts b/frontend/projects/ui/src/app/app.module.ts index 62a87ffd6..215c97e83 100644 --- a/frontend/projects/ui/src/app/app.module.ts +++ b/frontend/projects/ui/src/app/app.module.ts @@ -20,21 +20,19 @@ import { import { AppComponent } from './app.component' import { RoutingModule } from './routing.module' -import { OSWelcomePageModule } from './modals/os-welcome/os-welcome.module' -import { GenericInputComponentModule } from './modals/generic-input/generic-input.component.module' +import { OSWelcomePageModule } from './common/os-welcome/os-welcome.module' import { PreloaderModule } from './app/preloader/preloader.module' import { FooterModule } from './app/footer/footer.module' import { MenuModule } from './app/menu/menu.module' import { EnterModule } from './app/enter/enter.module' import { APP_PROVIDERS } from './app.providers' import { PatchDbModule } from './services/patch-db/patch-db.module' -import { ToastContainerModule } from './components/toast-container/toast-container.module' -import { ConnectionBarComponentModule } from './components/connection-bar/connection-bar.component.module' +import { ToastContainerModule } from './common/toast-container/toast-container.module' +import { ConnectionBarComponentModule } from './app/connection-bar/connection-bar.component.module' import { WidgetsPageModule } from 'src/app/apps/ui/pages/widgets/widgets.module' import { ServiceWorkerModule } from '@angular/service-worker' import { environment } from '../environments/environment' -import { LoadingModule } from './modals/loading/loading.module' -import { FormPageModule } from './modals/form/form.module' +import { LoadingModule } from './common/loading/loading.module' @NgModule({ declarations: [AppComponent], @@ -51,7 +49,6 @@ import { FormPageModule } from './modals/form/form.module' EnterModule, OSWelcomePageModule, MarkdownModule, - GenericInputComponentModule, MonacoEditorModule, SharedPipesModule, PatchDbModule, @@ -73,7 +70,6 @@ import { FormPageModule } from './modals/form/form.module' registrationStrategy: 'registerWhenStable:30000', }), LoadingModule, - FormPageModule, ], providers: APP_PROVIDERS, bootstrap: [AppComponent], diff --git a/frontend/projects/ui/src/app/components/connection-bar/connection-bar.component.html b/frontend/projects/ui/src/app/app/connection-bar/connection-bar.component.html similarity index 100% rename from frontend/projects/ui/src/app/components/connection-bar/connection-bar.component.html rename to frontend/projects/ui/src/app/app/connection-bar/connection-bar.component.html diff --git a/frontend/projects/ui/src/app/components/connection-bar/connection-bar.component.module.ts b/frontend/projects/ui/src/app/app/connection-bar/connection-bar.component.module.ts similarity index 100% rename from frontend/projects/ui/src/app/components/connection-bar/connection-bar.component.module.ts rename to frontend/projects/ui/src/app/app/connection-bar/connection-bar.component.module.ts diff --git a/frontend/projects/ui/src/app/components/connection-bar/connection-bar.component.scss b/frontend/projects/ui/src/app/app/connection-bar/connection-bar.component.scss similarity index 100% rename from frontend/projects/ui/src/app/components/connection-bar/connection-bar.component.scss rename to frontend/projects/ui/src/app/app/connection-bar/connection-bar.component.scss diff --git a/frontend/projects/ui/src/app/components/connection-bar/connection-bar.component.ts b/frontend/projects/ui/src/app/app/connection-bar/connection-bar.component.ts similarity index 100% rename from frontend/projects/ui/src/app/components/connection-bar/connection-bar.component.ts rename to frontend/projects/ui/src/app/app/connection-bar/connection-bar.component.ts diff --git a/frontend/projects/ui/src/app/app/footer/footer.component.ts b/frontend/projects/ui/src/app/app/footer/footer.component.ts index bad7fcc3b..c630418fd 100644 --- a/frontend/projects/ui/src/app/app/footer/footer.component.ts +++ b/frontend/projects/ui/src/app/app/footer/footer.component.ts @@ -1,7 +1,7 @@ import { ChangeDetectionStrategy, Component } from '@angular/core' -import { heightCollapse } from 'src/app/util/animations' import { PatchDB } from 'patch-db-client' -import { map } from 'rxjs/operators' +import { map } from 'rxjs' +import { heightCollapse } from 'src/app/util/animations' import { DataModel } from 'src/app/services/patch-db/data-model' @Component({ diff --git a/frontend/projects/ui/src/app/app/menu/menu.module.ts b/frontend/projects/ui/src/app/app/menu/menu.module.ts index 8797309fe..72a3fec9d 100644 --- a/frontend/projects/ui/src/app/app/menu/menu.module.ts +++ b/frontend/projects/ui/src/app/app/menu/menu.module.ts @@ -4,7 +4,7 @@ import { RouterModule } from '@angular/router' import { IonicModule } from '@ionic/angular' import { MenuComponent } from './menu.component' import { SnekModule } from '../snek/snek.module' -import { ConnectionBarComponentModule } from 'src/app/components/connection-bar/connection-bar.component.module' +import { ConnectionBarComponentModule } from '../connection-bar/connection-bar.component.module' @NgModule({ imports: [ diff --git a/frontend/projects/ui/src/app/modals/snake/snake.page.html b/frontend/projects/ui/src/app/app/snek/snake.page.html similarity index 100% rename from frontend/projects/ui/src/app/modals/snake/snake.page.html rename to frontend/projects/ui/src/app/app/snek/snake.page.html diff --git a/frontend/projects/ui/src/app/modals/snake/snake.page.scss b/frontend/projects/ui/src/app/app/snek/snake.page.scss similarity index 100% rename from frontend/projects/ui/src/app/modals/snake/snake.page.scss rename to frontend/projects/ui/src/app/app/snek/snake.page.scss diff --git a/frontend/projects/ui/src/app/modals/snake/snake.page.ts b/frontend/projects/ui/src/app/app/snek/snake.page.ts similarity index 99% rename from frontend/projects/ui/src/app/modals/snake/snake.page.ts rename to frontend/projects/ui/src/app/app/snek/snake.page.ts index 6296a8609..6c671201d 100644 --- a/frontend/projects/ui/src/app/modals/snake/snake.page.ts +++ b/frontend/projects/ui/src/app/app/snek/snake.page.ts @@ -1,6 +1,6 @@ import { Component, HostListener, Input } from '@angular/core' import { ModalController } from '@ionic/angular' -import { pauseFor } from '@start9labs/shared' +import { pauseFor } from '../../../../../shared/src/public-api' @Component({ selector: 'snake', diff --git a/frontend/projects/ui/src/app/app/snek/snek.directive.ts b/frontend/projects/ui/src/app/app/snek/snek.directive.ts index f056e93e5..5c8cc76b4 100644 --- a/frontend/projects/ui/src/app/app/snek/snek.directive.ts +++ b/frontend/projects/ui/src/app/app/snek/snek.directive.ts @@ -1,8 +1,8 @@ import { Directive, HostListener, Input } from '@angular/core' import { LoadingController, ModalController } from '@ionic/angular' import { ErrorToastService } from '@start9labs/shared' -import { SnakePage } from 'src/app/modals/snake/snake.page' import { ApiService } from 'src/app/services/api/embassy-api.service' +import { SnakePage } from './snake.page' @Directive({ selector: 'img[appSnek]', diff --git a/frontend/projects/ui/src/app/app/snek/snek.module.ts b/frontend/projects/ui/src/app/app/snek/snek.module.ts index 990192afa..73f4d0e8f 100644 --- a/frontend/projects/ui/src/app/app/snek/snek.module.ts +++ b/frontend/projects/ui/src/app/app/snek/snek.module.ts @@ -1,11 +1,13 @@ import { NgModule } from '@angular/core' +import { CommonModule } from '@angular/common' +import { IonicModule } from '@ionic/angular' -import { SnakePageModule } from 'src/app/modals/snake/snake.module' import { SnekDirective } from './snek.directive' +import { SnakePage } from './snake.page' @NgModule({ - imports: [SnakePageModule], - declarations: [SnekDirective], - exports: [SnekDirective], + imports: [CommonModule, IonicModule], + declarations: [SnekDirective, SnakePage], + exports: [SnekDirective, SnakePage], }) export class SnekModule {} diff --git a/frontend/projects/ui/src/app/modals/backup-report/backup-report.module.ts b/frontend/projects/ui/src/app/apps/ui/modals/backup-report/backup-report.module.ts similarity index 74% rename from frontend/projects/ui/src/app/modals/backup-report/backup-report.module.ts rename to frontend/projects/ui/src/app/apps/ui/modals/backup-report/backup-report.module.ts index 16e635e28..f21ff0918 100644 --- a/frontend/projects/ui/src/app/modals/backup-report/backup-report.module.ts +++ b/frontend/projects/ui/src/app/apps/ui/modals/backup-report/backup-report.module.ts @@ -5,10 +5,7 @@ import { BackupReportPage } from './backup-report.page' @NgModule({ declarations: [BackupReportPage], - imports: [ - CommonModule, - IonicModule, - ], + imports: [CommonModule, IonicModule], exports: [BackupReportPage], }) -export class BackupReportPageModule { } +export class BackupReportPageModule {} diff --git a/frontend/projects/ui/src/app/modals/backup-report/backup-report.page.html b/frontend/projects/ui/src/app/apps/ui/modals/backup-report/backup-report.page.html similarity index 82% rename from frontend/projects/ui/src/app/modals/backup-report/backup-report.page.html rename to frontend/projects/ui/src/app/apps/ui/modals/backup-report/backup-report.page.html index f3a9e98d5..4ecf064d9 100644 --- a/frontend/projects/ui/src/app/modals/backup-report/backup-report.page.html +++ b/frontend/projects/ui/src/app/apps/ui/modals/backup-report/backup-report.page.html @@ -11,9 +11,9 @@ - Completed: {{ timestamp | date : 'medium' }} + + Completed: {{ timestamp | date : 'medium' }} +

System data

@@ -29,10 +29,9 @@

{{ pkg.key }}

- {{ pkg.value.error ? 'Failed: ' + pkg.value.error : 'Succeeded' - }} + + {{ pkg.value.error ? 'Failed: ' + pkg.value.error : 'Succeeded' }} +

{ text: string diff --git a/frontend/projects/ui/src/app/modals/generic-input/generic-input.component.html b/frontend/projects/ui/src/app/apps/ui/modals/generic-input/generic-input.component.html similarity index 100% rename from frontend/projects/ui/src/app/modals/generic-input/generic-input.component.html rename to frontend/projects/ui/src/app/apps/ui/modals/generic-input/generic-input.component.html diff --git a/frontend/projects/ui/src/app/modals/generic-input/generic-input.component.module.ts b/frontend/projects/ui/src/app/apps/ui/modals/generic-input/generic-input.component.module.ts similarity index 100% rename from frontend/projects/ui/src/app/modals/generic-input/generic-input.component.module.ts rename to frontend/projects/ui/src/app/apps/ui/modals/generic-input/generic-input.component.module.ts diff --git a/frontend/projects/ui/src/app/modals/generic-input/generic-input.component.ts b/frontend/projects/ui/src/app/apps/ui/modals/generic-input/generic-input.component.ts similarity index 86% rename from frontend/projects/ui/src/app/modals/generic-input/generic-input.component.ts rename to frontend/projects/ui/src/app/apps/ui/modals/generic-input/generic-input.component.ts index 1bcf27d6a..2ebf80539 100644 --- a/frontend/projects/ui/src/app/modals/generic-input/generic-input.component.ts +++ b/frontend/projects/ui/src/app/apps/ui/modals/generic-input/generic-input.component.ts @@ -1,13 +1,11 @@ import { Component, inject, Input, ViewChild } from '@angular/core' import { ModalController, IonicSafeString, IonInput } from '@ionic/angular' import { getErrorMessage, THEME } from '@start9labs/shared' -import { MaskPipe } from 'src/app/pipes/mask/mask.pipe' +import { mask } from 'src/app/util/mask' @Component({ selector: 'generic-input', templateUrl: './generic-input.component.html', - styleUrls: ['./generic-input.component.scss'], - providers: [MaskPipe], }) export class GenericInputComponent { @ViewChild('mainInput') elem?: IonInput @@ -23,10 +21,7 @@ export class GenericInputComponent { readonly theme$ = inject(THEME) - constructor( - private readonly modalCtrl: ModalController, - private readonly mask: MaskPipe, - ) {} + constructor(private readonly modalCtrl: ModalController) {} ngOnInit() { const defaultOptions: Partial = { @@ -62,7 +57,7 @@ export class GenericInputComponent { .split('') .map(x => (x === '●' ? this.value[i++] : x)) .join('') - this.maskedValue = this.mask.transform(this.value) + this.maskedValue = mask(this.value) } async submit() { diff --git a/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-interfaces/app-interfaces.page.scss b/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-interfaces/app-interfaces.page.scss deleted file mode 100644 index 61ead3b94..000000000 --- a/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-interfaces/app-interfaces.page.scss +++ /dev/null @@ -1,3 +0,0 @@ -p { - font-family: 'Courier New'; -} \ No newline at end of file diff --git a/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/backups-routing.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/backups/backups.module.ts similarity index 95% rename from frontend/projects/ui/src/app/apps/ui/pages/backups-routes/backups-routing.module.ts rename to frontend/projects/ui/src/app/apps/ui/pages/backups/backups.module.ts index 94b506cc1..bcb252335 100644 --- a/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/backups-routing.module.ts +++ b/frontend/projects/ui/src/app/apps/ui/pages/backups/backups.module.ts @@ -34,4 +34,4 @@ const routes: Routes = [ imports: [RouterModule.forChild(routes)], exports: [RouterModule], }) -export class BackupsRoutingModule {} +export class BackupsModule {} diff --git a/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/components/backing-up/backing-up.component.html b/frontend/projects/ui/src/app/apps/ui/pages/backups/components/backing-up/backing-up.component.html similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/backups-routes/components/backing-up/backing-up.component.html rename to frontend/projects/ui/src/app/apps/ui/pages/backups/components/backing-up/backing-up.component.html diff --git a/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/components/backing-up/backing-up.component.ts b/frontend/projects/ui/src/app/apps/ui/pages/backups/components/backing-up/backing-up.component.ts similarity index 93% rename from frontend/projects/ui/src/app/apps/ui/pages/backups-routes/components/backing-up/backing-up.component.ts rename to frontend/projects/ui/src/app/apps/ui/pages/backups/components/backing-up/backing-up.component.ts index 9e9016481..4e297019e 100644 --- a/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/components/backing-up/backing-up.component.ts +++ b/frontend/projects/ui/src/app/apps/ui/pages/backups/components/backing-up/backing-up.component.ts @@ -5,12 +5,11 @@ import { PipeTransform, } from '@angular/core' import { PatchDB } from 'patch-db-client' -import { take } from 'rxjs/operators' +import { take, Observable } from 'rxjs' import { DataModel, PackageMainStatus, } from 'src/app/services/patch-db/data-model' -import { Observable } from 'rxjs' @Component({ selector: 'backing-up', diff --git a/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/directives/backup-create.directive.ts b/frontend/projects/ui/src/app/apps/ui/pages/backups/directives/backup-create.directive.ts similarity index 94% rename from frontend/projects/ui/src/app/apps/ui/pages/backups-routes/directives/backup-create.directive.ts rename to frontend/projects/ui/src/app/apps/ui/pages/backups/directives/backup-create.directive.ts index 1f4fa3059..50ee7f8a8 100644 --- a/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/directives/backup-create.directive.ts +++ b/frontend/projects/ui/src/app/apps/ui/pages/backups/directives/backup-create.directive.ts @@ -1,12 +1,12 @@ import { Directive, HostListener } from '@angular/core' import { LoadingController, ModalController } from '@ionic/angular' import { ApiService } from 'src/app/services/api/embassy-api.service' -import { BackupSelectPage } from 'src/app/apps/ui/pages/backups-routes/modals/backup-select/backup-select.page' import { TargetSelectPage } from '../modals/target-select/target-select.page' import { CifsBackupTarget, DiskBackupTarget, } from 'src/app/services/api/api.types' +import { BackupSelectPage } from '../modals/backup-select/backup-select.page' @Directive({ selector: '[backupCreate]', diff --git a/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/directives/backup-restore.directive.ts b/frontend/projects/ui/src/app/apps/ui/pages/backups/directives/backup-restore.directive.ts similarity index 94% rename from frontend/projects/ui/src/app/apps/ui/pages/backups-routes/directives/backup-restore.directive.ts rename to frontend/projects/ui/src/app/apps/ui/pages/backups/directives/backup-restore.directive.ts index f0f204ce4..3b1710030 100644 --- a/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/directives/backup-restore.directive.ts +++ b/frontend/projects/ui/src/app/apps/ui/pages/backups/directives/backup-restore.directive.ts @@ -8,11 +8,11 @@ import { ApiService } from 'src/app/services/api/embassy-api.service' import { GenericInputComponent, GenericInputOptions, -} from 'src/app/modals/generic-input/generic-input.component' +} from 'src/app/apps/ui/modals/generic-input/generic-input.component' import { BackupInfo, BackupTarget } from 'src/app/services/api/api.types' -import { RecoverSelectPage } from 'src/app/apps/ui/pages/backups-routes/modals/recover-select/recover-select.page' import * as argon2 from '@start9labs/argon2' import { TargetSelectPage } from '../modals/target-select/target-select.page' +import { RecoverSelectPage } from '../modals/recover-select/recover-select.page' @Directive({ selector: '[backupRestore]', diff --git a/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/modals/backup-select/backup-select.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/backups/modals/backup-select/backup-select.module.ts similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/backups-routes/modals/backup-select/backup-select.module.ts rename to frontend/projects/ui/src/app/apps/ui/pages/backups/modals/backup-select/backup-select.module.ts diff --git a/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/modals/backup-select/backup-select.page.html b/frontend/projects/ui/src/app/apps/ui/pages/backups/modals/backup-select/backup-select.page.html similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/backups-routes/modals/backup-select/backup-select.page.html rename to frontend/projects/ui/src/app/apps/ui/pages/backups/modals/backup-select/backup-select.page.html diff --git a/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/modals/backup-select/backup-select.page.scss b/frontend/projects/ui/src/app/apps/ui/pages/backups/modals/backup-select/backup-select.page.scss similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/backups-routes/modals/backup-select/backup-select.page.scss rename to frontend/projects/ui/src/app/apps/ui/pages/backups/modals/backup-select/backup-select.page.scss diff --git a/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/modals/backup-select/backup-select.page.ts b/frontend/projects/ui/src/app/apps/ui/pages/backups/modals/backup-select/backup-select.page.ts similarity index 95% rename from frontend/projects/ui/src/app/apps/ui/pages/backups-routes/modals/backup-select/backup-select.page.ts rename to frontend/projects/ui/src/app/apps/ui/pages/backups/modals/backup-select/backup-select.page.ts index 117597b1a..6c1f84614 100644 --- a/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/modals/backup-select/backup-select.page.ts +++ b/frontend/projects/ui/src/app/apps/ui/pages/backups/modals/backup-select/backup-select.page.ts @@ -1,9 +1,8 @@ import { Component, Input } from '@angular/core' import { ModalController } from '@ionic/angular' -import { map } from 'rxjs/operators' -import { DataModel, PackageState } from 'src/app/services/patch-db/data-model' import { PatchDB } from 'patch-db-client' -import { firstValueFrom } from 'rxjs' +import { firstValueFrom, map } from 'rxjs' +import { DataModel, PackageState } from 'src/app/services/patch-db/data-model' @Component({ selector: 'backup-select', diff --git a/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/modals/recover-select/recover-select.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/backups/modals/recover-select/recover-select.module.ts similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/backups-routes/modals/recover-select/recover-select.module.ts rename to frontend/projects/ui/src/app/apps/ui/pages/backups/modals/recover-select/recover-select.module.ts diff --git a/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/modals/recover-select/recover-select.page.html b/frontend/projects/ui/src/app/apps/ui/pages/backups/modals/recover-select/recover-select.page.html similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/backups-routes/modals/recover-select/recover-select.page.html rename to frontend/projects/ui/src/app/apps/ui/pages/backups/modals/recover-select/recover-select.page.html diff --git a/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/modals/recover-select/recover-select.page.scss b/frontend/projects/ui/src/app/apps/ui/pages/backups/modals/recover-select/recover-select.page.scss similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/backups-routes/modals/recover-select/recover-select.page.scss rename to frontend/projects/ui/src/app/apps/ui/pages/backups/modals/recover-select/recover-select.page.scss diff --git a/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/modals/recover-select/recover-select.page.ts b/frontend/projects/ui/src/app/apps/ui/pages/backups/modals/recover-select/recover-select.page.ts similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/backups-routes/modals/recover-select/recover-select.page.ts rename to frontend/projects/ui/src/app/apps/ui/pages/backups/modals/recover-select/recover-select.page.ts diff --git a/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/modals/recover-select/to-options.pipe.ts b/frontend/projects/ui/src/app/apps/ui/pages/backups/modals/recover-select/to-options.pipe.ts similarity index 95% rename from frontend/projects/ui/src/app/apps/ui/pages/backups-routes/modals/recover-select/to-options.pipe.ts rename to frontend/projects/ui/src/app/apps/ui/pages/backups/modals/recover-select/to-options.pipe.ts index 2ac688a6b..59a5644bb 100644 --- a/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/modals/recover-select/to-options.pipe.ts +++ b/frontend/projects/ui/src/app/apps/ui/pages/backups/modals/recover-select/to-options.pipe.ts @@ -1,10 +1,9 @@ import { Pipe, PipeTransform } from '@angular/core' import { Emver } from '@start9labs/shared' +import { map, Observable } from 'rxjs' import { PackageBackupInfo } from 'src/app/services/api/api.types' import { ConfigService } from 'src/app/services/config.service' import { PackageDataEntry } from 'src/app/services/patch-db/data-model' -import { Observable } from 'rxjs' -import { map } from 'rxjs/operators' export interface AppRecoverOption extends PackageBackupInfo { id: string diff --git a/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/modals/target-select/target-select.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/backups/modals/target-select/target-select.module.ts similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/backups-routes/modals/target-select/target-select.module.ts rename to frontend/projects/ui/src/app/apps/ui/pages/backups/modals/target-select/target-select.module.ts diff --git a/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/modals/target-select/target-select.page.html b/frontend/projects/ui/src/app/apps/ui/pages/backups/modals/target-select/target-select.page.html similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/backups-routes/modals/target-select/target-select.page.html rename to frontend/projects/ui/src/app/apps/ui/pages/backups/modals/target-select/target-select.page.html diff --git a/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/modals/target-select/target-select.page.scss b/frontend/projects/ui/src/app/apps/ui/pages/backups/modals/target-select/target-select.page.scss similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/backups-routes/modals/target-select/target-select.page.scss rename to frontend/projects/ui/src/app/apps/ui/pages/backups/modals/target-select/target-select.page.scss diff --git a/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/modals/target-select/target-select.page.ts b/frontend/projects/ui/src/app/apps/ui/pages/backups/modals/target-select/target-select.page.ts similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/backups-routes/modals/target-select/target-select.page.ts rename to frontend/projects/ui/src/app/apps/ui/pages/backups/modals/target-select/target-select.page.ts diff --git a/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/modals/target-select/target-status.component.html b/frontend/projects/ui/src/app/apps/ui/pages/backups/modals/target-select/target-status.component.html similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/backups-routes/modals/target-select/target-status.component.html rename to frontend/projects/ui/src/app/apps/ui/pages/backups/modals/target-select/target-status.component.html diff --git a/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-history/backup-history.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/backups/pages/backup-history/backup-history.module.ts similarity index 83% rename from frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-history/backup-history.module.ts rename to frontend/projects/ui/src/app/apps/ui/pages/backups/pages/backup-history/backup-history.module.ts index cbc1ba2dd..dac31f7f2 100644 --- a/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-history/backup-history.module.ts +++ b/frontend/projects/ui/src/app/apps/ui/pages/backups/pages/backup-history/backup-history.module.ts @@ -8,6 +8,7 @@ import { HasErrorPipe, } from './backup-history.page' import { TargetPipesModule } from '../../pipes/target-pipes.module' +import { BackupReportPageModule } from 'src/app/apps/ui/modals/backup-report/backup-report.module' const routes: Routes = [ { @@ -17,12 +18,13 @@ const routes: Routes = [ ] @NgModule({ - declarations: [BackupHistoryPage, DurationPipe, HasErrorPipe], imports: [ CommonModule, IonicModule, - RouterModule.forChild(routes), TargetPipesModule, + BackupReportPageModule, + RouterModule.forChild(routes), ], + declarations: [BackupHistoryPage, DurationPipe, HasErrorPipe], }) export class BackupHistoryPageModule {} diff --git a/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-history/backup-history.page.html b/frontend/projects/ui/src/app/apps/ui/pages/backups/pages/backup-history/backup-history.page.html similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-history/backup-history.page.html rename to frontend/projects/ui/src/app/apps/ui/pages/backups/pages/backup-history/backup-history.page.html diff --git a/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-history/backup-history.page.scss b/frontend/projects/ui/src/app/apps/ui/pages/backups/pages/backup-history/backup-history.page.scss similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-history/backup-history.page.scss rename to frontend/projects/ui/src/app/apps/ui/pages/backups/pages/backup-history/backup-history.page.scss diff --git a/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-history/backup-history.page.ts b/frontend/projects/ui/src/app/apps/ui/pages/backups/pages/backup-history/backup-history.page.ts similarity index 96% rename from frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-history/backup-history.page.ts rename to frontend/projects/ui/src/app/apps/ui/pages/backups/pages/backup-history/backup-history.page.ts index 2329b952c..48f5dafdf 100644 --- a/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-history/backup-history.page.ts +++ b/frontend/projects/ui/src/app/apps/ui/pages/backups/pages/backup-history/backup-history.page.ts @@ -5,7 +5,7 @@ import { LoadingController, ModalController } from '@ionic/angular' import { ApiService } from 'src/app/services/api/embassy-api.service' import { ErrorToastService } from '@start9labs/shared' import { BehaviorSubject } from 'rxjs' -import { BackupReportPage } from 'src/app/modals/backup-report/backup-report.page' +import { BackupReportPage } from 'src/app/apps/ui/modals/backup-report/backup-report.page' @Component({ selector: 'backup-history', diff --git a/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-jobs/backup-jobs.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/backups/pages/backup-jobs/backup-jobs.module.ts similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-jobs/backup-jobs.module.ts rename to frontend/projects/ui/src/app/apps/ui/pages/backups/pages/backup-jobs/backup-jobs.module.ts diff --git a/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-jobs/backup-jobs.page.html b/frontend/projects/ui/src/app/apps/ui/pages/backups/pages/backup-jobs/backup-jobs.page.html similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-jobs/backup-jobs.page.html rename to frontend/projects/ui/src/app/apps/ui/pages/backups/pages/backup-jobs/backup-jobs.page.html diff --git a/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-jobs/backup-jobs.page.scss b/frontend/projects/ui/src/app/apps/ui/pages/backups/pages/backup-jobs/backup-jobs.page.scss similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-jobs/backup-jobs.page.scss rename to frontend/projects/ui/src/app/apps/ui/pages/backups/pages/backup-jobs/backup-jobs.page.scss diff --git a/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-jobs/backup-jobs.page.ts b/frontend/projects/ui/src/app/apps/ui/pages/backups/pages/backup-jobs/backup-jobs.page.ts similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-jobs/backup-jobs.page.ts rename to frontend/projects/ui/src/app/apps/ui/pages/backups/pages/backup-jobs/backup-jobs.page.ts diff --git a/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-jobs/edit-job/edit-job.page.html b/frontend/projects/ui/src/app/apps/ui/pages/backups/pages/backup-jobs/edit-job/edit-job.page.html similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-jobs/edit-job/edit-job.page.html rename to frontend/projects/ui/src/app/apps/ui/pages/backups/pages/backup-jobs/edit-job/edit-job.page.html diff --git a/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-jobs/edit-job/edit-job.page.scss b/frontend/projects/ui/src/app/apps/ui/pages/backups/pages/backup-jobs/edit-job/edit-job.page.scss similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-jobs/edit-job/edit-job.page.scss rename to frontend/projects/ui/src/app/apps/ui/pages/backups/pages/backup-jobs/edit-job/edit-job.page.scss diff --git a/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-jobs/edit-job/edit-job.page.ts b/frontend/projects/ui/src/app/apps/ui/pages/backups/pages/backup-jobs/edit-job/edit-job.page.ts similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-jobs/edit-job/edit-job.page.ts rename to frontend/projects/ui/src/app/apps/ui/pages/backups/pages/backup-jobs/edit-job/edit-job.page.ts diff --git a/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-jobs/job-options/job-options.component.html b/frontend/projects/ui/src/app/apps/ui/pages/backups/pages/backup-jobs/job-options/job-options.component.html similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-jobs/job-options/job-options.component.html rename to frontend/projects/ui/src/app/apps/ui/pages/backups/pages/backup-jobs/job-options/job-options.component.html diff --git a/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-jobs/job-options/job-options.component.scss b/frontend/projects/ui/src/app/apps/ui/pages/backups/pages/backup-jobs/job-options/job-options.component.scss similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-jobs/job-options/job-options.component.scss rename to frontend/projects/ui/src/app/apps/ui/pages/backups/pages/backup-jobs/job-options/job-options.component.scss diff --git a/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-jobs/job-options/job-options.component.ts b/frontend/projects/ui/src/app/apps/ui/pages/backups/pages/backup-jobs/job-options/job-options.component.ts similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-jobs/job-options/job-options.component.ts rename to frontend/projects/ui/src/app/apps/ui/pages/backups/pages/backup-jobs/job-options/job-options.component.ts diff --git a/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-jobs/new-job/new-job.page.html b/frontend/projects/ui/src/app/apps/ui/pages/backups/pages/backup-jobs/new-job/new-job.page.html similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-jobs/new-job/new-job.page.html rename to frontend/projects/ui/src/app/apps/ui/pages/backups/pages/backup-jobs/new-job/new-job.page.html diff --git a/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-jobs/new-job/new-job.page.scss b/frontend/projects/ui/src/app/apps/ui/pages/backups/pages/backup-jobs/new-job/new-job.page.scss similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-jobs/new-job/new-job.page.scss rename to frontend/projects/ui/src/app/apps/ui/pages/backups/pages/backup-jobs/new-job/new-job.page.scss diff --git a/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-jobs/new-job/new-job.page.ts b/frontend/projects/ui/src/app/apps/ui/pages/backups/pages/backup-jobs/new-job/new-job.page.ts similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-jobs/new-job/new-job.page.ts rename to frontend/projects/ui/src/app/apps/ui/pages/backups/pages/backup-jobs/new-job/new-job.page.ts diff --git a/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-jobs/pipes.ts b/frontend/projects/ui/src/app/apps/ui/pages/backups/pages/backup-jobs/pipes.ts similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-jobs/pipes.ts rename to frontend/projects/ui/src/app/apps/ui/pages/backups/pages/backup-jobs/pipes.ts diff --git a/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-targets/backup-targets.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/backups/pages/backup-targets/backup-targets.module.ts similarity index 76% rename from frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-targets/backup-targets.module.ts rename to frontend/projects/ui/src/app/apps/ui/pages/backups/pages/backup-targets/backup-targets.module.ts index eef76b9eb..9c3f65886 100644 --- a/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-targets/backup-targets.module.ts +++ b/frontend/projects/ui/src/app/apps/ui/pages/backups/pages/backup-targets/backup-targets.module.ts @@ -2,9 +2,10 @@ import { NgModule } from '@angular/core' import { RouterModule, Routes } from '@angular/router' import { CommonModule } from '@angular/common' import { IonicModule } from '@ionic/angular' -import { BackupTargetsPage } from './backup-targets.page' -import { SkeletonListComponentModule } from 'src/app/components/skeleton-list/skeleton-list.component.module' import { UnitConversionPipesModule } from '@start9labs/shared' +import { SkeletonListComponentModule } from 'src/app/common/skeleton-list/skeleton-list.component.module' +import { FormPageModule } from 'src/app/apps/ui/modals/form/form.module' +import { BackupTargetsPage } from './backup-targets.page' const routes: Routes = [ { @@ -18,9 +19,10 @@ const routes: Routes = [ imports: [ CommonModule, IonicModule, - RouterModule.forChild(routes), SkeletonListComponentModule, UnitConversionPipesModule, + FormPageModule, + RouterModule.forChild(routes), ], }) export class BackupTargetsPageModule {} diff --git a/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-targets/backup-targets.page.html b/frontend/projects/ui/src/app/apps/ui/pages/backups/pages/backup-targets/backup-targets.page.html similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-targets/backup-targets.page.html rename to frontend/projects/ui/src/app/apps/ui/pages/backups/pages/backup-targets/backup-targets.page.html diff --git a/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-targets/backup-targets.page.scss b/frontend/projects/ui/src/app/apps/ui/pages/backups/pages/backup-targets/backup-targets.page.scss similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-targets/backup-targets.page.scss rename to frontend/projects/ui/src/app/apps/ui/pages/backups/pages/backup-targets/backup-targets.page.scss diff --git a/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-targets/backup-targets.page.ts b/frontend/projects/ui/src/app/apps/ui/pages/backups/pages/backup-targets/backup-targets.page.ts similarity index 97% rename from frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-targets/backup-targets.page.ts rename to frontend/projects/ui/src/app/apps/ui/pages/backups/pages/backup-targets/backup-targets.page.ts index 8e4e8b4f4..7571b9974 100644 --- a/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-targets/backup-targets.page.ts +++ b/frontend/projects/ui/src/app/apps/ui/pages/backups/pages/backup-targets/backup-targets.page.ts @@ -15,17 +15,17 @@ import { } from '../../types/target-types' import { BehaviorSubject, filter } from 'rxjs' import { TuiDialogService } from '@taiga-ui/core' -import { ErrorService } from '@start9labs/shared' -import { FormDialogService } from 'src/app/services/form-dialog.service' -import { FormPage } from 'src/app/modals/form/form.page' -import { LoadingService } from 'src/app/modals/loading/loading.service' import { TUI_PROMPT } from '@taiga-ui/kit' -import { configBuilderToSpec } from 'src/app/util/configBuilderToSpec' +import { ErrorService } from '@start9labs/shared' import { InputSpec, unionSelectKey, unionValueKey, } from '@start9labs/start-sdk/lib/config/configTypes' +import { FormDialogService } from 'src/app/services/form-dialog.service' +import { FormPage } from 'src/app/apps/ui/modals/form/form.page' +import { LoadingService } from 'src/app/common/loading/loading.service' +import { configBuilderToSpec } from 'src/app/util/configBuilderToSpec' type BackupConfig = | { diff --git a/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backups/backups.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/backups/pages/backups/backups.module.ts similarity index 77% rename from frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backups/backups.module.ts rename to frontend/projects/ui/src/app/apps/ui/pages/backups/pages/backups/backups.module.ts index 8726083c4..5c56787df 100644 --- a/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backups/backups.module.ts +++ b/frontend/projects/ui/src/app/apps/ui/pages/backups/pages/backups/backups.module.ts @@ -2,7 +2,9 @@ import { NgModule } from '@angular/core' import { RouterModule, Routes } from '@angular/router' import { CommonModule } from '@angular/common' import { IonicModule } from '@ionic/angular' -import { BackupsPage } from './backups.page' +import { BadgeMenuComponentModule } from 'src/app/common/badge-menu-button/badge-menu.component.module' +import { InsecureWarningComponentModule } from 'src/app/common/insecure-warning/insecure-warning.module' +import { GenericInputComponentModule } from 'src/app/apps/ui/modals/generic-input/generic-input.component.module' import { BackupCreateDirective } from '../../directives/backup-create.directive' import { BackupRestoreDirective } from '../../directives/backup-restore.directive' import { @@ -11,9 +13,8 @@ import { } from '../../components/backing-up/backing-up.component' import { BackupSelectPageModule } from '../../modals/backup-select/backup-select.module' import { RecoverSelectPageModule } from '../../modals/recover-select/recover-select.module' -import { BadgeMenuComponentModule } from 'src/app/components/badge-menu-button/badge-menu.component.module' -import { InsecureWarningComponentModule } from 'src/app/components/insecure-warning/insecure-warning.module' import { TargetPipesModule } from '../../pipes/target-pipes.module' +import { BackupsPage } from './backups.page' const routes: Routes = [ { @@ -32,6 +33,7 @@ const routes: Routes = [ BadgeMenuComponentModule, InsecureWarningComponentModule, TargetPipesModule, + GenericInputComponentModule, ], declarations: [ BackupsPage, diff --git a/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backups/backups.page.html b/frontend/projects/ui/src/app/apps/ui/pages/backups/pages/backups/backups.page.html similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backups/backups.page.html rename to frontend/projects/ui/src/app/apps/ui/pages/backups/pages/backups/backups.page.html diff --git a/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backups/backups.page.scss b/frontend/projects/ui/src/app/apps/ui/pages/backups/pages/backups/backups.page.scss similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backups/backups.page.scss rename to frontend/projects/ui/src/app/apps/ui/pages/backups/pages/backups/backups.page.scss diff --git a/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backups/backups.page.ts b/frontend/projects/ui/src/app/apps/ui/pages/backups/pages/backups/backups.page.ts similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backups/backups.page.ts rename to frontend/projects/ui/src/app/apps/ui/pages/backups/pages/backups/backups.page.ts diff --git a/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pipes/get-display-info.pipe.ts b/frontend/projects/ui/src/app/apps/ui/pages/backups/pipes/get-display-info.pipe.ts similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pipes/get-display-info.pipe.ts rename to frontend/projects/ui/src/app/apps/ui/pages/backups/pipes/get-display-info.pipe.ts diff --git a/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pipes/has-valid-backup.pipe.ts b/frontend/projects/ui/src/app/apps/ui/pages/backups/pipes/has-valid-backup.pipe.ts similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pipes/has-valid-backup.pipe.ts rename to frontend/projects/ui/src/app/apps/ui/pages/backups/pipes/has-valid-backup.pipe.ts diff --git a/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pipes/target-pipes.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/backups/pipes/target-pipes.module.ts similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pipes/target-pipes.module.ts rename to frontend/projects/ui/src/app/apps/ui/pages/backups/pipes/target-pipes.module.ts diff --git a/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/types/target-types.ts b/frontend/projects/ui/src/app/apps/ui/pages/backups/types/target-types.ts similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/backups-routes/types/target-types.ts rename to frontend/projects/ui/src/app/apps/ui/pages/backups/types/target-types.ts diff --git a/frontend/projects/ui/src/app/apps/ui/pages/home/home.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/home/home.module.ts index d086195f9..8e5ba887d 100644 --- a/frontend/projects/ui/src/app/apps/ui/pages/home/home.module.ts +++ b/frontend/projects/ui/src/app/apps/ui/pages/home/home.module.ts @@ -3,8 +3,8 @@ import { CommonModule } from '@angular/common' import { IonicModule } from '@ionic/angular' import { RouterModule, Routes } from '@angular/router' import { HomePage } from './home.page' -import { BadgeMenuComponentModule } from 'src/app/components/badge-menu-button/badge-menu.component.module' -import { WidgetListComponentModule } from 'src/app/components/widget-list/widget-list.component.module' +import { BadgeMenuComponentModule } from 'src/app/common/badge-menu-button/badge-menu.component.module' +import { WidgetListComponentModule } from 'src/app/common/widget-list/widget-list.component.module' const routes: Routes = [ { diff --git a/frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-list/marketplace-list.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/marketplace/marketplace-list/marketplace-list.module.ts similarity index 79% rename from frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-list/marketplace-list.module.ts rename to frontend/projects/ui/src/app/apps/ui/pages/marketplace/marketplace-list/marketplace-list.module.ts index ea1952578..918fe65a5 100644 --- a/frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-list/marketplace-list.module.ts +++ b/frontend/projects/ui/src/app/apps/ui/pages/marketplace/marketplace-list/marketplace-list.module.ts @@ -15,11 +15,11 @@ import { SearchModule, SkeletonModule, } from '@start9labs/marketplace' -import { BadgeMenuComponentModule } from 'src/app/components/badge-menu-button/badge-menu.component.module' +import { BadgeMenuComponentModule } from 'src/app/common/badge-menu-button/badge-menu.component.module' +import { StoreIconComponentModule } from 'src/app/common/store-icon/store-icon.component.module' import { MarketplaceStatusModule } from '../marketplace-status/marketplace-status.module' import { MarketplaceListPage } from './marketplace-list.page' -import { MarketplaceSettingsPageModule } from 'src/app/modals/marketplace-settings/marketplace-settings.module' -import { StoreIconComponentModule } from 'src/app/components/store-icon/store-icon.component.module' +import { MarketplaceSettingsPageModule } from './marketplace-settings/marketplace-settings.module' const routes: Routes = [ { diff --git a/frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-list/marketplace-list.page.html b/frontend/projects/ui/src/app/apps/ui/pages/marketplace/marketplace-list/marketplace-list.page.html similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-list/marketplace-list.page.html rename to frontend/projects/ui/src/app/apps/ui/pages/marketplace/marketplace-list/marketplace-list.page.html diff --git a/frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-list/marketplace-list.page.scss b/frontend/projects/ui/src/app/apps/ui/pages/marketplace/marketplace-list/marketplace-list.page.scss similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-list/marketplace-list.page.scss rename to frontend/projects/ui/src/app/apps/ui/pages/marketplace/marketplace-list/marketplace-list.page.scss diff --git a/frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-list/marketplace-list.page.ts b/frontend/projects/ui/src/app/apps/ui/pages/marketplace/marketplace-list/marketplace-list.page.ts similarity index 97% rename from frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-list/marketplace-list.page.ts rename to frontend/projects/ui/src/app/apps/ui/pages/marketplace/marketplace-list/marketplace-list.page.ts index ab76282c0..fe9281485 100644 --- a/frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-list/marketplace-list.page.ts +++ b/frontend/projects/ui/src/app/apps/ui/pages/marketplace/marketplace-list/marketplace-list.page.ts @@ -5,7 +5,7 @@ import { TuiDialogService } from '@taiga-ui/core' import { PolymorpheusComponent } from '@tinkoff/ng-polymorpheus' import { PatchDB } from 'patch-db-client' import { map } from 'rxjs' -import { MarketplaceSettingsPage } from 'src/app/modals/marketplace-settings/marketplace-settings.page' +import { MarketplaceSettingsPage } from './marketplace-settings/marketplace-settings.page' import { ConfigService } from 'src/app/services/config.service' import { MarketplaceService } from 'src/app/services/marketplace.service' import { DataModel } from 'src/app/services/patch-db/data-model' diff --git a/frontend/projects/ui/src/app/modals/marketplace-settings/marketplace-settings.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/marketplace/marketplace-list/marketplace-settings/marketplace-settings.module.ts similarity index 76% rename from frontend/projects/ui/src/app/modals/marketplace-settings/marketplace-settings.module.ts rename to frontend/projects/ui/src/app/apps/ui/pages/marketplace/marketplace-list/marketplace-settings/marketplace-settings.module.ts index 8c1398515..9eaebbd34 100644 --- a/frontend/projects/ui/src/app/modals/marketplace-settings/marketplace-settings.module.ts +++ b/frontend/projects/ui/src/app/apps/ui/pages/marketplace/marketplace-list/marketplace-settings/marketplace-settings.module.ts @@ -1,14 +1,15 @@ import { NgModule } from '@angular/core' import { CommonModule } from '@angular/common' import { IonicModule } from '@ionic/angular' -import { MarketplaceSettingsPage } from './marketplace-settings.page' import { SharedPipesModule } from '@start9labs/shared' -import { StoreIconComponentModule } from 'src/app/components/store-icon/store-icon.component.module' import { TuiDataListModule, TuiHostedDropdownModule, TuiSvgModule, } from '@taiga-ui/core' +import { StoreIconComponentModule } from 'src/app/common/store-icon/store-icon.component.module' +import { FormPageModule } from 'src/app/apps/ui/modals/form/form.module' +import { MarketplaceSettingsPage } from './marketplace-settings.page' @NgModule({ imports: [ @@ -19,6 +20,7 @@ import { TuiHostedDropdownModule, TuiDataListModule, TuiSvgModule, + FormPageModule, ], declarations: [MarketplaceSettingsPage], }) diff --git a/frontend/projects/ui/src/app/modals/marketplace-settings/marketplace-settings.page.html b/frontend/projects/ui/src/app/apps/ui/pages/marketplace/marketplace-list/marketplace-settings/marketplace-settings.page.html similarity index 100% rename from frontend/projects/ui/src/app/modals/marketplace-settings/marketplace-settings.page.html rename to frontend/projects/ui/src/app/apps/ui/pages/marketplace/marketplace-list/marketplace-settings/marketplace-settings.page.html diff --git a/frontend/projects/ui/src/app/modals/marketplace-settings/marketplace-settings.page.scss b/frontend/projects/ui/src/app/apps/ui/pages/marketplace/marketplace-list/marketplace-settings/marketplace-settings.page.scss similarity index 100% rename from frontend/projects/ui/src/app/modals/marketplace-settings/marketplace-settings.page.scss rename to frontend/projects/ui/src/app/apps/ui/pages/marketplace/marketplace-list/marketplace-settings/marketplace-settings.page.scss diff --git a/frontend/projects/ui/src/app/modals/marketplace-settings/marketplace-settings.page.ts b/frontend/projects/ui/src/app/apps/ui/pages/marketplace/marketplace-list/marketplace-settings/marketplace-settings.page.ts similarity index 96% rename from frontend/projects/ui/src/app/modals/marketplace-settings/marketplace-settings.page.ts rename to frontend/projects/ui/src/app/apps/ui/pages/marketplace/marketplace-list/marketplace-settings/marketplace-settings.page.ts index 1b3ff1118..09d30780e 100644 --- a/frontend/projects/ui/src/app/modals/marketplace-settings/marketplace-settings.page.ts +++ b/frontend/projects/ui/src/app/apps/ui/pages/marketplace/marketplace-list/marketplace-settings/marketplace-settings.page.ts @@ -1,18 +1,17 @@ import { ChangeDetectionStrategy, Component, Inject } from '@angular/core' import { ErrorService, sameUrl, toUrl } from '@start9labs/shared' import { AbstractMarketplaceService } from '@start9labs/marketplace' -import { TuiDialogService } from '@taiga-ui/core' -import { ApiService } from 'src/app/services/api/embassy-api.service' import { ValueSpecObject } from '@start9labs/start-sdk/lib/config/configTypes' +import { TuiDialogService } from '@taiga-ui/core' +import { TUI_PROMPT } from '@taiga-ui/kit' import { PatchDB } from 'patch-db-client' +import { combineLatest, filter, firstValueFrom, map, Subscription } from 'rxjs' +import { ApiService } from 'src/app/services/api/embassy-api.service' import { DataModel, UIStore } from 'src/app/services/patch-db/data-model' import { MarketplaceService } from 'src/app/services/marketplace.service' -import { map } from 'rxjs/operators' -import { combineLatest, filter, firstValueFrom, Subscription } from 'rxjs' import { FormDialogService } from 'src/app/services/form-dialog.service' -import { FormPage } from '../form/form.page' -import { LoadingService } from '../loading/loading.service' -import { TUI_PROMPT } from '@taiga-ui/kit' +import { FormPage } from 'src/app/apps/ui/modals/form/form.page' +import { LoadingService } from 'src/app/common/loading/loading.service' @Component({ selector: 'marketplace-settings', diff --git a/frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-show/components/marketplace-show-components.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/marketplace/marketplace-show/components/marketplace-show-components.module.ts similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-show/components/marketplace-show-components.module.ts rename to frontend/projects/ui/src/app/apps/ui/pages/marketplace/marketplace-show/components/marketplace-show-components.module.ts diff --git a/frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-show/components/marketplace-show-controls/marketplace-show-controls.component.html b/frontend/projects/ui/src/app/apps/ui/pages/marketplace/marketplace-show/components/marketplace-show-controls/marketplace-show-controls.component.html similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-show/components/marketplace-show-controls/marketplace-show-controls.component.html rename to frontend/projects/ui/src/app/apps/ui/pages/marketplace/marketplace-show/components/marketplace-show-controls/marketplace-show-controls.component.html diff --git a/frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-show/components/marketplace-show-controls/marketplace-show-controls.component.ts b/frontend/projects/ui/src/app/apps/ui/pages/marketplace/marketplace-show/components/marketplace-show-controls/marketplace-show-controls.component.ts similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-show/components/marketplace-show-controls/marketplace-show-controls.component.ts rename to frontend/projects/ui/src/app/apps/ui/pages/marketplace/marketplace-show/components/marketplace-show-controls/marketplace-show-controls.component.ts diff --git a/frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-show/components/marketplace-show-controls/marketplace-show-controls.page.scss b/frontend/projects/ui/src/app/apps/ui/pages/marketplace/marketplace-show/components/marketplace-show-controls/marketplace-show-controls.page.scss similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-show/components/marketplace-show-controls/marketplace-show-controls.page.scss rename to frontend/projects/ui/src/app/apps/ui/pages/marketplace/marketplace-show/components/marketplace-show-controls/marketplace-show-controls.page.scss diff --git a/frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-show/components/marketplace-show-dependent/marketplace-show-dependent.component.html b/frontend/projects/ui/src/app/apps/ui/pages/marketplace/marketplace-show/components/marketplace-show-dependent/marketplace-show-dependent.component.html similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-show/components/marketplace-show-dependent/marketplace-show-dependent.component.html rename to frontend/projects/ui/src/app/apps/ui/pages/marketplace/marketplace-show/components/marketplace-show-dependent/marketplace-show-dependent.component.html diff --git a/frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-show/components/marketplace-show-dependent/marketplace-show-dependent.component.scss b/frontend/projects/ui/src/app/apps/ui/pages/marketplace/marketplace-show/components/marketplace-show-dependent/marketplace-show-dependent.component.scss similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-show/components/marketplace-show-dependent/marketplace-show-dependent.component.scss rename to frontend/projects/ui/src/app/apps/ui/pages/marketplace/marketplace-show/components/marketplace-show-dependent/marketplace-show-dependent.component.scss diff --git a/frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-show/components/marketplace-show-dependent/marketplace-show-dependent.component.ts b/frontend/projects/ui/src/app/apps/ui/pages/marketplace/marketplace-show/components/marketplace-show-dependent/marketplace-show-dependent.component.ts similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-show/components/marketplace-show-dependent/marketplace-show-dependent.component.ts rename to frontend/projects/ui/src/app/apps/ui/pages/marketplace/marketplace-show/components/marketplace-show-dependent/marketplace-show-dependent.component.ts diff --git a/frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-show/components/marketplace-show-header/marketplace-show-header.component.html b/frontend/projects/ui/src/app/apps/ui/pages/marketplace/marketplace-show/components/marketplace-show-header/marketplace-show-header.component.html similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-show/components/marketplace-show-header/marketplace-show-header.component.html rename to frontend/projects/ui/src/app/apps/ui/pages/marketplace/marketplace-show/components/marketplace-show-header/marketplace-show-header.component.html diff --git a/frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-show/components/marketplace-show-header/marketplace-show-header.component.ts b/frontend/projects/ui/src/app/apps/ui/pages/marketplace/marketplace-show/components/marketplace-show-header/marketplace-show-header.component.ts similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-show/components/marketplace-show-header/marketplace-show-header.component.ts rename to frontend/projects/ui/src/app/apps/ui/pages/marketplace/marketplace-show/components/marketplace-show-header/marketplace-show-header.component.ts diff --git a/frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-show/marketplace-show.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/marketplace/marketplace-show/marketplace-show.module.ts similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-show/marketplace-show.module.ts rename to frontend/projects/ui/src/app/apps/ui/pages/marketplace/marketplace-show/marketplace-show.module.ts diff --git a/frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-show/marketplace-show.page.html b/frontend/projects/ui/src/app/apps/ui/pages/marketplace/marketplace-show/marketplace-show.page.html similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-show/marketplace-show.page.html rename to frontend/projects/ui/src/app/apps/ui/pages/marketplace/marketplace-show/marketplace-show.page.html diff --git a/frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-show/marketplace-show.page.scss b/frontend/projects/ui/src/app/apps/ui/pages/marketplace/marketplace-show/marketplace-show.page.scss similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-show/marketplace-show.page.scss rename to frontend/projects/ui/src/app/apps/ui/pages/marketplace/marketplace-show/marketplace-show.page.scss diff --git a/frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-show/marketplace-show.page.ts b/frontend/projects/ui/src/app/apps/ui/pages/marketplace/marketplace-show/marketplace-show.page.ts similarity index 92% rename from frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-show/marketplace-show.page.ts rename to frontend/projects/ui/src/app/apps/ui/pages/marketplace/marketplace-show/marketplace-show.page.ts index dcb6e48d1..623490f5c 100644 --- a/frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-show/marketplace-show.page.ts +++ b/frontend/projects/ui/src/app/apps/ui/pages/marketplace/marketplace-show/marketplace-show.page.ts @@ -3,8 +3,7 @@ import { ActivatedRoute } from '@angular/router' import { getPkgId } from '@start9labs/shared' import { AbstractMarketplaceService } from '@start9labs/marketplace' import { PatchDB } from 'patch-db-client' -import { BehaviorSubject } from 'rxjs' -import { filter, shareReplay, switchMap } from 'rxjs/operators' +import { filter, shareReplay, switchMap, BehaviorSubject } from 'rxjs' import { DataModel } from 'src/app/services/patch-db/data-model' @Component({ diff --git a/frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-status/marketplace-status.component.html b/frontend/projects/ui/src/app/apps/ui/pages/marketplace/marketplace-status/marketplace-status.component.html similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-status/marketplace-status.component.html rename to frontend/projects/ui/src/app/apps/ui/pages/marketplace/marketplace-status/marketplace-status.component.html diff --git a/frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-status/marketplace-status.component.scss b/frontend/projects/ui/src/app/apps/ui/pages/marketplace/marketplace-status/marketplace-status.component.scss similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-status/marketplace-status.component.scss rename to frontend/projects/ui/src/app/apps/ui/pages/marketplace/marketplace-status/marketplace-status.component.scss diff --git a/frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-status/marketplace-status.component.ts b/frontend/projects/ui/src/app/apps/ui/pages/marketplace/marketplace-status/marketplace-status.component.ts similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-status/marketplace-status.component.ts rename to frontend/projects/ui/src/app/apps/ui/pages/marketplace/marketplace-status/marketplace-status.component.ts diff --git a/frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-status/marketplace-status.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/marketplace/marketplace-status/marketplace-status.module.ts similarity index 83% rename from frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-status/marketplace-status.module.ts rename to frontend/projects/ui/src/app/apps/ui/pages/marketplace/marketplace-status/marketplace-status.module.ts index 2d3675f02..5f19ea352 100644 --- a/frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-status/marketplace-status.module.ts +++ b/frontend/projects/ui/src/app/apps/ui/pages/marketplace/marketplace-status/marketplace-status.module.ts @@ -2,8 +2,7 @@ import { CommonModule } from '@angular/common' import { NgModule } from '@angular/core' import { IonicModule } from '@ionic/angular' import { EmverPipesModule } from '@start9labs/shared' - -import { InstallProgressPipeModule } from 'src/app/pipes/install-progress/install-progress.module' +import { InstallProgressPipeModule } from 'src/app/common/install-progress/install-progress.module' import { MarketplaceStatusComponent } from './marketplace-status.component' @NgModule({ diff --git a/frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-routing.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/marketplace/marketplace.module.ts similarity index 94% rename from frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-routing.module.ts rename to frontend/projects/ui/src/app/apps/ui/pages/marketplace/marketplace.module.ts index d5d6304e4..3a90c851b 100644 --- a/frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-routing.module.ts +++ b/frontend/projects/ui/src/app/apps/ui/pages/marketplace/marketplace.module.ts @@ -30,4 +30,4 @@ const routes: Routes = [ imports: [RouterModule.forChild(routes)], exports: [RouterModule], }) -export class MarketplaceRoutingModule {} +export class MarketplaceModule {} diff --git a/frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/release-notes/release-notes.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/marketplace/release-notes/release-notes.module.ts similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/release-notes/release-notes.module.ts rename to frontend/projects/ui/src/app/apps/ui/pages/marketplace/release-notes/release-notes.module.ts diff --git a/frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/release-notes/release-notes.page.html b/frontend/projects/ui/src/app/apps/ui/pages/marketplace/release-notes/release-notes.page.html similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/release-notes/release-notes.page.html rename to frontend/projects/ui/src/app/apps/ui/pages/marketplace/release-notes/release-notes.page.html diff --git a/frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/release-notes/release-notes.page.ts b/frontend/projects/ui/src/app/apps/ui/pages/marketplace/release-notes/release-notes.page.ts similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/release-notes/release-notes.page.ts rename to frontend/projects/ui/src/app/apps/ui/pages/marketplace/release-notes/release-notes.page.ts diff --git a/frontend/projects/ui/src/app/apps/ui/pages/notifications/notifications.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/notifications/notifications.module.ts index 5ff2b4572..dfbb6036d 100644 --- a/frontend/projects/ui/src/app/apps/ui/pages/notifications/notifications.module.ts +++ b/frontend/projects/ui/src/app/apps/ui/pages/notifications/notifications.module.ts @@ -3,9 +3,9 @@ import { CommonModule } from '@angular/common' import { IonicModule } from '@ionic/angular' import { RouterModule, Routes } from '@angular/router' import { NotificationsPage } from './notifications.page' -import { BadgeMenuComponentModule } from 'src/app/components/badge-menu-button/badge-menu.component.module' +import { BadgeMenuComponentModule } from 'src/app/common/badge-menu-button/badge-menu.component.module' import { SharedPipesModule } from '@start9labs/shared' -import { BackupReportPageModule } from 'src/app/modals/backup-report/backup-report.module' +import { BackupReportPageModule } from '../../modals/backup-report/backup-report.module' const routes: Routes = [ { diff --git a/frontend/projects/ui/src/app/apps/ui/pages/notifications/notifications.page.ts b/frontend/projects/ui/src/app/apps/ui/pages/notifications/notifications.page.ts index 35c86048a..e47b95276 100644 --- a/frontend/projects/ui/src/app/apps/ui/pages/notifications/notifications.page.ts +++ b/frontend/projects/ui/src/app/apps/ui/pages/notifications/notifications.page.ts @@ -12,7 +12,7 @@ import { } from '@ionic/angular' import { ActivatedRoute } from '@angular/router' import { ErrorToastService } from '@start9labs/shared' -import { BackupReportPage } from 'src/app/modals/backup-report/backup-report.page' +import { BackupReportPage } from 'src/app/apps/ui/modals/backup-report/backup-report.page' import { PatchDB } from 'patch-db-client' import { DataModel } from 'src/app/services/patch-db/data-model' import { first } from 'rxjs' diff --git a/frontend/projects/ui/src/app/modals/action-success/action-success.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/services/app-actions/action-success/action-success.module.ts similarity index 73% rename from frontend/projects/ui/src/app/modals/action-success/action-success.module.ts rename to frontend/projects/ui/src/app/apps/ui/pages/services/app-actions/action-success/action-success.module.ts index 4ff931628..248dd430e 100644 --- a/frontend/projects/ui/src/app/modals/action-success/action-success.module.ts +++ b/frontend/projects/ui/src/app/apps/ui/pages/services/app-actions/action-success/action-success.module.ts @@ -1,16 +1,13 @@ import { NgModule } from '@angular/core' import { CommonModule } from '@angular/common' import { IonicModule } from '@ionic/angular' -import { ActionSuccessPage } from './action-success.page' import { QrCodeModule } from 'ng-qrcode' +import { ActionSuccessPage } from './action-success.page' + @NgModule({ declarations: [ActionSuccessPage], - imports: [ - CommonModule, - IonicModule, - QrCodeModule, - ], + imports: [CommonModule, IonicModule, QrCodeModule], exports: [ActionSuccessPage], }) -export class ActionSuccessPageModule { } +export class ActionSuccessPageModule {} diff --git a/frontend/projects/ui/src/app/modals/action-success/action-success.page.html b/frontend/projects/ui/src/app/apps/ui/pages/services/app-actions/action-success/action-success.page.html similarity index 93% rename from frontend/projects/ui/src/app/modals/action-success/action-success.page.html rename to frontend/projects/ui/src/app/apps/ui/pages/services/app-actions/action-success/action-success.page.html index bc660313d..da8cc7be5 100644 --- a/frontend/projects/ui/src/app/modals/action-success/action-success.page.html +++ b/frontend/projects/ui/src/app/apps/ui/pages/services/app-actions/action-success/action-success.page.html @@ -24,12 +24,12 @@ (click)="copy(actionRes.value)" > {{ actionRes.value }} - + + > + diff --git a/frontend/projects/ui/src/app/modals/action-success/action-success.page.ts b/frontend/projects/ui/src/app/apps/ui/pages/services/app-actions/action-success/action-success.page.ts similarity index 95% rename from frontend/projects/ui/src/app/modals/action-success/action-success.page.ts rename to frontend/projects/ui/src/app/apps/ui/pages/services/app-actions/action-success/action-success.page.ts index 30c5c02cd..48adb138a 100644 --- a/frontend/projects/ui/src/app/modals/action-success/action-success.page.ts +++ b/frontend/projects/ui/src/app/apps/ui/pages/services/app-actions/action-success/action-success.page.ts @@ -6,7 +6,6 @@ import { copyToClipboard } from '@start9labs/shared' @Component({ selector: 'action-success', templateUrl: './action-success.page.html', - styleUrls: ['./action-success.page.scss'], }) export class ActionSuccessPage { @Input() diff --git a/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-actions/app-actions-item.component.html b/frontend/projects/ui/src/app/apps/ui/pages/services/app-actions/app-actions-item.component.html similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-actions/app-actions-item.component.html rename to frontend/projects/ui/src/app/apps/ui/pages/services/app-actions/app-actions-item.component.html diff --git a/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-actions/app-actions.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/services/app-actions/app-actions.module.ts similarity index 78% rename from frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-actions/app-actions.module.ts rename to frontend/projects/ui/src/app/apps/ui/pages/services/app-actions/app-actions.module.ts index 71d7ffc30..6e25ca6c9 100644 --- a/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-actions/app-actions.module.ts +++ b/frontend/projects/ui/src/app/apps/ui/pages/services/app-actions/app-actions.module.ts @@ -2,14 +2,14 @@ import { NgModule } from '@angular/core' import { CommonModule } from '@angular/common' import { Routes, RouterModule } from '@angular/router' import { IonicModule } from '@ionic/angular' +import { SharedPipesModule } from '@start9labs/shared' +import { FormPageModule } from 'src/app/apps/ui/modals/form/form.module' +import { ActionSuccessPageModule } from './action-success/action-success.module' import { AppActionsPage, AppActionsItemComponent, GroupActionsPipe, } from './app-actions.page' -import { QRComponentModule } from 'src/app/components/qr/qr.component.module' -import { SharedPipesModule } from '@start9labs/shared' -import { ActionSuccessPageModule } from 'src/app/modals/action-success/action-success.module' const routes: Routes = [ { @@ -22,10 +22,10 @@ const routes: Routes = [ imports: [ CommonModule, IonicModule, - RouterModule.forChild(routes), - QRComponentModule, SharedPipesModule, ActionSuccessPageModule, + FormPageModule, + RouterModule.forChild(routes), ], declarations: [AppActionsPage, AppActionsItemComponent, GroupActionsPipe], }) diff --git a/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-actions/app-actions.page.html b/frontend/projects/ui/src/app/apps/ui/pages/services/app-actions/app-actions.page.html similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-actions/app-actions.page.html rename to frontend/projects/ui/src/app/apps/ui/pages/services/app-actions/app-actions.page.html diff --git a/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-actions/app-actions.page.scss b/frontend/projects/ui/src/app/apps/ui/pages/services/app-actions/app-actions.page.scss similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-actions/app-actions.page.scss rename to frontend/projects/ui/src/app/apps/ui/pages/services/app-actions/app-actions.page.scss diff --git a/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-actions/app-actions.page.ts b/frontend/projects/ui/src/app/apps/ui/pages/services/app-actions/app-actions.page.ts similarity index 96% rename from frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-actions/app-actions.page.ts rename to frontend/projects/ui/src/app/apps/ui/pages/services/app-actions/app-actions.page.ts index ba550d868..e8eaa1010 100644 --- a/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-actions/app-actions.page.ts +++ b/frontend/projects/ui/src/app/apps/ui/pages/services/app-actions/app-actions.page.ts @@ -21,12 +21,12 @@ import { WithId, ErrorService, } from '@start9labs/shared' -import { ActionSuccessPage } from 'src/app/modals/action-success/action-success.page' +import { ActionSuccessPage } from './action-success/action-success.page' import { hasCurrentDeps } from 'src/app/util/has-deps' import { filter } from 'rxjs' import { FormDialogService } from 'src/app/services/form-dialog.service' -import { FormPage } from 'src/app/modals/form/form.page' -import { LoadingService } from 'src/app/modals/loading/loading.service' +import { FormPage } from 'src/app/apps/ui/modals/form/form.page' +import { LoadingService } from 'src/app/common/loading/loading.service' @Component({ selector: 'app-actions', diff --git a/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-credentials/app-credentials.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/services/app-credentials/app-credentials.module.ts similarity index 70% rename from frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-credentials/app-credentials.module.ts rename to frontend/projects/ui/src/app/apps/ui/pages/services/app-credentials/app-credentials.module.ts index ac57600af..26e01e0ed 100644 --- a/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-credentials/app-credentials.module.ts +++ b/frontend/projects/ui/src/app/apps/ui/pages/services/app-credentials/app-credentials.module.ts @@ -3,13 +3,11 @@ import { CommonModule } from '@angular/common' import { Routes, RouterModule } from '@angular/router' import { IonicModule } from '@ionic/angular' import { AppCredentialsPage } from './app-credentials.page' -import { QRComponentModule } from 'src/app/components/qr/qr.component.module' -import { MaskPipeModule } from 'src/app/pipes/mask/mask.module' import { SharedPipesModule, TextSpinnerComponentModule, } from '@start9labs/shared' -import { SkeletonListComponentModule } from 'src/app/components/skeleton-list/skeleton-list.component.module' +import { SkeletonListComponentModule } from 'src/app/common/skeleton-list/skeleton-list.component.module' const routes: Routes = [ { @@ -23,10 +21,8 @@ const routes: Routes = [ CommonModule, IonicModule, RouterModule.forChild(routes), - QRComponentModule, SharedPipesModule, TextSpinnerComponentModule, - MaskPipeModule, SkeletonListComponentModule, ], declarations: [AppCredentialsPage], diff --git a/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-credentials/app-credentials.page.html b/frontend/projects/ui/src/app/apps/ui/pages/services/app-credentials/app-credentials.page.html similarity index 95% rename from frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-credentials/app-credentials.page.html rename to frontend/projects/ui/src/app/apps/ui/pages/services/app-credentials/app-credentials.page.html index 151a24396..4c9a8b41f 100644 --- a/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-credentials/app-credentials.page.html +++ b/frontend/projects/ui/src/app/apps/ui/pages/services/app-credentials/app-credentials.page.html @@ -32,7 +32,7 @@

{{ cred.key }}

- {{ unmasked[cred.key] ? cred.value : (cred.value | mask : 64) }} + {{ unmasked[cred.key] ? cred.value : mask(cred.value) }}

diff --git a/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-credentials/app-credentials.page.scss b/frontend/projects/ui/src/app/apps/ui/pages/services/app-credentials/app-credentials.page.scss similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-credentials/app-credentials.page.scss rename to frontend/projects/ui/src/app/apps/ui/pages/services/app-credentials/app-credentials.page.scss diff --git a/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-credentials/app-credentials.page.ts b/frontend/projects/ui/src/app/apps/ui/pages/services/app-credentials/app-credentials.page.ts similarity index 94% rename from frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-credentials/app-credentials.page.ts rename to frontend/projects/ui/src/app/apps/ui/pages/services/app-credentials/app-credentials.page.ts index e50890b83..06d1d13a8 100644 --- a/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-credentials/app-credentials.page.ts +++ b/frontend/projects/ui/src/app/apps/ui/pages/services/app-credentials/app-credentials.page.ts @@ -6,8 +6,8 @@ import { ErrorToastService, getPkgId, copyToClipboard, - pauseFor, } from '@start9labs/shared' +import { mask } from 'src/app/util/mask' @Component({ selector: 'app-credentials', @@ -49,6 +49,10 @@ export class AppCredentialsPage { await toast.present() } + mask(value: string) { + return mask(value, 64) + } + toggleMask(key: string) { this.unmasked[key] = !this.unmasked[key] } diff --git a/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-interfaces/app-interfaces-item.component.html b/frontend/projects/ui/src/app/apps/ui/pages/services/app-interfaces/app-interfaces-item.component.html similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-interfaces/app-interfaces-item.component.html rename to frontend/projects/ui/src/app/apps/ui/pages/services/app-interfaces/app-interfaces-item.component.html diff --git a/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-interfaces/app-interfaces.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/services/app-interfaces/app-interfaces.module.ts similarity index 69% rename from frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-interfaces/app-interfaces.module.ts rename to frontend/projects/ui/src/app/apps/ui/pages/services/app-interfaces/app-interfaces.module.ts index 4826e67fa..966905eae 100644 --- a/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-interfaces/app-interfaces.module.ts +++ b/frontend/projects/ui/src/app/apps/ui/pages/services/app-interfaces/app-interfaces.module.ts @@ -3,11 +3,13 @@ import { CommonModule } from '@angular/common' import { Routes, RouterModule } from '@angular/router' import { IonicModule } from '@ionic/angular' import { SharedPipesModule } from '@start9labs/shared' +import { QrCodeModule } from 'ng-qrcode' import { AppInterfacesItemComponent, AppInterfacesPage, } from './app-interfaces.page' -import { UiPipeModule } from 'src/app/pipes/ui/ui.module' +import { UiPipesModule } from '../ui-pipes/ui.module' +import { QRComponent } from './qr.component' const routes: Routes = [ { @@ -22,8 +24,9 @@ const routes: Routes = [ IonicModule, RouterModule.forChild(routes), SharedPipesModule, - UiPipeModule, + UiPipesModule, + QrCodeModule, ], - declarations: [AppInterfacesPage, AppInterfacesItemComponent], + declarations: [AppInterfacesPage, AppInterfacesItemComponent, QRComponent], }) export class AppInterfacesPageModule {} diff --git a/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-interfaces/app-interfaces.page.html b/frontend/projects/ui/src/app/apps/ui/pages/services/app-interfaces/app-interfaces.page.html similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-interfaces/app-interfaces.page.html rename to frontend/projects/ui/src/app/apps/ui/pages/services/app-interfaces/app-interfaces.page.html diff --git a/frontend/projects/ui/src/app/apps/ui/pages/services/app-interfaces/app-interfaces.page.scss b/frontend/projects/ui/src/app/apps/ui/pages/services/app-interfaces/app-interfaces.page.scss new file mode 100644 index 000000000..79823db59 --- /dev/null +++ b/frontend/projects/ui/src/app/apps/ui/pages/services/app-interfaces/app-interfaces.page.scss @@ -0,0 +1,3 @@ +p { + font-family: 'Courier New'; +} diff --git a/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-interfaces/app-interfaces.page.ts b/frontend/projects/ui/src/app/apps/ui/pages/services/app-interfaces/app-interfaces.page.ts similarity index 96% rename from frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-interfaces/app-interfaces.page.ts rename to frontend/projects/ui/src/app/apps/ui/pages/services/app-interfaces/app-interfaces.page.ts index 7c399f052..86650d044 100644 --- a/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-interfaces/app-interfaces.page.ts +++ b/frontend/projects/ui/src/app/apps/ui/pages/services/app-interfaces/app-interfaces.page.ts @@ -4,8 +4,8 @@ import { ModalController, ToastController } from '@ionic/angular' import { getPkgId, copyToClipboard } from '@start9labs/shared' import { AddressInfo, DataModel } from 'src/app/services/patch-db/data-model' import { PatchDB } from 'patch-db-client' -import { QRComponent } from 'src/app/components/qr/qr.component' import { map } from 'rxjs' +import { QRComponent } from './qr.component' @Component({ selector: 'app-interfaces', diff --git a/frontend/projects/ui/src/app/components/qr/qr.component.ts b/frontend/projects/ui/src/app/apps/ui/pages/services/app-interfaces/qr.component.ts similarity index 64% rename from frontend/projects/ui/src/app/components/qr/qr.component.ts rename to frontend/projects/ui/src/app/apps/ui/pages/services/app-interfaces/qr.component.ts index 7fb6108f0..8f34aa01d 100644 --- a/frontend/projects/ui/src/app/components/qr/qr.component.ts +++ b/frontend/projects/ui/src/app/apps/ui/pages/services/app-interfaces/qr.component.ts @@ -2,8 +2,7 @@ import { Component, Input } from '@angular/core' @Component({ selector: 'qr', - templateUrl: './qr.component.html', - styleUrls: ['./qr.component.scss'], + template: '', }) export class QRComponent { @Input() text!: string diff --git a/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-list/app-list-icon/app-list-icon.component.html b/frontend/projects/ui/src/app/apps/ui/pages/services/app-list/app-list-icon/app-list-icon.component.html similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-list/app-list-icon/app-list-icon.component.html rename to frontend/projects/ui/src/app/apps/ui/pages/services/app-list/app-list-icon/app-list-icon.component.html diff --git a/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-list/app-list-icon/app-list-icon.component.scss b/frontend/projects/ui/src/app/apps/ui/pages/services/app-list/app-list-icon/app-list-icon.component.scss similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-list/app-list-icon/app-list-icon.component.scss rename to frontend/projects/ui/src/app/apps/ui/pages/services/app-list/app-list-icon/app-list-icon.component.scss diff --git a/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-list/app-list-icon/app-list-icon.component.ts b/frontend/projects/ui/src/app/apps/ui/pages/services/app-list/app-list-icon/app-list-icon.component.ts similarity index 90% rename from frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-list/app-list-icon/app-list-icon.component.ts rename to frontend/projects/ui/src/app/apps/ui/pages/services/app-list/app-list-icon/app-list-icon.component.ts index 7ae537ad8..ccc4cd0c8 100644 --- a/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-list/app-list-icon/app-list-icon.component.ts +++ b/frontend/projects/ui/src/app/apps/ui/pages/services/app-list/app-list-icon/app-list-icon.component.ts @@ -1,6 +1,6 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core' import { ConnectionService } from 'src/app/services/connection.service' -import { PkgInfo } from 'src/app/util/get-package-info' +import { PkgInfo } from 'src/app/types/pkg-info' @Component({ selector: 'app-list-icon', diff --git a/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.html b/frontend/projects/ui/src/app/apps/ui/pages/services/app-list/app-list-pkg/app-list-pkg.component.html similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.html rename to frontend/projects/ui/src/app/apps/ui/pages/services/app-list/app-list-pkg/app-list-pkg.component.html diff --git a/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.scss b/frontend/projects/ui/src/app/apps/ui/pages/services/app-list/app-list-pkg/app-list-pkg.component.scss similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.scss rename to frontend/projects/ui/src/app/apps/ui/pages/services/app-list/app-list-pkg/app-list-pkg.component.scss diff --git a/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.ts b/frontend/projects/ui/src/app/apps/ui/pages/services/app-list/app-list-pkg/app-list-pkg.component.ts similarity index 83% rename from frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.ts rename to frontend/projects/ui/src/app/apps/ui/pages/services/app-list/app-list-pkg/app-list-pkg.component.ts index 87523897b..902391c28 100644 --- a/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.ts +++ b/frontend/projects/ui/src/app/apps/ui/pages/services/app-list/app-list-pkg/app-list-pkg.component.ts @@ -4,9 +4,9 @@ import { Input, ViewChild, } from '@angular/core' -import { LaunchMenuComponent } from 'src/app/components/launch-menu/launch-menu.component' +import { LaunchMenuComponent } from '../../launch-menu/launch-menu.component' import { PackageMainStatus } from 'src/app/services/patch-db/data-model' -import { PkgInfo } from 'src/app/util/get-package-info' +import { PkgInfo } from 'src/app/types/pkg-info' @Component({ selector: 'app-list-pkg', diff --git a/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-list/app-list.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/services/app-list/app-list.module.ts similarity index 70% rename from frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-list/app-list.module.ts rename to frontend/projects/ui/src/app/apps/ui/pages/services/app-list/app-list.module.ts index 27ff439fe..b1c8b5ec8 100644 --- a/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-list/app-list.module.ts +++ b/frontend/projects/ui/src/app/apps/ui/pages/services/app-list/app-list.module.ts @@ -9,14 +9,14 @@ import { TextSpinnerComponentModule, TickerModule, } from '@start9labs/shared' -import { BadgeMenuComponentModule } from 'src/app/components/badge-menu-button/badge-menu.component.module' -import { StatusComponentModule } from 'src/app/components/status/status.component.module' -import { UiPipeModule } from 'src/app/pipes/ui/ui.module' +import { BadgeMenuComponentModule } from 'src/app/common/badge-menu-button/badge-menu.component.module' +import { WidgetListComponentModule } from 'src/app/common/widget-list/widget-list.component.module' +import { StatusComponentModule } from '../status/status.component.module' +import { UiPipesModule } from '../ui-pipes/ui.module' import { AppListIconComponent } from './app-list-icon/app-list-icon.component' import { AppListPkgComponent } from './app-list-pkg/app-list-pkg.component' import { PackageInfoPipe } from './package-info.pipe' -import { WidgetListComponentModule } from 'src/app/components/widget-list/widget-list.component.module' -import { LaunchMenuComponentModule } from 'src/app/components/launch-menu/launch-menu.module' +import { LaunchMenuComponentModule } from '../launch-menu/launch-menu.module' const routes: Routes = [ { @@ -31,7 +31,7 @@ const routes: Routes = [ StatusComponentModule, EmverPipesModule, TextSpinnerComponentModule, - UiPipeModule, + UiPipesModule, IonicModule, RouterModule.forChild(routes), BadgeMenuComponentModule, diff --git a/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-list/app-list.page.html b/frontend/projects/ui/src/app/apps/ui/pages/services/app-list/app-list.page.html similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-list/app-list.page.html rename to frontend/projects/ui/src/app/apps/ui/pages/services/app-list/app-list.page.html diff --git a/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-list/app-list.page.scss b/frontend/projects/ui/src/app/apps/ui/pages/services/app-list/app-list.page.scss similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-list/app-list.page.scss rename to frontend/projects/ui/src/app/apps/ui/pages/services/app-list/app-list.page.scss diff --git a/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-list/app-list.page.ts b/frontend/projects/ui/src/app/apps/ui/pages/services/app-list/app-list.page.ts similarity index 92% rename from frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-list/app-list.page.ts rename to frontend/projects/ui/src/app/apps/ui/pages/services/app-list/app-list.page.ts index f7d7685ff..a16ae01e4 100644 --- a/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-list/app-list.page.ts +++ b/frontend/projects/ui/src/app/apps/ui/pages/services/app-list/app-list.page.ts @@ -1,7 +1,7 @@ import { ChangeDetectionStrategy, Component } from '@angular/core' import { PatchDB } from 'patch-db-client' +import { filter, map, pairwise, startWith } from 'rxjs' import { DataModel } from 'src/app/services/patch-db/data-model' -import { filter, map, pairwise, startWith } from 'rxjs/operators' @Component({ selector: 'app-list', diff --git a/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-list/package-info.pipe.ts b/frontend/projects/ui/src/app/apps/ui/pages/services/app-list/package-info.pipe.ts similarity index 75% rename from frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-list/package-info.pipe.ts rename to frontend/projects/ui/src/app/apps/ui/pages/services/app-list/package-info.pipe.ts index 504127ab7..220ebe38b 100644 --- a/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-list/package-info.pipe.ts +++ b/frontend/projects/ui/src/app/apps/ui/pages/services/app-list/package-info.pipe.ts @@ -1,12 +1,12 @@ import { Pipe, PipeTransform } from '@angular/core' -import { Observable } from 'rxjs' -import { filter, map, startWith } from 'rxjs/operators' +import { PatchDB } from 'patch-db-client' +import { filter, map, startWith, Observable } from 'rxjs' import { DataModel, PackageDataEntry, } from 'src/app/services/patch-db/data-model' -import { getPackageInfo, PkgInfo } from 'src/app/util/get-package-info' -import { PatchDB } from 'patch-db-client' +import { getPackageInfo } from 'src/app/util/get-package-info' +import { PkgInfo } from 'src/app/types/pkg-info' @Pipe({ name: 'packageInfo', diff --git a/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-logs/app-logs.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/services/app-logs/app-logs.module.ts similarity index 85% rename from frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-logs/app-logs.module.ts rename to frontend/projects/ui/src/app/apps/ui/pages/services/app-logs/app-logs.module.ts index e320f7568..cbaa4b59a 100644 --- a/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-logs/app-logs.module.ts +++ b/frontend/projects/ui/src/app/apps/ui/pages/services/app-logs/app-logs.module.ts @@ -3,7 +3,7 @@ import { CommonModule } from '@angular/common' import { Routes, RouterModule } from '@angular/router' import { IonicModule } from '@ionic/angular' import { AppLogsPage } from './app-logs.page' -import { LogsComponentModule } from 'src/app/components/logs/logs.component.module' +import { LogsComponentModule } from 'src/app/common/logs/logs.component.module' const routes: Routes = [ { diff --git a/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-logs/app-logs.page.html b/frontend/projects/ui/src/app/apps/ui/pages/services/app-logs/app-logs.page.html similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-logs/app-logs.page.html rename to frontend/projects/ui/src/app/apps/ui/pages/services/app-logs/app-logs.page.html diff --git a/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-logs/app-logs.page.scss b/frontend/projects/ui/src/app/apps/ui/pages/services/app-logs/app-logs.page.scss similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-logs/app-logs.page.scss rename to frontend/projects/ui/src/app/apps/ui/pages/services/app-logs/app-logs.page.scss diff --git a/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-logs/app-logs.page.ts b/frontend/projects/ui/src/app/apps/ui/pages/services/app-logs/app-logs.page.ts similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-logs/app-logs.page.ts rename to frontend/projects/ui/src/app/apps/ui/pages/services/app-logs/app-logs.page.ts diff --git a/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/app-show.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/services/app-show/app-show.module.ts similarity index 82% rename from frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/app-show.module.ts rename to frontend/projects/ui/src/app/apps/ui/pages/services/app-show/app-show.module.ts index b9d79d6f0..ee45f5f2b 100644 --- a/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/app-show.module.ts +++ b/frontend/projects/ui/src/app/apps/ui/pages/services/app-show/app-show.module.ts @@ -8,9 +8,9 @@ import { ResponsiveColModule, SharedPipesModule, } from '@start9labs/shared' -import { StatusComponentModule } from 'src/app/components/status/status.component.module' -import { AppConfigPageModule } from 'src/app/modals/app-config/app-config.module' -import { UiPipeModule } from 'src/app/pipes/ui/ui.module' +import { StatusComponentModule } from '../status/status.component.module' +import { AppConfigPageModule } from './modals/app-config/app-config.module' +import { UiPipesModule } from '../ui-pipes/ui.module' import { AppShowHeaderComponent } from './components/app-show-header/app-show-header.component' import { AppShowProgressComponent } from './components/app-show-progress/app-show-progress.component' import { AppShowStatusComponent } from './components/app-show-status/app-show-status.component' @@ -23,8 +23,8 @@ import { ToButtonsPipe } from './pipes/to-buttons.pipe' import { ToDependenciesPipe } from './pipes/to-dependencies.pipe' import { ToStatusPipe } from './pipes/to-status.pipe' import { ProgressDataPipe } from './pipes/progress-data.pipe' -import { InsecureWarningComponentModule } from 'src/app/components/insecure-warning/insecure-warning.module' -import { LaunchMenuComponentModule } from 'src/app/components/launch-menu/launch-menu.module' +import { InsecureWarningComponentModule } from 'src/app/common/insecure-warning/insecure-warning.module' +import { LaunchMenuComponentModule } from '../launch-menu/launch-menu.module' const routes: Routes = [ { @@ -56,7 +56,7 @@ const routes: Routes = [ RouterModule.forChild(routes), AppConfigPageModule, EmverPipesModule, - UiPipeModule, + UiPipesModule, ResponsiveColModule, SharedPipesModule, InsecureWarningComponentModule, diff --git a/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/app-show.page.html b/frontend/projects/ui/src/app/apps/ui/pages/services/app-show/app-show.page.html similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/app-show.page.html rename to frontend/projects/ui/src/app/apps/ui/pages/services/app-show/app-show.page.html diff --git a/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/app-show.page.ts b/frontend/projects/ui/src/app/apps/ui/pages/services/app-show/app-show.page.ts similarity index 97% rename from frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/app-show.page.ts rename to frontend/projects/ui/src/app/apps/ui/pages/services/app-show/app-show.page.ts index ef1cad136..60c5834eb 100644 --- a/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/app-show.page.ts +++ b/frontend/projects/ui/src/app/apps/ui/pages/services/app-show/app-show.page.ts @@ -1,6 +1,9 @@ import { ChangeDetectionStrategy, Component } from '@angular/core' +import { ActivatedRoute } from '@angular/router' import { NavController } from '@ionic/angular' +import { getPkgId } from '@start9labs/shared' import { PatchDB } from 'patch-db-client' +import { tap } from 'rxjs' import { DataModel, PackageDataEntry, @@ -10,9 +13,6 @@ import { PackageStatus, PrimaryStatus, } from 'src/app/services/pkg-status-rendering.service' -import { tap } from 'rxjs/operators' -import { ActivatedRoute } from '@angular/router' -import { getPkgId } from '@start9labs/shared' import { ConfigService } from 'src/app/services/config.service' const STATES = [ diff --git a/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/components/app-show-additional/app-show-additional.component.html b/frontend/projects/ui/src/app/apps/ui/pages/services/app-show/components/app-show-additional/app-show-additional.component.html similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/components/app-show-additional/app-show-additional.component.html rename to frontend/projects/ui/src/app/apps/ui/pages/services/app-show/components/app-show-additional/app-show-additional.component.html diff --git a/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/components/app-show-additional/app-show-additional.component.ts b/frontend/projects/ui/src/app/apps/ui/pages/services/app-show/components/app-show-additional/app-show-additional.component.ts similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/components/app-show-additional/app-show-additional.component.ts rename to frontend/projects/ui/src/app/apps/ui/pages/services/app-show/components/app-show-additional/app-show-additional.component.ts diff --git a/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/components/app-show-dependencies/app-show-dependencies.component.html b/frontend/projects/ui/src/app/apps/ui/pages/services/app-show/components/app-show-dependencies/app-show-dependencies.component.html similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/components/app-show-dependencies/app-show-dependencies.component.html rename to frontend/projects/ui/src/app/apps/ui/pages/services/app-show/components/app-show-dependencies/app-show-dependencies.component.html diff --git a/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/components/app-show-dependencies/app-show-dependencies.component.scss b/frontend/projects/ui/src/app/apps/ui/pages/services/app-show/components/app-show-dependencies/app-show-dependencies.component.scss similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/components/app-show-dependencies/app-show-dependencies.component.scss rename to frontend/projects/ui/src/app/apps/ui/pages/services/app-show/components/app-show-dependencies/app-show-dependencies.component.scss diff --git a/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/components/app-show-dependencies/app-show-dependencies.component.ts b/frontend/projects/ui/src/app/apps/ui/pages/services/app-show/components/app-show-dependencies/app-show-dependencies.component.ts similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/components/app-show-dependencies/app-show-dependencies.component.ts rename to frontend/projects/ui/src/app/apps/ui/pages/services/app-show/components/app-show-dependencies/app-show-dependencies.component.ts diff --git a/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/components/app-show-header/app-show-header.component.html b/frontend/projects/ui/src/app/apps/ui/pages/services/app-show/components/app-show-header/app-show-header.component.html similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/components/app-show-header/app-show-header.component.html rename to frontend/projects/ui/src/app/apps/ui/pages/services/app-show/components/app-show-header/app-show-header.component.html diff --git a/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/components/app-show-header/app-show-header.component.scss b/frontend/projects/ui/src/app/apps/ui/pages/services/app-show/components/app-show-header/app-show-header.component.scss similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/components/app-show-header/app-show-header.component.scss rename to frontend/projects/ui/src/app/apps/ui/pages/services/app-show/components/app-show-header/app-show-header.component.scss diff --git a/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/components/app-show-header/app-show-header.component.ts b/frontend/projects/ui/src/app/apps/ui/pages/services/app-show/components/app-show-header/app-show-header.component.ts similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/components/app-show-header/app-show-header.component.ts rename to frontend/projects/ui/src/app/apps/ui/pages/services/app-show/components/app-show-header/app-show-header.component.ts diff --git a/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/components/app-show-health-checks/app-show-health-checks.component.html b/frontend/projects/ui/src/app/apps/ui/pages/services/app-show/components/app-show-health-checks/app-show-health-checks.component.html similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/components/app-show-health-checks/app-show-health-checks.component.html rename to frontend/projects/ui/src/app/apps/ui/pages/services/app-show/components/app-show-health-checks/app-show-health-checks.component.html diff --git a/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/components/app-show-health-checks/app-show-health-checks.component.scss b/frontend/projects/ui/src/app/apps/ui/pages/services/app-show/components/app-show-health-checks/app-show-health-checks.component.scss similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/components/app-show-health-checks/app-show-health-checks.component.scss rename to frontend/projects/ui/src/app/apps/ui/pages/services/app-show/components/app-show-health-checks/app-show-health-checks.component.scss diff --git a/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/components/app-show-health-checks/app-show-health-checks.component.ts b/frontend/projects/ui/src/app/apps/ui/pages/services/app-show/components/app-show-health-checks/app-show-health-checks.component.ts similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/components/app-show-health-checks/app-show-health-checks.component.ts rename to frontend/projects/ui/src/app/apps/ui/pages/services/app-show/components/app-show-health-checks/app-show-health-checks.component.ts diff --git a/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/components/app-show-menu/app-show-menu.component.html b/frontend/projects/ui/src/app/apps/ui/pages/services/app-show/components/app-show-menu/app-show-menu.component.html similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/components/app-show-menu/app-show-menu.component.html rename to frontend/projects/ui/src/app/apps/ui/pages/services/app-show/components/app-show-menu/app-show-menu.component.html diff --git a/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/components/app-show-menu/app-show-menu.component.scss b/frontend/projects/ui/src/app/apps/ui/pages/services/app-show/components/app-show-menu/app-show-menu.component.scss similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/components/app-show-menu/app-show-menu.component.scss rename to frontend/projects/ui/src/app/apps/ui/pages/services/app-show/components/app-show-menu/app-show-menu.component.scss diff --git a/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/components/app-show-menu/app-show-menu.component.ts b/frontend/projects/ui/src/app/apps/ui/pages/services/app-show/components/app-show-menu/app-show-menu.component.ts similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/components/app-show-menu/app-show-menu.component.ts rename to frontend/projects/ui/src/app/apps/ui/pages/services/app-show/components/app-show-menu/app-show-menu.component.ts diff --git a/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/components/app-show-progress/app-show-progress.component.html b/frontend/projects/ui/src/app/apps/ui/pages/services/app-show/components/app-show-progress/app-show-progress.component.html similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/components/app-show-progress/app-show-progress.component.html rename to frontend/projects/ui/src/app/apps/ui/pages/services/app-show/components/app-show-progress/app-show-progress.component.html diff --git a/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/components/app-show-progress/app-show-progress.component.scss b/frontend/projects/ui/src/app/apps/ui/pages/services/app-show/components/app-show-progress/app-show-progress.component.scss similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/components/app-show-progress/app-show-progress.component.scss rename to frontend/projects/ui/src/app/apps/ui/pages/services/app-show/components/app-show-progress/app-show-progress.component.scss diff --git a/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/components/app-show-progress/app-show-progress.component.ts b/frontend/projects/ui/src/app/apps/ui/pages/services/app-show/components/app-show-progress/app-show-progress.component.ts similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/components/app-show-progress/app-show-progress.component.ts rename to frontend/projects/ui/src/app/apps/ui/pages/services/app-show/components/app-show-progress/app-show-progress.component.ts diff --git a/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.html b/frontend/projects/ui/src/app/apps/ui/pages/services/app-show/components/app-show-status/app-show-status.component.html similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.html rename to frontend/projects/ui/src/app/apps/ui/pages/services/app-show/components/app-show-status/app-show-status.component.html diff --git a/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.scss b/frontend/projects/ui/src/app/apps/ui/pages/services/app-show/components/app-show-status/app-show-status.component.scss similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.scss rename to frontend/projects/ui/src/app/apps/ui/pages/services/app-show/components/app-show-status/app-show-status.component.scss diff --git a/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.ts b/frontend/projects/ui/src/app/apps/ui/pages/services/app-show/components/app-show-status/app-show-status.component.ts similarity index 97% rename from frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.ts rename to frontend/projects/ui/src/app/apps/ui/pages/services/app-show/components/app-show-status/app-show-status.component.ts index 3bf109bd0..c3ad71beb 100644 --- a/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.ts +++ b/frontend/projects/ui/src/app/apps/ui/pages/services/app-show/components/app-show-status/app-show-status.component.ts @@ -23,12 +23,12 @@ import { FormDialogService } from 'src/app/services/form-dialog.service' import { AppConfigPage, PackageConfigData, -} from 'src/app/modals/app-config/app-config.page' +} from '../../modals/app-config/app-config.page' import { DependencyInfo } from '../../pipes/to-dependencies.pipe' import { hasCurrentDeps } from 'src/app/util/has-deps' import { ConnectionService } from 'src/app/services/connection.service' import { PatchDB } from 'patch-db-client' -import { LaunchMenuComponent } from 'src/app/components/launch-menu/launch-menu.component' +import { LaunchMenuComponent } from '../../../launch-menu/launch-menu.component' @Component({ selector: 'app-show-status', diff --git a/frontend/projects/ui/src/app/modals/app-config/app-config-dep.component.ts b/frontend/projects/ui/src/app/apps/ui/pages/services/app-show/modals/app-config/app-config-dep.component.ts similarity index 100% rename from frontend/projects/ui/src/app/modals/app-config/app-config-dep.component.ts rename to frontend/projects/ui/src/app/apps/ui/pages/services/app-show/modals/app-config/app-config-dep.component.ts diff --git a/frontend/projects/ui/src/app/modals/app-config/app-config.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/services/app-show/modals/app-config/app-config.module.ts similarity index 90% rename from frontend/projects/ui/src/app/modals/app-config/app-config.module.ts rename to frontend/projects/ui/src/app/apps/ui/pages/services/app-show/modals/app-config/app-config.module.ts index 0b7f94131..c7caf81ad 100644 --- a/frontend/projects/ui/src/app/modals/app-config/app-config.module.ts +++ b/frontend/projects/ui/src/app/apps/ui/pages/services/app-show/modals/app-config/app-config.module.ts @@ -7,8 +7,9 @@ import { TuiModeModule, TuiNotificationModule, } from '@taiga-ui/core' +import { FormPageModule } from 'src/app/apps/ui/modals/form/form.module' + import { AppConfigPage } from './app-config.page' -import { FormPageModule } from '../form/form.module' import { AppConfigDepComponent } from './app-config-dep.component' @NgModule({ diff --git a/frontend/projects/ui/src/app/modals/app-config/app-config.page.html b/frontend/projects/ui/src/app/apps/ui/pages/services/app-show/modals/app-config/app-config.page.html similarity index 100% rename from frontend/projects/ui/src/app/modals/app-config/app-config.page.html rename to frontend/projects/ui/src/app/apps/ui/pages/services/app-show/modals/app-config/app-config.page.html diff --git a/frontend/projects/ui/src/app/modals/app-config/app-config.page.scss b/frontend/projects/ui/src/app/apps/ui/pages/services/app-show/modals/app-config/app-config.page.scss similarity index 100% rename from frontend/projects/ui/src/app/modals/app-config/app-config.page.scss rename to frontend/projects/ui/src/app/apps/ui/pages/services/app-show/modals/app-config/app-config.page.scss diff --git a/frontend/projects/ui/src/app/modals/app-config/app-config.page.ts b/frontend/projects/ui/src/app/apps/ui/pages/services/app-show/modals/app-config/app-config.page.ts similarity index 95% rename from frontend/projects/ui/src/app/modals/app-config/app-config.page.ts rename to frontend/projects/ui/src/app/apps/ui/pages/services/app-show/modals/app-config/app-config.page.ts index dbef7701f..f606d067e 100644 --- a/frontend/projects/ui/src/app/modals/app-config/app-config.page.ts +++ b/frontend/projects/ui/src/app/apps/ui/pages/services/app-show/modals/app-config/app-config.page.ts @@ -21,10 +21,10 @@ import { compare, Operation } from 'fast-json-patch' import { hasCurrentDeps } from 'src/app/util/has-deps' import { getAllPackages, getPackage } from 'src/app/util/get-package-data' import { Breakages } from 'src/app/services/api/api.types' -import { InvalidService } from '../../components/form/invalid.service' -import { LoadingService } from '../loading/loading.service' -import { DependentInfo } from '../../types/dependent-info' -import { ActionButton } from '../form/form.page' +import { InvalidService } from 'src/app/common/form/invalid.service' +import { LoadingService } from 'src/app/common/loading/loading.service' +import { DependentInfo } from 'src/app/types/dependent-info' +import { ActionButton } from 'src/app/apps/ui/modals/form/form.page' export interface PackageConfigData { readonly pkgId: string diff --git a/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/pipes/health-color.pipe.ts b/frontend/projects/ui/src/app/apps/ui/pages/services/app-show/pipes/health-color.pipe.ts similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/pipes/health-color.pipe.ts rename to frontend/projects/ui/src/app/apps/ui/pages/services/app-show/pipes/health-color.pipe.ts diff --git a/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/pipes/progress-data.pipe.ts b/frontend/projects/ui/src/app/apps/ui/pages/services/app-show/pipes/progress-data.pipe.ts similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/pipes/progress-data.pipe.ts rename to frontend/projects/ui/src/app/apps/ui/pages/services/app-show/pipes/progress-data.pipe.ts diff --git a/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/pipes/to-buttons.pipe.ts b/frontend/projects/ui/src/app/apps/ui/pages/services/app-show/pipes/to-buttons.pipe.ts similarity index 98% rename from frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/pipes/to-buttons.pipe.ts rename to frontend/projects/ui/src/app/apps/ui/pages/services/app-show/pipes/to-buttons.pipe.ts index 8b97302e2..02113250d 100644 --- a/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/pipes/to-buttons.pipe.ts +++ b/frontend/projects/ui/src/app/apps/ui/pages/services/app-show/pipes/to-buttons.pipe.ts @@ -10,7 +10,7 @@ import { FormDialogService } from 'src/app/services/form-dialog.service' import { AppConfigPage, PackageConfigData, -} from 'src/app/modals/app-config/app-config.page' +} from '../modals/app-config/app-config.page' import { ApiService } from 'src/app/services/api/embassy-api.service' import { from, map, Observable } from 'rxjs' import { PatchDB } from 'patch-db-client' diff --git a/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/pipes/to-dependencies.pipe.ts b/frontend/projects/ui/src/app/apps/ui/pages/services/app-show/pipes/to-dependencies.pipe.ts similarity index 98% rename from frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/pipes/to-dependencies.pipe.ts rename to frontend/projects/ui/src/app/apps/ui/pages/services/app-show/pipes/to-dependencies.pipe.ts index c0f547e13..f2de20a4e 100644 --- a/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/pipes/to-dependencies.pipe.ts +++ b/frontend/projects/ui/src/app/apps/ui/pages/services/app-show/pipes/to-dependencies.pipe.ts @@ -10,7 +10,7 @@ import { FormDialogService } from 'src/app/services/form-dialog.service' import { AppConfigPage, PackageConfigData, -} from 'src/app/modals/app-config/app-config.page' +} from '../modals/app-config/app-config.page' import { Manifest } from '@start9labs/marketplace' export interface DependencyInfo { diff --git a/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/pipes/to-status.pipe.ts b/frontend/projects/ui/src/app/apps/ui/pages/services/app-show/pipes/to-status.pipe.ts similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/pipes/to-status.pipe.ts rename to frontend/projects/ui/src/app/apps/ui/pages/services/app-show/pipes/to-status.pipe.ts diff --git a/frontend/projects/ui/src/app/components/launch-menu/launch-menu.component.html b/frontend/projects/ui/src/app/apps/ui/pages/services/launch-menu/launch-menu.component.html similarity index 100% rename from frontend/projects/ui/src/app/components/launch-menu/launch-menu.component.html rename to frontend/projects/ui/src/app/apps/ui/pages/services/launch-menu/launch-menu.component.html diff --git a/frontend/projects/ui/src/app/components/launch-menu/launch-menu.component.scss b/frontend/projects/ui/src/app/apps/ui/pages/services/launch-menu/launch-menu.component.scss similarity index 100% rename from frontend/projects/ui/src/app/components/launch-menu/launch-menu.component.scss rename to frontend/projects/ui/src/app/apps/ui/pages/services/launch-menu/launch-menu.component.scss diff --git a/frontend/projects/ui/src/app/components/launch-menu/launch-menu.component.ts b/frontend/projects/ui/src/app/apps/ui/pages/services/launch-menu/launch-menu.component.ts similarity index 100% rename from frontend/projects/ui/src/app/components/launch-menu/launch-menu.component.ts rename to frontend/projects/ui/src/app/apps/ui/pages/services/launch-menu/launch-menu.component.ts diff --git a/frontend/projects/ui/src/app/components/launch-menu/launch-menu.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/services/launch-menu/launch-menu.module.ts similarity index 74% rename from frontend/projects/ui/src/app/components/launch-menu/launch-menu.module.ts rename to frontend/projects/ui/src/app/apps/ui/pages/services/launch-menu/launch-menu.module.ts index 56e0a9ac5..ccbe8fa7d 100644 --- a/frontend/projects/ui/src/app/components/launch-menu/launch-menu.module.ts +++ b/frontend/projects/ui/src/app/apps/ui/pages/services/launch-menu/launch-menu.module.ts @@ -1,12 +1,12 @@ import { NgModule } from '@angular/core' import { CommonModule } from '@angular/common' import { IonicModule } from '@ionic/angular' +import { UiPipesModule } from '../ui-pipes/ui.module' import { LaunchMenuComponent } from './launch-menu.component' -import { UiPipeModule } from 'src/app/pipes/ui/ui.module' @NgModule({ declarations: [LaunchMenuComponent], - imports: [CommonModule, IonicModule, UiPipeModule], + imports: [CommonModule, IonicModule, UiPipesModule], exports: [LaunchMenuComponent], }) export class LaunchMenuComponentModule {} diff --git a/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/apps-routing.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/services/services.module.ts similarity index 97% rename from frontend/projects/ui/src/app/apps/ui/pages/apps-routes/apps-routing.module.ts rename to frontend/projects/ui/src/app/apps/ui/pages/services/services.module.ts index f5343bcc2..858d4d9a7 100644 --- a/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/apps-routing.module.ts +++ b/frontend/projects/ui/src/app/apps/ui/pages/services/services.module.ts @@ -49,4 +49,4 @@ const routes: Routes = [ imports: [RouterModule.forChild(routes)], exports: [RouterModule], }) -export class AppsRoutingModule {} +export class ServicesModule {} diff --git a/frontend/projects/ui/src/app/components/status/status.component.html b/frontend/projects/ui/src/app/apps/ui/pages/services/status/status.component.html similarity index 100% rename from frontend/projects/ui/src/app/components/status/status.component.html rename to frontend/projects/ui/src/app/apps/ui/pages/services/status/status.component.html diff --git a/frontend/projects/ui/src/app/components/status/status.component.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/services/status/status.component.module.ts similarity index 82% rename from frontend/projects/ui/src/app/components/status/status.component.module.ts rename to frontend/projects/ui/src/app/apps/ui/pages/services/status/status.component.module.ts index ea093b8e9..d70f22c4c 100644 --- a/frontend/projects/ui/src/app/components/status/status.component.module.ts +++ b/frontend/projects/ui/src/app/apps/ui/pages/services/status/status.component.module.ts @@ -2,8 +2,8 @@ import { NgModule } from '@angular/core' import { CommonModule } from '@angular/common' import { IonicModule } from '@ionic/angular' import { UnitConversionPipesModule } from '@start9labs/shared' +import { InstallProgressPipeModule } from 'src/app/common/install-progress/install-progress.module' import { StatusComponent } from './status.component' -import { InstallProgressPipeModule } from 'src/app/pipes/install-progress/install-progress.module' @NgModule({ declarations: [StatusComponent], diff --git a/frontend/projects/ui/src/app/components/status/status.component.scss b/frontend/projects/ui/src/app/apps/ui/pages/services/status/status.component.scss similarity index 100% rename from frontend/projects/ui/src/app/components/status/status.component.scss rename to frontend/projects/ui/src/app/apps/ui/pages/services/status/status.component.scss diff --git a/frontend/projects/ui/src/app/components/status/status.component.ts b/frontend/projects/ui/src/app/apps/ui/pages/services/status/status.component.ts similarity index 100% rename from frontend/projects/ui/src/app/components/status/status.component.ts rename to frontend/projects/ui/src/app/apps/ui/pages/services/status/status.component.ts diff --git a/frontend/projects/ui/src/app/pipes/ui/ui.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/services/ui-pipes/ui.module.ts similarity index 88% rename from frontend/projects/ui/src/app/pipes/ui/ui.module.ts rename to frontend/projects/ui/src/app/apps/ui/pages/services/ui-pipes/ui.module.ts index 1ae23b713..24d4f0009 100644 --- a/frontend/projects/ui/src/app/pipes/ui/ui.module.ts +++ b/frontend/projects/ui/src/app/apps/ui/pages/services/ui-pipes/ui.module.ts @@ -5,4 +5,4 @@ import { UiPipe, UiAddressesPipe, AddressTypePipe } from './ui.pipe' declarations: [UiPipe, UiAddressesPipe, AddressTypePipe], exports: [UiPipe, UiAddressesPipe, AddressTypePipe], }) -export class UiPipeModule {} +export class UiPipesModule {} diff --git a/frontend/projects/ui/src/app/pipes/ui/ui.pipe.ts b/frontend/projects/ui/src/app/apps/ui/pages/services/ui-pipes/ui.pipe.ts similarity index 100% rename from frontend/projects/ui/src/app/pipes/ui/ui.pipe.ts rename to frontend/projects/ui/src/app/apps/ui/pages/services/ui-pipes/ui.pipe.ts diff --git a/frontend/projects/ui/src/app/apps/ui/pages/server-routes/email/email.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/system/email/email.module.ts similarity index 92% rename from frontend/projects/ui/src/app/apps/ui/pages/server-routes/email/email.module.ts rename to frontend/projects/ui/src/app/apps/ui/pages/system/email/email.module.ts index 483c8605d..2bcbd043b 100644 --- a/frontend/projects/ui/src/app/apps/ui/pages/server-routes/email/email.module.ts +++ b/frontend/projects/ui/src/app/apps/ui/pages/system/email/email.module.ts @@ -5,7 +5,7 @@ import { TuiButtonModule, TuiNotificationModule } from '@taiga-ui/core' import { EmailPage } from './email.page' import { Routes, RouterModule } from '@angular/router' import { FormsModule, ReactiveFormsModule } from '@angular/forms' -import { FormModule } from 'src/app/components/form/form.module' +import { FormModule } from 'src/app/common/form/form.module' import { TuiInputModule } from '@taiga-ui/kit' const routes: Routes = [ diff --git a/frontend/projects/ui/src/app/apps/ui/pages/server-routes/email/email.page.html b/frontend/projects/ui/src/app/apps/ui/pages/system/email/email.page.html similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/server-routes/email/email.page.html rename to frontend/projects/ui/src/app/apps/ui/pages/system/email/email.page.html diff --git a/frontend/projects/ui/src/app/apps/ui/pages/server-routes/email/email.page.scss b/frontend/projects/ui/src/app/apps/ui/pages/system/email/email.page.scss similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/server-routes/email/email.page.scss rename to frontend/projects/ui/src/app/apps/ui/pages/system/email/email.page.scss diff --git a/frontend/projects/ui/src/app/apps/ui/pages/server-routes/email/email.page.ts b/frontend/projects/ui/src/app/apps/ui/pages/system/email/email.page.ts similarity index 95% rename from frontend/projects/ui/src/app/apps/ui/pages/server-routes/email/email.page.ts rename to frontend/projects/ui/src/app/apps/ui/pages/system/email/email.page.ts index 9260a57ae..a7ea7a233 100644 --- a/frontend/projects/ui/src/app/apps/ui/pages/server-routes/email/email.page.ts +++ b/frontend/projects/ui/src/app/apps/ui/pages/system/email/email.page.ts @@ -1,16 +1,16 @@ import { Component } from '@angular/core' -import { ApiService } from 'src/app/services/api/embassy-api.service' +import { UntypedFormGroup } from '@angular/forms' import { ErrorService } from '@start9labs/shared' +import { InputSpec } from '@start9labs/start-sdk/lib/config/configTypes' +import { customSmtp } from '@start9labs/start-sdk/lib/config/configConstants' +import { TuiDialogService } from '@taiga-ui/core' import { PatchDB } from 'patch-db-client' +import { switchMap } from 'rxjs' +import { ApiService } from 'src/app/services/api/embassy-api.service' import { DataModel } from 'src/app/services/patch-db/data-model' import { FormService } from 'src/app/services/form.service' -import { LoadingService } from 'src/app/modals/loading/loading.service' -import { TuiDialogService } from '@taiga-ui/core' -import { switchMap } from 'rxjs/operators' -import { InputSpec } from '@start9labs/start-sdk/lib/config/configTypes' +import { LoadingService } from 'src/app/common/loading/loading.service' import { configBuilderToSpec } from 'src/app/util/configBuilderToSpec' -import { customSmtp } from '@start9labs/start-sdk/lib/config/configConstants' -import { UntypedFormGroup } from '@angular/forms' @Component({ selector: 'email', diff --git a/frontend/projects/ui/src/app/apps/ui/pages/server-routes/kernel-logs/kernel-logs.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/system/kernel-logs/kernel-logs.module.ts similarity index 86% rename from frontend/projects/ui/src/app/apps/ui/pages/server-routes/kernel-logs/kernel-logs.module.ts rename to frontend/projects/ui/src/app/apps/ui/pages/system/kernel-logs/kernel-logs.module.ts index 96c3f152c..c1b88603d 100644 --- a/frontend/projects/ui/src/app/apps/ui/pages/server-routes/kernel-logs/kernel-logs.module.ts +++ b/frontend/projects/ui/src/app/apps/ui/pages/system/kernel-logs/kernel-logs.module.ts @@ -3,7 +3,7 @@ import { CommonModule } from '@angular/common' import { Routes, RouterModule } from '@angular/router' import { IonicModule } from '@ionic/angular' import { KernelLogsPage } from './kernel-logs.page' -import { LogsComponentModule } from 'src/app/components/logs/logs.component.module' +import { LogsComponentModule } from 'src/app/common/logs/logs.component.module' const routes: Routes = [ { diff --git a/frontend/projects/ui/src/app/apps/ui/pages/server-routes/kernel-logs/kernel-logs.page.html b/frontend/projects/ui/src/app/apps/ui/pages/system/kernel-logs/kernel-logs.page.html similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/server-routes/kernel-logs/kernel-logs.page.html rename to frontend/projects/ui/src/app/apps/ui/pages/system/kernel-logs/kernel-logs.page.html diff --git a/frontend/projects/ui/src/app/apps/ui/pages/server-routes/kernel-logs/kernel-logs.page.scss b/frontend/projects/ui/src/app/apps/ui/pages/system/kernel-logs/kernel-logs.page.scss similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/server-routes/kernel-logs/kernel-logs.page.scss rename to frontend/projects/ui/src/app/apps/ui/pages/system/kernel-logs/kernel-logs.page.scss diff --git a/frontend/projects/ui/src/app/apps/ui/pages/server-routes/kernel-logs/kernel-logs.page.ts b/frontend/projects/ui/src/app/apps/ui/pages/system/kernel-logs/kernel-logs.page.ts similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/server-routes/kernel-logs/kernel-logs.page.ts rename to frontend/projects/ui/src/app/apps/ui/pages/system/kernel-logs/kernel-logs.page.ts diff --git a/frontend/projects/ui/src/app/apps/ui/pages/server-routes/lan/lan.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/system/lan/lan.module.ts similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/server-routes/lan/lan.module.ts rename to frontend/projects/ui/src/app/apps/ui/pages/system/lan/lan.module.ts diff --git a/frontend/projects/ui/src/app/apps/ui/pages/server-routes/lan/lan.page.html b/frontend/projects/ui/src/app/apps/ui/pages/system/lan/lan.page.html similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/server-routes/lan/lan.page.html rename to frontend/projects/ui/src/app/apps/ui/pages/system/lan/lan.page.html diff --git a/frontend/projects/ui/src/app/apps/ui/pages/server-routes/lan/lan.page.scss b/frontend/projects/ui/src/app/apps/ui/pages/system/lan/lan.page.scss similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/server-routes/lan/lan.page.scss rename to frontend/projects/ui/src/app/apps/ui/pages/system/lan/lan.page.scss diff --git a/frontend/projects/ui/src/app/apps/ui/pages/server-routes/lan/lan.page.ts b/frontend/projects/ui/src/app/apps/ui/pages/system/lan/lan.page.ts similarity index 88% rename from frontend/projects/ui/src/app/apps/ui/pages/server-routes/lan/lan.page.ts rename to frontend/projects/ui/src/app/apps/ui/pages/system/lan/lan.page.ts index bcb0a968f..b07b3f2f1 100644 --- a/frontend/projects/ui/src/app/apps/ui/pages/server-routes/lan/lan.page.ts +++ b/frontend/projects/ui/src/app/apps/ui/pages/system/lan/lan.page.ts @@ -1,4 +1,4 @@ -import { ChangeDetectionStrategy, Component, Input } from '@angular/core' +import { ChangeDetectionStrategy, Component } from '@angular/core' import { PatchDB } from 'patch-db-client' import { map } from 'rxjs' import { DataModel } from 'src/app/services/patch-db/data-model' diff --git a/frontend/projects/ui/src/app/apps/ui/pages/server-routes/server-logs/server-logs.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/system/server-logs/server-logs.module.ts similarity index 86% rename from frontend/projects/ui/src/app/apps/ui/pages/server-routes/server-logs/server-logs.module.ts rename to frontend/projects/ui/src/app/apps/ui/pages/system/server-logs/server-logs.module.ts index 14ec7f488..4b14f215c 100644 --- a/frontend/projects/ui/src/app/apps/ui/pages/server-routes/server-logs/server-logs.module.ts +++ b/frontend/projects/ui/src/app/apps/ui/pages/system/server-logs/server-logs.module.ts @@ -3,7 +3,7 @@ import { CommonModule } from '@angular/common' import { Routes, RouterModule } from '@angular/router' import { IonicModule } from '@ionic/angular' import { ServerLogsPage } from './server-logs.page' -import { LogsComponentModule } from 'src/app/components/logs/logs.component.module' +import { LogsComponentModule } from 'src/app/common/logs/logs.component.module' const routes: Routes = [ { diff --git a/frontend/projects/ui/src/app/apps/ui/pages/server-routes/server-logs/server-logs.page.html b/frontend/projects/ui/src/app/apps/ui/pages/system/server-logs/server-logs.page.html similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/server-routes/server-logs/server-logs.page.html rename to frontend/projects/ui/src/app/apps/ui/pages/system/server-logs/server-logs.page.html diff --git a/frontend/projects/ui/src/app/apps/ui/pages/server-routes/server-logs/server-logs.page.scss b/frontend/projects/ui/src/app/apps/ui/pages/system/server-logs/server-logs.page.scss similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/server-routes/server-logs/server-logs.page.scss rename to frontend/projects/ui/src/app/apps/ui/pages/system/server-logs/server-logs.page.scss diff --git a/frontend/projects/ui/src/app/apps/ui/pages/server-routes/server-logs/server-logs.page.ts b/frontend/projects/ui/src/app/apps/ui/pages/system/server-logs/server-logs.page.ts similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/server-routes/server-logs/server-logs.page.ts rename to frontend/projects/ui/src/app/apps/ui/pages/system/server-logs/server-logs.page.ts diff --git a/frontend/projects/ui/src/app/apps/ui/pages/server-routes/server-metrics/server-metrics.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/system/server-metrics/server-metrics.module.ts similarity index 84% rename from frontend/projects/ui/src/app/apps/ui/pages/server-routes/server-metrics/server-metrics.module.ts rename to frontend/projects/ui/src/app/apps/ui/pages/system/server-metrics/server-metrics.module.ts index a45dd577c..4b6d12b89 100644 --- a/frontend/projects/ui/src/app/apps/ui/pages/server-routes/server-metrics/server-metrics.module.ts +++ b/frontend/projects/ui/src/app/apps/ui/pages/system/server-metrics/server-metrics.module.ts @@ -3,7 +3,7 @@ import { CommonModule } from '@angular/common' import { Routes, RouterModule } from '@angular/router' import { IonicModule } from '@ionic/angular' import { ServerMetricsPage } from './server-metrics.page' -import { SkeletonListComponentModule } from 'src/app/components/skeleton-list/skeleton-list.component.module' +import { SkeletonListComponentModule } from 'src/app/common/skeleton-list/skeleton-list.component.module' import { SharedPipesModule } from '@start9labs/shared' const routes: Routes = [ diff --git a/frontend/projects/ui/src/app/apps/ui/pages/server-routes/server-metrics/server-metrics.page.html b/frontend/projects/ui/src/app/apps/ui/pages/system/server-metrics/server-metrics.page.html similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/server-routes/server-metrics/server-metrics.page.html rename to frontend/projects/ui/src/app/apps/ui/pages/system/server-metrics/server-metrics.page.html diff --git a/frontend/projects/ui/src/app/apps/ui/pages/server-routes/server-metrics/server-metrics.page.scss b/frontend/projects/ui/src/app/apps/ui/pages/system/server-metrics/server-metrics.page.scss similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/server-routes/server-metrics/server-metrics.page.scss rename to frontend/projects/ui/src/app/apps/ui/pages/system/server-metrics/server-metrics.page.scss diff --git a/frontend/projects/ui/src/app/apps/ui/pages/server-routes/server-metrics/server-metrics.page.ts b/frontend/projects/ui/src/app/apps/ui/pages/system/server-metrics/server-metrics.page.ts similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/server-routes/server-metrics/server-metrics.page.ts rename to frontend/projects/ui/src/app/apps/ui/pages/system/server-metrics/server-metrics.page.ts diff --git a/frontend/projects/ui/src/app/pipes/backup-color/backup-color.pipe.ts b/frontend/projects/ui/src/app/apps/ui/pages/system/server-show/backup-color.pipe.ts similarity index 100% rename from frontend/projects/ui/src/app/pipes/backup-color/backup-color.pipe.ts rename to frontend/projects/ui/src/app/apps/ui/pages/system/server-show/backup-color.pipe.ts diff --git a/frontend/projects/ui/src/app/modals/os-update/os-update.page.html b/frontend/projects/ui/src/app/apps/ui/pages/system/server-show/os-update/os-update.page.html similarity index 100% rename from frontend/projects/ui/src/app/modals/os-update/os-update.page.html rename to frontend/projects/ui/src/app/apps/ui/pages/system/server-show/os-update/os-update.page.html diff --git a/frontend/projects/ui/src/app/modals/os-update/os-update.page.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/system/server-show/os-update/os-update.page.module.ts similarity index 100% rename from frontend/projects/ui/src/app/modals/os-update/os-update.page.module.ts rename to frontend/projects/ui/src/app/apps/ui/pages/system/server-show/os-update/os-update.page.module.ts diff --git a/frontend/projects/ui/src/app/modals/os-update/os-update.page.scss b/frontend/projects/ui/src/app/apps/ui/pages/system/server-show/os-update/os-update.page.scss similarity index 100% rename from frontend/projects/ui/src/app/modals/os-update/os-update.page.scss rename to frontend/projects/ui/src/app/apps/ui/pages/system/server-show/os-update/os-update.page.scss diff --git a/frontend/projects/ui/src/app/modals/os-update/os-update.page.ts b/frontend/projects/ui/src/app/apps/ui/pages/system/server-show/os-update/os-update.page.ts similarity index 100% rename from frontend/projects/ui/src/app/modals/os-update/os-update.page.ts rename to frontend/projects/ui/src/app/apps/ui/pages/system/server-show/os-update/os-update.page.ts index b87962876..ffc544459 100644 --- a/frontend/projects/ui/src/app/modals/os-update/os-update.page.ts +++ b/frontend/projects/ui/src/app/apps/ui/pages/system/server-show/os-update/os-update.page.ts @@ -1,7 +1,7 @@ import { ChangeDetectionStrategy, Component } from '@angular/core' import { LoadingController, ModalController } from '@ionic/angular' -import { ApiService } from 'src/app/services/api/embassy-api.service' import { ErrorToastService } from '@start9labs/shared' +import { ApiService } from 'src/app/services/api/embassy-api.service' import { EOSService } from 'src/app/services/eos.service' @Component({ diff --git a/frontend/projects/ui/src/app/apps/ui/pages/server-routes/server-show/server-show.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/system/server-show/server-show.module.ts similarity index 60% rename from frontend/projects/ui/src/app/apps/ui/pages/server-routes/server-show/server-show.module.ts rename to frontend/projects/ui/src/app/apps/ui/pages/system/server-show/server-show.module.ts index 03e938b7c..f12152c8a 100644 --- a/frontend/projects/ui/src/app/apps/ui/pages/server-routes/server-show/server-show.module.ts +++ b/frontend/projects/ui/src/app/apps/ui/pages/system/server-show/server-show.module.ts @@ -5,11 +5,12 @@ import { RouterModule, Routes } from '@angular/router' import { ServerShowPage } from './server-show.page' import { FormsModule } from '@angular/forms' import { TextSpinnerComponentModule } from '@start9labs/shared' -import { BadgeMenuComponentModule } from 'src/app/components/badge-menu-button/badge-menu.component.module' -import { InsecureWarningComponentModule } from 'src/app/components/insecure-warning/insecure-warning.module' -import { OSUpdatePageModule } from 'src/app/modals/os-update/os-update.page.module' -import { BackupColorPipeModule } from 'src/app/pipes/backup-color/backup-color.module' +import { BadgeMenuComponentModule } from 'src/app/common/badge-menu-button/badge-menu.component.module' +import { InsecureWarningComponentModule } from 'src/app/common/insecure-warning/insecure-warning.module' +import { OSUpdatePageModule } from './os-update/os-update.page.module' +import { GenericInputComponentModule } from 'src/app/apps/ui/modals/generic-input/generic-input.component.module' import { ThemeSwitcherModule } from '../theme-switcher/theme-switcher.module' +import { BackupColorPipe } from './backup-color.pipe' const routes: Routes = [ { @@ -23,14 +24,14 @@ const routes: Routes = [ CommonModule, FormsModule, IonicModule, - RouterModule.forChild(routes), TextSpinnerComponentModule, BadgeMenuComponentModule, OSUpdatePageModule, - BackupColorPipeModule, ThemeSwitcherModule, InsecureWarningComponentModule, + GenericInputComponentModule, + RouterModule.forChild(routes), ], - declarations: [ServerShowPage], + declarations: [ServerShowPage, BackupColorPipe], }) export class ServerShowPageModule {} diff --git a/frontend/projects/ui/src/app/apps/ui/pages/server-routes/server-show/server-show.page.html b/frontend/projects/ui/src/app/apps/ui/pages/system/server-show/server-show.page.html similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/server-routes/server-show/server-show.page.html rename to frontend/projects/ui/src/app/apps/ui/pages/system/server-show/server-show.page.html diff --git a/frontend/projects/ui/src/app/apps/ui/pages/server-routes/server-show/server-show.page.scss b/frontend/projects/ui/src/app/apps/ui/pages/system/server-show/server-show.page.scss similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/server-routes/server-show/server-show.page.scss rename to frontend/projects/ui/src/app/apps/ui/pages/system/server-show/server-show.page.scss diff --git a/frontend/projects/ui/src/app/apps/ui/pages/server-routes/server-show/server-show.page.ts b/frontend/projects/ui/src/app/apps/ui/pages/system/server-show/server-show.page.ts similarity index 99% rename from frontend/projects/ui/src/app/apps/ui/pages/server-routes/server-show/server-show.page.ts rename to frontend/projects/ui/src/app/apps/ui/pages/system/server-show/server-show.page.ts index 624810770..7dd200e63 100644 --- a/frontend/projects/ui/src/app/apps/ui/pages/server-routes/server-show/server-show.page.ts +++ b/frontend/projects/ui/src/app/apps/ui/pages/system/server-show/server-show.page.ts @@ -1,3 +1,4 @@ +import { DOCUMENT } from '@angular/common' import { Component, Inject } from '@angular/core' import { AlertController, @@ -13,16 +14,15 @@ import { firstValueFrom, Observable, of } from 'rxjs' import { ErrorToastService } from '@start9labs/shared' import { EOSService } from 'src/app/services/eos.service' import { ClientStorageService } from 'src/app/services/client-storage.service' -import { OSUpdatePage } from 'src/app/modals/os-update/os-update.page' +import { OSUpdatePage } from './os-update/os-update.page' import { getAllPackages } from 'src/app/util/get-package-data' import { AuthService } from 'src/app/services/auth.service' import { DataModel } from 'src/app/services/patch-db/data-model' import { GenericInputComponent, GenericInputOptions, -} from 'src/app/modals/generic-input/generic-input.component' +} from 'src/app/apps/ui/modals/generic-input/generic-input.component' import { ConfigService } from 'src/app/services/config.service' -import { DOCUMENT } from '@angular/common' @Component({ selector: 'server-show', diff --git a/frontend/projects/ui/src/app/apps/ui/pages/server-routes/server-specs/server-specs.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/system/server-specs/server-specs.module.ts similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/server-routes/server-specs/server-specs.module.ts rename to frontend/projects/ui/src/app/apps/ui/pages/system/server-specs/server-specs.module.ts diff --git a/frontend/projects/ui/src/app/apps/ui/pages/server-routes/server-specs/server-specs.page.html b/frontend/projects/ui/src/app/apps/ui/pages/system/server-specs/server-specs.page.html similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/server-routes/server-specs/server-specs.page.html rename to frontend/projects/ui/src/app/apps/ui/pages/system/server-specs/server-specs.page.html diff --git a/frontend/projects/ui/src/app/apps/ui/pages/server-routes/server-specs/server-specs.page.scss b/frontend/projects/ui/src/app/apps/ui/pages/system/server-specs/server-specs.page.scss similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/server-routes/server-specs/server-specs.page.scss rename to frontend/projects/ui/src/app/apps/ui/pages/system/server-specs/server-specs.page.scss diff --git a/frontend/projects/ui/src/app/apps/ui/pages/server-routes/server-specs/server-specs.page.ts b/frontend/projects/ui/src/app/apps/ui/pages/system/server-specs/server-specs.page.ts similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/server-routes/server-specs/server-specs.page.ts rename to frontend/projects/ui/src/app/apps/ui/pages/system/server-specs/server-specs.page.ts diff --git a/frontend/projects/ui/src/app/apps/ui/pages/server-routes/sessions/sessions.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/system/sessions/sessions.module.ts similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/server-routes/sessions/sessions.module.ts rename to frontend/projects/ui/src/app/apps/ui/pages/system/sessions/sessions.module.ts diff --git a/frontend/projects/ui/src/app/apps/ui/pages/server-routes/sessions/sessions.page.html b/frontend/projects/ui/src/app/apps/ui/pages/system/sessions/sessions.page.html similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/server-routes/sessions/sessions.page.html rename to frontend/projects/ui/src/app/apps/ui/pages/system/sessions/sessions.page.html diff --git a/frontend/projects/ui/src/app/apps/ui/pages/server-routes/sessions/sessions.page.scss b/frontend/projects/ui/src/app/apps/ui/pages/system/sessions/sessions.page.scss similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/server-routes/sessions/sessions.page.scss rename to frontend/projects/ui/src/app/apps/ui/pages/system/sessions/sessions.page.scss diff --git a/frontend/projects/ui/src/app/apps/ui/pages/server-routes/sessions/sessions.page.ts b/frontend/projects/ui/src/app/apps/ui/pages/system/sessions/sessions.page.ts similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/server-routes/sessions/sessions.page.ts rename to frontend/projects/ui/src/app/apps/ui/pages/system/sessions/sessions.page.ts diff --git a/frontend/projects/ui/src/app/apps/ui/pages/server-routes/sideload/dnd.directive.ts b/frontend/projects/ui/src/app/apps/ui/pages/system/sideload/dnd.directive.ts similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/server-routes/sideload/dnd.directive.ts rename to frontend/projects/ui/src/app/apps/ui/pages/system/sideload/dnd.directive.ts diff --git a/frontend/projects/ui/src/app/apps/ui/pages/server-routes/sideload/sideload.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/system/sideload/sideload.module.ts similarity index 89% rename from frontend/projects/ui/src/app/apps/ui/pages/server-routes/sideload/sideload.module.ts rename to frontend/projects/ui/src/app/apps/ui/pages/system/sideload/sideload.module.ts index e0a4b2010..9dab5392d 100644 --- a/frontend/projects/ui/src/app/apps/ui/pages/server-routes/sideload/sideload.module.ts +++ b/frontend/projects/ui/src/app/apps/ui/pages/system/sideload/sideload.module.ts @@ -11,7 +11,8 @@ import { AdditionalModule, DependenciesModule, } from '@start9labs/marketplace' -import { MarketplaceShowComponentsModule } from '../../marketplace-routes/marketplace-show/components/marketplace-show-components.module' +// TODO: Find a way to not tie two routes together +import { MarketplaceShowComponentsModule } from '../../marketplace/marketplace-show/components/marketplace-show-components.module' const routes: Routes = [ { diff --git a/frontend/projects/ui/src/app/apps/ui/pages/server-routes/sideload/sideload.page.html b/frontend/projects/ui/src/app/apps/ui/pages/system/sideload/sideload.page.html similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/server-routes/sideload/sideload.page.html rename to frontend/projects/ui/src/app/apps/ui/pages/system/sideload/sideload.page.html diff --git a/frontend/projects/ui/src/app/apps/ui/pages/server-routes/sideload/sideload.page.scss b/frontend/projects/ui/src/app/apps/ui/pages/system/sideload/sideload.page.scss similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/server-routes/sideload/sideload.page.scss rename to frontend/projects/ui/src/app/apps/ui/pages/system/sideload/sideload.page.scss diff --git a/frontend/projects/ui/src/app/apps/ui/pages/server-routes/sideload/sideload.page.ts b/frontend/projects/ui/src/app/apps/ui/pages/system/sideload/sideload.page.ts similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/server-routes/sideload/sideload.page.ts rename to frontend/projects/ui/src/app/apps/ui/pages/system/sideload/sideload.page.ts diff --git a/frontend/projects/ui/src/app/apps/ui/pages/server-routes/ssh-keys/ssh-keys.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/system/ssh-keys/ssh-keys.module.ts similarity index 79% rename from frontend/projects/ui/src/app/apps/ui/pages/server-routes/ssh-keys/ssh-keys.module.ts rename to frontend/projects/ui/src/app/apps/ui/pages/system/ssh-keys/ssh-keys.module.ts index 4e974498c..6192f8f11 100644 --- a/frontend/projects/ui/src/app/apps/ui/pages/server-routes/ssh-keys/ssh-keys.module.ts +++ b/frontend/projects/ui/src/app/apps/ui/pages/system/ssh-keys/ssh-keys.module.ts @@ -2,8 +2,9 @@ import { NgModule } from '@angular/core' import { CommonModule } from '@angular/common' import { IonicModule } from '@ionic/angular' import { RouterModule, Routes } from '@angular/router' -import { SSHKeysPage } from './ssh-keys.page' import { SharedPipesModule } from '@start9labs/shared' +import { GenericInputComponentModule } from 'src/app/apps/ui/modals/generic-input/generic-input.component.module' +import { SSHKeysPage } from './ssh-keys.page' const routes: Routes = [ { @@ -16,8 +17,9 @@ const routes: Routes = [ imports: [ CommonModule, IonicModule, - RouterModule.forChild(routes), SharedPipesModule, + GenericInputComponentModule, + RouterModule.forChild(routes), ], declarations: [SSHKeysPage], }) diff --git a/frontend/projects/ui/src/app/apps/ui/pages/server-routes/ssh-keys/ssh-keys.page.html b/frontend/projects/ui/src/app/apps/ui/pages/system/ssh-keys/ssh-keys.page.html similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/server-routes/ssh-keys/ssh-keys.page.html rename to frontend/projects/ui/src/app/apps/ui/pages/system/ssh-keys/ssh-keys.page.html diff --git a/frontend/projects/ui/src/app/apps/ui/pages/server-routes/ssh-keys/ssh-keys.page.scss b/frontend/projects/ui/src/app/apps/ui/pages/system/ssh-keys/ssh-keys.page.scss similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/server-routes/ssh-keys/ssh-keys.page.scss rename to frontend/projects/ui/src/app/apps/ui/pages/system/ssh-keys/ssh-keys.page.scss diff --git a/frontend/projects/ui/src/app/apps/ui/pages/server-routes/ssh-keys/ssh-keys.page.ts b/frontend/projects/ui/src/app/apps/ui/pages/system/ssh-keys/ssh-keys.page.ts similarity index 97% rename from frontend/projects/ui/src/app/apps/ui/pages/server-routes/ssh-keys/ssh-keys.page.ts rename to frontend/projects/ui/src/app/apps/ui/pages/system/ssh-keys/ssh-keys.page.ts index 6bf457763..794e5dd47 100644 --- a/frontend/projects/ui/src/app/apps/ui/pages/server-routes/ssh-keys/ssh-keys.page.ts +++ b/frontend/projects/ui/src/app/apps/ui/pages/system/ssh-keys/ssh-keys.page.ts @@ -4,14 +4,14 @@ import { LoadingController, ModalController, } from '@ionic/angular' -import { SSHKey } from 'src/app/services/api/api.types' import { ErrorToastService } from '@start9labs/shared' +import { BehaviorSubject } from 'rxjs' +import { SSHKey } from 'src/app/services/api/api.types' import { ApiService } from 'src/app/services/api/embassy-api.service' import { GenericInputComponent, GenericInputOptions, -} from 'src/app/modals/generic-input/generic-input.component' -import { BehaviorSubject } from 'rxjs' +} from 'src/app/apps/ui/modals/generic-input/generic-input.component' @Component({ selector: 'ssh-keys', diff --git a/frontend/projects/ui/src/app/apps/ui/pages/server-routes/server-routing.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/system/system.module.ts similarity index 98% rename from frontend/projects/ui/src/app/apps/ui/pages/server-routes/server-routing.module.ts rename to frontend/projects/ui/src/app/apps/ui/pages/system/system.module.ts index 269ef563a..ff4093f02 100644 --- a/frontend/projects/ui/src/app/apps/ui/pages/server-routes/server-routing.module.ts +++ b/frontend/projects/ui/src/app/apps/ui/pages/system/system.module.ts @@ -84,4 +84,4 @@ const routes: Routes = [ imports: [RouterModule.forChild(routes)], exports: [RouterModule], }) -export class ServerRoutingModule {} +export class SystemModule {} diff --git a/frontend/projects/ui/src/app/apps/ui/pages/server-routes/theme-switcher/theme-switcher.component.html b/frontend/projects/ui/src/app/apps/ui/pages/system/theme-switcher/theme-switcher.component.html similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/server-routes/theme-switcher/theme-switcher.component.html rename to frontend/projects/ui/src/app/apps/ui/pages/system/theme-switcher/theme-switcher.component.html diff --git a/frontend/projects/ui/src/app/apps/ui/pages/server-routes/theme-switcher/theme-switcher.component.ts b/frontend/projects/ui/src/app/apps/ui/pages/system/theme-switcher/theme-switcher.component.ts similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/server-routes/theme-switcher/theme-switcher.component.ts rename to frontend/projects/ui/src/app/apps/ui/pages/system/theme-switcher/theme-switcher.component.ts diff --git a/frontend/projects/ui/src/app/apps/ui/pages/server-routes/theme-switcher/theme-switcher.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/system/theme-switcher/theme-switcher.module.ts similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/server-routes/theme-switcher/theme-switcher.module.ts rename to frontend/projects/ui/src/app/apps/ui/pages/system/theme-switcher/theme-switcher.module.ts diff --git a/frontend/projects/ui/src/app/apps/ui/pages/server-routes/wifi/wifi.const.ts b/frontend/projects/ui/src/app/apps/ui/pages/system/wifi/wifi.const.ts similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/server-routes/wifi/wifi.const.ts rename to frontend/projects/ui/src/app/apps/ui/pages/system/wifi/wifi.const.ts diff --git a/frontend/projects/ui/src/app/apps/ui/pages/server-routes/wifi/wifi.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/system/wifi/wifi.module.ts similarity index 87% rename from frontend/projects/ui/src/app/apps/ui/pages/server-routes/wifi/wifi.module.ts rename to frontend/projects/ui/src/app/apps/ui/pages/system/wifi/wifi.module.ts index 902824ff9..92323a129 100644 --- a/frontend/projects/ui/src/app/apps/ui/pages/server-routes/wifi/wifi.module.ts +++ b/frontend/projects/ui/src/app/apps/ui/pages/system/wifi/wifi.module.ts @@ -2,9 +2,10 @@ import { NgModule } from '@angular/core' import { CommonModule } from '@angular/common' import { IonicModule } from '@ionic/angular' import { RouterModule, Routes } from '@angular/router' -import { WifiPage, ToWifiIconPipe } from './wifi.page' import { SharedPipesModule } from '@start9labs/shared' import { TuiLetModule } from '@taiga-ui/cdk' +import { FormPageModule } from 'src/app/apps/ui/modals/form/form.module' +import { WifiPage, ToWifiIconPipe } from './wifi.page' const routes: Routes = [ { @@ -17,9 +18,10 @@ const routes: Routes = [ imports: [ CommonModule, IonicModule, - RouterModule.forChild(routes), SharedPipesModule, TuiLetModule, + FormPageModule, + RouterModule.forChild(routes), ], declarations: [WifiPage, ToWifiIconPipe], }) diff --git a/frontend/projects/ui/src/app/apps/ui/pages/server-routes/wifi/wifi.page.html b/frontend/projects/ui/src/app/apps/ui/pages/system/wifi/wifi.page.html similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/server-routes/wifi/wifi.page.html rename to frontend/projects/ui/src/app/apps/ui/pages/system/wifi/wifi.page.html diff --git a/frontend/projects/ui/src/app/apps/ui/pages/server-routes/wifi/wifi.page.scss b/frontend/projects/ui/src/app/apps/ui/pages/system/wifi/wifi.page.scss similarity index 100% rename from frontend/projects/ui/src/app/apps/ui/pages/server-routes/wifi/wifi.page.scss rename to frontend/projects/ui/src/app/apps/ui/pages/system/wifi/wifi.page.scss diff --git a/frontend/projects/ui/src/app/apps/ui/pages/server-routes/wifi/wifi.page.ts b/frontend/projects/ui/src/app/apps/ui/pages/system/wifi/wifi.page.ts similarity index 98% rename from frontend/projects/ui/src/app/apps/ui/pages/server-routes/wifi/wifi.page.ts rename to frontend/projects/ui/src/app/apps/ui/pages/system/wifi/wifi.page.ts index e15e413fc..71f1e285d 100644 --- a/frontend/projects/ui/src/app/apps/ui/pages/server-routes/wifi/wifi.page.ts +++ b/frontend/projects/ui/src/app/apps/ui/pages/system/wifi/wifi.page.ts @@ -6,8 +6,8 @@ import { ApiService } from 'src/app/services/api/embassy-api.service' import { AvailableWifi, RR } from 'src/app/services/api/api.types' import { pauseFor, ErrorToastService } from '@start9labs/shared' import { FormDialogService } from 'src/app/services/form-dialog.service' -import { FormContext, FormPage } from 'src/app/modals/form/form.page' -import { LoadingService } from 'src/app/modals/loading/loading.service' +import { FormContext, FormPage } from 'src/app/apps/ui/modals/form/form.page' +import { LoadingService } from 'src/app/common/loading/loading.service' import { PatchDB } from 'patch-db-client' import { DataModel } from 'src/app/services/patch-db/data-model' import { ConnectionService } from 'src/app/services/connection.service' diff --git a/frontend/projects/ui/src/app/apps/ui/pages/updates/filter-updates.pipe.ts b/frontend/projects/ui/src/app/apps/ui/pages/updates/filter-updates.pipe.ts new file mode 100644 index 000000000..b0a99424f --- /dev/null +++ b/frontend/projects/ui/src/app/apps/ui/pages/updates/filter-updates.pipe.ts @@ -0,0 +1,24 @@ +import { Pipe, PipeTransform } from '@angular/core' +import { Emver } from '@start9labs/shared' +import { MarketplacePkg } from '@start9labs/marketplace' +import { PackageDataEntry } from 'src/app/services/patch-db/data-model' + +@Pipe({ + name: 'filterUpdates', +}) +export class FilterUpdatesPipe implements PipeTransform { + constructor(private readonly emver: Emver) {} + + transform( + pkgs: MarketplacePkg[], + local: Record, + ): MarketplacePkg[] { + return pkgs.filter( + ({ manifest }) => + this.emver.compare( + manifest.version, + local[manifest.id]?.manifest.version || '', // @TODO this won't work, need old version + ) === 1, + ) + } +} diff --git a/frontend/projects/ui/src/app/pipes/install-progress/install-progress.pipe.ts b/frontend/projects/ui/src/app/apps/ui/pages/updates/install-progress.pipe.ts similarity index 56% rename from frontend/projects/ui/src/app/pipes/install-progress/install-progress.pipe.ts rename to frontend/projects/ui/src/app/apps/ui/pages/updates/install-progress.pipe.ts index 459dc722b..9ecf86dc3 100644 --- a/frontend/projects/ui/src/app/pipes/install-progress/install-progress.pipe.ts +++ b/frontend/projects/ui/src/app/apps/ui/pages/updates/install-progress.pipe.ts @@ -10,15 +10,3 @@ export class InstallProgressPipe implements PipeTransform { return packageLoadingProgress(installProgress)?.totalProgress || 0 } } - -@Pipe({ - name: 'installProgressDisplay', -}) -export class InstallProgressDisplayPipe implements PipeTransform { - transform(installProgress?: InstallProgress): string { - const totalProgress = - packageLoadingProgress(installProgress)?.totalProgress || 0 - - return totalProgress < 99 ? totalProgress + '%' : 'finalizing' - } -} diff --git a/frontend/projects/ui/src/app/apps/ui/pages/updates/updates.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/updates/updates.module.ts index eb4ac82da..8fc07fd36 100644 --- a/frontend/projects/ui/src/app/apps/ui/pages/updates/updates.module.ts +++ b/frontend/projects/ui/src/app/apps/ui/pages/updates/updates.module.ts @@ -2,18 +2,19 @@ import { NgModule } from '@angular/core' import { CommonModule } from '@angular/common' import { IonicModule } from '@ionic/angular' import { RouterModule, Routes } from '@angular/router' -import { BadgeMenuComponentModule } from 'src/app/components/badge-menu-button/badge-menu.component.module' +import { MimeTypePipeModule } from '@start9labs/marketplace' import { EmverPipesModule, MarkdownPipeModule, SharedPipesModule, } from '@start9labs/shared' -import { SkeletonListComponentModule } from 'src/app/components/skeleton-list/skeleton-list.component.module' import { RoundProgressModule } from 'angular-svg-round-progressbar' -import { InstallProgressPipeModule } from 'src/app/pipes/install-progress/install-progress.module' -import { StoreIconComponentModule } from 'src/app/components/store-icon/store-icon.component.module' -import { MimeTypePipeModule } from '@start9labs/marketplace' -import { FilterUpdatesPipe, UpdatesPage } from './updates.page' +import { BadgeMenuComponentModule } from 'src/app/common/badge-menu-button/badge-menu.component.module' +import { SkeletonListComponentModule } from 'src/app/common/skeleton-list/skeleton-list.component.module' +import { StoreIconComponentModule } from 'src/app/common/store-icon/store-icon.component.module' +import { UpdatesPage } from './updates.page' +import { InstallProgressPipe } from './install-progress.pipe' +import { FilterUpdatesPipe } from './filter-updates.pipe' const routes: Routes = [ { @@ -23,7 +24,7 @@ const routes: Routes = [ ] @NgModule({ - declarations: [UpdatesPage, FilterUpdatesPipe], + declarations: [UpdatesPage, FilterUpdatesPipe, InstallProgressPipe], imports: [ CommonModule, IonicModule, @@ -33,7 +34,6 @@ const routes: Routes = [ SkeletonListComponentModule, MarkdownPipeModule, RoundProgressModule, - InstallProgressPipeModule, StoreIconComponentModule, EmverPipesModule, MimeTypePipeModule, diff --git a/frontend/projects/ui/src/app/apps/ui/pages/updates/updates.page.ts b/frontend/projects/ui/src/app/apps/ui/pages/updates/updates.page.ts index 109e2f824..250e9646f 100644 --- a/frontend/projects/ui/src/app/apps/ui/pages/updates/updates.page.ts +++ b/frontend/projects/ui/src/app/apps/ui/pages/updates/updates.page.ts @@ -10,11 +10,9 @@ import { AbstractMarketplaceService, Marketplace, Manifest, - MarketplacePkg, StoreIdentity, } from '@start9labs/marketplace' -import { Emver, isEmptyObject } from '@start9labs/shared' -import { Pipe, PipeTransform } from '@angular/core' +import { isEmptyObject } from '@start9labs/shared' import { combineLatest, Observable } from 'rxjs' import { AlertController, @@ -166,23 +164,3 @@ export class UpdatesPage { } } } - -@Pipe({ - name: 'filterUpdates', -}) -export class FilterUpdatesPipe implements PipeTransform { - constructor(private readonly emver: Emver) {} - - transform( - pkgs: MarketplacePkg[], - local: Record, - ): MarketplacePkg[] { - return pkgs.filter( - ({ manifest }) => - this.emver.compare( - manifest.version, - local[manifest.id]?.manifest.version || '', // @TODO this won't work, need old version - ) === 1, - ) - } -} diff --git a/frontend/projects/ui/src/app/apps/ui/pages/widgets/built-in/health/health.component.ts b/frontend/projects/ui/src/app/apps/ui/pages/widgets/built-in/health/health.component.ts index 0544e3916..4b5b12413 100644 --- a/frontend/projects/ui/src/app/apps/ui/pages/widgets/built-in/health/health.component.ts +++ b/frontend/projects/ui/src/app/apps/ui/pages/widgets/built-in/health/health.component.ts @@ -1,9 +1,10 @@ import { ChangeDetectionStrategy, Component, inject } from '@angular/core' import { PatchDB } from 'patch-db-client' -import { map } from 'rxjs/operators' +import { map } from 'rxjs' import { PackageDataEntry } from 'src/app/services/patch-db/data-model' import { PrimaryStatus } from 'src/app/services/pkg-status-rendering.service' -import { getPackageInfo, PkgInfo } from 'src/app/util/get-package-info' +import { getPackageInfo } from 'src/app/util/get-package-info' +import { PkgInfo } from 'src/app/types/pkg-info' @Component({ selector: 'widget-health', diff --git a/frontend/projects/ui/src/app/apps/ui/pages/widgets/widgets.page.ts b/frontend/projects/ui/src/app/apps/ui/pages/widgets/widgets.page.ts index 7992c90a1..570071f0f 100644 --- a/frontend/projects/ui/src/app/apps/ui/pages/widgets/widgets.page.ts +++ b/frontend/projects/ui/src/app/apps/ui/pages/widgets/widgets.page.ts @@ -21,7 +21,7 @@ import { HealthComponent } from './built-in/health/health.component' import { NetworkComponent } from './built-in/network/network.component' import { MetricsComponent } from './built-in/metrics/metrics.component' import { UptimeComponent } from './built-in/uptime/uptime.component' -import { take } from 'rxjs/operators' +import { take } from 'rxjs' @Component({ selector: 'widgets', diff --git a/frontend/projects/ui/src/app/apps/ui/ui.module.ts b/frontend/projects/ui/src/app/apps/ui/ui.module.ts index 458e78741..0688c8f0d 100644 --- a/frontend/projects/ui/src/app/apps/ui/ui.module.ts +++ b/frontend/projects/ui/src/app/apps/ui/ui.module.ts @@ -15,9 +15,7 @@ const ROUTES: Routes = [ { path: 'system', loadChildren: () => - import('./pages/server-routes/server-routing.module').then( - m => m.ServerRoutingModule, - ), + import('./pages/system/system.module').then(m => m.SystemModule), }, { path: 'updates', @@ -27,8 +25,8 @@ const ROUTES: Routes = [ { path: 'marketplace', loadChildren: () => - import('./pages/marketplace-routes/marketplace-routing.module').then( - m => m.MarketplaceRoutingModule, + import('./pages/marketplace/marketplace.module').then( + m => m.MarketplaceModule, ), }, { @@ -41,16 +39,12 @@ const ROUTES: Routes = [ { path: 'services', loadChildren: () => - import('./pages/apps-routes/apps-routing.module').then( - m => m.AppsRoutingModule, - ), + import('./pages/services/services.module').then(m => m.ServicesModule), }, { path: 'backups', loadChildren: () => - import('./pages/backups-routes/backups-routing.module').then( - m => m.BackupsRoutingModule, - ), + import('./pages/backups/backups.module').then(m => m.BackupsModule), }, ] diff --git a/frontend/projects/ui/src/app/components/badge-menu-button/badge-menu.component.html b/frontend/projects/ui/src/app/common/badge-menu-button/badge-menu.component.html similarity index 100% rename from frontend/projects/ui/src/app/components/badge-menu-button/badge-menu.component.html rename to frontend/projects/ui/src/app/common/badge-menu-button/badge-menu.component.html diff --git a/frontend/projects/ui/src/app/components/badge-menu-button/badge-menu.component.module.ts b/frontend/projects/ui/src/app/common/badge-menu-button/badge-menu.component.module.ts similarity index 100% rename from frontend/projects/ui/src/app/components/badge-menu-button/badge-menu.component.module.ts rename to frontend/projects/ui/src/app/common/badge-menu-button/badge-menu.component.module.ts diff --git a/frontend/projects/ui/src/app/components/badge-menu-button/badge-menu.component.scss b/frontend/projects/ui/src/app/common/badge-menu-button/badge-menu.component.scss similarity index 100% rename from frontend/projects/ui/src/app/components/badge-menu-button/badge-menu.component.scss rename to frontend/projects/ui/src/app/common/badge-menu-button/badge-menu.component.scss diff --git a/frontend/projects/ui/src/app/components/badge-menu-button/badge-menu.component.ts b/frontend/projects/ui/src/app/common/badge-menu-button/badge-menu.component.ts similarity index 100% rename from frontend/projects/ui/src/app/components/badge-menu-button/badge-menu.component.ts rename to frontend/projects/ui/src/app/common/badge-menu-button/badge-menu.component.ts diff --git a/frontend/projects/ui/src/app/components/form/control.directive.ts b/frontend/projects/ui/src/app/common/form/control.directive.ts similarity index 100% rename from frontend/projects/ui/src/app/components/form/control.directive.ts rename to frontend/projects/ui/src/app/common/form/control.directive.ts diff --git a/frontend/projects/ui/src/app/components/form/control.ts b/frontend/projects/ui/src/app/common/form/control.ts similarity index 100% rename from frontend/projects/ui/src/app/components/form/control.ts rename to frontend/projects/ui/src/app/common/form/control.ts diff --git a/frontend/projects/ui/src/app/components/form/form-array/form-array.component.html b/frontend/projects/ui/src/app/common/form/form-array/form-array.component.html similarity index 100% rename from frontend/projects/ui/src/app/components/form/form-array/form-array.component.html rename to frontend/projects/ui/src/app/common/form/form-array/form-array.component.html diff --git a/frontend/projects/ui/src/app/components/form/form-array/form-array.component.scss b/frontend/projects/ui/src/app/common/form/form-array/form-array.component.scss similarity index 100% rename from frontend/projects/ui/src/app/components/form/form-array/form-array.component.scss rename to frontend/projects/ui/src/app/common/form/form-array/form-array.component.scss diff --git a/frontend/projects/ui/src/app/components/form/form-array/form-array.component.ts b/frontend/projects/ui/src/app/common/form/form-array/form-array.component.ts similarity index 100% rename from frontend/projects/ui/src/app/components/form/form-array/form-array.component.ts rename to frontend/projects/ui/src/app/common/form/form-array/form-array.component.ts diff --git a/frontend/projects/ui/src/app/components/form/form-color/form-color.component.html b/frontend/projects/ui/src/app/common/form/form-color/form-color.component.html similarity index 100% rename from frontend/projects/ui/src/app/components/form/form-color/form-color.component.html rename to frontend/projects/ui/src/app/common/form/form-color/form-color.component.html diff --git a/frontend/projects/ui/src/app/components/form/form-color/form-color.component.scss b/frontend/projects/ui/src/app/common/form/form-color/form-color.component.scss similarity index 100% rename from frontend/projects/ui/src/app/components/form/form-color/form-color.component.scss rename to frontend/projects/ui/src/app/common/form/form-color/form-color.component.scss diff --git a/frontend/projects/ui/src/app/components/form/form-color/form-color.component.ts b/frontend/projects/ui/src/app/common/form/form-color/form-color.component.ts similarity index 100% rename from frontend/projects/ui/src/app/components/form/form-color/form-color.component.ts rename to frontend/projects/ui/src/app/common/form/form-color/form-color.component.ts diff --git a/frontend/projects/ui/src/app/components/form/form-control/form-control.component.html b/frontend/projects/ui/src/app/common/form/form-control/form-control.component.html similarity index 100% rename from frontend/projects/ui/src/app/components/form/form-control/form-control.component.html rename to frontend/projects/ui/src/app/common/form/form-control/form-control.component.html diff --git a/frontend/projects/ui/src/app/components/form/form-control/form-control.component.scss b/frontend/projects/ui/src/app/common/form/form-control/form-control.component.scss similarity index 100% rename from frontend/projects/ui/src/app/components/form/form-control/form-control.component.scss rename to frontend/projects/ui/src/app/common/form/form-control/form-control.component.scss diff --git a/frontend/projects/ui/src/app/components/form/form-control/form-control.component.ts b/frontend/projects/ui/src/app/common/form/form-control/form-control.component.ts similarity index 100% rename from frontend/projects/ui/src/app/components/form/form-control/form-control.component.ts rename to frontend/projects/ui/src/app/common/form/form-control/form-control.component.ts diff --git a/frontend/projects/ui/src/app/components/form/form-control/form-control.providers.ts b/frontend/projects/ui/src/app/common/form/form-control/form-control.providers.ts similarity index 100% rename from frontend/projects/ui/src/app/components/form/form-control/form-control.providers.ts rename to frontend/projects/ui/src/app/common/form/form-control/form-control.providers.ts diff --git a/frontend/projects/ui/src/app/components/form/form-datetime/form-datetime.component.html b/frontend/projects/ui/src/app/common/form/form-datetime/form-datetime.component.html similarity index 100% rename from frontend/projects/ui/src/app/components/form/form-datetime/form-datetime.component.html rename to frontend/projects/ui/src/app/common/form/form-datetime/form-datetime.component.html diff --git a/frontend/projects/ui/src/app/components/form/form-datetime/form-datetime.component.ts b/frontend/projects/ui/src/app/common/form/form-datetime/form-datetime.component.ts similarity index 100% rename from frontend/projects/ui/src/app/components/form/form-datetime/form-datetime.component.ts rename to frontend/projects/ui/src/app/common/form/form-datetime/form-datetime.component.ts diff --git a/frontend/projects/ui/src/app/components/form/form-file/form-file.component.html b/frontend/projects/ui/src/app/common/form/form-file/form-file.component.html similarity index 100% rename from frontend/projects/ui/src/app/components/form/form-file/form-file.component.html rename to frontend/projects/ui/src/app/common/form/form-file/form-file.component.html diff --git a/frontend/projects/ui/src/app/components/form/form-file/form-file.component.scss b/frontend/projects/ui/src/app/common/form/form-file/form-file.component.scss similarity index 100% rename from frontend/projects/ui/src/app/components/form/form-file/form-file.component.scss rename to frontend/projects/ui/src/app/common/form/form-file/form-file.component.scss diff --git a/frontend/projects/ui/src/app/components/form/form-file/form-file.component.ts b/frontend/projects/ui/src/app/common/form/form-file/form-file.component.ts similarity index 100% rename from frontend/projects/ui/src/app/components/form/form-file/form-file.component.ts rename to frontend/projects/ui/src/app/common/form/form-file/form-file.component.ts diff --git a/frontend/projects/ui/src/app/components/form/form-group/form-group.component.html b/frontend/projects/ui/src/app/common/form/form-group/form-group.component.html similarity index 100% rename from frontend/projects/ui/src/app/components/form/form-group/form-group.component.html rename to frontend/projects/ui/src/app/common/form/form-group/form-group.component.html diff --git a/frontend/projects/ui/src/app/components/form/form-group/form-group.component.scss b/frontend/projects/ui/src/app/common/form/form-group/form-group.component.scss similarity index 100% rename from frontend/projects/ui/src/app/components/form/form-group/form-group.component.scss rename to frontend/projects/ui/src/app/common/form/form-group/form-group.component.scss diff --git a/frontend/projects/ui/src/app/components/form/form-group/form-group.component.ts b/frontend/projects/ui/src/app/common/form/form-group/form-group.component.ts similarity index 100% rename from frontend/projects/ui/src/app/components/form/form-group/form-group.component.ts rename to frontend/projects/ui/src/app/common/form/form-group/form-group.component.ts diff --git a/frontend/projects/ui/src/app/components/form/form-group/form-group.providers.ts b/frontend/projects/ui/src/app/common/form/form-group/form-group.providers.ts similarity index 100% rename from frontend/projects/ui/src/app/components/form/form-group/form-group.providers.ts rename to frontend/projects/ui/src/app/common/form/form-group/form-group.providers.ts diff --git a/frontend/projects/ui/src/app/components/form/form-multiselect/form-multiselect.component.html b/frontend/projects/ui/src/app/common/form/form-multiselect/form-multiselect.component.html similarity index 100% rename from frontend/projects/ui/src/app/components/form/form-multiselect/form-multiselect.component.html rename to frontend/projects/ui/src/app/common/form/form-multiselect/form-multiselect.component.html diff --git a/frontend/projects/ui/src/app/components/form/form-multiselect/form-multiselect.component.ts b/frontend/projects/ui/src/app/common/form/form-multiselect/form-multiselect.component.ts similarity index 100% rename from frontend/projects/ui/src/app/components/form/form-multiselect/form-multiselect.component.ts rename to frontend/projects/ui/src/app/common/form/form-multiselect/form-multiselect.component.ts diff --git a/frontend/projects/ui/src/app/components/form/form-number/form-number.component.html b/frontend/projects/ui/src/app/common/form/form-number/form-number.component.html similarity index 100% rename from frontend/projects/ui/src/app/components/form/form-number/form-number.component.html rename to frontend/projects/ui/src/app/common/form/form-number/form-number.component.html diff --git a/frontend/projects/ui/src/app/components/form/form-number/form-number.component.ts b/frontend/projects/ui/src/app/common/form/form-number/form-number.component.ts similarity index 100% rename from frontend/projects/ui/src/app/components/form/form-number/form-number.component.ts rename to frontend/projects/ui/src/app/common/form/form-number/form-number.component.ts diff --git a/frontend/projects/ui/src/app/components/form/form-object/form-object.component.html b/frontend/projects/ui/src/app/common/form/form-object/form-object.component.html similarity index 100% rename from frontend/projects/ui/src/app/components/form/form-object/form-object.component.html rename to frontend/projects/ui/src/app/common/form/form-object/form-object.component.html diff --git a/frontend/projects/ui/src/app/components/form/form-object/form-object.component.scss b/frontend/projects/ui/src/app/common/form/form-object/form-object.component.scss similarity index 100% rename from frontend/projects/ui/src/app/components/form/form-object/form-object.component.scss rename to frontend/projects/ui/src/app/common/form/form-object/form-object.component.scss diff --git a/frontend/projects/ui/src/app/components/form/form-object/form-object.component.ts b/frontend/projects/ui/src/app/common/form/form-object/form-object.component.ts similarity index 100% rename from frontend/projects/ui/src/app/components/form/form-object/form-object.component.ts rename to frontend/projects/ui/src/app/common/form/form-object/form-object.component.ts diff --git a/frontend/projects/ui/src/app/components/form/form-select/form-select.component.html b/frontend/projects/ui/src/app/common/form/form-select/form-select.component.html similarity index 100% rename from frontend/projects/ui/src/app/components/form/form-select/form-select.component.html rename to frontend/projects/ui/src/app/common/form/form-select/form-select.component.html diff --git a/frontend/projects/ui/src/app/components/form/form-select/form-select.component.ts b/frontend/projects/ui/src/app/common/form/form-select/form-select.component.ts similarity index 100% rename from frontend/projects/ui/src/app/components/form/form-select/form-select.component.ts rename to frontend/projects/ui/src/app/common/form/form-select/form-select.component.ts diff --git a/frontend/projects/ui/src/app/components/form/form-text/form-text.component.html b/frontend/projects/ui/src/app/common/form/form-text/form-text.component.html similarity index 100% rename from frontend/projects/ui/src/app/components/form/form-text/form-text.component.html rename to frontend/projects/ui/src/app/common/form/form-text/form-text.component.html diff --git a/frontend/projects/ui/src/app/components/form/form-text/form-text.component.scss b/frontend/projects/ui/src/app/common/form/form-text/form-text.component.scss similarity index 100% rename from frontend/projects/ui/src/app/components/form/form-text/form-text.component.scss rename to frontend/projects/ui/src/app/common/form/form-text/form-text.component.scss diff --git a/frontend/projects/ui/src/app/components/form/form-text/form-text.component.ts b/frontend/projects/ui/src/app/common/form/form-text/form-text.component.ts similarity index 100% rename from frontend/projects/ui/src/app/components/form/form-text/form-text.component.ts rename to frontend/projects/ui/src/app/common/form/form-text/form-text.component.ts diff --git a/frontend/projects/ui/src/app/components/form/form-textarea/form-textarea.component.html b/frontend/projects/ui/src/app/common/form/form-textarea/form-textarea.component.html similarity index 100% rename from frontend/projects/ui/src/app/components/form/form-textarea/form-textarea.component.html rename to frontend/projects/ui/src/app/common/form/form-textarea/form-textarea.component.html diff --git a/frontend/projects/ui/src/app/components/form/form-textarea/form-textarea.component.ts b/frontend/projects/ui/src/app/common/form/form-textarea/form-textarea.component.ts similarity index 100% rename from frontend/projects/ui/src/app/components/form/form-textarea/form-textarea.component.ts rename to frontend/projects/ui/src/app/common/form/form-textarea/form-textarea.component.ts diff --git a/frontend/projects/ui/src/app/components/form/form-toggle/form-toggle.component.html b/frontend/projects/ui/src/app/common/form/form-toggle/form-toggle.component.html similarity index 100% rename from frontend/projects/ui/src/app/components/form/form-toggle/form-toggle.component.html rename to frontend/projects/ui/src/app/common/form/form-toggle/form-toggle.component.html diff --git a/frontend/projects/ui/src/app/components/form/form-toggle/form-toggle.component.scss b/frontend/projects/ui/src/app/common/form/form-toggle/form-toggle.component.scss similarity index 100% rename from frontend/projects/ui/src/app/components/form/form-toggle/form-toggle.component.scss rename to frontend/projects/ui/src/app/common/form/form-toggle/form-toggle.component.scss diff --git a/frontend/projects/ui/src/app/components/form/form-toggle/form-toggle.component.ts b/frontend/projects/ui/src/app/common/form/form-toggle/form-toggle.component.ts similarity index 100% rename from frontend/projects/ui/src/app/components/form/form-toggle/form-toggle.component.ts rename to frontend/projects/ui/src/app/common/form/form-toggle/form-toggle.component.ts diff --git a/frontend/projects/ui/src/app/components/form/form-union/form-union.component.html b/frontend/projects/ui/src/app/common/form/form-union/form-union.component.html similarity index 100% rename from frontend/projects/ui/src/app/components/form/form-union/form-union.component.html rename to frontend/projects/ui/src/app/common/form/form-union/form-union.component.html diff --git a/frontend/projects/ui/src/app/components/form/form-union/form-union.component.scss b/frontend/projects/ui/src/app/common/form/form-union/form-union.component.scss similarity index 100% rename from frontend/projects/ui/src/app/components/form/form-union/form-union.component.scss rename to frontend/projects/ui/src/app/common/form/form-union/form-union.component.scss diff --git a/frontend/projects/ui/src/app/components/form/form-union/form-union.component.ts b/frontend/projects/ui/src/app/common/form/form-union/form-union.component.ts similarity index 100% rename from frontend/projects/ui/src/app/components/form/form-union/form-union.component.ts rename to frontend/projects/ui/src/app/common/form/form-union/form-union.component.ts diff --git a/frontend/projects/ui/src/app/components/form/form.module.ts b/frontend/projects/ui/src/app/common/form/form.module.ts similarity index 100% rename from frontend/projects/ui/src/app/components/form/form.module.ts rename to frontend/projects/ui/src/app/common/form/form.module.ts diff --git a/frontend/projects/ui/src/app/components/form/hint.pipe.ts b/frontend/projects/ui/src/app/common/form/hint.pipe.ts similarity index 100% rename from frontend/projects/ui/src/app/components/form/hint.pipe.ts rename to frontend/projects/ui/src/app/common/form/hint.pipe.ts diff --git a/frontend/projects/ui/src/app/components/form/invalid.service.ts b/frontend/projects/ui/src/app/common/form/invalid.service.ts similarity index 100% rename from frontend/projects/ui/src/app/components/form/invalid.service.ts rename to frontend/projects/ui/src/app/common/form/invalid.service.ts diff --git a/frontend/projects/ui/src/app/components/form/mustache.pipe.ts b/frontend/projects/ui/src/app/common/form/mustache.pipe.ts similarity index 100% rename from frontend/projects/ui/src/app/components/form/mustache.pipe.ts rename to frontend/projects/ui/src/app/common/form/mustache.pipe.ts diff --git a/frontend/projects/ui/src/app/components/insecure-warning/insecure-warning.component.html b/frontend/projects/ui/src/app/common/insecure-warning/insecure-warning.component.html similarity index 100% rename from frontend/projects/ui/src/app/components/insecure-warning/insecure-warning.component.html rename to frontend/projects/ui/src/app/common/insecure-warning/insecure-warning.component.html diff --git a/frontend/projects/ui/src/app/components/insecure-warning/insecure-warning.component.scss b/frontend/projects/ui/src/app/common/insecure-warning/insecure-warning.component.scss similarity index 100% rename from frontend/projects/ui/src/app/components/insecure-warning/insecure-warning.component.scss rename to frontend/projects/ui/src/app/common/insecure-warning/insecure-warning.component.scss diff --git a/frontend/projects/ui/src/app/components/insecure-warning/insecure-warning.component.ts b/frontend/projects/ui/src/app/common/insecure-warning/insecure-warning.component.ts similarity index 100% rename from frontend/projects/ui/src/app/components/insecure-warning/insecure-warning.component.ts rename to frontend/projects/ui/src/app/common/insecure-warning/insecure-warning.component.ts diff --git a/frontend/projects/ui/src/app/components/insecure-warning/insecure-warning.module.ts b/frontend/projects/ui/src/app/common/insecure-warning/insecure-warning.module.ts similarity index 100% rename from frontend/projects/ui/src/app/components/insecure-warning/insecure-warning.module.ts rename to frontend/projects/ui/src/app/common/insecure-warning/insecure-warning.module.ts diff --git a/frontend/projects/ui/src/app/common/install-progress/install-progress.module.ts b/frontend/projects/ui/src/app/common/install-progress/install-progress.module.ts new file mode 100644 index 000000000..68d0330b5 --- /dev/null +++ b/frontend/projects/ui/src/app/common/install-progress/install-progress.module.ts @@ -0,0 +1,8 @@ +import { NgModule } from '@angular/core' +import { InstallProgressDisplayPipe } from './install-progress.pipe' + +@NgModule({ + declarations: [InstallProgressDisplayPipe], + exports: [InstallProgressDisplayPipe], +}) +export class InstallProgressPipeModule {} diff --git a/frontend/projects/ui/src/app/common/install-progress/install-progress.pipe.ts b/frontend/projects/ui/src/app/common/install-progress/install-progress.pipe.ts new file mode 100644 index 000000000..d4ce5298a --- /dev/null +++ b/frontend/projects/ui/src/app/common/install-progress/install-progress.pipe.ts @@ -0,0 +1,15 @@ +import { Pipe, PipeTransform } from '@angular/core' +import { InstallProgress } from '../../services/patch-db/data-model' +import { packageLoadingProgress } from '../../util/package-loading-progress' + +@Pipe({ + name: 'installProgressDisplay', +}) +export class InstallProgressDisplayPipe implements PipeTransform { + transform(installProgress?: InstallProgress): string { + const totalProgress = + packageLoadingProgress(installProgress)?.totalProgress || 0 + + return totalProgress < 99 ? totalProgress + '%' : 'finalizing' + } +} diff --git a/frontend/projects/ui/src/app/modals/loading/loading.component.scss b/frontend/projects/ui/src/app/common/loading/loading.component.scss similarity index 100% rename from frontend/projects/ui/src/app/modals/loading/loading.component.scss rename to frontend/projects/ui/src/app/common/loading/loading.component.scss diff --git a/frontend/projects/ui/src/app/modals/loading/loading.component.ts b/frontend/projects/ui/src/app/common/loading/loading.component.ts similarity index 100% rename from frontend/projects/ui/src/app/modals/loading/loading.component.ts rename to frontend/projects/ui/src/app/common/loading/loading.component.ts diff --git a/frontend/projects/ui/src/app/modals/loading/loading.module.ts b/frontend/projects/ui/src/app/common/loading/loading.module.ts similarity index 100% rename from frontend/projects/ui/src/app/modals/loading/loading.module.ts rename to frontend/projects/ui/src/app/common/loading/loading.module.ts diff --git a/frontend/projects/ui/src/app/modals/loading/loading.service.ts b/frontend/projects/ui/src/app/common/loading/loading.service.ts similarity index 100% rename from frontend/projects/ui/src/app/modals/loading/loading.service.ts rename to frontend/projects/ui/src/app/common/loading/loading.service.ts diff --git a/frontend/projects/ui/src/app/components/logs/logs.component.html b/frontend/projects/ui/src/app/common/logs/logs.component.html similarity index 100% rename from frontend/projects/ui/src/app/components/logs/logs.component.html rename to frontend/projects/ui/src/app/common/logs/logs.component.html diff --git a/frontend/projects/ui/src/app/components/logs/logs.component.module.ts b/frontend/projects/ui/src/app/common/logs/logs.component.module.ts similarity index 100% rename from frontend/projects/ui/src/app/components/logs/logs.component.module.ts rename to frontend/projects/ui/src/app/common/logs/logs.component.module.ts diff --git a/frontend/projects/ui/src/app/components/logs/logs.component.scss b/frontend/projects/ui/src/app/common/logs/logs.component.scss similarity index 100% rename from frontend/projects/ui/src/app/components/logs/logs.component.scss rename to frontend/projects/ui/src/app/common/logs/logs.component.scss diff --git a/frontend/projects/ui/src/app/components/logs/logs.component.ts b/frontend/projects/ui/src/app/common/logs/logs.component.ts similarity index 100% rename from frontend/projects/ui/src/app/components/logs/logs.component.ts rename to frontend/projects/ui/src/app/common/logs/logs.component.ts diff --git a/frontend/projects/ui/src/app/modals/os-welcome/os-welcome.module.ts b/frontend/projects/ui/src/app/common/os-welcome/os-welcome.module.ts similarity index 100% rename from frontend/projects/ui/src/app/modals/os-welcome/os-welcome.module.ts rename to frontend/projects/ui/src/app/common/os-welcome/os-welcome.module.ts index 3e910403e..cabce3502 100644 --- a/frontend/projects/ui/src/app/modals/os-welcome/os-welcome.module.ts +++ b/frontend/projects/ui/src/app/common/os-welcome/os-welcome.module.ts @@ -1,9 +1,9 @@ import { NgModule } from '@angular/core' import { CommonModule } from '@angular/common' import { IonicModule } from '@ionic/angular' -import { OSWelcomePage } from './os-welcome.page' import { SharedPipesModule } from '@start9labs/shared' import { FormsModule } from '@angular/forms' +import { OSWelcomePage } from './os-welcome.page' @NgModule({ declarations: [OSWelcomePage], diff --git a/frontend/projects/ui/src/app/modals/os-welcome/os-welcome.page.html b/frontend/projects/ui/src/app/common/os-welcome/os-welcome.page.html similarity index 100% rename from frontend/projects/ui/src/app/modals/os-welcome/os-welcome.page.html rename to frontend/projects/ui/src/app/common/os-welcome/os-welcome.page.html diff --git a/frontend/projects/ui/src/app/modals/os-welcome/os-welcome.page.scss b/frontend/projects/ui/src/app/common/os-welcome/os-welcome.page.scss similarity index 100% rename from frontend/projects/ui/src/app/modals/os-welcome/os-welcome.page.scss rename to frontend/projects/ui/src/app/common/os-welcome/os-welcome.page.scss diff --git a/frontend/projects/ui/src/app/modals/os-welcome/os-welcome.page.ts b/frontend/projects/ui/src/app/common/os-welcome/os-welcome.page.ts similarity index 100% rename from frontend/projects/ui/src/app/modals/os-welcome/os-welcome.page.ts rename to frontend/projects/ui/src/app/common/os-welcome/os-welcome.page.ts diff --git a/frontend/projects/ui/src/app/components/skeleton-list/skeleton-list.component.html b/frontend/projects/ui/src/app/common/skeleton-list/skeleton-list.component.html similarity index 100% rename from frontend/projects/ui/src/app/components/skeleton-list/skeleton-list.component.html rename to frontend/projects/ui/src/app/common/skeleton-list/skeleton-list.component.html diff --git a/frontend/projects/ui/src/app/components/skeleton-list/skeleton-list.component.module.ts b/frontend/projects/ui/src/app/common/skeleton-list/skeleton-list.component.module.ts similarity index 62% rename from frontend/projects/ui/src/app/components/skeleton-list/skeleton-list.component.module.ts rename to frontend/projects/ui/src/app/common/skeleton-list/skeleton-list.component.module.ts index e777c211c..23e8b446e 100644 --- a/frontend/projects/ui/src/app/components/skeleton-list/skeleton-list.component.module.ts +++ b/frontend/projects/ui/src/app/common/skeleton-list/skeleton-list.component.module.ts @@ -5,14 +5,8 @@ import { IonicModule } from '@ionic/angular' import { RouterModule } from '@angular/router' @NgModule({ - declarations: [ - SkeletonListComponent, - ], - imports: [ - CommonModule, - IonicModule, - RouterModule.forChild([]), - ], + declarations: [SkeletonListComponent], + imports: [CommonModule, IonicModule, RouterModule], exports: [SkeletonListComponent], }) -export class SkeletonListComponentModule { } +export class SkeletonListComponentModule {} diff --git a/frontend/projects/ui/src/app/components/skeleton-list/skeleton-list.component.ts b/frontend/projects/ui/src/app/common/skeleton-list/skeleton-list.component.ts similarity index 89% rename from frontend/projects/ui/src/app/components/skeleton-list/skeleton-list.component.ts rename to frontend/projects/ui/src/app/common/skeleton-list/skeleton-list.component.ts index d5e320caa..4f6c369d0 100644 --- a/frontend/projects/ui/src/app/components/skeleton-list/skeleton-list.component.ts +++ b/frontend/projects/ui/src/app/common/skeleton-list/skeleton-list.component.ts @@ -3,7 +3,6 @@ import { Component, Input } from '@angular/core' @Component({ selector: 'skeleton-list', templateUrl: './skeleton-list.component.html', - styleUrls: ['./skeleton-list.component.scss'], }) export class SkeletonListComponent { @Input() groups = 0 diff --git a/frontend/projects/ui/src/app/components/store-icon/store-icon.component.html b/frontend/projects/ui/src/app/common/store-icon/store-icon.component.html similarity index 100% rename from frontend/projects/ui/src/app/components/store-icon/store-icon.component.html rename to frontend/projects/ui/src/app/common/store-icon/store-icon.component.html diff --git a/frontend/projects/ui/src/app/components/store-icon/store-icon.component.module.ts b/frontend/projects/ui/src/app/common/store-icon/store-icon.component.module.ts similarity index 100% rename from frontend/projects/ui/src/app/components/store-icon/store-icon.component.module.ts rename to frontend/projects/ui/src/app/common/store-icon/store-icon.component.module.ts diff --git a/frontend/projects/ui/src/app/components/store-icon/store-icon.component.scss b/frontend/projects/ui/src/app/common/store-icon/store-icon.component.scss similarity index 100% rename from frontend/projects/ui/src/app/components/store-icon/store-icon.component.scss rename to frontend/projects/ui/src/app/common/store-icon/store-icon.component.scss diff --git a/frontend/projects/ui/src/app/components/store-icon/store-icon.component.ts b/frontend/projects/ui/src/app/common/store-icon/store-icon.component.ts similarity index 100% rename from frontend/projects/ui/src/app/components/store-icon/store-icon.component.ts rename to frontend/projects/ui/src/app/common/store-icon/store-icon.component.ts diff --git a/frontend/projects/ui/src/app/components/toast-container/notifications-toast/notifications-toast.component.html b/frontend/projects/ui/src/app/common/toast-container/notifications-toast/notifications-toast.component.html similarity index 100% rename from frontend/projects/ui/src/app/components/toast-container/notifications-toast/notifications-toast.component.html rename to frontend/projects/ui/src/app/common/toast-container/notifications-toast/notifications-toast.component.html diff --git a/frontend/projects/ui/src/app/components/toast-container/notifications-toast/notifications-toast.component.ts b/frontend/projects/ui/src/app/common/toast-container/notifications-toast/notifications-toast.component.ts similarity index 100% rename from frontend/projects/ui/src/app/components/toast-container/notifications-toast/notifications-toast.component.ts rename to frontend/projects/ui/src/app/common/toast-container/notifications-toast/notifications-toast.component.ts diff --git a/frontend/projects/ui/src/app/components/toast-container/notifications-toast/notifications-toast.service.ts b/frontend/projects/ui/src/app/common/toast-container/notifications-toast/notifications-toast.service.ts similarity index 86% rename from frontend/projects/ui/src/app/components/toast-container/notifications-toast/notifications-toast.service.ts rename to frontend/projects/ui/src/app/common/toast-container/notifications-toast/notifications-toast.service.ts index 52d35ea3c..f5f88bb08 100644 --- a/frontend/projects/ui/src/app/components/toast-container/notifications-toast/notifications-toast.service.ts +++ b/frontend/projects/ui/src/app/common/toast-container/notifications-toast/notifications-toast.service.ts @@ -1,7 +1,6 @@ import { Injectable } from '@angular/core' -import { endWith, Observable } from 'rxjs' -import { map, pairwise } from 'rxjs/operators' import { PatchDB } from 'patch-db-client' +import { endWith, map, pairwise, Observable } from 'rxjs' import { DataModel } from 'src/app/services/patch-db/data-model' @Injectable({ providedIn: 'root' }) diff --git a/frontend/projects/ui/src/app/components/toast-container/refresh-alert/refresh-alert.component.html b/frontend/projects/ui/src/app/common/toast-container/refresh-alert/refresh-alert.component.html similarity index 65% rename from frontend/projects/ui/src/app/components/toast-container/refresh-alert/refresh-alert.component.html rename to frontend/projects/ui/src/app/common/toast-container/refresh-alert/refresh-alert.component.html index 0c4ec3543..20985c11e 100644 --- a/frontend/projects/ui/src/app/components/toast-container/refresh-alert/refresh-alert.component.html +++ b/frontend/projects/ui/src/app/common/toast-container/refresh-alert/refresh-alert.component.html @@ -2,8 +2,14 @@ Your user interface is cached and out of date. Hard refresh the page to get the latest UI.
    -
  • On Mac: cmd + shift + R
    • -
  • On Linux/Windows: ctrl + shift + R
    • +
  • + On Mac + : cmd + shift + R +
    • +
  • + On Linux/Windows + : ctrl + shift + R +
Ok diff --git a/frontend/projects/ui/src/app/components/toast-container/refresh-alert/refresh-alert.component.ts b/frontend/projects/ui/src/app/common/toast-container/refresh-alert/refresh-alert.component.ts similarity index 100% rename from frontend/projects/ui/src/app/components/toast-container/refresh-alert/refresh-alert.component.ts rename to frontend/projects/ui/src/app/common/toast-container/refresh-alert/refresh-alert.component.ts diff --git a/frontend/projects/ui/src/app/components/toast-container/refresh-alert/refresh-alert.service.ts b/frontend/projects/ui/src/app/common/toast-container/refresh-alert/refresh-alert.service.ts similarity index 90% rename from frontend/projects/ui/src/app/components/toast-container/refresh-alert/refresh-alert.service.ts rename to frontend/projects/ui/src/app/common/toast-container/refresh-alert/refresh-alert.service.ts index c65de7a29..134add795 100644 --- a/frontend/projects/ui/src/app/components/toast-container/refresh-alert/refresh-alert.service.ts +++ b/frontend/projects/ui/src/app/common/toast-container/refresh-alert/refresh-alert.service.ts @@ -1,8 +1,7 @@ import { Injectable } from '@angular/core' -import { endWith, Observable } from 'rxjs' -import { map } from 'rxjs/operators' import { Emver } from '@start9labs/shared' import { PatchDB } from 'patch-db-client' +import { endWith, map, Observable } from 'rxjs' import { ConfigService } from 'src/app/services/config.service' import { DataModel } from 'src/app/services/patch-db/data-model' diff --git a/frontend/projects/ui/src/app/components/toast-container/toast-container.component.html b/frontend/projects/ui/src/app/common/toast-container/toast-container.component.html similarity index 100% rename from frontend/projects/ui/src/app/components/toast-container/toast-container.component.html rename to frontend/projects/ui/src/app/common/toast-container/toast-container.component.html diff --git a/frontend/projects/ui/src/app/components/toast-container/toast-container.component.ts b/frontend/projects/ui/src/app/common/toast-container/toast-container.component.ts similarity index 100% rename from frontend/projects/ui/src/app/components/toast-container/toast-container.component.ts rename to frontend/projects/ui/src/app/common/toast-container/toast-container.component.ts diff --git a/frontend/projects/ui/src/app/components/toast-container/toast-container.module.ts b/frontend/projects/ui/src/app/common/toast-container/toast-container.module.ts similarity index 100% rename from frontend/projects/ui/src/app/components/toast-container/toast-container.module.ts rename to frontend/projects/ui/src/app/common/toast-container/toast-container.module.ts diff --git a/frontend/projects/ui/src/app/components/toast-container/update-toast/update-toast.component.html b/frontend/projects/ui/src/app/common/toast-container/update-toast/update-toast.component.html similarity index 100% rename from frontend/projects/ui/src/app/components/toast-container/update-toast/update-toast.component.html rename to frontend/projects/ui/src/app/common/toast-container/update-toast/update-toast.component.html diff --git a/frontend/projects/ui/src/app/components/toast-container/update-toast/update-toast.component.ts b/frontend/projects/ui/src/app/common/toast-container/update-toast/update-toast.component.ts similarity index 100% rename from frontend/projects/ui/src/app/components/toast-container/update-toast/update-toast.component.ts rename to frontend/projects/ui/src/app/common/toast-container/update-toast/update-toast.component.ts diff --git a/frontend/projects/ui/src/app/components/toast-container/update-toast/update-toast.service.ts b/frontend/projects/ui/src/app/common/toast-container/update-toast/update-toast.service.ts similarity index 83% rename from frontend/projects/ui/src/app/components/toast-container/update-toast/update-toast.service.ts rename to frontend/projects/ui/src/app/common/toast-container/update-toast/update-toast.service.ts index 5eb650869..77afbe736 100644 --- a/frontend/projects/ui/src/app/components/toast-container/update-toast/update-toast.service.ts +++ b/frontend/projects/ui/src/app/common/toast-container/update-toast/update-toast.service.ts @@ -1,6 +1,5 @@ import { Injectable } from '@angular/core' -import { endWith, Observable } from 'rxjs' -import { distinctUntilChanged, filter } from 'rxjs/operators' +import { distinctUntilChanged, filter, endWith, Observable } from 'rxjs' import { PatchDB } from 'patch-db-client' import { DataModel } from 'src/app/services/patch-db/data-model' diff --git a/frontend/projects/ui/src/app/components/any-link/any-link.component.html b/frontend/projects/ui/src/app/common/widget-list/any-link/any-link.component.html similarity index 100% rename from frontend/projects/ui/src/app/components/any-link/any-link.component.html rename to frontend/projects/ui/src/app/common/widget-list/any-link/any-link.component.html diff --git a/frontend/projects/ui/src/app/components/any-link/any-link.component.scss b/frontend/projects/ui/src/app/common/widget-list/any-link/any-link.component.scss similarity index 100% rename from frontend/projects/ui/src/app/components/any-link/any-link.component.scss rename to frontend/projects/ui/src/app/common/widget-list/any-link/any-link.component.scss diff --git a/frontend/projects/ui/src/app/components/any-link/any-link.component.ts b/frontend/projects/ui/src/app/common/widget-list/any-link/any-link.component.ts similarity index 100% rename from frontend/projects/ui/src/app/components/any-link/any-link.component.ts rename to frontend/projects/ui/src/app/common/widget-list/any-link/any-link.component.ts diff --git a/frontend/projects/ui/src/app/components/widget-card/widget-card.component.html b/frontend/projects/ui/src/app/common/widget-list/widget-card/widget-card.component.html similarity index 100% rename from frontend/projects/ui/src/app/components/widget-card/widget-card.component.html rename to frontend/projects/ui/src/app/common/widget-list/widget-card/widget-card.component.html diff --git a/frontend/projects/ui/src/app/components/widget-card/widget-card.component.scss b/frontend/projects/ui/src/app/common/widget-list/widget-card/widget-card.component.scss similarity index 94% rename from frontend/projects/ui/src/app/components/widget-card/widget-card.component.scss rename to frontend/projects/ui/src/app/common/widget-list/widget-card/widget-card.component.scss index 87a411690..c52cc45cf 100644 --- a/frontend/projects/ui/src/app/components/widget-card/widget-card.component.scss +++ b/frontend/projects/ui/src/app/common/widget-list/widget-card/widget-card.component.scss @@ -1,6 +1,6 @@ ion-card { background: rgba(70, 70, 70, 0.31); - box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.25); + box-shadow: 0 4px 4px rgba(0, 0, 0, 0.25); border-radius: 44px; margin: auto; max-height: 100%; @@ -54,7 +54,8 @@ ion-card { } @media (max-width: 900px) { - ion-card-title, ion-footer { + ion-card-title, + ion-footer { height: auto !important; } ion-footer { diff --git a/frontend/projects/ui/src/app/components/widget-card/widget-card.component.ts b/frontend/projects/ui/src/app/common/widget-list/widget-card/widget-card.component.ts similarity index 100% rename from frontend/projects/ui/src/app/components/widget-card/widget-card.component.ts rename to frontend/projects/ui/src/app/common/widget-list/widget-card/widget-card.component.ts diff --git a/frontend/projects/ui/src/app/components/widget-list/widget-list.component.html b/frontend/projects/ui/src/app/common/widget-list/widget-list.component.html similarity index 100% rename from frontend/projects/ui/src/app/components/widget-list/widget-list.component.html rename to frontend/projects/ui/src/app/common/widget-list/widget-list.component.html diff --git a/frontend/projects/ui/src/app/components/widget-list/widget-list.component.module.ts b/frontend/projects/ui/src/app/common/widget-list/widget-list.component.module.ts similarity index 51% rename from frontend/projects/ui/src/app/components/widget-list/widget-list.component.module.ts rename to frontend/projects/ui/src/app/common/widget-list/widget-list.component.module.ts index d4fbd1bed..bead5c4b3 100644 --- a/frontend/projects/ui/src/app/components/widget-list/widget-list.component.module.ts +++ b/frontend/projects/ui/src/app/common/widget-list/widget-list.component.module.ts @@ -3,20 +3,13 @@ import { CommonModule } from '@angular/common' import { IonicModule } from '@ionic/angular' import { RouterModule } from '@angular/router' import { ResponsiveColModule } from '@start9labs/shared' +import { AnyLinkComponent } from './any-link/any-link.component' import { WidgetListComponent } from './widget-list.component' -import { AnyLinkModule } from 'src/app/components/any-link/any-link.component.module' -import { WidgetCardComponentModule } from '../widget-card/widget-card.component.module' +import { WidgetCardComponent } from './widget-card/widget-card.component' @NgModule({ - declarations: [WidgetListComponent], - imports: [ - CommonModule, - IonicModule, - RouterModule.forChild([]), - AnyLinkModule, - WidgetCardComponentModule, - ResponsiveColModule, - ], + declarations: [WidgetListComponent, WidgetCardComponent, AnyLinkComponent], + imports: [CommonModule, IonicModule, RouterModule, ResponsiveColModule], exports: [WidgetListComponent], }) export class WidgetListComponentModule {} diff --git a/frontend/projects/ui/src/app/components/widget-list/widget-list.component.scss b/frontend/projects/ui/src/app/common/widget-list/widget-list.component.scss similarity index 100% rename from frontend/projects/ui/src/app/components/widget-list/widget-list.component.scss rename to frontend/projects/ui/src/app/common/widget-list/widget-list.component.scss diff --git a/frontend/projects/ui/src/app/components/widget-list/widget-list.component.ts b/frontend/projects/ui/src/app/common/widget-list/widget-list.component.ts similarity index 96% rename from frontend/projects/ui/src/app/components/widget-list/widget-list.component.ts rename to frontend/projects/ui/src/app/common/widget-list/widget-list.component.ts index b39e313ee..36eea1f7f 100644 --- a/frontend/projects/ui/src/app/components/widget-list/widget-list.component.ts +++ b/frontend/projects/ui/src/app/common/widget-list/widget-list.component.ts @@ -5,7 +5,7 @@ import { HostListener, ViewChild, } from '@angular/core' -import { Card, Dimension } from '../widget-card/widget-card.component' +import { Card, Dimension } from './widget-card/widget-card.component' @Component({ selector: 'widget-list', diff --git a/frontend/projects/ui/src/app/components/any-link/any-link.component.module.ts b/frontend/projects/ui/src/app/components/any-link/any-link.component.module.ts deleted file mode 100644 index 4ea67eb50..000000000 --- a/frontend/projects/ui/src/app/components/any-link/any-link.component.module.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { NgModule } from '@angular/core' -import { CommonModule } from '@angular/common' -import { RouterModule } from '@angular/router' -import { AnyLinkComponent } from './any-link.component' - -@NgModule({ - declarations: [AnyLinkComponent], - imports: [CommonModule, RouterModule.forChild([])], - exports: [AnyLinkComponent], -}) -export class AnyLinkModule {} diff --git a/frontend/projects/ui/src/app/components/qr/qr.component.html b/frontend/projects/ui/src/app/components/qr/qr.component.html deleted file mode 100644 index ce8bda2cc..000000000 --- a/frontend/projects/ui/src/app/components/qr/qr.component.html +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/frontend/projects/ui/src/app/components/qr/qr.component.module.ts b/frontend/projects/ui/src/app/components/qr/qr.component.module.ts deleted file mode 100644 index 4bd3e5365..000000000 --- a/frontend/projects/ui/src/app/components/qr/qr.component.module.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { NgModule } from '@angular/core' -import { CommonModule } from '@angular/common' -import { QRComponent } from './qr.component' -import { IonicModule } from '@ionic/angular' -import { QrCodeModule } from 'ng-qrcode' - -@NgModule({ - declarations: [ - QRComponent, - ], - imports: [ - CommonModule, - IonicModule, - QrCodeModule, - ], - exports: [QRComponent], -}) -export class QRComponentModule { } diff --git a/frontend/projects/ui/src/app/components/qr/qr.component.scss b/frontend/projects/ui/src/app/components/qr/qr.component.scss deleted file mode 100644 index e69de29bb..000000000 diff --git a/frontend/projects/ui/src/app/components/skeleton-list/skeleton-list.component.scss b/frontend/projects/ui/src/app/components/skeleton-list/skeleton-list.component.scss deleted file mode 100644 index e69de29bb..000000000 diff --git a/frontend/projects/ui/src/app/components/widget-card/widget-card.component.module.ts b/frontend/projects/ui/src/app/components/widget-card/widget-card.component.module.ts deleted file mode 100644 index 0ea61fcf8..000000000 --- a/frontend/projects/ui/src/app/components/widget-card/widget-card.component.module.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { NgModule } from '@angular/core' -import { CommonModule } from '@angular/common' -import { IonicModule } from '@ionic/angular' -import { RouterModule } from '@angular/router' -import { WidgetCardComponent } from './widget-card.component' -import { AnyLinkModule } from 'src/app/components/any-link/any-link.component.module' - -@NgModule({ - declarations: [WidgetCardComponent], - imports: [ - CommonModule, - IonicModule, - RouterModule.forChild([]), - AnyLinkModule, - ], - exports: [WidgetCardComponent], -}) -export class WidgetCardComponentModule {} diff --git a/frontend/projects/ui/src/app/guards/auth.guard.ts b/frontend/projects/ui/src/app/guards/auth.guard.ts index 9606f82f7..37a02eafb 100644 --- a/frontend/projects/ui/src/app/guards/auth.guard.ts +++ b/frontend/projects/ui/src/app/guards/auth.guard.ts @@ -1,8 +1,7 @@ import { Injectable } from '@angular/core' import { CanActivate, Router, CanActivateChild, UrlTree } from '@angular/router' -import { map } from 'rxjs/operators' +import { map, Observable } from 'rxjs' import { AuthService } from '../services/auth.service' -import { Observable } from 'rxjs' @Injectable({ providedIn: 'root', diff --git a/frontend/projects/ui/src/app/guards/unauth.guard.ts b/frontend/projects/ui/src/app/guards/unauth.guard.ts index 3951173e9..7e43320de 100644 --- a/frontend/projects/ui/src/app/guards/unauth.guard.ts +++ b/frontend/projects/ui/src/app/guards/unauth.guard.ts @@ -1,8 +1,7 @@ import { Injectable } from '@angular/core' import { CanActivate, Router, UrlTree } from '@angular/router' -import { map } from 'rxjs/operators' +import { map, Observable } from 'rxjs' import { AuthService } from '../services/auth.service' -import { Observable } from 'rxjs' @Injectable({ providedIn: 'root', diff --git a/frontend/projects/ui/src/app/modals/action-success/action-success.page.scss b/frontend/projects/ui/src/app/modals/action-success/action-success.page.scss deleted file mode 100644 index e69de29bb..000000000 diff --git a/frontend/projects/ui/src/app/modals/backup-report/backup-report.page.scss b/frontend/projects/ui/src/app/modals/backup-report/backup-report.page.scss deleted file mode 100644 index e69de29bb..000000000 diff --git a/frontend/projects/ui/src/app/modals/generic-input/generic-input.component.scss b/frontend/projects/ui/src/app/modals/generic-input/generic-input.component.scss deleted file mode 100644 index e69de29bb..000000000 diff --git a/frontend/projects/ui/src/app/modals/snake/snake.module.ts b/frontend/projects/ui/src/app/modals/snake/snake.module.ts deleted file mode 100644 index cc9c937d0..000000000 --- a/frontend/projects/ui/src/app/modals/snake/snake.module.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { NgModule } from '@angular/core' -import { CommonModule } from '@angular/common' -import { IonicModule } from '@ionic/angular' - -import { SnakePage } from './snake.page' - -@NgModule({ - imports: [CommonModule, IonicModule], - declarations: [SnakePage], - exports: [SnakePage], -}) -export class SnakePageModule {} diff --git a/frontend/projects/ui/src/app/pipes/backup-color/backup-color.module.ts b/frontend/projects/ui/src/app/pipes/backup-color/backup-color.module.ts deleted file mode 100644 index 3451791e1..000000000 --- a/frontend/projects/ui/src/app/pipes/backup-color/backup-color.module.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { NgModule } from '@angular/core' -import { BackupColorPipe } from './backup-color.pipe' - -@NgModule({ - declarations: [BackupColorPipe], - exports: [BackupColorPipe], -}) -export class BackupColorPipeModule {} diff --git a/frontend/projects/ui/src/app/pipes/install-progress/install-progress.module.ts b/frontend/projects/ui/src/app/pipes/install-progress/install-progress.module.ts deleted file mode 100644 index 37bbd0744..000000000 --- a/frontend/projects/ui/src/app/pipes/install-progress/install-progress.module.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { NgModule } from '@angular/core' -import { - InstallProgressDisplayPipe, - InstallProgressPipe, -} from './install-progress.pipe' - -@NgModule({ - declarations: [InstallProgressPipe, InstallProgressDisplayPipe], - exports: [InstallProgressPipe, InstallProgressDisplayPipe], -}) -export class InstallProgressPipeModule {} diff --git a/frontend/projects/ui/src/app/pipes/mask/mask.module.ts b/frontend/projects/ui/src/app/pipes/mask/mask.module.ts deleted file mode 100644 index 13950e553..000000000 --- a/frontend/projects/ui/src/app/pipes/mask/mask.module.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { NgModule } from '@angular/core' -import { MaskPipe } from './mask.pipe' - -@NgModule({ - declarations: [MaskPipe], - exports: [MaskPipe], -}) -export class MaskPipeModule {} diff --git a/frontend/projects/ui/src/app/pipes/mask/mask.pipe.ts b/frontend/projects/ui/src/app/pipes/mask/mask.pipe.ts deleted file mode 100644 index 140f4b303..000000000 --- a/frontend/projects/ui/src/app/pipes/mask/mask.pipe.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { Pipe, PipeTransform } from '@angular/core' - -@Pipe({ - name: 'mask', -}) -export class MaskPipe implements PipeTransform { - transform(val: string, max?: number): string { - const length = max ? Math.min(max, val.length) : val.length - return '●'.repeat(length) - } -} diff --git a/frontend/projects/ui/src/app/routing.module.ts b/frontend/projects/ui/src/app/routing.module.ts index c6fb75ef1..d835713bc 100644 --- a/frontend/projects/ui/src/app/routing.module.ts +++ b/frontend/projects/ui/src/app/routing.module.ts @@ -6,7 +6,6 @@ import { UnauthGuard } from './guards/unauth.guard' const routes: Routes = [ { path: 'loading', - canActivate: [UnauthGuard], loadChildren: () => import('./apps/loading/loading.module').then(m => m.LoadingPageModule), }, diff --git a/frontend/projects/ui/src/app/services/auth.service.ts b/frontend/projects/ui/src/app/services/auth.service.ts index 2dec137e6..73a068015 100644 --- a/frontend/projects/ui/src/app/services/auth.service.ts +++ b/frontend/projects/ui/src/app/services/auth.service.ts @@ -1,6 +1,5 @@ import { Injectable, NgZone } from '@angular/core' -import { ReplaySubject } from 'rxjs' -import { distinctUntilChanged, map } from 'rxjs/operators' +import { distinctUntilChanged, map, ReplaySubject } from 'rxjs' import { Router } from '@angular/router' import { StorageService } from './storage.service' diff --git a/frontend/projects/ui/src/app/services/connection.service.ts b/frontend/projects/ui/src/app/services/connection.service.ts index a45d5ec4c..b7d95e5ea 100644 --- a/frontend/projects/ui/src/app/services/connection.service.ts +++ b/frontend/projects/ui/src/app/services/connection.service.ts @@ -1,6 +1,13 @@ import { Injectable } from '@angular/core' -import { combineLatest, fromEvent, merge, ReplaySubject } from 'rxjs' -import { distinctUntilChanged, map, startWith } from 'rxjs/operators' +import { + combineLatest, + distinctUntilChanged, + map, + startWith, + fromEvent, + merge, + ReplaySubject, +} from 'rxjs' @Injectable({ providedIn: 'root', diff --git a/frontend/projects/ui/src/app/services/eos.service.ts b/frontend/projects/ui/src/app/services/eos.service.ts index 27cc1739e..10c31ab2d 100644 --- a/frontend/projects/ui/src/app/services/eos.service.ts +++ b/frontend/projects/ui/src/app/services/eos.service.ts @@ -1,10 +1,9 @@ import { Injectable } from '@angular/core' import { Emver } from '@start9labs/shared' -import { BehaviorSubject, combineLatest } from 'rxjs' -import { distinctUntilChanged, map } from 'rxjs/operators' +import { PatchDB } from 'patch-db-client' +import { BehaviorSubject, distinctUntilChanged, map, combineLatest } from 'rxjs' import { MarketplaceEOS } from 'src/app/services/api/api.types' import { ApiService } from 'src/app/services/api/embassy-api.service' -import { PatchDB } from 'patch-db-client' import { getServerInfo } from 'src/app/util/get-server-info' import { DataModel } from './patch-db/data-model' diff --git a/frontend/projects/ui/src/app/services/marketplace.service.ts b/frontend/projects/ui/src/app/services/marketplace.service.ts index 3467c52ae..302c57d58 100644 --- a/frontend/projects/ui/src/app/services/marketplace.service.ts +++ b/frontend/projects/ui/src/app/services/marketplace.service.ts @@ -1,4 +1,5 @@ import { Injectable } from '@angular/core' +import { sameUrl } from '@start9labs/shared' import { MarketplacePkg, AbstractMarketplaceService, @@ -7,6 +8,7 @@ import { StoreInfo, StoreIdentity, } from '@start9labs/marketplace' +import { PatchDB } from 'patch-db-client' import { BehaviorSubject, combineLatest, @@ -16,12 +18,6 @@ import { Observable, of, scan, -} from 'rxjs' -import { RR } from 'src/app/services/api/api.types' -import { ApiService } from 'src/app/services/api/embassy-api.service' -import { DataModel, UIStore } from 'src/app/services/patch-db/data-model' -import { PatchDB } from 'patch-db-client' -import { catchError, filter, map, @@ -31,9 +27,11 @@ import { switchMap, take, tap, -} from 'rxjs/operators' +} from 'rxjs' +import { RR } from 'src/app/services/api/api.types' +import { ApiService } from 'src/app/services/api/embassy-api.service' +import { DataModel, UIStore } from 'src/app/services/patch-db/data-model' import { ConfigService } from './config.service' -import { sameUrl } from '@start9labs/shared' import { ClientStorageService } from './client-storage.service' @Injectable() diff --git a/frontend/projects/ui/src/app/services/patch-data.service.ts b/frontend/projects/ui/src/app/services/patch-data.service.ts index 248dca045..9efe05699 100644 --- a/frontend/projects/ui/src/app/services/patch-data.service.ts +++ b/frontend/projects/ui/src/app/services/patch-data.service.ts @@ -1,11 +1,10 @@ import { Inject, Injectable } from '@angular/core' import { ModalController } from '@ionic/angular' -import { Observable } from 'rxjs' -import { filter, share, switchMap, take, tap } from 'rxjs/operators' +import { filter, share, switchMap, take, tap, Observable } from 'rxjs' import { PatchDB } from 'patch-db-client' import { DataModel } from 'src/app/services/patch-db/data-model' import { EOSService } from 'src/app/services/eos.service' -import { OSWelcomePage } from 'src/app/modals/os-welcome/os-welcome.page' +import { OSWelcomePage } from '../common/os-welcome/os-welcome.page' import { ConfigService } from 'src/app/services/config.service' import { ApiService } from 'src/app/services/api/embassy-api.service' import { MarketplaceService } from 'src/app/services/marketplace.service' diff --git a/frontend/projects/ui/src/app/services/patch-db/patch-db.factory.ts b/frontend/projects/ui/src/app/services/patch-db/patch-db.factory.ts index 78af9beec..3f43d1e49 100644 --- a/frontend/projects/ui/src/app/services/patch-db/patch-db.factory.ts +++ b/frontend/projects/ui/src/app/services/patch-db/patch-db.factory.ts @@ -1,4 +1,5 @@ import { InjectionToken, Injector } from '@angular/core' +import { Update } from 'patch-db-client' import { bufferTime, catchError, @@ -6,10 +7,14 @@ import { switchMap, take, tap, -} from 'rxjs/operators' -import { Update } from 'patch-db-client' + defer, + EMPTY, + from, + interval, + merge, + Observable, +} from 'rxjs' import { DataModel } from './data-model' -import { defer, EMPTY, from, interval, merge, Observable } from 'rxjs' import { AuthService } from '../auth.service' import { ConnectionService } from '../connection.service' import { ApiService } from '../api/embassy-api.service' diff --git a/frontend/projects/ui/src/app/services/patch-monitor.service.ts b/frontend/projects/ui/src/app/services/patch-monitor.service.ts index ac395798d..41f69e344 100644 --- a/frontend/projects/ui/src/app/services/patch-monitor.service.ts +++ b/frontend/projects/ui/src/app/services/patch-monitor.service.ts @@ -1,6 +1,5 @@ import { Injectable } from '@angular/core' -import { Observable } from 'rxjs' -import { tap } from 'rxjs/operators' +import { tap, Observable } from 'rxjs' import { PatchDB } from 'patch-db-client' import { AuthService } from 'src/app/services/auth.service' import { DataModel } from './patch-db/data-model' diff --git a/frontend/projects/ui/src/app/services/theme-switcher.service.ts b/frontend/projects/ui/src/app/services/theme-switcher.service.ts index eac9c5425..cdb215457 100644 --- a/frontend/projects/ui/src/app/services/theme-switcher.service.ts +++ b/frontend/projects/ui/src/app/services/theme-switcher.service.ts @@ -1,10 +1,9 @@ import { Inject, Injectable } from '@angular/core' import { WINDOW } from '@ng-web-apis/common' import { PatchDB } from 'patch-db-client' -import { BehaviorSubject } from 'rxjs' +import { filter, take, BehaviorSubject } from 'rxjs' import { ApiService } from './api/embassy-api.service' import { DataModel } from './patch-db/data-model' -import { filter, take } from 'rxjs/operators' @Injectable({ providedIn: 'root', diff --git a/frontend/projects/ui/src/app/services/time-service.ts b/frontend/projects/ui/src/app/services/time-service.ts index 7439dea0f..64ce0913d 100644 --- a/frontend/projects/ui/src/app/services/time-service.ts +++ b/frontend/projects/ui/src/app/services/time-service.ts @@ -1,9 +1,16 @@ import { Injectable } from '@angular/core' -import { map, startWith, switchMap } from 'rxjs/operators' import { PatchDB } from 'patch-db-client' +import { + map, + startWith, + switchMap, + combineLatest, + from, + Observable, + timer, +} from 'rxjs' import { DataModel } from './patch-db/data-model' import { ApiService } from './api/embassy-api.service' -import { combineLatest, from, Observable, timer } from 'rxjs' export interface TimeInfo { systemStartTime: number diff --git a/frontend/projects/ui/src/app/types/pkg-info.ts b/frontend/projects/ui/src/app/types/pkg-info.ts new file mode 100644 index 000000000..ca45bd4f6 --- /dev/null +++ b/frontend/projects/ui/src/app/types/pkg-info.ts @@ -0,0 +1,22 @@ +import { Subscription } from 'rxjs' +import { + PackageDataEntry, + PackageMainStatus, + PackageState, +} from '../services/patch-db/data-model' +import { + PrimaryStatus, + StatusRendering, +} from '../services/pkg-status-rendering.service' +import { ProgressData } from './progress-data' + +export interface PkgInfo { + entry: PackageDataEntry + primaryRendering: StatusRendering + primaryStatus: PrimaryStatus | PackageState | PackageMainStatus + installProgress: ProgressData | null + error: boolean + warning: boolean + transitioning: boolean + sub?: Subscription | null +} diff --git a/frontend/projects/ui/src/app/util/get-package-info.ts b/frontend/projects/ui/src/app/util/get-package-info.ts index 4bc458428..880a9bcb2 100644 --- a/frontend/projects/ui/src/app/util/get-package-info.ts +++ b/frontend/projects/ui/src/app/util/get-package-info.ts @@ -1,18 +1,12 @@ -import { - PackageDataEntry, - PackageMainStatus, - PackageState, -} from '../services/patch-db/data-model' +import { PackageDataEntry } from '../services/patch-db/data-model' import { DependencyStatus, HealthStatus, PrimaryRendering, PrimaryStatus, renderPkgStatus, - StatusRendering, } from '../services/pkg-status-rendering.service' -import { ProgressData } from 'src/app/types/progress-data' -import { Subscription } from 'rxjs' +import { PkgInfo } from '../types/pkg-info' import { packageLoadingProgress } from './package-loading-progress' export function getPackageInfo(entry: PackageDataEntry): PkgInfo { @@ -35,14 +29,3 @@ export function getPackageInfo(entry: PackageDataEntry): PkgInfo { statuses.health === HealthStatus.Starting, } } - -export interface PkgInfo { - entry: PackageDataEntry - primaryRendering: StatusRendering - primaryStatus: PrimaryStatus | PackageState | PackageMainStatus - installProgress: ProgressData | null - error: boolean - warning: boolean - transitioning: boolean - sub?: Subscription | null -} diff --git a/frontend/projects/ui/src/app/util/mask.ts b/frontend/projects/ui/src/app/util/mask.ts new file mode 100644 index 000000000..ebedbe9fa --- /dev/null +++ b/frontend/projects/ui/src/app/util/mask.ts @@ -0,0 +1,3 @@ +export function mask(val: string, max: number = Infinity): string { + return '●'.repeat(Math.min(max, val.length)) +} diff --git a/frontend/projects/ui/src/app/util/rxjs.util.ts b/frontend/projects/ui/src/app/util/rxjs.util.ts index 5554c77c6..fc1c87a58 100644 --- a/frontend/projects/ui/src/app/util/rxjs.util.ts +++ b/frontend/projects/ui/src/app/util/rxjs.util.ts @@ -5,8 +5,9 @@ import { race, OperatorFunction, Observer, + take, + map, } from 'rxjs' -import { take, map } from 'rxjs/operators' export function fromAsync$( async: (s: S) => Promise,