dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UI: Refactoring for tabs

Browse Source
This commit is contained in:
Artem Dzhereleiko 2023-08-01 10:35:59 +03:00
parent 00fb745c31
commit d39ab98cfa
3 changed files with 6 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
ui-ngx/src/app/core/services/menu.service.ts
View File

@ -136,42 +136,6 @@ export class MenuService {
}
]
},
{
id: 'account',
name: 'profile.profile',
type: 'link',
path: '/account',
disabled: true,
icon: 'mdi:message-badge',
isMdiIcon: true,
pages: [
{
id: 'personal_info',
name: 'account.personal-info',
fullName: 'account.personal-info',
type: 'link',
path: '/account/profile',
icon: 'mdi:badge-account-horizontal',
isMdiIcon: true
},
{
id: 'security',
name: 'security.security',
fullName: 'security.security',
type: 'link',
path: '/account/security',
icon: 'lock'
},
{
id: 'notificationSettings',
name: 'account.notification-settings',
fullName: 'account.notification-settings',
type: 'link',
path: '/account/notificationSettings',
icon: 'settings'
}
]
},
{
id: 'notifications_center',
name: 'notification.notification-center',
@ -540,42 +504,6 @@ export class MenuService {
}
]
},
{
id: 'account',
name: 'profile.profile',
type: 'link',
path: '/account',
disabled: true,
icon: 'mdi:message-badge',
isMdiIcon: true,
pages: [
{
id: 'personal_info',
name: 'account.personal-info',
fullName: 'account.personal-info',
type: 'link',
path: '/account/profile',
icon: 'mdi:badge-account-horizontal',
isMdiIcon: true
},
{
id: 'security',
name: 'security.security',
fullName: 'security.security',
type: 'link',
path: '/account/security',
icon: 'lock'
},
{
id: 'notificationSettings',
name: 'account.notification-settings',
fullName: 'account.notification-settings',
type: 'link',
path: '/account/notificationSettings',
icon: 'settings'
}
]
},
{
id: 'notifications_center',
name: 'notification.notification-center',
@ -904,34 +832,6 @@ export class MenuService {
icon: 'view_quilt'
}
]
},
{
id: 'account',
name: 'profile.profile',
type: 'link',
path: '/account',
disabled: true,
icon: 'mdi:message-badge',
isMdiIcon: true,
pages: [
{
id: 'personal_info',
name: 'account.personal-info',
fullName: 'account.personal-info',
type: 'link',
path: '/account/profile',
icon: 'mdi:badge-account-horizontal',
isMdiIcon: true
},
{
id: 'security',
name: 'security.security',
fullName: 'security.security',
type: 'link',
path: '/account/security',
icon: 'lock'
}
]
}
);
if (authState.edgesSupportEnabled) {

6
ui-ngx/src/app/modules/home/pages/account/account-routing.module.ts
View File

@ -23,6 +23,9 @@ import { profileRoutes } from '@home/pages/profile/profile-routing.module';
import { getCurrentAuthState } from '@core/auth/auth.selectors';
import { Store } from '@ngrx/store';
import { AppState } from '@core/core.state';
import {
notificationUserSettingsRoutes
} from '@home/pages/notification/settings/notification-settings-routing.modules';
const routes: Routes = [
{
@ -49,7 +52,8 @@ const routes: Routes = [
}
},
...profileRoutes,
...securityRoutes
...securityRoutes,
...notificationUserSettingsRoutes
]
}
];

2
ui-ngx/src/app/modules/home/pages/notification/settings/notification-settings-routing.modules.ts
View File

@ -36,7 +36,7 @@ export class NotificationUserSettingsResolver implements Resolve<any> {
}
}
export const NotificationUserSettingsRoutes: Routes = [
export const notificationUserSettingsRoutes: Routes = [
{
path: 'notificationSettings',
component: NotificationSettingsComponent,