diff options
Diffstat (limited to 'resources')
-rw-r--r-- | resources/announcements/version.json | 8 | ||||
-rw-r--r-- | resources/views/dashboard/account.edge | 2 | ||||
-rw-r--r-- | resources/views/dashboard/delete.edge | 2 | ||||
-rw-r--r-- | resources/views/dashboard/login.edge | 2 | ||||
-rw-r--r-- | resources/views/dashboard/transfer.edge | 2 | ||||
-rw-r--r-- | resources/views/layouts/main.edge | 2 | ||||
-rw-r--r-- | resources/views/layouts/v2.edge | 4 | ||||
-rw-r--r-- | resources/views/others/import.edge | 6 | ||||
-rw-r--r-- | resources/views/others/index.edge | 4 | ||||
-rw-r--r-- | resources/views/others/new.edge | 4 |
10 files changed, 18 insertions, 18 deletions
diff --git a/resources/announcements/version.json b/resources/announcements/version.json index 79aabf3..3865a89 100644 --- a/resources/announcements/version.json +++ b/resources/announcements/version.json | |||
@@ -1,10 +1,10 @@ | |||
1 | { | 1 | { |
2 | "main": { | 2 | "main": { |
3 | "headline": "Example Accouncement", | 3 | "headline": "Example Announcement", |
4 | "subHeadline": "Configure your announcement here", | 4 | "subHeadline": "Configure your announcement here", |
5 | "image": { | 5 | "image": { |
6 | "light": "https://api.getferdi.com/assets/feature/light.png", | 6 | "light": "https://api.ferdium.org/assets/feature/light.png", |
7 | "dark": "https://api.getferdi.com/assets/feature/dark.png" | 7 | "dark": "https://api.ferdium.org/assets/feature/dark.png" |
8 | }, | 8 | }, |
9 | "text": "Long description here", | 9 | "text": "Long description here", |
10 | "cta": { | 10 | "cta": { |
@@ -31,4 +31,4 @@ | |||
31 | } | 31 | } |
32 | } | 32 | } |
33 | } | 33 | } |
34 | } \ No newline at end of file | 34 | } |
diff --git a/resources/views/dashboard/account.edge b/resources/views/dashboard/account.edge index a36d175..b805ac5 100644 --- a/resources/views/dashboard/account.edge +++ b/resources/views/dashboard/account.edge | |||
@@ -4,7 +4,7 @@ | |||
4 | <div class="w-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 Ferdium account |
8 | </h1> | 8 | </h1> |
9 | @if(flashMessage('error')) | 9 | @if(flashMessage('error')) |
10 | <div class="bg-orange-100 border-l-4 border-orange-500 text-orange-700 p-4"> | 10 | <div class="bg-orange-100 border-l-4 border-orange-500 text-orange-700 p-4"> |
diff --git a/resources/views/dashboard/delete.edge b/resources/views/dashboard/delete.edge index 1395f7a..d058a73 100644 --- a/resources/views/dashboard/delete.edge +++ b/resources/views/dashboard/delete.edge | |||
@@ -16,7 +16,7 @@ | |||
16 | @endif | 16 | @endif |
17 | 17 | ||
18 | <form action="/user/delete" method="POST"> | 18 | <form action="/user/delete" method="POST"> |
19 | <p>Are you sure, that you want to delete your Ferdi account?</p> | 19 | <p>Are you sure, that you want to delete your Ferdium account?</p> |
20 | <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> |
21 | <div class="pt-8"> | 21 | <div class="pt-8"> |
22 | {{ csrfField() }} | 22 | {{ csrfField() }} |
diff --git a/resources/views/dashboard/login.edge b/resources/views/dashboard/login.edge index ee354a4..23995ae 100644 --- a/resources/views/dashboard/login.edge +++ b/resources/views/dashboard/login.edge | |||
@@ -61,7 +61,7 @@ | |||
61 | </div> | 61 | </div> |
62 | <div class="text-center"> | 62 | <div class="text-center"> |
63 | <a class="w-full font-bold text-sm text-blue-500 hover:text-blue-800" href="../import"> | 63 | <a class="w-full font-bold text-sm text-blue-500 hover:text-blue-800" href="../import"> |
64 | Import your Franz account | 64 | Import your Franz/Ferdi account |
65 | </a> | 65 | </a> |
66 | </div> | 66 | </div> |
67 | </form> | 67 | </form> |
diff --git a/resources/views/dashboard/transfer.edge b/resources/views/dashboard/transfer.edge index 9412a8c..103381d 100644 --- a/resources/views/dashboard/transfer.edge +++ b/resources/views/dashboard/transfer.edge | |||
@@ -28,7 +28,7 @@ | |||
28 | <h3 class="text-gray-600 text-xl">Import data</h3> | 28 | <h3 class="text-gray-600 text-xl">Import data</h3> |
29 | <div> | 29 | <div> |
30 | <div> | 30 | <div> |
31 | <input type="file" name="file" id="file" value="" accept=".json,.ferdi-data" required> | 31 | <input type="file" name="file" id="file" value="" accept=".json,.ferdi-data,.ferdium-data" required> |
32 | </div> | 32 | </div> |
33 | </div> | 33 | </div> |
34 | 34 | ||
diff --git a/resources/views/layouts/main.edge b/resources/views/layouts/main.edge index 00d9987..c611bc5 100644 --- a/resources/views/layouts/main.edge +++ b/resources/views/layouts/main.edge | |||
@@ -5,7 +5,7 @@ | |||
5 | <meta charset="UTF-8"> | 5 | <meta charset="UTF-8"> |
6 | <meta name="viewport" content="width=device-width, initial-scale=1.0"> | 6 | <meta name="viewport" content="width=device-width, initial-scale=1.0"> |
7 | <meta http-equiv="X-UA-Compatible" content="ie=edge"> | 7 | <meta http-equiv="X-UA-Compatible" content="ie=edge"> |
8 | <title>ferdi-server</title> | 8 | <title>ferdium-server</title> |
9 | <link rel="shortcut icon" type="image/jpg" href="img/favicon.ico" /> | 9 | <link rel="shortcut icon" type="image/jpg" href="img/favicon.ico" /> |
10 | 10 | ||
11 | {{ style('css/vanilla') }} | 11 | {{ style('css/vanilla') }} |
diff --git a/resources/views/layouts/v2.edge b/resources/views/layouts/v2.edge index 999be94..312ed67 100644 --- a/resources/views/layouts/v2.edge +++ b/resources/views/layouts/v2.edge | |||
@@ -16,8 +16,8 @@ | |||
16 | <div class="flex flex-col h-screen"> | 16 | <div class="flex flex-col h-screen"> |
17 | <div class="bg-black"> | 17 | <div class="bg-black"> |
18 | <div class="flex flex-row items-center container px-20 mx-auto"> | 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> | 19 | <a href="/"><img width="50" class="my-4 mr-10" src="https://github.com/ferdium/ferdium-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> | 20 | <a class="github-button" href="https://github.com/ferdium/ferdium-server" data-icon="octicon-star" data-show-count="true" aria-label="Star ferdium/ferdium-server on GitHub">Star</a> |
21 | </div> | 21 | </div> |
22 | </div> | 22 | </div> |
23 | <div class="flex flex-1"> | 23 | <div class="flex flex-1"> |
diff --git a/resources/views/others/import.edge b/resources/views/others/import.edge index 918c60b..7fb58de 100644 --- a/resources/views/others/import.edge +++ b/resources/views/others/import.edge | |||
@@ -5,10 +5,10 @@ | |||
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"> |
8 | Import your Franz account | 8 | Import your Franz/Ferdi account |
9 | </h1> | 9 | </h1> |
10 | <p class="text-gray-600 text-sm text-center py-2"> | 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. | 11 | Please login using your Franz/Ferdi account. We will create a new Ferdium account with the same credentials. |
12 | </p> | 12 | </p> |
13 | 13 | ||
14 | @if(flashMessage('error')) | 14 | @if(flashMessage('error')) |
@@ -54,7 +54,7 @@ | |||
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/Ferdi 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"> |
diff --git a/resources/views/others/index.edge b/resources/views/others/index.edge index ade5304..5cc5726 100644 --- a/resources/views/others/index.edge +++ b/resources/views/others/index.edge | |||
@@ -17,7 +17,7 @@ | |||
17 | <div class="flex w-full justify-center md:justify-start pb-0 fade-in"> | 17 | <div class="flex w-full justify-center md:justify-start pb-0 fade-in"> |
18 | <ol class="list-decimal list-inside"> | 18 | <ol class="list-decimal list-inside"> |
19 | <li> | 19 | <li> |
20 | Logout of Ferdi, if you are currently logged in | 20 | Logout of Ferdium, if you are currently logged in |
21 | </li> | 21 | </li> |
22 | <li> | 22 | <li> |
23 | Choose "Change Server" to get to the settings screen | 23 | Choose "Change Server" to get to the settings screen |
@@ -34,7 +34,7 @@ | |||
34 | <a href="/user/account" class="bg-gray-700 hover:bg-gray-900 text-white font-bold text-center md:text-left py-2 px-4 rounded"> | 34 | <a href="/user/account" class="bg-gray-700 hover:bg-gray-900 text-white font-bold text-center md:text-left py-2 px-4 rounded"> |
35 | Go to account dashboard | 35 | Go to account dashboard |
36 | </a> | 36 | </a> |
37 | <p class="text-gray-700 my-10 py-0 pb-8 lg:pb-6 text-center md:text-left fade-in pt-2"><em><a href="https://getferdi.com">Don't have Ferdi yet?</a></em></p> | 37 | <p class="text-gray-700 my-10 py-0 pb-8 lg:pb-6 text-center md:text-left fade-in pt-2"><em><a href="https://ferdium.org">Don't have Ferdium yet?</a></em></p> |
38 | </div> | 38 | </div> |
39 | 39 | ||
40 | <!--Right Col--> | 40 | <!--Right Col--> |
diff --git a/resources/views/others/new.edge b/resources/views/others/new.edge index 96bd0ee..1bfd46f 100644 --- a/resources/views/others/new.edge +++ b/resources/views/others/new.edge | |||
@@ -2,8 +2,8 @@ | |||
2 | 2 | ||
3 | @section('content') | 3 | @section('content') |
4 | <h1>Create a new recipe</h1> | 4 | <h1>Create a new recipe</h1> |
5 | <p>Please create a recipe using <a href="https://github.com/meetfranz/plugins/blob/master/docs/integration.md">the | 5 | <p>Please create a recipe using <a href="https://github.com/ferdium/ferdium-recipes/blob/master/docs/integration.md">the |
6 | official Franz guide</a>, then publish it here.</p> | 6 | official guide</a>, then publish it here.</p> |
7 | <form action="new" method="post" enctype="multipart/form-data"> | 7 | <form action="new" method="post" enctype="multipart/form-data"> |
8 | <label for="author">Author</label><br /> | 8 | <label for="author">Author</label><br /> |
9 | <input type="text" name="author" placeholder="Jon Doe" required><br /> | 9 | <input type="text" name="author" placeholder="Jon Doe" required><br /> |