Merge pull request #10724 from firefly-iii/release-1754630264

🤖 Automatically merge the PR into the develop branch.

app/Http/Controllers/Rule/CreateController.php

@@ -270,6 +270,7 @@ class CreateController extends Controller
         $data     = $request->getRuleData();
 
         $rule     = $this->ruleRepos->store($data);
+        session()->flash('success_url', route('rules.select-transactions', [$rule->id]));
         session()->flash('success', (string) trans('firefly.stored_new_rule', ['title' => $rule->title]));
         app('preferences')->mark();
 

config/firefly.php

@@ -78,8 +78,8 @@ return [
         'running_balance_column' => env('USE_RUNNING_BALANCE', false),
         // see cer.php for exchange rates feature flag.
     ],
-    'version'                      => 'develop/2025-08-07',
-    'build_time'                   => 1754591739,
+    'version'                      => 'develop/2025-08-08',
+    'build_time'                   => 1754630161,
     'api_version'                  => '2.1.0', // field is no longer used.
     'db_version'                   => 26,
 

package-lock.json

@@ -5700,9 +5700,9 @@
             "license": "MIT"
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.5.198",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.198.tgz",
-            "integrity": "sha512-G5COfnp3w+ydVu80yprgWSfmfQaYRh9DOxfhAxstLyetKaLyl55QrNjx8C38Pc/C+RaDmb1M0Lk8wPEMQ+bGgQ==",
+            "version": "1.5.199",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.199.tgz",
+            "integrity": "sha512-3gl0S7zQd88kCAZRO/DnxtBKuhMO4h0EaQIN3YgZfV6+pW+5+bf2AdQeHNESCoaQqo/gjGVYEf2YM4O5HJQqpQ==",
             "dev": true,
             "license": "ISC"
         },
@@ -11524,9 +11524,9 @@
             }
         },
         "node_modules/vite": {
-            "version": "7.1.0",
-            "resolved": "https://registry.npmjs.org/vite/-/vite-7.1.0.tgz",
-            "integrity": "sha512-3jdAy3NhBJYsa/lCFcnRfbK4kNkO/bhijFCnv5ByUQk/eekYagoV2yQSISUrhpV+5JiY5hmwOh7jNnQ68dFMuQ==",
+            "version": "7.1.1",
+            "resolved": "https://registry.npmjs.org/vite/-/vite-7.1.1.tgz",
+            "integrity": "sha512-yJ+Mp7OyV+4S+afWo+QyoL9jFWD11QFH0i5i7JypnfTcA1rmgxCbiA8WwAICDEtZ1Z1hzrVhN8R8rGTqkTY8ZQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {

resources/views/auth/login.blade.php

@@ -56,8 +56,12 @@
                     <div class="input-group-text"> <em class="fa-solid fa-user"></em> </div>
                 </div>
                 @endif
-                <div class="input-group mb-3"> <input type="password" name="password" class="form-control" placeholder="{{ trans('form.password') }}" @if(true===$IS_DEMO_SITE)value="{{ $DEMO_PASSWORD }}"@endif autocomplete="current-password">
-                    <div class="input-group-text"> <em class="fa-solid fa-lock"></em> </div>
+                <div class="input-group mb-3">
+                    <input type="password" id="password" name="password" class="form-control" placeholder="{{ trans('form.password') }}" @if(true===$IS_DEMO_SITE)value="{{ $DEMO_PASSWORD }}"@endif autocomplete="current-password">
+                    <div class="input-group-text">
+                        <em class="fa-solid fa-lock"></em>
+                        <i class="fa-solid fa-eye-slash fa-eye" id="togglePassword"></i>
+                    </div>
                 </div> <!--begin::Row-->
                 <div class="row">
                     <div class="col-8">
@@ -80,3 +84,21 @@
     </div>
 
 @endsection
+@section('scripts')
+<script nonce="{{ $JS_NONCE }}">
+    const togglePassword = document.querySelector('#togglePassword');
+    const password = document.querySelector('#password');
+    togglePassword.addEventListener('click', () => {
+        const type = password.getAttribute('type') === 'password' ? 'text' : 'password';
+        if('text' === type) {
+            togglePassword.classList.add('fa-eye');
+            togglePassword.classList.remove('fa-eye-slash');
+        }
+        if('password' === type) {
+            togglePassword.classList.add('fa-eye-slash');
+            togglePassword.classList.remove('fa-eye');
+        }
+        password.setAttribute('type', type);
+    });
+</script>
+@endsection

resources/views/rules/index.twig

@@ -6,12 +6,15 @@
 
     <div class="row">
         <div class="col-lg-12 col-md-12 col-sm-12">
-            <p>
+            <div class="btn-group">
                 <a href="{{ route('rule-groups.create') }}" id="new_rule_group" class="btn btn-success">{{ 'new_rule_group'|_ }}</a>
-            </p>
+                <a href="{{ route('rules.create') }}" class="btn btn-success new_rule">{{ 'new_rule'|_ }}</a>
+            </div>
+            <p></p>
         </div>
     </div>
 
+
     {% if ruleGroups|length == 1 and ruleGroups[0].rules.count() == 0 %}
         {% include 'partials.empty' with {objectType: 'default', type: 'rules',route: route('rules.create')} %}
         {# make FF ignore demo for now. #}
@@ -62,6 +65,10 @@
                         <p>
                             <em>{{ ruleGroup.description }}</em>
                         </p>
+                        <p>
+                            <a href="{{ route('rules.create', ruleGroup.id) }}"
+                               class="btn btn-success new_rule">{{ 'new_rule'|_ }}</a>
+                        </p>
 
                         {% if ruleGroup.rules.count() > 0 %}
                             <table class="table table-hover table-striped group-rules">