diff --git a/src/app/components/creator/room-creator-page/room-creator-page.component.scss b/src/app/components/creator/room-creator-page/room-creator-page.component.scss index df6b2acf635bab47d89d2fd8b746f9c8960a3cfc..5b84d3b6fa7baa33943e7cae94d08e91de903aa5 100644 --- a/src/app/components/creator/room-creator-page/room-creator-page.component.scss +++ b/src/app/components/creator/room-creator-page/room-creator-page.component.scss @@ -21,6 +21,7 @@ mat-icon{ height:90% !important; width: 90% !important; font-size:48px !important; + text-align: center; } .smallerIcon { @@ -47,7 +48,7 @@ h3 { h4 { font-size: medium; - color: mat-color($arsnova-primary, 200); + color: mat-color($arsnova-primary, 300); } h2 { diff --git a/src/app/components/participant/room-participant-page/room-participant-page.component.scss b/src/app/components/participant/room-participant-page/room-participant-page.component.scss index a22f83f983f8bbb5c5a0350019cfaef87e4d629f..9eb82ffda173a04e4bb5d890a7f16d54360c9b86 100644 --- a/src/app/components/participant/room-participant-page/room-participant-page.component.scss +++ b/src/app/components/participant/room-participant-page/room-participant-page.component.scss @@ -37,7 +37,7 @@ h3 { h4 { font-size: medium; - color: mat-color($arsnova-primary, 200); + color: mat-color($arsnova-primary, 300); } h2 { diff --git a/src/app/components/shared/room-join/room-join.component.ts b/src/app/components/shared/room-join/room-join.component.ts index d8475228fc68e88e05628a710e3eedba68caeb99..e018ee7de467b7df33a414ce32c231e3be111b62 100644 --- a/src/app/components/shared/room-join/room-join.component.ts +++ b/src/app/components/shared/room-join/room-join.component.ts @@ -6,6 +6,8 @@ import { RegisterErrorStateMatcher } from '../../home/_dialogs/register/register import { FormControl, FormGroupDirective, NgForm, Validators } from '@angular/forms'; import { ErrorStateMatcher } from '@angular/material'; import { NotificationService } from '../../../services/util/notification.service'; +import {LanguageService} from "../../../services/util/language.service"; +import {TranslateService} from "@ngx-translate/core"; export class JoinErrorStateMatcher implements ErrorStateMatcher { isErrorState(control: FormControl | null, form: FormGroupDirective | NgForm | null): boolean { @@ -22,7 +24,7 @@ export class JoinErrorStateMatcher implements ErrorStateMatcher { export class RoomJoinComponent implements OnInit { room: Room; - demoId = '82458028'; + demoId = '26973546'; roomFormControl = new FormControl('', [Validators.required, Validators.minLength(8)]); @@ -30,8 +32,8 @@ export class RoomJoinComponent implements OnInit { constructor(private roomService: RoomService, private router: Router, - public notificationService: NotificationService - ) { + public notificationService: NotificationService, + private translateService: TranslateService) { } ngOnInit() { @@ -42,7 +44,9 @@ export class RoomJoinComponent implements OnInit { .subscribe(room => { this.room = room; if (!room) { - this.notificationService.show(`No room was found with id: ${id}`); + this.translateService.get('home-page.no-room-found').subscribe(message => { + this.notificationService.show(message); + }); } else { this.roomService.addToHistory(this.room.id); this.router.navigate([`/participant/room/${this.room.shortId}`]); diff --git a/src/assets/i18n/participant/en.json b/src/assets/i18n/participant/en.json index 0d31267853a19253d5538778e1bfb635b20b16ec..f0af882fad0882063b6d5ccc63afa50c25a5dd0c 100644 --- a/src/assets/i18n/participant/en.json +++ b/src/assets/i18n/participant/en.json @@ -2,7 +2,7 @@ "home-page": { "join-demo-session": "Join demo-session", "session-id": "Session-Id", - "no-room-found": "No session was found with id:", + "no-room-found": "No session was found with this id:", "please-enter": "Please enter a session-id.", "exactly-8": "A session-id has exactly 8 digits." },