diff --git a/.gitignore b/.gitignore
index 5f181bc8..187b2020 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,5 +5,6 @@ textures/*
node_modules/*
resources/cache/*
resources/assets/bower_components/*
-assets/dist/*
+assets/css/*
+assets/js/*
koala-config.json
diff --git a/config/app.php b/config/app.php
index 01e288e4..1d2a261b 100644
--- a/config/app.php
+++ b/config/app.php
@@ -1,6 +1,15 @@
'3.1',
/*
|--------------------------------------------------------------------------
@@ -52,7 +61,7 @@ return [
|
*/
- 'timezone' => 'UTC',
+ 'timezone' => 'Asia/Shanghai',
/*
|--------------------------------------------------------------------------
@@ -151,6 +160,7 @@ return [
/*
* Application Service Providers...
*/
+ App\Providers\BootServiceProvider::class,
App\Providers\AppServiceProvider::class,
App\Providers\EventServiceProvider::class,
App\Providers\RouteServiceProvider::class,
diff --git a/gulpfile.js b/gulpfile.js
index a5a6d9d3..60732a5d 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -2,7 +2,7 @@
* @Author: prpr
* @Date: 2016-07-21 13:38:26
* @Last Modified by: printempw
-* @Last Modified time: 2016-08-28 11:44:15
+* @Last Modified time: 2016-08-28 18:29:06
*/
var gulp = require('gulp'),
@@ -10,6 +10,7 @@ var gulp = require('gulp'),
uglify = require('gulp-uglify'),
sass = require('gulp-sass'),
cleanCss = require('gulp-clean-css'),
+ del = require('del'),
zip = require('gulp-zip');
require('laravel-elixir-replace');
@@ -46,26 +47,25 @@ var replacements = [
elixir(function(mix) {
mix
- .scripts(vendor_js.concat(
- 'resources/assets/src/js/utils.js'
- ), 'assets/js/app.min.js', './')
+ .scripts(vendor_js.concat([
+ 'resources/assets/js/utils.js'
+ ]), 'assets/js/app.min.js', './')
.styles(vendor_css, 'assets/css/app.min.css', './')
-
.replace('assets/css/app.min.css', replacements)
+ // copy fonts & images
.copy([
'resources/assets/bower_components/bootstrap/dist/fonts/**',
'resources/assets/bower_components/font-awesome/fonts/**'
], 'assets/fonts/')
-
.copy([
'resources/assets/bower_components/iCheck/skins/square/blue.png',
'resources/assets/bower_components/iCheck/skins/square/blue@2x.png'
], 'assets/images/')
.task('sass')
- .task('scripts')
+ .task('uglify');
});
// compile sass
@@ -76,7 +76,7 @@ gulp.task('sass', function () {
.pipe(gulp.dest('./assets/css'));
});
-gulp.task('scripts', function() {
+gulp.task('uglify', function() {
gulp.src('resources/assets/js/*.js')
.pipe(uglify())
.pipe(gulp.dest('./assets/js'));
@@ -84,6 +84,14 @@ gulp.task('scripts', function() {
// release
gulp.task('zip', function() {
+ // delete cache files
+ del([
+ 'storage/logs/*',
+ 'storage/framework/cache/*',
+ 'storage/framework/sessions/*',
+ 'storage/framework/views/*'
+ ]);
+
return gulp.src([
'**/*.*',
'LICENSE',
@@ -95,16 +103,19 @@ gulp.task('zip', function() {
'!.gitignore',
'!.git/**/*.*',
'!.git/',
+ '!artisan',
'!koala-config.json',
'!gulpfile.js',
'!package.json',
'!composer.json',
'!composer.lock',
'!bower.json',
- '!assets/bower_components/**/*.*',
- '!assets/src/**/*.*',
+ '!resources/assets/**/*.*',
'!.sass-cache/**/*.*',
- '!.sass-cache/'
+ '!.sass-cache/',
+ '!storage/logs/*.*',
+ // do not pack vendor since laravel contains huge dependencies
+ '!vendor/**/*.*'
], { dot: true })
.pipe(zip('blessing-skin-server-v'+version+'.zip'))
.pipe(gulp.dest('../'));
diff --git a/resources/assets/sass/style.scss b/resources/assets/sass/style.scss
index a13a9863..f7e4879f 100644
--- a/resources/assets/sass/style.scss
+++ b/resources/assets/sass/style.scss
@@ -2,24 +2,24 @@
* @Author: printempw
* @Date: 2016-06-04 20:55:09
* @Last Modified by: printempw
- * @Last Modified time: 2016-08-14 12:58:39
+ * @Last Modified time: 2016-08-28 13:32:56
*/
$font_stack: Ubuntu, 'Segoe UI', 'Microsoft Yahei', 'Microsoft Jhenghei', sans-serif;
@font-face {
font-family: 'Ubuntu';
- src: url('../../fonts/ubuntu.woff2') format('woff2');
+ src: url('../fonts/ubuntu.woff2') format('woff2');
}
@font-face {
font-family: 'Minecraft';
- src: url('../../fonts/minecraft.eot');
- src: url('../../fonts/minecraft.eot') format('embedded-opentype'),
- url('../../fonts/minecraft.woff2') format('woff2'),
- url('../../fonts/minecraft.woff') format('woff'),
- url('../../fonts/minecraft.ttf') format('truetype'),
- url('../../fonts/minecraft.svg#minecraft') format('svg');
+ src: url('../fonts/minecraft.eot');
+ src: url('../fonts/minecraft.eot') format('embedded-opentype'),
+ url('../fonts/minecraft.woff2') format('woff2'),
+ url('../fonts/minecraft.woff') format('woff'),
+ url('../fonts/minecraft.ttf') format('truetype'),
+ url('../fonts/minecraft.svg#minecraft') format('svg');
}
body, h1, h2, h3, h4, h5, h6, .logo {
diff --git a/resources/views/admin/master.tpl b/resources/views/admin/master.tpl
index 03c7d1ea..2240dd26 100644
--- a/resources/views/admin/master.tpl
+++ b/resources/views/admin/master.tpl
@@ -8,11 +8,11 @@
-
+
-
+
@yield('style')
@@ -127,9 +127,9 @@
-
+
-
+
@if (Option::get('check_update') == '1')
+
-
+
@if (Session::has('msg'))
+
diff --git a/resources/views/setup/master.tpl b/resources/views/setup/master.tpl
index 3879e6d7..cefb4b4b 100644
--- a/resources/views/setup/master.tpl
+++ b/resources/views/setup/master.tpl
@@ -6,7 +6,7 @@