MycroftAI
/
selene-backend
mirror of https://github.com/MycroftAI/selene-backend.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

moved the skill summary search bar inside of the skill summary component because it is the only place it is used.

pull/9/head
Chris Veilleux 2018-10-22 21:42:28 -05:00
parent 39244314a9
commit 8f55e4e2c2
3 changed files with 6 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
market/frontend/v1/market-ui/src/app/skills/skill-toolbar/skill-toolbar.component.html → market/frontend/v1/market-ui/src/app/skills/skill-summary/skill-search/skill-search.component.html
View File

@ -7,18 +7,6 @@
</button>
</mat-form-field>
</div>
<!-- commenting out the language picker until such time as there are -->
<!-- languages to pick -->
<!--<mat-form-field class="language-field" fxFlex="20">-->
<!--<mat-select placeholder="Language" [(ngModel)]="selectedLanguage">-->
<!--<mat-option *ngFor="let language of languages" [value]="language.value">-->
<!--{{language.display}}-->
<!--</mat-option>-->
<!--</mat-select>-->
<!--</mat-form-field>-->
</div>
<div *ngIf="showBackButton">
<button mat-icon-button class="back-button" (click)="clearSearch()">

8
market/frontend/v1/market-ui/src/app/skills/skill-toolbar/skill-toolbar.component.scss → market/frontend/v1/market-ui/src/app/skills/skill-summary/skill-search/skill-search.component.scss
View File

@ -1,10 +1,4 @@
@import '../../../stylesheets/global';
.back-button {
color: $mycroft-dark-grey;
margin-left: 20px;
width: 100px;
}
@import '../../../../stylesheets/global';
fa-icon {
color: $mycroft-dark-grey;

15
market/frontend/v1/market-ui/src/app/skills/skill-toolbar/skill-toolbar.component.ts → market/frontend/v1/market-ui/src/app/skills/skill-summary/skill-search/skill-search.component.ts
View File

@ -3,22 +3,18 @@ import { Component, EventEmitter, OnInit, OnDestroy, Output } from '@angular/cor
import { Subscription } from "rxjs/internal/Subscription";
import { faArrowLeft, faSearch } from '@fortawesome/free-solid-svg-icons';
import { SkillsService } from "../skills.service";
import { SkillsService } from "../../skills.service";
@Component({
selector: 'market-skill-toolbar',
templateUrl: './skill-toolbar.component.html',
styleUrls: ['./skill-toolbar.component.scss']
selector: 'market-skill-search',
templateUrl: './skill-search.component.html',
styleUrls: ['./skill-search.component.scss']
})
export class SkillToolbarComponent implements OnInit, OnDestroy {
export class SkillSearchComponent implements OnInit, OnDestroy {
public backArrow = faArrowLeft;
public languages = [
{value: 'english', display: 'English'}
];
public searchIcon = faSearch;
@Output() public searchResults = new EventEmitter();
public searchTerm: string;
public selectedLanguage = this.languages[0].value;
public skillsAreFiltered: Subscription;
public showBackButton: boolean = false;
@ -43,7 +39,6 @@ export class SkillToolbarComponent implements OnInit, OnDestroy {
this.skillsService.searchSkills(this.searchTerm).subscribe(
(skills) => {
this.searchResults.emit(skills);
console.log(this.skillsAreFiltered);
}
);
}