From 9d18e66409c0ef7b2296c00c112a3b738ead1745 Mon Sep 17 00:00:00 2001 From: tutn Date: Tue, 6 Aug 2024 15:17:05 +0700 Subject: [PATCH 01/12] add image alt --- .../product/product-detail/product-detail.component.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/marketplace-ui/src/app/modules/product/product-detail/product-detail.component.html b/marketplace-ui/src/app/modules/product/product-detail/product-detail.component.html index 73592b411..e916c9e3f 100644 --- a/marketplace-ui/src/app/modules/product/product-detail/product-detail.component.html +++ b/marketplace-ui/src/app/modules/product/product-detail/product-detail.component.html @@ -17,7 +17,8 @@
- +

{{ From 6153fb2d47818e5fb4b4fe8b2802ba5eb59b1329 Mon Sep 17 00:00:00 2001 From: tutn Date: Tue, 6 Aug 2024 15:17:17 +0700 Subject: [PATCH 02/12] add autocomplete for input --- .../product/product-filter/product-filter.component.html | 1 + .../components/header/navigation/navigation.component.html | 1 + .../components/header/search-bar/search-bar.component.html | 2 ++ 3 files changed, 4 insertions(+) diff --git a/marketplace-ui/src/app/modules/product/product-filter/product-filter.component.html b/marketplace-ui/src/app/modules/product/product-filter/product-filter.component.html index f63101c8b..6021eecec 100644 --- a/marketplace-ui/src/app/modules/product/product-filter/product-filter.component.html +++ b/marketplace-ui/src/app/modules/product/product-filter/product-filter.component.html @@ -68,6 +68,7 @@

- -
+
{{ 'common.filter.value.' + product.type | translate }}
-
+
{{ - product.names | multilingualism: languageService.selectedLanguage() + product.names | multilingualism: languageService.selectedLanguage() }}
-

+

{{ - product.shortDescriptions - | multilingualism: languageService.selectedLanguage() + product.shortDescriptions | multilingualism: languageService.selectedLanguage() }}

-
+ \ No newline at end of file diff --git a/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-detail-feedback.component.html b/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-detail-feedback.component.html index 196c02984..de0d9b4fb 100644 --- a/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-detail-feedback.component.html +++ b/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-detail-feedback.component.html @@ -1,15 +1,15 @@
- +
@if (isShowBtnMore()) { -
- -
+
+ +
} \ No newline at end of file diff --git a/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-detail-feedback.component.ts b/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-detail-feedback.component.ts index 7b4e4d318..3ed5bab2a 100644 --- a/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-detail-feedback.component.ts +++ b/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-detail-feedback.component.ts @@ -11,6 +11,7 @@ import { ProductFeedbacksPanelComponent } from './product-feedbacks-panel/produc import { AppModalService } from '../../../../shared/services/app-modal.service'; import { ProductFeedbackService } from './product-feedbacks-panel/product-feedback.service'; import { TranslateModule } from '@ngx-translate/core'; +import { LanguageService } from '../../../../core/services/language/language.service'; const MAX_ELEMENTS = 6; @@ -41,6 +42,7 @@ export class ProductDetailFeedbackComponent { productFeedbackService = inject(ProductFeedbackService); appModalService = inject(AppModalService); + languageService = inject(LanguageService); showPopup!: boolean; diff --git a/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-feedbacks-panel/feedback-filter/feedback-filter.component.html b/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-feedbacks-panel/feedback-filter/feedback-filter.component.html index 1741cde6d..9df399dcb 100644 --- a/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-feedbacks-panel/feedback-filter/feedback-filter.component.html +++ b/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-feedbacks-panel/feedback-filter/feedback-filter.component.html @@ -1,14 +1,12 @@
-

{{'common.sort.label' | translate}}:

- @for (type of feedbackSortTypes; track $index) { - + } -
+ \ No newline at end of file diff --git a/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-feedbacks-panel/feedback-filter/feedback-filter.component.ts b/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-feedbacks-panel/feedback-filter/feedback-filter.component.ts index e8b316b5a..1a7645579 100644 --- a/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-feedbacks-panel/feedback-filter/feedback-filter.component.ts +++ b/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-feedbacks-panel/feedback-filter/feedback-filter.component.ts @@ -3,6 +3,7 @@ import { TranslateModule } from '@ngx-translate/core'; import { FEEDBACK_SORT_TYPES } from '../../../../../../shared/constants/common.constant'; import { FormsModule } from '@angular/forms'; import { ProductFeedbackService } from '../product-feedback.service'; +import { LanguageService } from '../../../../../../core/services/language/language.service'; @Component({ selector: 'app-feedback-filter', @@ -17,6 +18,7 @@ export class FeedbackFilterComponent { @Output() sortChange = new EventEmitter(); productFeedbackService = inject(ProductFeedbackService); + languageService = inject(LanguageService); onSortChange(event: Event): void { const selectElement = event.target as HTMLSelectElement; diff --git a/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-feedbacks-panel/product-feedbacks-panel.component.html b/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-feedbacks-panel/product-feedbacks-panel.component.html index 37067feed..3e674a7e7 100644 --- a/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-feedbacks-panel/product-feedbacks-panel.component.html +++ b/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-feedbacks-panel/product-feedbacks-panel.component.html @@ -1,27 +1,27 @@
@if (isRenderInModalDialog) { -
- @for (feedback of feedbacks(); track $index) { - - } -
+
+ @for (feedback of feedbacks(); track $index) { + + } +
} @else if (isMobileMode()) { -
- @for (feedback of feedbacks(); track $index) { - - } -
+
+ @for (feedback of feedbacks(); track $index) { + + } +
} @else { -
- @for (feedback of feedbacks() | slice:0:6; track $index) { - - } -
+
+ @for (feedback of feedbacks() | slice:0:6; track $index) { + + } +
} -
+ \ No newline at end of file diff --git a/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-feedbacks-panel/product-feedbacks-panel.component.ts b/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-feedbacks-panel/product-feedbacks-panel.component.ts index 6f2c46cca..3531a69fc 100644 --- a/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-feedbacks-panel/product-feedbacks-panel.component.ts +++ b/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-feedbacks-panel/product-feedbacks-panel.component.ts @@ -15,6 +15,7 @@ import { ThemeService } from '../../../../../core/services/theme/theme.service'; import { Feedback } from '../../../../../shared/models/feedback.model'; import { CommonModule } from '@angular/common'; import { ProductDetailService } from '../../product-detail.service'; +import { LanguageService } from '../../../../../core/services/language/language.service'; interface CustomElement extends HTMLElement { scrollTop: number; @@ -43,6 +44,7 @@ export class ProductFeedbacksPanelComponent { themeService = inject(ThemeService); productFeedbackService = inject(ProductFeedbackService); productDetailService = inject(ProductDetailService); + languageService = inject(LanguageService); feedbacks: Signal = this.productFeedbackService.feedbacks; diff --git a/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-star-rating-panel/add-feedback-dialog/add-feedback-dialog.component.html b/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-star-rating-panel/add-feedback-dialog/add-feedback-dialog.component.html index 9eca9042f..6473df0bb 100644 --- a/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-star-rating-panel/add-feedback-dialog/add-feedback-dialog.component.html +++ b/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-star-rating-panel/add-feedback-dialog/add-feedback-dialog.component.html @@ -1,51 +1,45 @@
- +
-

+

{{ 'common.feedback.addFeedbackTitle' | translate }}

-
+
{{ 'common.feedback.addFeedbackDescription' | translate }}
-

+

{{ 'common.feedback.currentProductTitle' | translate }}

- +
-

+

{{ 'common.feedback.starRatingTitle' | translate }}

- -

+ +

{{ 'common.feedback.commentLabel' | translate }}

-
- -

+

{{ 'common.feedback.loggedGithubAsLabel' | translate }} {{ displayName }}

-
+ \ No newline at end of file diff --git a/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-star-rating-panel/add-feedback-dialog/success-dialog/success-dialog.component.html b/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-star-rating-panel/add-feedback-dialog/success-dialog/success-dialog.component.html index 6cc10d0a8..0f2d4b724 100644 --- a/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-star-rating-panel/add-feedback-dialog/success-dialog/success-dialog.component.html +++ b/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-star-rating-panel/add-feedback-dialog/success-dialog/success-dialog.component.html @@ -3,11 +3,11 @@
- Confetti Icon -

+ Confetti Icon +

{{ 'common.feedback.successMessage' | translate }}

-

{{ 'common.feedback.thankMessage' | translate }} {{ authService.getDisplayName() ?? '' }}

+

{{ 'common.feedback.thankMessage' | translate + }} {{ authService.getDisplayName() ?? '' }}

\ No newline at end of file diff --git a/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-star-rating-panel/add-feedback-dialog/success-dialog/success-dialog.component.ts b/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-star-rating-panel/add-feedback-dialog/success-dialog/success-dialog.component.ts index 9790866c9..3384b7ce4 100644 --- a/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-star-rating-panel/add-feedback-dialog/success-dialog/success-dialog.component.ts +++ b/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-star-rating-panel/add-feedback-dialog/success-dialog/success-dialog.component.ts @@ -3,6 +3,7 @@ import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { AuthService } from '../../../../../../../auth/auth.service'; import { NgOptimizedImage } from '@angular/common'; +import { LanguageService } from '../../../../../../../core/services/language/language.service'; @Component({ selector: 'app-success-dialog', @@ -16,4 +17,6 @@ export class SuccessDialogComponent { activeModal = inject(NgbActiveModal); authService = inject(AuthService); + + languageService = inject(LanguageService); } \ No newline at end of file diff --git a/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-star-rating-panel/product-star-rating-panel.component.html b/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-star-rating-panel/product-star-rating-panel.component.html index eb1c26356..f6ca0d2d9 100644 --- a/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-star-rating-panel/product-star-rating-panel.component.html +++ b/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-star-rating-panel/product-star-rating-panel.component.html @@ -6,7 +6,7 @@
-

+

{{ 'common.feedback.detailedReviews' | translate }}

@@ -19,8 +19,8 @@
} diff --git a/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-star-rating-panel/product-star-rating-panel.component.ts b/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-star-rating-panel/product-star-rating-panel.component.ts index 86888b5e2..351599f1e 100644 --- a/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-star-rating-panel/product-star-rating-panel.component.ts +++ b/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-star-rating-panel/product-star-rating-panel.component.ts @@ -8,6 +8,7 @@ import { } from '../../product-star-rating-number/product-star-rating-number.component'; import { CommonModule } from '@angular/common'; import { StarRatingCounting } from '../../../../../shared/models/star-rating-counting.model'; +import { LanguageService } from '../../../../../core/services/language/language.service'; @Component({ selector: 'app-product-star-rating-panel', @@ -28,6 +29,7 @@ export class ProductStarRatingPanelComponent { @Output() openAddFeedbackDialog = new EventEmitter(); productStarRatingService = inject(ProductStarRatingService); + languageService = inject(LanguageService); starRatings: Signal = this.productStarRatingService.starRatings; } diff --git a/marketplace-ui/src/app/modules/product/product-detail/product-detail-information-tab/product-detail-information-tab.component.html b/marketplace-ui/src/app/modules/product/product-detail/product-detail-information-tab/product-detail-information-tab.component.html index caf883de5..d61a45eb4 100644 --- a/marketplace-ui/src/app/modules/product/product-detail/product-detail-information-tab/product-detail-information-tab.component.html +++ b/marketplace-ui/src/app/modules/product/product-detail/product-detail-information-tab/product-detail-information-tab.component.html @@ -1,16 +1,16 @@ -

+

{{ 'common.product.detail.information.label' | translate }}

- + {{ 'common.product.detail.information.value.author' | translate }} {{ productDetail.vendor }}
- + {{ 'common.product.detail.information.value.version' | translate }} @@ -19,7 +19,7 @@

- + {{ 'common.product.detail.information.value.compatibility' | translate }} @@ -28,35 +28,35 @@

- + {{ 'common.product.detail.information.value.cost' | translate }} {{ productDetail.cost }}
- + {{ 'common.product.detail.information.value.language' | translate }} {{ productDetail.language }}
- + {{ 'common.product.detail.type' | translate }} {{ productDetail.type }}
- + {{ 'common.product.detail.information.value.industry' | translate }} {{ productDetail.industry }}
- + {{ 'common.product.detail.information.value.tag' | translate }} @@ -65,7 +65,7 @@

- + {{ 'common.product.detail.information.value.source' | translate }} @@ -76,26 +76,24 @@

- + {{ 'common.product.detail.information.value.status' | translate }}
- + {{ - 'common.product.detail.information.value.moreInformation' | translate + 'common.product.detail.information.value.moreInformation' | translate }} - {{ 'common.product.detail.information.value.contactUs' | translate }}
-
+ \ No newline at end of file diff --git a/marketplace-ui/src/app/modules/product/product-detail/product-detail-information-tab/product-detail-information-tab.component.ts b/marketplace-ui/src/app/modules/product/product-detail/product-detail-information-tab/product-detail-information-tab.component.ts index 8c8ca8822..5d7bb86dc 100644 --- a/marketplace-ui/src/app/modules/product/product-detail/product-detail-information-tab/product-detail-information-tab.component.ts +++ b/marketplace-ui/src/app/modules/product/product-detail/product-detail-information-tab/product-detail-information-tab.component.ts @@ -1,7 +1,8 @@ import { CommonModule } from '@angular/common'; -import { Component, Input } from '@angular/core'; +import { Component, inject, Input } from '@angular/core'; import { TranslateModule } from '@ngx-translate/core'; import { ProductDetail } from '../../../../shared/models/product-detail.model'; +import { LanguageService } from '../../../../core/services/language/language.service'; @Component({ selector: 'app-product-detail-information-tab', @@ -15,4 +16,6 @@ export class ProductDetailInformationTabComponent { productDetail!: ProductDetail; @Input() selectedVersion!: string; + + languageService = inject(LanguageService); } diff --git a/marketplace-ui/src/app/modules/product/product-detail/product-detail-maven-content/product-detail-maven-content.component.html b/marketplace-ui/src/app/modules/product/product-detail/product-detail-maven-content/product-detail-maven-content.component.html index ef973f8cf..15e185a93 100644 --- a/marketplace-ui/src/app/modules/product/product-detail/product-detail-maven-content/product-detail-maven-content.component.html +++ b/marketplace-ui/src/app/modules/product/product-detail/product-detail-maven-content/product-detail-maven-content.component.html @@ -1,4 +1,4 @@ -

+

<!-- {{ productModuleContent.name }} -->
@@ -17,4 +17,4 @@   <type>{{ productModuleContent.type }}</type>
</dependency> - + \ No newline at end of file diff --git a/marketplace-ui/src/app/modules/product/product-detail/product-detail-maven-content/product-detail-maven-content.component.ts b/marketplace-ui/src/app/modules/product/product-detail/product-detail-maven-content/product-detail-maven-content.component.ts index 9d46efffb..a645e68e9 100644 --- a/marketplace-ui/src/app/modules/product/product-detail/product-detail-maven-content/product-detail-maven-content.component.ts +++ b/marketplace-ui/src/app/modules/product/product-detail/product-detail-maven-content/product-detail-maven-content.component.ts @@ -1,6 +1,7 @@ -import { Component, Input } from '@angular/core'; +import { Component, inject, Input } from '@angular/core'; import { TranslateModule } from '@ngx-translate/core'; import { ProductModuleContent } from '../../../../shared/models/product-module-content.model'; +import { LanguageService } from '../../../../core/services/language/language.service'; @Component({ selector: 'app-product-detail-maven-content', @@ -14,4 +15,6 @@ export class ProductDetailMavenContentComponent { productModuleContent!: ProductModuleContent; @Input() selectedVersion!: string; + + languageService = inject(LanguageService); } diff --git a/marketplace-ui/src/app/modules/product/product-detail/product-detail-version-action/product-detail-version-action.component.html b/marketplace-ui/src/app/modules/product/product-detail/product-detail-version-action/product-detail-version-action.component.html index 5c1bffebf..bac8349a1 100644 --- a/marketplace-ui/src/app/modules/product/product-detail/product-detail-version-action/product-detail-version-action.component.html +++ b/marketplace-ui/src/app/modules/product/product-detail/product-detail-version-action/product-detail-version-action.component.html @@ -1,11 +1,12 @@ - @if(!isDesignerEnvironment()) { - } @@ -15,7 +16,7 @@
-
-
- + @if (isDevVersionsDisplayed()) { {{ 'common.product.detail.download.hideDevVersions' | translate }} } @else { @@ -54,7 +57,7 @@ }
- -
-
@@ -142,56 +111,31 @@

-
- + +
-
- +
-
- +
-
-
-
- +
@@ -200,29 +144,25 @@

@if (productDetail() && productFeedbackService.totalElements() > 0) { - + } @else { -
-
- Message Star -

- {{ 'common.feedback.noFeedbackMessage1' | translate }} -
- {{ 'common.feedback.noFeedbackMessage2' | translate }} -

- -
+
+
+ Message Star +

+ {{ 'common.feedback.noFeedbackMessage1' | translate + }} +
+ {{ 'common.feedback.noFeedbackMessage2' | translate + }} +

+
+
}
-
+ \ No newline at end of file diff --git a/marketplace-ui/src/app/modules/product/product-detail/product-installation-count-action/product-installation-count-action.component.html b/marketplace-ui/src/app/modules/product/product-detail/product-installation-count-action/product-installation-count-action.component.html index 60b474ae8..98a1a2082 100644 --- a/marketplace-ui/src/app/modules/product/product-detail/product-installation-count-action/product-installation-count-action.component.html +++ b/marketplace-ui/src/app/modules/product/product-detail/product-installation-count-action/product-installation-count-action.component.html @@ -1,9 +1,9 @@
-

+

{{ 'common.product.detail.installation' | translate }}

{{this.currentInstallationCount}}

-

+

{{ 'common.product.detail.times' | translate }}

-
+ \ No newline at end of file diff --git a/marketplace-ui/src/app/modules/product/product-detail/product-installation-count-action/product-installation-count-action.component.ts b/marketplace-ui/src/app/modules/product/product-detail/product-installation-count-action/product-installation-count-action.component.ts index 6b40a0e5a..dd7be48d5 100644 --- a/marketplace-ui/src/app/modules/product/product-detail/product-installation-count-action/product-installation-count-action.component.ts +++ b/marketplace-ui/src/app/modules/product/product-detail/product-installation-count-action/product-installation-count-action.component.ts @@ -1,5 +1,6 @@ -import {Component, Input} from '@angular/core'; +import {Component, inject, Input} from '@angular/core'; import {TranslateModule} from "@ngx-translate/core"; +import { LanguageService } from '../../../../core/services/language/language.service'; @Component({ selector: 'app-product-installation-count-action', @@ -14,4 +15,6 @@ import {TranslateModule} from "@ngx-translate/core"; export class ProductInstallationCountActionComponent { @Input() currentInstallationCount!: number; + + languageService = inject(LanguageService); } diff --git a/marketplace-ui/src/app/modules/product/product-detail/product-star-rating-number/product-star-rating-number.component.html b/marketplace-ui/src/app/modules/product/product-detail/product-star-rating-number/product-star-rating-number.component.html index a669dd5f7..7decf1a1a 100644 --- a/marketplace-ui/src/app/modules/product/product-detail/product-star-rating-number/product-star-rating-number.component.html +++ b/marketplace-ui/src/app/modules/product/product-detail/product-star-rating-number/product-star-rating-number.component.html @@ -1,46 +1,36 @@ -
-

{{ - (productStarRatingService.totalComments() > 0 - ? 'common.feedback.reviewLabel' - : 'common.feedback.reviewLabelNoYet' - ) | translate + (productStarRatingService.totalComments() > 0 + ? 'common.feedback.reviewLabel' + : 'common.feedback.reviewLabelNoYet' + ) + }}

@if (productStarRatingService.totalComments() > 0) { -

- {{ productStarRatingService.reviewNumber() | number: '1.1-1' }} -

+

+ {{ productStarRatingService.reviewNumber() | number: '1.1-1' }} +

} @else { - Message Star + Message Star }
- @if (isShowTotalRatingNumber) { -

- ({{ productStarRatingService.totalComments() }}) -

+

+ ({{ productStarRatingService.totalComments() }}) +

}
@if (isShowRateLink) { - - {{ 'common.feedback.rateLinkLabel' | translate }} - + + {{ 'common.feedback.rateLinkLabel' | translate }} + } -
+ \ No newline at end of file diff --git a/marketplace-ui/src/app/modules/product/product-detail/product-star-rating-number/product-star-rating-number.component.ts b/marketplace-ui/src/app/modules/product/product-detail/product-star-rating-number/product-star-rating-number.component.ts index 4516546ff..74413de3f 100644 --- a/marketplace-ui/src/app/modules/product/product-detail/product-star-rating-number/product-star-rating-number.component.ts +++ b/marketplace-ui/src/app/modules/product/product-detail/product-star-rating-number/product-star-rating-number.component.ts @@ -7,6 +7,7 @@ import { import { CommonModule } from '@angular/common'; import { AuthService } from '../../../../auth/auth.service'; import { ProductDetailService } from '../product-detail.service'; +import { LanguageService } from '../../../../core/services/language/language.service'; @Component({ selector: 'app-product-star-rating-number', @@ -19,6 +20,7 @@ export class ProductStarRatingNumberComponent { productStarRatingService = inject(ProductStarRatingService); private readonly productDetailService = inject(ProductDetailService); private readonly authService = inject(AuthService); + languageService = inject(LanguageService); @Input() isShowRateLink = true; @Input() isShowTotalRatingNumber = true; diff --git a/marketplace-ui/src/app/modules/product/product-filter/product-filter.component.html b/marketplace-ui/src/app/modules/product/product-filter/product-filter.component.html index 6021eecec..bfff0fc5c 100644 --- a/marketplace-ui/src/app/modules/product/product-filter/product-filter.component.html +++ b/marketplace-ui/src/app/modules/product/product-filter/product-filter.component.html @@ -6,10 +6,7 @@
@for (type of types; track $index) { -
-

+

{{ type.label | translate }}

}
- @for (type of types; track $index) { - } @@ -39,19 +32,14 @@
-
+

{{ translateService.get('common.sort.label') | async }}:

- @for (type of sorts; track $index) { - } @@ -62,19 +50,13 @@

- +
- + [ariaLabel]="translateService.get('common.search.placeholder') | async" aria-describedby="search" />
-

+
\ No newline at end of file diff --git a/marketplace-ui/src/app/modules/product/product-filter/product-filter.component.ts b/marketplace-ui/src/app/modules/product/product-filter/product-filter.component.ts index c2d9cfc66..b57b92246 100644 --- a/marketplace-ui/src/app/modules/product/product-filter/product-filter.component.ts +++ b/marketplace-ui/src/app/modules/product/product-filter/product-filter.component.ts @@ -6,6 +6,7 @@ import { ThemeService } from '../../../core/services/theme/theme.service'; import { FILTER_TYPES, SORT_TYPES } from '../../../shared/constants/common.constant'; import { TypeOption } from '../../../shared/enums/type-option.enum'; import { SortOption } from '../../../shared/enums/sort-option.enum'; +import { LanguageService } from '../../../core/services/language/language.service'; @Component({ selector: 'app-product-filter', @@ -28,6 +29,7 @@ export class ProductFilterComponent { themeService = inject(ThemeService); translateService = inject(TranslateService); + languageService = inject(LanguageService); onSelectType(type: TypeOption) { this.selectedType = type; diff --git a/marketplace-ui/src/app/modules/product/product.component.html b/marketplace-ui/src/app/modules/product/product.component.html index 2cc8ff608..809197fcc 100644 --- a/marketplace-ui/src/app/modules/product/product.component.html +++ b/marketplace-ui/src/app/modules/product/product.component.html @@ -12,43 +12,32 @@

{{ translateService.get('common.introduction.contribute') | async }}

-

- @if (products().length > 0) { -
- @for (product of products(); track $index) { -
- -
- } +
+ @for (product of products(); track $index) { +
+
+ } +
} @else { -
-
- Search not found -
-
+
+
+ Search not found +
+
}
-
+
\ No newline at end of file diff --git a/marketplace-ui/src/app/shared/components/footer/footer.component.html b/marketplace-ui/src/app/shared/components/footer/footer.component.html index f9a831c6d..4338dc041 100644 --- a/marketplace-ui/src/app/shared/components/footer/footer.component.html +++ b/marketplace-ui/src/app/shared/components/footer/footer.component.html @@ -1,30 +1,24 @@
-
+
-
- -
@@ -36,12 +30,9 @@
-
+
@for (link of ivyFooterLinks; track $index) {
- + {{ link.label | translate }}
@@ -67,17 +57,15 @@
-
- + \ No newline at end of file diff --git a/marketplace-ui/src/app/shared/components/footer/footer.component.ts b/marketplace-ui/src/app/shared/components/footer/footer.component.ts index 3ae857a18..0c16ce98f 100644 --- a/marketplace-ui/src/app/shared/components/footer/footer.component.ts +++ b/marketplace-ui/src/app/shared/components/footer/footer.component.ts @@ -4,6 +4,7 @@ import { TranslateModule } from '@ngx-translate/core'; import { ThemeService } from '../../../core/services/theme/theme.service'; import { IVY_FOOTER_LINKS, NAV_ITEMS, SOCIAL_MEDIA_LINK } from '../../constants/common.constant'; import { NavItem } from '../../models/nav-item.model'; +import { LanguageService } from '../../../core/services/language/language.service'; @Component({ selector: 'app-footer', @@ -14,6 +15,7 @@ import { NavItem } from '../../models/nav-item.model'; }) export class FooterComponent { themeService = inject(ThemeService); + languageService = inject(LanguageService); socialMediaLinks = SOCIAL_MEDIA_LINK; navItems: NavItem[] = NAV_ITEMS; ivyFooterLinks = IVY_FOOTER_LINKS; diff --git a/marketplace-ui/src/app/shared/components/header/navigation/navigation.component.html b/marketplace-ui/src/app/shared/components/header/navigation/navigation.component.html index 8ae020416..5d9c7a82e 100644 --- a/marketplace-ui/src/app/shared/components/header/navigation/navigation.component.html +++ b/marketplace-ui/src/app/shared/components/header/navigation/navigation.component.html @@ -2,15 +2,11 @@
- +
-
@@ -18,20 +14,14 @@ - + \ No newline at end of file diff --git a/marketplace-ui/src/app/shared/components/header/navigation/navigation.component.ts b/marketplace-ui/src/app/shared/components/header/navigation/navigation.component.ts index 858d48ce7..a8db15d56 100644 --- a/marketplace-ui/src/app/shared/components/header/navigation/navigation.component.ts +++ b/marketplace-ui/src/app/shared/components/header/navigation/navigation.component.ts @@ -3,6 +3,7 @@ import { Component, inject, Input } from '@angular/core'; import { TranslateModule, TranslateService } from '@ngx-translate/core'; import { NAV_ITEMS } from '../../../constants/common.constant'; import { NavItem } from '../../../models/nav-item.model'; +import { LanguageService } from '../../../../core/services/language/language.service'; @Component({ selector: 'app-navigation', @@ -15,4 +16,5 @@ export class NavigationComponent { @Input() navItems: NavItem[] = NAV_ITEMS; translateService = inject(TranslateService); + languageService = inject(LanguageService); } diff --git a/marketplace-ui/src/app/shared/components/header/search-bar/search-bar.component.html b/marketplace-ui/src/app/shared/components/header/search-bar/search-bar.component.html index 877ff9d69..2600bb32c 100644 --- a/marketplace-ui/src/app/shared/components/header/search-bar/search-bar.component.html +++ b/marketplace-ui/src/app/shared/components/header/search-bar/search-bar.component.html @@ -4,34 +4,27 @@
  • - - - + + +
    - + " /> -
    - - - +
    + + +
    • } @else { -
    +
    • @@ -47,20 +40,16 @@ @if (isSearchBarDisplayed()) {
    - - - + + +
    - + " />
    } @else {
    @@ -71,13 +60,13 @@
  • -
    • } - + \ No newline at end of file diff --git a/marketplace-ui/src/app/shared/components/header/search-bar/search-bar.component.ts b/marketplace-ui/src/app/shared/components/header/search-bar/search-bar.component.ts index caf326ec2..fd530437b 100644 --- a/marketplace-ui/src/app/shared/components/header/search-bar/search-bar.component.ts +++ b/marketplace-ui/src/app/shared/components/header/search-bar/search-bar.component.ts @@ -3,6 +3,7 @@ import { Component, ElementRef, HostListener, inject, signal } from '@angular/co import { TranslateModule, TranslateService } from '@ngx-translate/core'; import { LanguageSelectionComponent } from '../language-selection/language-selection.component'; import { ThemeSelectionComponent } from '../theme-selection/theme-selection.component'; +import { LanguageService } from '../../../../core/services/language/language.service'; @Component({ selector: 'app-search-bar', @@ -21,6 +22,7 @@ export class SearchBarComponent { translateService = inject(TranslateService); elementRef = inject(ElementRef); + languageService = inject(LanguageService); @HostListener('document:click', ['$event']) handleClickOutside(event: MouseEvent) { From cc2fe766050d976879ed3cde3b57b2b11a0f18d5 Mon Sep 17 00:00:00 2001 From: tutn Date: Thu, 8 Aug 2024 09:48:39 +0700 Subject: [PATCH 04/12] Update description text color --- .../product/product-detail/product-detail.component.scss | 1 + marketplace-ui/src/assets/scss/custom-style.scss | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/marketplace-ui/src/app/modules/product/product-detail/product-detail.component.scss b/marketplace-ui/src/app/modules/product/product-detail/product-detail.component.scss index 688a50ff7..a17334e1f 100644 --- a/marketplace-ui/src/app/modules/product/product-detail/product-detail.component.scss +++ b/marketplace-ui/src/app/modules/product/product-detail/product-detail.component.scss @@ -57,6 +57,7 @@ ul, li { font-size: 18px; font-weight: 400; + color: var(--ivy-text-primary-color); } ul, li { diff --git a/marketplace-ui/src/assets/scss/custom-style.scss b/marketplace-ui/src/assets/scss/custom-style.scss index 353b3313e..646ff5cf2 100644 --- a/marketplace-ui/src/assets/scss/custom-style.scss +++ b/marketplace-ui/src/assets/scss/custom-style.scss @@ -62,8 +62,8 @@ p { --ivy-active-color: #{$ivyPrimaryColorLight}; --ivy-link-corlor: #{$ivyPrimaryColorLight}; --ivy-text-normal-color: #{$ivyNormalTextColorLight}; - --ivy-text-primary-color: $ivyPrimaryTextColorLight; - --ivy-text-secondary-color: $ivySecondaryTextLight; + --ivy-text-primary-color: #{$ivyPrimaryTextColorLight}; + --ivy-text-secondary-color: #{$ivySecondaryTextLight}; --ivy-border-color: #{$ivySecondaryButtonHoverLight}; --ivy-textarea-background-color: #FAFAFA; --header-border-color: #ebebeb; From f7475725f7e7d8666d2304ba861be7114e0f684a Mon Sep 17 00:00:00 2001 From: tutn Date: Mon, 12 Aug 2024 14:23:26 +0700 Subject: [PATCH 05/12] Handle feedback --- .../product-card/product-card.component.html | 16 +++++++--------- .../add-feedback-dialog.component.html | 3 +-- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/marketplace-ui/src/app/modules/product/product-card/product-card.component.html b/marketplace-ui/src/app/modules/product/product-card/product-card.component.html index f31c06ba2..e894d0f5b 100644 --- a/marketplace-ui/src/app/modules/product/product-card/product-card.component.html +++ b/marketplace-ui/src/app/modules/product/product-card/product-card.component.html @@ -1,6 +1,4 @@ -
    +
    @if (!isShowInRESTClientEditor) { -

    - {{ - product.shortDescriptions - | multilingualism: languageService.selectedLanguage() - }} -

    +

    + {{ + product.shortDescriptions + | multilingualism: languageService.selectedLanguage() + }} +

    }
    \ No newline at end of file diff --git a/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-star-rating-panel/add-feedback-dialog/add-feedback-dialog.component.html b/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-star-rating-panel/add-feedback-dialog/add-feedback-dialog.component.html index 211d2be14..7b6c61bc9 100644 --- a/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-star-rating-panel/add-feedback-dialog/add-feedback-dialog.component.html +++ b/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-star-rating-panel/add-feedback-dialog/add-feedback-dialog.component.html @@ -24,8 +24,7 @@

    -

    +

    {{ 'common.feedback.commentLabel' | translate }}