diff options
-rw-r--r-- | resources/views/dashboard/account.edge | 2 | ||||
-rw-r--r-- | resources/views/dashboard/delete.edge | 2 | ||||
-rw-r--r-- | resources/views/dashboard/forgotPassword.edge | 4 | ||||
-rw-r--r-- | resources/views/dashboard/login.edge | 4 | ||||
-rw-r--r-- | resources/views/dashboard/resetPassword.edge | 4 | ||||
-rw-r--r-- | resources/views/dashboard/transfer.edge | 2 | ||||
-rw-r--r-- | resources/views/layouts/v2.edge | 18 | ||||
-rw-r--r-- | resources/views/others/import.edge | 6 | ||||
-rw-r--r-- | resources/views/others/index.edge | 24 | ||||
-rw-r--r-- | 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 @@ | |||
1 | @layout('layouts.v2') | 1 | @layout('layouts.v2') |
2 | 2 | ||
3 | @section('content') | 3 | @section('content') |
4 | <div class="w-screen h-screen bg-purple-200 flex items-center justify-center"> | 4 | <div class="w-screen bg-purple-200 flex items-center justify-center"> |
5 | <div class="w-full max-w-lg bg-white shadow-md rounded px-8 pt-6 pb-8 mb-4"> | 5 | <div class="w-full max-w-lg bg-white shadow-md rounded px-8 pt-6 pb-8 mb-4"> |
6 | <h1 class="text-gray-700 text-center text-2xl pb-5"> | 6 | <h1 class="text-gray-700 text-center text-2xl pb-5"> |
7 | Your Ferdi account | 7 | 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 @@ | |||
1 | @layout('layouts.v2') | 1 | @layout('layouts.v2') |
2 | 2 | ||
3 | @section('content') | 3 | @section('content') |
4 | <div class="w-screen h-screen bg-purple-200 flex items-center justify-center"> | 4 | <div class="w-screen bg-purple-200 flex items-center justify-center"> |
5 | <div class="w-full max-w-lg bg-white shadow-md rounded px-8 pt-6 pb-8 mb-4"> | 5 | <div class="w-full max-w-lg bg-white shadow-md rounded px-8 pt-6 pb-8 mb-4"> |
6 | <h1 class="text-gray-700 text-center text-2xl pb-5">Delete your account</h1> | 6 | <h1 class="text-gray-700 text-center text-2xl pb-5">Delete your account</h1> |
7 | @if(flashMessage('error')) | 7 | @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 @@ | |||
1 | @layout('layouts.v2') | 1 | @layout('layouts.v2') |
2 | 2 | ||
3 | @section('content') | 3 | @section('content') |
4 | <div class="w-screen h-screen bg-purple-200 flex items-center justify-center"> | 4 | <div class="w-screen bg-purple-200 flex items-center justify-center"> |
5 | <form class="w-full max-w-sm bg-white shadow-md rounded px-8 pt-6 pb-8 mb-4" | 5 | <form class="w-full max-w-sm bg-white shadow-md rounded px-8 pt-6 pb-8 mb-4" |
6 | action="/user/forgot" method="POST"> | 6 | action="/user/forgot" method="POST"> |
7 | <h1 class="text-gray-700 text-center text-2xl pb-5"> | 7 | <h1 class="text-gray-700 text-center text-2xl pb-5"> |
@@ -33,7 +33,7 @@ | |||
33 | value="{{ old('mail', '') }}" | 33 | value="{{ old('mail', '') }}" |
34 | required> | 34 | required> |
35 | </div> | 35 | </div> |
36 | 36 | ||
37 | <button | 37 | <button |
38 | class="bg-blue-500 hover:bg-blue-700 text-white font-bold py-2 px-4 rounded focus:outline-none focus:shadow-outline" | 38 | class="bg-blue-500 hover:bg-blue-700 text-white font-bold py-2 px-4 rounded focus:outline-none focus:shadow-outline" |
39 | type="submit"> | 39 | 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 @@ | |||
1 | @layout('layouts.v2') | 1 | @layout('layouts.v2') |
2 | 2 | ||
3 | @section('content') | 3 | @section('content') |
4 | <div class="w-screen h-screen bg-purple-200 flex items-center justify-center"> | 4 | <div class="w-screen bg-purple-200 flex items-center justify-center"> |
5 | <form class="w-full max-w-sm bg-white shadow-md rounded px-8 pt-6 pb-8 mb-4" | 5 | <form class="w-full max-w-sm bg-white shadow-md rounded px-8 pt-6 pb-8 mb-4" |
6 | action="{{ route('login') }}" method="POST"> | 6 | action="{{ route('login') }}" method="POST"> |
7 | <h1 class="text-gray-700 text-center text-2xl pb-5"> | 7 | <h1 class="text-gray-700 text-center text-2xl pb-5"> |
@@ -52,7 +52,7 @@ | |||
52 | Sign In | 52 | Sign In |
53 | </button> | 53 | </button> |
54 | <p class="text-gray-600 text-sm text-center py-2"> | 54 | <p class="text-gray-600 text-sm text-center py-2"> |
55 | 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. | 55 | 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. |
56 | </p> | 56 | </p> |
57 | <div class="text-center"> | 57 | <div class="text-center"> |
58 | <a class="w-full font-bold text-sm text-blue-500 hover:text-blue-800" href="/user/forgot"> | 58 | <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 @@ | |||
1 | @layout('layouts.v2') | 1 | @layout('layouts.v2') |
2 | 2 | ||
3 | @section('content') | 3 | @section('content') |
4 | <div class="w-screen h-screen bg-purple-200 flex items-center justify-center"> | 4 | <div class="w-screen bg-purple-200 flex items-center justify-center"> |
5 | <form class="w-full max-w-sm bg-white shadow-md rounded px-8 pt-6 pb-8 mb-4" | 5 | <form class="w-full max-w-sm bg-white shadow-md rounded px-8 pt-6 pb-8 mb-4" |
6 | action="/user/reset" method="POST"> | 6 | action="/user/reset" method="POST"> |
7 | <h1 class="text-gray-700 text-center text-2xl pb-5"> | 7 | <h1 class="text-gray-700 text-center text-2xl pb-5"> |
@@ -48,7 +48,7 @@ | |||
48 | </div> | 48 | </div> |
49 | 49 | ||
50 | <input type="hidden" name="token" value="{{ token }}"> | 50 | <input type="hidden" name="token" value="{{ token }}"> |
51 | 51 | ||
52 | <button | 52 | <button |
53 | class="bg-blue-500 hover:bg-blue-700 text-white font-bold py-2 px-4 rounded focus:outline-none focus:shadow-outline" | 53 | class="bg-blue-500 hover:bg-blue-700 text-white font-bold py-2 px-4 rounded focus:outline-none focus:shadow-outline" |
54 | type="submit"> | 54 | 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 @@ | |||
1 | @layout('layouts.v2') | 1 | @layout('layouts.v2') |
2 | 2 | ||
3 | @section('content') | 3 | @section('content') |
4 | <div class="w-screen h-screen bg-purple-200 flex items-center justify-center"> | 4 | <div class="w-screen bg-purple-200 flex items-center justify-center"> |
5 | <div class="w-full max-w-lg bg-white shadow-md rounded px-8 pt-6 pb-8 mb-4"> | 5 | <div class="w-full max-w-lg bg-white shadow-md rounded px-8 pt-6 pb-8 mb-4"> |
6 | <h1 class="text-gray-700 text-center text-2xl pb-5">Import/Export data from another Ferdi server</h1> | 6 | <h1 class="text-gray-700 text-center text-2xl pb-5">Import/Export data from another Ferdi server</h1> |
7 | @if(flashMessage('error')) | 7 | @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 @@ | |||
13 | </head> | 13 | </head> |
14 | 14 | ||
15 | <body> | 15 | <body> |
16 | @!section('content') | 16 | <div class="flex flex-col h-screen"> |
17 | <div class="bg-black"> | ||
18 | <div class="flex flex-row items-center container px-20 mx-auto"> | ||
19 | <a href="/"><img width="50" class="my-4 mr-10" src="https://github.com/getferdi/server/raw/master/logo.png"></a> | ||
20 | <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> | ||
21 | </div> | ||
22 | </div> | ||
23 | <div class="flex flex-1"> | ||
24 | @!section('content') | ||
25 | </div> | ||
26 | <div class="bg-black"> | ||
27 | <div class="container px-20 py-3 text-sm text-white mx-auto text-center"> | ||
28 | 2021 © All rights reserved - <a href="/terms" style="color: #d772fe">Terms of service</a> and <a href="/privacy" style="color: #d772fe">privacy policy</a>. | ||
29 | </div> | ||
30 | </div> | ||
31 | </div> | ||
32 | <script async defer src="https://buttons.github.io/buttons.js"></script> | ||
17 | </body> | 33 | </body> |
18 | 34 | ||
19 | </html> | 35 | </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 @@ | |||
1 | @layout('layouts.v2') | 1 | @layout('layouts.v2') |
2 | 2 | ||
3 | @section('content') | 3 | @section('content') |
4 | <div class="w-screen h-screen bg-purple-200 flex items-center justify-center"> | 4 | <div class="w-screen bg-purple-200 flex items-center justify-center"> |
5 | <form class="w-full max-w-sm bg-white shadow-md rounded px-8 pt-6 pb-8 mb-4" | 5 | <form class="w-full max-w-sm bg-white shadow-md rounded px-8 pt-6 pb-8 mb-4" |
6 | action="/import" method="POST"> | 6 | action="/import" method="POST"> |
7 | <h1 class="text-gray-700 text-center text-2xl pb-5"> | 7 | <h1 class="text-gray-700 text-center text-2xl pb-5"> |
@@ -54,8 +54,8 @@ | |||
54 | Import account | 54 | Import account |
55 | </button> | 55 | </button> |
56 | <p class="text-gray-600 text-sm text-center py-2"> | 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 | 57 | By importing your Franz account, you accept the <a href="/terms">terms of service</a> and <a href="/privacy">privacy |
58 | policy</a> | 58 | policy</a> |
59 | </p> | 59 | </p> |
60 | <div class="text-center"> | 60 | <div class="text-center"> |
61 | <a class="w-full font-bold text-sm text-blue-500 hover:text-blue-800" href="/user/login"> | 61 | <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 @@ | |||
1 | @layout('layouts.v2') | 1 | @layout('layouts.v2') |
2 | 2 | ||
3 | @section('content') | 3 | @section('content') |
4 | <div class="leading-normal tracking-normal text-gray-900" style="font-family: 'Source Sans Pro', sans-serif;"> | ||
5 | |||
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> | ||
10 | <!--Main--> | 4 | <!--Main--> |
11 | <div class="container px-6 mx-auto flex flex-wrap flex-col md:flex-row items-center"> | 5 | <div class="container px-20 mx-auto flex flex-wrap flex-col md:flex-row items-center"> |
12 | 6 | ||
13 | <!--Left Col--> | 7 | <!--Left Col--> |
14 | <div class="flex flex-col w-full xl:w-2/5 justify-center lg:items-start overflow-y-hidden"> | 8 | <div class="flex flex-col w-full xl:w-2/5 justify-center lg:items-start overflow-y-hidden"> |
@@ -38,7 +32,7 @@ | |||
38 | Don't have Ferdi yet? | 32 | Don't have Ferdi yet? |
39 | </p> | 33 | </p> |
40 | <a href="https://getferdi.com" class="bg-gray-700 hover:bg-gray-900 text-white font-bold py-2 px-4 rounded"> | 34 | <a href="https://getferdi.com" class="bg-gray-700 hover:bg-gray-900 text-white font-bold py-2 px-4 rounded"> |
41 | Get Ferdi now | 35 | Get Ferdi |
42 | </a> | 36 | </a> |
43 | 37 | ||
44 | <p class="text-gray-700 font-bold pb-8 lg:pb-6 text-center md:text-left fade-in pt-8"> | 38 | <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 @@ | |||
55 | <img class="w-5/6 mx-auto lg:mr-0 slide-in-bottom" src="{{ assetsUrl('img/hero.png') }}"> | 49 | <img class="w-5/6 mx-auto lg:mr-0 slide-in-bottom" src="{{ assetsUrl('img/hero.png') }}"> |
56 | </div> | 50 | </div> |
57 | 51 | ||
58 | <!--Footer--> | ||
59 | <div class="w-full pt-16 pb-6 text-sm text-center md:text-left fade-in"> | ||
60 | <a class="text-gray-500 no-underline hover:no-underline" href="https://github.com/getferdi"> | ||
61 | Ferdi server is a project by The Ferdi Team | ||
62 | </a> | ||
63 | </div> | ||
64 | |||
65 | </div> | 52 | </div> |
66 | 53 | ||
67 | <script> | 54 | <script> |
@@ -70,12 +57,9 @@ | |||
70 | if (server[server.length - 1] == '/') { | 57 | if (server[server.length - 1] == '/') { |
71 | server = server.substr(0, server.length - 1) | 58 | server = server.substr(0, server.length - 1) |
72 | } | 59 | } |
73 | 60 | ||
74 | // Show on page | 61 | // Show on page |
75 | document.getElementById('server').innerText = server; | 62 | document.getElementById('server').innerText = server; |
76 | |||
77 | </script> | ||
78 | 63 | ||
79 | </div> | 64 | </script> |
80 | </div> | ||
81 | @endsection | 65 | @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 @@ | |||
1 | @layout('layouts.v2') | 1 | @layout('layouts.v2') |
2 | 2 | ||
3 | @section('content') | 3 | @section('content') |
4 | <div class="w-screen h-screen bg-purple-200 flex items-center justify-center"> | 4 | <div class="w-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"> | 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"> | 6 | <h1 class="text-gray-700 text-center text-2xl pb-5"> |
7 | {{ heading }} | 7 | {{ heading }} |