-
Notifications
You must be signed in to change notification settings - Fork 0
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
refactor(various): various changes #11
Merged
Changes from 8 commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
1642c39
refactor(alert): message validation
LAMM26 917f123
refactor(external-link): icon adjustments
LAMM26 b40c8ab
refactor(notice): removed unecessary styling
LAMM26 45b9ae7
refactor(breadcrumbs): cleanup
LAMM26 39212c1
refactor(button): cleanup
LAMM26 b358a4e
refactor(showcases): reordering
LAMM26 aa561d5
fix(alert): message validation fix
LAMM26 0db511c
refactor(alert): removed OnInit
LAMM26 c36f496
refactor(alert): removed log
LAMM26 3869349
refactor(various): merged next
LAMM26 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
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 |
---|---|---|
|
@@ -30,8 +30,10 @@ import { AlertIcon, AlertType } from './alert.interface'; | |
}) | ||
export class AlertComponent { | ||
type = input.required<keyof typeof AlertType>(); | ||
message = input.required<string>(); | ||
closeable = input<boolean>(false); | ||
message = input.required<string, string>({ | ||
transform: (message) => this.messageValidation(message) | ||
}); | ||
isCloseable = input<boolean>(false); | ||
isOpen = input<boolean>(true); | ||
isHandset = input<boolean>(); | ||
|
||
|
@@ -40,6 +42,22 @@ export class AlertComponent { | |
iconName = computed(() => AlertIcon[this.type()]); | ||
typeName = computed(() => AlertType[this.type()]); | ||
|
||
private messageValidation(message: string): string { | ||
if (this.isCloseable()) { | ||
if (message.length > 105) { | ||
return `${message.slice(0, 105)}...`; | ||
} | ||
|
||
return message; | ||
} else { | ||
if (message.length > 120) { | ||
return `${message.slice(0, 120)}...`; | ||
} | ||
|
||
return message; | ||
} | ||
} | ||
|
||
getAlertClass() { | ||
return `container --${this.typeName()}`; | ||
} | ||
|
@@ -49,6 +67,9 @@ export class AlertComponent { | |
} | ||
|
||
onClose() { | ||
if (this.isCloseable()) { | ||
console.log('hello'); | ||
} | ||
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. Supprimer les console.log |
||
this.closed.emit(true); | ||
} | ||
} |
9 changes: 5 additions & 4 deletions
9
projects/demo/src/app/components/external-link/external-link.component.scss
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,9 +1,10 @@ | ||
span { | ||
margin-right: 4px; | ||
margin-right: 2px; | ||
} | ||
|
||
mat-icon { | ||
width: 12px; | ||
height: 12px; | ||
font-size: 12px; | ||
width: 13px; | ||
height: 13px; | ||
font-size: 13px; | ||
margin-right: 2px; | ||
} |
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
29 changes: 22 additions & 7 deletions
29
projects/demo/src/app/pages/components/showcases/breadcrumb/breadcrumb.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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +0,0 @@ | ||
p span { | ||
display: inline-flex; | ||
} | ||
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
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.
On pourrait améliorer la lisbilité en utilisant les "early return" pour éviter les conditions imbriqués