IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2024-11-26 02:40:43 -06:00
Code Issues Packages Projects Releases Wiki Activity

Rename (unused) files.

Browse Source
This commit is contained in:
James Cole 2024-03-09 12:11:18 +01:00
parent 0ff405d1e0
commit a3fd99a498
No known key found for this signature in database
GPG Key ID: B49A324B7EAD6D80
12 changed files with 70 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
public/v2/css/adminlte.css → public/v2/css/old-adminlte.css
View File

0
public/v2/css/adminlte.css.map → public/v2/css/old-adminlte.css.map
View File

0
public/v2/css/adminlte.min.css → public/v2/css/old-adminlte.min.css vendored
View File

0
public/v2/css/adminlte.min.css.map → public/v2/css/old-adminlte.min.css.map
View File

0
public/v2/js/adminlte.js → public/v2/js/old-adminlte.js
View File

0
public/v2/js/adminlte.js.map → public/v2/js/old-adminlte.js.map
View File

0
public/v2/js/adminlte.min.js → public/v2/js/old-adminlte.min.js vendored
View File

0
public/v2/js/adminlte.min.js.map → public/v2/js/old-adminlte.min.js.map
View File

20
resources/assets/v2/sass/app.scss
View File

@ -19,9 +19,27 @@
*/
$color-mode-type: media-query;
$link-decoration: none !default;
.balance-box {
container: sidebar / inline-size;
}
.form-control {
appearance: auto;
}
// Bootstrap
//@import "~bootstrap-sass/assets/stylesheets/bootstrap";
// @import "bootstrap/scss/bootstrap";
// admin LTE
@import "admin-lte/src/scss/adminlte";
// @import "~bootstrap-sass/assets/stylesheets/bootstrap";
// Font awesome
//@import "~font-awesome/css/font-awesome";

4
resources/views/auth/login.blade.php
View File

@ -48,11 +48,11 @@
<form action="{{ route('login.post') }}" method="post">
<input type="hidden" name="_token" value="{{ csrf_token() }}"/>
@if(config('firefly.authentication_guard') === 'web')
<div class="input-group mb-3"> <input type="email" name="email" " class="form-control" placeholder="{{ trans('form.email') }}" value="@if(true===$IS_DEMO_SITE){{ $DEMO_USERNAME }}@else{{ $email }}@endif">
<div class="input-group mb-3"> <input type="email" name="email" autofocus required class="form-control" placeholder="{{ trans('form.email') }}" value="@if(true===$IS_DEMO_SITE){{ $DEMO_USERNAME }}@else{{ $email }}@endif">
<div class="input-group-text"> <em class="fa-solid fa-envelope"></em> </div>
</div>
@else
<div class="input-group mb-3"> <input type="text" autocomplete="username" " name="{{ $usernameField }}" class="form-control" placeholder="{{ trans('form.login_name') }}" value="{{ $email }}">
<div class="input-group mb-3"> <input type="text" autocomplete="username" autofocus required name="{{ $usernameField }}" class="form-control" placeholder="{{ trans('form.login_name') }}" value="{{ $email }}">
<div class="input-group-text"> <em class="fa-solid fa-user"></em> </div>
</div>
@endif

121
resources/views/errors/FireflyException.blade.php
View File

@ -1,108 +1,81 @@
@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>
@endsection
<!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 }}">
<link href="v1/css/daterangepicker.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>xxxxxx
<div class="row">
<div class="col">
<h1><a href="{{ route('index') }}"><strong>Firefly</strong> III</a></h1>
</div>
</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 class="row">
<div class="col">
<h3 class="text-danger">{{ trans('errors.error_occurred') }}</h3>
</div>
</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 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() ?? 'General unknown error' }}
</p>
<p>
{!! trans('errors.error_location', ['file' => $exception->getFile(), 'line' => $exception->getLine(), 'code' => $exception->getCode() ]) !!}
</p>
</div>
</div>
</div>
{% if not debug %}
@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.more_info') }}
</h4>
<p>
{{ trans('errors.collect_info')|raw }}
{{ trans('errors.collect_info_more')|raw }}
{!! trans('errors.collect_info') !!}
{!! trans('errors.collect_info_more') !!}
</p>
<h4>
{{ trans('errors.github_help') }}
</h4>
<p>
{{ trans('errors.github_instructions')|raw }}
{{ 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.include_info', ['link' => route('debug') ]) }}</li> |raw
<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 }}
@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() ]) !!}
</p>
<h4>
{{ trans('errors.stacktrace') }}
</h4>
<div style="font-family: monospace;font-size:11px;">
{!! nl2br($exception->getTraceAsString()) !!}
</div>
</div>
</div>
</div>
{% endif %}
@endif
@endsection
</body>
</html>

9
resources/views/v2/partials/layout/head.blade.php
View File

@ -66,16 +66,11 @@
Firefly III
</title>
<!--begin::Primary Meta Tags-->
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<!--begin::Fonts-->
<!--
<link href="v2/css/fonts.css" rel="stylesheet">
<!--end::Fonts-->
<!--begin::Required Plugin(AdminLTE)-->
<link rel="stylesheet" href="v2/css/adminlte.css">
<!--end::Required Plugin(AdminLTE)-->
-->
@yield('vite')
</head>