Kleinere optische Anpassungen

2022-05-30 11:04:19 +02:00
parent 45325e339c
commit 4039534547
10 changed files with 117 additions and 50 deletions
--- 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
--- a/FoodsharingSiegen.Server/Controls/InteractionRow.razor
+++ b/FoodsharingSiegen.Server/Controls/InteractionRow.razor
@@ -59,17 +59,17 @@
            foreach (var interaction in Interactions)
            {
                <div>
-                    @interaction.User.Name (@interaction.Date.ToShortDateString())
+                    <span title="@interaction.User.Memo">@interaction.User.Name</span> (@interaction.Date.ToShortDateString())
                    @if (!string.IsNullOrWhiteSpace(interaction.Info))
                    {
                        <span>(<i>@interaction.Info</i>)</span>
                    }
-                    
+
                    @if ((!Prospect.Complete || interaction.Type == InteractionType.Complete) && AllowAddInteraction)
                    {
                        <span>&nbsp;<a href=""><i class="fa-solid fa-square-xmark" @onclick="async () => await RemoveClick.InvokeAsync(interaction.Id)" @onclick:preventDefault></i></a></span>
                    }
-                    
+
                </div>
            }
        }
--- a/FoodsharingSiegen.Server/FoodsharingSiegen.Server.csproj
+++ b/FoodsharingSiegen.Server/FoodsharingSiegen.Server.csproj
@@ -11,12 +11,19 @@
      <ProjectReference Include="..\FoodsharingSiegen.Shared\FoodsharingSiegen.Shared.csproj" />
    </ItemGroup>

+    <PropertyGroup>
+        <LibSassOutputStyle>expanded</LibSassOutputStyle>
+        <LibSassOutputLevel>verbose</LibSassOutputLevel>
+        <LibSassMessageLevel>High</LibSassMessageLevel>
+    </PropertyGroup>
+    
    <ItemGroup>
      <PackageReference Include="Blazorise.DataGrid" Version="1.0.2" />
      <PackageReference Include="Blazorise.Snackbar" Version="1.0.2" />
      <PackageReference Include="Blazorise.Icons.Material" Version="1.0.2" />
      <PackageReference Include="Blazorise.Components" Version="1.0.2" />
      <PackageReference Include="Blazorise.Material" Version="1.0.2" />
+      <PackageReference Include="LibSassBuilder" Version="2.0.1" />
      <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.1" />
      <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.1">
        <PrivateAssets>all</PrivateAssets>
--- a/FoodsharingSiegen.Server/Pages/AuditView.razor
+++ b/FoodsharingSiegen.Server/Pages/AuditView.razor
@@ -9,7 +9,7 @@

 <PageTitle>Aktivitäten</PageTitle>

-<h4>Aktivitäten</h4>
+<h2>Aktivitäten</h2>

 <DataGrid TItem="Audit"
          Data="@Audits"
--- a/FoodsharingSiegen.Server/Pages/Profile.razor
+++ b/FoodsharingSiegen.Server/Pages/Profile.razor
@@ -8,7 +8,9 @@
 <PageTitle>Profil</PageTitle>

 <div style="width: 100%; max-width: 500px;">
-    <h4>Mein Profil</h4>
+    
+    <h2>Mein Profil</h2>
+    
    <Button Color="Color.Primary" Clicked="SaveProfile">Speichern</Button>
    <Fields Class="my-3">
        <Validations @ref="ValidationsRef">
@@ -24,7 +26,7 @@
                <Field ColumnSize="ColumnSize.Is12">
                    <FieldLabel>Info über dich</FieldLabel>
                    <FieldBody>
-                        <MemoEdit Rows="3" Placeholder="z.B. Bieb bei Rewe Musterhausen" @bind-Text="User.Memo" />
+                        <MemoEdit Rows="3" Placeholder="z.B. Bieb bei Rewe Musterhausen" @bind-Text="User.Memo"/>
                    </FieldBody>
                </Field>
            </Validation>
--- a/FoodsharingSiegen.Server/Pages/Prospects.razor
+++ b/FoodsharingSiegen.Server/Pages/Prospects.razor
@@ -11,7 +11,7 @@

 <PageTitle>Einarbeitungen</PageTitle>

-<h4>Aktuelle Einarbeitungen</h4>
+<h2>Aktuelle Einarbeitungen</h2>

 <Button
    Color="Color.Primary"
@@ -26,7 +26,7 @@
 {
    <hr />
    <h4>Aktuell:</h4>
-    <div class="row">
+    <div class="row m-0">
        <Repeater Items="@activeProspects">
            <ProspectContainer Prospect="context" InteractionModal="InteractionModal" ProspectModal="ProspectModal" RemoveInteraction="@RemoveInteraction"></ProspectContainer>
        </Repeater>
@@ -41,7 +41,7 @@
 {
    <hr />
    <h4>Abgeschlossen:</h4>
-    <div class="row">
+    <div class="row m-0">
        <Repeater Items="@completedProspects">
            <ProspectContainer Prospect="context" InteractionModal="InteractionModal" ProspectModal="ProspectModal" RemoveInteraction="@RemoveInteraction"></ProspectContainer>
        </Repeater>
--- a/FoodsharingSiegen.Server/Pages/Users.razor
+++ b/FoodsharingSiegen.Server/Pages/Users.razor
@@ -41,7 +41,7 @@
          @bind-SelectedRow="SelectedUser"
          RowDoubleClicked="arg => UserDataGrid.Edit(arg.Item)"
          Editable
-          Responsive>
+          Responsive="true">
    <DataGridColumns>
        <DataGridCommandColumn TItem="User" Width="100px" CellClass="@(_ => "px-0 d-flex align-items-center justify-content-center")">
            <NewCommandTemplate>
--- a/FoodsharingSiegen.Server/Shared/NavMenu.razor
+++ b/FoodsharingSiegen.Server/Shared/NavMenu.razor
@@ -1,9 +1,6 @@
 <div class="top-row ps-3 navbar navbar-dark">
    <div class="container-fluid">
        <a class="navbar-brand" href="">Foodsharing Siegen</a>
-        <button title="Navigation menu" class="navbar-toggler" @onclick="ToggleNavMenu">
-            <span class="navbar-toggler-icon"></span>
-        </button>
    </div>
 </div>

--- 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;
+  }
 }
--- a/FoodsharingSiegen.Server/Shared/NavMenu.razor.scss
+++ 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;
+    }
+}