From b76dcdb7465163920f46392d90196f50ef526f87 Mon Sep 17 00:00:00 2001
From: Andre Beging <a.beging@eas-solutions.de>
Date: Thu, 7 Nov 2024 15:25:17 +0100
Subject: [PATCH] Update Icons

---
 Server/Components/Layout/NavMenu.razor     | 25 +++++++++++-----------
 Server/Components/Pages/CustomerPage.razor |  2 +-
 Server/Components/Pages/InvoicePage.razor  |  4 ++--
 Server/Components/Pages/SettingsPage.razor |  7 +++++-
 Server/Data/SettingsData.cs                |  2 ++
 Server/Model/InvoiceDocument.cs            |  8 ++++++-
 6 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/Server/Components/Layout/NavMenu.razor b/Server/Components/Layout/NavMenu.razor
index 847cb1b..584786e 100644
--- a/Server/Components/Layout/NavMenu.razor
+++ b/Server/Components/Layout/NavMenu.razor
@@ -10,34 +10,33 @@
   <nav class="flex-column">
     <div class="nav-item px-3">
       <NavLink class="nav-link" href="/create" Match="NavLinkMatch.All">
-        <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-plus-square-fill" viewBox="0 0 16 16">
-          <path d="M2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2zm6.5 4.5v3h3a.5.5 0 0 1 0 1h-3v3a.5.5 0 0 1-1 0v-3h-3a.5.5 0 0 1 0-1h3v-3a.5.5 0 0 1 1 0"/>
-        </svg> Neue Rechnung
+        <div style="width: 30px; margin-right: .5rem;" class="text-center">
+          <i class="fas fa-plus-square fa-xl"></i>
+        </div> Neue Rechnung
       </NavLink>
     </div>
 
     <div class="nav-item px-3">
       <NavLink class="nav-link" href="/" Match="NavLinkMatch.All">
-        <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-receipt" viewBox="0 0 16 16">
-          <path d="M1.92.506a.5.5 0 0 1 .434.14L3 1.293l.646-.647a.5.5 0 0 1 .708 0L5 1.293l.646-.647a.5.5 0 0 1 .708 0L7 1.293l.646-.647a.5.5 0 0 1 .708 0L9 1.293l.646-.647a.5.5 0 0 1 .708 0l.646.647.646-.647a.5.5 0 0 1 .708 0l.646.647.646-.647a.5.5 0 0 1 .801.13l.5 1A.5.5 0 0 1 15 2v12a.5.5 0 0 1-.053.224l-.5 1a.5.5 0 0 1-.8.13L13 14.707l-.646.647a.5.5 0 0 1-.708 0L11 14.707l-.646.647a.5.5 0 0 1-.708 0L9 14.707l-.646.647a.5.5 0 0 1-.708 0L7 14.707l-.646.647a.5.5 0 0 1-.708 0L5 14.707l-.646.647a.5.5 0 0 1-.708 0L3 14.707l-.646.647a.5.5 0 0 1-.801-.13l-.5-1A.5.5 0 0 1 1 14V2a.5.5 0 0 1 .053-.224l.5-1a.5.5 0 0 1 .367-.27m.217 1.338L2 2.118v11.764l.137.274.51-.51a.5.5 0 0 1 .707 0l.646.647.646-.646a.5.5 0 0 1 .708 0l.646.646.646-.646a.5.5 0 0 1 .708 0l.646.646.646-.646a.5.5 0 0 1 .708 0l.646.646.646-.646a.5.5 0 0 1 .708 0l.646.646.646-.646a.5.5 0 0 1 .708 0l.509.509.137-.274V2.118l-.137-.274-.51.51a.5.5 0 0 1-.707 0L12 1.707l-.646.647a.5.5 0 0 1-.708 0L10 1.707l-.646.647a.5.5 0 0 1-.708 0L8 1.707l-.646.647a.5.5 0 0 1-.708 0L6 1.707l-.646.647a.5.5 0 0 1-.708 0L4 1.707l-.646.647a.5.5 0 0 1-.708 0z"/>
-          <path d="M3 4.5a.5.5 0 0 1 .5-.5h6a.5.5 0 1 1 0 1h-6a.5.5 0 0 1-.5-.5m0 2a.5.5 0 0 1 .5-.5h6a.5.5 0 1 1 0 1h-6a.5.5 0 0 1-.5-.5m0 2a.5.5 0 0 1 .5-.5h6a.5.5 0 1 1 0 1h-6a.5.5 0 0 1-.5-.5m0 2a.5.5 0 0 1 .5-.5h6a.5.5 0 0 1 0 1h-6a.5.5 0 0 1-.5-.5m8-6a.5.5 0 0 1 .5-.5h1a.5.5 0 0 1 0 1h-1a.5.5 0 0 1-.5-.5m0 2a.5.5 0 0 1 .5-.5h1a.5.5 0 0 1 0 1h-1a.5.5 0 0 1-.5-.5m0 2a.5.5 0 0 1 .5-.5h1a.5.5 0 0 1 0 1h-1a.5.5 0 0 1-.5-.5m0 2a.5.5 0 0 1 .5-.5h1a.5.5 0 0 1 0 1h-1a.5.5 0 0 1-.5-.5"/>
-        </svg> Rechnungen
+        <div style="width: 30px; margin-right: .5rem;" class="text-center">
+          <i class="fas fa-file-invoice fa-xl"></i>
+        </div> Rechnungen
       </NavLink>
     </div>
 
     <div class="nav-item px-3">
       <NavLink class="nav-link" href="customers">
-        <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-person-vcard-fill" viewBox="0 0 16 16">
-          <path d="M0 4a2 2 0 0 1 2-2h12a2 2 0 0 1 2 2v8a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2zm9 1.5a.5.5 0 0 0 .5.5h4a.5.5 0 0 0 0-1h-4a.5.5 0 0 0-.5.5M9 8a.5.5 0 0 0 .5.5h4a.5.5 0 0 0 0-1h-4A.5.5 0 0 0 9 8m1 2.5a.5.5 0 0 0 .5.5h3a.5.5 0 0 0 0-1h-3a.5.5 0 0 0-.5.5m-1 2C9 10.567 7.21 9 5 9c-2.086 0-3.8 1.398-3.984 3.181A1 1 0 0 0 2 13h6.96q.04-.245.04-.5M7 6a2 2 0 1 0-4 0 2 2 0 0 0 4 0"/>
-        </svg> Kunden
+        <div style="width: 30px; margin-right: .5rem;" class="text-center">
+          <i class="fas fa-address-card fa-xl"></i>
+        </div> Kunden
       </NavLink>
     </div>
 
     <div class="nav-item px-3">
       <NavLink class="nav-link" href="settings">
-        <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-gear-fill" viewBox="0 0 16 16">
-          <path d="M9.405 1.05c-.413-1.4-2.397-1.4-2.81 0l-.1.34a1.464 1.464 0 0 1-2.105.872l-.31-.17c-1.283-.698-2.686.705-1.987 1.987l.169.311c.446.82.023 1.841-.872 2.105l-.34.1c-1.4.413-1.4 2.397 0 2.81l.34.1a1.464 1.464 0 0 1 .872 2.105l-.17.31c-.698 1.283.705 2.686 1.987 1.987l.311-.169a1.464 1.464 0 0 1 2.105.872l.1.34c.413 1.4 2.397 1.4 2.81 0l.1-.34a1.464 1.464 0 0 1 2.105-.872l.31.17c1.283.698 2.686-.705 1.987-1.987l-.169-.311a1.464 1.464 0 0 1 .872-2.105l.34-.1c1.4-.413 1.4-2.397 0-2.81l-.34-.1a1.464 1.464 0 0 1-.872-2.105l.17-.31c.698-1.283-.705-2.686-1.987-1.987l-.311.169a1.464 1.464 0 0 1-2.105-.872zM8 10.93a2.929 2.929 0 1 1 0-5.86 2.929 2.929 0 0 1 0 5.858z"/>
-        </svg> Einstellungen
+        <div style="width: 30px; margin-right: .5rem;" class="text-center">
+          <i class="fas fa-cogs fa-xl"></i>
+        </div> Einstellungen
       </NavLink>
     </div>
   </nav>
diff --git a/Server/Components/Pages/CustomerPage.razor b/Server/Components/Pages/CustomerPage.razor
index fffd36a..810d23b 100644
--- a/Server/Components/Pages/CustomerPage.razor
+++ b/Server/Components/Pages/CustomerPage.razor
@@ -37,7 +37,7 @@
     <InputText DisplayName="Phone" class="form-control" @bind-Value="@EditFormObject.Phone"></InputText>
   </div>
   
-  <button type="button" class="btn btn-sm btn-primary" @onclick="SaveCustomerAsync">Speichern</button>
+  <button type="button" class="btn btn-sm btn-primary" @onclick="SaveCustomerAsync"><i class="fas fa-save"></i> Speichern</button>
   <button type="button" class="btn btn-sm btn-secondary" @onclick="HideEditFormAsync">Abbrechen</button>
 }
 else
diff --git a/Server/Components/Pages/InvoicePage.razor b/Server/Components/Pages/InvoicePage.razor
index 985ba9c..ca3b88a 100644
--- a/Server/Components/Pages/InvoicePage.razor
+++ b/Server/Components/Pages/InvoicePage.razor
@@ -10,8 +10,8 @@
 
 <h1>Rechnung #@Invoice.InvoiceId</h1>
 
-<button type="button" class="btn btn-primary" @onclick="SaveInvoiceAsync">Speichern</button>
-<button type="button" class="btn btn-info" @onclick="GenerateInvoiceAsync">Generieren</button>
+<button type="button" class="btn btn-primary" @onclick="SaveInvoiceAsync"><i class="fas fa-save"></i> Speichern</button>
+<button type="button" class="btn btn-info" @onclick="GenerateInvoiceAsync"><i class="fas fa-file-pdf"></i> Generieren</button>
 
 @if (!string.IsNullOrWhiteSpace(AlertMessage))
 {
diff --git a/Server/Components/Pages/SettingsPage.razor b/Server/Components/Pages/SettingsPage.razor
index af0af8a..333ff15 100644
--- a/Server/Components/Pages/SettingsPage.razor
+++ b/Server/Components/Pages/SettingsPage.razor
@@ -5,7 +5,7 @@
 
 <h3>Einstellungen</h3>
 
-<button type="button" class="btn btn-primary" @onclick="Save">Speichern</button>
+<button type="button" class="btn btn-primary" @onclick="Save"><i class="fas fa-save"></i> Speichern</button>
 
 <hr />
 
@@ -72,3 +72,8 @@
   <label class="form-label">BIC</label>
   <InputText DisplayName="BIC" class="form-control" @bind-Value="@SettingsData.Instance.PaymentData.Bic"></InputText>
 </div>
+
+<div class="mb-3">
+  <label class="form-label">Logo Pfad</label>
+  <InputText class="form-control" @bind-Value="@SettingsData.Instance.Logo"></InputText>
+</div>
diff --git a/Server/Data/SettingsData.cs b/Server/Data/SettingsData.cs
index dddccb3..f6f7bd7 100644
--- a/Server/Data/SettingsData.cs
+++ b/Server/Data/SettingsData.cs
@@ -15,6 +15,8 @@ namespace Server.Data
         public PaymentData PaymentData { get; set; } = new();
         
         public string? Comment { get; set; }
+        
+        public string? Logo { get; set; }
 
         #endregion
 
diff --git a/Server/Model/InvoiceDocument.cs b/Server/Model/InvoiceDocument.cs
index e7f17cf..8563513 100644
--- a/Server/Model/InvoiceDocument.cs
+++ b/Server/Model/InvoiceDocument.cs
@@ -3,6 +3,7 @@ using System.Net.Mime;
 using QuestPDF.Fluent;
 using QuestPDF.Helpers;
 using QuestPDF.Infrastructure;
+using Server.Data;
 
 namespace Server.Model
 {
@@ -190,7 +191,12 @@ namespace Server.Model
                 {
                     row.RelativeItem().AlignCenter().Column(col =>
                     {
-                        col.Item().Height(25, Unit.Millimetre).Image("bit.bmp");
+
+                        if (!string.IsNullOrWhiteSpace(SettingsData.Instance.Logo) && File.Exists(SettingsData.Instance.Logo))
+                            col.Item().Height(25, Unit.Millimetre).Image(SettingsData.Instance.Logo);
+                        else
+                            col.Item().Height(25, Unit.Millimetre);
+
                     });
                 });