From 2af1fdcbc8b5ff3c67d4276fa5559a5f2fff3441 Mon Sep 17 00:00:00 2001 From: juancarmore Date: Mon, 17 Mar 2025 13:43:27 +0100 Subject: [PATCH] frontend: Remove unused models and refactor code to include HomeComponent in shared-meet-components library --- .../src/lib}/pages/home/home.component.html | 0 .../src/lib}/pages/home/home.component.scss | 2 +- .../src/lib}/pages/home/home.component.spec.ts | 15 ++++++--------- .../src/lib}/pages/home/home.component.ts | 10 +++------- .../shared-meet-components/src/lib/pages/index.ts | 1 + .../src/lib/routes/base-routes.ts | 4 +++- frontend/src/app/app.routes.ts | 3 +-- frontend/src/app/models/server.model.ts | 4 ---- frontend/src/app/models/storage.model.ts | 7 ------- 9 files changed, 15 insertions(+), 31 deletions(-) rename frontend/{src/app => projects/shared-meet-components/src/lib}/pages/home/home.component.html (100%) rename frontend/{src/app => projects/shared-meet-components/src/lib}/pages/home/home.component.scss (98%) rename frontend/{src/app => projects/shared-meet-components/src/lib}/pages/home/home.component.spec.ts (50%) rename frontend/{src/app => projects/shared-meet-components/src/lib}/pages/home/home.component.ts (95%) delete mode 100644 frontend/src/app/models/server.model.ts delete mode 100644 frontend/src/app/models/storage.model.ts diff --git a/frontend/src/app/pages/home/home.component.html b/frontend/projects/shared-meet-components/src/lib/pages/home/home.component.html similarity index 100% rename from frontend/src/app/pages/home/home.component.html rename to frontend/projects/shared-meet-components/src/lib/pages/home/home.component.html diff --git a/frontend/src/app/pages/home/home.component.scss b/frontend/projects/shared-meet-components/src/lib/pages/home/home.component.scss similarity index 98% rename from frontend/src/app/pages/home/home.component.scss rename to frontend/projects/shared-meet-components/src/lib/pages/home/home.component.scss index 1d91092..79372ba 100644 --- a/frontend/src/app/pages/home/home.component.scss +++ b/frontend/projects/shared-meet-components/src/lib/pages/home/home.component.scss @@ -17,7 +17,7 @@ $formGap: 0.375rem; .section1 { background: linear-gradient(rgba(255, 255, 255, 0.2), rgba(255, 255, 255, 0.2)), - url('../../../assets/images/bg.webp') top center no-repeat; + url('/assets/images/bg.webp') top center no-repeat; background-size: cover; height: 100%; text-align: center; diff --git a/frontend/src/app/pages/home/home.component.spec.ts b/frontend/projects/shared-meet-components/src/lib/pages/home/home.component.spec.ts similarity index 50% rename from frontend/src/app/pages/home/home.component.spec.ts rename to frontend/projects/shared-meet-components/src/lib/pages/home/home.component.spec.ts index ea3cf71..0fc278b 100644 --- a/frontend/src/app/pages/home/home.component.spec.ts +++ b/frontend/projects/shared-meet-components/src/lib/pages/home/home.component.spec.ts @@ -1,18 +1,15 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { RouterTestingModule } from '@angular/router/testing'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; import { HomeComponent } from './home.component'; -import { UntypedFormBuilder } from '@angular/forms'; describe('HomeComponent', () => { let component: HomeComponent; let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - providers: [UntypedFormBuilder], - imports: [RouterTestingModule.withRoutes([]), HomeComponent] -}).compileComponents(); - })); + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [HomeComponent] + }).compileComponents(); + }); beforeEach(() => { fixture = TestBed.createComponent(HomeComponent); diff --git a/frontend/src/app/pages/home/home.component.ts b/frontend/projects/shared-meet-components/src/lib/pages/home/home.component.ts similarity index 95% rename from frontend/src/app/pages/home/home.component.ts rename to frontend/projects/shared-meet-components/src/lib/pages/home/home.component.ts index b656353..7ffa2cf 100644 --- a/frontend/src/app/pages/home/home.component.ts +++ b/frontend/projects/shared-meet-components/src/lib/pages/home/home.component.ts @@ -13,15 +13,11 @@ import { MatIconButton, MatButton } from '@angular/material/button'; import { NgClass } from '@angular/common'; import { MatToolbar } from '@angular/material/toolbar'; import { ActivatedRoute, Router } from '@angular/router'; - import { Subscription } from 'rxjs'; - -// import { ConfigService } from '@app/services/config.service'; -import { HttpService, OpenViduMeetRoom, OpenViduMeetRoomOptions } from 'projects/shared-meet-components/src/public-api'; - -import packageInfo from '../../../../package.json'; - +import { HttpService } from '../../services/http/http.service'; +import { OpenViduMeetRoom, OpenViduMeetRoomOptions } from '../../typings/ce/room'; import { animals, colors, Config, uniqueNamesGenerator } from 'unique-names-generator'; +import packageInfo from '../../../../../../package.json'; @Component({ selector: 'app-home', 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 437da39..f8add9b 100644 --- a/frontend/projects/shared-meet-components/src/lib/pages/index.ts +++ b/frontend/projects/shared-meet-components/src/lib/pages/index.ts @@ -7,6 +7,7 @@ export * from './console/security-preferences/security-preferences.component'; export * from './console/about/about.component'; export * from './console/overview/overview.component'; export * from './console/login/login.component'; +export * from './home/home.component'; export * from './video-room/video-room.component'; export * from './participant-name-form/participant-name-form.component'; export * from './disconnected/disconnected.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 a96bfdf..eed0822 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 @@ -17,15 +17,17 @@ import { ConsoleComponent, ConsoleLoginComponent, DisconnectedComponent, + HomeComponent, OverviewComponent, ParticipantNameFormComponent, + RecordingsComponent, RoomsComponent, SecurityPreferencesComponent, VideoRoomComponent } from '../pages'; -import { RecordingsComponent } from '@lib/pages/console/recordings/recordings.component'; export const baseRoutes: Routes = [ + { path: '', component: HomeComponent }, { path: 'disconnected', component: DisconnectedComponent }, { path: 'unauthorized', component: UnauthorizedComponent }, { diff --git a/frontend/src/app/app.routes.ts b/frontend/src/app/app.routes.ts index 03e378a..ff7ef22 100644 --- a/frontend/src/app/app.routes.ts +++ b/frontend/src/app/app.routes.ts @@ -1,5 +1,4 @@ import { Routes } from '@angular/router'; -import { HomeComponent } from '@app/pages/home/home.component'; import { baseRoutes } from 'projects/shared-meet-components/src/public-api'; -export const routes: Routes = [{ path: '', component: HomeComponent }, ...baseRoutes]; +export const routes: Routes = baseRoutes; diff --git a/frontend/src/app/models/server.model.ts b/frontend/src/app/models/server.model.ts deleted file mode 100644 index 24b07ff..0000000 --- a/frontend/src/app/models/server.model.ts +++ /dev/null @@ -1,4 +0,0 @@ -export interface ServerConfigurationResponse { - isPrivateAccess: boolean; - -} \ No newline at end of file diff --git a/frontend/src/app/models/storage.model.ts b/frontend/src/app/models/storage.model.ts deleted file mode 100644 index 85faa03..0000000 --- a/frontend/src/app/models/storage.model.ts +++ /dev/null @@ -1,7 +0,0 @@ -export enum StorageAppKeys { - PARTICIPANT_NAME = 'participantName', - PARTICIPANT_CREDENTIALS = 'participantCredentials', - ADMIN_CREDENTIALS = 'adminCredentials', -} - -export const STORAGE_PREFIX = 'OvCall-';