diff --git a/FoodsharingSiegen.Server/Auth/AuthService.cs b/FoodsharingSiegen.Server/Auth/AuthService.cs index 6472c26..223f62d 100644 --- a/FoodsharingSiegen.Server/Auth/AuthService.cs +++ b/FoodsharingSiegen.Server/Auth/AuthService.cs @@ -139,7 +139,7 @@ namespace FoodsharingSiegen.Server.Auth return new OperationResult(); } - return new OperationResult(new Exception("Invalid")); + return new OperationResult(new Exception("Benutzername oder Passwort falsch")); } #endregion diff --git a/FoodsharingSiegen.Server/Controls/InteractionRow.razor b/FoodsharingSiegen.Server/Controls/InteractionRow.razor index 2123d94..1eed3c0 100644 --- a/FoodsharingSiegen.Server/Controls/InteractionRow.razor +++ b/FoodsharingSiegen.Server/Controls/InteractionRow.razor @@ -59,17 +59,17 @@ foreach (var interaction in Interactions) {
- @interaction.User.Name (@interaction.Date.ToShortDateString()) + @interaction.User.Name (@interaction.Date.ToShortDateString()) @if (!string.IsNullOrWhiteSpace(interaction.Info)) { (@interaction.Info) } - + @if ((!Prospect.Complete || interaction.Type == InteractionType.Complete) && AllowAddInteraction) {   } - +
} } diff --git a/FoodsharingSiegen.Server/FoodsharingSiegen.Server.csproj b/FoodsharingSiegen.Server/FoodsharingSiegen.Server.csproj index e6f2197..c9e5e44 100644 --- a/FoodsharingSiegen.Server/FoodsharingSiegen.Server.csproj +++ b/FoodsharingSiegen.Server/FoodsharingSiegen.Server.csproj @@ -11,12 +11,19 @@ + + expanded + verbose + High + + + all diff --git a/FoodsharingSiegen.Server/Pages/AuditView.razor b/FoodsharingSiegen.Server/Pages/AuditView.razor index 3b9f1ad..4030a53 100644 --- a/FoodsharingSiegen.Server/Pages/AuditView.razor +++ b/FoodsharingSiegen.Server/Pages/AuditView.razor @@ -9,7 +9,7 @@ Aktivitäten -

Aktivitäten

+

Aktivitäten

Profil
-

Mein Profil

+ +

Mein Profil

+ @@ -24,7 +26,7 @@ Info über dich - + diff --git a/FoodsharingSiegen.Server/Pages/Prospects.razor b/FoodsharingSiegen.Server/Pages/Prospects.razor index 0f844ac..ff156f8 100644 --- a/FoodsharingSiegen.Server/Pages/Prospects.razor +++ b/FoodsharingSiegen.Server/Pages/Prospects.razor @@ -11,7 +11,7 @@ Einarbeitungen -

Aktuelle Einarbeitungen

+

Aktuelle Einarbeitungen

diff --git a/FoodsharingSiegen.Server/Shared/NavMenu.razor.css b/FoodsharingSiegen.Server/Shared/NavMenu.razor.css index b7970aa..cae2731 100644 --- a/FoodsharingSiegen.Server/Shared/NavMenu.razor.css +++ b/FoodsharingSiegen.Server/Shared/NavMenu.razor.css @@ -1,62 +1,61 @@ .navbar-toggler { - background-color: rgba(255, 255, 255, 0.1); + background-color: rgba(255, 255, 255, 0.1); } .top-row { - height: 3.5rem; - background-color: rgba(0,0,0,0.4); + height: 60px; + background-color: rgba(0, 0, 0, 0.4); } .navbar-brand { - font-size: 1.1rem; + font-size: 1.1rem; } .oi { - width: 2rem; - font-size: 1.1rem; - vertical-align: text-top; - top: -2px; + width: 2rem; + font-size: 1.1rem; + vertical-align: text-top; + top: -2px; } .nav-item { - font-size: 0.9rem; - padding-bottom: 0.5rem; + font-size: 0.9rem; + padding-bottom: 0.5rem; } - .nav-item:first-of-type { - padding-top: 1rem; - } +.nav-item:first-of-type { + padding-top: 1rem; +} - .nav-item:last-of-type { - padding-bottom: 1rem; - } +.nav-item:last-of-type { + padding-bottom: 1rem; +} - .nav-item ::deep a { - color: #533a20; - border-radius: 4px; - height: 3rem; - display: flex; - align-items: center; - line-height: 3rem; - } +.nav-item ::deep a { + color: #533a20; + border-radius: 4px; + height: 3rem; + display: flex; + align-items: center; + line-height: 3rem; +} .nav-item ::deep a.active { - background-color: rgba(255,255,255,0.25); - color: #64ae24; + background-color: rgba(255, 255, 255, 0.25); + color: #64ae24; } .nav-item ::deep a:hover { - background-color: rgba(255,255,255,0.1); - color: #64ae24; + background-color: rgba(255, 255, 255, 0.1); + color: #64ae24; } @media (min-width: 641px) { - .navbar-toggler { - display: none; - } - - .collapse { - /* Never collapse the sidebar for wide screens */ - display: block; - } + .navbar-toggler { + display: none; + } + .collapse { + /* Never collapse the sidebar for wide screens */ + display: block; + } } diff --git a/FoodsharingSiegen.Server/Shared/NavMenu.razor.scss b/FoodsharingSiegen.Server/Shared/NavMenu.razor.scss new file mode 100644 index 0000000..3ba4c1b --- /dev/null +++ b/FoodsharingSiegen.Server/Shared/NavMenu.razor.scss @@ -0,0 +1,62 @@ +.navbar-toggler { + background-color: rgba(255, 255, 255, 0.1); +} + +.top-row { + height: 60px; + background-color: rgba(0,0,0,0.4); +} + +.navbar-brand { + font-size: 1.1rem; +} + +.oi { + width: 2rem; + font-size: 1.1rem; + vertical-align: text-top; + top: -2px; +} + +.nav-item { + font-size: 0.9rem; + padding-bottom: 0.5rem; +} + + .nav-item:first-of-type { + padding-top: 1rem; + } + + .nav-item:last-of-type { + padding-bottom: 1rem; + } + + .nav-item ::deep a { + color: #533a20; + border-radius: 4px; + height: 3rem; + display: flex; + align-items: center; + line-height: 3rem; + } + +.nav-item ::deep a.active { + background-color: rgba(255,255,255,0.25); + color: #64ae24; +} + +.nav-item ::deep a:hover { + background-color: rgba(255,255,255,0.1); + color: #64ae24; +} + +@media (min-width: 641px) { + .navbar-toggler { + display: none; + } + + .collapse { + /* Never collapse the sidebar for wide screens */ + display: block; + } +}