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.

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

Implement timer for the quiz #21

Merged
merged 1 commit into from
Feb 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ <h4 class="modal-title">{{result.isCorrect ? 'Correct!' : 'Incorrect!'}}</h4>
</div>
</div>
</div>
<div class="pb-0 p-1 mx-auto result-modal__score">
Score: {{result.score}}
</div>
</div>
<div class="modal-footer" [ngClass]="(result.isCorrect ? 'result-modal--correct' : 'result-modal--incorrect')">
<button type="button" class="btn btn-outline-dark" (click)="close()">{{closeButtonText}}</button>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,8 @@
width: 175px;
border-radius: 20px;
}

&__score {
text-decoration: underline;
}
}
4 changes: 2 additions & 2 deletions src/app/components/play/play.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@ <h2>Specific Artist Only</h2>
<div class="play-container__row">
<div class="play-container__row__left-section">
<span>#</span>
<span class="quiz__index">{{ quizIndex + 1 }}</span>
<span class="quiz__index">{{ quizIndex + 1 }}/5</span>
</div>
<div class="play-container__row__right-section">
<span class="quiz__timer">{{quizSettings.timer}}</span>
<span class="quiz__timer">{{timeLeft}}</span>
</div>
</div>
<div class="play-container__row play-container__row__audio-row audio__wave audio__controls">
Expand Down
67 changes: 52 additions & 15 deletions src/app/components/play/play.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Component, ElementRef, HostListener, NgZone, OnInit, ViewChild, Writabl
import { Artist, TopArtistsByTrack, Track, UserTopItems, UserTopTracks } from '../../_shared/models/user-top-items-response.model';
import { SpotifyService } from '../../_shared/services/spotify.service';
import { UserService } from '../../_shared/services/user.service';
import { concatMap, finalize } from 'rxjs';
import { Observable, concatMap, finalize, map, takeWhile, timer } from 'rxjs';
import { CommonModule } from '@angular/common';
import { NgSelectModule } from '@ng-select/ng-select';
import { FormsModule } from '@angular/forms';
Expand Down Expand Up @@ -30,6 +30,7 @@ export class PlayComponent implements OnInit {
isFocused: boolean = false;
isHardMode: boolean = false;
isTrackPlaying: boolean = false;
isTimerStarted: boolean = false;

topTracksMap: Map<string, Track> = new Map<string, Track>();
topArtistsByTrackMap: Map<string, TopArtistsByTrack> = new Map<string, TopArtistsByTrack>();
Expand All @@ -49,6 +50,8 @@ export class PlayComponent implements OnInit {

hoverIndex: number = -1;

timerInterval: any; // for the setInterval
timeLeft: number = 0.0;
volume: number = 0.3;

hasFilteredTracksSignal: WritableSignal<boolean> = signal(false);
Expand Down Expand Up @@ -136,6 +139,7 @@ export class PlayComponent implements OnInit {
this.getQuizSongs();
this.quizIndex = 0;
this.isPlaying = true;
this.startTimer();
}

getQuizSongs(): void {
Expand Down Expand Up @@ -171,29 +175,39 @@ export class PlayComponent implements OnInit {
this.filter = `${this.filteredTracks[index].name} - ${this.filteredTracks[index].artists[0].name}`;
}

submitAnswer(): void {
this.isTrackPlaying = false;
const selectedAnswerStrId: string = this.spotifyService.buildTrackIdentifier(this.selectedAnswer!.name, this.spotifyService.artistsToStr(this.selectedAnswer!.artists));
const quizAnswerStrId: string = this.spotifyService.buildTrackIdentifier(this.quizSongs[this.quizIndex]!.name, this.spotifyService.artistsToStr(this.quizSongs[this.quizIndex]!.artists));

submitAnswer(isTimeRanOut: boolean = false): void {
let modalRef: NgbModalRef;
this.isTrackPlaying = false;
this.isTimerStarted = false;
clearInterval(this.timerInterval);

if (this.quizIndex === 4)
modalRef = this.modalService.open(QuizAnswerModal, { backdrop: 'static', keyboard: false});
else
modalRef = this.modalService.open(QuizAnswerModal);

if (selectedAnswerStrId === quizAnswerStrId) {
this.quizScore++;
(modalRef.componentInstance.result as QuizResult) = { isCorrect: true, isLastQuestion: (this.quizIndex === 4), score: this.quizScore, track: this.quizSongs[this.quizIndex]!};
} else {
if (isTimeRanOut) {
modalRef = this.modalService.open(QuizAnswerModal);
(modalRef.componentInstance.result as QuizResult) = { isCorrect: false, isLastQuestion: (this.quizIndex === 4), score: this.quizScore, track: this.quizSongs[this.quizIndex]!};
} else {
const selectedAnswerStrId: string = this.spotifyService.buildTrackIdentifier(this.selectedAnswer!.name, this.spotifyService.artistsToStr(this.selectedAnswer!.artists));
const quizAnswerStrId: string = this.spotifyService.buildTrackIdentifier(this.quizSongs[this.quizIndex]!.name, this.spotifyService.artistsToStr(this.quizSongs[this.quizIndex]!.artists));

if (this.quizIndex === 4)
modalRef = this.modalService.open(QuizAnswerModal, { backdrop: 'static', keyboard: false});
else
modalRef = this.modalService.open(QuizAnswerModal);

if (selectedAnswerStrId === quizAnswerStrId) {
this.quizScore++;
(modalRef.componentInstance.result as QuizResult) = { isCorrect: true, isLastQuestion: (this.quizIndex === 4), score: this.quizScore, track: this.quizSongs[this.quizIndex]!};
} else {
(modalRef.componentInstance.result as QuizResult) = { isCorrect: false, isLastQuestion: (this.quizIndex === 4), score: this.quizScore, track: this.quizSongs[this.quizIndex]!};
}
}

modalRef.closed.subscribe(() => {
this.selectedAnswer = null;
this.filter = null;
this.quizIndex++;

if (this.quizSongs[this.quizIndex])
this.startTimer();
});

modalRef.dismissed.subscribe(() => {
Expand Down Expand Up @@ -354,4 +368,27 @@ export class PlayComponent implements OnInit {
}
}, 100);
}

startTimer(): void {
console.log('start timer');
this.timeLeft = JSON.parse(JSON.stringify(this.quizSettings.timer));

if (!this.isTimerStarted) {
console.log('in if');
setTimeout(() => {
console.log('timeout');
this.isTimerStarted = true;

this.timerInterval = setInterval(() => {
console.log('interval');
if (this.isTimerStarted && this.timeLeft > 0.0)
this.timeLeft--;
else if (this.isTimerStarted && this.timeLeft <= 0) {
clearInterval(this.timerInterval);
this.submitAnswer(true);
}
}, 1000);
}, 500);
}
}
}