diff --git a/meet-ce/frontend/projects/shared-meet-components/src/lib/domains/console/pages/index.ts b/meet-ce/frontend/projects/shared-meet-components/src/lib/domains/console/pages/index.ts
index 4e9bf571..99a2f7ee 100644
--- a/meet-ce/frontend/projects/shared-meet-components/src/lib/domains/console/pages/index.ts
+++ b/meet-ce/frontend/projects/shared-meet-components/src/lib/domains/console/pages/index.ts
@@ -3,5 +3,5 @@ export * from './config/config.component';
export * from './console/console.component';
export * from './embedded/embedded.component';
export * from './overview/overview.component';
-export * from './users/users.component';
+export * from './users-permissions/users-permissions.component';
diff --git a/meet-ce/frontend/projects/shared-meet-components/src/lib/domains/console/pages/users/users.component.html b/meet-ce/frontend/projects/shared-meet-components/src/lib/domains/console/pages/users-permissions/users-permissions.component.html
similarity index 77%
rename from meet-ce/frontend/projects/shared-meet-components/src/lib/domains/console/pages/users/users.component.html
rename to meet-ce/frontend/projects/shared-meet-components/src/lib/domains/console/pages/users-permissions/users-permissions.component.html
index 35e323aa..96784f2f 100644
--- a/meet-ce/frontend/projects/shared-meet-components/src/lib/domains/console/pages/users/users.component.html
+++ b/meet-ce/frontend/projects/shared-meet-components/src/lib/domains/console/pages/users-permissions/users-permissions.component.html
@@ -1,10 +1,12 @@
@if (isLoading()) {
@@ -78,8 +80,8 @@
@@ -137,10 +139,7 @@
>
{{ showNewPassword() ? 'visibility_off' : 'visibility' }}
- Minimum 5 characters. We recommend using letters, numbers, and
- symbols
+ Minimum 5 characters. We recommend using letters, numbers, and symbols
@if (getNewPasswordError()) {
{{ getNewPasswordError() }}
}
@@ -188,6 +187,50 @@
+
+
+
+
+
}
diff --git a/meet-ce/frontend/projects/shared-meet-components/src/lib/domains/console/pages/users/users.component.scss b/meet-ce/frontend/projects/shared-meet-components/src/lib/domains/console/pages/users-permissions/users-permissions.component.scss
similarity index 100%
rename from meet-ce/frontend/projects/shared-meet-components/src/lib/domains/console/pages/users/users.component.scss
rename to meet-ce/frontend/projects/shared-meet-components/src/lib/domains/console/pages/users-permissions/users-permissions.component.scss
diff --git a/meet-ce/frontend/projects/shared-meet-components/src/lib/domains/console/pages/users/users.component.ts b/meet-ce/frontend/projects/shared-meet-components/src/lib/domains/console/pages/users-permissions/users-permissions.component.ts
similarity index 97%
rename from meet-ce/frontend/projects/shared-meet-components/src/lib/domains/console/pages/users/users.component.ts
rename to meet-ce/frontend/projects/shared-meet-components/src/lib/domains/console/pages/users-permissions/users-permissions.component.ts
index 70bf6d62..d7f244a2 100644
--- a/meet-ce/frontend/projects/shared-meet-components/src/lib/domains/console/pages/users/users.component.ts
+++ b/meet-ce/frontend/projects/shared-meet-components/src/lib/domains/console/pages/users-permissions/users-permissions.component.ts
@@ -24,7 +24,7 @@ import { NotificationService } from '../../../../shared/services/notification.se
import { AuthService } from '../../../auth/services/auth.service';
@Component({
- selector: 'ov-users',
+ selector: 'ov-users-permissions',
imports: [
MatCardModule,
MatButtonModule,
@@ -38,10 +38,10 @@ import { AuthService } from '../../../auth/services/auth.service';
ReactiveFormsModule
// ProFeatureBadgeComponent
],
- templateUrl: './users.component.html',
- styleUrl: './users.component.scss'
+ templateUrl: './users-permissions.component.html',
+ styleUrl: './users-permissions.component.scss'
})
-export class UsersComponent implements OnInit {
+export class UsersPermissionsComponent implements OnInit {
isLoading = signal(true);
showCurrentPassword = signal(false);
diff --git a/meet-ce/frontend/projects/shared-meet-components/src/lib/domains/console/routes/console.routes.ts b/meet-ce/frontend/projects/shared-meet-components/src/lib/domains/console/routes/console.routes.ts
index dd390b39..cd7ff610 100644
--- a/meet-ce/frontend/projects/shared-meet-components/src/lib/domains/console/routes/console.routes.ts
+++ b/meet-ce/frontend/projects/shared-meet-components/src/lib/domains/console/routes/console.routes.ts
@@ -23,19 +23,6 @@ export const consoleChildRoutes: DomainRouteConfig[] = [
},
...roomsConsoleRoutes,
...recordingsConsoleRoutes,
- {
- route: {
- path: 'users',
- loadComponent: () => import('../pages/users/users.component').then((m) => m.UsersComponent)
- },
- navMetadata: {
- label: 'Users',
- route: 'users',
- icon: 'group',
- iconClass: 'ov-users material-symbols-outlined',
- order: 4
- }
- },
{
route: {
path: 'embedded',
@@ -46,6 +33,20 @@ export const consoleChildRoutes: DomainRouteConfig[] = [
route: 'embedded',
icon: 'code_blocks',
iconClass: 'material-symbols-outlined ov-developer-icon',
+ order: 4
+ }
+ },
+ {
+ route: {
+ path: 'users-permissions',
+ loadComponent: () =>
+ import('../pages/users-permissions/users-permissions.component').then((m) => m.UsersPermissionsComponent)
+ },
+ navMetadata: {
+ label: 'Users & Permissions',
+ route: 'users-permissions',
+ icon: 'passkey',
+ iconClass: 'ov-users-permissions material-symbols-outlined',
order: 5
}
},
diff --git a/meet-ce/frontend/src/assets/styles/_tokens-core.scss b/meet-ce/frontend/src/assets/styles/_tokens-core.scss
index f33312b0..561dd0c9 100644
--- a/meet-ce/frontend/src/assets/styles/_tokens-core.scss
+++ b/meet-ce/frontend/src/assets/styles/_tokens-core.scss
@@ -24,7 +24,7 @@
--ov-meet-icon-rooms: var(--ov-meet-color-primary); // video_chat, meeting_room
--ov-meet-icon-recordings: var(--ov-meet-color-accent); // video_library, play_circle
--ov-meet-icon-developer: var(--ov-meet-color-warning); // code, api
- --ov-meet-icon-users: #37b953; // group, manage_accounts
+ --ov-meet-icon-users-permissions: #e05200; // group, manage_accounts
--ov-meet-icon-settings: var(--ov-meet-color-secondary); // settings, tune
// --ov-meet-icon-about: var(--ov-meet-color-info); // info, security, help
diff --git a/meet-ce/frontend/src/assets/styles/_utilities.scss b/meet-ce/frontend/src/assets/styles/_utilities.scss
index f7581a46..739792f6 100644
--- a/meet-ce/frontend/src/assets/styles/_utilities.scss
+++ b/meet-ce/frontend/src/assets/styles/_utilities.scss
@@ -107,8 +107,8 @@
@include layout.ov-theme-transition;
}
-.ov-users {
- color: var(--ov-meet-icon-users) !important;
+.ov-users-permissions {
+ color: var(--ov-meet-icon-users-permissions) !important;
overflow: none;
@include layout.ov-theme-transition;
}