myxelium/Bridge-Multi
1
0
Fork 0
mirror of https://github.com/Myxelium/Bridge-Multi.git synced 2026-04-11 14:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added search loading icon

Browse Source
This commit is contained in:
Geomitron
2020-05-26 22:04:48 -04:00
parent 444ff40533
commit 2b5c64d376
4 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/components/browse/search-bar/search-bar.component.html
View File

@@ -1,15 +1,15 @@
<div class="ui bottom attached borderless menu"> <div class="ui bottom attached borderless menu">
<div class="item"> <div class="item">
<!-- TODO: add advanced search --> <!-- TODO: add advanced search -->
<div class="ui icon input"> <div class="ui icon input" [class.loading]="searchService.isLoading()">
<input #searchBox type="text" placeholder=" Search..." (keyup.enter)="onSearch(searchBox.value)"> <input #searchBox type="text" placeholder=" Search..." (keyup.enter)="onSearch(searchBox.value)">
<i class="search icon"></i> <i class="search icon"></i>
</div> </div>
</div> </div>
<div #typeDropdown class="ui item dropdown"> <!-- <div #typeDropdown class="ui item dropdown">
Type <i class="dropdown icon"></i> Type <i class="dropdown icon"></i>
<div class="menu"> <div class="menu">
<!-- TODO: revise what items are displayed --> TODO: revise what items are displayed
<a class="item">Any</a> <a class="item">Any</a>
<a class="item">Name</a> <a class="item">Name</a>
<a class="item">Artist</a> <a class="item">Artist</a>
@@ -18,7 +18,7 @@
<a class="item">Year</a> <a class="item">Year</a>
<a class="item">Charter</a> <a class="item">Charter</a>
</div> </div>
</div> </div> -->
<!-- TODO <div class="item right"> <!-- TODO <div class="item right">
<button class="ui positive disabled button">Bulk Download</button> <button class="ui positive disabled button">Bulk Download</button>
</div> --> </div> -->

2
src/app/components/browse/search-bar/search-bar.component.ts
View File

@@ -8,7 +8,7 @@ import { SearchService } from 'src/app/core/services/search.service'
}) })
export class SearchBarComponent implements AfterViewInit { export class SearchBarComponent implements AfterViewInit {
constructor(private searchService: SearchService) { } constructor(public searchService: SearchService) { }
ngAfterViewInit() { ngAfterViewInit() {
$('.ui.dropdown').dropdown() $('.ui.dropdown').dropdown()

7
src/app/core/services/search.service.ts
View File

@@ -18,8 +18,9 @@ export class SearchService {
constructor(private electronService: ElectronService) { } constructor(private electronService: ElectronService) { }
async newSearch(query: string) { async newSearch(query: string) {
if (this.awaitingResults) { return }
this.awaitingResults = true this.awaitingResults = true
this.currentQuery = { query, type: SearchType.Any, offset: 0, length: 20 + 1 } // TODO: make length a setting this.currentQuery = { query, type: SearchType.Any, offset: 0, length: 50 + 1 } // TODO: make length a setting
this.results = this.trimLastChart(await this.electronService.invoke('song-search', this.currentQuery)) this.results = this.trimLastChart(await this.electronService.invoke('song-search', this.currentQuery))
this.awaitingResults = false this.awaitingResults = false
@@ -27,6 +28,10 @@ export class SearchService {
this.newResultsEmitter.emit(this.results) this.newResultsEmitter.emit(this.results)
} }
isLoading() {
return this.awaitingResults
}
/** /**
* Event emitted when new search results are returned * Event emitted when new search results are returned
* or when more results are added to an existing search. * or when more results are added to an existing search.

2
src/electron/ipc/download/FileTransfer.ts
View File

@@ -82,8 +82,6 @@ export class FileTransfer {
} }
} else { } else {
// TODO: handle other common problems, like chart/audio files not named correctly // TODO: handle other common problems, like chart/audio files not named correctly
// TODO: this could have been a chart pack; have option to only keep selected chart?
// (think about a user trying to download a set of charts in a pack)
} }
} }
} }