From a7a3abeb4da151d2e4c7326a1f45b891ecc0c9b4 Mon Sep 17 00:00:00 2001 From: Carlos Santos <4a.santos@gmail.com> Date: Mon, 10 Mar 2025 19:44:57 +0100 Subject: [PATCH] frontend: Refactor room preferences to rooms component and update routing --- .../lib/pages/console/console.component.ts | 2 +- .../rooms.component.html} | 0 .../rooms.component.scss} | 0 .../rooms.component.spec.ts} | 2 +- .../rooms.component.ts} | 7 ++-- .../src/lib/pages/index.ts | 2 +- .../src/lib/routes/base-routes.ts | 42 +++++++++++-------- 7 files changed, 30 insertions(+), 25 deletions(-) rename frontend/projects/shared-meet-components/src/lib/pages/console/{room-preferences/room-preferences.component.html => rooms/rooms.component.html} (100%) rename frontend/projects/shared-meet-components/src/lib/pages/console/{room-preferences/room-preferences.component.scss => rooms/rooms.component.scss} (100%) rename frontend/projects/shared-meet-components/src/lib/pages/console/{room-preferences/room-preferences.component.spec.ts => rooms/rooms.component.spec.ts} (88%) rename frontend/projects/shared-meet-components/src/lib/pages/console/{room-preferences/room-preferences.component.ts => rooms/rooms.component.ts} (96%) diff --git a/frontend/projects/shared-meet-components/src/lib/pages/console/console.component.ts b/frontend/projects/shared-meet-components/src/lib/pages/console/console.component.ts index cc99bc0..11632a5 100644 --- a/frontend/projects/shared-meet-components/src/lib/pages/console/console.component.ts +++ b/frontend/projects/shared-meet-components/src/lib/pages/console/console.component.ts @@ -13,7 +13,7 @@ import { AuthService } from '../../services'; export class ConsoleComponent { navLinks: ConsoleNavLink[] = [ { label: 'Overview', route: 'overview', icon: 'dashboard' }, - { label: 'Rooms', route: 'room-preferences', icon: 'video_settings' }, + { label: 'Rooms', route: 'rooms', icon: 'video_settings' }, { label: 'Recordings', route: 'recordings', icon: 'radio_button_checked' } // { label: 'Access & Permissions', route: 'access-permissions', icon: 'lock' }, // { label: 'Appearance', route: 'appearance', icon: 'palette' }, diff --git a/frontend/projects/shared-meet-components/src/lib/pages/console/room-preferences/room-preferences.component.html b/frontend/projects/shared-meet-components/src/lib/pages/console/rooms/rooms.component.html similarity index 100% rename from frontend/projects/shared-meet-components/src/lib/pages/console/room-preferences/room-preferences.component.html rename to frontend/projects/shared-meet-components/src/lib/pages/console/rooms/rooms.component.html diff --git a/frontend/projects/shared-meet-components/src/lib/pages/console/room-preferences/room-preferences.component.scss b/frontend/projects/shared-meet-components/src/lib/pages/console/rooms/rooms.component.scss similarity index 100% rename from frontend/projects/shared-meet-components/src/lib/pages/console/room-preferences/room-preferences.component.scss rename to frontend/projects/shared-meet-components/src/lib/pages/console/rooms/rooms.component.scss diff --git a/frontend/projects/shared-meet-components/src/lib/pages/console/room-preferences/room-preferences.component.spec.ts b/frontend/projects/shared-meet-components/src/lib/pages/console/rooms/rooms.component.spec.ts similarity index 88% rename from frontend/projects/shared-meet-components/src/lib/pages/console/room-preferences/room-preferences.component.spec.ts rename to frontend/projects/shared-meet-components/src/lib/pages/console/rooms/rooms.component.spec.ts index f04163f..853d065 100644 --- a/frontend/projects/shared-meet-components/src/lib/pages/console/room-preferences/room-preferences.component.spec.ts +++ b/frontend/projects/shared-meet-components/src/lib/pages/console/rooms/rooms.component.spec.ts @@ -1,6 +1,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { RoomPreferencesComponent } from './room-preferences.component'; +import { RoomPreferencesComponent } from './rooms.component'; describe('RoomConfigComponent', () => { let component: RoomPreferencesComponent; diff --git a/frontend/projects/shared-meet-components/src/lib/pages/console/room-preferences/room-preferences.component.ts b/frontend/projects/shared-meet-components/src/lib/pages/console/rooms/rooms.component.ts similarity index 96% rename from frontend/projects/shared-meet-components/src/lib/pages/console/room-preferences/room-preferences.component.ts rename to frontend/projects/shared-meet-components/src/lib/pages/console/rooms/rooms.component.ts index 8710337..5aaeb6c 100644 --- a/frontend/projects/shared-meet-components/src/lib/pages/console/room-preferences/room-preferences.component.ts +++ b/frontend/projects/shared-meet-components/src/lib/pages/console/rooms/rooms.component.ts @@ -22,10 +22,10 @@ import { OpenViduMeetRoom } from 'projects/shared-meet-components/src/lib/typing MatButtonModule, MatIconModule ], - templateUrl: './room-preferences.component.html', - styleUrl: './room-preferences.component.scss' + templateUrl: './rooms.component.html', + styleUrl: './rooms.component.scss' }) -export class RoomPreferencesComponent implements OnInit { +export class RoomsComponent implements OnInit { createdRooms: OpenViduMeetRoom[] = []; private roomPreferences!: RoomPreferences; recordingEnabled = false; @@ -36,7 +36,6 @@ export class RoomPreferencesComponent implements OnInit { constructor( protected loggerService: LoggerService, - private roomService: RoomService, private notificationService: NotificationService ) { diff --git a/frontend/projects/shared-meet-components/src/lib/pages/index.ts b/frontend/projects/shared-meet-components/src/lib/pages/index.ts index f0f6888..78b4826 100644 --- a/frontend/projects/shared-meet-components/src/lib/pages/index.ts +++ b/frontend/projects/shared-meet-components/src/lib/pages/index.ts @@ -1,5 +1,5 @@ export * from './console/console.component'; -export * from './console/room-preferences/room-preferences.component'; +export * from './console/rooms/rooms.component'; export * from './console/access-permissions/access-permissions.component'; export * from './console/appearance/appearance.component'; export * from './console/security-preferences/security-preferences.component'; diff --git a/frontend/projects/shared-meet-components/src/lib/routes/base-routes.ts b/frontend/projects/shared-meet-components/src/lib/routes/base-routes.ts index 88f08e1..3c08fb6 100644 --- a/frontend/projects/shared-meet-components/src/lib/routes/base-routes.ts +++ b/frontend/projects/shared-meet-components/src/lib/routes/base-routes.ts @@ -18,10 +18,11 @@ import { DisconnectedComponent, OverviewComponent, ParticipantNameFormComponent, - RoomPreferencesComponent, + RoomsComponent, SecurityPreferencesComponent, VideoRoomComponent } from '../pages'; +import { RecordingsComponent } from '@lib/pages/console/recordings/recordings.component'; export const baseRoutes: Routes = [ { path: 'disconnected', component: DisconnectedComponent }, @@ -34,7 +35,7 @@ export const baseRoutes: Routes = [ { path: 'console', component: ConsoleComponent, - canActivate: [/*standaloneModeGuard*/ checkAdminAuthenticatedGuard], + canActivate: [checkAdminAuthenticatedGuard], children: [ { path: '', @@ -46,25 +47,30 @@ export const baseRoutes: Routes = [ component: OverviewComponent }, { - path: 'access-permissions', - component: AccessPermissionsComponent + path: 'rooms', + component: RoomsComponent }, { - path: 'appearance', - component: AppearanceComponent - }, - { - path: 'room-preferences', - component: RoomPreferencesComponent - }, - { - path: 'security-preferences', - component: SecurityPreferencesComponent - }, - { - path: 'about', - component: AboutComponent + path: 'recordings', + component: RecordingsComponent }, + // { + // path: 'access-permissions', + // component: AccessPermissionsComponent + // }, + // { + // path: 'appearance', + // component: AppearanceComponent + // }, + + // { + // path: 'security-preferences', + // component: SecurityPreferencesComponent + // }, + // { + // path: 'about', + // component: AboutComponent + // }, { path: '**', redirectTo: 'overview' } ] },