diff --git a/src/app/api/client.service.ts b/src/app/api/client.service.ts index 795e757..7f732b9 100644 --- a/src/app/api/client.service.ts +++ b/src/app/api/client.service.ts @@ -151,10 +151,6 @@ export class ClientService extends ApiImplementation { return this.http.get(`/photos/id/${id}`); } - getLevelRelations(id: number) { - return this.http.get(`/levels/id/${id}/relations`); - } - setLevelAsHearted(id: number) { return this.http.post(`/levels/id/${id}/heart`, null); } diff --git a/src/app/api/types/levels/level-relations.ts b/src/app/api/types/levels/level-relations.ts index f13db7f..72a7b1c 100644 --- a/src/app/api/types/levels/level-relations.ts +++ b/src/app/api/types/levels/level-relations.ts @@ -1,5 +1,8 @@ export interface LevelRelations { isHearted: boolean; isQueued: boolean; + levelRating: number; myPlaysCount: number; + completionCount: number; + photoCount: number; } \ No newline at end of file diff --git a/src/app/api/types/levels/level.ts b/src/app/api/types/levels/level.ts index fbd043f..f0b2c3b 100644 --- a/src/app/api/types/levels/level.ts +++ b/src/app/api/types/levels/level.ts @@ -1,4 +1,5 @@ import {User} from "../users/user"; +import { LevelRelations } from "./level-relations"; export interface Level { levelId: number; @@ -22,4 +23,6 @@ export interface Level { hearts: number; totalPlays: number; uniquePlays: number; + + ownRelations: LevelRelations | undefined; } diff --git a/src/app/components/items/level-statistics.component.ts b/src/app/components/items/level-statistics.component.ts index cee7ccb..ebed6dd 100644 --- a/src/app/components/items/level-statistics.component.ts +++ b/src/app/components/items/level-statistics.component.ts @@ -2,7 +2,6 @@ import {Component, Input} from '@angular/core'; import {Level} from "../../api/types/levels/level"; import {faHeart, faPlay, faStar, faThumbsDown, faThumbsUp} from "@fortawesome/free-solid-svg-icons"; import {StatisticComponent} from "../ui/info/statistic.component"; -import { getFormattedDateTime, getShortDateTime } from '../../helpers/date-time'; import { LevelTeamPickStatusComponent } from "./level-team-pick-status.component"; @Component({ @@ -13,10 +12,10 @@ import { LevelTeamPickStatusComponent } from "./level-team-pick-status.component ], template: `
- - - - + + + + @if (level.teamPicked) { diff --git a/src/app/components/ui/info/statistic.component.ts b/src/app/components/ui/info/statistic.component.ts index 2a79d9a..fd75858 100644 --- a/src/app/components/ui/info/statistic.component.ts +++ b/src/app/components/ui/info/statistic.component.ts @@ -3,23 +3,24 @@ import {IconProp} from "@fortawesome/fontawesome-svg-core"; import {faExclamationTriangle} from "@fortawesome/free-solid-svg-icons"; import {TooltipComponent} from "../text/tooltip.component"; import {FaIconComponent} from "@fortawesome/angular-fontawesome"; -import { DecimalPipe } from "@angular/common"; +import { DecimalPipe, NgClass } from "@angular/common"; @Component({ selector: 'app-statistic', imports: [ TooltipComponent, FaIconComponent, - DecimalPipe + DecimalPipe, + NgClass ], template: ` - + @if (truncate) { - {{value | number:'1.0-1'}} + {{value | number:'1.0-1'}} } @else { - {{value}} + {{value}} } ` @@ -29,4 +30,5 @@ export class StatisticComponent { @Input({required: true}) name: string = "Statistic"; @Input({required: true}) icon: IconProp = faExclamationTriangle; @Input() truncate: boolean = false; + @Input() emphasize: boolean = false; } diff --git a/src/app/pages/level/level.component.html b/src/app/pages/level/level.component.html index 173bbaf..153fee3 100644 --- a/src/app/pages/level/level.component.html +++ b/src/app/pages/level/level.component.html @@ -52,11 +52,11 @@ } - @if(relations && !isMobile) { - + @if(ownUser && relations && !isMobile) { + } - @else if(relations && isMobile) { - + @else if(ownUser && relations && isMobile) { + } diff --git a/src/app/pages/level/level.component.ts b/src/app/pages/level/level.component.ts index 619bff6..d0d430a 100644 --- a/src/app/pages/level/level.component.ts +++ b/src/app/pages/level/level.component.ts @@ -81,7 +81,6 @@ export class LevelComponent { this.auth.user.subscribe(user => { if(user) { this.ownUser = user; - this.client.getLevelRelations(id).subscribe(relations => this.relations = relations); } }); }); @@ -91,6 +90,7 @@ export class LevelComponent { setDataFromLevel(data: Level) { this.level = data; + this.relations = data.ownRelations; if(this.isBrowser) { window.history.replaceState({}, '', `/level/${data.levelId}/${this.slug.transform(data.title)}`); }