Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace projector with projector service #4588

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

Replace projector with projector service #4588

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7b50b54
Replace projector
bastianjoel Jan 27, 2025
423c713
Remove console log
bastianjoel Jan 27, 2025
42e0985
Remove content from projection subscription
bastianjoel Jan 27, 2025
cc01463
Fix test
bastianjoel Jan 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions client/src/app/domain/models/projector/projection.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
import { Fqid, Id } from '../../definitions/key-types';
import { HasCollection } from '../../interfaces/has-collection';
import { HasMeetingId } from '../../interfaces/has-meeting-id';
import { BaseModel } from '../base/base-model';

type ProjectionContent = HasCollection & { [key: string]: any };

export class Projection extends BaseModel<Projection> {
public static COLLECTION = `projection`;

Expand All @@ -16,9 +13,6 @@ export class Projection extends BaseModel<Projection> {

public weight!: number;

// Calculated field
public content!: ProjectionContent;

public content_object_id!: Fqid; // */projection_ids
public current_projector_id!: Id; // projector/current_projection_ids;
public preview_projector_id!: Id; // projector/preview_projection_ids;
Expand All @@ -34,7 +28,6 @@ export class Projection extends BaseModel<Projection> {
`stable`,
`weight`,
`type`,
`content`,
`current_projector_id`,
`preview_projector_id`,
`history_projector_id`,
Expand Down
3 changes: 1 addition & 2 deletions client/src/app/gateways/repositories/projections/projection-repository.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,7 @@ export class ProjectionRepositoryService extends BaseMeetingRelatedRepository<Vi
`preview_projector_id`,
`current_projector_id`,
`history_projector_id`,
`current_projector_id`,
`content`
`current_projector_id`
];
return {
...super.getFieldsets(),
Expand Down
4 changes: 2 additions & 2 deletions ...p/site/pages/meetings/modules/list-of-speakers-content/list-of-speakers-content.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import { ParticipantCommonServiceModule } from '../../pages/participants/service
import { DetailViewModule } from '../meetings-component-collector/detail-view/detail-view.module';
import { ProjectorButtonModule } from '../meetings-component-collector/projector-button/projector-button.module';
import { ParticipantSearchSelectorModule } from '../participant-search-selector';
import { CountdownTimeModule } from '../projector/modules/countdown-time/countdown-time.module';
import { CountdownTimeComponent } from '../projector/components/countdown-time/countdown-time.component';
import { ListOfSpeakersContentComponent } from './components/list-of-speakers-content/list-of-speakers-content.component';
import { ListOfSpeakersEntryComponent } from './components/list-of-speakers-entry/list-of-speakers-entry.component';
import { ModerationNoteComponent } from './components/moderation-note/moderation-note.component';
Expand Down Expand Up @@ -64,7 +64,7 @@ const DECLARATIONS = [
PointOfOrderDialogModule,
SpeakerUserSelectDialogModule,
ProjectorButtonModule,
CountdownTimeModule,
CountdownTimeComponent,
DirectivesModule,
OpenSlidesTranslationModule.forChild(),
PipesModule
Expand Down
0 ...ntdown-time/countdown-time.component.html → ...ntdown-time/countdown-time.component.html
View file
Open in desktop
File renamed without changes.
0 ...ntdown-time/countdown-time.component.scss → ...ntdown-time/countdown-time.component.scss
View file
Open in desktop
File renamed without changes.
0 ...own-time/countdown-time.component.spec.ts → ...own-time/countdown-time.component.spec.ts
View file
Open in desktop
File renamed without changes.
3 changes: 3 additions & 0 deletions ...ountdown-time/countdown-time.component.ts → ...ountdown-time/countdown-time.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { CommonModule } from '@angular/common';
import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnDestroy } from '@angular/core';
import { ServerTimeService } from 'src/app/gateways/server-time.service';

Expand All @@ -14,6 +15,8 @@ export enum CountdownState {
}

@Component({
standalone: true,
imports: [CommonModule],
selector: `os-countdown-time`,
templateUrl: `./countdown-time.component.html`,
styleUrls: [`./countdown-time.component.scss`],
Expand Down
6 changes: 0 additions & 6 deletions ...ages/meetings/modules/projector/components/projector-clock/projector-clock.component.html
View file
Open in desktop

This file was deleted.

19 changes: 0 additions & 19 deletions ...ages/meetings/modules/projector/components/projector-clock/projector-clock.component.scss
View file
Open in desktop

This file was deleted.

24 changes: 0 additions & 24 deletions ...s/meetings/modules/projector/components/projector-clock/projector-clock.component.spec.ts
View file
Open in desktop

This file was deleted.

49 changes: 0 additions & 49 deletions .../pages/meetings/modules/projector/components/projector-clock/projector-clock.component.ts
View file
Open in desktop

This file was deleted.

63 changes: 2 additions & 61 deletions ...c/app/site/pages/meetings/modules/projector/components/projector/projector.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,63 +1,4 @@
<div #container class="projector-container" id="container" (osResized)="onResized()">
<div class="projector" id="projector">
@if (isOffline) {
<div id="offline-indicator">
<mat-icon>fiber_manual_record</mat-icon>
</div>
}
@if (projector && projector.show_header_footer) {
<div class="headerFooter" id="header">
<!-- projector logo -->
@if (projectorLogoObservable | async; as projectorLogo) {
@if (projector.show_logo) {
<img
class="projector-logo-main"
[alt]="'Projector logo' | translate"
src="{{ projectorLogo }}"
/>
}
}
@if (projector.show_title) {
<div id="eventdata">
@if (
{
eventName: eventNameObservable | async,
eventDescription: eventDescriptionObservable | async
};
as eventData
) {
@if (eventData.eventName) {
<div
class="event-name ellipsis-overflow"
[innerHTML]="eventData.eventName"
[ngClass]="{ titleonly: !eventData.eventDescription }"
></div>
}
@if (eventData.eventDescription) {
<div class="event-description" [innerHTML]="eventData.eventDescription"></div>
}
}
</div>
}
</div>
}
@if (projector!.show_clock) {
<os-projector-clock [color]="projector!.header_font_color"></os-projector-clock>
}
@for (slide of slides | async; track slide.id) {
<div>
<os-slide-container
[projector]="projector!"
[scale]="projector!.scale"
[scroll]="projector!.scroll"
[slideData]="slide"
></os-slide-container>
</div>
}
@if (projector && projector.show_header_footer) {
<div class="headerFooter" id="footer">
<div class="footertext"></div>
</div>
}
</div>
<div class="blocker"></div>
<iframe class="projector" id="projector" [src]="url | trust: 'resourceUrl'" (load)="onResized()"></iframe>
</div>
72 changes: 8 additions & 64 deletions ...c/app/site/pages/meetings/modules/projector/components/projector/projector.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,70 +25,14 @@
overflow: hidden;
font-size: 22px !important;
line-height: 24px !important;
border: none;
z-index: 1;
}

#header {
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 70px;
box-shadow: 0 0 7px rgba(0, 0, 0, 0.6);
background-repeat: no-repeat;
background-size: 100% 100%;
margin-bottom: 20px;
z-index: 9;

.projector-logo-main {
height: 50px;
padding-left: 50px;
padding-top: 10px;
float: left;
display: flex;
}

#eventdata {
padding-left: 50px;
padding-top: 12px;
padding-right: 130px;
height: 50px;
overflow: hidden;
line-height: 1.1;

.event-name {
font-size: 26px;
font-weight: 400;

&.titleonly {
padding-top: 12px;
}
}

.event-description {
font-size: 18px;
opacity: 0.8;
}
}
}

#footer {
position: fixed;
width: 100%;
height: 35px;
bottom: 0;
z-index: 9;

.footertext {
font-size: 16px;
padding-left: 50px;
padding-right: 50px;
padding-top: 5px;
overflow: hidden;
text-align: right;
}

span {
opacity: 0.8;
}
}
.blocker {
position: absolute;
height: 100%;
width: 100%;
z-index: 2;
}
}
Loading
Loading