3 files changed, 87 insertions, 53 deletions

diff --git a/resources/views/others/import.edge b/resources/views/others/import.edge
index b890bbb..80da037 100644
--- a/resources/views/others/import.edge
+++ b/resources/views/others/import.edge
@@ -1,19 +1,67 @@
-@layout('layouts.main')
+@layout('layouts.v2')
 
 @section('content')
-<h1>Import a Franz account</h1>
-<p>Please login using your Franz account. We will create a new Ferdi account with the same credentials.</p>
-<form action="import" method="post">
-  <label for="email">E-Mail address</label><br />
-  <input type="email" name="email" placeholder="joe@example.com" required><br />
+<div class="w-screen h-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">
+      Import your Franz account
+    </h1>
+    <p class="text-gray-600 text-sm text-center py-2">
+      Please login using your Franz account. We will create a new Ferdi account with the same credentials.
+    </p>
 
-  <label for="password">Password</label><br />
-  <input type="password" name="password" placeholder="********" required><br />
+    @if(flashMessage('error'))
+    <div class="bg-orange-100 border-l-4 border-orange-500 text-orange-700 p-4">
+      {{ flashMessage('error') }}
+    </div>
+    @endif
+    @if(old('message'))
+    <div class="bg-orange-100 border-l-4 border-orange-500 text-orange-700 p-4">
+      {{ old('message') }}
+    </div>
+    @endif
 
-  <button type="submit" id="submitbutton">Import Franz account</button>
-  <small>
-    By importing your Franz account, you accept the <a href="/terms">Terms of service</a> and <a href="/privacy">Privacy
-      policy</a>
-  </small>
+    <div class="mb-4">
+      <label class="block text-gray-700 text-sm font-bold mb-2" for="email">
+        E-Mail
+      </label>
+      <input
+        class="shadow appearance-none border rounded w-full py-2 px-3 text-gray-700 leading-tight focus:outline-none focus:shadow-outline"
+        id="email"
+        name="email"
+        type="text"
+        placeholder="E-Mail"
+        value="{{ old('email', '') }}"
+        required>
+    </div>
+    <div class="mb-6">
+      <label class="block text-gray-700 text-sm font-bold mb-2" for="password">
+        Password
+      </label>
+      <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"
+        id="password"
+        type="password"
+        name="password"
+        placeholder="*****"
+        autocomplete="current-password"
+        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">
+      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>  
+    </p>
+    <div class="text-center">
+      <a class="w-full font-bold text-sm text-blue-500 hover:text-blue-800" href="/user/login">
+        Login to an existing account
+      </a>
+    </div>
 </form>
+</div>
 @endsection
diff --git a/resources/views/others/index.edge b/resources/views/others/index.edge
index 9c90fb0..9b4d3e5 100644
--- a/resources/views/others/index.edge
+++ b/resources/views/others/index.edge
@@ -4,18 +4,18 @@
 <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 pt-10 md:pt-14 px-6 mx-auto flex flex-wrap flex-col md:flex-row items-center">
+    <div class="container px-6 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">
         <h1
-          class="my-4 text-3xl md:text-5xl text-purple-800 font-bold leading-tight text-center md:text-left slide-in-bottom-h1">
+          class="my-4 text-3xl md:text-5xl text-gray-800 font-bold leading-tight text-center md:text-left slide-in-bottom-h1">
           Ferdi Server
         </h1>
-        <p class="leading-normal text-base md:text-2xl mb-8 text-center md:text-left slide-in-bottom-subtitle">
-          You are accessing a custom <a href="https://github.com/getferdi/ferdi">Ferdi</a> server.
-        </p>
 
         <p class="text-gray-700 font-bold pb-8 lg:pb-6 text-center md:text-left fade-in">
           Setup your client
@@ -44,7 +44,7 @@
         <p class="text-gray-700 font-bold pb-8 lg:pb-6 text-center md:text-left fade-in pt-8">
           Manage your account
         </p>
-        <a href="https://getferdi.com" class="bg-gray-700 hover:bg-gray-900 text-white font-bold py-2 px-4 rounded">
+        <a href="/user/account" class="bg-gray-700 hover:bg-gray-900 text-white font-bold py-2 px-4 rounded">
           Go to account dashboard
         </a>
 
@@ -79,37 +79,3 @@
   </div>
 </div>
 @endsection
-
-
-@section('nothing')
-<style>
-  ol,
-  p {
-    margin: 0.5rem 0;
-  }
-
-  img {
-    height: 200px;
-    margin: 0;
-  }
-
-</style>
-
-<img src="https://github.com/getferdi/ferdi/raw/develop/build-helpers/images/icon.png" alt="Ferdi logo">
-
-<h1>Ferdi Server</h1>
-<p>You are accessing a custom <a href="https://github.com/getferdi/ferdi">Ferdi</a> server.</p>
-<p>
-  To use this server in your Ferdi client, <a href="ferdi://settings/app">open Ferdi's settings</a> and as the
-  <code>server</code>, enter <code id="server"></code>
-</p>
-<p>
-  Alternatively, you can manage your account in the <a href="/user/account">account dashboard</a>.
-</p>
-
-<br />
-<small>
-  <a href="https://github.com/getferdi/server">ferdi-server</a> is a project by <a
-    href="https://getferdi.com">the Ferdi Team</a>.
-</small>
-@endsection
diff --git a/resources/views/others/message.edge b/resources/views/others/message.edge
new file mode 100644
index 0000000..bd7f5a3
--- /dev/null
+++ b/resources/views/others/message.edge
@@ -0,0 +1,20 @@
+@layout('layouts.v2')
+
+@section('content')
+<div class="w-screen h-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 }}
+    </h1>
+    <p class="text-gray-600 text-sm text-center py-2">
+      {{ text }}
+    </p>
+
+    <div class="text-center">
+      <a class="w-full font-bold text-sm text-blue-500 hover:text-blue-800" href="#" onclick="window.history.back()">
+        Go back
+      </a>
+    </div>
+  </div>
+</div>
+@endsection