From 637b501ea59c83cb8234835109a29bc1d2670cd9 Mon Sep 17 00:00:00 2001
From: kytwb <kytwb@pm.me>
Date: Fri, 10 Dec 2021 18:34:19 +0100
Subject: Tweak UI to look like getferdi.com

---
 resources/views/dashboard/account.edge        |  2 +-
 resources/views/dashboard/delete.edge         |  2 +-
 resources/views/dashboard/forgotPassword.edge |  4 ++--
 resources/views/dashboard/login.edge          |  4 ++--
 resources/views/dashboard/resetPassword.edge  |  4 ++--
 resources/views/dashboard/transfer.edge       |  2 +-
 resources/views/layouts/v2.edge               | 18 +++++++++++++++++-
 resources/views/others/import.edge            |  6 +++---
 resources/views/others/index.edge             | 24 ++++--------------------
 resources/views/others/message.edge           |  2 +-
 10 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/resources/views/dashboard/account.edge b/resources/views/dashboard/account.edge
index 6792615..a36d175 100644
--- a/resources/views/dashboard/account.edge
+++ b/resources/views/dashboard/account.edge
@@ -1,7 +1,7 @@
 @layout('layouts.v2')
 
 @section('content')
-<div class="w-screen h-screen bg-purple-200 flex items-center justify-center">
+<div class="w-screen bg-purple-200 flex items-center justify-center">
   <div class="w-full max-w-lg bg-white shadow-md rounded px-8 pt-6 pb-8 mb-4">
     <h1 class="text-gray-700 text-center text-2xl pb-5">
       Your Ferdi account
diff --git a/resources/views/dashboard/delete.edge b/resources/views/dashboard/delete.edge
index 3a29253..1395f7a 100644
--- a/resources/views/dashboard/delete.edge
+++ b/resources/views/dashboard/delete.edge
@@ -1,7 +1,7 @@
 @layout('layouts.v2')
 
 @section('content')
-<div class="w-screen h-screen bg-purple-200 flex items-center justify-center">
+<div class="w-screen bg-purple-200 flex items-center justify-center">
   <div class="w-full max-w-lg bg-white shadow-md rounded px-8 pt-6 pb-8 mb-4">
     <h1 class="text-gray-700 text-center text-2xl pb-5">Delete your account</h1>
     @if(flashMessage('error'))
diff --git a/resources/views/dashboard/forgotPassword.edge b/resources/views/dashboard/forgotPassword.edge
index 755c300..cd5d8c0 100644
--- a/resources/views/dashboard/forgotPassword.edge
+++ b/resources/views/dashboard/forgotPassword.edge
@@ -1,7 +1,7 @@
 @layout('layouts.v2')
 
 @section('content')
-<div class="w-screen h-screen bg-purple-200 flex items-center justify-center">
+<div class="w-screen bg-purple-200 flex items-center justify-center">
 <form class="w-full max-w-sm bg-white shadow-md rounded px-8 pt-6 pb-8 mb-4"
   action="/user/forgot" method="POST">
     <h1 class="text-gray-700 text-center text-2xl pb-5">
@@ -33,7 +33,7 @@
         value="{{ old('mail', '') }}"
         required>
     </div>
-    
+
     <button
       class="bg-blue-500 hover:bg-blue-700 text-white font-bold py-2 px-4 rounded focus:outline-none focus:shadow-outline"
       type="submit">
diff --git a/resources/views/dashboard/login.edge b/resources/views/dashboard/login.edge
index dce7360..ee354a4 100644
--- a/resources/views/dashboard/login.edge
+++ b/resources/views/dashboard/login.edge
@@ -1,7 +1,7 @@
 @layout('layouts.v2')
 
 @section('content')
-<div class="w-screen h-screen bg-purple-200 flex items-center justify-center">
+<div class="w-screen bg-purple-200 flex items-center justify-center">
 <form class="w-full max-w-sm bg-white shadow-md rounded px-8 pt-6 pb-8 mb-4"
   action="{{ route('login') }}" method="POST">
     <h1 class="text-gray-700 text-center text-2xl pb-5">
@@ -52,7 +52,7 @@
       Sign In
     </button>
     <p class="text-gray-600 text-sm text-center py-2">
-      By logging in, you accept the <a href="/terms">Terms of Service</a> and <a href="/privacy">Privacy policy</a>. This website uses cookies to log you in.
+      By logging in, you accept the <a href="/terms">terms of service</a> and <a href="/privacy">privacy policy</a>. This website uses cookies to log you in.
     </p>
     <div class="text-center">
       <a class="w-full font-bold text-sm text-blue-500 hover:text-blue-800" href="/user/forgot">
diff --git a/resources/views/dashboard/resetPassword.edge b/resources/views/dashboard/resetPassword.edge
index d663020..4b39169 100644
--- a/resources/views/dashboard/resetPassword.edge
+++ b/resources/views/dashboard/resetPassword.edge
@@ -1,7 +1,7 @@
 @layout('layouts.v2')
 
 @section('content')
-<div class="w-screen h-screen bg-purple-200 flex items-center justify-center">
+<div class="w-screen bg-purple-200 flex items-center justify-center">
 <form class="w-full max-w-sm bg-white shadow-md rounded px-8 pt-6 pb-8 mb-4"
   action="/user/reset" method="POST">
     <h1 class="text-gray-700 text-center text-2xl pb-5">
@@ -48,7 +48,7 @@
     </div>
 
     <input type="hidden" name="token" value="{{ token }}">
-    
+
     <button
       class="bg-blue-500 hover:bg-blue-700 text-white font-bold py-2 px-4 rounded focus:outline-none focus:shadow-outline"
       type="submit">
diff --git a/resources/views/dashboard/transfer.edge b/resources/views/dashboard/transfer.edge
index d2feedc..9412a8c 100644
--- a/resources/views/dashboard/transfer.edge
+++ b/resources/views/dashboard/transfer.edge
@@ -1,7 +1,7 @@
 @layout('layouts.v2')
 
 @section('content')
-<div class="w-screen h-screen bg-purple-200 flex items-center justify-center">
+<div class="w-screen bg-purple-200 flex items-center justify-center">
   <div class="w-full max-w-lg bg-white shadow-md rounded px-8 pt-6 pb-8 mb-4">
     <h1 class="text-gray-700 text-center text-2xl pb-5">Import/Export data from another Ferdi server</h1>
     @if(flashMessage('error'))
diff --git a/resources/views/layouts/v2.edge b/resources/views/layouts/v2.edge
index f3bf37c..aa9c696 100644
--- a/resources/views/layouts/v2.edge
+++ b/resources/views/layouts/v2.edge
@@ -13,7 +13,23 @@
 </head>
 
 <body>
-    @!section('content')
+    <div class="flex flex-col h-screen">
+      <div class="bg-black">
+        <div class="flex flex-row items-center container px-20 mx-auto">
+          <a href="/"><img width="50" class="my-4 mr-10" src="https://github.com/getferdi/server/raw/master/logo.png"></a>
+          <a class="github-button" href="https://github.com/getferdi/server" data-icon="octicon-star" data-show-count="true" aria-label="Star getferdi/server on GitHub">Star</a>
+        </div>
+      </div>
+      <div class="flex flex-1">
+        @!section('content')
+      </div>
+      <div class="bg-black">
+        <div class="container px-20 py-3 text-sm text-white mx-auto text-center">
+          2021 © All rights reserved - <a href="/terms" style="color: #d772fe">Terms of service</a> and <a href="/privacy" style="color: #d772fe">privacy policy</a>.
+        </div>
+      </div>
+    </div>
+    <script async defer src="https://buttons.github.io/buttons.js"></script>
 </body>
 
 </html>
diff --git a/resources/views/others/import.edge b/resources/views/others/import.edge
index 80da037..918c60b 100644
--- a/resources/views/others/import.edge
+++ b/resources/views/others/import.edge
@@ -1,7 +1,7 @@
 @layout('layouts.v2')
 
 @section('content')
-<div class="w-screen h-screen bg-purple-200 flex items-center justify-center">
+<div class="w-screen bg-purple-200 flex items-center justify-center">
 <form class="w-full max-w-sm bg-white shadow-md rounded px-8 pt-6 pb-8 mb-4"
   action="/import" method="POST">
     <h1 class="text-gray-700 text-center text-2xl pb-5">
@@ -54,8 +54,8 @@
       Import account
     </button>
     <p class="text-gray-600 text-sm text-center py-2">
-      By importing your Franz account, you accept the <a href="/terms">Terms of service</a> and <a href="/privacy">Privacy
-        policy</a>  
+      By importing your Franz account, you accept the <a href="/terms">terms of service</a> and <a href="/privacy">privacy
+        policy</a>
     </p>
     <div class="text-center">
       <a class="w-full font-bold text-sm text-blue-500 hover:text-blue-800" href="/user/login">
diff --git a/resources/views/others/index.edge b/resources/views/others/index.edge
index 9b4d3e5..1d8b425 100644
--- a/resources/views/others/index.edge
+++ b/resources/views/others/index.edge
@@ -1,14 +1,8 @@
 @layout('layouts.v2')
 
 @section('content')
-<div class="leading-normal tracking-normal text-gray-900" style="font-family: 'Source Sans Pro', sans-serif;">
-
-  <div class="h-screen bg-right bg-cover">
-    <div class="flex justify-center">
-      <img class="h-20 my-10" src="{{ assetsUrl('img/icon.png') }}">
-    </div>
     <!--Main-->
-    <div class="container px-6 mx-auto flex flex-wrap flex-col md:flex-row items-center">
+    <div class="container px-20 mx-auto flex flex-wrap flex-col md:flex-row items-center">
 
       <!--Left Col-->
       <div class="flex flex-col w-full xl:w-2/5 justify-center lg:items-start overflow-y-hidden">
@@ -38,7 +32,7 @@
           Don't have Ferdi yet?
         </p>
         <a href="https://getferdi.com" class="bg-gray-700 hover:bg-gray-900 text-white font-bold py-2 px-4 rounded">
-          Get Ferdi now
+          Get Ferdi
         </a>
 
         <p class="text-gray-700 font-bold pb-8 lg:pb-6 text-center md:text-left fade-in pt-8">
@@ -55,13 +49,6 @@
         <img class="w-5/6 mx-auto lg:mr-0 slide-in-bottom" src="{{ assetsUrl('img/hero.png') }}">
       </div>
 
-      <!--Footer-->
-      <div class="w-full pt-16 pb-6 text-sm text-center md:text-left fade-in">
-        <a class="text-gray-500 no-underline hover:no-underline" href="https://github.com/getferdi">
-          Ferdi server is a project by The Ferdi Team
-        </a>
-      </div>
-
     </div>
 
     <script>
@@ -70,12 +57,9 @@
       if (server[server.length - 1] == '/') {
         server = server.substr(0, server.length - 1)
       }
-    
+
       // Show on page
       document.getElementById('server').innerText = server;
-    
-    </script>
 
-  </div>
-</div>
+    </script>
 @endsection
diff --git a/resources/views/others/message.edge b/resources/views/others/message.edge
index bd7f5a3..59be2ed 100644
--- a/resources/views/others/message.edge
+++ b/resources/views/others/message.edge
@@ -1,7 +1,7 @@
 @layout('layouts.v2')
 
 @section('content')
-<div class="w-screen h-screen bg-purple-200 flex items-center justify-center">
+<div class="w-screen bg-purple-200 flex items-center justify-center">
   <div class="w-full max-w-sm bg-white shadow-md rounded px-8 pt-6 pb-8 mb-4" action="/import" method="POST">
     <h1 class="text-gray-700 text-center text-2xl pb-5">
       {{ heading }}
-- 
cgit v1.2.3-54-g00ecf