diff --git a/src/app/app.component.css b/src/app/app.component.css index 52e7af8520..3eeee0a30e 100644 --- a/src/app/app.component.css +++ b/src/app/app.component.css @@ -2,4 +2,21 @@ display: flex; padding: 10px; justify-content: space-evenly; +} +h1 { + color: rgb(185, 135, 6); + font-family: 'Courier New', Courier, monospace; +} +h3 { + color: rgb(88, 67, 12); + font-size: 22px; + font-family: 'Courier New', Courier, monospace; +} +li,p { + font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif; + font-size: 15px; +} +button { + font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif; + font-size: 12px; } \ No newline at end of file diff --git a/src/app/crew/crew.component.css b/src/app/crew/crew.component.css index acfd7eb7f0..c376c5d270 100644 --- a/src/app/crew/crew.component.css +++ b/src/app/crew/crew.component.css @@ -18,5 +18,7 @@ img { h3 { text-align: center; } - +.selected { + color: teal; +} /* Add a 'selected' class here to style selected astronaut names a different color. */ \ No newline at end of file diff --git a/src/app/crew/crew.component.html b/src/app/crew/crew.component.html index 6eaaeaf78a..ecdf8c82c5 100644 --- a/src/app/crew/crew.component.html +++ b/src/app/crew/crew.component.html @@ -1,14 +1,19 @@

Candidates


-

Crew

+

Crew Full

    -
  1. {{astronaut.name}}
  2. +
  3. + {{astronaut.name}}
- -
+ + \ No newline at end of file diff --git a/src/app/crew/crew.component.ts b/src/app/crew/crew.component.ts index 7d7fbbb02c..2686c896c6 100644 --- a/src/app/crew/crew.component.ts +++ b/src/app/crew/crew.component.ts @@ -3,7 +3,7 @@ import { Component, OnInit } from '@angular/core'; @Component({ selector: 'app-crew', templateUrl: './crew.component.html', - styleUrls: ['./crew.component.css'] + styleUrls: ['./crew.component.css', '../app.component.css'] }) export class CrewComponent implements OnInit { @@ -24,6 +24,11 @@ export class CrewComponent implements OnInit { ngOnInit() { } - // Code the 'addCrewMember' function here: + addCrewMember(member){ + if(!this.crew.includes(member)&&this.crew.length<3){ + this.crew.push(member); + } + + } } diff --git a/src/app/equipment/equipment.component.css b/src/app/equipment/equipment.component.css index 9ac48af6ab..5ec2548100 100644 --- a/src/app/equipment/equipment.component.css +++ b/src/app/equipment/equipment.component.css @@ -6,13 +6,20 @@ button { margin: 2px; cursor: pointer; + } h3 { text-align: center; } - +.active { + background-color: gold; +} /* Add an 'active' class to style the background of the 'Add to Cargo Hold' buttons. */ +.nearMaxMass { + color:red; + font-style: italic; + font-weight: bold; +} - -/* Add the 'nearMaxMass' class style here: */ +/* Add the 'nearMaxMass' class style here: */ \ No newline at end of file diff --git a/src/app/equipment/equipment.component.html b/src/app/equipment/equipment.component.html index e6d5240db8..7f7d5006e7 100644 --- a/src/app/equipment/equipment.component.html +++ b/src/app/equipment/equipment.component.html @@ -2,8 +2,9 @@

Equipment

  1. - + {{item.name}}, {{item.mass}} kg +
@@ -13,10 +14,13 @@

Equipment

Cargo Hold: {{cargoHold.length}}/{{maxItems}} Spots Filled

    -
  1. {{equipment.name}}
  2. +
  3. {{equipment.name}} + +

Mass in Hold: {{cargoMass}} kg

-

Mass Budget Remaining: {{}} kg

- +

Mass Budget Remaining: {{maximumAllowedMass - cargoMass}} kg

+
+ diff --git a/src/app/equipment/equipment.component.ts b/src/app/equipment/equipment.component.ts index 1aa172d773..7ade110968 100644 --- a/src/app/equipment/equipment.component.ts +++ b/src/app/equipment/equipment.component.ts @@ -3,7 +3,8 @@ import { Component, OnInit } from '@angular/core'; @Component({ selector: 'app-equipment', templateUrl: './equipment.component.html', - styleUrls: ['./equipment.component.css'] + styleUrls: ['./equipment.component.css','../app.component.css'] + }) export class EquipmentComponent implements OnInit { equipmentItems: object[] = [ @@ -21,11 +22,36 @@ export class EquipmentComponent implements OnInit { cargoMass: number = 0; maximumAllowedMass: number = 2000; maxItems: number = 10; + buttonDisabled: boolean = false; + active: boolean = true; + nearCapacity: boolean = false; + constructor() { } ngOnInit() { } // Code your addItem function here: - + addItem(item){ + if(this.cargoHold.length=1800){ + this.nearCapacity = true; + } + } + else if(this.cargoHold.length>this.maxItems-1){ + this.buttonDisabled = true; + alert(`Cargo Hold full`); + } + } + emptyHold(){ + this.cargoHold = []; + this.cargoMass = 0; + } + removeItem(equipment){ + let index = this.cargoHold.indexOf(equipment); + this.cargoHold.splice(index, 1); + } + } diff --git a/src/app/experiments/experiments.component.html b/src/app/experiments/experiments.component.html index cd894b1902..2b509cd8c5 100644 --- a/src/app/experiments/experiments.component.html +++ b/src/app/experiments/experiments.component.html @@ -1,7 +1,18 @@

Possible Experiments


+
+

Mission Experiments:

+
    +
  1. {{expAdded}} + +
  2. + +
+ \ No newline at end of file diff --git a/src/app/experiments/experiments.component.ts b/src/app/experiments/experiments.component.ts index b4df9023cf..87e5195283 100644 --- a/src/app/experiments/experiments.component.ts +++ b/src/app/experiments/experiments.component.ts @@ -3,13 +3,21 @@ import { Component, OnInit } from '@angular/core'; @Component({ selector: 'app-experiments', templateUrl: './experiments.component.html', - styleUrls: ['./experiments.component.css'] + styleUrls: ['./experiments.component.css', '../app.component.css'] }) export class ExperimentsComponent implements OnInit { experiments: string[] = ['Moon soil sample', 'Plant growth in orbit', 'Human bone density changes', 'Water droplet podcast for grades K-5', 'Satellite launch']; - + added: string[] =[]; constructor() { } ngOnInit() { } - +addExperiment(experiment){ + if(this.added.length<3){ + this.added.push(experiment); + } + } + removeExperiment(expAdded){ + let index = this.added.indexOf(expAdded); + this.added.splice(index, 1); + } } diff --git a/src/app/header/header.component.ts b/src/app/header/header.component.ts index 57ba169ddc..248e287f9e 100644 --- a/src/app/header/header.component.ts +++ b/src/app/header/header.component.ts @@ -3,7 +3,7 @@ import { Component, OnInit } from '@angular/core'; @Component({ selector: 'app-header', templateUrl: './header.component.html', - styleUrls: ['./header.component.css'] + styleUrls: ['./header.component.css', '../app.component.css'] }) export class HeaderComponent implements OnInit {