mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-02-25 18:45:27 -06:00
Move more to v2
This commit is contained in:
James Cole
parent
d11c36e476
commit
752a877b91
@ -47,7 +47,7 @@ return [
|
|||||||
|
|
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
'view' => 'partials/layout/v4/breadcrumbs',
|
'view' => 'partials/layout/breadcrumbs',
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
|
|||||||
@ -21,6 +21,12 @@
|
|||||||
|
|
||||||
declare(strict_types=1);
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
$path = realpath(base_path('resources/views'));
|
||||||
|
if ('v2' === env('FIREFLY_III_LAYOUT')) {
|
||||||
|
$path = realpath(base_path('resources/views/v2'));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
return [
|
return [
|
||||||
/*
|
/*
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
@ -33,9 +39,7 @@ return [
|
|||||||
|
|
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
'paths' => [
|
'paths' => [$path,],
|
||||||
realpath(base_path('resources/views')),
|
|
||||||
],
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
|
|||||||
@ -1 +0,0 @@
|
|||||||
|
|
||||||
17
public/build/assets/dashboard-e8bd1ddb.js
Normal file
17
public/build/assets/dashboard-e8bd1ddb.js
Normal file
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -23,19 +23,14 @@
|
|||||||
"file": "assets/fa-solid-900-7152a693.woff2",
|
"file": "assets/fa-solid-900-7152a693.woff2",
|
||||||
"src": "node_modules/@fortawesome/fontawesome-free/webfonts/fa-solid-900.woff2"
|
"src": "node_modules/@fortawesome/fontawesome-free/webfonts/fa-solid-900.woff2"
|
||||||
},
|
},
|
||||||
"resources/assets/v4/app.js": {
|
"resources/assets/v2/dashboard.js": {
|
||||||
"file": "assets/app-4ed993c7.js",
|
"file": "assets/dashboard-e8bd1ddb.js",
|
||||||
"isEntry": true,
|
"isEntry": true,
|
||||||
"src": "resources/assets/v4/app.js"
|
"src": "resources/assets/v2/dashboard.js"
|
||||||
},
|
},
|
||||||
"resources/assets/v4/index.js": {
|
"resources/assets/v2/sass/app.scss": {
|
||||||
"file": "assets/index-f6fa7443.js",
|
|
||||||
"isEntry": true,
|
|
||||||
"src": "resources/assets/v4/index.js"
|
|
||||||
},
|
|
||||||
"resources/assets/v4/sass/app.scss": {
|
|
||||||
"file": "assets/app-40e01f65.css",
|
"file": "assets/app-40e01f65.css",
|
||||||
"isEntry": true,
|
"isEntry": true,
|
||||||
"src": "resources/assets/v4/sass/app.scss"
|
"src": "resources/assets/v2/sass/app.scss"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
96
resources/views/v2/errors/FireflyException.twig
Normal file
96
resources/views/v2/errors/FireflyException.twig
Normal file
@ -0,0 +1,96 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="{{ trans('config.html_language') }}">
|
||||||
|
<head>
|
||||||
|
<meta charset="UTF-8">
|
||||||
|
<meta name="robots" content="noindex, nofollow, noarchive, noodp, NoImageIndex, noydir">
|
||||||
|
<title>Firefly III Exception :(</title>
|
||||||
|
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||||
|
<meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
|
||||||
|
<base href="{{ route('index') }}/">
|
||||||
|
|
||||||
|
{# CSS things #}
|
||||||
|
|
||||||
|
{# libraries #}
|
||||||
|
<link href="v1/lib/bs/css/bootstrap.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"
|
||||||
|
nonce="{{ JS_NONCE }}">
|
||||||
|
<link href="v1/lib/fa/css/font-awesome.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"
|
||||||
|
nonce="{{ JS_NONCE }}">
|
||||||
|
|
||||||
|
{# the theme #}
|
||||||
|
<link href="v1/lib/adminlte/css/AdminLTE.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"
|
||||||
|
nonce="{{ JS_NONCE }}">
|
||||||
|
|
||||||
|
{# favicons #}
|
||||||
|
{% include('partials.favicons') %}
|
||||||
|
|
||||||
|
</head>
|
||||||
|
<body class="container">
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-lg-10 col-lg-offset-1 col-md-12 col-sm-12 col-xs-12">
|
||||||
|
<h1><a href="{{ route('index') }}"><strong>Firefly</strong>III</a></h1>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-lg-10 col-lg-offset-1 col-md-12 col-sm-12 col-xs-12">
|
||||||
|
<h3 class="text-info">{{ trans('errors.error_occurred') }}</h3>
|
||||||
|
</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('errors.error_not_recoverable') }}
|
||||||
|
</p>
|
||||||
|
<p class="text-danger">
|
||||||
|
{{ exception.getMessage |default('General unknown errror') }}
|
||||||
|
</p>
|
||||||
|
<p>
|
||||||
|
{{ trans('errors.error_location', {file: exception.getFile, line: exception.getLine, code: exception.getCode })|raw }}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{% if not debug %}
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-lg-10 col-lg-offset-1 col-md-12 col-sm-12 col-xs-12">
|
||||||
|
<h4>
|
||||||
|
{{ trans('errors.more_info') }}
|
||||||
|
</h4>
|
||||||
|
<p>
|
||||||
|
{{ trans('errors.collect_info')|raw }}
|
||||||
|
{{ trans('errors.collect_info_more')|raw }}
|
||||||
|
</p>
|
||||||
|
<h4>
|
||||||
|
{{ trans('errors.github_help') }}
|
||||||
|
</h4>
|
||||||
|
<p>
|
||||||
|
{{ trans('errors.github_instructions')|raw }}
|
||||||
|
</p>
|
||||||
|
<ol>
|
||||||
|
<li>{{ trans('errors.use_search') }}</li>
|
||||||
|
<li>{{ trans('errors.include_info', { link: route('debug') })|raw }}</li>
|
||||||
|
<li>{{ trans('errors.tell_more') }}</li>
|
||||||
|
<li>{{ trans('errors.include_logs') }}</li>
|
||||||
|
<li>{{ trans('errors.what_did_you_do') }}</li>
|
||||||
|
</ol>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
{% if debug %}
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-lg-10 col-lg-offset-1 col-md-12 col-sm-12 col-xs-12">
|
||||||
|
<h4>{{ trans('errors.error') }}</h4>
|
||||||
|
<p>
|
||||||
|
{{ trans('errors.error_location', {file: exception.getFile, line: exception.getLine, code: exception.getCode })|raw }}
|
||||||
|
</p>
|
||||||
|
<h4>
|
||||||
|
{{ trans('errors.stacktrace') }}
|
||||||
|
</h4>
|
||||||
|
<div style="font-family: monospace;font-size:11px;">
|
||||||
|
{{ exception.getTraceAsString|nl2br }}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
@ -1,6 +1,6 @@
|
|||||||
@extends('layout.v4.default')
|
@extends('layout.default')
|
||||||
@section('vite')
|
@section('vite')
|
||||||
@vite(['resources/assets/v4/sass/app.scss', 'resources/assets/v4/dashboard.js'])
|
@vite(['resources/assets/v2/sass/app.scss', 'resources/assets/v2/dashboard.js'])
|
||||||
@endsection
|
@endsection
|
||||||
@section('content')
|
@section('content')
|
||||||
|
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html lang="{{ trans('config.html_language') }}">
|
<html lang="{{ trans('config.html_language') }}">
|
||||||
<!--begin::Head-->
|
<!--begin::Head-->
|
||||||
@include('partials.layout.v4.head')
|
@include('partials.layout.head')
|
||||||
<!--end::Head-->
|
<!--end::Head-->
|
||||||
|
|
||||||
<!--begin::Body-->
|
<!--begin::Body-->
|
||||||
@ -104,7 +104,7 @@
|
|||||||
</nav>
|
</nav>
|
||||||
<!--end::Header-->
|
<!--end::Header-->
|
||||||
<!--begin::Sidebar-->
|
<!--begin::Sidebar-->
|
||||||
@include('partials.layout.v4.sidebar')
|
@include('partials.layout.sidebar')
|
||||||
<!--end::Sidebar-->
|
<!--end::Sidebar-->
|
||||||
<!--begin::App Main-->
|
<!--begin::App Main-->
|
||||||
<main class="app-main">
|
<main class="app-main">
|
||||||
@ -141,13 +141,13 @@
|
|||||||
<!--end::App Main-->
|
<!--end::App Main-->
|
||||||
|
|
||||||
<!--begin::Footer-->
|
<!--begin::Footer-->
|
||||||
@include('partials.layout.v4.footer')
|
@include('partials.layout.footer')
|
||||||
|
|
||||||
<!--end::Footer-->
|
<!--end::Footer-->
|
||||||
</div>
|
</div>
|
||||||
<!--end::App Wrapper-->
|
<!--end::App Wrapper-->
|
||||||
<!--begin::Script-->
|
<!--begin::Script-->
|
||||||
@include('partials.layout.v4.scripts')
|
@include('partials.layout.scripts')
|
||||||
<!--end::Script-->
|
<!--end::Script-->
|
||||||
|
|
||||||
</body>
|
</body>
|
||||||
11
resources/views/v2/partials/favicons.twig
Normal file
11
resources/views/v2/partials/favicons.twig
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
<link rel="apple-touch-icon" sizes="180x180" href="apple-touch-icon.png">
|
||||||
|
<link rel="icon" type="image/png" sizes="32x32" href="favicon-32x32.png?v=3e8AboOwbd">
|
||||||
|
<link rel="icon" type="image/png" sizes="16x16" href="favicon-16x16.png?v=3e8AboOwbd">
|
||||||
|
<link rel="manifest" href="manifest.webmanifest?v=3e8AboOwbd">
|
||||||
|
<link rel="mask-icon" href="safari-pinned-tab.svg" color="#3c8dbc">
|
||||||
|
<link rel="shortcut icon" href="favicon.ico?v=3e8AboOwbd">
|
||||||
|
<meta name="apple-mobile-web-app-title" content="Firefly III">
|
||||||
|
<meta name="application-name" content="Firefly III">
|
||||||
|
<meta name="msapplication-TileColor" content="#3c8dbc">
|
||||||
|
<meta name="msapplication-TileImage" content="mstile-144x144.png?v=3e8AboOwbd">
|
||||||
|
<meta name="theme-color" content="#3c8dbc">
|
||||||
@ -11,9 +11,8 @@ export default defineConfig({
|
|||||||
plugins: [
|
plugins: [
|
||||||
laravel({
|
laravel({
|
||||||
input: [
|
input: [
|
||||||
'resources/assets/v4/sass/app.scss',
|
'resources/assets/v2/sass/app.scss',
|
||||||
'resources/assets/v4/app.js',
|
'resources/assets/v2/dashboard.js',
|
||||||
'resources/assets/v4/index.js'
|
|
||||||
],
|
],
|
||||||
refresh: true,
|
refresh: true,
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user