better grid
This commit is contained in:
@@ -1,12 +1,27 @@
|
||||
<div class="h-full w-full absolute bg-red-300">
|
||||
@if (isVisible()) {
|
||||
<div
|
||||
class="h-full w-full absolute bg-red-300"
|
||||
animate.enter="animate-slide-in"
|
||||
animate.leave="animate-slide-out"
|
||||
>
|
||||
<div class="py-4 container mx-auto">
|
||||
<div class="flex flex-row justify-between">
|
||||
<p>food-pantry works!</p>
|
||||
<ff-button (click)="onClose.emit(true)">X</ff-button>
|
||||
</div>
|
||||
<ff-grid
|
||||
[template]="food"
|
||||
[gridItems]="foods()"
|
||||
(onSelect)="onFoodChosen.emit($event)"
|
||||
></ff-grid>
|
||||
>
|
||||
<ng-template #food let-food="item">
|
||||
<div
|
||||
class="flex flex-row items-center justify-center overflow-hidden"
|
||||
>
|
||||
{{ food.name }}
|
||||
</div>
|
||||
</div>
|
||||
</ng-template>
|
||||
</ff-grid>
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { Component, inject, output, OutputEmitterRef, Signal } from '@angular/core';
|
||||
import { Component, inject, input, InputSignal, output, OutputEmitterRef, Signal } from '@angular/core';
|
||||
import { ButtonComponent } from "../ui-elements/button/button.component";
|
||||
import { Food } from '../../types/food';
|
||||
import { FoodStore } from '../../api/food.store';
|
||||
@@ -10,6 +10,7 @@ import { GridComponent } from "../grid/grid.component";
|
||||
templateUrl: './food-pantry.component.html',
|
||||
})
|
||||
export class FoodPantryComponent {
|
||||
public readonly isVisible: InputSignal<boolean> = input.required();
|
||||
public readonly onClose: OutputEmitterRef<true> = output<true>();
|
||||
public readonly onFoodChosen: OutputEmitterRef<Food> = output<Food>();
|
||||
|
||||
|
||||
@@ -2,11 +2,15 @@
|
||||
@for (item of gridItems(); track $index) {
|
||||
<div
|
||||
(click)="onSelect.emit(item)"
|
||||
class="rounded-lg bg-primary-400 cursor-pointer"
|
||||
class="rounded-lg bg-primary-400 cursor-pointer relative"
|
||||
[ngStyle]="{
|
||||
width: size() + 'rem',
|
||||
height: size() + 'rem',
|
||||
}"
|
||||
></div>
|
||||
>
|
||||
<ng-container
|
||||
*ngTemplateOutlet="template(); context: { item }"
|
||||
></ng-container>
|
||||
</div>
|
||||
}
|
||||
</div>
|
||||
|
||||
@@ -1,13 +1,15 @@
|
||||
import { NgStyle } from '@angular/common';
|
||||
import { Component, input, InputSignal, output, OutputEmitterRef } from '@angular/core';
|
||||
import { NgStyle, NgTemplateOutlet } from '@angular/common';
|
||||
import { Component, input, InputSignal, output, OutputEmitterRef, TemplateRef } from '@angular/core';
|
||||
|
||||
@Component({
|
||||
selector: 'ff-grid',
|
||||
imports: [NgStyle],
|
||||
imports: [NgStyle, NgTemplateOutlet],
|
||||
templateUrl: './grid.component.html',
|
||||
})
|
||||
export class GridComponent<T> {
|
||||
public readonly gridItems: InputSignal<T[]> = input.required();
|
||||
public readonly template: InputSignal<TemplateRef<{ item: T; }>> = input.required();
|
||||
public readonly attr: InputSignal<string> = input('');
|
||||
public readonly size: InputSignal<number> = input<number>(5);
|
||||
|
||||
public readonly onSelect: OutputEmitterRef<T> = output<T>();
|
||||
|
||||
@@ -1,8 +1,14 @@
|
||||
<div class="h-full w-full absolute bg-blue-300">
|
||||
@if (isVisible()) {
|
||||
<div
|
||||
class="h-full w-full absolute bg-blue-300"
|
||||
animate.enter="animate-slide-in"
|
||||
animate.leave="animate-slide-out"
|
||||
>
|
||||
<div class="py-4 container mx-auto">
|
||||
<div class="flex flex-row justify-between">
|
||||
<p>inventory works!</p>
|
||||
<ff-button (click)="onClose.emit()">X</ff-button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { Component, output, OutputEmitterRef } from '@angular/core';
|
||||
import { Component, input, InputSignal, output, OutputEmitterRef } from '@angular/core';
|
||||
import { ButtonComponent } from "../ui-elements/button/button.component";
|
||||
|
||||
@Component({
|
||||
@@ -7,6 +7,7 @@ import { ButtonComponent } from "../ui-elements/button/button.component";
|
||||
templateUrl: './inventory.component.html',
|
||||
})
|
||||
export class InventoryComponent {
|
||||
public readonly isVisible: InputSignal<boolean> = input.required();
|
||||
public readonly onClose: OutputEmitterRef<void> = output<void>();
|
||||
public readonly onItemChosen: OutputEmitterRef<any> = output<any>();
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
[routerLink]="['/' + ERouteKey.Interactions + '/' + chibi.id]"
|
||||
class="w-full flex flex-row gap-4 bg-primary-200 p-4 rounded-lg cursor-pointer"
|
||||
>
|
||||
<img [src]="chibi.iconPath" class="rounded-full w-3/12" />
|
||||
<img [src]="chibi.iconPath" class="rounded-full w-12 aspect-square" />
|
||||
<div>
|
||||
<div class="flex flex-row items-center gap-2">
|
||||
<div
|
||||
|
||||
@@ -14,15 +14,17 @@
|
||||
}
|
||||
</div>
|
||||
<div class="h-1/3 min-h-20 bg-primary-300 relative">
|
||||
@if (shownMenu == EInteractionMenuState.Pantry) {
|
||||
<ff-food-pantry
|
||||
[isVisible]="shownMenu == EInteractionMenuState.Pantry"
|
||||
(onClose)="closeMenu()"
|
||||
(onFoodChosen)="interact(EChibiInteraction.Feed, $event)"
|
||||
></ff-food-pantry>
|
||||
}
|
||||
@if (shownMenu == EInteractionMenuState.Inventory) {
|
||||
<ff-inventory (onClose)="closeMenu()"></ff-inventory>
|
||||
}
|
||||
|
||||
<ff-inventory
|
||||
[isVisible]="shownMenu == EInteractionMenuState.Inventory"
|
||||
(onClose)="closeMenu()"
|
||||
></ff-inventory>
|
||||
|
||||
<div class="flex flex-row gap-5 py-4 container mx-auto">
|
||||
<ff-button (click)="openInventory()">{{
|
||||
lang.game.actions.giveItem
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { Component, computed, effect, inject, input, InputSignal, signal, Signal, WritableSignal } from '@angular/core';
|
||||
import { Component, computed, effect, inject, input, InputSignal, OnDestroy, signal, Signal, WritableSignal } from '@angular/core';
|
||||
import { HeaderComponent } from "../../components/ui-elements/header/header.component";
|
||||
import { ERouteKey } from '../../types/route-key';
|
||||
import { Chibi, ChibiId } from '../../types/chibi/chibi';
|
||||
@@ -12,7 +12,7 @@ import { IBrain } from '../../logic/chibi-behaviour/brain';
|
||||
import { BRAIN_MAP } from '../../logic/chibi-behaviour/brain-map';
|
||||
import { TranslateableComponent } from '../../components/translateable.component';
|
||||
import { Food } from '../../types/food';
|
||||
import { interval } from 'rxjs';
|
||||
import { interval, Subscribable, Subscription } from 'rxjs';
|
||||
import { RandomService } from '../../logic/random.service';
|
||||
import { ChibiInteraction } from '../../logic/chibi-behaviour/brains/aperio.brain';
|
||||
|
||||
@@ -29,7 +29,7 @@ const THINKING_INTERVAL: number = 2000;
|
||||
imports: [HeaderComponent, InteractionCanvasComponent, FoodPantryComponent, InventoryComponent, ButtonComponent],
|
||||
templateUrl: './interactions.component.html',
|
||||
})
|
||||
export class InteractionsComponent extends TranslateableComponent {
|
||||
export class InteractionsComponent extends TranslateableComponent implements OnDestroy {
|
||||
public readonly chibiId: InputSignal<ChibiId> = input.required<ChibiId>();
|
||||
|
||||
private readonly chibiStore: ChibiStore = inject(ChibiStore);
|
||||
@@ -46,6 +46,8 @@ export class InteractionsComponent extends TranslateableComponent {
|
||||
|
||||
private brain!: IBrain;
|
||||
|
||||
private sub: Subscription = new Subscription();
|
||||
|
||||
constructor() {
|
||||
super();
|
||||
effect(() => {
|
||||
@@ -54,9 +56,13 @@ export class InteractionsComponent extends TranslateableComponent {
|
||||
this.brain.init(this.chibi(), this.randomService);
|
||||
}
|
||||
})
|
||||
interval(THINKING_INTERVAL).subscribe(() => {
|
||||
this.sub.add(interval(THINKING_INTERVAL).subscribe(() => {
|
||||
this.brain.exist();
|
||||
})
|
||||
}));
|
||||
}
|
||||
|
||||
ngOnDestroy() {
|
||||
this.sub.unsubscribe();
|
||||
}
|
||||
|
||||
public interact(interaction: EChibiInteraction, item?: Food): void {
|
||||
|
||||
@@ -26,4 +26,24 @@
|
||||
--color-secondary-900: #651e71;
|
||||
--color-secondary-950: #41074b;
|
||||
|
||||
|
||||
--animate-slide-in: slide-in 0.3s ease-in-out;
|
||||
@keyframes slide-in {
|
||||
from {
|
||||
transform: translateX(-100%);
|
||||
}
|
||||
to {
|
||||
transform: translateX(0);
|
||||
}
|
||||
}
|
||||
|
||||
--animate-slide-out: slide-out 0.3s ease-in-out;
|
||||
@keyframes slide-out {
|
||||
from {
|
||||
transform: translateX(0);
|
||||
}
|
||||
to {
|
||||
transform: translateX(-100%);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user