From b120512c7ae447e3a656b254e8b9a28885a11b10 Mon Sep 17 00:00:00 2001
From: Philipp Sautner <philipp.sautner@mni.thm.de>
Date: Tue, 13 Jul 2021 17:04:46 +0000
Subject: [PATCH] Adds button to navigate to new quiz-now wall
---
src/app/components/creator/creator.module.ts | 2 ++
.../shared/header/header.component.html | 8 ++++++
.../shared/header/header.component.ts | 2 ++
.../shared/quiz-now/quiz-now.component.html | 3 +++
.../shared/quiz-now/quiz-now.component.scss | 18 +++++++++++++
.../quiz-now/quiz-now.component.spec.ts | 25 +++++++++++++++++++
.../shared/quiz-now/quiz-now.component.ts | 15 +++++++++++
.../shared/shared-routing.module.ts | 11 ++++++++
src/app/components/shared/shared.module.ts | 5 ++--
src/assets/i18n/home/de.json | 3 ++-
src/assets/i18n/home/en.json | 3 ++-
11 files changed, 90 insertions(+), 5 deletions(-)
create mode 100644 src/app/components/shared/quiz-now/quiz-now.component.html
create mode 100644 src/app/components/shared/quiz-now/quiz-now.component.scss
create mode 100644 src/app/components/shared/quiz-now/quiz-now.component.spec.ts
create mode 100644 src/app/components/shared/quiz-now/quiz-now.component.ts
diff --git a/src/app/components/creator/creator.module.ts b/src/app/components/creator/creator.module.ts
index 10b0706bd..5efccbce0 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 b57fe82fb..86a7f4a5a 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 8a7d21884..42f57a9a3 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 000000000..18dd69c14
--- /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 000000000..283440e2e
--- /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 000000000..eb2e84079
--- /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 000000000..a97b45cb3
--- /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 1b15001b4..8211ca0e7 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 f022dfac5..215b6d3ca 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 a4ac4728a..b363c9e4a 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 1c489980b..0c7e06454 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",
--
GitLab