Merge pull request #28 from xpquiz/develop

v1.1.0

Author: isahann

angular.json

@@ -23,6 +23,9 @@
             "polyfills": [
               "zone.js"
             ],
+            "allowedCommonJsDependencies": [
+              "crypto-js"
+            ],
             "tsConfig": "tsconfig.app.json",
             "inlineStyleLanguage": "sass",
             "assets": [

package-lock.json

@@ -21,6 +21,7 @@
     "@types/crypto-js": "^4.1.1",
     "angular-cli-ghpages": "^1.0.6",
     "crypto-js": "^4.1.1",
+    "moment": "^2.29.4",
     "rxjs": "~7.8.0",
     "tslib": "^2.3.0",
     "xp.css": "^0.2.6",

package.json

@@ -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>
@@ -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>

src/app/about-window/about-window.component.html

@@ -31,11 +31,11 @@ const routes: Routes = [
       component: QuestionWindowComponent,
     },
     {
-      path: PathsEnum.CORRECT_ANSWER,
+      path: `${PathsEnum.CORRECT_ANSWER}/:points`,
       component: CorrectAnswerWindowComponent,
     },
     {
-      path: PathsEnum.WRONG_ANSWER,
+      path: `${PathsEnum.WRONG_ANSWER}/:answer`,
       component: WrongAnswerWindowComponent
     }
   ]

src/app/app-routing.module.ts

@@ -13,6 +13,7 @@ import {ScoreWindowComponent} from './score-window/score-window.component';
 import { CorrectAnswerWindowComponent } from './correct-answer-window/correct-answer-window.component';
 import { WrongAnswerWindowComponent } from './wrong-answer-window/wrong-answer-window.component';
 import { AboutWindowComponent } from './about-window/about-window.component';
+import {CopyClipboardDirective} from "./directives/CopyClipboardDirective";
 
 @NgModule({
   declarations: [
@@ -25,6 +26,7 @@ import { AboutWindowComponent } from './about-window/about-window.component';
     CorrectAnswerWindowComponent,
     WrongAnswerWindowComponent,
     AboutWindowComponent,
+    CopyClipboardDirective
   ],
     imports: [
         BrowserModule,

src/app/app.module.ts

@@ -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>

src/app/common/icon-button/icon-button.component.html

@@ -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>

src/app/common/window-title-bar/window-title-bar.component.html

@@ -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>

src/app/correct-answer-window/correct-answer-window.component.html

@@ -13,5 +13,4 @@
 
     label
       text-align: center
-
-
+      margin: 5px