Skip to content

Commit

Permalink
Merge branch 'release/v0.3.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
frdteknikelektro committed Apr 19, 2018
2 parents 4cd177b + 2c0eee5 commit 8e9ae16
Show file tree
Hide file tree
Showing 53 changed files with 3,240 additions and 16,750 deletions.
11 changes: 7 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,12 @@ In this file you can extends global section like menu.
To extends menu add this in ```app.blade.php```
```blade
@section('sidebar-menu')
<ul class="nav" id="side-menu">
<li>
<a href="{{ route('home') }}" class="active"><i class="fa fa-home fa-fw"></i> Home</a>
<ul class="nav">
<li class="active">
<a class="nav-link" href="{{ route('home') }}">
<i class="pe-7s-home"></i>
<p>Home</p>
</a>
</li>
</ul>
@endsection
Expand Down Expand Up @@ -81,7 +84,7 @@ npm install

Install Light Bootstrap Dashboard needed package from npm
```bash
npm install --save-dev animate.css bootstrap-notify bootstrap-select bootstrap-switch chartist flatui-radiocheck font-awesome pixeden-stroke-7-icon
npm install --save-dev animate.css bootstrap bootstrap-notify bootstrap-select bootstrap-switch chartist flatui-radiocheck font-awesome popper.js pixeden-stroke-7-icon
```

Run Laravel Mix command
Expand Down
8 changes: 4 additions & 4 deletions app/Console/Commands/stubs/make/views/auth/login.stub
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@

@section('content')
<div class="row">
<div class="col-md-4 col-md-offset-4">
<div class="col-md-4 offset-md-4">
<div class="auth-card card">
<div class="header">
<h4 class="title">Login</h4>
<div class="card-header">
<h4 class="card-title">Login</h4>
</div>
<div class="content">
<div class="card-body">
<form action="{{ route('login') }}" method="POST">
{{ csrf_field() }}
<div class="form-group {{ $errors->has('email') ? 'has-error' : '' }}">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@

@section('content')
<div class="row">
<div class="col-md-4 col-md-offset-4">
<div class="col-md-4 offset-md-4">
<div class="auth-card card">
<div class="header">
<h4 class="title">Reset Password</h4>
<div class="card-header">
<h4 class="card-title">Reset Password</h4>
</div>
<div class="content">
<div class="card-body">
<form action="{{ route('password.email') }}" method="POST">
{{ csrf_field() }}
<div class="form-group {{ $errors->has('email') ? 'has-error' : '' }}">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@

@section('content')
<div class="row">
<div class="col-md-4 col-md-offset-4">
<div class="col-md-4 offset-md-4">
<div class="auth-card card">
<div class="header">
<h4 class="title">Reset Password</h4>
<div class="card-header">
<h4 class="card-title">Reset Password</h4>
</div>
<div class="content">
<div class="card-body">
<form action="{{ route('password.request') }}" method="POST">
{{ csrf_field() }}
<input type="hidden" name="token" value="{{ $token }}">
Expand Down
8 changes: 4 additions & 4 deletions app/Console/Commands/stubs/make/views/auth/register.stub
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@

@section('content')
<div class="row">
<div class="col-md-4 col-md-offset-4">
<div class="col-md-4 offset-md-4">
<div class="auth-card card">
<div class="header">
<h4 class="title">Register</h4>
<div class="card-header">
<h4 class="card-title">Register</h4>
</div>
<div class="content">
<div class="card-body">
<form action="{{ route('register') }}" method="POST">
{{ csrf_field() }}
<fieldset>
Expand Down
8 changes: 4 additions & 4 deletions app/Console/Commands/stubs/make/views/errors/403.stub
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@

@section('content')
<div class="row">
<div class="col-md-8 col-md-offset-2">
<div class="col-md-8 offset-md-2">
<div class="card">
<div class="header">
<h4 class="title">Oops! {{ class_basename($exception->getPrevious() ? : $exception) }}</h4>
<div class="card-header">
<h4 class="card-title">Oops! {{ class_basename($exception->getPrevious() ? : $exception) }}</h4>
</div>
@if($exception->getMessage())
<div class="content">
<div class="card-body">
{{ $exception->getPrevious() ? $exception->getPrevious()->getMessage() : $exception->getMessage() }}
</div>
@endif
Expand Down
8 changes: 4 additions & 4 deletions app/Console/Commands/stubs/make/views/errors/404.stub
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@

@section('content')
<div class="row">
<div class="col-md-8 col-md-offset-2">
<div class="col-md-8 offset-md-2">
<div class="card">
<div class="header">
<h4 class="title">Oops! {{ class_basename($exception->getPrevious() ? : $exception) }}</h4>
<div class="card-header">
<h4 class="card-title">Oops! {{ class_basename($exception->getPrevious() ? : $exception) }}</h4>
</div>
@if($exception->getMessage())
<div class="content">
<div class="card-body">
{{ $exception->getPrevious() ? $exception->getPrevious()->getMessage() : $exception->getMessage() }}
</div>
@endif
Expand Down
10 changes: 5 additions & 5 deletions app/Console/Commands/stubs/make/views/home.stub
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@

@section('content')
<div class="row">
<div class="col-md-8 col-md-offset-2">
<div class="col-md-8 offset-md-2">
<div class="card">
<div class="header">
<h4 class="title">Dashboard</h4>
{{-- <p class="category">Dashboard</p> --}}
<div class="card-header">
<h4 class="card-title">Dashboard</h4>
{{-- <p class="card-category">Dashboard</p> --}}
</div>
<div class="content">
<div class="card-body">
@if (session('status'))
<div class="alert alert-success">
{{ session('status') }}
Expand Down
2 changes: 1 addition & 1 deletion app/Console/Commands/stubs/make/views/layouts/app.stub
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
@section('sidebar-menu')
<ul class="nav">
<li class="active">
<a href="{{ route('home') }}">
<a class="nav-link" href="{{ route('home') }}">
<i class="pe-7s-home"></i>
<p>Home</p>
</a>
Expand Down
19 changes: 16 additions & 3 deletions app/Console/Commands/stubs/make/webpack.mix.stub
Original file line number Diff line number Diff line change
@@ -1,12 +1,25 @@

mix.autoload({
jquery: ['$', 'jQuery', 'jquery']
});

mix.copy('resources/assets/img/sidebar-*.jpg', 'public/images');
mix.js('resources/assets/js/auth.js', 'public/js')
.sass('resources/assets/sass/auth.scss', 'public/css');
mix.js('resources/assets/js/light-bootstrap-dashboard.js', 'public/js')
.sass('resources/assets/sass/light-bootstrap-dashboard.scss', 'public/css');
mix.extract([
'lodash', 'chartist', 'jquery',
'bootstrap-notify', 'bootstrap-select', 'bootstrap-switch',
'vue', 'axios'
'lodash',
'chartist',
'jquery',
'popper.js',
'bootstrap',
'bootstrap-sass',
'bootstrap-notify',
'bootstrap-select',
'bootstrap-switch',
'flatui-radiocheck',
'vue',
'axios'
], 'public/js/vendor.js');
mix.version();
Loading

0 comments on commit 8e9ae16

Please sign in to comment.