Refactor views and CSS

crowdin.yml

@@ -1,7 +1,6 @@
-"api_token_env": CROWDIN_TOKEN
-"api_key_env": CROWDIN_API_KEY
-"project_identifier_env": CROWDIN_PROJECT_ID
 "project_id_env": CROWDIN_PROJECT_NR
+"api_token_env": CROWDIN_TOKEN
+
 "base_path_env": CROWDIN_BASE_PATH
 "preserve_hierarchy": false
 files: [

package.json

@@ -3,11 +3,13 @@
     "type": "module",
     "scripts": {
         "dev": "vite",
-        "build": "vite build"
+        "build": "vite build",
+        "postinstall": "patch-package"
     },
     "devDependencies": {
         "axios": "^1.6.3",
         "laravel-vite-plugin": "^0.8.1",
+        "patch-package": "^8.0.0",
         "sass": "^1.69.6",
         "vite": "^4.5.2",
         "vite-plugin-manifest-sri": "^0.1.0"
@@ -19,6 +21,7 @@
         "@ag-grid-community/styles": "^31.0.3",
         "@fortawesome/fontawesome-free": "^6.4.0",
         "@popperjs/core": "^2.11.8",
+        "admin-lte": "^4.0.0-alpha3",
         "alpinejs": "^3.13.3",
         "bootstrap": "^5.3.0",
         "bootstrap5-autocomplete": "^1.1.22",

patches/admin-lte+4.0.0-alpha3.patch

@@ -0,0 +1,12 @@
+diff --git a/node_modules/admin-lte/src/scss/_app-sidebar.scss b/node_modules/admin-lte/src/scss/_app-sidebar.scss
+index 437946b..040bf5d 100644
+--- a/node_modules/admin-lte/src/scss/_app-sidebar.scss
++++ b/node_modules/admin-lte/src/scss/_app-sidebar.scss
+@@ -582,7 +582,6 @@ body:not(.app-loaded) {
+
+ @if $enable-dark-mode {
+   @include color-mode(dark) {
+-    &.app-sidebar,
+     .app-sidebar {
+       --#{$lte-prefix}sidebar-hover-bg: #{$lte-sidebar-hover-bg-dark};
+       --#{$lte-prefix}sidebar-color: #{$lte-sidebar-color-dark};

resources/lang/en_US/firefly.php

@@ -104,7 +104,7 @@
     'two_factor_forgot'                                   => 'I forgot my two-factor thing.',
     'two_factor_lost_header'                              => 'Lost your two factor authentication?',
     'two_factor_lost_intro'                               => 'If you lost your backup codes as well, you have bad luck. This is not something you can fix from the web interface. You have two choices.',
-    'two_factor_lost_fix_self'                            => 'If you run your own instance of Firefly III, read <a href="https://docs.firefly-iii.org/references/faq/firefly-iii/using/#i-lost-my-2fa-token-generator-or-2fa-has-stopped-working>this entry in the FAQ</a> for instructions.',
+    'two_factor_lost_fix_self'                            => 'If you run your own instance of Firefly III, read <a href="https://docs.firefly-iii.org/references/faq/firefly-iii/using/#i-lost-my-2fa-token-generator-or-2fa-has-stopped-working">this entry in the FAQ</a> for instructions.',
     'two_factor_lost_fix_owner'                           => 'Otherwise, email the site owner, <a href="mailto::site_owner">:site_owner</a> and ask them to reset your two factor authentication.',
     'mfa_backup_code'                                     => 'You have used a backup code to login to Firefly III. It can\'t be used again, so cross it from your list.',
     'pref_two_factor_new_backup_codes'                    => 'Get new backup codes',

resources/views/auth/lost-two-factor.blade.php

@@ -0,0 +1,30 @@
+@extends('layout.v2.error')
+@section('content')
+<div class="row">
+    <div class="col">
+        <h1><a href="{{ route('index') }}"><strong>Firefly</strong> III</a></h1>
+    </div>
+</div>
+
+<div class="row">
+    <div class="col">
+        <h2>{{ __('firefly.two_factor_lost_header') }}</h2>
+    </div>
+</div>
+
+<div class="row">
+    <div class="col-lg-10 col-lg-offset-1 col-md-12 col-sm-12 col-xs-12">
+        <p>
+            {{ trans('firefly.two_factor_lost_intro') }}
+        </p>
+        <ul>
+            <li>
+                {!! trans('firefly.two_factor_lost_fix_self') !!}
+            </li>
+            <li>
+                {!! trans('firefly.two_factor_lost_fix_owner', ['site_owner' => $siteOwner])  !!}
+            </li>
+        </ul>
+    </div>
+</div>
+@endsection