diff --git a/src-angular/app/app.component.html b/src-angular/app/app.component.html index 171d8a7..f91c458 100644 --- a/src-angular/app/app.component.html +++ b/src-angular/app/app.component.html @@ -1,4 +1,6 @@ -
- - -
+@if (settingsLoaded) { +
+ + +
+} diff --git a/src-angular/app/app.module.ts b/src-angular/app/app.module.ts index 8dcb4fe..e3f7745 100644 --- a/src-angular/app/app.module.ts +++ b/src-angular/app/app.module.ts @@ -16,7 +16,6 @@ import { DownloadsModalComponent } from './components/browse/status-bar/download import { StatusBarComponent } from './components/browse/status-bar/status-bar.component' import { SettingsComponent } from './components/settings/settings.component' import { ToolbarComponent } from './components/toolbar/toolbar.component' -import { CheckboxDirective } from './core/directives/checkbox.directive' import { RemoveStyleTagsPipe } from './core/pipes/remove-style-tags.pipe' @NgModule({ @@ -32,7 +31,6 @@ import { RemoveStyleTagsPipe } from './core/pipes/remove-style-tags.pipe' ChartSidebarMenutComponent, ResultTableRowComponent, DownloadsModalComponent, - CheckboxDirective, RemoveStyleTagsPipe, SettingsComponent, ], diff --git a/src-angular/app/components/browse/chart-sidebar/chart-sidebar-menu/chart-sidebar-menu.component.html b/src-angular/app/components/browse/chart-sidebar/chart-sidebar-menu/chart-sidebar-menu.component.html index 00bc70b..e2d3408 100644 --- a/src-angular/app/components/browse/chart-sidebar/chart-sidebar-menu/chart-sidebar-menu.component.html +++ b/src-angular/app/components/browse/chart-sidebar/chart-sidebar-menu/chart-sidebar-menu.component.html @@ -113,10 +113,11 @@ diff --git a/src-angular/app/components/browse/chart-sidebar/chart-sidebar.component.html b/src-angular/app/components/browse/chart-sidebar/chart-sidebar.component.html index 144e770..f67f7a5 100644 --- a/src-angular/app/components/browse/chart-sidebar/chart-sidebar.component.html +++ b/src-angular/app/components/browse/chart-sidebar/chart-sidebar.component.html @@ -1,134 +1,136 @@ -
-
- @if (albumArtMd5) { - @if (hasIcons && icon) { -
- -
- } - @if (albumLoading) { -
- } - Album art - } -
-
-
-
- - Charter: - {{ selectedChart.charter | removeStyleTags }} -
-
- Length: - {{ effectiveLength }} (+{{ extraLengthSeconds }}s) -
- -
-
-
-
- @if (hasIssues) { -
- -
- @if (metadataIssues.length > 0) { -
Metadata Issues Found:
-
    -
  • {{ getMetadataIssueText(issue) }}
    • -
- } - @if (folderIssues.length > 0) { -
Chart Folder Issues Found:
-
    -
  • {{ getFolderIssueText(issue) }}
    • -
- } - @if (chartIssues.length > 0) { -
Chart Issues Found:
-
    -
  • {{ getChartIssueText(issue) }}
    • -
- } - @for (trackIssues of trackIssuesGroups; track $index) { -
{{ trackIssues.groupName }}
-
    -
  • {{ getTrackIssueText(issue) }}
    • -
- } -
-
- } - @if (selectedChart.modchart) { -
Modchart
- } - @for (pair of boolProperties; track $index) { -

- - {{ pair.text }} -

- } -
-
-
-
-
- @if (selectedChart.notesData.hasVocals) { - - } - @for (instrument of instruments; track $index) { - - } -
-
- @if (instruments.length > 1 || difficulties.length > 1) { -
- @if (instruments.length > 1) { - - } - @if (difficulties.length > 1) { - - } +@if (selectedChart) { +
+
+ @if (albumArtMd5) { + @if (hasIcons && icon) { +
+
} -

Average NPS: {{ averageNps || 'N/A' }}

-

Maximum NPS: {{ maximumNps }}

-

Note Count: {{ noteCount }}

+ @if (albumLoading) { +
+ } + Album art + } +
+
+
+ +
+ Length: + {{ effectiveLength }} (+{{ extraLengthSeconds }}s) +
+ +
+
+
+
+ @if (hasIssues) { +
+ +
+ @if (metadataIssues.length > 0) { +
Metadata Issues Found:
+
    +
  • {{ getMetadataIssueText(issue) }}
    • +
+ } + @if (folderIssues.length > 0) { +
Chart Folder Issues Found:
+
    +
  • {{ getFolderIssueText(issue) }}
    • +
+ } + @if (chartIssues.length > 0) { +
Chart Issues Found:
+
    +
  • {{ getChartIssueText(issue) }}
    • +
+ } + @for (trackIssues of trackIssuesGroups; track $index) { +
{{ trackIssues.groupName }}
+
    +
  • {{ getTrackIssueText(issue) }}
    • +
+ } +
+
+ } + @if (selectedChart.modchart) { +
Modchart
+ } + @for (pair of boolProperties; track $index) { +

+ + {{ pair.text }} +

+ } +
+
+
+
+
+ @if (selectedChart.notesData.hasVocals) { + + } + @for (instrument of instruments; track $index) { + + } +
+
+ @if (instruments.length > 1 || difficulties.length > 1) { +
+ @if (instruments.length > 1) { + + } + @if (difficulties.length > 1) { + + } +
+ } +

Average NPS: {{ averageNps || 'N/A' }}

+

Maximum NPS: {{ maximumNps }}

+

Note Count: {{ noteCount }}

+
+
+
+
+ +
+ +
-
- -
- - -
-
-
+} diff --git a/src-angular/app/components/browse/result-table/result-table.component.ts b/src-angular/app/components/browse/result-table/result-table.component.ts index 50ebd92..02348c3 100644 --- a/src-angular/app/components/browse/result-table/result-table.component.ts +++ b/src-angular/app/components/browse/result-table/result-table.component.ts @@ -1,10 +1,9 @@ -import { Component, EventEmitter, HostBinding, OnInit, Output, QueryList, ViewChild, ViewChildren } from '@angular/core' +import { Component, EventEmitter, HostBinding, OnInit, Output, QueryList, ViewChildren } from '@angular/core' import { sortBy } from 'lodash' import { SettingsService } from 'src-angular/app/core/services/settings.service' import { ChartData } from 'src-shared/interfaces/search.interface' -import { CheckboxDirective } from '../../../core/directives/checkbox.directive' import { SearchService } from '../../../core/services/search.service' import { SelectionService } from '../../../core/services/selection.service' import { ResultTableRowComponent } from './result-table-row/result-table-row.component' @@ -18,7 +17,6 @@ export class ResultTableComponent implements OnInit { @Output() rowClicked = new EventEmitter() - @ViewChild(CheckboxDirective, { static: true }) checkboxColumn: CheckboxDirective @ViewChildren('tableRow') tableRows: QueryList activeSong: ChartData[] | null = null diff --git a/src-angular/app/components/browse/status-bar/downloads-modal/downloads-modal.component.html b/src-angular/app/components/browse/status-bar/downloads-modal/downloads-modal.component.html index b38660b..9a8012e 100644 --- a/src-angular/app/components/browse/status-bar/downloads-modal/downloads-modal.component.html +++ b/src-angular/app/components/browse/status-bar/downloads-modal/downloads-modal.component.html @@ -1,6 +1,6 @@
+ class="flex flex-col gap-2 p-1 overflow-y-auto max-h-[75vh] scrollbar scrollbar-w-2 scrollbar-h-2 scrollbar-thumb-neutral scrollbar-thumb-rounded-full"> @for (download of downloadService.downloads; track download.md5) {
-
- - -
-
- - - -
-
}
diff --git a/src-angular/app/components/settings/settings.component.html b/src-angular/app/components/settings/settings.component.html index 155206c..b29d1b0 100644 --- a/src-angular/app/components/settings/settings.component.html +++ b/src-angular/app/components/settings/settings.component.html @@ -10,9 +10,9 @@ readonly type="text" placeholder="No directory selected!" /> - + @if (settingsService.libraryDirectory !== undefined) { + + }
diff --git a/src-angular/app/core/directives/checkbox.directive.ts b/src-angular/app/core/directives/checkbox.directive.ts deleted file mode 100644 index f971523..0000000 --- a/src-angular/app/core/directives/checkbox.directive.ts +++ /dev/null @@ -1,39 +0,0 @@ -import { Directive, ElementRef, EventEmitter, Output } from '@angular/core' - -@Directive({ - selector: '[appCheckbox]', -}) -export class CheckboxDirective { - @Output() checked = new EventEmitter() - - _isChecked = false - - constructor(private checkbox: ElementRef) { } - - // ngAfterViewInit() { - // TODO - // $(this.checkbox.nativeElement).checkbox({ - // onChecked: () => { - // this.checked.emit(true) - // this._isChecked = true - // }, - // onUnchecked: () => { - // this.checked.emit(false) - // this._isChecked = false - // }, - // }) - // } - - check(isChecked: boolean) { - this._isChecked = isChecked - if (isChecked) { - this.checkbox.nativeElement.checked = true - } else { - this.checkbox.nativeElement.checked = false - } - } - - get isChecked() { - return this._isChecked - } -}