From 21ba7b89c0b185ef1e6878ebd02df21af8c51ed6 Mon Sep 17 00:00:00 2001
From: Michal Kostewicz <m.kostewicz84@gmail.com>
Date: Sat, 6 Feb 2021 19:55:27 +0100
Subject: Add lastname column to User DB table and update API logic to
 save,return and update this data.

---
 resources/views/dashboard/account.edge | 8 ++++++++
 resources/views/dashboard/data.edge    | 6 ++++++
 2 files changed, 14 insertions(+)

(limited to 'resources')

diff --git a/resources/views/dashboard/account.edge b/resources/views/dashboard/account.edge
index 9f3539e..6792615 100644
--- a/resources/views/dashboard/account.edge
+++ b/resources/views/dashboard/account.edge
@@ -37,6 +37,14 @@
             type="text" value="{{ old('name', username) }}" placeholder="Name" name="username" required>
         </div>
       </div>
+      <div class="mb-6">
+        <label class="block text-gray-700 text-sm font-bold mb-2">Last Name</label>
+        <div>
+          <input
+            class="shadow appearance-none rounded w-full py-2 px-3 text-gray-700 mb-3 leading-tight focus:outline-none focus:shadow-outline"
+            type="text" value="{{ old('lastname', lastname) }}" placeholder="Last Name" name="lastname" required>
+        </div>
+      </div>
       <div class="mb-6">
         <label class="block text-gray-700 text-sm font-bold mb-2">E-Mail</label>
         <div>
diff --git a/resources/views/dashboard/data.edge b/resources/views/dashboard/data.edge
index 60ef10b..92a78d4 100644
--- a/resources/views/dashboard/data.edge
+++ b/resources/views/dashboard/data.edge
@@ -122,6 +122,9 @@
             <th>
                 Name
             </th>
+            <th>
+                Last Name
+            </th>
             <th>
                 Order
             </th>
@@ -147,6 +150,9 @@
               <td>
                   {{ workspace.name }}
               </td>
+              <td>
+                  {{ workspace.lastname }}
+              </td>
               <td>
                   {{ workspace.order }}
               </td>
-- 
cgit v1.2.3-54-g00ecf


From 5296311b393a61b08e771d3074a8a9c7258533cc Mon Sep 17 00:00:00 2001
From: Michal Kostewicz <m.kostewicz84@gmail.com>
Date: Sun, 7 Feb 2021 09:49:21 +0100
Subject: Fix regarding CR comments - username should be added to user and not
 to workspace

---
 resources/views/dashboard/data.edge | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'resources')

diff --git a/resources/views/dashboard/data.edge b/resources/views/dashboard/data.edge
index 92a78d4..cf48c1c 100644
--- a/resources/views/dashboard/data.edge
+++ b/resources/views/dashboard/data.edge
@@ -48,6 +48,14 @@
                 {{ username }}
             </td>
         </tr>
+        <tr>
+            <td>
+                Last Name
+            </td>
+            <td>
+                {{ lastname }}
+            </td>
+        </tr>
         <tr>
             <td>
                 Created account on
@@ -122,9 +130,6 @@
             <th>
                 Name
             </th>
-            <th>
-                Last Name
-            </th>
             <th>
                 Order
             </th>
@@ -150,9 +155,6 @@
               <td>
                   {{ workspace.name }}
               </td>
-              <td>
-                  {{ workspace.lastname }}
-              </td>
               <td>
                   {{ workspace.order }}
               </td>
-- 
cgit v1.2.3-54-g00ecf


From a227833e66eebbed9c0dae8cd74b276eb7bbc572 Mon Sep 17 00:00:00 2001
From: Vijay A <avijayr@protonmail.com>
Date: Wed, 19 May 2021 10:37:34 +0530
Subject: Fixed #56: Added favicon for all html pages served by the server.

---
 public/img/favicon.ico            | Bin 0 -> 4286 bytes
 public/privacy.html               |   1 +
 public/terms.html                 |   1 +
 resources/views/layouts/main.edge |   1 +
 resources/views/layouts/v2.edge   |   1 +
 5 files changed, 4 insertions(+)
 create mode 100644 public/img/favicon.ico

(limited to 'resources')

diff --git a/public/img/favicon.ico b/public/img/favicon.ico
new file mode 100644
index 0000000..4ec9d51
Binary files /dev/null and b/public/img/favicon.ico differ
diff --git a/public/privacy.html b/public/privacy.html
index ac17608..33302ad 100644
--- a/public/privacy.html
+++ b/public/privacy.html
@@ -8,6 +8,7 @@
   <title>Privacy Policy - Ferdi API</title>
 
   <link rel="stylesheet" href="css/vanilla.css">
+  <link rel="shortcut icon" type="image/jpg" href="img/favicon.ico" />
 </head>
 
 <body>
diff --git a/public/terms.html b/public/terms.html
index 270e3ab..d7ef44b 100644
--- a/public/terms.html
+++ b/public/terms.html
@@ -8,6 +8,7 @@
   <title>Terms of Service - Ferdi API</title>
 
   <link rel="stylesheet" href="css/vanilla.css">
+  <link rel="shortcut icon" type="image/jpg" href="img/favicon.ico" />
 
   <style>
     ol,
diff --git a/resources/views/layouts/main.edge b/resources/views/layouts/main.edge
index b6cc8ca..00d9987 100644
--- a/resources/views/layouts/main.edge
+++ b/resources/views/layouts/main.edge
@@ -6,6 +6,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <meta http-equiv="X-UA-Compatible" content="ie=edge">
   <title>ferdi-server</title>
+  <link rel="shortcut icon" type="image/jpg" href="img/favicon.ico" />
 
   {{ style('css/vanilla') }}
   {{ style('css/main') }}
diff --git a/resources/views/layouts/v2.edge b/resources/views/layouts/v2.edge
index 39f8085..f3bf37c 100644
--- a/resources/views/layouts/v2.edge
+++ b/resources/views/layouts/v2.edge
@@ -6,6 +6,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <meta http-equiv="X-UA-Compatible" content="ie=edge">
   <title>Ferdi Server</title>
+  <link rel="shortcut icon" type="image/jpg" href="img/favicon.ico" />
 
   {{ style('css/tailwind') }}
   {{ style('css/main') }}
-- 
cgit v1.2.3-54-g00ecf