Skip to content
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
4 changes: 2 additions & 2 deletions src/app/about-window/about-window.component.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class="window">
<app-window-title-bar iconPath="assets/icons/about.png" title="About XPQuiz"></app-window-title-bar>
<app-window-title-bar iconPath="about.png" title="About XPQuiz"></app-window-title-bar>
<div class="window-body">
<label><b>XPQuiz</b>&nbsp;- Version 1.0.1</label>
<label class="main">Created by&nbsp;<b><a href="https://isahann.github.io">Isahann Hanacleto</a></b></label>
Expand All @@ -13,7 +13,7 @@
href="https://www.deviantart.com/marchmountain/art/Windows-XP-High-Resolution-Icon-Pack-916042853">marchmountain
at DeviantArt</a></b></label>

<app-icon-button iconPath="assets/icons/home.png" title="Return to home"
<app-icon-button iconPath="home.png" title="Return to home"
(onButtonClick)="this.returnHome()"></app-icon-button>
</div>
</div>
2 changes: 1 addition & 1 deletion src/app/common/icon-button/icon-button.component.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<button [disabled]="this.disabled" (click)="this.onClick()">
<img
[ngSrc]="this.iconPath" [ngClass]="this.disabled ? 'disabled' : ''"
[ngSrc]="'assets/icons/20x20/' + this.iconPath" [ngClass]="this.disabled ? 'disabled' : ''"
alt="" [height]="this.iconSize" [width]="this.iconSize"/>
{{this.title}}
</button>
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="title-bar">
<div class="title-bar-text">
<img
[ngSrc]="this.iconPath"
[ngSrc]="'assets/icons/15x15/' + this.iconPath"
alt="" [height]="this.iconSize" [width]="this.iconSize" />
{{this.title}}
</div>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<div class="window">
<app-window-title-bar iconPath="assets/icons/success.png" title="You did it!"></app-window-title-bar>
<app-window-title-bar iconPath="success.png" title="You did it!"></app-window-title-bar>
<div class="window-body">
<div class="window-body_title">
<label><b>Congratulations!</b></label>
<label>You earned {{this.questionScore}} points!</label>
<label>Come back in 3 hours for another question!</label>
</div>

<app-icon-button iconPath="assets/icons/home.png" title="Return to home"
<app-icon-button iconPath="home.png" title="Return to home"
(onButtonClick)="this.returnHome()"></app-icon-button>
</div>
</div>
8 changes: 4 additions & 4 deletions src/app/main-window/main-window.component.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class="window">
<app-window-title-bar iconPath="assets/icons/home.png" title="Welcome!"></app-window-title-bar>
<app-window-title-bar iconPath="home.png" title="Welcome!"></app-window-title-bar>
<div class="window-body">
<label>Welcome to &nbsp;<b>XPQuiz</b>!</label>

Expand All @@ -11,12 +11,12 @@
</ng-container>

<div class="window-body_buttons">
<app-icon-button iconPath="assets/icons/quiz.png" title="New quiz"
<app-icon-button iconPath="quiz.png" title="New quiz"
(onButtonClick)="this.redirectTo(PathsEnum.QUIZ)"
[disabled]="!this.quizCanBeAnswered"></app-icon-button>
<app-icon-button iconPath="assets/icons/score.png" title="My score"
<app-icon-button iconPath="score.png" title="My score"
(onButtonClick)="this.redirectTo(PathsEnum.SCORES)"></app-icon-button>
<app-icon-button iconPath="assets/icons/about.png" title="About"
<app-icon-button iconPath="about.png" title="About"
(onButtonClick)="this.redirectTo(PathsEnum.ABOUT)"></app-icon-button>
</div>
</div>
Expand Down
8 changes: 4 additions & 4 deletions src/app/question-window/question-window.component.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="host">
<div class="window window_question">
<app-window-title-bar iconPath="assets/icons/question.png" title="Question!"></app-window-title-bar>
<app-window-title-bar iconPath="question.png" title="Question!"></app-window-title-bar>
<div class="window-body window_question_body">
<ng-container *ngIf="!this.questionLoaded">
<div class="window_question_body_loading">
Expand All @@ -27,7 +27,7 @@

<ng-container *ngIf="this.selectedAnswer">
<div class="window window_check-answer">
<app-window-title-bar iconPath="assets/icons/check-question.png"
<app-window-title-bar iconPath="check-question.png"
title="Check your answer!"></app-window-title-bar>
<div class="window-body window_check-answer_body">
<div class="window_check-answer_body_image">
Expand All @@ -42,9 +42,9 @@
<ng-container *ngIf="!this.confirmedAnswer">
<label class="window_check-answer_body_question_title">Are you sure about that?</label>
<div class="window_check-answer_body_question_buttons">
<app-icon-button iconPath="assets/icons/success.png" title="Yes!"
<app-icon-button iconPath="yes.png" title="Yes!"
(onButtonClick)="this.confirmAnswer()"></app-icon-button>
<app-icon-button iconPath="assets/icons/critical.png" title="No..."
<app-icon-button iconPath="no.png" title="No..."
(onButtonClick)="this.validateAnswer()"></app-icon-button>
</div>
</ng-container>
Expand Down
4 changes: 2 additions & 2 deletions src/app/score-window/score-window.component.html
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<div class="window">
<app-window-title-bar iconPath="assets/icons/score.png" title="Score"></app-window-title-bar>
<app-window-title-bar iconPath="score.png" title="Score"></app-window-title-bar>
<div class="window-body">
<div class="window-body_title">
<label>You currently have &nbsp;<b>[{{this.score}}]</b>&nbsp; points!</label>
</div>

<app-icon-button iconPath="assets/icons/home.png" title="Return to home"
<app-icon-button iconPath="home.png" title="Return to home"
(onButtonClick)="this.returnHome()"></app-icon-button>
</div>
</div>
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<div class="window">
<app-window-title-bar iconPath="assets/icons/critical.png" title="Oh no!"></app-window-title-bar>
<app-window-title-bar iconPath="critical.png" title="Oh no!"></app-window-title-bar>
<div class="window-body">
<div class="window-body_title">
<label>That was not the right answer! The answer was &nbsp;<b>[{{this.correctAnswer}}]</b></label>
<label>Come back in 3 hours for another question!</label>
</div>

<app-icon-button iconPath="assets/icons/home.png" title="Return to home"
<app-icon-button iconPath="home.png" title="Return to home"
(onButtonClick)="this.returnHome()"></app-icon-button>
</div>
</div>
Binary file added src/assets/icons/15x15/about.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/icons/15x15/check-question.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/icons/15x15/critical.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/icons/15x15/home.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/icons/15x15/question.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/icons/15x15/score.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/icons/15x15/success.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/icons/20x20/about.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/icons/20x20/home.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/icons/20x20/no.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/icons/20x20/quiz.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/icons/20x20/score.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/icons/20x20/yes.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed src/assets/icons/about.png
Binary file not shown.
Binary file modified src/assets/icons/alert.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed src/assets/icons/check-question.png
Binary file not shown.
Binary file removed src/assets/icons/critical.png
Binary file not shown.
Binary file removed src/assets/icons/home.png
Binary file not shown.
Binary file modified src/assets/icons/loading.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed src/assets/icons/question.png
Binary file not shown.
Binary file removed src/assets/icons/quiz.png
Binary file not shown.
Binary file removed src/assets/icons/score.png
Binary file not shown.
Binary file removed src/assets/icons/success.png
Binary file not shown.