diff --git a/resources/assets/v3/js/pages/auth/auth.js b/resources/assets/v3/js/pages/auth/auth.js new file mode 100644 index 0000000000..b52fae3398 --- /dev/null +++ b/resources/assets/v3/js/pages/auth/auth.js @@ -0,0 +1,21 @@ +/* + * auth.js + * Copyright (c) 2026 james@firefly-iii.org + * + * This file is part of Firefly III (https://github.com/firefly-iii). + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +import '../../boot/bootstrap.js'; diff --git a/resources/assets/v3/vite.config.js b/resources/assets/v3/vite.config.js index d549e78244..071e166137 100644 --- a/resources/assets/v3/vite.config.js +++ b/resources/assets/v3/vite.config.js @@ -40,6 +40,9 @@ export default defineConfig(({command, mode, isSsrBuild, isPreview}) => { // CSS for entire app 'sass/app.scss', + // auth pages (login etc) + 'js/pages/auth/auth.js', + // dashboard 'js/pages/dashboard/boxes.js', 'js/pages/dashboard/dashboard.js', diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index 31dccb88a4..8d09b4c647 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -4,7 +4,7 @@ @if(true===$IS_DEMO_SITE)
-

+

Welcome to the Firefly III demo!

To log in, please use email address {{ $DEMO_USERNAME }} with password @@ -49,18 +49,18 @@ @if(config('firefly.authentication_guard') === 'web')

-
+
@else
-
+
@endif
- - + +
@@ -91,12 +91,12 @@ 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'); + togglePassword.classList.add('bi-eye'); + togglePassword.classList.remove('bi-eye-slash'); } if('password' === type) { - togglePassword.classList.add('fa-eye-slash'); - togglePassword.classList.remove('fa-eye'); + togglePassword.classList.add('bi-eye-slash'); + togglePassword.classList.remove('bi-eye'); } password.setAttribute('type', type); }); diff --git a/resources/views/auth/oauth/authorize.blade.php b/resources/views/auth/oauth/authorize.blade.php index ca86a9b76a..1e2e27cfce 100644 --- a/resources/views/auth/oauth/authorize.blade.php +++ b/resources/views/auth/oauth/authorize.blade.php @@ -1,79 +1,50 @@ - - - - - - +@extends('layout.v3.auth') +@section('content') +
+
+ Authorization Request +
+
+

+ Application "{{ $client->name }}" is requesting permission to access your account and financial data. +

+

+ Access to the API is not scoped. All data will be accessible. Please proceed with caution and only authorize applications you trust. +

+ @if('' !== $client->redirect_uris[0] ?? '') +

+ You will be redirected to {{ $client->redirect_uris[0] }} after you authorize or cancel this request. +

+ @endif - Firefly III - Authorization + + @if (count($scopes) > 0) +
+

This application will be able to:

- - - - - - - -
-
-
-
-
- Authorization Request +
    + @foreach ($scopes as $scope) +
  • {{ $scope->description }}
  • + @endforeach +
-
- -

{{ $client->name }} is requesting permission to access your account.

+ @endif - - @if (count($scopes) > 0) -
-

This application will be able to:

- -
    - @foreach ($scopes as $scope) -
  • {{ $scope->description }}
  • - @endforeach -
-
- @endif - -
+
+
+
-
+ @csrf - - +
+ +
- +
+
@csrf @@ -82,13 +53,15 @@ +
+
+
-
- - + +@endsection diff --git a/resources/views/auth/passwords/email.blade.php b/resources/views/auth/passwords/email.blade.php index 601b7a3ad8..4db388f96f 100644 --- a/resources/views/auth/passwords/email.blade.php +++ b/resources/views/auth/passwords/email.blade.php @@ -1,4 +1,4 @@ -@extends('layout.v2.session') +@extends('layout.v3.auth') @section('content') {{-- SUCCESS MESSAGE (ALWAYS SINGULAR) --}} @@ -35,7 +35,7 @@
-
+
diff --git a/resources/views/auth/passwords/reset.blade.php b/resources/views/auth/passwords/reset.blade.php index a90693ed6c..2b80fe8453 100644 --- a/resources/views/auth/passwords/reset.blade.php +++ b/resources/views/auth/passwords/reset.blade.php @@ -1,4 +1,4 @@ -@extends('layout.v2.session') +@extends('layout.v3.auth') @section('content') @if($errors->any()) @@ -30,17 +30,17 @@
-
+
-
+
-
+
@@ -50,7 +50,7 @@ + class="bi bi-question-circle">
diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php index be0cb4224d..43690d5980 100644 --- a/resources/views/auth/register.blade.php +++ b/resources/views/auth/register.blade.php @@ -1,4 +1,4 @@ -@extends('layout.v2.session') +@extends('layout.v3.auth') @section('content') @@ -35,17 +35,17 @@
-
+
-
+
-
+
@@ -55,7 +55,7 @@ + class="bi bi-question-circle">
diff --git a/resources/views/errors/404.blade.php b/resources/views/errors/404.blade.php index 43a559888f..6bbda60cfb 100644 --- a/resources/views/errors/404.blade.php +++ b/resources/views/errors/404.blade.php @@ -1,4 +1,4 @@ -@extends('layout.v2.error') +@extends('layout.v3.blank') @section('status_code','404') @section('status','Not Found') @section('sub_title', trans('errors.404_header')) @@ -21,8 +21,4 @@

- - - - @endsection diff --git a/resources/views/errors/500.blade.php b/resources/views/errors/500.blade.php index f47617549f..00c8f9e998 100644 --- a/resources/views/errors/500.blade.php +++ b/resources/views/errors/500.blade.php @@ -1,4 +1,4 @@ -@extends('layout.v2.error') +@extends('layout.v3.blank') @section('status_code','500') @section('status','Internal Server Error') @section('sub_title', trans('errors.error_occurred')) diff --git a/resources/views/errors/503.blade.php b/resources/views/errors/503.blade.php index 1b5333553a..642768fb14 100644 --- a/resources/views/errors/503.blade.php +++ b/resources/views/errors/503.blade.php @@ -1,4 +1,4 @@ -@extends('layout.v2.error') +@extends('layout.v3.blank') @section('status_code','503') @section('status','Service Unavailable') @section('sub_title', trans('errors.maintenance_mode')) @@ -13,9 +13,6 @@

- - - @endsection diff --git a/resources/views/errors/DatabaseException.blade.php b/resources/views/errors/DatabaseException.blade.php index de6e334de2..60acc72bf7 100644 --- a/resources/views/errors/DatabaseException.blade.php +++ b/resources/views/errors/DatabaseException.blade.php @@ -1,4 +1,4 @@ -@extends('layout.v2.error') +@extends('layout.v3.blank') @section('status_code','500') @section('status','Internal Server Error') @section('sub_title', trans('errors.db_error_occurred')) diff --git a/resources/views/errors/FireflyException.blade.php b/resources/views/errors/FireflyException.blade.php index 0ba68826ae..2328c00295 100644 --- a/resources/views/errors/FireflyException.blade.php +++ b/resources/views/errors/FireflyException.blade.php @@ -1,4 +1,4 @@ -@extends('layout.v2.error') +@extends('layout.v3.blank') @section('status_code','500') @section('status','Internal Server Error') @section('sub_title', trans('errors.error_occurred')) @@ -66,7 +66,7 @@

{{ trans('errors.stacktrace') }}

-
+
{!! nl2br($exception->getTraceAsString()) !!}
diff --git a/resources/views/errors/error.blade.php b/resources/views/errors/error.blade.php index 12a061bfce..bb3dad4c43 100644 --- a/resources/views/errors/error.blade.php +++ b/resources/views/errors/error.blade.php @@ -1,4 +1,4 @@ -@extends('layout.v2.error') +@extends('layout.v3.blank') @section('status_code','') @section('status','Error message') @section('sub_title', trans('errors.error_occurred')) diff --git a/resources/views/layout/v3/auth.blade.php b/resources/views/layout/v3/auth.blade.php index 80ca01ce77..d982973635 100644 --- a/resources/views/layout/v3/auth.blade.php +++ b/resources/views/layout/v3/auth.blade.php @@ -14,53 +14,29 @@ --> {{ __('firefly.login_page_title') }} - - - - - - - - - - + @vite(['sass/app.scss']) - - + - -