Merge pull request #111 from annamar26/dev

Deploy final

blackrock/.firebase/hosting.ZGlzdC9ibGFja3JvY2s.cache

@@ -1,33 +1,33 @@
-3rdpartylicenses.txt,1643082397223,0881bc529969b7b192fabdcb5d27710ae961ac3e46b656ccdabc68b2fb7f1d51
-735.d6cd728f851a79bc.js,1643082397223,10e5fffde1d0694b32b9c8114cbac69ec40aa62561561486c22c76f430b2436a
-favicon.ico,1643082402582,a2aee5309d0b59b9b66384ccc3969a07fab1b320d0bf76f1b25047a051d7f774
-index.html,1643082403599,3524a3ab7805d66c0ac2226a5f13515353355919332c971de3dd1ab197ee057c
-runtime.391bca1e7370da67.js,1643082397223,96a109997cb54e80b42c95362a1db07df5e6c38102a99a2b97fec6f32ea52cdd
-polyfills.3df89b6700ffa81a.js,1643082397223,7b67e6bdd56740490b21df520b5f7a8410e85bf68678f16623ac033726b2fba9
-assets/blackrock-logo-nav.svg,1643082402603,e6a0c2e72afb351067e7f7100cfef84ccc6fe5e9f5ad01670c0e397dd65c2ee4
-assets/draganddrop_sound.mp3,1643082402610,de7d8c01e30e2c05c252f18e4042e3efeab2479f95c4949f96ece613c6019a03
-assets/Coins_Two Color.png,1643082402609,1a0e12b8670a6ddc5db46c0b123677b720ee643bd18da7fac24b0e3087be8fbd
-assets/Piggy bank_Outline.png,1643082402688,cd014a7353a5fe71edab7fb0c1965174ef446a0de17b207358b3a4f1c347ad04
-assets/Progress _Two Color.png,1643082402689,0d2de721c0a13d6a09a1fad3dfd4d118cdf6634c85f4475b6df8d75723e6cdaa
-styles.cb67fe35143c02fb.css,1643082397224,f11099a89c707be2f752954a7fdf9acafad0dd4a4b2463a87639436be57eff5a
-assets/jedibaby_1.jpg,1643082402648,6ca48cd6fed8abbbe482f5b0571ba501d5d6260f645eea4d69e6df9fd0e5488e
-assets/ukUQGo3a_400x400.jpeg,1643082402695,cebb72b126868ae95d6c1f0476c79d7c1790884acf39ee667213ed2dbc45b539
-799.9a6ae9149b9fab37.js,1643082397223,8c947344e4d52134157b79a9bc1228905ec5c0ccfc2258f66675cf9a5ed3de7c
-assets/soundeffect_.mp3,1643082402693,e12d220936f814b9d9e15c75f8c67262194625c886092dd23e1b7d4011602423
-489.0d21e48e0fb35a06.js,1643082397223,4e500e8f9409a5b96bc4ce4f010790312e0bb853a6a58c47bb7af510348de52a
-assets/inversion033.jpg,1643082402642,fefbc66f63eaeffba4d4dbc53ee3970a2701ef2920581eac091407496c32bd91
-159.2b98bb5687f562e5.js,1643082397223,4942ef9b08f41f70c9a235e3e29fc3ea99bc6eed9de120b8eff2316805416d65
-bg-yoda.322eea25d4a9e50a.jpg,1643082397222,dc7d62ac68c3a6c29a0e67805b73b9ee11221beedbb7ef2431559c0f67b69b4e
-assets/bg-yoda.jpg,1643082402602,dc7d62ac68c3a6c29a0e67805b73b9ee11221beedbb7ef2431559c0f67b69b4e
-assets/invertir.jpg,1643082402646,83b4cc2e2c11f4085c8f399946c1da372bdd0e19e7b7e7ca770a43325f0c5acc
-assets/yoda_5.jpg,1643082402702,9c903ae34f086286d090f2e526ab441f1f1c6b3df908012e287557e8b3107ab8
-assets/ahorrar.jpg,1643082402599,4f68093cc8d032f30be8d2e11f44a35363b05b4772a249be03cc53de46ce41ff
-assets/cards_courses.jpg,1643082402607,6a332efec851056cafaa722d08b54ddd23957994f04e6103439752fbaa3cf456
-assets/fm_courses.jpg,1643082402614,84bac0447772e9aab7e892b1a7f87dcca7eed5de0a1cbb08580a15b8b38f4eb4
-assets/yoda_1.jpg,1643082402699,9bbc87dce6c0eb4e758031cad3242e1a161b245a81d7ce9ebc8ffa854d8917ac
-assets/mace_windu_4.jpg,1643082402655,32b0f70a90970f99a55e700c31553df0bd86839ccaadd4dca4255f0c1846c74a
-assets/image.png,1643082402637,4ca7ccbc3c6dfc54cecd222bf352b7e26a217fc6b25ea126c92ca39105a4c6e0
-assets/obi-results.png,1643082402667,aa1e0099f0d7dfd3bb8a105bebefd50d30a206caa57e675620625562e1c40584
-assets/green_courses.png,1643082402626,a1d0e571da41310c8cc5c600683d4406f954c8531f70941dbedab4c27d1d792c
-main.e48cb8da09151a21.js,1643082397222,311899b950eb48baa85151df2f8a1968c43c71dd13070947d716aa27c8801b91
-assets/padawan_2.png,1643082402684,ecda270894a2a1c92fc4d43d0a43266e6b4cd1a5bf05e16fd10d54156276d448
+735.d6cd728f851a79bc.js,1643115527013,10e5fffde1d0694b32b9c8114cbac69ec40aa62561561486c22c76f430b2436a
+3rdpartylicenses.txt,1643115527014,4ed71dee14a4e027d003caa3396538d44e868475425814522c80d0ecda009486
+favicon.ico,1643115534455,a2aee5309d0b59b9b66384ccc3969a07fab1b320d0bf76f1b25047a051d7f774
+runtime.391bca1e7370da67.js,1643115527013,96a109997cb54e80b42c95362a1db07df5e6c38102a99a2b97fec6f32ea52cdd
+polyfills.3df89b6700ffa81a.js,1643115527014,7b67e6bdd56740490b21df520b5f7a8410e85bf68678f16623ac033726b2fba9
+index.html,1643115535612,4c046c634fe016af843c9b39706bad007bcf425daa6aad7f586728f125b157c9
+assets/blackrock-logo-nav.svg,1643115534519,e6a0c2e72afb351067e7f7100cfef84ccc6fe5e9f5ad01670c0e397dd65c2ee4
+assets/draganddrop_sound.mp3,1643115534527,de7d8c01e30e2c05c252f18e4042e3efeab2479f95c4949f96ece613c6019a03
+assets/Coins_Two Color.png,1643115534526,1a0e12b8670a6ddc5db46c0b123677b720ee643bd18da7fac24b0e3087be8fbd
+assets/Piggy bank_Outline.png,1643115534606,cd014a7353a5fe71edab7fb0c1965174ef446a0de17b207358b3a4f1c347ad04
+styles.cb67fe35143c02fb.css,1643115527013,f11099a89c707be2f752954a7fdf9acafad0dd4a4b2463a87639436be57eff5a
+assets/Progress _Two Color.png,1643115534607,0d2de721c0a13d6a09a1fad3dfd4d118cdf6634c85f4475b6df8d75723e6cdaa
+assets/jedibaby_1.jpg,1643115534565,6ca48cd6fed8abbbe482f5b0571ba501d5d6260f645eea4d69e6df9fd0e5488e
+assets/ukUQGo3a_400x400.jpeg,1643115534613,cebb72b126868ae95d6c1f0476c79d7c1790884acf39ee667213ed2dbc45b539
+799.9a6ae9149b9fab37.js,1643115527013,8c947344e4d52134157b79a9bc1228905ec5c0ccfc2258f66675cf9a5ed3de7c
+assets/soundeffect_.mp3,1643115534611,e12d220936f814b9d9e15c75f8c67262194625c886092dd23e1b7d4011602423
+489.0d21e48e0fb35a06.js,1643115527013,4e500e8f9409a5b96bc4ce4f010790312e0bb853a6a58c47bb7af510348de52a
+assets/inversion033.jpg,1643115534560,fefbc66f63eaeffba4d4dbc53ee3970a2701ef2920581eac091407496c32bd91
+159.2b98bb5687f562e5.js,1643115527013,4942ef9b08f41f70c9a235e3e29fc3ea99bc6eed9de120b8eff2316805416d65
+bg-yoda.322eea25d4a9e50a.jpg,1643115527013,dc7d62ac68c3a6c29a0e67805b73b9ee11221beedbb7ef2431559c0f67b69b4e
+assets/bg-yoda.jpg,1643115534518,dc7d62ac68c3a6c29a0e67805b73b9ee11221beedbb7ef2431559c0f67b69b4e
+assets/invertir.jpg,1643115534563,83b4cc2e2c11f4085c8f399946c1da372bdd0e19e7b7e7ca770a43325f0c5acc
+assets/yoda_5.jpg,1643115534620,9c903ae34f086286d090f2e526ab441f1f1c6b3df908012e287557e8b3107ab8
+assets/ahorrar.jpg,1643115534515,4f68093cc8d032f30be8d2e11f44a35363b05b4772a249be03cc53de46ce41ff
+assets/cards_courses.jpg,1643115534524,6a332efec851056cafaa722d08b54ddd23957994f04e6103439752fbaa3cf456
+assets/yoda_1.jpg,1643115534617,9bbc87dce6c0eb4e758031cad3242e1a161b245a81d7ce9ebc8ffa854d8917ac
+assets/fm_courses.jpg,1643115534532,84bac0447772e9aab7e892b1a7f87dcca7eed5de0a1cbb08580a15b8b38f4eb4
+assets/mace_windu_4.jpg,1643115534572,32b0f70a90970f99a55e700c31553df0bd86839ccaadd4dca4255f0c1846c74a
+assets/image.png,1643115534555,4ca7ccbc3c6dfc54cecd222bf352b7e26a217fc6b25ea126c92ca39105a4c6e0
+assets/obi-results.png,1643115534584,aa1e0099f0d7dfd3bb8a105bebefd50d30a206caa57e675620625562e1c40584
+assets/green_courses.png,1643115534545,a1d0e571da41310c8cc5c600683d4406f954c8531f70941dbedab4c27d1d792c
+main.0d90d8c2a71f7be2.js,1643115527013,4bfb34751a539f80f3dc76866487a49c906cfa5a881362abed46a268098a5f6c
+assets/padawan_2.png,1643115534601,ecda270894a2a1c92fc4d43d0a43266e6b4cd1a5bf05e16fd10d54156276d448

blackrock/src/app/components/chip/chip.component.html

@@ -1,3 +1,3 @@
 <mat-chip-list aria-label="Fish selection">
-    <mat-chip>{{content}}</mat-chip>
- </mat-chip-list>
+  <mat-chip>{{ content }}</mat-chip>
+</mat-chip-list>

blackrock/src/app/components/chip/chip.component.scss

@@ -1,9 +1,7 @@
 mat-chip.mat-standard-chip {
-    background-color:black;
-    color: white;
-     width: 290px;
-    height: 3rem;
-    font-size: 16px;
-
+  background-color: black;
+  color: white;
+  width: 290px;
+  height: 3rem;
+  font-size: 16px;
 }
-

blackrock/src/app/components/chip/chip.component.ts

@@ -3,13 +3,11 @@ import { Component, Input, OnInit } from '@angular/core';
 @Component({
   selector: 'app-chip',
   templateUrl: './chip.component.html',
-  styleUrls: ['./chip.component.scss']
+  styleUrls: ['./chip.component.scss'],
 })
 export class ChipComponent implements OnInit {
-  @Input() content=""
-  constructor() { }
-
-  ngOnInit(): void {
-  }
+  @Input() content = '';
+  constructor() {}
 
+  ngOnInit(): void {}
 }

blackrock/src/app/components/fifth-question/fifth-question.component.html

@@ -2,34 +2,35 @@
   <h1>{{ user }}, ¿por qué quieres aprender sobre finanzas?</h1>
   <section>
     <button
-    id="q1"
+      id="q1"
       (click)="checkVisited($event)"
       value="Quiero tomar las riendas de mi futuro financiero"
     >
-
       Quiero tomar las riendas de mi futuro financiero
     </button>
-    <button id="q2" (click)="checkVisited($event)" value="Quiero comprar una casa">
-
+    <button
+      id="q2"
+      (click)="checkVisited($event)"
+      value="Quiero comprar una casa"
+    >
       Quiero comprar una casa
     </button>
     <button
-    id="q3"
+      id="q3"
       (click)="checkVisited($event)"
       value="Quiero expandir mis conocimientos"
     >
       Quiero expandir mis conocimientos
     </button>
     <button
-    id="q4"
+      id="q4"
       (click)="checkVisited($event)"
       value="Tengo un objetivo en la mente al que quiero llegar"
     >
-
       Tengo un objetivo en la mente al que quiero llegar
     </button>
     <button
-    id="q5"
+      id="q5"
       (click)="checkVisited($event)"
       value="He visto que más y más gente ha comenzado a invertir y no me quiero
 quedar atrás"

blackrock/src/app/components/fifth-question/fifth-question.component.scss

@@ -1,18 +1,17 @@
 @import url("https://fonts.googleapis.com/css2?family=Noto+Sans:wght@400;700&display=swap");
 @import url("https://fonts.googleapis.com/css2?family=Oswald:wght@400&display=swap");
 $yellow: #ffce00;
-$pink: #FC9BB3;
+$pink: #fc9bb3;
 
 div {
   background-color: $pink;
   height: 85%;
-  padding: 83px;
+  padding: 83px 83px 20px;
   h1 {
     margin: 0rem 0rem 2rem 2rem;
     font-weight: bold;
     font-family: "Noto Sans", sans-serif;
     font-size: 36px;
-
   }
   section {
     display: grid;
@@ -75,11 +74,11 @@ div {
     background-color: $pink;
     justify-content: center;
     overflow-y: scroll;
-		padding: 1rem;
+    padding: 1rem;
     h1 {
       margin: 1rem 0rem 2rem 2rem;
       padding-top: 1rem;
-			font-size: 24px;
+      font-size: 24px;
     }
     section {
       display: grid;

blackrock/src/app/components/fifth-question/fifth-question.component.ts

@@ -3,37 +3,33 @@ import { Component, Input, OnInit } from '@angular/core';
 @Component({
   selector: 'app-fifth-question',
   templateUrl: './fifth-question.component.html',
-  styleUrls: ['./fifth-question.component.scss']
+  styleUrls: ['./fifth-question.component.scss'],
 })
 export class FifthQuestionComponent implements OnInit {
-  @Input() userName: string='';
-  resultarray = [sessionStorage.getItem("Score1"), sessionStorage.getItem("Score2"), sessionStorage.getItem("Score3"), sessionStorage.getItem("Score4")]
-	scoremap = this.resultarray.map((x) => parseInt(x!))
-	score = this.scoremap.reduce((a, b) => a + b) 
-
+  @Input() userName: string = '';
+  resultarray = [
+    sessionStorage.getItem('Score1'),
+    sessionStorage.getItem('Score2'),
+    sessionStorage.getItem('Score3'),
+    sessionStorage.getItem('Score4'),
+  ];
+  scoremap = this.resultarray.map((x) => parseInt(x!));
+  score = this.scoremap.reduce((a, b) => a + b);
 
-  user: any
+  user: any;
 
- isVisited = false;
+  isVisited = false;
 
-  constructor() { }
-
-  ngOnInit(){
-    this.user= sessionStorage.getItem('Nombre')
-    console.log(this.scoremap)
-		console.log(this.score)
+  constructor() {}
 
+  ngOnInit() {
+    this.user = sessionStorage.getItem('Nombre');
   }
-
 
   checkVisited(event: any) {
-    const valor = event.target
-     console.log(valor.value)
-     valor.style.filter= "grayscale(0%)";
-     valor.style.transform= "scale(1.1)";
-     sessionStorage.setItem('goal', valor.value)
-
+    const valor = event.target;
+    valor.style.filter = 'grayscale(0%)';
+    valor.style.transform = 'scale(1.1)';
+    sessionStorage.setItem('goal', valor.value);
   }
-
-
 }

blackrock/src/app/components/first-question/first-question.component.html

@@ -1,13 +1,18 @@
 <section class="firstQuestion">
-<h1>  {{user}}, (con ayuda de la fuerza), selecciona todos los temas de los que tengas conocimiento. </h1> 
-
-    <mat-chip-list  class= "optionscontainer" selectable multiple>
-        <mat-chip #c="matChip" *ngFor="let option of options" [value]="option" (click)="toggleSelection(c)" >
-            <mat-icon *ngIf="c.selected">check</mat-icon>
-            {{option}}
-        </mat-chip>
-    </mat-chip-list>
-</section>
-
+  <h1>
+    {{ user }}, (con ayuda de la fuerza), selecciona todos los temas de los que
+    tengas conocimiento.
+  </h1>
 
-
+  <mat-chip-list class="optionscontainer" selectable multiple>
+    <mat-chip
+      #c="matChip"
+      *ngFor="let option of options"
+      [value]="option"
+      (click)="toggleSelection(c)"
+    >
+      <mat-icon *ngIf="c.selected">check</mat-icon>
+      {{ option }}
+    </mat-chip>
+  </mat-chip-list>
+</section>

blackrock/src/app/components/first-question/first-question.component.scss

@@ -59,17 +59,21 @@ $bg-color: #ffce00;
 
     .optionscontainer {
       width: 100%;
-			margin-left: 3rem;
+      margin-left: 3rem;
       display: flex;
       justify-content: center;
       align-items: center;
 
       align-items: center;
     }
-    ::ng-deep .mat-chip-list-wrapper {
-      justify-content: center;
-      margin-bottom: 3rem;
-      margin-right: 5rem;
-    }
   }
+  ::ng-deep .mat-chip-list-wrapper {
+    justify-content: center;
+    margin-bottom: 2rem;
+    margin-right: 4rem;
+  }
+	::ng-deep .mat-chip{
+		font-size: 16px !important;
+		margin: 6px !important;
+	}
 }