Upgrade to Laravel 5.8 and AdminLTE3

This commit is contained in:
Deon George
2019-06-02 15:35:48 +10:00
parent 5a036cdc64
commit 41d6a07196
135 changed files with 20724 additions and 103787 deletions

View File

@@ -1,22 +0,0 @@
/**
* First we will load all of this project's JavaScript dependencies which
* includes Vue and other libraries. It is a great starting point when
* building robust, powerful web applications using Vue and Laravel.
*/
require('./bootstrap');
window.Vue = require('vue');
/**
* Next, we will create a fresh Vue application instance and attach it to
* the page. Then, you may begin adding components to this application
* or customize the JavaScript scaffolding to fit your unique needs.
*/
// Vue.component('example-component', require('./components/ExampleComponent.vue'));
const app = new Vue({
el: '#app'
});

View File

@@ -1,58 +0,0 @@
<template>
<form method="post" @submit.prevent="submit" @keydown="clearErrors($event.target.name)">
<div class="alert alert-success text-center" v-show="form.succeeded" id="result">{{ trans('adminlte_lang_message.resetemaillink') }}</div>
<div class="form-group has-feedback" :class="{ 'has-error': form.errors.has('email') }">
<input type="email" class="form-control" :placeholder="trans('adminlte_lang_message.email')" name="email" v-model="form.email" autofocus/>
<span class="glyphicon glyphicon-envelope form-control-feedback"></span>
<transition name="fade">
<span class="help-block" v-if="form.errors.has('email')" v-text="form.errors.get('email')"></span>
</transition>
</div>
<div class="row">
<div class="col-xs-2">
</div><!-- /.col -->
<div class="col-xs-8">
<button type="submit" class="btn btn-primary btn-block btn-flat" :disabled="form.errors.any()"><i v-if="form.submitting" class="fa fa-refresh fa-spin"></i> {{ trans('adminlte_lang_message.sendpassword') }}</button>
</div><!-- /.col -->
<div class="col-xs-2">
</div><!-- /.col -->
</div>
</form>
</template>
<style src="./fade.css"></style>
<script>
import Form from 'acacha-forms'
export default {
data: function () {
return {
form: new Form({ email: ''}),
result: ''
}
},
methods: {
submit () {
this.form.post('/password/email')
.then(response => {
this.result = response.data.status;
})
.catch(error => {
console.log(this.trans('adminlte_lang_message.sendpassword') + ':' + error)
})
},
clearErrors (name) {
this.form.errors.clear(name)
this.form.succeeded = false
this.result = ''
}
},
mounted () {
this.form.clearOnSubmit = true
}
}
</script>

View File

@@ -1,20 +0,0 @@
export default {
mounted () {
this.initialitzeICheck()
},
methods: {
initialitzeICheck () {
var component = this
$('input').iCheck({
checkboxClass: 'icheckbox_square-blue',
radioClass: 'iradio_square-blue',
increaseArea: '20%'
}).on('ifChecked', function (event) {
component.form.setField('terms', true)
component.form.errors.clear('terms')
}).on('ifUnchecked', function (event) {
component.form.setField('terms', '')
})
}
}
}

View File

@@ -1,125 +0,0 @@
<template>
<form method="post" @submit.prevent="submit" @keydown="clearErrors($event.target.name)">
<div class="alert alert-success text-center" v-show="form.succeeded" id="result">{{ trans('adminlte_lang_message.loggedin') }} <i class="fa fa-refresh fa-spin"></i> {{ trans('adminlte_lang_message.entering') }}</div>
<div class="form-group has-feedback" :class="{ 'has-error': form.errors.has('email') }" v-if="type === 'email'">
<input type="email" class="form-control" :placeholder="placeholder" :name="name" value="" v-model="form.email" @change="adddomain" autofocus/>
<span class="glyphicon form-control-feedback" :class="[icon]"></span>
<transition name="fade">
<span class="help-block" v-if="form.errors.has('email')" v-text="form.errors.get('email')" id="validation_error_email"></span>
</transition>
</div>
<div class="form-group has-feedback" :class="{ 'has-error': form.errors.has('username') }" v-else>
<input type="text" class="form-control" :placeholder="placeholder" :name="name" v-model="form.username" @change="adddomain" autofocus/>
<span class="glyphicon form-control-feedback" :class="[icon]"></span>
<transition name="fade">
<span class="help-block" v-if="form.errors.has('username')" v-text="form.errors.get('username')" id="validation_error_username"></span>
</transition>
</div>
<div class="form-group has-feedback" :class="{ 'has-error': form.errors.has('password') }">
<input type="password" class="form-control" :placeholder="trans('adminlte_lang_message.password')" name="password" v-model="form.password"/>
<span class="glyphicon glyphicon-lock form-control-feedback"></span>
<transition name="fade">
<span class="help-block" v-if="form.errors.has('password')" v-text="form.errors.get('password')" id="validation_error_password"></span>
</transition>
</div>
<div class="row">
<div class="col-xs-8">
<div class="checkbox icheck">
<label>
<input style="display:none;" type="checkbox" name="remember" v-model="form.remember"> {{ trans('adminlte_lang_message.remember') }}
</label>
</div>
</div>
<div class="col-xs-4">
<button type="submit" class="btn btn-primary btn-block btn-flat" v-text="trans('adminlte_lang_message.buttonsign')" :disabled="form.errors.any()"><i v-if="form.submitting" class="fa fa-refresh fa-spin"></i></button>
</div>
</div>
</form>
</template>
<style src="./fade.css"></style>
<script>
import Form from 'acacha-forms'
import initialitzeIcheck from './InitializeIcheck'
import redirect from './redirect'
export default {
mixins: [initialitzeIcheck, redirect],
data: function () {
let form = new Form({ username: '', password: '', remember: '' })
if (this.name === 'email') {
form = new Form({ email: '', password: '', remember: '' })
}
return {
form: form,
}
},
props: {
name: {
type: String,
required: true
},
domain: {
type: String,
required: false
}
},
computed: {
placeholder: function () {
if (this.name === 'email') return this.trans('adminlte_lang_message.email')
return this.trans('adminlte_lang_message.username')
},
type: function () {
if (this.name === 'email') return 'email'
return 'text'
},
icon: function () {
if (this.name === 'email') return 'glyphicon-envelope'
return 'glyphicon-user'
}
},
watch: {
'form.remember': function (value) {
if (value) {
$('input').iCheck('check')
} else {
$('input').iCheck('uncheck')
}
}
},
methods: {
submit () {
this.form.post('/login')
.then(response => {
var component = this;
setTimeout(function(){
component.redirect(response)
}, 2500);
})
.catch(error => {
console.log(this.trans('adminlte_lang_message.loginerror') + ':' + error)
})
},
adddomain: function () {
if (this.type === 'email') return
if (this.domain === '') return
if (this.form.username.endsWith(this.domain)) return
if (this.form.username.includes('@')) return
this.form.username = this.form.username + '@' + this.domain
},
clearErrors (name) {
if (name === 'password') {
this.form.errors.clear('password')
name = this.name
}
this.form.errors.clear(name)
}
}
}
</script>

View File

@@ -1,104 +0,0 @@
<template>
<form method="post" @submit.prevent="submit" @keydown="clearErrors($event.target.name)">
<div class="alert alert-success text-center" v-show="form.succeeded" id="result"> {{ trans('adminlte_lang_message.registered') }} <i class="fa fa-refresh fa-spin"></i> {{ trans('adminlte_lang_message.entering') }}</div>
<div class="form-group has-feedback " :class="{ 'has-error': form.errors.has('name') }">
<input type="text" class="form-control" :placeholder="trans('adminlte_lang_message.fullname')" name="name" value="" v-model="form.name" autofocus/>
<span class="glyphicon glyphicon-user form-control-feedback"></span>
<transition name="fade">
<span class="help-block" v-if="form.errors.has('name')" v-text="form.errors.get('name')"></span>
</transition>
</div>
<div class="form-group has-feedback" :class="{ 'has-error': form.errors.has('email') }">
<input type="email" class="form-control" :placeholder="trans('adminlte_lang_message.email')" name="email" value="" v-model="form.email"/>
<span class="glyphicon glyphicon-envelope form-control-feedback"></span>
<transition name="fade">
<span class="help-block" v-if="form.errors.has('email')" v-text="form.errors.get('email')"></span>
</transition>
</div>
<div class="form-group has-feedback" :class="{ 'has-error': form.errors.has('password') }">
<input type="password" class="form-control" :placeholder="trans('adminlte_lang_message.password')" name="password" v-model="form.password"/>
<span class="glyphicon glyphicon-lock form-control-feedback"></span>
<transition name="fade">
<span class="help-block" v-if="form.errors.has('password')" v-text="form.errors.get('password')"></span>
</transition>
</div>
<div class="form-group has-feedback">
<input type="password" class="form-control" :placeholder="trans('adminlte_lang_message.retypepassword')" name="password_confirmation" v-model="form.password_confirmation"/>
</div>
<div class="form-group has-feedback" :class="{ 'has-error': form.errors.has('token') }">
<input type="text" class="form-control" placeholder="Authorisation Token" name="token" value="" v-model="form.token"/>
<span class="glyphicon glyphicon-barcode form-control-feedback"></span>
<transition name="fade">
<span class="help-block" v-if="form.errors.has('token')" v-text="form.errors.get('token')"></span>
</transition>
</div>
<div class="row">
<div class="col-xs-7">
<label>
<div class="checkbox_register icheck">
<label data-toggle="modal" data-target="#termsModal">
<input type="checkbox" name="terms" v-model="form.terms" class="has-error">
<a href="#" :class="{ 'text-danger': form.errors.has('terms') }" v-text="trans('adminlte_lang_message.conditions')"></a>
</label>
</div>
</label>
</div>
<div class="col-xs-4 col-xs-push-1">
<button type="submit" class="btn btn-primary btn-block btn-flat" :disabled="form.errors.any()" v-text="trans('adminlte_lang_message.register')"><i v-if="form.submitting" class="fa fa-refresh fa-spin"></i> </button>
</div>
</div>
<div v-if="form.errors.has('terms')" class="form-group has-feedback" :class="{ 'has-error': form.errors.has('terms') }">
<span class="help-block" v-if="form.errors.has('terms')" v-text="form.errors.get('terms')"></span>
</div>
</form>
</template>
<style src="./fade.css"></style>
<script>
import Form from 'acacha-forms'
import initialitzeIcheck from './InitializeIcheck'
import redirect from './redirect'
export default {
mixins: [initialitzeIcheck, redirect],
data: function () {
return {
form: new Form({ name: '', email: '', token: '', password: '', password_confirmation: '', terms: '' })
}
},
watch: {
'form.terms': function (value) {
if (value) {
$('input').iCheck('check')
} else {
$('input').iCheck('uncheck')
}
}
},
methods: {
submit () {
this.form.post('/register')
.then(response => {
var component = this;
setTimeout(function(){
component.redirect(response)
}, 2500);
})
.catch(error => {
console.log(this.trans('adminlte_lang_message.registererror') + ':' + error)
})
},
clearErrors (name) {
if (name === 'password_confirmation') {
name = 'password'
this.form.errors.clear('password_confirmation')
}
this.form.errors.clear(name)
}
}
}
</script>

View File

@@ -1,88 +0,0 @@
<template>
<form method="post" @submit.prevent="submit" @keydown="clearErrors($event.target.name)">
<div class="alert alert-success text-center" v-show="form.succeeded" id="result">{{ trans('adminlte_lang_message.success') }} <i class="fa fa-refresh fa-spin"></i> {{ trans('adminlte_lang_message.loggedin') }}</div>
<input type="hidden" name="token" v-model="form.token">
<div class="form-group has-feedback" :class="{ 'has-error': form.errors.has('email') }">
<input type="email" class="form-control" :placeholder="trans('adminlte_lang_message.email')" name="email" v-model="form.email" autofocus/>
<span class="glyphicon glyphicon-envelope form-control-feedback"></span>
<transition name="fade">
<span class="help-block" v-if="form.errors.has('email')" v-text="form.errors.get('email')"></span>
</transition>
</div>
<div class="form-group has-feedback" :class="{ 'has-error': form.errors.has('password') }">
<input type="password" class="form-control" :placeholder="trans('adminlte_lang_message.password')" name="password" v-model="form.password"/>
<span class="glyphicon glyphicon-lock form-control-feedback"></span>
<transition name="fade">
<span class="help-block" v-if="form.errors.has('password')" v-text="form.errors.get('password')"></span>
</transition>
</div>
<div class="form-group has-feedback">
<input type="password" class="form-control" :placeholder="trans('adminlte_lang_message.retypepassword')" name="password_confirmation" v-model="form.password_confirmation"/>
<span class="glyphicon glyphicon-lock form-control-feedback"></span>
</div>
<div class="row">
<div class="col-xs-2">
</div><!-- /.col -->
<div class="col-xs-8">
<button type="submit" class="btn btn-primary btn-block btn-flat" :disabled="form.errors.any()"><i v-if="form.submitting" class="fa fa-refresh fa-spin"></i> {{ trans('adminlte_lang_message.passwordreset') }}</button>
</div><!-- /.col -->
<div class="col-xs-2">
</div><!-- /.col -->
</div>
</form>
</template>
<style src="./fade.css"></style>
<script>
import Form from 'acacha-forms'
import redirect from './redirect'
export default {
mixins: [redirect],
props: {
token: {
type: String,
required: true
},
},
data: function () {
return {
form: new Form({email: '', password: '', password_confirmation: '', token: this.token }),
result: ''
}
},
methods: {
submit () {
this.form.post('/password/reset')
.then(response => {
this.result = response.data.status;
var component = this;
setTimeout(function(){
component.redirect(response)
}, 2500);
})
.catch(error => {
console.log(this.trans('adminlte_lang_message.passwordreset') + ':' + error)
})
},
clearErrors (name) {
if (name === 'password_confirmation') {
name = 'password'
this.form.errors.clear('password_confirmation')
}
this.form.errors.clear(name)
this.form.succeeded = false
this.result = ''
},
mounted () {
this.form.clearOnSubmit = true
}
}
}
</script>

View File

@@ -1,7 +0,0 @@
.fade-enter-active, .fade-leave-active {
transition: opacity 1s ease;
}
.fade-enter, .fade-leave-to {
opacity: 0;
}

View File

@@ -1,7 +0,0 @@
export default {
methods: {
redirect (response) {
window.location.reload()
}
}
}

View File

@@ -1,18 +0,0 @@
@import "../../../node_modules/admin-lte/build/less/AdminLTE.less";
@boxed-layout-bg-image-path: "../../dist/img/boxed-bg.jpg";
@btn-font-weight: 300;
@font-family-sans-serif: "Roboto", Helvetica, Arial, sans-serif;
body, label, .checkbox label {
font-weight: 300;
}
.error-page {
background-color: @body-bg;
}
[v-cloak] {
display:none;
}

View File

@@ -1,37 +0,0 @@
// Body
$body-bg: #f5f8fa;
// Borders
$laravel-border-color: darken($body-bg, 10%);
$list-group-border: $laravel-border-color;
$navbar-default-border: $laravel-border-color;
$panel-default-border: $laravel-border-color;
$panel-inner-border: $laravel-border-color;
// Brands
$brand-primary: #3097D1;
$brand-info: #8eb4cb;
$brand-success: #2ab27b;
$brand-warning: #cbb956;
$brand-danger: #bf5329;
// Typography
$font-family-sans-serif: "Roboto", Helvetica, Arial, sans-serif;
$font-size-base: 14px;
$line-height-base: 1.6;
$text-color: #636b6f;
// Navbar
$navbar-default-bg: #fff;
// Buttons
$btn-default-color: $text-color;
// Inputs
$input-border: lighten($text-color, 40%);
$input-border-focus: lighten($brand-primary, 25%);
$input-color-placeholder: lighten($text-color, 30%);
// Panels
$panel-default-heading-bg: #fff;

View File

@@ -1,21 +0,0 @@
// Fonts
@import url("https://fonts.googleapis.com/css?family=Raleway:300,400,600");
// Variables
@import "variables";
// Bootstrap
// @import "node_modules/bootstrap/scss/bootstrap.scss";
@import "node_modules/bootstrap-sass/assets/stylesheets/bootstrap";
//Ionicons
@import "node_modules/ionicons/dist/scss/ionicons.scss";
//Font awesome
@import "node_modules/font-awesome/scss/font-awesome.scss";
.navbar-laravel {
background-color: #fff;
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.04);
}

33
resources/js/app.js vendored Normal file
View File

@@ -0,0 +1,33 @@
/**
* First we will load all of this project's JavaScript dependencies which
* includes Vue and other libraries. It is a great starting point when
* building robust, powerful web applications using Vue and Laravel.
*/
require('./bootstrap');
window.Vue = require('vue');
/**
* The following block of code may be used to automatically register your
* Vue components. It will recursively scan this directory for the Vue
* components and automatically register them with their "basename".
*
* Eg. ./components/ExampleComponent.vue -> <example-component></example-component>
*/
// const files = require.context('./', true, /\.vue$/i);
// files.keys().map(key => Vue.component(key.split('/').pop().split('.')[0], files(key).default));
Vue.component('example-component', require('./components/ExampleComponent.vue').default);
/**
* Next, we will create a fresh Vue application instance and attach it to
* the page. Then, you may begin adding components to this application
* or customize the JavaScript scaffolding to fit your unique needs.
*/
const app = new Vue({
el: '#app'
});

View File

@@ -1,6 +1,5 @@
window._ = require('lodash');
window.Popper = require('popper.js').default;
/**
* We'll load jQuery and the Bootstrap jQuery plugin which provides support
@@ -9,15 +8,12 @@ window.Popper = require('popper.js').default;
*/
try {
window.Popper = require('popper.js').default;
window.$ = window.jQuery = require('jquery');
require('bootstrap-sass');
require('bootstrap');
} catch (e) {}
require('admin-lte')
window.toastr = require('toastr')
require('icheck')
/**
* We'll load the axios HTTP library which allows us to easily issue requests
* to our Laravel back-end. This library automatically handles sending the
@@ -42,25 +38,6 @@ if (token) {
console.error('CSRF token not found: https://laravel.com/docs/csrf#csrf-x-csrf-token');
}
/**
* Vue is a modern JavaScript library for building interactive web interfaces
* using reactive data binding and reusable components. Vue's API is clean
* and simple, leaving you to focus on building your next great project.
*/
window.Vue = require('vue')
// Use trans function in Vue (equivalent to trans() Laravel Translations helper). See htmlheader.balde.php partial.
Vue.prototype.trans = (key) => {
return _.get(window.trans, key, key)
}
// Laravel AdminLTE vue components
Vue.component('register-form', require('./components/auth/RegisterForm.vue'))
Vue.component('login-form', require('./components/auth/LoginForm.vue'))
Vue.component('email-reset-password-form', require('./components/auth/EmailResetPasswordForm.vue'))
Vue.component('reset-password-form', require('./components/auth/ResetPasswordForm.vue'))
/**
* Echo exposes an expressive API for subscribing to channels and listening
* for events that are broadcast by Laravel. Echo and event broadcasting
@@ -77,6 +54,3 @@ Vue.component('reset-password-form', require('./components/auth/ResetPasswordFor
// cluster: process.env.MIX_PUSHER_APP_CLUSTER,
// encrypted: true
// });
import dt from 'datatables.net';
import 'datatables.net-dt/css/jquery.dataTables.css';

View File

@@ -0,0 +1,23 @@
<template>
<div class="container">
<div class="row justify-content-center">
<div class="col-md-8">
<div class="card">
<div class="card-header">Example Component</div>
<div class="card-body">
I'm an example component.
</div>
</div>
</div>
</div>
</div>
</template>
<script>
export default {
mounted() {
console.log('Component mounted.')
}
}
</script>

View File

@@ -13,7 +13,7 @@ return [
|
*/
'password' => 'Passwords must be at least six characters and match the confirmation.',
'password' => 'Passwords must be at least eight characters and match the confirmation.',
'reset' => 'Your password has been reset!',
'sent' => 'We have e-mailed your password reset link!',
'token' => 'This password reset token is invalid.',

View File

@@ -13,83 +13,108 @@ return [
|
*/
'accepted' => 'The :attribute must be accepted.',
'active_url' => 'The :attribute is not a valid URL.',
'after' => 'The :attribute must be a date after :date.',
'after_or_equal' => 'The :attribute must be a date after or equal to :date.',
'alpha' => 'The :attribute may only contain letters.',
'alpha_dash' => 'The :attribute may only contain letters, numbers, and dashes.',
'alpha_num' => 'The :attribute may only contain letters and numbers.',
'array' => 'The :attribute must be an array.',
'before' => 'The :attribute must be a date before :date.',
'before_or_equal' => 'The :attribute must be a date before or equal to :date.',
'between' => [
'accepted' => 'The :attribute must be accepted.',
'active_url' => 'The :attribute is not a valid URL.',
'after' => 'The :attribute must be a date after :date.',
'after_or_equal' => 'The :attribute must be a date after or equal to :date.',
'alpha' => 'The :attribute may only contain letters.',
'alpha_dash' => 'The :attribute may only contain letters, numbers, dashes and underscores.',
'alpha_num' => 'The :attribute may only contain letters and numbers.',
'array' => 'The :attribute must be an array.',
'before' => 'The :attribute must be a date before :date.',
'before_or_equal' => 'The :attribute must be a date before or equal to :date.',
'between' => [
'numeric' => 'The :attribute must be between :min and :max.',
'file' => 'The :attribute must be between :min and :max kilobytes.',
'string' => 'The :attribute must be between :min and :max characters.',
'array' => 'The :attribute must have between :min and :max items.',
'file' => 'The :attribute must be between :min and :max kilobytes.',
'string' => 'The :attribute must be between :min and :max characters.',
'array' => 'The :attribute must have between :min and :max items.',
],
'boolean' => 'The :attribute field must be true or false.',
'confirmed' => 'The :attribute confirmation does not match.',
'country' => 'The :attribute field is not a valid country.',
'date' => 'The :attribute is not a valid date.',
'date_format' => 'The :attribute does not match the format :format.',
'different' => 'The :attribute and :other must be different.',
'digits' => 'The :attribute must be :digits digits.',
'digits_between' => 'The :attribute must be between :min and :max digits.',
'dimensions' => 'The :attribute has invalid image dimensions.',
'distinct' => 'The :attribute field has a duplicate value.',
'email' => 'The :attribute must be a valid email address.',
'exists' => 'The selected :attribute is invalid.',
'file' => 'The :attribute must be a file.',
'filled' => 'The :attribute field must have a value.',
'image' => 'The :attribute must be an image.',
'in' => 'The selected :attribute is invalid.',
'in_array' => 'The :attribute field does not exist in :other.',
'integer' => 'The :attribute must be an integer.',
'ip' => 'The :attribute must be a valid IP address.',
'ipv4' => 'The :attribute must be a valid IPv4 address.',
'ipv6' => 'The :attribute must be a valid IPv6 address.',
'json' => 'The :attribute must be a valid JSON string.',
'max' => [
'boolean' => 'The :attribute field must be true or false.',
'confirmed' => 'The :attribute confirmation does not match.',
'date' => 'The :attribute is not a valid date.',
'date_equals' => 'The :attribute must be a date equal to :date.',
'date_format' => 'The :attribute does not match the format :format.',
'different' => 'The :attribute and :other must be different.',
'digits' => 'The :attribute must be :digits digits.',
'digits_between' => 'The :attribute must be between :min and :max digits.',
'dimensions' => 'The :attribute has invalid image dimensions.',
'distinct' => 'The :attribute field has a duplicate value.',
'email' => 'The :attribute must be a valid email address.',
'exists' => 'The selected :attribute is invalid.',
'file' => 'The :attribute must be a file.',
'filled' => 'The :attribute field must have a value.',
'gt' => [
'numeric' => 'The :attribute must be greater than :value.',
'file' => 'The :attribute must be greater than :value kilobytes.',
'string' => 'The :attribute must be greater than :value characters.',
'array' => 'The :attribute must have more than :value items.',
],
'gte' => [
'numeric' => 'The :attribute must be greater than or equal :value.',
'file' => 'The :attribute must be greater than or equal :value kilobytes.',
'string' => 'The :attribute must be greater than or equal :value characters.',
'array' => 'The :attribute must have :value items or more.',
],
'image' => 'The :attribute must be an image.',
'in' => 'The selected :attribute is invalid.',
'in_array' => 'The :attribute field does not exist in :other.',
'integer' => 'The :attribute must be an integer.',
'ip' => 'The :attribute must be a valid IP address.',
'ipv4' => 'The :attribute must be a valid IPv4 address.',
'ipv6' => 'The :attribute must be a valid IPv6 address.',
'json' => 'The :attribute must be a valid JSON string.',
'lt' => [
'numeric' => 'The :attribute must be less than :value.',
'file' => 'The :attribute must be less than :value kilobytes.',
'string' => 'The :attribute must be less than :value characters.',
'array' => 'The :attribute must have less than :value items.',
],
'lte' => [
'numeric' => 'The :attribute must be less than or equal :value.',
'file' => 'The :attribute must be less than or equal :value kilobytes.',
'string' => 'The :attribute must be less than or equal :value characters.',
'array' => 'The :attribute must not have more than :value items.',
],
'max' => [
'numeric' => 'The :attribute may not be greater than :max.',
'file' => 'The :attribute may not be greater than :max kilobytes.',
'string' => 'The :attribute may not be greater than :max characters.',
'array' => 'The :attribute may not have more than :max items.',
'file' => 'The :attribute may not be greater than :max kilobytes.',
'string' => 'The :attribute may not be greater than :max characters.',
'array' => 'The :attribute may not have more than :max items.',
],
'mimes' => 'The :attribute must be a file of type: :values.',
'mimetypes' => 'The :attribute must be a file of type: :values.',
'min' => [
'mimes' => 'The :attribute must be a file of type: :values.',
'mimetypes' => 'The :attribute must be a file of type: :values.',
'min' => [
'numeric' => 'The :attribute must be at least :min.',
'file' => 'The :attribute must be at least :min kilobytes.',
'string' => 'The :attribute must be at least :min characters.',
'array' => 'The :attribute must have at least :min items.',
'file' => 'The :attribute must be at least :min kilobytes.',
'string' => 'The :attribute must be at least :min characters.',
'array' => 'The :attribute must have at least :min items.',
],
'not_in' => 'The selected :attribute is invalid.',
'not_regex' => 'The :attribute format is invalid.',
'numeric' => 'The :attribute must be a number.',
'present' => 'The :attribute field must be present.',
'regex' => 'The :attribute format is invalid.',
'required' => 'The :attribute field is required.',
'required_if' => 'The :attribute field is required when :other is :value.',
'required_unless' => 'The :attribute field is required unless :other is in :values.',
'required_with' => 'The :attribute field is required when :values is present.',
'required_with_all' => 'The :attribute field is required when :values is present.',
'required_without' => 'The :attribute field is required when :values is not present.',
'not_in' => 'The selected :attribute is invalid.',
'not_regex' => 'The :attribute format is invalid.',
'numeric' => 'The :attribute must be a number.',
'present' => 'The :attribute field must be present.',
'regex' => 'The :attribute format is invalid.',
'required' => 'The :attribute field is required.',
'required_if' => 'The :attribute field is required when :other is :value.',
'required_unless' => 'The :attribute field is required unless :other is in :values.',
'required_with' => 'The :attribute field is required when :values is present.',
'required_with_all' => 'The :attribute field is required when :values are present.',
'required_without' => 'The :attribute field is required when :values is not present.',
'required_without_all' => 'The :attribute field is required when none of :values are present.',
'same' => 'The :attribute and :other must match.',
'size' => [
'same' => 'The :attribute and :other must match.',
'size' => [
'numeric' => 'The :attribute must be :size.',
'file' => 'The :attribute must be :size kilobytes.',
'string' => 'The :attribute must be :size characters.',
'array' => 'The :attribute must contain :size items.',
'file' => 'The :attribute must be :size kilobytes.',
'string' => 'The :attribute must be :size characters.',
'array' => 'The :attribute must contain :size items.',
],
'state' => 'This state is not valid for the specified country.',
'string' => 'The :attribute must be a string.',
'timezone' => 'The :attribute must be a valid zone.',
'unique' => 'The :attribute has already been taken.',
'uploaded' => 'The :attribute failed to upload.',
'url' => 'The :attribute format is invalid.',
'starts_with' => 'The :attribute must start with one of the following: :values',
'string' => 'The :attribute must be a string.',
'timezone' => 'The :attribute must be a valid zone.',
'unique' => 'The :attribute has already been taken.',
'uploaded' => 'The :attribute failed to upload.',
'url' => 'The :attribute format is invalid.',
'uuid' => 'The :attribute must be a valid UUID.',
/*
|--------------------------------------------------------------------------
@@ -113,9 +138,9 @@ return [
| Custom Validation Attributes
|--------------------------------------------------------------------------
|
| The following language lines are used to swap attribute place-holders
| with something more reader friendly such as E-Mail Address instead
| of "email". This simply helps us make messages a little cleaner.
| The following language lines are used to swap our attribute placeholder
| with something more reader friendly such as "E-Mail Address" instead
| of "email". This simply helps us make our message more expressive.
|
*/

20
resources/sass/_variables.scss vendored Normal file
View File

@@ -0,0 +1,20 @@
// Body
$body-bg: #f8fafc;
// Typography
$font-family-sans-serif: "Nunito", sans-serif;
$font-size-base: 0.9rem;
$line-height-base: 1.6;
// Colors
$blue: #3490dc;
$indigo: #6574cd;
$purple: #9561e2;
$pink: #f66D9b;
$red: #e3342f;
$orange: #f6993f;
$yellow: #ffed4a;
$green: #38c172;
$teal: #4dc0b5;
$cyan: #6cb2eb;

14
resources/sass/app.scss vendored Normal file
View File

@@ -0,0 +1,14 @@
// Fonts
@import url('https://fonts.googleapis.com/css?family=Nunito');
// Variables
@import 'variables';
// Bootstrap
@import '~bootstrap/scss/bootstrap';
.navbar-laravel {
background-color: #fff;
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.04);
}

View File

@@ -1,10 +1,11 @@
@if ($o->accounts->count() > 2)
<div class="col-sm-3">
<div class="col-sm-2">
<div class="info-box">
<span class="info-box-icon bg-orange"><i class="fa fa-user"></i></span>
<span class="info-box-icon bg-primary elevation-1"><i class="fa fa-user"></i></span>
<div class="info-box-content">
<span class="info-box-text">Accounts Linked</span>
<span class="info-box-number">{{ $o->accounts->count() }}</span>
<span class="info-box-text">Linked Accounts</span>
<span class="info-box-number">{{ number_format($o->accounts->count()) }}</span>
</div>
</div>
</div>
@@ -12,17 +13,8 @@
<div class="col-sm-3">
<div class="info-box">
<span class="info-box-icon bg-red"><i class="fa fa-dollar"></i></span>
<div class="info-box-content">
<span class="info-box-text">Account Balance</span>
<span class="info-box-number"><small>$</small> {{ number_format($o->invoices_due->sum('due'),2) }}</span>
</div>
</div>
</div>
<span class="info-box-icon bg-info"><i class="fa fa-clone"></i></span>
<div class="col-sm-3">
<div class="info-box">
<span class="info-box-icon bg-green"><i class="fa fa-clone"></i></span>
<div class="info-box-content">
<span class="info-box-text">Active Services</span>
<span class="info-box-number">{{ $o->services_active->count() }} <small>/{{ $o->services->count() }}</small></span>
@@ -30,12 +22,24 @@
</div>
</div>
<div class="col-sm-3">
<div class="col-sm-2">
<div class="info-box">
<span class="info-box-icon bg-blue"><i class="fa fa-hashtag"></i></span>
<span class="info-box-icon bg-danger"><i class="fa fa-dollar"></i></span>
<div class="info-box-content">
<span class="info-box-text">Account Balance</span>
<span class="info-box-number"><small>$</small> {{ number_format($o->invoices_due->sum('due'),2) }}</span>
</div>
</div>
</div>
<div class="col-sm-2">
<div class="info-box">
<span class="info-box-icon bg-dark"><i class="fa fa-hashtag"></i></span>
<div class="info-box-content">
<span class="info-box-text">Invoices Due</span>
<span class="info-box-number">{{ $o->invoices_due->count() }}</span>
</div>
</div>
</div>
</div>

View File

@@ -1,17 +1,11 @@
<div class="box box-info">
<div class="box-header">
<h3 class="box-title">Invoices Due</h3>
<div class="box-tools pull-right">
<button type="button" class="btn btn-box-tool" data-widget="collapse" data-toggle="tooltip" title="Collapse">
<i class="fa fa-minus"></i></button>
<button type="button" class="btn btn-box-tool" data-widget="remove" data-toggle="tooltip" title="Remove">
<i class="fa fa-times"></i></button>
</div>
<div class="card card-dark card-outline">
<div class="card-header">
<h4 class="card-title">Invoices Due</h4>
</div>
<div class="box-body">
<div class="card-body">
@if ($user->invoices_due->count())
<table class="table table-bordered table-striped table-hover" id="invoices" style="width: 100%;">
<table class="table table-striped table-hover" id="invoices" style="width: 100%;">
<thead>
<tr>
<th>Invoice</th>
@@ -37,19 +31,15 @@
</div>
@section('page-scripts')
@css('https://cdn.datatables.net/responsive/2.2.1/css/responsive.dataTables.min.css')
@css('https://cdn.datatables.net/rowgroup/1.0.2/css/rowGroup.dataTables.min.css')
@js('https://cdn.datatables.net/responsive/2.2.1/js/dataTables.responsive.min.js')
@js('https://cdn.datatables.net/rowgroup/1.0.2/js/dataTables.rowGroup.min.js')
@css('https://cdn.datatables.net/1.10.19/css/jquery.dataTables.min.css','jq-dt-css','jquery');
@js('https://cdn.datatables.net/1.10.19/js/jquery.dataTables.min.js','jq-dt-js','jquery');
@css('https://cdn.datatables.net/responsive/2.2.1/css/responsive.dataTables.min.css','dt-responsive-css','jq-dt-css')
@js('https://cdn.datatables.net/responsive/2.2.1/js/dataTables.responsive.min.js','dt-responsive-js','jq-dt-js')
@css('https://cdn.datatables.net/rowgroup/1.0.2/css/rowGroup.dataTables.min.css','dt-rowgroup-css','jq-dt-css')
@js('https://cdn.datatables.net/rowgroup/1.0.2/js/dataTables.rowGroup.min.js','dt-rowgroup-js','jq-dt-js')
@css('/plugin/dataTables/dataTables.bootstrap4.css','dt-bootstrap4-css','jq-dt-css')
@js('/plugin/dataTables/dataTables.bootstrap4.js','dt-bootstrap4-js','jq-dt-js')
<style>
table.dataTable {
width: 100%;
}
table.dataTable td {
outline: none;
}
</style>
<script type="text/javascript">
$(document).ready(function() {
$('#invoices').DataTable( {

View File

@@ -1,15 +1,14 @@
<div class="box box-notice">
<div class="box-header">
<h3 class="box-title">Payment History</h3>
<div class="box-tools pull-right">
<button type="button" class="btn btn-box-tool" data-widget="collapse" data-toggle="tooltip" title="Collapse">
<i class="fa fa-minus"></i></button>
<button type="button" class="btn btn-box-tool" data-widget="remove" data-toggle="tooltip" title="Remove">
<i class="fa fa-times"></i></button>
<div class="card card-primary card-outline">
<div class="card-header">
<h4 class="card-title">Payment History</h4>
<div class="card-tools">
<button type="button" class="btn btn-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
<button type="button" class="btn btn-tool" data-widget="remove"><i class="fa fa-remove"></i></button>
</div>
</div>
<div class="box-body">
<div class="card-body">
@if ($user->payment_history->count())
<table class="table table-bordered table-striped table-hover" id="payments" style="width: 100%;">
<thead>
@@ -27,19 +26,15 @@
</div>
@section('page-scripts')
@css('https://cdn.datatables.net/responsive/2.2.1/css/responsive.dataTables.min.css')
@css('https://cdn.datatables.net/rowgroup/1.0.2/css/rowGroup.dataTables.min.css')
@js('https://cdn.datatables.net/responsive/2.2.1/js/dataTables.responsive.min.js')
@js('https://cdn.datatables.net/rowgroup/1.0.2/js/dataTables.rowGroup.min.js')
@css('https://cdn.datatables.net/1.10.19/css/jquery.dataTables.min.css','jq-dt-css','jquery');
@js('https://cdn.datatables.net/1.10.19/js/jquery.dataTables.min.js','jq-dt-js','jquery');
@css('https://cdn.datatables.net/responsive/2.2.1/css/responsive.dataTables.min.css','dt-responsive-css','jq-dt-css')
@js('https://cdn.datatables.net/responsive/2.2.1/js/dataTables.responsive.min.js','dt-responsive-js','jq-dt-js')
@css('https://cdn.datatables.net/rowgroup/1.0.2/css/rowGroup.dataTables.min.css','dt-rowgroup-css','jq-dt-css')
@js('https://cdn.datatables.net/rowgroup/1.0.2/js/dataTables.rowGroup.min.js','dt-rowgroup-js','jq-dt-js')
@css('/plugin/dataTables/dataTables.bootstrap4.css','dt-bootstrap4-css','jq-dt-css')
@js('/plugin/dataTables/dataTables.bootstrap4.js','dt-bootstrap4-js','jq-dt-js')
<style>
table.dataTable {
width: 100%;
}
table.dataTable td {
outline: none;
}
</style>
<script type="text/javascript">
$(document).ready(function() {
$('#payments').DataTable( {

View File

@@ -1,17 +1,11 @@
<div class="box box-success">
<div class="box-header">
<h3 class="box-title">Services</h3>
<div class="box-tools pull-right">
<button type="button" class="btn btn-box-tool" data-widget="collapse" data-toggle="tooltip" title="Collapse">
<i class="fa fa-minus"></i></button>
<button type="button" class="btn btn-box-tool" data-widget="remove" data-toggle="tooltip" title="Remove">
<i class="fa fa-times"></i></button>
</div>
<div class="card card-info card-outline">
<div class="card-header">
<h4 class="card-title">Services</h4>
</div>
<div class="box-body">
<div class="card-body">
@if ($user->services_active->count())
<table class="table table-bordered table-striped table-hover" id="services" style="width: 100%;">
<table class="table table-striped table-hover" id="services" style="width: 100%;">
<thead>
<tr>
<th>ID</th>
@@ -22,6 +16,7 @@
<th>Next Invoice</th>
</tr>
</thead>
<tfoot>
<tr>
<th>Count {{ $user->services_active->count() }}</th>
@@ -29,6 +24,7 @@
</tr>
</tfoot>
</table>
@else
<p>No services active</p>
@endif
@@ -36,16 +32,15 @@
</div>
@section('page-scripts')
@css('https://cdn.datatables.net/responsive/2.2.1/css/responsive.dataTables.min.css')
@css('https://cdn.datatables.net/rowgroup/1.0.2/css/rowGroup.dataTables.min.css')
@js('https://cdn.datatables.net/responsive/2.2.1/js/dataTables.responsive.min.js')
@js('https://cdn.datatables.net/rowgroup/1.0.2/js/dataTables.rowGroup.min.js')
@css('https://cdn.datatables.net/1.10.19/css/jquery.dataTables.min.css','jq-dt-css','jquery');
@js('https://cdn.datatables.net/1.10.19/js/jquery.dataTables.min.js','jq-dt-js','jquery');
@css('https://cdn.datatables.net/responsive/2.2.1/css/responsive.dataTables.min.css','dt-responsive-css','jq-dt-css')
@js('https://cdn.datatables.net/responsive/2.2.1/js/dataTables.responsive.min.js','dt-responsive-js','jq-dt-js')
@css('https://cdn.datatables.net/rowgroup/1.0.2/css/rowGroup.dataTables.min.css','dt-rowgroup-css','jq-dt-css')
@js('https://cdn.datatables.net/rowgroup/1.0.2/js/dataTables.rowGroup.min.js','dt-rowgroup-js','jq-dt-js')
@css('/plugin/dataTables/dataTables.bootstrap4.css','dt-bootstrap4-css','jq-dt-css')
@js('/plugin/dataTables/dataTables.bootstrap4.js','dt-bootstrap4-js','jq-dt-js')
<style>
table.dataTable td {
outline: none;
}
</style>
<script type="text/javascript">
$(document).ready(function() {
$('#services').DataTable( {
@@ -79,5 +74,5 @@
$(this).toggleClass('selected');
});
});
</script>
</script>
@append

View File

@@ -1,17 +1,16 @@
<div class="box box-success">
<div class="box-header">
<h3 class="box-title">Accounts</h3>
<div class="box-tools pull-right">
<button type="button" class="btn btn-box-tool" data-widget="collapse" data-toggle="tooltip" title="Collapse">
<i class="fa fa-minus"></i></button>
<button type="button" class="btn btn-box-tool" data-widget="remove" data-toggle="tooltip" title="Remove">
<i class="fa fa-times"></i></button>
<div class="card card-success card-outline">
<div class="card-header">
<h4 class="card-title">Accounts</h4>
<div class="card-tools">
<button type="button" class="btn btn-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
<button type="button" class="btn btn-tool" data-widget="remove"><i class="fa fa-remove"></i></button>
</div>
</div>
<div class="box-body">
<div class="card-body">
@if ($user->all_accounts()->count())
<table class="table table-bordered table-striped table-hover" id="accounts" style="width: 100%;">
<table class="table table-striped table-hover" id="accounts" style="width: 100%;">
<thead>
<tr>
<th>Profile</th>
@@ -34,16 +33,15 @@
</div>
@section('page-scripts')
@css('https://cdn.datatables.net/responsive/2.2.1/css/responsive.dataTables.min.css')
@css('https://cdn.datatables.net/rowgroup/1.0.2/css/rowGroup.dataTables.min.css')
@js('https://cdn.datatables.net/responsive/2.2.1/js/dataTables.responsive.min.js')
@js('https://cdn.datatables.net/rowgroup/1.0.2/js/dataTables.rowGroup.min.js')
@css('https://cdn.datatables.net/1.10.19/css/jquery.dataTables.min.css','jq-dt-css','jquery');
@js('https://cdn.datatables.net/1.10.19/js/jquery.dataTables.min.js','jq-dt-js','jquery');
@css('https://cdn.datatables.net/responsive/2.2.1/css/responsive.dataTables.min.css','dt-responsive-css','jq-dt-css')
@js('https://cdn.datatables.net/responsive/2.2.1/js/dataTables.responsive.min.js','dt-responsive-js','jq-dt-js')
@css('https://cdn.datatables.net/rowgroup/1.0.2/css/rowGroup.dataTables.min.css','dt-rowgroup-css','jq-dt-css')
@js('https://cdn.datatables.net/rowgroup/1.0.2/js/dataTables.rowGroup.min.js','dt-rowgroup-js','jq-dt-js')
@css('/plugin/dataTables/dataTables.bootstrap4.css','dt-bootstrap4-css','jq-dt-css')
@js('/plugin/dataTables/dataTables.bootstrap4.js','dt-bootstrap4-js','jq-dt-js')
<style>
table.dataTable td {
outline: none;
}
</style>
<script type="text/javascript">
$(document).ready(function() {
$('#accounts').DataTable( {

View File

@@ -1,66 +1,76 @@
@extends('adminlte::layouts.app')
@section('htmlheader_title')
Home
Reseller Home
@endsection
@section('contentheader_title')
{{ $o->full_name }}
@endsection
@section('page_title')
{{ $o->full_name }}
@endsection
@section('contentheader_description')
Home
Reseller Home
@endsection
@section('main-content')
<div class="row col-md-12">
@include('widgets.account_summary')
<div class="row">
@include('common.account.widget.summary')
</div>
<div class="col-md-12">
<ul class="nav nav-tabs">
<li class="active">
<a href="#services-tab" data-toggle="tab">Services</a>
</li>
<li>
<a href="#clients-tab" data-toggle="tab">Clients</a>
</li>
</ul>
<div class="row">
<div class="col-md-12">
<div class="card">
<div class="tab-content">
<div class="tab-pane active" id="services-tab">
<div class="row">
<div class="col-xs-7">
@include('widgets.services_active')
</div>
<div class="col-xs-5">
@include('widgets.invoices_due')
</div>
<div class="col-xs-5">
@include('widgets.payment_history')
<div class="card-header p-2">
<ul class="nav nav-pills">
<li class="nav-item"><a class="nav-link active" href="#tab-services" data-toggle="tab">Services</a></li>
<li class="nav-item"><a class="nav-link" href="#tab-clients" data-toggle="tab">Clients</a></li>
</ul>
</div>
<div class="card-body">
<div class="tab-content">
<div class="active tab-pane" id="tab-services">
<div class="row">
<div class="col-7">
@include('common.service.widget.active')
</div>
<div class="col-5">
@include('common.invoice.widget.due')
@include('common.payment.widget.history')
</div>
</div>
</div>
<div class="tab-pane" id="tab-clients">
<div class="row">
<div class="col-4">
@include('r.account.widget.list')
</div>
<div class="col-8">
@include('r.service.widget.movement')
</div>
{{--
<div class="col-xs-6">
@include('r.agents')
</div>
<div class="col-xs-6">
@include('r.service_inactive')
</div>
<div class="col-xs-6">
@include('r.clients')
</div>
--}}
</div>
</div>
</div>
</div>
</div>
<div class="tab-pane" id="clients-tab">
<div class="row">
<div class="col-xs-6">
@include('r.accounts')
</div>
<div class="col-xs-6">
@include('r.service_movements')
</div>
<div class="col-xs-6">
@include('r.agents')
</div>
<div class="col-xs-6">
@include('r.service_inactive')
</div>
{{--
<div class="col-xs-6">
@include('r.clients')
</div>
--}}
</div>
</div>
</div>
</div>

View File

@@ -1,17 +1,16 @@
<div class="box box-warning">
<div class="box-header">
<h3 class="box-title">Service Movements</h3>
<div class="box-tools pull-right">
<button type="button" class="btn btn-box-tool" data-widget="collapse" data-toggle="tooltip" title="Collapse">
<i class="fa fa-minus"></i></button>
<button type="button" class="btn btn-box-tool" data-widget="remove" data-toggle="tooltip" title="Remove">
<i class="fa fa-times"></i></button>
<div class="card card-warning card-outline">
<div class="card-header">
<h4 class="card-title">Service Movements</h4>
<div class="card-tools">
<button type="button" class="btn btn-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
<button type="button" class="btn btn-tool" data-widget="remove"><i class="fa fa-remove"></i></button>
</div>
</div>
<div class="box-body">
<div class="card-body">
@if ($user->all_client_service_movements()->count())
<table class="table table-bordered table-striped table-hover" id="service_movements" style="width: 100%;">
<table class="table table-striped table-hover" id="service_movements" style="width: 100%;">
<thead>
<tr>
<th>ID</th>
@@ -35,16 +34,15 @@
</div>
@section('page-scripts')
@css('https://cdn.datatables.net/responsive/2.2.1/css/responsive.dataTables.min.css')
@css('https://cdn.datatables.net/rowgroup/1.0.2/css/rowGroup.dataTables.min.css')
@js('https://cdn.datatables.net/responsive/2.2.1/js/dataTables.responsive.min.js')
@js('https://cdn.datatables.net/rowgroup/1.0.2/js/dataTables.rowGroup.min.js')
@css('https://cdn.datatables.net/1.10.19/css/jquery.dataTables.min.css','jq-dt-css','jquery');
@js('https://cdn.datatables.net/1.10.19/js/jquery.dataTables.min.js','jq-dt-js','jquery');
@css('https://cdn.datatables.net/responsive/2.2.1/css/responsive.dataTables.min.css','dt-responsive-css','jq-dt-css')
@js('https://cdn.datatables.net/responsive/2.2.1/js/dataTables.responsive.min.js','dt-responsive-js','jq-dt-js')
@css('https://cdn.datatables.net/rowgroup/1.0.2/css/rowGroup.dataTables.min.css','dt-rowgroup-css','jq-dt-css')
@js('https://cdn.datatables.net/rowgroup/1.0.2/js/dataTables.rowGroup.min.js','dt-rowgroup-js','jq-dt-js')
@css('/plugin/dataTables/dataTables.bootstrap4.css','dt-bootstrap4-css','jq-dt-css')
@js('/plugin/dataTables/dataTables.bootstrap4.js','dt-bootstrap4-js','jq-dt-js')
<style>
table.dataTable td {
outline: none;
}
</style>
<script type="text/javascript">
$(document).ready(function() {
$('#service_movements').DataTable( {

View File

@@ -1,31 +1,33 @@
@extends('adminlte::layouts.app')
@section('htmlheader_title')
Home
Client Home
@endsection
@section('contentheader_title')
{{ $o->full_name }}
@endsection
@section('page_title')
{{ $o->full_name }}
@endsection
@section('contentheader_description')
Home
Client Home
@endsection
@section('main-content')
<div class="content">
<div class="row">
@include('widgets.account_summary')
@include('common.account.widget.summary')
</div>
<div class="row">
<div class="col-xs-7">
@include('widgets.services_active')
<div class="col-7">
@include('common.service.widget.active')
</div>
<div class="col-xs-5">
@include('widgets.invoices_due')
</div>
<div class="col-xs-5">
@include('widgets.payment_history')
<div class="col-5">
@include('common.invoice.widget.due')
@include('common.payment.widget.history')
</div>
</div>
</div>

View File

@@ -3,60 +3,60 @@
<!--[if IE 9]> <html lang="en" class="ie9 no-js"> <![endif]-->
<!--[if !IE]><!--> <html lang="en"> <!--<![endif]-->
@section('htmlheader')
@include('layouts.partials.htmlheader')
@show
<!-- Body BEGIN -->
<body class="corporate">
<div class="wrapper">
@include('layouts.partials.mainheader')
@include('layouts.partials.sidebar')
<!-- Content Wrapper. Contains page content -->
<div class="content-wrapper">
@include('layouts.partials.contentheader')
<!-- Main content -->
<section class="content">
<!-- Your Page Content Here -->
<div class="main">
<div class="container">
@yield('breadcrumb')
<div class="row margin-bottom-40">
@yield('main-content')
</div>
</div>
</div>
</section><!-- /.content -->
</div><!-- /.content-wrapper -->
@include('layouts.partials.controlsidebar')
@include('layouts.partials.footer')
</div><!-- ./wrapper -->
@section('scripts')
{{-- BEGIN CORE PLUGINS (REQUIRED FOR ALL PAGES) --}}
@js('/site/js/jquery/1.11.2/js/jquery.min.js','jquery')
@js('/site/js/bootstrap/3.3.5/js/bootstrap.min.js','bootstrap-js','jquery')
@js('/site/js/jquery/plugins/migrate/1.2.1/js/jquery-migrate.min.js','jq-migrate','jquery')
@js('/site/js/jquery/plugins/back-to-top/back-to-top.js','back-to-top','jquery')
{{-- END CORE PLUGINS --}}
@include('layouts.partials.scripts')
{{-- Scripts --}}
{!! Asset::scripts() !!}
@yield('page-scripts')
@section('htmlheader')
@include('layouts.partials.htmlheader')
@show
</body>
<!-- BODY End-->
<body class="corporate">
<div id="app">
<div class="wrapper">
@include('layouts.partials.mainheader')
@include('layouts.partials.sidebar')
<!-- Content Wrapper. Contains page content -->
<div class="content-wrapper">
@include('layouts.partials.contentheader')
<!-- Main content -->
<section class="content">
<!-- Your Page Content Here -->
<div class="main">
<div class="container">
@yield('breadcrumb')
<div class="row margin-bottom-40">
@yield('main-content')
</div>
</div>
</div>
</section><!-- /.content -->
</div><!-- /.content-wrapper -->
@include('layouts.partials.controlsidebar')
@include('layouts.partials.footer')
</div><!-- ./wrapper -->
</div> <!-- ./app -->
@section('scripts')
{{-- BEGIN CORE PLUGINS (REQUIRED FOR ALL PAGES) --}}
@js('/site/js/jquery/1.11.2/js/jquery.min.js','jquery')
@js('/site/js/bootstrap/3.3.5/js/bootstrap.min.js','bootstrap-js','jquery')
@js('/site/js/jquery/plugins/migrate/1.2.1/js/jquery-migrate.min.js','jq-migrate','jquery')
@js('/site/js/jquery/plugins/back-to-top/back-to-top.js','back-to-top','jquery')
{{-- END CORE PLUGINS --}}
{{-- Scripts --}}
{!! Asset::scripts() !!}
@include('layouts.partials.scripts')
@yield('page-scripts')
@show
</body>
</html>

View File

@@ -1,13 +1,11 @@
<head>
<meta charset="UTF-8">
<title>{{ config('app.name') }} - {{ $so->site_name }}</title>
<meta content="width=device-width, initial-scale=1.0" name="viewport" />
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
<title>{{ config('app.name') }} - @yield('htmlheader_title', 'Your title here')</title>
<meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
<!-- CSRF Token -->
<meta name="csrf-token" content="{{ csrf_token() }}">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
<meta property="og:site_name" content="{{ config('app.name') }}" />
<meta property="og:title" content="{{ $so->site_name }}" />
<meta property="og:description" content="{{ $so->site_description }}" />
@@ -17,22 +15,21 @@
<link rel="shortcut icon" href="{{ object_get($so,'favicon','favicon.ico') }}" />
{{-- Fonts START --}}
<link href="//fonts.googleapis.com/css?family=Open+Sans:300,400,600,700|PT+Sans+Narrow|Source+Sans+Pro:200,300,400,600,700,900&amp;subset=all" rel="stylesheet" type="text/css">
{{-- Fonts END --}}
@css('/assets/font-awesome/css/font-awesome.min.css')
@css('/site/js/bootstrap/3.3.5/css/bootstrap.min.css')
{{-- Theme styles START --}}
<!-- Font Awesome Icons -->
@css('/plugin/font-awesome/css/font-awesome.min.css','font-awesome','app')
<!-- Theme style -->
@css('/site/css/components.css')
@css('/site/css/slider.css')
@css('/site/css/style.css')
@css('/site/css/style-responsive.css')
@css('/site/css/themes/blue.css')
@css('/site/css/custom.css')
{{-- Theme styles END --}}
<!-- Google Font: Source Sans Pro -->
<link href="//fonts.googleapis.com/css?family=Open+Sans:300,400,600,700|PT+Sans+Narrow|Source+Sans+Pro:200,300,400,600,700,900&amp;subset=all" rel="stylesheet" type="text/css">
@css('/site/js/bootstrap/3.3.5/css/bootstrap.min.css')
{{-- Styles --}}
<!-- STYLESHEETS -->
{!! Asset::styles() !!}
</head>

View File

@@ -62,8 +62,8 @@
<div class="input-group">
<input type="text" placeholder="Search" class="form-control">
<span class="input-group-btn">
<button class="btn btn-primary" type="submit">Search</button>
</span>
<button class="btn btn-primary" type="submit">Search</button>
</span>
</div>
</form>
</div>

View File

@@ -1,2 +1,10 @@
<!-- Compiled app javascript -->
{{-- <script src="{{ url (mix('/js/app.js')) }}"></script> --}}
<!-- REQUIRED JS SCRIPTS -->
<script type="text/javascript">
// Our CSRF token to each interaction
$.ajaxSetup({
headers: {
'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
}
});
</script>

View File

@@ -271,7 +271,7 @@
@endsection
@section('page-scripts')
@js('/js/jqBootstrapValidation.js','jq-validation','jquery')
@js('/plugin/jqBootstrapValidation/jqBootstrapValidation.js','jq-validation','jquery')
<script src="//code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
<script>

View File

@@ -76,8 +76,7 @@
</body>
@endsection
@section('scripts')
@section('page-scripts')
<script type="text/javascript">
jQuery(document).ready(function() {
Layout.init();

View File

@@ -1,15 +1,29 @@
<ul class="sidebar-menu" data-widget="tree">
<li class="header"><b>MENU</b></li>
<!-- Optionally, you can add icons to the links -->
<li @if(Route::current()->getName() == 'home')class="active"@endif><a href="{{ url('home') }}"><i class='fa fa-link'></i> <span>{{ trans('adminlte_lang::message.home') }}</span></a></li>
<li class="@if(Route::current()->getName() == 'order') active @endif treeview">
<a href="#">
<i class='fa fa-shopping-cart'></i> <span>Order</span>
<span class="pull-right-container"><i class="fa fa-angle-left pull-right"></i></span>
</a>
<ul class="treeview-menu">
<li><a href="{{ url('order') }}"><i class="fa fa-circle-o"></i> New Order</a></li>
{{-- <li><a href="{{ url('u/order/rejected') }}"><i class="fa fa-circle-o"></i> Rejected Orders</a></li> --}}
</ul>
</li>
</ul>
<li class="nav-header">MAIN</li>
<li class="nav-item">
<a href="{{ url('home') }}" class="nav-link @if(preg_match('#^event/summary#',Route::current()->uri())) active @endif">
<i class="nav-icon fa fa-link"></i>
<p>
{{ trans('adminlte_lang::message.home') }}
</p>
</a>
</li>
<li class="nav-item has-treeview @if(preg_match('#^order/#',Route::current()->uri())) menu-open @endif">
<a href="#" class="nav-link @if(preg_match('#^order/#',Route::current()->uri())) active @endif">
<i class="nav-icon fa fa-tree"></i>
<p>
Orders
<i class="fa fa-angle-left right"></i>
</p>
</a>
<ul class="nav nav-treeview">
<li class="nav-item">
<a href="{{ url('order') }}" class="nav-link @if(Route::current()->uri() == 'group/add') active @endif">
<i class="fa fa-circle-o nav-icon"></i>
<p>New Order</p>
</a>
</li>
</ul>
</li>