Merge branches 'main' and 'main' of https://github.com/Poomipat-Ch/taobin_recipe_manager
This commit is contained in:
commit
32ebe50b85
5 changed files with 76 additions and 14 deletions
|
|
@ -28,11 +28,17 @@
|
|||
<input
|
||||
class="input input-bordered join-item w-[300px]"
|
||||
placeholder="Product Code, Name or Other Name"
|
||||
(input)="setSearch($event)"
|
||||
(keydown.enter)="search($event)"
|
||||
/>
|
||||
<button class="btn join-item">Search</button>
|
||||
<button class="btn join-item" (click)="search($event)">
|
||||
Search
|
||||
</button>
|
||||
</div>
|
||||
<div class="flex gap-2">
|
||||
<button class="btn rounded-lg">View JSON</button>
|
||||
<button class="btn rounded-lg" (click)="openJsonTab()">
|
||||
View JSON
|
||||
</button>
|
||||
<button class="btn rounded-lg">
|
||||
<svg
|
||||
class="w-6 h-6 text-gray-800 dark:text-white"
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@ import { DatePipe, NgFor, NgIf } from '@angular/common';
|
|||
import { Recipe, Recipe01 } from 'src/app/core/models/recipe.model';
|
||||
import { RecipeService } from 'src/app/core/services/recipe.service';
|
||||
import { BehaviorSubject } from 'rxjs';
|
||||
import { environment } from 'src/environments/environment';
|
||||
|
||||
@Component({
|
||||
selector: 'app-dashboard',
|
||||
|
|
@ -40,6 +41,9 @@ export class DashboardComponent implements OnInit {
|
|||
isLoadMore: boolean = false;
|
||||
isHasMore: boolean = true;
|
||||
|
||||
private searchStr = '';
|
||||
private oldSearchStr = '';
|
||||
|
||||
@ViewChild('table', { static: false }) set content(table: ElementRef) {
|
||||
table.nativeElement.addEventListener(
|
||||
'scroll',
|
||||
|
|
@ -56,6 +60,7 @@ export class DashboardComponent implements OnInit {
|
|||
.getRecipes({
|
||||
offset: this.offset,
|
||||
take: this.take,
|
||||
search: this.oldSearchStr,
|
||||
})
|
||||
.subscribe(({ recipes, hasMore }) => {
|
||||
const { Recipe01, ...recipesWithoutRecipe01 } = recipes;
|
||||
|
|
@ -92,6 +97,7 @@ export class DashboardComponent implements OnInit {
|
|||
.getRecipes({
|
||||
offset: this.offset,
|
||||
take: this.take,
|
||||
search: this.oldSearchStr,
|
||||
})
|
||||
.subscribe(({ recipes, hasMore }) => {
|
||||
const { Recipe01, ...recipesWithoutRecipe01 } = recipes;
|
||||
|
|
@ -109,4 +115,35 @@ export class DashboardComponent implements OnInit {
|
|||
this.isHasMore = hasMore;
|
||||
});
|
||||
}
|
||||
|
||||
setSearch(event: Event) {
|
||||
this.searchStr = (event.target as HTMLInputElement).value;
|
||||
}
|
||||
|
||||
search(event: Event) {
|
||||
this.offset = 0;
|
||||
this.oldSearchStr = this.searchStr;
|
||||
this._recipeService
|
||||
.getRecipes({
|
||||
offset: this.offset,
|
||||
take: this.take,
|
||||
search: this.searchStr,
|
||||
})
|
||||
.subscribe(({ recipes, hasMore }) => {
|
||||
const { Recipe01, ...recipesWithoutRecipe01 } = recipes;
|
||||
this.recipes01 = Recipe01;
|
||||
|
||||
this.recipes = {
|
||||
...recipesWithoutRecipe01,
|
||||
Recipe01: [],
|
||||
};
|
||||
this.offset += 10;
|
||||
this.isLoaded = true;
|
||||
this.isHasMore = hasMore;
|
||||
});
|
||||
}
|
||||
|
||||
openJsonTab() {
|
||||
window.open(environment.api + '/recipes/json', '_blank');
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue