Server re-build with latest AdonisJS framework & Typescript (#47)

* chore: setup first basis structure

* chore: ensure styling is loaded correctly

* chore: comply to new routing syntax by replace . with / in routes/resource locations

* chore: add login controller

* chore: correctly use views with slash instead of dot

* chore: working login + tests

* chore: clean up tests

* chore: add password-forgot endpoint and matching test

* chore: add delete page test

* chore: add logout test

* chore: add reset-password route and tests

* chore: remove obsolete comment

* chore: add account-page and tests

* chore: add data page & first step of the test

* chore: add transfer/import data feature and tests

* chore: add export and basic test

* chore: add all static api routes with tests

* Regenerate 'pnpm-lock.json' and fix bad merge conflict

WIP:
- Tests have been commented out since they dont work
- Server doesn't start

* easier dev and test runs

* - remove --require-pragma from reformat-files so formatting works properly
- run pnpm reformat-files over codebase
- remove .json files from .eslintignore
- add invalid.json file to .eslintignore
- configure prettier properly in eslint config
- add type jsdoc to prettier config
- run adonis generate:manifest command to regenerate ace-manifest.json
- specify volta in package.json
- introduce typecheck npm script
- remove unused .mjs extension from npm scripts
- install missing type definition dependencies
- add pnpm.allowedDeprecatedVersions to package.json
- fix invalid extends in tsconfig.json causing TS issues throughout codebase
- remove @ts-ignore throughout codebase which is not relevant anymore
- enable some of the tsconfig options
- remove outdated eslint-disable from codebase
- change deprecated faker.company.companyName() to faker.company.name()
- fix TS issues inside transfer.spec.ts

* - update to latest node and pnpm versions
- upgrade all non-major dependencies to latest
- install missing @types/luxon dependency
- add cuid to pnpm.allowedDeprecatedVersions
- add esModuleInterop config option to tsconfig
- migrate more deprecated faker methods to new ones
- add more temporary ts-ignore to code

* - update eslint config
- remove trailingComma: all since default in prettier v3
- add typecheck command to prepare-code npm script
- upgrade various dependencies to latest major version
- update tsconfig to include only useful config options
- disable some lint issues and fix others

* - add test command to prepare-code
- disable strictPropertyInitialization flag in tsconfig which creates issues with adonis models
- update precommit hook to excute pnpm prepare-code
- remove ts-ignore statements from all models

* fix node and pnpm dependency update

* add cross env (so that we can develop on windows)

* add signup endpoint (TODO: JWT auth)

* Add login endpoint

* Add me and updateMe endpoints

* Add service endpoint

* refactor: change endpoints to use jwt

* add recipes endpoint

* add workspaces endpoint

* fix web controllors for login and post import

* Update node deps

* Change auth middleware (for web) and exempt api from CSRF

* Add import endpoint (franz import)

* Fix export/import logic

* Fix service and workspace data in user/data

* Fix partial lint

* chore: workaround lint issues

* fix: migration naming had two .

* Sync back node with recipes repo

* Temporarily ignore typescript

* Fix adonisrc to handle public folder static assets

* Fix issue with production database

* add Legacy Password Provider

* Fix lint errors

* Fix issue on login errors frontend

* add Legacy Password Provider

* Fix issue with customIcons

* Fix issue with auth tokens

* Update 'node' to '18.18.0'

* make docker work

* improve docker entrypoint (test api performance)

* Add migration database script

* NODE_ENV on recipes

* prefer @ts-expect-error over @ts-ignore

* small fixes

* Update 'pnpm' to '8.7.6'

* fix error catch

* Automatically generate JWT Public and Private keys

* Use custom Adonis5-jwt

* Update code to use secret (old way, no breaking changes)

* Normalize appKey

* Trick to make JWT tokens on client work with new version

* Fix error with new JWT logic

* Change migration and how we store JWT

* Fix 500 response code (needs to be 401)

* Improve logic and fix bugs

* Fix build and entrypoint logic

* Catch error if appKey changes

* Add newToken logic

* Fix lint (ignore any errors)

* Add build for PRs

* pnpm reformat-files result

* Fix some tests

* Fix reset password not working (test failing)

* Restore csrfTokens (disabled by accident)

* Fix pnpm start command with .env

* Disable failing tests on the transfer endpoint (TODO)

* Add tests to PR build

* Fix build

* Remove unnecessary assertStatus

* Add typecheck

* hash password on UserFactory (fix build)

* Add JWT_USE_PEM true by default (increase security)

* fix name of github action

---------

Co-authored-by: Vijay A <vraravam@users.noreply.github.com>
Co-authored-by: Balaji Vijayakumar <kuttibalaji.v6@gmail.com>
Co-authored-by: MCMXC <16797721+mcmxcdev@users.noreply.github.com>
Co-authored-by: André Oliveira <oliveira.andrerodrigues95@gmail.com>

14 files changed, 251 insertions, 222 deletions

diff --git a/resources/views/dashboard/account.edge b/resources/views/dashboard/account.edge
index b805ac5..3a1f53c 100644
--- a/resources/views/dashboard/account.edge
+++ b/resources/views/dashboard/account.edge
@@ -1,4 +1,4 @@
-@layout('layouts.v2')
+@layout('layouts/v2')
 
 @section('content')
 <div class="w-screen bg-purple-200 flex items-center justify-center">
@@ -6,19 +6,19 @@
     <h1 class="text-gray-700 text-center text-2xl pb-5">
       Your Ferdium account
     </h1>
-    @if(flashMessage('error'))
+    @if(flashMessages.has('error'))
     <div class="bg-orange-100 border-l-4 border-orange-500 text-orange-700 p-4">
-      {{ flashMessage('error') }}
+      {{ flashMessages.get('error') }}
     </div>
     @endif
-    @if(old('message'))
+    @if(flashMessages.has('message'))
     <div class="bg-orange-100 border-l-4 border-orange-500 text-orange-700 p-4">
-      {{ old('message') }}
+      {{ flashMessages.get('message') }}
     </div>
     @endif
-    @if(flashMessage('notification'))
+    @if(flashMessages.has('notification'))
     <div class="bg-orange-100 border-l-4 border-orange-500 text-orange-700 p-4">
-      {{ flashMessage('notification.message') }}
+      {{ flashMessages.get('notification.message') }}
     </div>
     @endif
     @if(success === true)
@@ -34,7 +34,7 @@
         <div>
           <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"
-            type="text" value="{{ old('name', username) }}" placeholder="Name" name="username" required>
+            type="text" value="{{ flashMessages.get('username', username) }}" placeholder="Name" name="username" required>
         </div>
       </div>
       <div class="mb-6">
@@ -42,7 +42,7 @@
         <div>
           <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"
-            type="text" value="{{ old('lastname', lastname) }}" placeholder="Last Name" name="lastname" required>
+            type="text" value="{{ flashMessages.get('lastname', lastname) }}" placeholder="Last Name" name="lastname" required>
         </div>
       </div>
       <div class="mb-6">
@@ -50,7 +50,7 @@
         <div>
           <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"
-            type="email" value="{{ old('email', email) }}" placeholder="E-Mail" name="email" required>
+            type="email" value="{{ flashMessages.get('email', email) }}" placeholder="E-Mail" name="email" required>
         </div>
       </div>
       <div class="mb-6">
@@ -67,16 +67,16 @@
     </form>
     <div class="text-center">
         <a class="w-full font-bold text-sm text-gray-500 hover:text-gray-800 mb-3"
-        href="/user/data">My account data</a>
+          href="/user/data">My account data</a>
         <br />
         <a class="w-full font-bold text-sm text-gray-500 hover:text-gray-800 mb-3"
-        href="/user/transfer">Import/Export account data</a>
+          href="/user/transfer">Import/Export account data</a>
         <br />
         <a class="w-full font-bold text-sm text-red-500 hover:text-red-800 mb-3"
-        href="/user/delete">Delete my account</a>
+          href="/user/delete">Delete my account</a>
         <br />
     <a class="w-full font-bold text-sm text-gray-500 hover:text-gray-800 mb-3"
-    href="/user/logout">Logout</a>
+      href="/user/logout">Logout</a>
     </div>
   </div>
 </div>
diff --git a/resources/views/dashboard/data.edge b/resources/views/dashboard/data.edge
index cf48c1c..ac1ee40 100644
--- a/resources/views/dashboard/data.edge
+++ b/resources/views/dashboard/data.edge
@@ -1,179 +1,201 @@
-@layout('layouts.v2')
+@layout('layouts/v2')
 
 @section('content')
 <style>
-    table {
-        border: 1px solid #919191;
-        border-collapse: collapse;
-        table-layout: fixed;
-        width: 100%; 
-    }
-    table thead { text-align: center; }
-    table tbody { text-align: right; }
-    table tr { border-bottom: 1px solid #919191; }
-    table tbody tr:nth-child(even) { background: var(--tertiary-color); }
-    table th { background: var(--secondary-color); font-weight: bold; }
-    table th, table td { padding: 1rem; }
-    table th:not(last-of-type), table td:not(last-of-type) { border-right: 1px solid #919191; }
+  table {
+    border: 1px solid #919191;
+    border-collapse: collapse;
+    table-layout: fixed;
+    width: 100%;
+  }
 
+  table thead {
+    text-align: center;
+  }
+
+  table tbody {
+    text-align: right;
+  }
+
+  table tr {
+    border-bottom: 1px solid #919191;
+  }
+
+  table tbody tr:nth-child(even) {
+    background: var(--tertiary-color);
+  }
+
+  table th {
+    background: var(--secondary-color);
+    font-weight: bold;
+  }
+
+  table th,
+  table td {
+    padding: 1rem;
+  }
+
+  table th:not(last-of-type),
+  table td:not(last-of-type) {
+    border-right: 1px solid #919191;
+  }
 </style>
 
 <div class="bg-purple-200 flex items-center justify-center">
   <div class="w-full bg-white shadow-md rounded px-8 pt-6 mt-5 pb-8 mb-4">
     <h1 class="text-gray-700 text-center text-2xl pb-5">Your Account Data</h1>
 
-    
     <table class="w-full rounded-lg overflow-hidden sm:shadow-lg my-5">
-        <tr>
-            <th>
-                Name
-            </th>
-            <th>
-                Value
-            </th>
-        </tr>
-        <tr>
-            <td>
-                E-Mail
-            </td>
-            <td>
-                {{ mail }}
-            </td>
-        </tr>
-        <tr>
-            <td>
-                Username
-            </td>
-            <td>
-                {{ username }}
-            </td>
-        </tr>
-        <tr>
-            <td>
-                Last Name
-            </td>
-            <td>
-                {{ lastname }}
-            </td>
-        </tr>
-        <tr>
-            <td>
-                Created account on
-            </td>
-            <td>
-                {{ created }}
-            </td>
-        </tr>
-        <tr>
-            <td>
-                Last account update on
-            </td>
-            <td>
-                {{ updated }}
-            </td>
-        </tr>
+      <tr>
+        <th>
+          Name
+        </th>
+        <th>
+          Value
+        </th>
+      </tr>
+      <tr>
+        <td>
+          E-Mail
+        </td>
+        <td>
+          {{ mail }}
+        </td>
+      </tr>
+      <tr>
+        <td>
+          Username
+        </td>
+        <td>
+          {{ username }}
+        </td>
+      </tr>
+      <tr>
+        <td>
+          Last Name
+        </td>
+        <td>
+          {{ lastname }}
+        </td>
+      </tr>
+      <tr>
+        <td>
+          Created account on
+        </td>
+        <td>
+          {{ created }}
+        </td>
+      </tr>
+      <tr>
+        <td>
+          Last account update on
+        </td>
+        <td>
+          {{ updated }}
+        </td>
+      </tr>
     </table>
-    
+
     <h1 class="text-gray-700 text-center text-2xl pb-5">Your Services</h1>
     <table class="w-full rounded-lg overflow-hidden sm:shadow-lg my-5">
-        <tr>
-            <th>
-                Service ID
-            </th>
-            <th>
-                Name
-            </th>
-            <th>
-                Recipe ID
-            </th>
-            <th>
-                Settings
-            </th>
-            <th>
-                Created
-            </th>
-            <th>
-                Last updated
-            </th>
-        </tr>
-    
-        @each(service in services)
-          <tr>
-              <td>
-                  {{ service.serviceId }}
-              </td>
-              <td>
-                  {{ service.name }}
-              </td>
-              <td>
-                  {{ service.recipeId }}
-              </td>
-              <td>
-                  {{ stringify(service.settings) }}
-              </td>
-              <td>
-                  {{ service.created_at }}
-              </td>
-              <td>
-                  {{ service.updated_at }}
-              </td>
-          </tr>
-        @endeach
+      <tr>
+        <th>
+          Service ID
+        </th>
+        <th>
+          Name
+        </th>
+        <th>
+          Recipe ID
+        </th>
+        <th>
+          Settings
+        </th>
+        <th>
+          Created
+        </th>
+        <th>
+          Last updated
+        </th>
+      </tr>
+
+      @each(service in services)
+      <tr>
+        <td>
+          {{ service.serviceId }}
+        </td>
+        <td>
+          {{ service.name }}
+        </td>
+        <td>
+          {{ service.recipeId }}
+        </td>
+        <td>
+          {{ stringify(service.settings) }}
+        </td>
+        <td>
+          {{ service.createdAt.toFormat('yyyy-MM-dd HH:mm:ss') }}
+        </td>
+        <td>
+          {{ service.updatedAt.toFormat('yyyy-MM-dd HH:mm:ss') }}
+        </td>
+      </tr>
+      @endeach
     </table>
-    
+
     <h1 class="text-gray-700 text-center text-2xl pb-5">Your Workspaces</h1>
     <table>
-        <tr>
-            <th>
-                Service ID
-            </th>
-            <th>
-                Name
-            </th>
-            <th>
-                Order
-            </th>
-            <th>
-                Services
-            </th>
-            <th>
-                Data
-            </th>
-            <th>
-                Created
-            </th>
-            <th>
-                Last updated
-            </th>
-        </tr>
-    
-        @each(workspace in workspaces)
-          <tr>
-              <td>
-                  {{ workspace.workspaceId }}
-              </td>
-              <td>
-                  {{ workspace.name }}
-              </td>
-              <td>
-                  {{ workspace.order }}
-              </td>
-              <td>
-                  {{ stringify(workspace.services) }}
-              </td>
-              <td>
-                  {{ stringify(workspace.data) }}
-              </td>
-              <td>
-                  {{ workspace.created_at }}
-              </td>
-              <td>
-                  {{ workspace.updated_at }}
-              </td>
-          </tr>
-        @endeach
+      <tr>
+        <th>
+          Workspace ID
+        </th>
+        <th>
+          Name
+        </th>
+        <th>
+          Order
+        </th>
+        <th>
+          Services
+        </th>
+        <th>
+          Data
+        </th>
+        <th>
+          Created
+        </th>
+        <th>
+          Last updated
+        </th>
+      </tr>
+
+      @each(workspace in workspaces)
+      <tr>
+        <td>
+          {{ workspace.workspaceId }}
+        </td>
+        <td>
+          {{ workspace.name }}
+        </td>
+        <td>
+          {{ workspace.order }}
+        </td>
+        <td>
+          {{ stringify(workspace.services) }}
+        </td>
+        <td>
+          {{ stringify(workspace.data) }}
+        </td>
+        <td>
+          {{ workspace.createdAt.toFormat('yyyy-MM-dd HH:mm:ss') }}
+        </td>
+        <td>
+          {{ workspace.updatedAt.toFormat('yyyy-MM-dd HH:mm:ss') }}
+        </td>
+      </tr>
+      @endeach
     </table>
-    
+
     <div class="text-center">
       <a class="w-full font-bold text-sm text-gray-500 hover:text-gray-800 mb-3" href="/user/account">Back to My
         Account</a>
@@ -182,4 +204,4 @@
   </div>
 </div>
 </div>
-@endsection
\ No newline at end of file
+@endsection
diff --git a/resources/views/dashboard/delete.edge b/resources/views/dashboard/delete.edge
index d058a73..ea4a431 100644
--- a/resources/views/dashboard/delete.edge
+++ b/resources/views/dashboard/delete.edge
@@ -1,17 +1,17 @@
-@layout('layouts.v2')
+@layout('layouts/v2')
 
 @section('content')
 <div class="w-screen bg-purple-200 flex items-center justify-center">
   <div class="w-full max-w-lg bg-white shadow-md rounded px-8 pt-6 pb-8 mb-4">
     <h1 class="text-gray-700 text-center text-2xl pb-5">Delete your account</h1>
-    @if(flashMessage('error'))
+    @if(flashMessages.has('error'))
     <div class="bg-orange-100 border-l-4 border-orange-500 text-orange-700 p-4">
-      {{ flashMessage('error') }}
+      {{ flashMessages.get('error') }}
     </div>
     @endif
-    @if(old('message'))
+    @if(flashMessages.has('message'))
     <div class="bg-orange-100 border-l-4 border-orange-500 text-orange-700 p-4">
-      {{ old('message') }}
+      {{ flashMessages.get('message') }}
     </div>
     @endif
 
diff --git a/resources/views/dashboard/forgotPassword.edge b/resources/views/dashboard/forgotPassword.edge
index cd5d8c0..b41e1cc 100644
--- a/resources/views/dashboard/forgotPassword.edge
+++ b/resources/views/dashboard/forgotPassword.edge
@@ -1,4 +1,4 @@
-@layout('layouts.v2')
+@layout('layouts/v2')
 
 @section('content')
 <div class="w-screen bg-purple-200 flex items-center justify-center">
@@ -8,14 +8,14 @@
       Forgot Password?
     </h1>
 
-    @if(flashMessage('error'))
+    @if(flashMessages.has('error'))
     <div class="bg-orange-100 border-l-4 border-orange-500 text-orange-700 p-4">
-      {{ flashMessage('error') }}
+      {{ flashMessages.get('error') }}
     </div>
     @endif
-    @if(old('message'))
+    @if(flashMessages.has('message'))
     <div class="bg-orange-100 border-l-4 border-orange-500 text-orange-700 p-4">
-      {{ old('message') }}
+      {{ flashMessages.get('message') }}
     </div>
     @endif
 
@@ -30,7 +30,7 @@
         name="mail"
         type="text"
         placeholder="E-Mail"
-        value="{{ old('mail', '') }}"
+        value="{{ flashMessages.get('mail', '') }}"
         required>
     </div>
 
diff --git a/resources/views/dashboard/login.edge b/resources/views/dashboard/login.edge
index 23995ae..360ad98 100644
--- a/resources/views/dashboard/login.edge
+++ b/resources/views/dashboard/login.edge
@@ -1,4 +1,4 @@
-@layout('layouts.v2')
+@layout('layouts/v2')
 
 @section('content')
 <div class="w-screen bg-purple-200 flex items-center justify-center">
@@ -8,14 +8,14 @@
       Login
     </h1>
 
-    @if(flashMessage('error'))
+    @if(flashMessages.has('error'))
     <div class="bg-orange-100 border-l-4 border-orange-500 text-orange-700 p-4">
-      {{ flashMessage('error') }}
+      {{ flashMessages.get('error') }}
     </div>
     @endif
-    @if(old('message'))
+    @if(flashMessages.has('message'))
     <div class="bg-orange-100 border-l-4 border-orange-500 text-orange-700 p-4">
-      {{ old('message') }}
+      {{ flashMessages.get('message') }}
     </div>
     @endif
 
@@ -30,7 +30,7 @@
         name="mail"
         type="text"
         placeholder="E-Mail"
-        value="{{ old('mail', '') }}"
+        value="{{ flashMessages.get('mail', '') }}"
         required>
     </div>
     <div class="mb-6">
@@ -60,7 +60,7 @@
       </a>
     </div>
     <div class="text-center">
-      <a class="w-full font-bold text-sm text-blue-500 hover:text-blue-800" href="../import">
+      <a class="w-full font-bold text-sm text-blue-500 hover:text-blue-800" href="/import">
         Import your Franz/Ferdi account
       </a>
     </div>
diff --git a/resources/views/dashboard/resetPassword.edge b/resources/views/dashboard/resetPassword.edge
index 4b39169..33b08c3 100644
--- a/resources/views/dashboard/resetPassword.edge
+++ b/resources/views/dashboard/resetPassword.edge
@@ -1,4 +1,4 @@
-@layout('layouts.v2')
+@layout('layouts/v2')
 
 @section('content')
 <div class="w-screen bg-purple-200 flex items-center justify-center">
@@ -8,14 +8,14 @@
       Reset Your Password
     </h1>
 
-    @if(flashMessage('error'))
+    @if(flashMessages.has('error'))
     <div class="bg-orange-100 border-l-4 border-orange-500 text-orange-700 p-4">
-      {{ flashMessage('error') }}
+      {{ flashMessages.get('error') }}
     </div>
     @endif
-    @if(old('message'))
+    @if(flashMessages.has('message'))
     <div class="bg-orange-100 border-l-4 border-orange-500 text-orange-700 p-4">
-      {{ old('message') }}
+      {{ flashMessages.get('message') }}
     </div>
     @endif
 
@@ -30,7 +30,7 @@
         name="password"
         type="password"
         placeholder="New Password"
-        value="{{ old('password', '') }}"
+        value="{{ flashMessages.get('password', '') }}"
         required>
     </div>
     <div class="mb-4">
@@ -43,7 +43,7 @@
         name="password_confirmation"
         type="password"
         placeholder="Confirm Password"
-        value="{{ old('password_confirmation', '') }}"
+        value="{{ flashMessages.get('password_confirmation', '') }}"
         required>
     </div>
 
diff --git a/resources/views/dashboard/transfer.edge b/resources/views/dashboard/transfer.edge
index bdae1f4..759edbf 100644
--- a/resources/views/dashboard/transfer.edge
+++ b/resources/views/dashboard/transfer.edge
@@ -1,22 +1,22 @@
-@layout('layouts.v2')
+@layout('layouts/v2')
 
 @section('content')
 <div class="w-screen bg-purple-200 flex items-center justify-center">
   <div class="w-full max-w-lg bg-white shadow-md rounded px-8 pt-6 pb-8 mb-4">
     <h1 class="text-gray-700 text-center text-2xl pb-5">Import/Export data from another Ferdium server</h1>
-    @if(flashMessage('error'))
+    @if(flashMessages.has('error'))
     <div class="bg-orange-100 border-l-4 border-orange-500 text-orange-700 p-4">
-      {{ flashMessage('error') }}
+      {{ flashMessages.get('error') }}
     </div>
     @endif
-    @if(old('message'))
+    @if(flashMessages.has('message'))
     <div class="bg-orange-100 border-l-4 border-orange-500 text-orange-700 p-4">
-      {{ old('message') }}
+      {{ flashMessages.get('message') }}
     </div>
     @endif
-    @if(flashMessage('notification'))
+    @if(flashMessages.has('notification'))
     <div class="bg-orange-100 border-l-4 border-orange-500 text-orange-700 p-4">
-      {{ flashMessage('notification.message') }}
+      {{ flashMessages.get('notification.message') }}
     </div>
     @endif
     @if(success === true)
diff --git a/resources/views/emails/reset_password.edge b/resources/views/emails/reset_password.edge
new file mode 100644
index 0000000..e2d2c1c
--- /dev/null
+++ b/resources/views/emails/reset_password.edge
@@ -0,0 +1,8 @@
+Hello {{ username }},
+we received a request to reset your Ferdium account password.
+Use the link below to reset your password. If you didn't requested that your password be reset, please ignore this
+message.
+
+{{ appUrl }}/user/reset?token={{ encodeURIComponent(token) }}
+
+This message was sent automatically. Please do not reply.
diff --git a/resources/views/layouts/main.edge b/resources/views/layouts/main.edge
index c611bc5..a53b6c5 100644
--- a/resources/views/layouts/main.edge
+++ b/resources/views/layouts/main.edge
@@ -6,10 +6,10 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <meta http-equiv="X-UA-Compatible" content="ie=edge">
   <title>ferdium-server</title>
-  <link rel="shortcut icon" type="image/jpg" href="img/favicon.ico" />
+  <link rel="shortcut icon" type="image/jpg" href="/img/favicon.ico" />
 
-  {{ style('css/vanilla') }}
-  {{ style('css/main') }}
+  <link rel="stylesheet" type="text/css" href="/css/vanilla.css">
+  <link rel="stylesheet" type="text/css" href="/css/main.css">
 </head>
 
 <body>
diff --git a/resources/views/layouts/v2.edge b/resources/views/layouts/v2.edge
index 38af29f..ac20cab 100644
--- a/resources/views/layouts/v2.edge
+++ b/resources/views/layouts/v2.edge
@@ -8,8 +8,8 @@
   <title>Server</title>
   <link rel="shortcut icon" type="image/jpg" href="/img/favicon.ico" />
 
-  {{ style('css/tailwind') }}
-  {{ style('css/main') }}
+  <link rel="stylesheet" type="text/css" href="/css/tailwind.css">
+  <link rel="stylesheet" type="text/css" href="/css/main.css">
 </head>
 
 <body>
diff --git a/resources/views/others/import.edge b/resources/views/others/import.edge
index 7fb58de..ca7cc6d 100644
--- a/resources/views/others/import.edge
+++ b/resources/views/others/import.edge
@@ -1,4 +1,4 @@
-@layout('layouts.v2')
+@layout('layouts/v2')
 
 @section('content')
 <div class="w-screen bg-purple-200 flex items-center justify-center">
@@ -11,14 +11,14 @@
       Please login using your Franz/Ferdi account. We will create a new Ferdium account with the same credentials.
     </p>
 
-    @if(flashMessage('error'))
+    @if(flashMessages.has('error'))
     <div class="bg-orange-100 border-l-4 border-orange-500 text-orange-700 p-4">
-      {{ flashMessage('error') }}
+      {{ flashMessages.get('error') }}
     </div>
     @endif
-    @if(old('message'))
+    @if(flashMessages.has('message'))
     <div class="bg-orange-100 border-l-4 border-orange-500 text-orange-700 p-4">
-      {{ old('message') }}
+      {{ flashMessages.get('message') }}
     </div>
     @endif
 
@@ -32,7 +32,7 @@
         name="email"
         type="text"
         placeholder="E-Mail"
-        value="{{ old('email', '') }}"
+        value="{{ flashMessages.get('email', '') }}"
         required>
     </div>
     <div class="mb-6">
diff --git a/resources/views/others/index.edge b/resources/views/others/index.edge
index 5cc5726..1f595b6 100644
--- a/resources/views/others/index.edge
+++ b/resources/views/others/index.edge
@@ -1,4 +1,4 @@
-@layout('layouts.v2')
+@layout('layouts/v2')
 
 @section('content')
     <!--Main-->
@@ -39,7 +39,7 @@
 
       <!--Right Col-->
       <div class="w-full xl:w-3/5 py-6 overflow-y-hidden">
-        <img class="w-5/6 mx-auto lg:mr-0 slide-in-bottom" src="{{ assetsUrl('img/hero.png') }}">
+        <img class="w-5/6 mx-auto lg:mr-0 slide-in-bottom" src="/img/hero.png">
       </div>
 
     </div>
@@ -53,6 +53,5 @@
 
       // Show on page
       document.getElementById('server').innerText = server;
-
     </script>
 @endsection
diff --git a/resources/views/others/message.edge b/resources/views/others/message.edge
index 59be2ed..08200da 100644
--- a/resources/views/others/message.edge
+++ b/resources/views/others/message.edge
@@ -1,4 +1,4 @@
-@layout('layouts.v2')
+@layout('layouts/v2')
 
 @section('content')
 <div class="w-screen bg-purple-200 flex items-center justify-center">
diff --git a/resources/views/others/new.edge b/resources/views/others/new.edge
index ed97a34..66587c2 100644
--- a/resources/views/others/new.edge
+++ b/resources/views/others/new.edge
@@ -1,4 +1,4 @@
-@layout('layouts.main')
+@layout('layouts/main')
 
 @section('content')
 <h1>Create a new recipe</h1>
@@ -33,5 +33,5 @@
   <button type="submit" id="submitbutton">Create recipe</button>
 </form>
 
-<script src="js/new.js"></script>
+<script src="/js/new.js"></script>
 @endsection