Skip to content

Commit aef36a4

Browse files
authored
Feature/demo (#21)
* dash fix * form updates (reminder) * fix in details * version * deleted hardcoded code * fix * fix
1 parent 12f39a0 commit aef36a4

File tree

17 files changed

+246
-268
lines changed

17 files changed

+246
-268
lines changed

docker-compose.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ name: isbe-catalog-ui
22

33
services:
44
catalog-ui:
5-
image: in2workspace/bae-frontend:v0.0.5
5+
image: in2workspace/bae-frontend:v0.0.6
66
container_name: isbe-catalog-ui
77
restart: always

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "bae-frontend",
3-
"version": "0.0.5",
3+
"version": "0.0.6",
44
"scripts": {
55
"ng": "ng",
66
"start": "ng serve",

src/app/offerings/gallery/gallery.component.html

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!-- Offerings Gallery section -->
2-
<bae-categories-panel class="fixed z-30 w-full top-[72px] transition transform opacity-0 duration-200" [ngClass]="showPanel ? 'opacity-100' : 'hidden'"></bae-categories-panel>
2+
<!--<bae-categories-panel class="fixed z-30 w-full top-[72px] transition transform opacity-0 duration-200" [ngClass]="showPanel ? 'opacity-100' : 'hidden'"></bae-categories-panel>-->
33
<section class="flex p-5" [ngClass]="showPanel ? 'pt-[75px]' : ''">
4-
@if(showDrawer){
4+
<!--@if(showDrawer){
55
<div (click)="$event.stopPropagation();" [ngClass]="showDrawer ? 'backdrop-blur-sm': ''" class="fixed h-screen w-3/4 top-0 left-0 z-50 p-4 overflow-y-auto bg-white dark:bg-gray-800" tabindex="-1" aria-labelledby="drawer-label">
66
<button type="button" (click)="showDrawer=!showDrawer" aria-controls="drawer-example" class="text-gray-400 bg-transparent hover:bg-gray-200 hover:text-gray-900 rounded-lg text-sm w-8 h-8 absolute top-2.5 end-2.5 flex items-center justify-center dark:hover:bg-gray-600 dark:hover:text-white" >
77
<svg class="w-3 h-3" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 14 14">
@@ -13,10 +13,10 @@
1313
</div>
1414
} @else {
1515
<bae-categories-filter [catalogId]="DFT_CATALOG" class="hidden md:block w-1/5 md:w-2/4 lg:w-1/4"></bae-categories-filter>
16-
}
16+
}-->
1717

18-
<div class="flex flex-col w-full md:w-4/5 lg:w-3/4">
19-
<section class="md:pl-5 content pb-5 px-4 flex items-center">
18+
<div class="flex flex-col w-full">
19+
<!--<section class="md:pl-5 content pb-5 px-4 flex items-center">
2020
<button (click)="showDrawer=!showDrawer;$event.stopPropagation();" type="button" class="md:hidden px-2 w-fit h-fit py-2 text-sm font-medium text-center inline-flex items-center dark:text-white bg-white text-primary-100 border border-primary-100 rounded-lg dark:bg-primary-100 dark:border-secondary-200">
2121
<svg class="w-4 h-4 mr-2" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 17 14">
2222
<path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M1 1h15M1 7h15M1 13h15"/>
@@ -41,7 +41,7 @@
4141
</div>
4242
</form>
4343
}
44-
</section>
44+
</section>-->
4545
@if (loading) {
4646
<div role="status" class=" h-full flex justify-center align-middle">
4747
<svg aria-hidden="true" class="w-12 h-12 text-gray-200 animate-spin dark:text-gray-600 fill-purple-600" viewBox="0 0 100 101" fill="none" xmlns="http://www.w3.org/2000/svg">
@@ -51,7 +51,7 @@
5151
<span class="sr-only">Loading...</span>
5252
</div>
5353
} @else {
54-
<div class="md:pl-5 grid grid-cols-1 place-items-center lg:grid-cols-2 xl:grid-cols-3">
54+
<div class="md:pl-5 grid grid-cols-1 place-items-center lg:grid-cols-3 xl:grid-cols-4">
5555
@for (prod of products; track prod.id; let index = $index) {
5656
<bae-off-card [productOff]=prod [cardId]="index" class="w-full h-full p-2"></bae-off-card>
5757
} @empty {
@@ -62,7 +62,7 @@
6262
@if (page_check) {
6363
<div class="flex pb-12 justify-center align-middle">
6464
<button (click)="next()" class="flex cursor-pointer items-center justify-center px-3 h-8 text-sm font-medium text-gray-500 bg-white border border-gray-300 rounded-lg hover:bg-gray-100 hover:text-gray-700 dark:bg-gray-800 dark:border-gray-700 dark:text-gray-400 dark:hover:bg-gray-700 dark:hover:text-white">
65-
Load more
65+
{{ 'CREATE_PROD_SPEC._load_more' | translate }}
6666
<svg class="w-3.5 h-3.5 ms-2" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
6767
<path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M5 12h14m-7 7V5"/>
6868
</svg>

src/app/pages/admin/categories/update-category/update-category.component.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -266,14 +266,16 @@ export class UpdateCategoryComponent implements OnInit {
266266
name: this.category.name,
267267
description: this.category.description,
268268
isRoot: this.category.isRoot,
269-
parentId: this.category.parentId
269+
parentId: this.category.parentId,
270+
status: this.category.lifecycleStatus
270271
};
271272

272273
const current = {
273274
name: this.generalForm.value.name,
274275
description: this.generalForm.value.description,
275276
isRoot: this.isParent,
276-
parentId: this.isParent ? undefined : this.selectedCategory?.id
277+
parentId: this.isParent ? undefined : this.selectedCategory?.id,
278+
status: this.catStatusDraft
277279
};
278280

279281
this.edited = hasNonStatusChanges(original, current);

src/app/pages/catalogs/catalogs.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ <h5 class="text-2xl font-bold tracking-tight line-clamp-4 text-primary-100 dark:
7171
@if (page_check) {
7272
<div class="flex pt-8 justify-center align-middle">
7373
<button (click)="next()" class="flex cursor-pointer items-center justify-center px-3 h-8 text-sm font-medium text-gray-500 bg-white border border-gray-300 rounded-lg hover:bg-gray-100 hover:text-gray-700 dark:bg-gray-800 dark:border-gray-700 dark:text-gray-400 dark:hover:bg-gray-700 dark:hover:text-white">
74-
Load more
74+
{{ 'CREATE_PROD_SPEC._load_more' | translate }}
7575
<svg class="w-3.5 h-3.5 ms-2" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
7676
<path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M5 12h14m-7 7V5"/>
7777
</svg>

src/app/pages/product-details/product-details.component.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ <h5 class="font-semibold tracking-tight text-lg text-primary-100 dark:text-prima
6767
</div>
6868
</div>
6969

70-
<div class="p-4 lg:p-5 grid grid-cols-1 lg:grid-cols-2 gap-4">
70+
<div class="p-4 lg:p-5 gap-4">
7171
<h5 class="font-semibold tracking-tight text-lg text-primary-100 dark:text-primary-50">{{ 'PRODUCT_DETAILS._product_pricing' | translate }}:</h5>
7272
@if(productOff?.productOfferingPrice != undefined){
7373
@if(checkCustom){
@@ -138,8 +138,8 @@ <h5 class="flex justify-center mb-2 p-6 text-2xl font-bold tracking-tight text-g
138138
}
139139
</div>
140140

141-
<div class="p-4 lg:p-5 grid grid-cols-1 lg:grid-cols-2 gap-4">
142-
<h2 class="text-4xl font-extrabold text-primary-100 text-center pb-8 pt-12 dark:text-primary-50">{{ 'PRODUCT_DETAILS._product_chars' | translate }}</h2>
141+
<div class="p-4 lg:p-5 gap-4">
142+
<h5 class="font-semibold tracking-tight text-lg text-primary-100 dark:text-primary-50">{{ 'PRODUCT_DETAILS._product_chars' | translate }}</h5>
143143
<div class="container mx-auto px-4">
144144
<div class="flex flex-wrap -mx-4">
145145
@for (char of prodChars; track char.id; let idx = $index) {
@@ -170,7 +170,7 @@ <h3 class="text-2xl font-bold mb-4 dark:text-white">{{char.name}}</h3>
170170
</div>
171171
</div>
172172
} @empty {
173-
<div class="flex justify-center items-center w-full">
173+
<div class="flex items-center w-full">
174174
<div class="flex items-center w-1/2 p-4 mb-4 text-sm text-primary-100 rounded-lg bg-white border border-gray-200 shadow-md dark:bg-secondary-200 dark:text-primary-50" role="alert">
175175
<svg class="flex-shrink-0 inline w-4 h-4 me-3" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 20 20">
176176
<path d="M10 .5a9.5 9.5 0 1 0 9.5 9.5A9.51 9.51 0 0 0 10 .5ZM9.5 4a1.5 1.5 0 1 1 0 3 1.5 1.5 0 0 1 0-3ZM12 15H8a1 1 0 0 1 0-2h1v-3H8a1 1 0 0 1 0-2h2a1 1 0 0 1 1 1v4h1a1 1 0 0 1 0 2Z"/>

src/app/pages/product-inventory/inventory-items/inventory-products/inventory-products.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ <h5 class="text-xl font-semibold tracking-tight text-primary-100 dark:text-white
193193
@if (page_check) {
194194
<div class="flex pt-6 pb-6 justify-center align-middle">
195195
<button (click)="next()" class="flex cursor-pointer items-center justify-center px-3 h-8 text-sm font-medium text-gray-500 bg-white border border-gray-300 rounded-lg hover:bg-gray-100 hover:text-gray-700 dark:bg-gray-800 dark:border-gray-700 dark:text-gray-400 dark:hover:bg-gray-700 dark:hover:text-white">
196-
Load more
196+
{{ 'CREATE_PROD_SPEC._load_more' | translate }}
197197
<svg class="w-3.5 h-3.5 ms-2" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
198198
<path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M5 12h14m-7 7V5"/>
199199
</svg>

src/app/pages/product-orders/sections/invoices-info/invoices-info.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@
138138
@if (page_check) {
139139
<div class="flex pb-6 justify-center align-middle">
140140
<button (click)="next()" class="flex cursor-pointer shadow-lg items-center justify-center px-3 h-8 text-sm font-medium text-gray-500 dark:text-white bg-white dark:bg-primary-100 dark:hover:bg-secondary-100 border border-gray-300 dark:border-secondary-200 rounded-lg hover:bg-gray-200">
141-
Load more
141+
{{ 'CREATE_PROD_SPEC._load_more' | translate }}
142142
<svg class="w-3.5 h-3.5 ms-2" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
143143
<path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M5 12h14m-7 7V5"/>
144144
</svg>

src/app/pages/product-orders/sections/order-info/order-info.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ <h6 class="mb-3 text-sm font-bold text-gray-900 dark:text-white">
219219
@if (page_check) {
220220
<div class="flex pb-6 justify-center align-middle">
221221
<button (click)="next()" class="flex cursor-pointer shadow-lg items-center justify-center px-3 h-8 text-sm font-medium text-gray-500 dark:text-white bg-white dark:bg-primary-100 dark:hover:bg-secondary-100 border border-gray-300 dark:border-secondary-200 rounded-lg hover:bg-gray-200">
222-
Load more
222+
{{ 'CREATE_PROD_SPEC._load_more' | translate }}
223223
<svg class="w-3.5 h-3.5 ms-2" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
224224
<path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M5 12h14m-7 7V5"/>
225225
</svg>

0 commit comments

Comments
 (0)