Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MARP-452 check accessibility of new website #85

Merged
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@
width="70"
height="70"
[ngSrc]="product | logo"
[alt]="product.names | multilingualism: languageService.selectedLanguage()" />
[alt]="
product.names | multilingualism: languageService.selectedLanguage()
"
[lang]="languageService.selectedLanguage()" />
@if (isShowInRESTClientEditor) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why removing it?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was not being removed, just re-formatted in the same line in line 5th

<div
class="card__tag lh-md px-2 py-1 text-capitalize"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we add lang for it?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It does not use translate or multilingualism pipe so it should not include lang

Expand All @@ -16,20 +19,23 @@
</div>
} @else {
<div
[lang]="languageService.selectedLanguage()"
class="card__tag lh-md px-2 py-1"
[ngClass]="themeService.isDarkMode() ? 'text-dark' : 'text-light'">
{{ 'common.filter.value.' + product.type | translate }}
</div>
}
</div>
<div>
<h5 class="card__title text-primary">
{{
product.names | multilingualism: languageService.selectedLanguage()
}}
<h5
class="card__title text-primary"
[lang]="languageService.selectedLanguage()">
{{ product.names | multilingualism: languageService.selectedLanguage() }}
</h5>
@if (!isShowInRESTClientEditor) {
<p class="card__description text-secondary">
<p
class="card__description text-secondary"
[lang]="languageService.selectedLanguage()">
{{
product.shortDescriptions
| multilingualism: languageService.selectedLanguage()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<div style="margin-bottom: 64px;">
<app-product-star-rating-panel (openAddFeedbackDialog)="appModalService.openAddFeedbackDialog()" [isMobileMode]="isMobileMode()" />
<app-product-star-rating-panel (openAddFeedbackDialog)="appModalService.openAddFeedbackDialog()"
[isMobileMode]="isMobileMode()" />
</div>

<app-product-feedbacks-panel [isMobileMode]="isMobileMode()" />

@if (isShowBtnMore()) {
<div class="d-flex flex-row justify-content-center">
<button
class="btn border-0 btn-secondary btn-show-more"
(click)="openShowFeedbacksDialog()">
{{ 'common.feedback.showMoreBtnLabel' | translate }}
</button>
</div>
<div class="d-flex flex-row justify-content-center">
<button [lang]="languageService.selectedLanguage()" class="btn border-0 btn-secondary btn-show-more"
(click)="openShowFeedbacksDialog()">
{{ 'common.feedback.showMoreBtnLabel' | translate }}
</button>
</div>
}
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -41,6 +42,7 @@ export class ProductDetailFeedbackComponent {

productFeedbackService = inject(ProductFeedbackService);
appModalService = inject(AppModalService);
languageService = inject(LanguageService);

showPopup!: boolean;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
<div class="d-flex flex-row align-items-center">
<p class="text-primary mb-0 text-nowrap">{{'common.sort.label' | translate}}:</p>
<select
class="form-select border-primary text-primary"
aria-label="sort"
[ngModel]="productFeedbackService.sort()"
<p [lang]="languageService.selectedLanguage()" class="text-primary mb-0 text-nowrap">{{'common.sort.label' |
translate}}:</p>
<select class="form-select border-primary text-primary" aria-label="sort" [ngModel]="productFeedbackService.sort()"
(change)="onSortChange($event)">
@for (type of feedbackSortTypes; track $index) {
<option [value]="type.sortFn">
{{ type.label | translate }}
</option>
<option [value]="type.sortFn">
{{ type.label | translate }}
</option>
}
</select>
</div>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -17,6 +18,7 @@ export class FeedbackFilterComponent {
@Output() sortChange = new EventEmitter<string>();

productFeedbackService = inject(ProductFeedbackService);
languageService = inject(LanguageService);

onSortChange(event: Event): void {
const selectElement = event.target as HTMLSelectElement;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
<div class="d-flex flex-column p-0" style="gap: 48px">
<div class="d-flex flex-row p-0 align-items-center justify-content-between feedback-header">
<h4 class="text-secondary mb-0">
<h4 [lang]="languageService.selectedLanguage()" class="text-secondary mb-0">
{{ 'common.feedback.label' | translate }}
</h4>
<app-feedback-filter (sortChange)="onSortChange($event)" />
</div>
@if (isRenderInModalDialog) {
<div class="overflow-auto grid-feedbacks-container-dialog" (scroll)="onScrollCheckAllFeedbacksLoaded($event)">
@for (feedback of feedbacks(); track $index) {
<app-product-feedback [feedback]="feedback" />
}
</div>
<div class="overflow-auto grid-feedbacks-container-dialog" (scroll)="onScrollCheckAllFeedbacksLoaded($event)">
@for (feedback of feedbacks(); track $index) {
<app-product-feedback [feedback]="feedback" />
}
</div>
} @else if (isMobileMode()) {
<div class="grid-feedbacks-container">
@for (feedback of feedbacks(); track $index) {
<app-product-feedback [feedback]="feedback" />
}
</div>
<div class="grid-feedbacks-container">
@for (feedback of feedbacks(); track $index) {
<app-product-feedback [feedback]="feedback" />
}
</div>
} @else {
<div class="grid-feedbacks-container">
@for (feedback of feedbacks() | slice:0:6; track $index) {
<app-product-feedback [feedback]="feedback" />
}
</div>
<div class="grid-feedbacks-container">
@for (feedback of feedbacks() | slice:0:6; track $index) {
<app-product-feedback [feedback]="feedback" />
}
</div>
}
</div>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -43,6 +44,7 @@ export class ProductFeedbacksPanelComponent {
themeService = inject(ThemeService);
productFeedbackService = inject(ProductFeedbackService);
productDetailService = inject(ProductDetailService);
languageService = inject(LanguageService);

feedbacks: Signal<Feedback[] | undefined> =
this.productFeedbackService.feedbacks;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,51 +1,44 @@
<div class="modal-content-wrapper">
<div class="modal-header border-bottom-0">
<button
type="button"
class="btn-close"
aria-label="Close"
(click)="activeModal.dismiss()"></button>
<button type="button" class="btn-close" aria-label="Close" (click)="activeModal.dismiss()"></button>
</div>
<div class="modal-body modal-body-wrapper default-cursor">
<h4 class="add-feedback-title text-primary">
<h4 [lang]="languageService.selectedLanguage()" class="add-feedback-title text-primary">
{{ 'common.feedback.addFeedbackTitle' | translate }}
</h4>
<h5 class="text-secondary">
<h5 [lang]="languageService.selectedLanguage()" class="text-secondary">
{{ 'common.feedback.addFeedbackDescription' | translate }}
</h5>
<div>
<p class="text-secondary mb-2">
<p [lang]="languageService.selectedLanguage()" class="text-secondary mb-2">
{{ 'common.feedback.currentProductTitle' | translate }}
</p>
<select
class="form-select product-item-select border-primary text-primary"
aria-label="item">
<option>{{ productDetailService.productNames() | multilingualism: languageService.selectedLanguage() }}</option>
<select class="form-select product-item-select border-primary text-primary" aria-label="item">
<option [lang]="languageService.selectedLanguage()">{{ productDetailService.productNames() | multilingualism:
languageService.selectedLanguage() }}</option>
</select>
</div>
<div class="d-flex flex-column flex-grow-1">
<p class="text-secondary mb-2">
<p [lang]="languageService.selectedLanguage()" class="text-secondary mb-2">
{{ 'common.feedback.starRatingTitle' | translate }}
</p>
<app-star-rating [rate]="feedback.rating" (rateChange)="onRateChange($event)" [starClass]="'adding-feedback-star'" [ratingStarsClass]="'rating-stars'" />
<p class="text-secondary mb-2 mt-3">
<app-star-rating [rate]="feedback.rating" (rateChange)="onRateChange($event)" [starClass]="'adding-feedback-star'"
[ratingStarsClass]="'rating-stars'" />
<p [lang]="languageService.selectedLanguage()" class="text-secondary mb-2 mt-3">
{{ 'common.feedback.commentLabel' | translate }}
</p>
<textarea
class="feedback-content-textarea text-primary"
maxlength="250"
<textarea class="feedback-content-textarea text-primary" maxlength="250"
[(ngModel)]="feedback.content"></textarea>
</div>
<button
class="btn btn-primary border-0 submit-feedback-btn" [disabled]="!feedback.content.trim() || feedback.rating <= 0"
(click)="onSubmitFeedback()">
<button [lang]="languageService.selectedLanguage()" class="btn btn-primary border-0 submit-feedback-btn"
[disabled]="!feedback.content.trim() || feedback.rating <= 0" (click)="onSubmitFeedback()">
{{ 'common.feedback.submitBtnLabel' | translate }}
</button>
<p class="text-secondary mb-2 text-center">
<p [lang]="languageService.selectedLanguage()" class="text-secondary mb-2 text-center">
{{ 'common.feedback.loggedGithubAsLabel' | translate }}
<span class="user-link">
{{ displayName }}
</span>
</p>
</div>
</div>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
<button type="button" class="btn-close" aria-label="Close" (click)="activeModal.dismiss()"></button>
</div>
<div class="modal-body">
<img ngSrc="/assets/images/misc/confetti-icon.png"
width="60" height="60" alt="Confetti Icon">
<h4 class="text-primary">
<img ngSrc="/assets/images/misc/confetti-icon.png" width="60" height="60" alt="Confetti Icon">
<h4 [lang]="languageService.selectedLanguage()" class="text-primary">
{{ 'common.feedback.successMessage' | translate }}
</h4>
<h4 class="text-primary">{{ 'common.feedback.thankMessage' | translate }} {{ authService.getDisplayName() ?? '' }}</h4>
<h4 [lang]="languageService.selectedLanguage()" class="text-primary">{{ 'common.feedback.thankMessage' | translate
}} {{ authService.getDisplayName() ?? '' }}</h4>
</div>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -16,4 +17,6 @@ export class SuccessDialogComponent {
activeModal = inject(NgbActiveModal);

authService = inject(AuthService);

languageService = inject(LanguageService);
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<app-product-star-rating-number (openAddFeedbackDialog)="openAddFeedbackDialog.emit()" />
<div></div>
<div>
<p class="text-secondary mb-1">
<p [lang]="languageService.selectedLanguage()" class="text-secondary mb-1">
{{ 'common.feedback.detailedReviews' | translate }}
</p>
<div>
Expand All @@ -19,8 +19,8 @@
</div>
</div>
<div aria-hidden="true" class="star-rating-counting-line">
<div id="star-rating-percent-{{ counting.starRating }}" class="star-rating-percent"
starRatingHighlight [percent]="counting.percent!"></div>
<div id="star-rating-percent-{{ counting.starRating }}" class="star-rating-percent" starRatingHighlight
[percent]="counting.percent!"></div>
</div>
</div>
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -28,6 +29,7 @@ export class ProductStarRatingPanelComponent {
@Output() openAddFeedbackDialog = new EventEmitter<void>();

productStarRatingService = inject(ProductStarRatingService);
languageService = inject(LanguageService);

starRatings: Signal<StarRatingCounting[]> = this.productStarRatingService.starRatings;
}
Loading
Loading