Add views

This commit is contained in:
2025-04-27 00:41:19 +02:00
parent 142cff1807
commit ea27f1e23d
29 changed files with 750 additions and 88 deletions

View File

@@ -1,4 +1,7 @@
<main class="flex flex-col h-screen w-full items-center bg-surface-800"> <main class="flex flex-col h-screen w-full items-center bg-surface-800">
<app-bar class="sticky top-0 z-10 h-[10%]"/> <app-bar class="sticky top-0 z-10 h-[10%]"/>
<app-items class="size-full"/>
<div class="flex-1">
<router-outlet/>
</div>
</main> </main>

View File

@@ -7,7 +7,7 @@ import {FormsModule} from '@angular/forms';
import {BarComponent} from './component/bar/bar.component'; import {BarComponent} from './component/bar/bar.component';
import {ScrollingModule} from '@angular/cdk/scrolling'; import {ScrollingModule} from '@angular/cdk/scrolling';
import {ApiModule} from './openapi'; import {ApiModule} from './openapi';
import {ItemsComponent} from './component/items/items.component'; import {RouterOutlet} from '@angular/router';
@Component({ @Component({
selector: 'app-root', selector: 'app-root',
@@ -21,8 +21,7 @@ import {ItemsComponent} from './component/items/items.component';
BarComponent, BarComponent,
ScrollingModule, ScrollingModule,
ApiModule, ApiModule,
ItemsComponent, RouterOutlet
ItemsComponent
], ],
templateUrl: './app.component.html', templateUrl: './app.component.html',
styleUrl: './app.component.css', styleUrl: './app.component.css',

View File

@@ -1,6 +1,8 @@
import { Routes } from '@angular/router'; import {Routes} from '@angular/router';
import {ItemsComponent} from './component/items/items.component'; import {DecksComponent} from './views/decks/decks.component';
import {CardsComponent} from './views/cards/cards.component';
export const routes: Routes = [ export const routes: Routes = [
{ path: '', component: ItemsComponent }, { path: 'cards', component: CardsComponent },
{ path: 'decks', component: DecksComponent },
]; ];

View File

@@ -30,51 +30,22 @@ export class BarComponent implements OnInit {
ngOnInit() { ngOnInit() {
this.items = [ this.items = [
{ {
label: 'Home (Cards)', label: 'Home (TBD)',
icon: 'pi pi-home', icon: 'pi pi-home'
command: () => { },
this.router.navigate(['/cards']); {
label: 'Decks',
icon: 'pi pi-star',
command: async () => {
await this.router.navigate(['/decks']);
} }
}, },
{ {
label: 'Features', label: 'Cards',
icon: 'pi pi-star'
},
{
label: 'Projects',
icon: 'pi pi-search', icon: 'pi pi-search',
items: [ command: async () => {
{ await this.router.navigate(['/cards']);
label: 'Components',
icon: 'pi pi-bolt'
},
{
label: 'Blocks',
icon: 'pi pi-server'
},
{
label: 'UI Kit',
icon: 'pi pi-pencil'
},
{
label: 'Templates',
icon: 'pi pi-palette',
items: [
{
label: 'Apollo',
icon: 'pi pi-palette'
},
{
label: 'Ultima',
icon: 'pi pi-palette'
} }
]
}
]
},
{
label: 'Contact',
icon: 'pi pi-envelope'
} }
] ]
} }

View File

@@ -2,17 +2,19 @@
@if (cards.length > 0) { @if (cards.length > 0) {
<p-virtualscroller <p-virtualscroller
[items]="cards" [items]="cards"
[itemSize]="580 / 4" [itemSize]="itemSize"
[lazy]="true" [lazy]="true"
[loading]="lazyLoading" [loading]="lazyLoading"
[appendOnly]="true" [appendOnly]="false"
[step]="pageSize"
[numToleratedItems]="numberOfToleratedItems"
(onLazyLoad)="onLazyLoad($event)" (onLazyLoad)="onLazyLoad($event)"
styleClass="size-full" styleClass="size-full"
> >
<ng-template [appVirtualScroll]="cards" pTemplate="content" let-options="options"> <ng-template [appVirtualScroll]="cards" pTemplate="content" let-options="options">
<div class="flex flex-wrap justify-around"> <div class="flex flex-wrap justify-around">
@for (card of options.items; track card.id) { @for (card of options.items; track card.id) {
<p-card styleClass="w-[24rem] h-[36rem] m-4 overflow-hidden"> <p-card styleClass="w-[24rem] h-[36rem] m-2 overflow-hidden">
<ng-template pTemplate="header"> <ng-template pTemplate="header">
<div <div
class="relative duration-200 w-[23rem] rounded-lg ease-in-out h-64 z-10 overflow-hidden hover:h-[34rem] hover:translate-y-2 m-2 after:absolute after:inset-0 after:shadow-[inset_0_-10px_30px_15px_rgba(0,0,0,0.85)] after:content-[''] hover:inset-0" class="relative duration-200 w-[23rem] rounded-lg ease-in-out h-64 z-10 overflow-hidden hover:h-[34rem] hover:translate-y-2 m-2 after:absolute after:inset-0 after:shadow-[inset_0_-10px_30px_15px_rgba(0,0,0,0.85)] after:content-[''] hover:inset-0"

View File

@@ -1,4 +1,4 @@
import {AfterViewInit, Component, ElementRef, OnInit, ViewChild} from '@angular/core'; import {AfterViewInit, Component, ElementRef, OnInit, TrackByFunction, ViewChild} from '@angular/core';
import {Scroller, ScrollerLazyLoadEvent} from 'primeng/scroller'; import {Scroller, ScrollerLazyLoadEvent} from 'primeng/scroller';
import {Card as CardModel, CardService} from '../../openapi'; import {Card as CardModel, CardService} from '../../openapi';
import {Card} from 'primeng/card'; import {Card} from 'primeng/card';
@@ -31,16 +31,17 @@ export class ItemsComponent implements OnInit, AfterViewInit {
private readonly FONT_SIZE_PX = 14; private readonly FONT_SIZE_PX = 14;
lastRequestResponseSize?: number;
pageSize: number = 5; pageSize: number = 5;
page: number = -1; page: number = -1;
// noinspection PointlessArithmeticExpressionJS Card height + ( margin top + margin bottom) (rem) // noinspection PointlessArithmeticExpressionJS Card height + ( margin top/bottom) (rem)
rowHeight: number = 36 + (1 * 2); rowHeight: number = 36 + (0.5 * 2);
itemWidth: number = 24; // Card width (rem) itemWidth: number = 24; // Card width (rem)
cards: CardModel[] = []; cards: CardModel[] = [];
lazyLoading: boolean = false; lazyLoading: boolean = false;
itemsPerRow!: number; itemsPerRow!: number;
rowsInPage!: number; rowsInPage!: number;
itemSize: number = this.rowHeight;
numberOfToleratedItems: number = 5;
ngOnInit() { ngOnInit() {
this.scrollSubject this.scrollSubject
@@ -66,10 +67,14 @@ export class ItemsComponent implements OnInit, AfterViewInit {
this.calculateItemsPerRow(entry.contentRect.width); this.calculateItemsPerRow(entry.contentRect.width);
const itemsInViewPort = this.itemsPerRow * this.rowsInPage; const itemsInViewPort = this.itemsPerRow * this.rowsInPage;
this.pageSize = itemsInViewPort;
console.log(`items in row: ${this.itemsPerRow}`);
console.log(`rows in page: ${this.rowsInPage}`);
if (this.virtualScroller) { if (this.virtualScroller) {
this.virtualScroller.numItemsInViewport = itemsInViewPort; //this.virtualScroller.numItemsInViewport = itemsInViewPort;
this.virtualScroller.numToleratedItems = Math.floor(itemsInViewPort * 1.5); //this.virtualScroller.numToleratedItems = Math.floor(itemsInViewPort * 1.5);
this.numberOfToleratedItems = itemsInViewPort;
} }
} }
}); });
@@ -90,26 +95,18 @@ export class ItemsComponent implements OnInit, AfterViewInit {
} }
private updateVirtualScrollerSettings(): void { private updateVirtualScrollerSettings(): void {
if (this.virtualScroller) { this.itemSize = (this.rowHeight * this.FONT_SIZE_PX) / this.itemsPerRow;
this.virtualScroller.itemSize = (this.rowHeight * this.FONT_SIZE_PX);
}
} }
getPage(lastIndexInPage: number): void { getPage(lastIndexInPage: number): void {
console.log("piss")
if (this.lazyLoading) {
return;
}
console.log("piss2")
console.log(lastIndexInPage )
if (this.lastRequestResponseSize && this.lastRequestResponseSize > lastIndexInPage ) {
return;
}
console.log("piss3")
this.lazyLoading = true this.lazyLoading = true
if (lastIndexInPage % this.pageSize !== 0) {
this.lazyLoading = false
return;
}
this.page++; this.page++;
this.cardService.getCards( this.cardService.getCards(
@@ -118,10 +115,13 @@ export class ItemsComponent implements OnInit, AfterViewInit {
this.pageSize, this.pageSize,
).subscribe({ ).subscribe({
next: cards => { next: cards => {
console.log(`pageSize ${this.pageSize}`); for (const card of cards) {
console.log(`response size ${cards.length}`); this.cards.push(card)
this.cards = this.cards.concat(cards); }
console.log(`total cards ${this.cards.length}`); this.lazyLoading = false;
},
error: error => {
console.log(error);
this.lazyLoading = false; this.lazyLoading = false;
} }
}); });

View File

@@ -4,7 +4,7 @@ api.base.service.ts
api.module.ts api.module.ts
api/api.ts api/api.ts
api/card.service.ts api/card.service.ts
api/deck-controller.service.ts api/deck.service.ts
configuration.ts configuration.ts
encoder.ts encoder.ts
git_push.sh git_push.sh
@@ -12,5 +12,6 @@ index.ts
model/card.ts model/card.ts
model/deck.ts model/deck.ts
model/models.ts model/models.ts
model/page-deck.ts
param.ts param.ts
variables.ts variables.ts

View File

@@ -1,5 +1,5 @@
export * from './card.service'; export * from './card.service';
import { CardService } from './card.service'; import { CardService } from './card.service';
export * from './deck-controller.service'; export * from './deck.service';
import { DeckControllerService } from './deck-controller.service'; import { DeckService } from './deck.service';
export const APIS = [CardService, DeckControllerService]; export const APIS = [CardService, DeckService];

View File

@@ -142,6 +142,7 @@ export class CardService extends BaseService {
public getCards(name?: string, page?: number, pageSize?: number, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable<HttpResponse<Array<Card>>>; public getCards(name?: string, page?: number, pageSize?: number, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable<HttpResponse<Array<Card>>>;
public getCards(name?: string, page?: number, pageSize?: number, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable<HttpEvent<Array<Card>>>; public getCards(name?: string, page?: number, pageSize?: number, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable<HttpEvent<Array<Card>>>;
public getCards(name?: string, page?: number, pageSize?: number, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable<any> { public getCards(name?: string, page?: number, pageSize?: number, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable<any> {
let localVarQueryParameters = new HttpParams({encoder: this.encoder}); let localVarQueryParameters = new HttpParams({encoder: this.encoder});
localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, localVarQueryParameters = this.addToHttpParams(localVarQueryParameters,
<any>name, 'name'); <any>name, 'name');

View File

@@ -0,0 +1,272 @@
/**
* dex API
*
*
*
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
* https://openapi-generator.tech
* Do not edit the class manually.
*/
/* tslint:disable:no-unused-variable member-ordering */
import { Inject, Injectable, Optional } from '@angular/core';
import { HttpClient, HttpHeaders, HttpParams,
HttpResponse, HttpEvent, HttpParameterCodec, HttpContext
} from '@angular/common/http';
import { CustomHttpParameterCodec } from '../encoder';
import { Observable } from 'rxjs';
// @ts-ignore
import { Deck } from '../model/deck';
// @ts-ignore
import { PageDeck } from '../model/page-deck';
// @ts-ignore
import { BASE_PATH, COLLECTION_FORMATS } from '../variables';
import { Configuration } from '../configuration';
import { BaseService } from '../api.base.service';
@Injectable({
providedIn: 'root'
})
export class DeckService extends BaseService {
constructor(protected httpClient: HttpClient, @Optional() @Inject(BASE_PATH) basePath: string|string[], @Optional() configuration?: Configuration) {
super(basePath, configuration);
}
/**
* Add a Card by its ID to a Deck by its name
* @param cardId
* @param deckName
* @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
* @param reportProgress flag to report request and response progress.
*/
public addCardToDeck(cardId: number, deckName: string, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: undefined, context?: HttpContext, transferCache?: boolean}): Observable<any>;
public addCardToDeck(cardId: number, deckName: string, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: undefined, context?: HttpContext, transferCache?: boolean}): Observable<HttpResponse<any>>;
public addCardToDeck(cardId: number, deckName: string, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: undefined, context?: HttpContext, transferCache?: boolean}): Observable<HttpEvent<any>>;
public addCardToDeck(cardId: number, deckName: string, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: undefined, context?: HttpContext, transferCache?: boolean}): Observable<any> {
if (cardId === null || cardId === undefined) {
throw new Error('Required parameter cardId was null or undefined when calling addCardToDeck.');
}
if (deckName === null || deckName === undefined) {
throw new Error('Required parameter deckName was null or undefined when calling addCardToDeck.');
}
let localVarHeaders = this.defaultHeaders;
const localVarHttpHeaderAcceptSelected: string | undefined = options?.httpHeaderAccept ?? this.configuration.selectHeaderAccept([
]);
if (localVarHttpHeaderAcceptSelected !== undefined) {
localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected);
}
const localVarHttpContext: HttpContext = options?.context ?? new HttpContext();
const localVarTransferCache: boolean = options?.transferCache ?? true;
let responseType_: 'text' | 'json' | 'blob' = 'json';
if (localVarHttpHeaderAcceptSelected) {
if (localVarHttpHeaderAcceptSelected.startsWith('text')) {
responseType_ = 'text';
} else if (this.configuration.isJsonMime(localVarHttpHeaderAcceptSelected)) {
responseType_ = 'json';
} else {
responseType_ = 'blob';
}
}
let localVarPath = `/api/decks/${this.configuration.encodeParam({name: "deckName", value: deckName, in: "path", style: "simple", explode: false, dataType: "string", dataFormat: undefined})}/${this.configuration.encodeParam({name: "cardId", value: cardId, in: "path", style: "simple", explode: false, dataType: "number", dataFormat: "int64"})}`;
return this.httpClient.request<any>('post', `${this.configuration.basePath}${localVarPath}`,
{
context: localVarHttpContext,
responseType: <any>responseType_,
withCredentials: this.configuration.withCredentials,
headers: localVarHeaders,
observe: observe,
transferCache: localVarTransferCache,
reportProgress: reportProgress
}
);
}
/**
* Create a Deck with a given name
* @param deck
* @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
* @param reportProgress flag to report request and response progress.
*/
public createDeck(deck: Deck, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: undefined, context?: HttpContext, transferCache?: boolean}): Observable<any>;
public createDeck(deck: Deck, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: undefined, context?: HttpContext, transferCache?: boolean}): Observable<HttpResponse<any>>;
public createDeck(deck: Deck, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: undefined, context?: HttpContext, transferCache?: boolean}): Observable<HttpEvent<any>>;
public createDeck(deck: Deck, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: undefined, context?: HttpContext, transferCache?: boolean}): Observable<any> {
if (deck === null || deck === undefined) {
throw new Error('Required parameter deck was null or undefined when calling createDeck.');
}
let localVarHeaders = this.defaultHeaders;
const localVarHttpHeaderAcceptSelected: string | undefined = options?.httpHeaderAccept ?? this.configuration.selectHeaderAccept([
]);
if (localVarHttpHeaderAcceptSelected !== undefined) {
localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected);
}
const localVarHttpContext: HttpContext = options?.context ?? new HttpContext();
const localVarTransferCache: boolean = options?.transferCache ?? true;
// to determine the Content-Type header
const consumes: string[] = [
'application/json'
];
const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes);
if (httpContentTypeSelected !== undefined) {
localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected);
}
let responseType_: 'text' | 'json' | 'blob' = 'json';
if (localVarHttpHeaderAcceptSelected) {
if (localVarHttpHeaderAcceptSelected.startsWith('text')) {
responseType_ = 'text';
} else if (this.configuration.isJsonMime(localVarHttpHeaderAcceptSelected)) {
responseType_ = 'json';
} else {
responseType_ = 'blob';
}
}
let localVarPath = `/api/decks`;
return this.httpClient.request<any>('post', `${this.configuration.basePath}${localVarPath}`,
{
context: localVarHttpContext,
body: deck,
responseType: <any>responseType_,
withCredentials: this.configuration.withCredentials,
headers: localVarHeaders,
observe: observe,
transferCache: localVarTransferCache,
reportProgress: reportProgress
}
);
}
/**
* Get a singular Deck by its name
* @param name
* @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
* @param reportProgress flag to report request and response progress.
*/
public getDeckByName(name: string, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable<Deck>;
public getDeckByName(name: string, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable<HttpResponse<Deck>>;
public getDeckByName(name: string, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable<HttpEvent<Deck>>;
public getDeckByName(name: string, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable<any> {
if (name === null || name === undefined) {
throw new Error('Required parameter name was null or undefined when calling getDeckByName.');
}
let localVarHeaders = this.defaultHeaders;
const localVarHttpHeaderAcceptSelected: string | undefined = options?.httpHeaderAccept ?? this.configuration.selectHeaderAccept([
'application/json'
]);
if (localVarHttpHeaderAcceptSelected !== undefined) {
localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected);
}
const localVarHttpContext: HttpContext = options?.context ?? new HttpContext();
const localVarTransferCache: boolean = options?.transferCache ?? true;
let responseType_: 'text' | 'json' | 'blob' = 'json';
if (localVarHttpHeaderAcceptSelected) {
if (localVarHttpHeaderAcceptSelected.startsWith('text')) {
responseType_ = 'text';
} else if (this.configuration.isJsonMime(localVarHttpHeaderAcceptSelected)) {
responseType_ = 'json';
} else {
responseType_ = 'blob';
}
}
let localVarPath = `/api/decks/${this.configuration.encodeParam({name: "name", value: name, in: "path", style: "simple", explode: false, dataType: "string", dataFormat: undefined})}`;
return this.httpClient.request<Deck>('get', `${this.configuration.basePath}${localVarPath}`,
{
context: localVarHttpContext,
responseType: <any>responseType_,
withCredentials: this.configuration.withCredentials,
headers: localVarHeaders,
observe: observe,
transferCache: localVarTransferCache,
reportProgress: reportProgress
}
);
}
/**
* Get a page of Decks with optional name query parameter
* @param name
* @param page
* @param pageSize
* @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
* @param reportProgress flag to report request and response progress.
*/
public getDecks(name?: string, page?: number, pageSize?: number, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable<PageDeck>;
public getDecks(name?: string, page?: number, pageSize?: number, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable<HttpResponse<PageDeck>>;
public getDecks(name?: string, page?: number, pageSize?: number, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable<HttpEvent<PageDeck>>;
public getDecks(name?: string, page?: number, pageSize?: number, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable<any> {
let localVarQueryParameters = new HttpParams({encoder: this.encoder});
localVarQueryParameters = this.addToHttpParams(localVarQueryParameters,
<any>name, 'name');
localVarQueryParameters = this.addToHttpParams(localVarQueryParameters,
<any>page, 'page');
localVarQueryParameters = this.addToHttpParams(localVarQueryParameters,
<any>pageSize, 'pageSize');
let localVarHeaders = this.defaultHeaders;
const localVarHttpHeaderAcceptSelected: string | undefined = options?.httpHeaderAccept ?? this.configuration.selectHeaderAccept([
'application/json'
]);
if (localVarHttpHeaderAcceptSelected !== undefined) {
localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected);
}
const localVarHttpContext: HttpContext = options?.context ?? new HttpContext();
const localVarTransferCache: boolean = options?.transferCache ?? true;
let responseType_: 'text' | 'json' | 'blob' = 'json';
if (localVarHttpHeaderAcceptSelected) {
if (localVarHttpHeaderAcceptSelected.startsWith('text')) {
responseType_ = 'text';
} else if (this.configuration.isJsonMime(localVarHttpHeaderAcceptSelected)) {
responseType_ = 'json';
} else {
responseType_ = 'blob';
}
}
let localVarPath = `/api/decks`;
return this.httpClient.request<PageDeck>('get', `${this.configuration.basePath}${localVarPath}`,
{
context: localVarHttpContext,
params: localVarQueryParameters,
responseType: <any>responseType_,
withCredentials: this.configuration.withCredentials,
headers: localVarHeaders,
observe: observe,
transferCache: localVarTransferCache,
reportProgress: reportProgress
}
);
}
}

View File

@@ -1,2 +1,3 @@
export * from './card'; export * from './card';
export * from './deck'; export * from './deck';
export * from './page-deck';

View File

@@ -0,0 +1,19 @@
/**
* dex API
*
*
*
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
* https://openapi-generator.tech
* Do not edit the class manually.
*/
import { Deck } from './deck';
export interface PageDeck {
content: Array<Deck>;
page?: number;
pageSize?: number;
totalPages?: number;
}

View File

@@ -0,0 +1 @@
<p>card-item works!</p>

View File

@@ -0,0 +1,23 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { CardItemComponent } from './card-item.component';
describe('CardItemComponent', () => {
let component: CardItemComponent;
let fixture: ComponentFixture<CardItemComponent>;
beforeEach(async () => {
await TestBed.configureTestingModule({
imports: [CardItemComponent]
})
.compileComponents();
fixture = TestBed.createComponent(CardItemComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

View File

@@ -0,0 +1,11 @@
import { Component } from '@angular/core';
@Component({
selector: 'app-card-item',
imports: [],
templateUrl: './card-item.component.html',
styleUrl: './card-item.component.css'
})
export class CardItemComponent {
}

View File

View File

@@ -0,0 +1,60 @@
<div #container class="h-full w-screen">
@if (initialized) {
<p-virtualscroller
[items]="cards"
[itemSize]="itemSize"
[lazy]="true"
[loading]="lazyLoading"
[appendOnly]="true"
[step]="pageSize"
[numToleratedItems]="numberOfToleratedItems"
(onLazyLoad)="onLazyLoad($event)"
scrollHeight="600px"
scrollWidth="600px"
>
<ng-template
[appVirtualScroll]="cards"
pTemplate="content"
let-options="options"
>
<div class="flex-none flex-wrap justify-around">
@for (card of options.items; track card.id) {
<p-card styleClass="w-[24rem] h-[36rem] m-2 overflow-hidden">
<ng-template pTemplate="header">
<div
class="relative duration-200 w-[23rem] rounded-lg ease-in-out h-64 z-10 overflow-hidden hover:h-[34rem] hover:translate-y-2 m-2 after:absolute after:inset-0 after:shadow-[inset_0_-10px_30px_15px_rgba(0,0,0,0.85)] after:content-[''] hover:inset-0"
>
<div class="absolute -inset-0">
<!--suppress AngularNgOptimizedImage -->
<img
alt="Card"
class="w-full h-full object-cover object-center"
src="http://localhost:8080{{ card.imageApiPath }}"
/>
</div>
</div>
</ng-template>
<ng-template pTemplate="title"> {{ card.name }}</ng-template>
<ng-template pTemplate="subtitle"> Card subtitle</ng-template>
<ng-template pTemplate="footer">
<div class="flex gap-4 mt-1">
<p-button label="Cancel" severity="secondary" class="w-full" [outlined]="true" styleClass="w-full"/>
<p-button label="Save" class="w-full" styleClass="w-full"/>
</div>
</ng-template>
<p>
Lorem ipsum dolor sit amet, consectetur adipisicing elit. Inventore sed consequuntur error repudiandae
numquam deserunt
quisquam repellat libero asperiores earum nam nobis, culpa ratione quam perferendis esse, cupiditate
neque
quas!
</p>
</p-card>
}
</div>
</ng-template>
</p-virtualscroller>
} @else {
hold on im pogging rn
}
</div>

View File

@@ -0,0 +1,23 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { CardsComponent } from './cards.component';
describe('CardsComponent', () => {
let component: CardsComponent;
let fixture: ComponentFixture<CardsComponent>;
beforeEach(async () => {
await TestBed.configureTestingModule({
imports: [CardsComponent]
})
.compileComponents();
fixture = TestBed.createComponent(CardsComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

View File

@@ -0,0 +1,118 @@
// noinspection DuplicatedCode
import {AfterViewInit, Component, ElementRef, OnInit, ViewChild} from '@angular/core';
import {Scroller, ScrollerLazyLoadEvent} from 'primeng/scroller';
import {Card as CardModel, CardService, PageDeck} from '../../openapi';
import {BehaviorSubject, catchError, debounceTime, of, Subject, switchMap} from 'rxjs';
import {Button} from 'primeng/button';
import {Card} from 'primeng/card';
import {PrimeTemplate} from 'primeng/api';
import {VirtualScrollDirective} from '../../directives/virtual-scroll.directive';
@Component({
selector: 'app-cards',
imports: [
Button,
Card,
PrimeTemplate,
Scroller,
VirtualScrollDirective
],
templateUrl: './cards.component.html',
styleUrl: './cards.component.css'
})
export class CardsComponent implements AfterViewInit {
@ViewChild('container') containerRef!: ElementRef<HTMLElement>;
constructor(private cardService: CardService) {
}
private readonly FONT_SIZE_PX = 14;
private pageSubject = new BehaviorSubject<number>(0);
private resizeObserver!: ResizeObserver;
pageSize: number = 5;
page: number = 0;
// noinspection PointlessArithmeticExpressionJS Card height + ( margin top/bottom) (rem)
rowHeight: number = 36 + (0.5 * 2);
itemWidth: number = 24; // Card width (rem)
cards: CardModel[] = [];
lazyLoading: boolean = false;
itemsPerRow!: number;
rowsInPage!: number;
itemSize: number = this.rowHeight;
numberOfToleratedItems: number = 5;
initialized: boolean = false;
ngAfterViewInit(): void {
this.setupResizeObserver();
this.pageSubject
.pipe(
debounceTime(150),
switchMap(pageNumber => {
this.lazyLoading = true;
return this.cardService.getCards(undefined, pageNumber, this.pageSize).pipe(
catchError(error => {
console.log(`Error: ${error}`);
return of([]);
})
)
})
)
.subscribe(cards => {
this.lazyLoading = false;
if (!this.initialized) {
this.initialized = true;
}
this.cards = [
...this.cards,
...cards
]
})
}
private setupResizeObserver(): void {
this.resizeObserver = new ResizeObserver(entries => {
for (const entry of entries) {
this.calculateRowsInPage(entry.contentRect.height);
this.calculateItemsPerRow(entry.contentRect.width);
const itemsInViewPort = this.itemsPerRow * this.rowsInPage;
this.pageSize = itemsInViewPort;
this.numberOfToleratedItems = itemsInViewPort;
}
});
this.resizeObserver.observe(this.containerRef.nativeElement);
}
private calculateItemsPerRow(containerWidth: number): void {
const newItemsPerRow = Math.floor(containerWidth / (this.itemWidth * this.FONT_SIZE_PX)) || 1;
if (newItemsPerRow !== this.itemsPerRow) {
this.itemsPerRow = newItemsPerRow;
}
this.updateVirtualScrollerSettings();
}
private calculateRowsInPage(containerHeight: number) {
this.rowsInPage = Math.ceil(containerHeight / (this.rowHeight * this.FONT_SIZE_PX));
}
private updateVirtualScrollerSettings(): void {
this.itemSize = (this.rowHeight * this.FONT_SIZE_PX) / this.itemsPerRow;
}
onLazyLoad(event: ScrollerLazyLoadEvent) {
if (!event || event.last % this.pageSize !== 0) {
return;
}
this.pageSubject.next(++this.page);
}
}

View File

@@ -0,0 +1 @@
<p>deck-item works!</p>

View File

@@ -0,0 +1,23 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { DeckItemComponent } from './deck-item.component';
describe('DeckItemComponent', () => {
let component: DeckItemComponent;
let fixture: ComponentFixture<DeckItemComponent>;
beforeEach(async () => {
await TestBed.configureTestingModule({
imports: [DeckItemComponent]
})
.compileComponents();
fixture = TestBed.createComponent(DeckItemComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

View File

@@ -0,0 +1,11 @@
import { Component } from '@angular/core';
@Component({
selector: 'app-deck-item',
imports: [],
templateUrl: './deck-item.component.html',
styleUrl: './deck-item.component.css'
})
export class DeckItemComponent {
}

View File

View File

@@ -0,0 +1,26 @@
<div class="card">
<p-table
[value]="decks"
[tableStyle]="{ 'min-width': '60rem' }"
>
<ng-template pTemplate="caption">
<div class="flex items-center justify-between">
<span class="text-xl font-bold">Decks</span>
<p-button icon="pi pi-refresh" rounded raised/>
</div>
</ng-template>
<ng-template pTemplate="header">
<tr>
<th>Name</th>
<th>No. of Cards</th>
</tr>
</ng-template>
<ng-template pTemplate="body" let-deck>
<tr>
<td>{{ deck.name }}</td>
<td>{{ getCardsInDecks(deck) }}</td>
</tr>
</ng-template>
<ng-template pTemplate="footer"> In total there are 0 Decks.</ng-template>
</p-table>
</div>

View File

@@ -0,0 +1,23 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { DecksComponent } from './decks.component';
describe('DecksComponent', () => {
let component: DecksComponent;
let fixture: ComponentFixture<DecksComponent>;
beforeEach(async () => {
await TestBed.configureTestingModule({
imports: [DecksComponent]
})
.compileComponents();
fixture = TestBed.createComponent(DecksComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

View File

@@ -0,0 +1,71 @@
import {Component, OnInit} from '@angular/core';
import {TableModule} from 'primeng/table';
import {Button} from 'primeng/button';
import {FormsModule} from '@angular/forms';
import {Deck, DeckService, PageDeck} from '../../openapi';
import {BehaviorSubject, catchError, Observable, of, switchMap} from 'rxjs';
import {LazyLoadEvent} from 'primeng/api';
@Component({
selector: 'app-decks',
imports: [
TableModule,
Button,
FormsModule
],
templateUrl: './decks.component.html',
styleUrl: './decks.component.css'
})
export class DecksComponent implements OnInit {
constructor(private deckService: DeckService) {
}
protected loading: boolean = true;
protected decks: Deck[] = [];
private readonly pageSubject: BehaviorSubject<number> = new BehaviorSubject(0);
private page: number = 0;
private pageSize: number = 5;
ngOnInit() {
this.pageSubject.pipe(
switchMap(pageNumber => {
this.loading = true;
return this.deckService.getDecks(undefined, pageNumber, this.pageSize).pipe(
catchError(error => {
console.log(`Error: ${error}`);
return of({
content: [],
page: pageNumber,
pageSize: this.pageSize,
totalPages: 1
} as PageDeck);
})
)
}
)
).subscribe(pageDeck => {
this.loading = false
this.decks = [
...this.decks,
...pageDeck.content
]
});
}
lazyLoad(event: LazyLoadEvent) {
if (!event.last || event.last % this.pageSize !== 0) {
return;
}
this.pageSubject.next(++this.page);
}
getCardsInDecks(deck: Deck): number {
return Object.keys(deck.cards).length
}
}

View File

@@ -1,7 +1,7 @@
/* You can add global styles to this file, and also import other style files */ /* You can add global styles to this file, and also import other style files */
@import "tailwindcss"; @import "tailwindcss";
@import "primeicons/primeicons.css"; @import "primeicons/primeicons.css";
@plugin "tailwindcss-primeui"; @import "tailwindcss-primeui";
html { html {
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica,