diff --git a/src/app/components/creator/creator.module.ts b/src/app/components/creator/creator.module.ts index 10b0706bd73293cd45e16b584f072917b30750d4..5efccbce0e2d57c0a571144e26416ab839a9cfff 100644 --- a/src/app/components/creator/creator.module.ts +++ b/src/app/components/creator/creator.module.ts @@ -23,6 +23,7 @@ import { DeleteAnswerComponent } from './_dialogs/delete-answer/delete-answer.co import { QuestionWallComponent } from '../shared/questionwall/question-wall/question-wall.component'; import { ArsModule } from '../../../../projects/ars/src/lib/ars.module'; import { MatRippleModule } from '@angular/material/core'; +import { QuizNowComponent } from '../shared/quiz-now/quiz-now.component'; @NgModule({ imports: [ @@ -56,6 +57,7 @@ import { MatRippleModule } from '@angular/material/core'; DeleteCommentComponent, BonusDeleteComponent, DeleteAnswerComponent, + QuizNowComponent, QuestionWallComponent ], exports: [] diff --git a/src/app/components/shared/header/header.component.html b/src/app/components/shared/header/header.component.html index b57fe82fbb74dde04b858a22aadd1afb73a70e8a..86a7f4a5a40e85ee5e09cc7206cd5116551292ad 100644 --- a/src/app/components/shared/header/header.component.html +++ b/src/app/components/shared/header/header.component.html @@ -182,6 +182,14 @@ <span>{{'header.update-spacy-keywords' | translate}}</span> </button> + <button mat-menu-item + tabindex="0" + routerLink="participant/room/{{shortId}}/comments/quiznow"> + <mat-icon>school + </mat-icon> + <span>{{'header.quiz-now' | translate}}</span> + </button> + </ng-container> <ng-container *ngIf="router.url.includes('/participant/room/')"> </ng-container> diff --git a/src/app/components/shared/header/header.component.ts b/src/app/components/shared/header/header.component.ts index 8a7d2188460561981e9b03bff666b8955c1d2ed2..42f57a9a36d1859dd45a9a8534fdb2ac29edbe72 100644 --- a/src/app/components/shared/header/header.component.ts +++ b/src/app/components/shared/header/header.component.ts @@ -27,6 +27,8 @@ import { TagCloudMetaData } from '../../../services/util/tag-cloud-data.service' import { WorkerDialogComponent } from '../_dialogs/worker-dialog/worker-dialog.component'; import { WsRoomService } from '../../../services/websockets/ws-room.service'; import { TopicCloudAdminService } from '../../../services/util/topic-cloud-admin.service'; +import { QuizNowComponent } from '../quiz-now/quiz-now.component'; + @Component({ selector: 'app-header', diff --git a/src/app/components/shared/quiz-now/quiz-now.component.html b/src/app/components/shared/quiz-now/quiz-now.component.html new file mode 100644 index 0000000000000000000000000000000000000000..18dd69c14285d2e0d03a2846ab01a5bcd984fa54 --- /dev/null +++ b/src/app/components/shared/quiz-now/quiz-now.component.html @@ -0,0 +1,3 @@ +<div class="container"> + <iframe class="responsive-iframe" src="https://arsnova.click"></iframe> +</div> diff --git a/src/app/components/shared/quiz-now/quiz-now.component.scss b/src/app/components/shared/quiz-now/quiz-now.component.scss new file mode 100644 index 0000000000000000000000000000000000000000..283440e2ef29b9675e4f7154a691b342cef102f0 --- /dev/null +++ b/src/app/components/shared/quiz-now/quiz-now.component.scss @@ -0,0 +1,18 @@ +iframe { + border-width: 0px; +} + +.container { + width: auto; + height: auto; +} + +.responsive-iframe { + position: absolute; + top: 0; + left: 0; + bottom: 0; + right: 0; + width: 100%; + height: 100%; +} diff --git a/src/app/components/shared/quiz-now/quiz-now.component.spec.ts b/src/app/components/shared/quiz-now/quiz-now.component.spec.ts new file mode 100644 index 0000000000000000000000000000000000000000..eb2e840793c039433251a26cf0633edbb570c159 --- /dev/null +++ b/src/app/components/shared/quiz-now/quiz-now.component.spec.ts @@ -0,0 +1,25 @@ +/*import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { QuizNowComponent } from './quiz-now.component'; + +describe('QuizNowComponent', () => { + let component: QuizNowComponent; + let fixture: ComponentFixture<QuizNowComponent>; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ QuizNowComponent ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(QuizNowComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +});*/ diff --git a/src/app/components/shared/quiz-now/quiz-now.component.ts b/src/app/components/shared/quiz-now/quiz-now.component.ts new file mode 100644 index 0000000000000000000000000000000000000000..a97b45cb33e4b1a0012518ae0db1fc241ee417a4 --- /dev/null +++ b/src/app/components/shared/quiz-now/quiz-now.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-quiz-now', + templateUrl: './quiz-now.component.html', + styleUrls: ['./quiz-now.component.scss'] +}) +export class QuizNowComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/src/app/components/shared/shared-routing.module.ts b/src/app/components/shared/shared-routing.module.ts index 1b15001b4ed5cbe84fea53fb90a22f39e4301622..8211ca0e7e5f8d1d49f68835b1b7f537fadb77c8 100644 --- a/src/app/components/shared/shared-routing.module.ts +++ b/src/app/components/shared/shared-routing.module.ts @@ -4,6 +4,7 @@ import { QuestionWallComponent } from './questionwall/question-wall/question-wal import { AuthenticationGuard } from '../../guards/authentication.guard'; import { UserRole } from '../../models/user-roles.enum'; import { TagCloudComponent } from './tag-cloud/tag-cloud.component'; +import { QuizNowComponent } from './quiz-now/quiz-now.component'; const routes: Routes = [ { @@ -16,6 +17,16 @@ const routes: Routes = [ UserRole.PARTICIPANT] } }, + { + path: 'room/:shortId/comments/quiznow', + component: QuizNowComponent, + data: { roles: [ + UserRole.CREATOR, + UserRole.EDITING_MODERATOR, + UserRole.EXECUTIVE_MODERATOR, + UserRole.PARTICIPANT] } + }, + { path: 'room/:shortId/comments/tagcloud', component: TagCloudComponent, diff --git a/src/app/components/shared/shared.module.ts b/src/app/components/shared/shared.module.ts index f022dfac582d8515332e41d4450ead18c6e6db9a..215b6d3ca027b423aad79a70da412d25d8498ee4 100644 --- a/src/app/components/shared/shared.module.ts +++ b/src/app/components/shared/shared.module.ts @@ -38,7 +38,7 @@ import { TopicCloudFilterComponent } from './_dialogs/topic-cloud-filter/topic-c import { SpacyDialogComponent } from './_dialogs/spacy-dialog/spacy-dialog.component'; import { TagCloudPopUpComponent } from './tag-cloud/tag-cloud-pop-up/tag-cloud-pop-up.component'; import { WorkerDialogComponent } from './_dialogs/worker-dialog/worker-dialog.component'; -import {DragDropModule} from "@angular/cdk/drag-drop"; +import { DragDropModule } from "@angular/cdk/drag-drop"; @NgModule({ imports: [ @@ -82,8 +82,7 @@ import {DragDropModule} from "@angular/cdk/drag-drop"; TopicDialogCommentComponent, TopicCloudFilterComponent, SpacyDialogComponent, - TagCloudPopUpComponent, - WorkerDialogComponent + TagCloudPopUpComponent ], exports: [ RoomJoinComponent, diff --git a/src/assets/i18n/home/de.json b/src/assets/i18n/home/de.json index a4ac4728a23888f24c85e54312a984302265f6d8..b363c9e4ad441813f0b35317cfda0c1a3e1e7c7a 100644 --- a/src/assets/i18n/home/de.json +++ b/src/assets/i18n/home/de.json @@ -106,7 +106,8 @@ "overview-questioners-tooltip": "Anzahl Fragensteller*innen", "overview-keywords-tooltip": "Anzahl Schlüsselwörter", "update-spacy-keywords": "Fragen analysieren", - "overview-admin-config-enabled": "Themeneinschränkung aktiv" + "overview-admin-config-enabled": "Themeneinschränkung aktiv", + "quiz-now": "Jetzt quizzen" }, "help": { "cancel": "Schließen", diff --git a/src/assets/i18n/home/en.json b/src/assets/i18n/home/en.json index 1c489980bdeddd440a152e77c1ba51f676cae5d6..0c7e064541fd85f367ec828e3121a47b76fc5b36 100644 --- a/src/assets/i18n/home/en.json +++ b/src/assets/i18n/home/en.json @@ -95,7 +95,8 @@ "overview-questioners-tooltip": "Number of questioners", "overview-keywords-tooltip": "Number of Keywords", "update-spacy-keywords": "Add keywords", - "overview-admin-config-enabled": "Themes requirement active" + "overview-admin-config-enabled": "Themes requirement active", + "quiz-now": "Quiz now" }, "help": { "cancel": "Close",