First set of code for new layout based on AdminLTE 3.0

This commit is contained in:
James Cole
2020-06-14 15:51:20 +02:00
parent caddf3d1c6
commit 7c1139e42b
42 changed files with 13385 additions and 3 deletions

View File

@@ -196,7 +196,7 @@
<span>{{ 'currencies'|_ }}</span>
</a>
</li>
{% if hasRole('owner') %}
{% if hasRole('owner') %}
<li class="{{ activeRoutePartial('admin') }}">
<a class="{{ activeRoutePartial('admin') }}" href="{{ route('admin.index') }}">
<i class="fa fa-angle-right fa-fw"></i>

View File

@@ -0,0 +1,101 @@
{% extends "./layout/auth" %}
{% block content %}
{# error when logging in #}
{% if errors.has('email') %}
<div class="row">
<div class="alert alert-danger alert-dismissible">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
<h5><i class="icon fas fa-ban"></i> {{ 'flash_error'|_ }}</h5>
{{ errors.get('email')[0] }}
</div>
</div>
{% endif %}
{# error when logout force #}
{% if session('logoutMessage') %}
<div class="row">
<div class="alert alert-info alert-dismissible">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
<h5><i class="icon fas fa-info"></i>
{{ session('logoutMessage') }}
</div>
</div>
{% endif %}
{# default header #}
<div class="login-box">
<div class="login-logo">
<img src="v2/images/logo-small.png" alt="Firefly III" width="40"/>
<a href="{{ route('index') }}"><b>Firefly</b>III</a>
</div>
{# demo site info #}
{% if IS_DEMO_SITE %}
<div class="callout callout-success">
<h5><i class="fas fa-info"></i> Firefly III demonistration website</h5>
To log in, please use email address <code>{{ DEMO_USERNAME }}</code> and password <code>{{ DEMO_PASSWORD }}</code>
</div>
{% endif %}
<!-- /.login-logo -->
<div class="card">
<div class="card-body login-card-body">
<p class="login-box-msg">{{ 'sign_in_to_start'|_ }}</p>
<form action="{{ route('login') }}" method="post">
<input type="hidden" name="_token" value="{{ csrf_token() }}"/>
<div class="input-group mb-3">
{% if config('firefly.login_provider') == 'eloquent' %}
<input type="email" required autocomplete="email" name="email" value="{{ email }}" class="form-control"
placeholder="{{ trans('form.email') }}"/>
{% else %}
<input type="text" required autocomplete="username" name="email" value="{{ email }}" class="form-control"
placeholder="{{ trans('form.login_name') }}"/>
{% endif %}
<div class="input-group-append">
<div class="input-group-text">
<span class="fas fa-envelope"></span>
</div>
</div>
</div>
<div class="input-group mb-3">
<input type="password" name="password" required autocomplete="current-password" class="form-control"
placeholder="{{ trans('form.password') }}"/>
<div class="input-group-append">
<div class="input-group-text">
<span class="fas fa-lock"></span>
</div>
</div>
</div>
<div class="row">
<div class="col-8">
<div class="icheck-primary">
<input id="remember" type="checkbox" name="remember" {% if remember %}checked="checked"{% endif %} value="1">
<label for="remember">
{{ trans('form.remember_me') }}
</label>
</div>
</div>
<!-- /.col -->
<div class="col-4">
<button type="submit" class="btn btn-primary btn-block">{{ 'sign_in'|_ }}</button>
</div>
<!-- /.col -->
</div>
</form>
{% if allowReset %}
<p class="mb-1">
<a href="{{ URL.to('/password/reset') }}">{{ 'forgot_my_password'|_ }}</a>
</p>
{% endif %}
{% if allowRegistration %}
<p class="mb-0">
<a href="{{ URL.to('/register') }}">{{ 'register_new_account'|_ }}</a><br>
</p>
{% endif %}
</div>
<!-- /.login-card-body -->
</div>
</div>
<!-- /.login-box -->
{% endblock %}

View File

@@ -0,0 +1,16 @@
{% extends "./layout/default" %}
{% block content %}
<!-- Small boxes (Stat box) -->
<!-- Main row -->
<div id="dashboard"></div>
<!-- /.row (main row) -->
{% endblock %}
{% block styles %}
{% endblock %}
{% block scripts %}
<script src="v2/js/dashboard.js" nonce="{{ JS_NONCE }}"></script>
{% endblock %}

View File

@@ -0,0 +1,98 @@
<!DOCTYPE html>
<html>
<head>
<base href="{{ route('index') }}/">
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="csrf-token" content="{{ csrf_token() }}">
<meta name="robots" content="noindex, nofollow, noarchive, noodp, NoImageIndex, noydir">
<meta name="apple-mobile-web-app-capable" content="yes">
<title>
{% if subTitle %}
{{ subTitle }} »
{% endif %}
{% if title != "Firefly III" %}
{{ title }} »
{% endif %}
Firefly III
</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="v2/plugins/local-fonts/gf-source.css">
<link rel="stylesheet" href="v2/css/app.css">
</head>
<body class="hold-transition sidebar-mini layout-fixed">
<div class="wrapper">
<!-- Navbar -->
{% include('partials.layout.navbar') %}
<!-- Main Sidebar Container -->
{% include('partials.layout.sidebar') %}
<!-- Content Wrapper. Contains page content -->
<div class="content-wrapper">
<!-- Content Header (Page header) -->
<div class="content-header">
<div class="container-fluid">
<div class="row mb-2">
<div class="col-sm-6">
<h1 class="m-0 text-dark">{% if mainTitleIcon %}<i class="fa fas {{ mainTitleIcon }}"></i>{% endif %}
{{ title }} <small class="text-muted">
{% if subTitleIcon %}<i class="fa fas {{ subTitleIcon }}"></i>{% endif %}
{{ subTitle }}</small></h1>
</div><!-- /.col -->
<div class="col-sm-6">
<ol class="breadcrumb float-sm-right">
<li class="breadcrumb-item"><a href="#">Home</a></li>
<li class="breadcrumb-item active">Bread crumbs v1</li>
</ol>
</div><!-- /.col -->
</div><!-- /.row -->
</div><!-- /.container-fluid -->
</div>
<!-- /.content-header -->
<!-- Main content -->
<section class="content">
<div class="container-fluid">
{% block content %}{% endblock %}
</div><!-- /.container-fluid -->
</section>
<!-- /.content -->
</div>
<!-- /.content-wrapper -->
{% include('partials.layout.footer') %}
<!-- Control Sidebar -->
<aside class="control-sidebar control-sidebar-dark">
<!-- Control sidebar content goes here -->
bla bla bla
</aside>
<!-- /.control-sidebar -->
</div>
<!-- ./wrapper -->
<script src="v2/js/manifest.js" nonce="{{ JS_NONCE }}"></script>
<script src="v2/js/vendor.js" nonce="{{ JS_NONCE }}"></script>
{% block scripts %}{% endblock %}
<!-- jQuery -->
<!--<script src="v2/plugins/jquery/jquery.min.js" nonce="{{ JS_NONCE }}"></script>-->
<!-- jQuery UI 1.11.4 -->
<!--<script src="v2/plugins/jquery-ui/jquery-ui.min.js" nonce="{{ JS_NONCE }}"></script>-->
<!-- Resolve conflict in jQuery UI tooltip with Bootstrap tooltip -->
<!--<script nonce="{{ JS_NONCE }}">
$.widget.bridge('uibutton', $.ui.button)
</script>
-->
<!-- Bootstrap 4 -->
<!--<script src="v2/plugins/bootstrap/js/bootstrap.bundle.min.js" nonce="{{ JS_NONCE }}"></script>-->
<!-- overlayScrollbars -->
<!--<script src="v2/plugins/overlayScrollbars/js/jquery.overlayScrollbars.min.js" nonce="{{ JS_NONCE }}"></script>-->
<!-- AdminLTE App -->
<!--<script src="v2/dist/js/adminlte.js" nonce="{{ JS_NONCE }}"></script>-->
</body>
</html>

View File

@@ -0,0 +1,7 @@
<footer class="main-footer">
<small><a href="https://firefly-iii.org/">Firefly III</a> &copy; James Cole, <a href="https://www.gnu.org/licenses/agpl-3.0.html">AGPL-3.0-or-later</a></small>
<div class="float-right d-none d-sm-inline-block">
<b>{{ 'version'|_ }}</b> <a href="{{ route('debug') }}">{{ Config.get('firefly.version') }}</a>
</div>
</footer>

View File

@@ -0,0 +1,113 @@
<nav class="main-header navbar navbar-expand navbar-white navbar-light">
<!-- Left navbar links -->
<ul class="navbar-nav">
<li class="nav-item">
<a class="nav-link" data-widget="pushmenu" href="#" role="button"><i class="fas fa-bars"></i></a>
</li>
</ul>
<!-- SEARCH FORM -->
<form class="form-inline ml-3">
<div class="input-group input-group-sm">
<input class="form-control form-control-navbar" type="search" placeholder="Search" aria-label="Search">
<div class="input-group-append">
<button class="btn btn-navbar" type="submit">
<i class="fas fa-search"></i>
</button>
</div>
</div>
</form>
<!-- Right navbar links -->
<ul class="navbar-nav ml-auto">
<!-- Messages Dropdown Menu -->
<li class="nav-item dropdown">
<a class="nav-link" data-toggle="dropdown" href="#">
<i class="far fa-calendar-alt"></i>
</a>
<div class="dropdown-menu dropdown-menu-lg dropdown-menu-right">
<a href="#" class="dropdown-item">
<!-- Message Start -->
<div class="media">
<img src="v2/dist/img/user1-128x128.jpg" alt="User Avatar" class="img-size-50 mr-3 img-circle">
<div class="media-body">
<h3 class="dropdown-item-title">
Brad Diesel
<span class="float-right text-sm text-danger"><i class="fas fa-star"></i></span>
</h3>
<p class="text-sm">Call me whenever you can...</p>
<p class="text-sm text-muted"><i class="far fa-clock mr-1"></i> 4 Hours Ago</p>
</div>
</div>
<!-- Message End -->
</a>
<div class="dropdown-divider"></div>
<a href="#" class="dropdown-item">
<!-- Message Start -->
<div class="media">
<img src="v2/dist/img/user8-128x128.jpg" alt="User Avatar" class="img-size-50 img-circle mr-3">
<div class="media-body">
<h3 class="dropdown-item-title">
John Pierce
<span class="float-right text-sm text-muted"><i class="fas fa-star"></i></span>
</h3>
<p class="text-sm">I got your message bro</p>
<p class="text-sm text-muted"><i class="far fa-clock mr-1"></i> 4 Hours Ago</p>
</div>
</div>
<!-- Message End -->
</a>
<div class="dropdown-divider"></div>
<a href="#" class="dropdown-item">
<!-- Message Start -->
<div class="media">
<img src="v2/dist/img/user3-128x128.jpg" alt="User Avatar" class="img-size-50 img-circle mr-3">
<div class="media-body">
<h3 class="dropdown-item-title">
Nora Silvester
<span class="float-right text-sm text-warning"><i class="fas fa-star"></i></span>
</h3>
<p class="text-sm">The subject goes here</p>
<p class="text-sm text-muted"><i class="far fa-clock mr-1"></i> 4 Hours Ago</p>
</div>
</div>
<!-- Message End -->
</a>
<div class="dropdown-divider"></div>
<a href="#" class="dropdown-item dropdown-footer">See All Messages</a>
</div>
</li>
<!-- Notifications Dropdown Menu -->
<li class="nav-item dropdown">
<a class="nav-link" data-toggle="dropdown" href="#">
<i class="far fa-user"></i>
</a>
<div class="dropdown-menu dropdown-menu-lg dropdown-menu-right">
<span class="dropdown-item dropdown-header">15 Notifications</span>
<div class="dropdown-divider"></div>
<a href="#" class="dropdown-item">
<i class="fas fa-envelope mr-2"></i> 4 new messages
<span class="float-right text-muted text-sm">3 mins</span>
</a>
<div class="dropdown-divider"></div>
<a href="#" class="dropdown-item">
<i class="fas fa-users mr-2"></i> 8 friend requests
<span class="float-right text-muted text-sm">12 hours</span>
</a>
<div class="dropdown-divider"></div>
<a href="#" class="dropdown-item">
<i class="fas fa-file mr-2"></i> 3 new reports
<span class="float-right text-muted text-sm">2 days</span>
</a>
<div class="dropdown-divider"></div>
<a href="#" class="dropdown-item dropdown-footer">See All Notifications</a>
</div>
</li>
<li class="nav-item">
<a class="nav-link" data-widget="control-sidebar" data-slide="true" href="#" role="button">
<i class="fas fa-th-large"></i>
</a>
</li>
</ul>
</nav>
<!-- /.navbar -->

View File

@@ -0,0 +1,254 @@
<aside class="main-sidebar sidebar-dark-primary elevation-4">
<!-- Brand Logo -->
<a href="{{ route('index') }}" class="brand-link">
<img src="v2/dist/img/firefly-iii-logo.png" alt="Firefly III" class="brand-image"
style="opacity: .8"> <!-- img-circle elevation-3 -->
<span class="brand-text font-weight-light">Firefly III</span>
</a>
<!-- Sidebar -->
<div class="sidebar">
<!-- Sidebar user panel (optional) -->
<!--
<div class="user-panel mt-3 pb-3 mb-3 d-flex">
<div class="image">
<img src="v2/dist/img/user2-160x160.jpg" class="img-circle elevation-2" alt="User Image">
</div>
<div class="info">
<a href="#" class="d-block">Alexander Pierce</a>
</div>
</div>
-->
<!-- Sidebar Menu -->
<nav class="mt-2">
<ul class="nav nav-pills nav-sidebar flex-column" data-widget="treeview" role="menu" data-accordion="false">
<!-- Add icons to the links using the .nav-icon class
with font-awesome or any other icon font library -->
<li class="nav-item">
<a href="{{ route('index') }}" class="nav-link">
<i class="nav-icon fas fa-tachometer-alt"></i>
<p>
{{ 'dashboard'|_ }}
</p>
</a>
</li>
<li class="nav-header text-uppercase">{{ 'financial_control'|_ }}</li>
<li class="nav-item">
<a href="{{ route('budgets.index') }}" class="nav-link">
<i class="nav-icon fas fa-chart-pie"></i>
<p>
{{ 'budgets'|_ }}
</p>
</a>
</li>
<li class="nav-item">
<a href="{{ route('bills.index') }}" class="nav-link">
<i class="nav-icon far fa-calendar-alt"></i>
<p>
{{ 'bills'|_ }}
</p>
</a>
</li>
<li class="nav-item">
<a href="{{ route('piggy-banks.index') }}" class="nav-link">
<i class="nav-icon fas fa-bullseye"></i>
<p>
{{ 'piggyBanks'|_ }}
</p>
</a>
</li>
<li class="nav-header text-uppercase">{{ 'accounting'|_ }}</li>
<li class="nav-item has-treeview">
<a href="#" class="nav-link">
<i class="nav-icon fas fa-exchange-alt"></i>
<p>
{{ 'transactions'|_ }}
<i class="right fas fa-angle-left"></i>
</p>
</a>
<ul class="nav nav-treeview">
<li class="nav-item">
<a href="{{ route('transactions.index', 'withdrawal') }}" class="nav-link">
<i class="fas fa-long-arrow-alt-left nav-icon"></i>
<p>{{ 'expenses'|_ }}</p>
</a>
</li>
<li class="nav-item">
<a href="{{ route('transactions.index', 'deposit') }}" class="nav-link">
<i class="fas fa-long-arrow-alt-right nav-icon"></i>
<p>{{ 'income'|_ }}</p>
</a>
</li>
<li class="nav-item">
<a href="{{ route('transactions.index', 'transfers') }}" class="nav-link">
<i class="fas fa-exchange-alt nav-icon"></i>
<p>{{ 'transfers'|_ }}</p>
</a>
</li>
</ul>
</li>
<li class="nav-item has-treeview">
<a href="#" class="nav-link">
<i class="nav-icon fas fa-microchip"></i>
<p>
{{ 'automation'|_ }}
<i class="right fas fa-angle-left"></i>
</p>
</a>
<ul class="nav nav-treeview">
<li class="nav-item">
<a href="{{ route('rules.index') }}" class="nav-link">
<i class="fas fa-random nav-icon"></i>
<p>{{ 'rules'|_ }}</p>
</a>
</li>
<li class="nav-item">
<a href="{{ route('recurring.index') }}" class="nav-link">
<i class="fas fa-magic nav-icon"></i>
<p>{{ 'recurrences'|_ }}</p>
</a>
</li>
</ul>
</li>
<li class="nav-header text-uppercase">{{ 'others'|_ }}</li>
<li class="nav-item has-treeview">
<a href="#" class="nav-link">
<i class="nav-icon fas fa-credit-card"></i>
<p>
{{ 'accounts'|_ }}
<i class="right fas fa-angle-left"></i>
</p>
</a>
<ul class="nav nav-treeview">
<li class="nav-item">
<a href="{{ route('accounts.index', 'asset') }}" class="nav-link">
<i class="far fa-money-bill-alt nav-icon"></i>
<p>{{ 'asset_accounts'|_ }}</p>
</a>
</li>
<li class="nav-item">
<a href="{{ route('accounts.index', 'expense') }}" class="nav-link">
<i class="fas fa-shopping-cart nav-icon"></i>
<p>{{ 'expense_accounts'|_ }}</p>
</a>
</li>
<li class="nav-item">
<a href="{{ route('accounts.index', 'revenue') }}" class="nav-link">
<i class="fas fa-briefcase nav-icon"></i>
<p>{{ 'revenue_accounts'|_ }}</p>
</a>
</li>
<li class="nav-item">
<a href="{{ route('accounts.index', 'liabilities') }}" class="nav-link">
<i class="far fa-funnel-dollar nav-icon"></i>
<p>{{ 'liabilities_accounts'|_ }}</p>
</a>
</li>
</ul>
</li>
<li class="nav-item has-treeview">
<a href="#" class="nav-link">
<i class="nav-icon fas fa-tags"></i>
<p>
{{ 'classification'|_ }}
<i class="right fas fa-angle-left"></i>
</p>
</a>
<ul class="nav nav-treeview">
<li class="nav-item">
<a href="{{ route('categories.index') }}" class="nav-link">
<i class="fas fa-bookmark nav-icon"></i>
<p>{{ 'categories'|_ }}</p>
</a>
</li>
<li class="nav-item">
<a href="{{ route('tags.index') }}" class="nav-link">
<i class="fas fa-tags nav-icon"></i>
<p>{{ 'tags'|_ }}</p>
</a>
</li>
</ul>
</li>
<li class="nav-item">
<a href="{{ route('reports.index') }}" class="nav-link">
<i class="nav-icon far fa-chart-bar"></i>
<p>
{{ 'reports'|_ }}
</p>
</a>
</li>
<li class="nav-item">
<a href="{{ route('export.index') }}" class="nav-link">
<i class="nav-icon fas fa-upload"></i>
<p>
{{ 'export_data_menu'|_ }}
</p>
</a>
</li>
<li class="nav-item has-treeview">
<a href="#" class="nav-link">
<i class="nav-icon fas fa-sliders-h"></i>
<p>
{{ 'options'|_ }}
<i class="right fas fa-angle-left"></i>
</p>
</a>
<ul class="nav nav-treeview">
<li class="nav-item">
<a href="{{ route('profile.index') }}" class="nav-link">
<i class="far fa-user nav-icon"></i>
<p>{{ 'profile'|_ }}</p>
</a>
</li>
<li class="nav-item">
<a href="{{ route('preferences.index') }}" class="nav-link">
<i class="fas fa-cogs nav-icon"></i>
<p>{{ 'preferences'|_ }}</p>
</a>
</li>
<li class="nav-item">
<a href="{{ route('currencies.index') }}" class="nav-link">
<i class="fas fa-euro-sign nav-icon"></i>
<p>{{ 'currencies'|_ }}</p>
</a>
</li>
{% if hasRole('owner') %}
<li class="nav-item">
<a href="{{ route('admin.index') }}" class="nav-link">
<i class="far fa-hand-spock nav-icon"></i>
<p>{{ 'administration'|_ }}</p>
</a>
</li>
{% endif %}
</ul>
</li>
<li class="nav-item">
<a href="{{ route('logout') }}" class="nav-link">
<i class="nav-icon fas fa-sign-out-alt"></i>
<p>
{{ 'logout'|_ }}
</p>
</a>
</li>
</ul>
</nav>
<!-- /.sidebar-menu -->
</div>
<!-- /.sidebar -->
</aside>