Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-11-03 23:57:33 -05:00
Code Issues Packages Projects Releases Wiki Activity

Refactor (#2495)

Browse Source 
* Minify js and css

* Refactor master layout
This commit is contained in:
David Bomba 2018-11-07 20:36:42 +11:00 committed by GitHub
parent 1ad857bac9
commit 7e57b0f2fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 135 additions and 42166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16916
public/css/ninja.css vendored
View File

File diff suppressed because one or more lines are too long

21
public/css/ninja.min.css vendored Normal file
View File

File diff suppressed because one or more lines are too long

25194
public/js/ninja.js vendored
View File

File diff suppressed because one or more lines are too long

4
public/js/ninja.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

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

@ -1,4 +1,4 @@
@extends('layouts.master')
@extends('layouts.guest')
@section('body')
<body class="app flex-row align-items-center">

25
resources/views/client/edit.blade.php
View File

@ -1,22 +1,12 @@
@extends('layouts.master')
@extends('layouts.master', ['header' => $header])
@section('head')
@parent
<link rel="stylesheet" href="//cdn.datatables.net/1.10.18/css/dataTables.bootstrap4.min.css">
<script src="//cdn.datatables.net/1.10.18/js/jquery.dataTables.min.js"></script>
<script src="//cdn.datatables.net/1.10.18/js/dataTables.bootstrap4.min.js"></script>
@endsection
@section('header')
@include('header', $header)
@parent
@endsection
@section('sidebar')
@include('sidebar')
@endsection
@section('body')
<main class="main">
@ -40,16 +30,6 @@
</main>
@include('dashboard.aside')
@endsection
@section('footer')
@include('footer')
@endsection
@ -61,4 +41,3 @@

22
resources/views/client/list.blade.php
View File

@ -1,23 +1,15 @@
@extends('layouts.master')
@extends('layouts.master', ['header' => $header])
@section('head')
@parent
<link rel="stylesheet" href="//cdn.datatables.net/1.10.18/css/dataTables.bootstrap4.min.css">
<script src="//cdn.datatables.net/1.10.18/js/jquery.dataTables.min.js"></script>
<script src="//cdn.datatables.net/1.10.18/js/dataTables.bootstrap4.min.js"></script>
@endsection
@section('header')
@include('header', $header)
@parent
@endsection
@section('sidebar')
@include('sidebar')
@endsection
@section('body')
@parent
<main class="main" >
<!-- Breadcrumb-->
{{ Breadcrumbs::render('clients') }}
@ -35,16 +27,10 @@
</div>
</main>
@include('dashboard.aside')
@endsection
@section('footer')
@include('footer')
@parent
{!! $html->scripts() !!}
@endsection

18
resources/views/dashboard/index.blade.php
View File

@ -1,13 +1,4 @@
@extends('layouts.master')
@section('header')
@include('header', $header)
@endsection
@section('sidebar')
@include('sidebar')
@endsection
@extends('layouts.master', ['header' => $header])
@section('body')
<main class="main">
@ -19,11 +10,4 @@
</div>
</main>
@include('dashboard.aside')
@endsection
@section('footer')
@include('footer')
@endsection

2
resources/views/header.blade.php
View File

@ -134,4 +134,4 @@
<span class="navbar-toggler-icon"></span>
</button>
</header>
<div class="app-body" id="app">
<div class="app-body">

73
resources/views/layouts/guest.blade.php Normal file
View File

@ -0,0 +1,73 @@
<!DOCTYPE html>
<html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
<head>
<!-- Source: https://github.com/invoiceninja/invoiceninja -->
<!-- Error: {{ session('error') }} -->
@if (config('services.analytics.tracking_id'))
<script async src="https://www.googletagmanager.com/gtag/js?id=UA-122229484-1"></script>
<script>
window.dataLayer = window.dataLayer || [];
function gtag(){dataLayer.push(arguments);}
gtag('js', new Date());
gtag('config', '{{ config('services.analytics.tracking_id') }}', { 'anonymize_ip': true });
function trackEvent(category, action) {
ga('send', 'event', category, action, this.src);
}
</script>
<script>
Vue.config.devtools = true;
</script>
@else
<script>
function gtag(){}
</script>
@endif
<meta charset="utf-8">
<title>@yield('meta_title', 'Invoice Ninja') | {{ config('app.name') }}</title>
<meta name="description" content="@yield('meta_description')"/>
<link href="{{ asset('favicon.png') }}" rel="shortcut icon" type="image/png">
<!--
TODO Setup social sharing info
<meta property="og:site_name" content="Invoice Ninja"/>
<meta property="og:url" content="{{ config('ninja.site_url') }}"/>
<meta property="og:title" content="Invoice Ninja"/>
<meta property="og:image" content="{{ config('ninja.site_url') }}/images/logo.png"/>
<meta property="og:description" content="Create. Send. Get Paid."/>
--/>
<!-- http://realfavicongenerator.net -->
<!--
TODO Setup favicon
<link rel="apple-touch-icon" sizes="180x180" href="{{ url('apple-touch-icon.png') }}">
<link rel="icon" type="image/png" href="{{ url('favicon-32x32.png') }}" sizes="32x32">
<link rel="icon" type="image/png" href="{{ url('favicon-16x16.png') }}" sizes="16x16">
<link rel="manifest" href="{{ url('manifest.json') }}">
<link rel="mask-icon" href="{{ url('safari-pinned-tab.svg') }}" color="#3bc65c">
<link rel="shortcut icon" href="{{ url('favicon.ico') }}">
<meta name="apple-mobile-web-app-title" content="Invoice Ninja">
<meta name="application-name" content="Invoice Ninja">
<meta name="theme-color" content="#ffffff">
-->
<meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no">
<meta name="csrf-token" content="{{ csrf_token() }}">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/simple-line-icons/2.4.1/css/simple-line-icons.css">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.css">
<link rel="canonical" href="{{ config('ninja.site_url') }}/{{ request()->path() }}"/>
<link rel="stylesheet" href="{{ mix('/css/ninja.min.css') }}">
<script src="https://code.jquery.com/jquery-3.2.1.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js" integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q" crossorigin="anonymous"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js" integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl" crossorigin="anonymous"></script>
<script src=" {{ mix('/js/ninja.min.js') }}"></script>
@yield('head')
</head>
@yield('body')
</html>

14
resources/views/layouts/master.blade.php
View File

@ -58,22 +58,32 @@
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/simple-line-icons/2.4.1/css/simple-line-icons.css">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.css">
<link rel="canonical" href="{{ config('ninja.site_url') }}/{{ request()->path() }}"/>
<link rel="stylesheet" href="{{ mix('/css/ninja.css') }}">
<link rel="stylesheet" href="{{ mix('/css/ninja.min.css') }}">
<script src="https://code.jquery.com/jquery-3.2.1.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js" integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q" crossorigin="anonymous"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js" integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl" crossorigin="anonymous"></script>
<script src=" {{ mix('/js/ninja.js') }}"></script>
<script src=" {{ mix('/js/ninja.min.js') }}"></script>
@yield('head')
</head>
@include('header', $header)
@yield('header')
@include('sidebar')
@yield('sidebar')
@section('body')
@yield('body')
@include('dashboard.aside')
@include('footer')
@yield('footer')

2
resources/views/signup/index.blade.php
View File

@ -1,4 +1,4 @@
@extends('layouts.master')
@extends('layouts.guest')
@section('body')

8
webpack.mix.js vendored
View File

@ -1,6 +1,5 @@
const mix = require('laravel-mix');
/*
|--------------------------------------------------------------------------
| Mix Asset Management
@ -17,16 +16,21 @@ mix.js('resources/js/app.js', 'public/js/vendor');
mix.scripts([
'node_modules/@coreui/coreui/dist/js/coreui.js',
//'node_modules/vue/dist/vue.min.js',
'node_modules/vue/dist/vue.js',
//'node_modules/vue/dist/vue.js',
'public/js/vendor/app.js'
], 'public/js/ninja.js');
mix.minify('public/js/ninja.js');
mix.styles([
'node_modules/@coreui/coreui/dist/css/coreui.css',
'node_modules/@coreui/icons/css/coreui-icons.css',
'node_modules/font-awesome/css/font-awesome.css'
], 'public/css/ninja.css');
mix.minify('public/css/ninja.css');
mix.copyDirectory('node_modules/font-awesome/fonts', 'public/fonts');