-
Notifications
You must be signed in to change notification settings - Fork 2
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
tutn-axonivy
merged 14 commits into
develop
from
feature/MARP-452-Check-accessibility-of-new-Website
Aug 12, 2024
Merged
Changes from 5 commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
9d18e66
add image alt
tutn-axonivy 6153fb2
add autocomplete for input
tutn-axonivy 6def132
add lang attribute
tutn-axonivy cc2fe76
Update description text color
tutn-axonivy 94a4a7f
Merge remote-tracking branch 'origin/develop' into feature/MARP-452-C…
tutn-axonivy 731bbb8
Merge remote-tracking branch 'origin/develop' into feature/MARP-452-C…
tutn-axonivy f747572
Handle feedback
tutn-axonivy 7fcf43f
reformat code
tutn-axonivy 31989fa
reformat code
tutn-axonivy 279d4d6
Fix unit test
tutn-axonivy 18e8c2a
remove input focus border
tutn-axonivy acffaca
re-format code
tutn-axonivy 8ecb995
revert code
tutn-axonivy d4bbaf0
fix fail unit test
tutn-axonivy File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
16 changes: 8 additions & 8 deletions
16
...les/product/product-detail/product-detail-feedback/product-detail-feedback.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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> | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
16 changes: 7 additions & 9 deletions
16
...ct-detail-feedback/product-feedbacks-panel/feedback-filter/feedback-filter.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
34 changes: 17 additions & 17 deletions
34
...il/product-detail-feedback/product-feedbacks-panel/product-feedbacks-panel.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
40 changes: 17 additions & 23 deletions
40
...feedback/product-star-rating-panel/add-feedback-dialog/add-feedback-dialog.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,51 +1,45 @@ | ||
<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"> | ||
<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()" [lang]="languageService.selectedLanguage()" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. There are duplicated code |
||
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> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why removing it?
There was a problem hiding this comment.
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