diff --git a/ui-ngx/src/app/modules/home/pages/admin/admin-routing.module.ts b/ui-ngx/src/app/modules/home/pages/admin/admin-routing.module.ts index 43a2c588c2..b914ab8b2a 100644 --- a/ui-ngx/src/app/modules/home/pages/admin/admin-routing.module.ts +++ b/ui-ngx/src/app/modules/home/pages/admin/admin-routing.module.ts @@ -38,7 +38,6 @@ import { widgetsLibraryRoutes } from '@home/pages/widget/widget-library-routing. import { RouterTabsComponent } from '@home/components/router-tabs.component'; import { auditLogsRoutes } from '@home/pages/audit-log/audit-log-routing.module'; import { ImageGalleryComponent } from '@shared/components/image/image-gallery.component'; -import { MobileAppSettingsComponent } from '@home/pages/admin/mobile-app-settings.component'; import { oAuth2Routes } from '@home/pages/admin/oauth2/oauth2-routing.module'; import { ImageResourceType, IMAGES_URL_PREFIX, ResourceSubType } from '@shared/models/resource.models'; import { ScadaSymbolComponent } from '@home/pages/scada-symbol/scada-symbol.component'; @@ -312,18 +311,6 @@ const routes: Routes = [ } } }, - { - path: 'mobile-app', - component: MobileAppSettingsComponent, - canDeactivate: [ConfirmOnExitGuard], - data: { - auth: [Authority.SYS_ADMIN], - title: 'admin.mobile-app.mobile-app', - breadcrumb: { - menuId: MenuId.mobile_app_settings - } - } - }, { path: 'security-settings', redirectTo: '/security-settings/general' diff --git a/ui-ngx/src/app/modules/home/pages/admin/admin.module.ts b/ui-ngx/src/app/modules/home/pages/admin/admin.module.ts index 1904738299..f00b4d01f1 100644 --- a/ui-ngx/src/app/modules/home/pages/admin/admin.module.ts +++ b/ui-ngx/src/app/modules/home/pages/admin/admin.module.ts @@ -32,7 +32,6 @@ import { QueueComponent } from '@home/pages/admin/queue/queue.component'; import { RepositoryAdminSettingsComponent } from '@home/pages/admin/repository-admin-settings.component'; import { AutoCommitAdminSettingsComponent } from '@home/pages/admin/auto-commit-admin-settings.component'; import { TwoFactorAuthSettingsComponent } from '@home/pages/admin/two-factor-auth-settings.component'; -import { MobileAppSettingsComponent } from '@home/pages/admin/mobile-app-settings.component'; import { WidgetComponentsModule } from '@home/components/widget/widget-components.module'; import { OAuth2Module } from '@home/pages/admin/oauth2/oauth2.module'; @@ -50,8 +49,7 @@ import { OAuth2Module } from '@home/pages/admin/oauth2/oauth2.module'; QueueComponent, RepositoryAdminSettingsComponent, AutoCommitAdminSettingsComponent, - TwoFactorAuthSettingsComponent, - MobileAppSettingsComponent + TwoFactorAuthSettingsComponent ], imports: [ CommonModule, diff --git a/ui-ngx/src/app/modules/home/pages/mobile/mobile-routing.module.ts b/ui-ngx/src/app/modules/home/pages/mobile/mobile-routing.module.ts index 6665c716b9..8aa2e92381 100644 --- a/ui-ngx/src/app/modules/home/pages/mobile/mobile-routing.module.ts +++ b/ui-ngx/src/app/modules/home/pages/mobile/mobile-routing.module.ts @@ -20,7 +20,7 @@ import { RouterTabsComponent } from '@home/components/router-tabs.component'; import { Authority } from '@shared/models/authority.enum'; import { MenuId } from '@core/services/menu.models'; import { MobileAppTableConfigResolver } from '@home/pages/mobile/applications/mobile-app-table-config.resolver'; -import { MobileAppSettingsComponent } from '@home/pages/admin/mobile-app-settings.component'; +import { MobileAppSettingsComponent } from '@home/pages/mobile/qr-code-widget/mobile-app-settings.component'; import { ConfirmOnExitGuard } from '@core/guards/confirm-on-exit.guard'; import { applicationsRoutes } from '@home/pages/mobile/applications/applications-routing.module'; import { bundlesRoutes } from '@home/pages/mobile/bundes/bundles-routing.module'; diff --git a/ui-ngx/src/app/modules/home/pages/admin/mobile-app-settings.component.html b/ui-ngx/src/app/modules/home/pages/mobile/qr-code-widget/mobile-app-settings.component.html similarity index 100% rename from ui-ngx/src/app/modules/home/pages/admin/mobile-app-settings.component.html rename to ui-ngx/src/app/modules/home/pages/mobile/qr-code-widget/mobile-app-settings.component.html diff --git a/ui-ngx/src/app/modules/home/pages/admin/mobile-app-settings.component.scss b/ui-ngx/src/app/modules/home/pages/mobile/qr-code-widget/mobile-app-settings.component.scss similarity index 100% rename from ui-ngx/src/app/modules/home/pages/admin/mobile-app-settings.component.scss rename to ui-ngx/src/app/modules/home/pages/mobile/qr-code-widget/mobile-app-settings.component.scss diff --git a/ui-ngx/src/app/modules/home/pages/admin/mobile-app-settings.component.ts b/ui-ngx/src/app/modules/home/pages/mobile/qr-code-widget/mobile-app-settings.component.ts similarity index 99% rename from ui-ngx/src/app/modules/home/pages/admin/mobile-app-settings.component.ts rename to ui-ngx/src/app/modules/home/pages/mobile/qr-code-widget/mobile-app-settings.component.ts index d50a888d4a..ec2e4317a0 100644 --- a/ui-ngx/src/app/modules/home/pages/admin/mobile-app-settings.component.ts +++ b/ui-ngx/src/app/modules/home/pages/mobile/qr-code-widget/mobile-app-settings.component.ts @@ -32,7 +32,7 @@ import { ActionUpdateMobileQrCodeEnabled } from '@core/auth/auth.actions'; @Component({ selector: 'tb-mobile-app-settings', templateUrl: './mobile-app-settings.component.html', - styleUrls: ['mobile-app-settings.component.scss', './settings-card.scss'] + styleUrls: ['mobile-app-settings.component.scss', '../../admin/settings-card.scss'] }) export class MobileAppSettingsComponent extends PageComponent implements HasConfirmForm, OnDestroy {