diff --git a/VeraxShield/VeraxShield/composants/affichages/navBar/NavBarPrincipale.razor b/VeraxShield/VeraxShield/composants/affichages/navBar/NavBarPrincipale.razor index 9310bc1..1630a45 100644 --- a/VeraxShield/VeraxShield/composants/affichages/navBar/NavBarPrincipale.razor +++ b/VeraxShield/VeraxShield/composants/affichages/navBar/NavBarPrincipale.razor @@ -1,45 +1,36 @@ @page "/NavBar" +@inherits LayoutComponentBase -

NavBarPrincipale

- - - + - - - - Utilisateurs - - - Articles - @* - Dropdown - - Action - - Another action - - *@ - - - Modérateurs - - - - role/nom - - - - - - + + + Utilisateurs + + + Articles + + + Modérateurs + - \ No newline at end of file + + + @DonneurEtat.NomUtilisateur + + + + + + + + + +@Body \ No newline at end of file diff --git a/VeraxShield/VeraxShield/composants/affichages/navBar/NavBarPrincipale.razor.cs b/VeraxShield/VeraxShield/composants/affichages/navBar/NavBarPrincipale.razor.cs index 7784179..8302532 100644 --- a/VeraxShield/VeraxShield/composants/affichages/navBar/NavBarPrincipale.razor.cs +++ b/VeraxShield/VeraxShield/composants/affichages/navBar/NavBarPrincipale.razor.cs @@ -4,6 +4,8 @@ namespace VeraxShield.composants.affichages.navBar { public partial class NavBarPrincipale { + [Inject] + private DonneurEtat DonneurEtat { get; set; } [Inject] private NavigationManager NavigationManager { get; set; } diff --git a/VeraxShield/VeraxShield/services/authentificationService/DonneurEtat.cs b/VeraxShield/VeraxShield/services/authentificationService/DonneurEtat.cs index bb0af8a..20e60eb 100644 --- a/VeraxShield/VeraxShield/services/authentificationService/DonneurEtat.cs +++ b/VeraxShield/VeraxShield/services/authentificationService/DonneurEtat.cs @@ -7,6 +7,8 @@ public class DonneurEtat : AuthenticationStateProvider private IAuthentificationService _serviceAuthentification; private UtilisateurCourant _utilisateurCourant; + public string NomUtilisateur => _utilisateurCourant?.Nom; + public DonneurEtat(IAuthentificationService service) { this._serviceAuthentification = service; diff --git a/VeraxShield/VeraxShield/wwwroot/css/composants/navBar/NavBarPrincipale.css b/VeraxShield/VeraxShield/wwwroot/css/composants/navBar/NavBarPrincipale.css index f390ac2..226a1e4 100644 --- a/VeraxShield/VeraxShield/wwwroot/css/composants/navBar/NavBarPrincipale.css +++ b/VeraxShield/VeraxShield/wwwroot/css/composants/navBar/NavBarPrincipale.css @@ -1,13 +1,63 @@ body{ - color : snow; + font-size : 17px; } -.bar-container{ - background-color : black; +.nav-link{ + color : white; + margin : 0; } +/* NavBarPrincipale.css */ -.logo{ - width : 80px; +.bar-container { + display : flex; + justify-content : space-between; + align-items : center; + background-color : #053679; } +.bar-menu { + display : flex; + justify-content : space-around; + align-items : center; + flex-grow : 1; /* Permet à la bar-menu de prendre tout l'espace disponible */ +} + + +.bar-menu .bar-item:first-child { + margin-left : 0; +} + +.bar-menu .bar-item:last-child { + margin-right : 0; +} + +.bar-menu .bar-link:hover { + text-decoration : none; + color : #D4DBE6; + transform : scale(1.1); +} + +.btn-primary { + background-color : #E5E5E5; + color : #053679; + border-color: #053679; +} + +.bar-role{ + color : black; + font-weight : 500; + font-size : 15px; + margin-right : 20px; + align-self : center; + border : 2px solid black; + padding : 3px; + border-radius : 5px; +} + +.logo { + width : 55px; +} + + + diff --git a/VeraxShield/VeraxShield/wwwroot/ressources/images/logo/logo.png b/VeraxShield/VeraxShield/wwwroot/ressources/images/logo/logo.png index 2f38be0..1eb3e5d 100644 Binary files a/VeraxShield/VeraxShield/wwwroot/ressources/images/logo/logo.png and b/VeraxShield/VeraxShield/wwwroot/ressources/images/logo/logo.png differ