aboutsummaryrefslogtreecommitdiffstats
path: root/resources
diff options
context:
space:
mode:
authorLibravatar vantezzen <hello@vantezzen.io>2020-04-02 15:32:18 +0200
committerLibravatar vantezzen <hello@vantezzen.io>2020-04-02 15:32:18 +0200
commitddd002094d5c80ca4065b7d181e7f5b9471556da (patch)
tree1c5d9d018878595b32b4ec6bd3734bef698237d5 /resources
parentMerge branch 'master' of https://github.com/getferdi/ferdi-server (diff)
downloadferdium-server-ddd002094d5c80ca4065b7d181e7f5b9471556da.tar.gz
ferdium-server-ddd002094d5c80ca4065b7d181e7f5b9471556da.tar.zst
ferdium-server-ddd002094d5c80ca4065b7d181e7f5b9471556da.zip
Update dashboard design
Diffstat (limited to 'resources')
-rw-r--r--resources/views/dashboard/account.edge109
-rw-r--r--resources/views/dashboard/data.edge326
-rw-r--r--resources/views/dashboard/delete.edge45
-rw-r--r--resources/views/dashboard/login.edge86
-rw-r--r--resources/views/dashboard/transfer.edge81
-rw-r--r--resources/views/others/import.edge74
-rw-r--r--resources/views/others/index.edge46
-rw-r--r--resources/views/others/message.edge20
8 files changed, 435 insertions, 352 deletions
diff --git a/resources/views/dashboard/account.edge b/resources/views/dashboard/account.edge
index a91aa11..9f3539e 100644
--- a/resources/views/dashboard/account.edge
+++ b/resources/views/dashboard/account.edge
@@ -1,66 +1,75 @@
1@layout('layouts.main') 1@layout('layouts.v2')
2 2
3@section('content') 3@section('content')
4<h2>Your Ferdi account</h2> 4<div class="w-screen h-screen bg-purple-200 flex items-center justify-center">
5@if(flashMessage('error')) 5 <div class="w-full max-w-lg bg-white shadow-md rounded px-8 pt-6 pb-8 mb-4">
6 <div class="alert"> 6 <h1 class="text-gray-700 text-center text-2xl pb-5">
7 {{ flashMessage('error') }} 7 Your Ferdi account
8 </h1>
9 @if(flashMessage('error'))
10 <div class="bg-orange-100 border-l-4 border-orange-500 text-orange-700 p-4">
11 {{ flashMessage('error') }}
8 </div> 12 </div>
9@endif 13 @endif
10@if(old('message')) 14 @if(old('message'))
11 <div class="alert"> 15 <div class="bg-orange-100 border-l-4 border-orange-500 text-orange-700 p-4">
12 {{ old('message') }} 16 {{ old('message') }}
13 </div> 17 </div>
14@endif 18 @endif
15@if(flashMessage('notification')) 19 @if(flashMessage('notification'))
16 <div class="alert"> 20 <div class="bg-orange-100 border-l-4 border-orange-500 text-orange-700 p-4">
17 {{ flashMessage('notification.message') }} 21 {{ flashMessage('notification.message') }}
18 </div> 22 </div>
19@endif 23 @endif
20@if(success === true) 24 @if(success === true)
21 <div class="alert" style="background-color:#28C76F;"> 25 <div class="bg-green-100 border-l-4 border-green-500 text-white p-4" style="background-color:#28C76F;">
22 Sucessfully updated your user account 26 Sucessfully updated your user account
23 </div> 27 </div>
24@endif 28 @endif
25 29
26<form action="/user/account" method="POST"> 30 <form action="/user/account" method="POST">
27 {{ csrfField() }} 31 {{ csrfField() }}
28 <div> 32 <div class="mb-6">
29 <label>Name</label> 33 <label class="block text-gray-700 text-sm font-bold mb-2">Name</label>
30 <div> 34 <div>
31 <input type="text" value="{{ old('name', username) }}" placeholder="Name" name="username" required> 35 <input
36 class="shadow appearance-none rounded w-full py-2 px-3 text-gray-700 mb-3 leading-tight focus:outline-none focus:shadow-outline"
37 type="text" value="{{ old('name', username) }}" placeholder="Name" name="username" required>
32 </div> 38 </div>
33 </div> 39 </div>
34 <div> 40 <div class="mb-6">
35 <label>E-Mail</label> 41 <label class="block text-gray-700 text-sm font-bold mb-2">E-Mail</label>
36 <div> 42 <div>
37 <input type="email" value="{{ old('email', email) }}" placeholder="E-Mail" name="email" required> 43 <input
44 class="shadow appearance-none rounded w-full py-2 px-3 text-gray-700 mb-3 leading-tight focus:outline-none focus:shadow-outline"
45 type="email" value="{{ old('email', email) }}" placeholder="E-Mail" name="email" required>
38 </div> 46 </div>
39 </div> 47 </div>
40 <div> 48 <div class="mb-6">
41 <label>Password</label> 49 <label class="block text-gray-700 text-sm font-bold mb-2">Password</label>
42 <div> 50 <div>
43 <input type="password" placeholder="*********" name="password"> 51 <input
52 class="shadow appearance-none rounded w-full py-2 px-3 text-gray-700 mb-3 leading-tight focus:outline-none focus:shadow-outline"
53 type="password" placeholder="*********" name="password">
44 </div> 54 </div>
45 </div> 55 </div>
46 <div> 56 <div>
47 <button style="background-color:#28C76F;margin-bottom:1rem;">Change settings</button> 57 <button style="background-color:#28C76F;margin-bottom:1rem;">Change settings</button>
58 </div>
59 </form>
60 <div class="text-center">
61 <a class="w-full font-bold text-sm text-gray-500 hover:text-gray-800 mb-3"
62 href="/user/data">My account data</a>
63 <br />
64 <a class="w-full font-bold text-sm text-gray-500 hover:text-gray-800 mb-3"
65 href="/user/transfer">Import/Export account data</a>
66 <br />
67 <a class="w-full font-bold text-sm text-red-500 hover:text-red-800 mb-3"
68 href="/user/delete">Delete my account</a>
69 <br />
70 <a class="w-full font-bold text-sm text-gray-500 hover:text-gray-800 mb-3"
71 href="/user/logout">Logout</a>
48 </div> 72 </div>
49</form> 73 </div>
50
51<div>
52 <a class="button" href="/user/delete" style="background-color:#F6416C;margin-bottom:1rem;">Delete my account</a>
53</div>
54<div>
55 <a class="button" href="/user/data" style="margin-bottom:1rem;">My account data</a>
56</div> 74</div>
57<div> 75@endsection
58 <a class="button" href="/user/transfer" style="margin-bottom:1rem;">Import/Export account data</a>
59</div>
60<div>
61 <a class="button" href="/user/logout">Logout</a>
62</div>
63
64</div>
65
66@endsection \ No newline at end of file
diff --git a/resources/views/dashboard/data.edge b/resources/views/dashboard/data.edge
index 1935229..60ef10b 100644
--- a/resources/views/dashboard/data.edge
+++ b/resources/views/dashboard/data.edge
@@ -1,167 +1,177 @@
1@layout('layouts.main') 1@layout('layouts.v2')
2 2
3@section('content') 3@section('content')
4<h2>Your Ferdi account data</h2> 4<style>
5@if(flashMessage('error')) 5 table {
6 <div class="alert"> 6 border: 1px solid #919191;
7 {{ flashMessage('error') }} 7 border-collapse: collapse;
8 </div> 8 table-layout: fixed;
9@endif 9 width: 100%;
10@if(old('message')) 10 }
11 <div class="alert"> 11 table thead { text-align: center; }
12 {{ old('message') }} 12 table tbody { text-align: right; }
13 </div> 13 table tr { border-bottom: 1px solid #919191; }
14@endif 14 table tbody tr:nth-child(even) { background: var(--tertiary-color); }
15 15 table th { background: var(--secondary-color); font-weight: bold; }
16<h4>General account data</h4> 16 table th, table td { padding: 1rem; }
17<table> 17 table th:not(last-of-type), table td:not(last-of-type) { border-right: 1px solid #919191; }
18 <tr>
19 <th>
20 Name
21 </th>
22 <th>
23 Value
24 </th>
25 </tr>
26 <tr>
27 <td>
28 E-Mail
29 </td>
30 <td>
31 {{ mail }}
32 </td>
33 </tr>
34 <tr>
35 <td>
36 Username
37 </td>
38 <td>
39 {{ username }}
40 </td>
41 </tr>
42 <tr>
43 <td>
44 Created account on
45 </td>
46 <td>
47 {{ created }}
48 </td>
49 </tr>
50 <tr>
51 <td>
52 Last account update on
53 </td>
54 <td>
55 {{ updated }}
56 </td>
57 </tr>
58</table>
59
60<h4>Your services</h4>
61<table>
62 <tr>
63 <th>
64 Service ID
65 </th>
66 <th>
67 Name
68 </th>
69 <th>
70 Recipe ID
71 </th>
72 <th>
73 Settings
74 </th>
75 <th>
76 Created
77 </th>
78 <th>
79 Last updated
80 </th>
81 </tr>
82 18
83 @each(service in services) 19</style>
84 <tr>
85 <td>
86 {{ service.serviceId }}
87 </td>
88 <td>
89 {{ service.name }}
90 </td>
91 <td>
92 {{ service.recipeId }}
93 </td>
94 <td>
95 {{ service.settings }}
96 </td>
97 <td>
98 {{ service.created_at }}
99 </td>
100 <td>
101 {{ service.updated_at }}
102 </td>
103 </tr>
104 @endeach
105</table>
106 20
21<div class="bg-purple-200 flex items-center justify-center">
22 <div class="w-full bg-white shadow-md rounded px-8 pt-6 mt-5 pb-8 mb-4">
23 <h1 class="text-gray-700 text-center text-2xl pb-5">Your Account Data</h1>
107 24
108<h4>Your workspaces</h4> 25
109<table> 26 <table class="w-full rounded-lg overflow-hidden sm:shadow-lg my-5">
110 <tr> 27 <tr>
111 <th> 28 <th>
112 Service ID 29 Name
113 </th> 30 </th>
114 <th> 31 <th>
115 Name 32 Value
116 </th> 33 </th>
117 <th> 34 </tr>
118 Order 35 <tr>
119 </th> 36 <td>
120 <th> 37 E-Mail
121 Services 38 </td>
122 </th> 39 <td>
123 <th> 40 {{ mail }}
124 Data 41 </td>
125 </th> 42 </tr>
126 <th> 43 <tr>
127 Created 44 <td>
128 </th> 45 Username
129 <th> 46 </td>
130 Last updated 47 <td>
131 </th> 48 {{ username }}
132 </tr> 49 </td>
133 50 </tr>
134 @each(workspace in workspaces) 51 <tr>
135 <tr> 52 <td>
136 <td> 53 Created account on
137 {{ workspace.workspaceId }} 54 </td>
138 </td> 55 <td>
139 <td> 56 {{ created }}
140 {{ workspace.name }} 57 </td>
141 </td> 58 </tr>
142 <td> 59 <tr>
143 {{ workspace.order }} 60 <td>
144 </td> 61 Last account update on
145 <td> 62 </td>
146 {{ workspace.services }} 63 <td>
147 </td> 64 {{ updated }}
148 <td> 65 </td>
149 {{ workspace.data }} 66 </tr>
150 </td> 67 </table>
151 <td> 68
152 {{ workspace.created_at }} 69 <h1 class="text-gray-700 text-center text-2xl pb-5">Your Services</h1>
153 </td> 70 <table class="w-full rounded-lg overflow-hidden sm:shadow-lg my-5">
154 <td> 71 <tr>
155 {{ workspace.updated_at }} 72 <th>
156 </td> 73 Service ID
157 </tr> 74 </th>
158 @endeach 75 <th>
159</table> 76 Name
77 </th>
78 <th>
79 Recipe ID
80 </th>
81 <th>
82 Settings
83 </th>
84 <th>
85 Created
86 </th>
87 <th>
88 Last updated
89 </th>
90 </tr>
91
92 @each(service in services)
93 <tr>
94 <td>
95 {{ service.serviceId }}
96 </td>
97 <td>
98 {{ service.name }}
99 </td>
100 <td>
101 {{ service.recipeId }}
102 </td>
103 <td>
104 {{ stringify(service.settings) }}
105 </td>
106 <td>
107 {{ service.created_at }}
108 </td>
109 <td>
110 {{ service.updated_at }}
111 </td>
112 </tr>
113 @endeach
114 </table>
115
116 <h1 class="text-gray-700 text-center text-2xl pb-5">Your Workspaces</h1>
117 <table>
118 <tr>
119 <th>
120 Service ID
121 </th>
122 <th>
123 Name
124 </th>
125 <th>
126 Order
127 </th>
128 <th>
129 Services
130 </th>
131 <th>
132 Data
133 </th>
134 <th>
135 Created
136 </th>
137 <th>
138 Last updated
139 </th>
140 </tr>
141
142 @each(workspace in workspaces)
143 <tr>
144 <td>
145 {{ workspace.workspaceId }}
146 </td>
147 <td>
148 {{ workspace.name }}
149 </td>
150 <td>
151 {{ workspace.order }}
152 </td>
153 <td>
154 {{ stringify(workspace.services) }}
155 </td>
156 <td>
157 {{ stringify(workspace.data) }}
158 </td>
159 <td>
160 {{ workspace.created_at }}
161 </td>
162 <td>
163 {{ workspace.updated_at }}
164 </td>
165 </tr>
166 @endeach
167 </table>
168
169 <div class="text-center">
170 <a class="w-full font-bold text-sm text-gray-500 hover:text-gray-800 mb-3" href="/user/account">Back to My
171 Account</a>
172 </div>
160 173
161<div> 174 </div>
162 <a class="button" href="/user/account">Back to my account</a>
163</div> 175</div>
164
165</div> 176</div>
166
167@endsection \ No newline at end of file 177@endsection \ No newline at end of file
diff --git a/resources/views/dashboard/delete.edge b/resources/views/dashboard/delete.edge
index d3fc0df..3a29253 100644
--- a/resources/views/dashboard/delete.edge
+++ b/resources/views/dashboard/delete.edge
@@ -1,31 +1,36 @@
1@layout('layouts.main') 1@layout('layouts.v2')
2 2
3@section('content') 3@section('content')
4<h2>Delete Ferdi account</h2> 4<div class="w-screen h-screen bg-purple-200 flex items-center justify-center">
5@if(flashMessage('error')) 5 <div class="w-full max-w-lg bg-white shadow-md rounded px-8 pt-6 pb-8 mb-4">
6 <div class="alert"> 6 <h1 class="text-gray-700 text-center text-2xl pb-5">Delete your account</h1>
7 {{ flashMessage('error') }} 7 @if(flashMessage('error'))
8 <div class="bg-orange-100 border-l-4 border-orange-500 text-orange-700 p-4">
9 {{ flashMessage('error') }}
8 </div> 10 </div>
9@endif 11 @endif
10@if(old('message')) 12 @if(old('message'))
11 <div class="alert"> 13 <div class="bg-orange-100 border-l-4 border-orange-500 text-orange-700 p-4">
12 {{ old('message') }} 14 {{ old('message') }}
13 </div> 15 </div>
14@endif 16 @endif
15 17
16<form action="/user/delete" method="POST"> 18 <form action="/user/delete" method="POST">
17 <p>Are you sure, that you want to delete your Ferdi account?</p> 19 <p>Are you sure, that you want to delete your Ferdi account?</p>
18 <p>This will <b>permanently</b> delete all your account settings, services and workspaces.</p> 20 <p>This will <b>permanently</b> delete all your account settings, services and workspaces.</p>
19 <div> 21 <div class="pt-8">
20 {{ csrfField() }} 22 {{ csrfField() }}
21 <button style="background-color:#F6416C;margin-bottom:1rem;">Yes, delete account</button> 23 <button style="background-color:#F6416C;margin-bottom:1rem;">Yes, delete account</button>
24 </div>
25 </form>
26
27 <div class="text-center">
28 <a class="w-full font-bold text-sm text-gray-500 hover:text-gray-800 mb-3" href="/user/account">Back to My
29 Account</a>
22 </div> 30 </div>
23</form>
24 31
25<div> 32 </div>
26 <a class="button" href="/user/account" style="background-color:#28C76F;">Cancel</a> 33 <script src="/js/transfer.js"></script>
27</div> 34</div>
28
29</div> 35</div>
30 36@endsection
31@endsection \ No newline at end of file
diff --git a/resources/views/dashboard/login.edge b/resources/views/dashboard/login.edge
index 16042b3..9b4b52a 100644
--- a/resources/views/dashboard/login.edge
+++ b/resources/views/dashboard/login.edge
@@ -1,42 +1,64 @@
1@layout('layouts.main') 1@layout('layouts.v2')
2 2
3@section('content') 3@section('content')
4<h2>Login</h2> 4<div class="w-screen h-screen bg-purple-200 flex items-center justify-center">
5@if(flashMessage('error')) 5<form class="w-full max-w-sm bg-white shadow-md rounded px-8 pt-6 pb-8 mb-4"
6 <div class="alert"> 6 action="{{ route('login') }}" method="POST">
7 {{ flashMessage('error') }} 7 <h1 class="text-gray-700 text-center text-2xl pb-5">
8 Login
9 </h1>
10
11 @if(flashMessage('error'))
12 <div class="bg-orange-100 border-l-4 border-orange-500 text-orange-700 p-4">
13 {{ flashMessage('error') }}
8 </div> 14 </div>
9@endif 15 @endif
10@if(old('message')) 16 @if(old('message'))
11 <div class="alert"> 17 <div class="bg-orange-100 border-l-4 border-orange-500 text-orange-700 p-4">
12 {{ old('message') }} 18 {{ old('message') }}
13 </div> 19 </div>
14@endif 20 @endif
15<form action="/user/login" method="POST"> 21
16 {{ csrfField() }} 22 {{ csrfField() }}
17 <div> 23 <div class="mb-4">
18 <label>E-Mail</label> 24 <label class="block text-gray-700 text-sm font-bold mb-2" for="username">
19 <div> 25 E-Mail
20 <input type="email" value="{{ old('mail', '') }}" placeholder="E-Mail" name="mail"> 26 </label>
21 </div> 27 <input
22 </div> 28 class="shadow appearance-none border rounded w-full py-2 px-3 text-gray-700 leading-tight focus:outline-none focus:shadow-outline"
23 <div> 29 id="mail"
24 <label>Password</label> 30 name="mail"
25 <div> 31 type="text"
26 <input type="password" placeholder="*********" name="password"> 32 placeholder="E-Mail"
27 </div> 33 value="{{ old('mail', '') }}"
34 required>
28 </div> 35 </div>
29 <div> 36 <div class="mb-6">
30 <button>Login</button> 37 <label class="block text-gray-700 text-sm font-bold mb-2" for="password">
31 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. 38 Password
32 39 </label>
40 <input
41 class="shadow appearance-none rounded w-full py-2 px-3 text-gray-700 mb-3 leading-tight focus:outline-none focus:shadow-outline"
42 id="password"
43 type="password"
44 name="password"
45 placeholder="*****"
46 autocomplete="current-password"
47 required>
33 </div> 48 </div>
34 <div> 49 <button
35 <p>Not a member yet? Register in the Ferdi app or <a href="../import">import your Franz account</a>.</p> 50 class="bg-blue-500 hover:bg-blue-700 text-white font-bold py-2 px-4 rounded focus:outline-none focus:shadow-outline"
51 type="submit">
52 Sign In
53 </button>
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.
56 </p>
57 <div class="text-center">
58 <a class="w-full font-bold text-sm text-blue-500 hover:text-blue-800" href="../import">
59 Import your Franz account
60 </a>
36 </div> 61 </div>
37</form> 62</form>
38<br />
39
40</div> 63</div>
41 64@endsection
42@endsection \ No newline at end of file
diff --git a/resources/views/dashboard/transfer.edge b/resources/views/dashboard/transfer.edge
index 94efeb0..d2feedc 100644
--- a/resources/views/dashboard/transfer.edge
+++ b/resources/views/dashboard/transfer.edge
@@ -1,52 +1,55 @@
1@layout('layouts.main') 1@layout('layouts.v2')
2 2
3@section('content') 3@section('content')
4<h2>Import/Export data from another Ferdi server</h2> 4<div class="w-screen h-screen bg-purple-200 flex items-center justify-center">
5@if(flashMessage('error')) 5 <div class="w-full max-w-lg bg-white shadow-md rounded px-8 pt-6 pb-8 mb-4">
6 <div class="alert"> 6 <h1 class="text-gray-700 text-center text-2xl pb-5">Import/Export data from another Ferdi server</h1>
7 {{ flashMessage('error') }} 7 @if(flashMessage('error'))
8 <div class="bg-orange-100 border-l-4 border-orange-500 text-orange-700 p-4">
9 {{ flashMessage('error') }}
8 </div> 10 </div>
9@endif 11 @endif
10@if(old('message')) 12 @if(old('message'))
11 <div class="alert"> 13 <div class="bg-orange-100 border-l-4 border-orange-500 text-orange-700 p-4">
12 {{ old('message') }} 14 {{ old('message') }}
13 </div> 15 </div>
14@endif 16 @endif
15@if(flashMessage('notification')) 17 @if(flashMessage('notification'))
16 <div class="alert"> 18 <div class="bg-orange-100 border-l-4 border-orange-500 text-orange-700 p-4">
17 {{ flashMessage('notification.message') }} 19 {{ flashMessage('notification.message') }}
18 </div> 20 </div>
19@endif 21 @endif
20@if(success === true) 22 @if(success === true)
21 <div class="alert" style="background-color:#28C76F;"> 23 <div class="bg-green-100 border-l-4 border-green-500 text-white p-4" style="background-color:#28C76F;">
22 Sucessfully imported your account data 24 Sucessfully imported your account data
23 </div> 25 </div>
24@endif 26 @endif
25 27
26<h3>Import data</h3> 28 <h3 class="text-gray-600 text-xl">Import data</h3>
27<div>
28 <label>Account data</label>
29 <div>
30 <input type="file" name="file" id="file" value="" accept=".json,.ferdi-data" required>
31 </div>
32</div>
33
34<form action="/user/transfer" method="POST">
35 {{ csrfField() }}
36 <input type="hidden" name="file" id="fileoutput" value="">
37 <div> 29 <div>
38 <button style="background-color:#28C76F;margin-bottom:1rem;" id="submit" disabled>Import data</button> 30 <div>
31 <input type="file" name="file" id="file" value="" accept=".json,.ferdi-data" required>
32 </div>
39 </div> 33 </div>
40</form>
41 34
42<h3>Export data</h3> 35 <form action="/user/transfer" method="POST">
43<a class="button" style="background-color:#28C76F;margin-bottom:1rem;" href="/user/export">Export data</a> 36 {{ csrfField() }}
37 <input type="hidden" name="file" id="fileoutput" value="">
38 <div>
39 <button style="background-color:#28C76F;margin-bottom:1rem;" id="submit" disabled>Import data</button>
40 </div>
41 </form>
44 42
45<div> 43 <h3 class="text-gray-600 text-xl">Export data</h3>
46 <a class="button" href="/user/account">Back to my account</a> 44 <a class="button" style="background-color:#28C76F;margin-bottom:1rem;" href="/user/export">Export data</a>
47</div>
48 45
49</div> 46 <div class="text-center">
50<script src="/js/transfer.js"></script> 47 <a class="w-full font-bold text-sm text-gray-500 hover:text-gray-800 mb-3" href="/user/account">Back to My
48 Account</a>
49 </div>
51 50
52@endsection \ No newline at end of file 51 </div>
52 <script src="/js/transfer.js"></script>
53</div>
54</div>
55@endsection
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 E-Mail
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
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-06-29 00:46:03 +0000