diff options
author | vantezzen <hello@vantezzen.io> | 2020-04-02 15:32:18 +0200 |
---|---|---|
committer | vantezzen <hello@vantezzen.io> | 2020-04-02 15:32:18 +0200 |
commit | ddd002094d5c80ca4065b7d181e7f5b9471556da (patch) | |
tree | 1c5d9d018878595b32b4ec6bd3734bef698237d5 /resources/views/others | |
parent | Merge branch 'master' of https://github.com/getferdi/ferdi-server (diff) | |
download | ferdium-server-ddd002094d5c80ca4065b7d181e7f5b9471556da.tar.gz ferdium-server-ddd002094d5c80ca4065b7d181e7f5b9471556da.tar.zst ferdium-server-ddd002094d5c80ca4065b7d181e7f5b9471556da.zip |
Update dashboard design
Diffstat (limited to 'resources/views/others')
-rw-r--r-- | resources/views/others/import.edge | 74 | ||||
-rw-r--r-- | resources/views/others/index.edge | 46 | ||||
-rw-r--r-- | resources/views/others/message.edge | 20 |
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 @@ | |||
1 | @layout('layouts.main') | 1 | @layout('layouts.v2') |
2 | 2 | ||
3 | @section('content') | 3 | @section('content') |
4 | <h1>Import a Franz account</h1> | 4 | <div class="w-screen h-screen bg-purple-200 flex items-center justify-center"> |
5 | <p>Please login using your Franz account. We will create a new Ferdi account with the same credentials.</p> | 5 | <form class="w-full max-w-sm bg-white shadow-md rounded px-8 pt-6 pb-8 mb-4" |
6 | <form action="import" method="post"> | 6 | action="/import" method="POST"> |
7 | <label for="email">E-Mail address</label><br /> | 7 | <h1 class="text-gray-700 text-center text-2xl pb-5"> |
8 | <input type="email" name="email" placeholder="joe@example.com" required><br /> | 8 | Import your Franz account |
9 | </h1> | ||
10 | <p class="text-gray-600 text-sm text-center py-2"> | ||
11 | Please login using your Franz account. We will create a new Ferdi account with the same credentials. | ||
12 | </p> | ||
9 | 13 | ||
10 | <label for="password">Password</label><br /> | 14 | @if(flashMessage('error')) |
11 | <input type="password" name="password" placeholder="********" required><br /> | 15 | <div class="bg-orange-100 border-l-4 border-orange-500 text-orange-700 p-4"> |
16 | {{ flashMessage('error') }} | ||
17 | </div> | ||
18 | @endif | ||
19 | @if(old('message')) | ||
20 | <div class="bg-orange-100 border-l-4 border-orange-500 text-orange-700 p-4"> | ||
21 | {{ old('message') }} | ||
22 | </div> | ||
23 | @endif | ||
12 | 24 | ||
13 | <button type="submit" id="submitbutton">Import Franz account</button> | 25 | <div class="mb-4"> |
14 | <small> | 26 | <label class="block text-gray-700 text-sm font-bold mb-2" for="email"> |
15 | By importing your Franz account, you accept the <a href="/terms">Terms of service</a> and <a href="/privacy">Privacy | 27 | |
16 | policy</a> | 28 | </label> |
17 | </small> | 29 | <input |
30 | class="shadow appearance-none border rounded w-full py-2 px-3 text-gray-700 leading-tight focus:outline-none focus:shadow-outline" | ||
31 | id="email" | ||
32 | name="email" | ||
33 | type="text" | ||
34 | placeholder="E-Mail" | ||
35 | value="{{ old('email', '') }}" | ||
36 | required> | ||
37 | </div> | ||
38 | <div class="mb-6"> | ||
39 | <label class="block text-gray-700 text-sm font-bold mb-2" for="password"> | ||
40 | Password | ||
41 | </label> | ||
42 | <input | ||
43 | class="shadow appearance-none rounded w-full py-2 px-3 text-gray-700 mb-3 leading-tight focus:outline-none focus:shadow-outline" | ||
44 | id="password" | ||
45 | type="password" | ||
46 | name="password" | ||
47 | placeholder="*****" | ||
48 | autocomplete="current-password" | ||
49 | required> | ||
50 | </div> | ||
51 | <button | ||
52 | class="bg-blue-500 hover:bg-blue-700 text-white font-bold py-2 px-4 rounded focus:outline-none focus:shadow-outline" | ||
53 | type="submit"> | ||
54 | Import account | ||
55 | </button> | ||
56 | <p class="text-gray-600 text-sm text-center py-2"> | ||
57 | By importing your Franz account, you accept the <a href="/terms">Terms of service</a> and <a href="/privacy">Privacy | ||
58 | policy</a> | ||
59 | </p> | ||
60 | <div class="text-center"> | ||
61 | <a class="w-full font-bold text-sm text-blue-500 hover:text-blue-800" href="/user/login"> | ||
62 | Login to an existing account | ||
63 | </a> | ||
64 | </div> | ||
18 | </form> | 65 | </form> |
66 | </div> | ||
19 | @endsection | 67 | @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 @@ | |||
4 | <div class="leading-normal tracking-normal text-gray-900" style="font-family: 'Source Sans Pro', sans-serif;"> | 4 | <div class="leading-normal tracking-normal text-gray-900" style="font-family: 'Source Sans Pro', sans-serif;"> |
5 | 5 | ||
6 | <div class="h-screen bg-right bg-cover"> | 6 | <div class="h-screen bg-right bg-cover"> |
7 | <div class="flex justify-center"> | ||
8 | <img class="h-20 my-10" src="{{ assetsUrl('img/icon.png') }}"> | ||
9 | </div> | ||
7 | <!--Main--> | 10 | <!--Main--> |
8 | <div class="container pt-10 md:pt-14 px-6 mx-auto flex flex-wrap flex-col md:flex-row items-center"> | 11 | <div class="container px-6 mx-auto flex flex-wrap flex-col md:flex-row items-center"> |
9 | 12 | ||
10 | <!--Left Col--> | 13 | <!--Left Col--> |
11 | <div class="flex flex-col w-full xl:w-2/5 justify-center lg:items-start overflow-y-hidden"> | 14 | <div class="flex flex-col w-full xl:w-2/5 justify-center lg:items-start overflow-y-hidden"> |
12 | <h1 | 15 | <h1 |
13 | class="my-4 text-3xl md:text-5xl text-purple-800 font-bold leading-tight text-center md:text-left slide-in-bottom-h1"> | 16 | class="my-4 text-3xl md:text-5xl text-gray-800 font-bold leading-tight text-center md:text-left slide-in-bottom-h1"> |
14 | Ferdi Server | 17 | Ferdi Server |
15 | </h1> | 18 | </h1> |
16 | <p class="leading-normal text-base md:text-2xl mb-8 text-center md:text-left slide-in-bottom-subtitle"> | ||
17 | You are accessing a custom <a href="https://github.com/getferdi/ferdi">Ferdi</a> server. | ||
18 | </p> | ||
19 | 19 | ||
20 | <p class="text-gray-700 font-bold pb-8 lg:pb-6 text-center md:text-left fade-in"> | 20 | <p class="text-gray-700 font-bold pb-8 lg:pb-6 text-center md:text-left fade-in"> |
21 | Setup your client | 21 | Setup your client |
@@ -44,7 +44,7 @@ | |||
44 | <p class="text-gray-700 font-bold pb-8 lg:pb-6 text-center md:text-left fade-in pt-8"> | 44 | <p class="text-gray-700 font-bold pb-8 lg:pb-6 text-center md:text-left fade-in pt-8"> |
45 | Manage your account | 45 | Manage your account |
46 | </p> | 46 | </p> |
47 | <a href="https://getferdi.com" class="bg-gray-700 hover:bg-gray-900 text-white font-bold py-2 px-4 rounded"> | 47 | <a href="/user/account" class="bg-gray-700 hover:bg-gray-900 text-white font-bold py-2 px-4 rounded"> |
48 | Go to account dashboard | 48 | Go to account dashboard |
49 | </a> | 49 | </a> |
50 | 50 | ||
@@ -79,37 +79,3 @@ | |||
79 | </div> | 79 | </div> |
80 | </div> | 80 | </div> |
81 | @endsection | 81 | @endsection |
82 | |||
83 | |||
84 | @section('nothing') | ||
85 | <style> | ||
86 | ol, | ||
87 | p { | ||
88 | margin: 0.5rem 0; | ||
89 | } | ||
90 | |||
91 | img { | ||
92 | height: 200px; | ||
93 | margin: 0; | ||
94 | } | ||
95 | |||
96 | </style> | ||
97 | |||
98 | <img src="https://github.com/getferdi/ferdi/raw/develop/build-helpers/images/icon.png" alt="Ferdi logo"> | ||
99 | |||
100 | <h1>Ferdi Server</h1> | ||
101 | <p>You are accessing a custom <a href="https://github.com/getferdi/ferdi">Ferdi</a> server.</p> | ||
102 | <p> | ||
103 | To use this server in your Ferdi client, <a href="ferdi://settings/app">open Ferdi's settings</a> and as the | ||
104 | <code>server</code>, enter <code id="server"></code> | ||
105 | </p> | ||
106 | <p> | ||
107 | Alternatively, you can manage your account in the <a href="/user/account">account dashboard</a>. | ||
108 | </p> | ||
109 | |||
110 | <br /> | ||
111 | <small> | ||
112 | <a href="https://github.com/getferdi/server">ferdi-server</a> is a project by <a | ||
113 | href="https://getferdi.com">the Ferdi Team</a>. | ||
114 | </small> | ||
115 | @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 @@ | |||
1 | @layout('layouts.v2') | ||
2 | |||
3 | @section('content') | ||
4 | <div class="w-screen h-screen bg-purple-200 flex items-center justify-center"> | ||
5 | <div class="w-full max-w-sm bg-white shadow-md rounded px-8 pt-6 pb-8 mb-4" action="/import" method="POST"> | ||
6 | <h1 class="text-gray-700 text-center text-2xl pb-5"> | ||
7 | {{ heading }} | ||
8 | </h1> | ||
9 | <p class="text-gray-600 text-sm text-center py-2"> | ||
10 | {{ text }} | ||
11 | </p> | ||
12 | |||
13 | <div class="text-center"> | ||
14 | <a class="w-full font-bold text-sm text-blue-500 hover:text-blue-800" href="#" onclick="window.history.back()"> | ||
15 | Go back | ||
16 | </a> | ||
17 | </div> | ||
18 | </div> | ||
19 | </div> | ||
20 | @endsection | ||