From 9642c1c9b0d84bc43c2b00fbec12d102dde9a460 Mon Sep 17 00:00:00 2001
From: printempw <h@prinzeugen.net>
Date: Wed, 14 Sep 2016 22:44:30 +0800
Subject: [PATCH] move assets to resources directory

---
 .bowerrc                                      |   2 +-
 .gitignore                                    |   5 +-
 app/helpers.php                               |   8 +-
 assets/js/.gitignore                          |   3 -
 gulpfile.js                                   |  74 +++++++++---------
 {assets/css => resources/dist}/.gitignore     |   0
 {assets => resources}/fonts/FontAwesome.otf   | Bin
 .../fonts/fontawesome-webfont.eot             | Bin
 .../fonts/fontawesome-webfont.svg             |   0
 .../fonts/fontawesome-webfont.ttf             | Bin
 .../fonts/fontawesome-webfont.woff            | Bin
 .../fonts/fontawesome-webfont.woff2           | Bin
 .../fonts/glyphicons-halflings-regular.eot    | Bin
 .../fonts/glyphicons-halflings-regular.svg    |   0
 .../fonts/glyphicons-halflings-regular.ttf    | Bin
 .../fonts/glyphicons-halflings-regular.woff   | Bin
 .../fonts/glyphicons-halflings-regular.woff2  | Bin
 {assets => resources}/fonts/minecraft.eot     | Bin
 {assets => resources}/fonts/minecraft.svg     |   0
 {assets => resources}/fonts/minecraft.ttf     | Bin
 {assets => resources}/fonts/minecraft.woff    | Bin
 {assets => resources}/fonts/minecraft.woff2   | Bin
 {assets => resources}/fonts/ubuntu.woff2      | Bin
 {assets => resources}/images/bg.jpg           | Bin
 {assets => resources}/images/blue.png         | Bin
 {assets => resources}/images/blue@2x.png      | Bin
 {assets => resources}/images/favicon.ico      | Bin
 {assets => resources}/images/loading-sm.gif   | Bin
 {assets => resources}/images/loading.gif      | Bin
 resources/{assets => src}/js/admin.js         |   0
 resources/{assets => src}/js/auth.js          |   0
 resources/{assets => src}/js/skinlib.js       |   0
 resources/{assets => src}/js/user.js          |   0
 resources/{assets => src}/js/utils.js         |   0
 resources/{assets => src}/sass/admin.scss     |   0
 resources/{assets => src}/sass/auth.scss      |   0
 resources/{assets => src}/sass/index.scss     |   0
 resources/{assets => src}/sass/install.scss   |   0
 resources/{assets => src}/sass/skinlib.scss   |   0
 resources/{assets => src}/sass/style.scss     |  16 ++--
 resources/{assets => src}/sass/user.scss      |   0
 .../vendor}/highlight/LICENSE                 |   0
 .../vendor}/highlight/README.md               |   0
 .../vendor}/highlight/highlight.min.js        |   0
 .../highlight/styles/arduino-light.css        |   0
 .../vendor}/skin-preview/three.min.js         |   0
 .../vendor}/skin-preview/three.msp.js         |   0
 .../vendor}/skins/_all-skins.css              |   0
 .../vendor}/skins/_all-skins.min.css          |   0
 .../vendor}/skins/skin-black-light.css        |   0
 .../vendor}/skins/skin-black-light.min.css    |   0
 .../vendor}/skins/skin-black.css              |   0
 .../vendor}/skins/skin-black.min.css          |   0
 .../vendor}/skins/skin-blue-light.css         |   0
 .../vendor}/skins/skin-blue-light.min.css     |   0
 .../vendor}/skins/skin-blue.css               |   0
 .../vendor}/skins/skin-blue.min.css           |   0
 .../vendor}/skins/skin-green-light.css        |   0
 .../vendor}/skins/skin-green-light.min.css    |   0
 .../vendor}/skins/skin-green.css              |   0
 .../vendor}/skins/skin-green.min.css          |   0
 .../vendor}/skins/skin-purple-light.css       |   0
 .../vendor}/skins/skin-purple-light.min.css   |   0
 .../vendor}/skins/skin-purple.css             |   0
 .../vendor}/skins/skin-purple.min.css         |   0
 .../vendor}/skins/skin-red-light.css          |   0
 .../vendor}/skins/skin-red-light.min.css      |   0
 .../vendor}/skins/skin-red.css                |   0
 .../vendor}/skins/skin-red.min.css            |   0
 .../vendor}/skins/skin-yellow-light.css       |   0
 .../vendor}/skins/skin-yellow-light.min.css   |   0
 .../vendor}/skins/skin-yellow.css             |   0
 .../vendor}/skins/skin-yellow.min.css         |   0
 resources/views/admin/customize.tpl           |   2 +-
 resources/views/admin/master.tpl              |   2 +-
 resources/views/auth/master.tpl               |   2 +-
 resources/views/index.tpl                     |   2 +-
 resources/views/skinlib/master.tpl            |   2 +-
 resources/views/skinlib/show.tpl              |   4 +-
 resources/views/skinlib/upload.tpl            |   4 +-
 resources/views/user/closet.tpl               |   4 +-
 resources/views/user/config.tpl               |   4 +-
 resources/views/user/master.tpl               |   2 +-
 resources/views/user/player.tpl               |   4 +-
 84 files changed, 71 insertions(+), 69 deletions(-)
 delete mode 100644 assets/js/.gitignore
 rename {assets/css => resources/dist}/.gitignore (100%)
 rename {assets => resources}/fonts/FontAwesome.otf (100%)
 rename {assets => resources}/fonts/fontawesome-webfont.eot (100%)
 rename {assets => resources}/fonts/fontawesome-webfont.svg (100%)
 rename {assets => resources}/fonts/fontawesome-webfont.ttf (100%)
 rename {assets => resources}/fonts/fontawesome-webfont.woff (100%)
 rename {assets => resources}/fonts/fontawesome-webfont.woff2 (100%)
 rename {assets => resources}/fonts/glyphicons-halflings-regular.eot (100%)
 rename {assets => resources}/fonts/glyphicons-halflings-regular.svg (100%)
 rename {assets => resources}/fonts/glyphicons-halflings-regular.ttf (100%)
 rename {assets => resources}/fonts/glyphicons-halflings-regular.woff (100%)
 rename {assets => resources}/fonts/glyphicons-halflings-regular.woff2 (100%)
 rename {assets => resources}/fonts/minecraft.eot (100%)
 rename {assets => resources}/fonts/minecraft.svg (100%)
 rename {assets => resources}/fonts/minecraft.ttf (100%)
 rename {assets => resources}/fonts/minecraft.woff (100%)
 rename {assets => resources}/fonts/minecraft.woff2 (100%)
 rename {assets => resources}/fonts/ubuntu.woff2 (100%)
 rename {assets => resources}/images/bg.jpg (100%)
 rename {assets => resources}/images/blue.png (100%)
 rename {assets => resources}/images/blue@2x.png (100%)
 rename {assets => resources}/images/favicon.ico (100%)
 rename {assets => resources}/images/loading-sm.gif (100%)
 rename {assets => resources}/images/loading.gif (100%)
 rename resources/{assets => src}/js/admin.js (100%)
 rename resources/{assets => src}/js/auth.js (100%)
 rename resources/{assets => src}/js/skinlib.js (100%)
 rename resources/{assets => src}/js/user.js (100%)
 rename resources/{assets => src}/js/utils.js (100%)
 rename resources/{assets => src}/sass/admin.scss (100%)
 rename resources/{assets => src}/sass/auth.scss (100%)
 rename resources/{assets => src}/sass/index.scss (100%)
 rename resources/{assets => src}/sass/install.scss (100%)
 rename resources/{assets => src}/sass/skinlib.scss (100%)
 rename resources/{assets => src}/sass/style.scss (86%)
 rename resources/{assets => src}/sass/user.scss (100%)
 rename {assets/libs => resources/vendor}/highlight/LICENSE (100%)
 rename {assets/libs => resources/vendor}/highlight/README.md (100%)
 rename {assets/libs => resources/vendor}/highlight/highlight.min.js (100%)
 rename {assets/libs => resources/vendor}/highlight/styles/arduino-light.css (100%)
 rename {assets/libs => resources/vendor}/skin-preview/three.min.js (100%)
 rename {assets/libs => resources/vendor}/skin-preview/three.msp.js (100%)
 rename {assets/libs => resources/vendor}/skins/_all-skins.css (100%)
 rename {assets/libs => resources/vendor}/skins/_all-skins.min.css (100%)
 rename {assets/libs => resources/vendor}/skins/skin-black-light.css (100%)
 rename {assets/libs => resources/vendor}/skins/skin-black-light.min.css (100%)
 rename {assets/libs => resources/vendor}/skins/skin-black.css (100%)
 rename {assets/libs => resources/vendor}/skins/skin-black.min.css (100%)
 rename {assets/libs => resources/vendor}/skins/skin-blue-light.css (100%)
 rename {assets/libs => resources/vendor}/skins/skin-blue-light.min.css (100%)
 rename {assets/libs => resources/vendor}/skins/skin-blue.css (100%)
 rename {assets/libs => resources/vendor}/skins/skin-blue.min.css (100%)
 rename {assets/libs => resources/vendor}/skins/skin-green-light.css (100%)
 rename {assets/libs => resources/vendor}/skins/skin-green-light.min.css (100%)
 rename {assets/libs => resources/vendor}/skins/skin-green.css (100%)
 rename {assets/libs => resources/vendor}/skins/skin-green.min.css (100%)
 rename {assets/libs => resources/vendor}/skins/skin-purple-light.css (100%)
 rename {assets/libs => resources/vendor}/skins/skin-purple-light.min.css (100%)
 rename {assets/libs => resources/vendor}/skins/skin-purple.css (100%)
 rename {assets/libs => resources/vendor}/skins/skin-purple.min.css (100%)
 rename {assets/libs => resources/vendor}/skins/skin-red-light.css (100%)
 rename {assets/libs => resources/vendor}/skins/skin-red-light.min.css (100%)
 rename {assets/libs => resources/vendor}/skins/skin-red.css (100%)
 rename {assets/libs => resources/vendor}/skins/skin-red.min.css (100%)
 rename {assets/libs => resources/vendor}/skins/skin-yellow-light.css (100%)
 rename {assets/libs => resources/vendor}/skins/skin-yellow-light.min.css (100%)
 rename {assets/libs => resources/vendor}/skins/skin-yellow.css (100%)
 rename {assets/libs => resources/vendor}/skins/skin-yellow.min.css (100%)

diff --git a/.bowerrc b/.bowerrc
index ae1b0707..e211daf1 100644
--- a/.bowerrc
+++ b/.bowerrc
@@ -1,3 +1,3 @@
 {
-  "directory": "resources/assets/bower_components"
+  "directory": "resources/src/bower_components"
 }
diff --git a/.gitignore b/.gitignore
index f7191068..edf4fd82 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,8 +3,5 @@
 vendor/*
 storage/textures/*
 node_modules/*
-resources/cache/*
-resources/assets/bower_components/*
-assets/css/*
-assets/js/*
+resources/src/bower_components/*
 koala-config.json
diff --git a/app/helpers.php b/app/helpers.php
index 14aa5fbd..fb383a22 100644
--- a/app/helpers.php
+++ b/app/helpers.php
@@ -1,5 +1,7 @@
 <?php
 
+use Illuminate\Support\Str;
+
 if (! function_exists('get_real_ip')) {
 
     function get_real_ip()
@@ -54,7 +56,11 @@ if (! function_exists('assets')) {
     function assets($relative_uri)
     {
         // add query string to fresh cache
-        return url("assets/$relative_uri")."?v=".config('app.version');
+        if (Str::startsWith($relative_uri, 'css') || Str::startsWith($relative_uri, 'js')) {
+            return url("resources/dist/$relative_uri")."?v=".config('app.version');
+        } else {
+            return url("resources/$relative_uri");
+        }
     }
 }
 
diff --git a/assets/js/.gitignore b/assets/js/.gitignore
deleted file mode 100644
index 8f4803c0..00000000
--- a/assets/js/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*
-!public/
-!.gitignore
diff --git a/gulpfile.js b/gulpfile.js
index 9c8c9f33..8d57c09f 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-09-03 21:38:43
+* @Last Modified time: 2016-09-14 22:36:51
 */
 
 var gulp     = require('gulp'),
@@ -15,58 +15,60 @@ var gulp     = require('gulp'),
 
 require('laravel-elixir-replace');
 
+var path = require('path');
 var version  = require('./package.json').version;
 
 var vendor_js = [
-    'resources/assets/bower_components/jquery/dist/jquery.min.js',
-    'resources/assets/bower_components/bootstrap/dist/js/bootstrap.min.js',
-    'resources/assets/bower_components/AdminLTE/dist/js/app.min.js',
-    'resources/assets/bower_components/bootstrap-fileinput/js/fileinput.min.js',
-    'resources/assets/bower_components/bootstrap-fileinput/js/locales/zh.js',
-    'resources/assets/bower_components/iCheck/icheck.min.js',
-    'resources/assets/bower_components/toastr/toastr.min.js',
-    'resources/assets/bower_components/sweetalert2/dist/sweetalert2.min.js',
-    'resources/assets/bower_components/es6-promise/es6-promise.min.js'
+    'resources/src/bower_components/jquery/dist/jquery.min.js',
+    'resources/src/bower_components/bootstrap/dist/js/bootstrap.min.js',
+    'resources/src/bower_components/AdminLTE/dist/js/app.min.js',
+    'resources/src/bower_components/bootstrap-fileinput/js/fileinput.min.js',
+    'resources/src/bower_components/bootstrap-fileinput/js/locales/zh.js',
+    'resources/src/bower_components/iCheck/icheck.min.js',
+    'resources/src/bower_components/toastr/toastr.min.js',
+    'resources/src/bower_components/sweetalert2/dist/sweetalert2.min.js',
+    'resources/src/bower_components/es6-promise/es6-promise.min.js'
 ];
 
 var vendor_css = [
-    'resources/assets/bower_components/bootstrap/dist/css/bootstrap.min.css',
-    'resources/assets/bower_components/AdminLTE/dist/css/AdminLTE.min.css',
-    'resources/assets/bower_components/bootstrap-fileinput/css/fileinput.min.css',
-    'resources/assets/bower_components/font-awesome/css/font-awesome.min.css',
-    'resources/assets/bower_components/iCheck/skins/square/blue.css',
-    'resources/assets/bower_components/toastr/toastr.min.css',
-    'resources/assets/bower_components/sweetalert2/dist/sweetalert2.min.css'
+    'resources/src/bower_components/bootstrap/dist/css/bootstrap.min.css',
+    'resources/src/bower_components/AdminLTE/dist/css/AdminLTE.min.css',
+    'resources/src/bower_components/bootstrap-fileinput/css/fileinput.min.css',
+    'resources/src/bower_components/font-awesome/css/font-awesome.min.css',
+    'resources/src/bower_components/iCheck/skins/square/blue.css',
+    'resources/src/bower_components/toastr/toastr.min.css',
+    'resources/src/bower_components/sweetalert2/dist/sweetalert2.min.css'
 ];
 
 var replacements = [
     ['@import url(https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,700,300italic,400italic,600italic);', ''],
-    ['blue.png', '"../images/blue.png"'],
-    ['blue@2x.png', '"../images/blue@2x.png"'],
-    ['../img/loading.gif', '"../images/loading.gif"'],
-    ['../img/loading-sm.gif', '"../images/loading-sm.gif"']
+    ['../fonts/fontawesome', '../../fonts/fontawesome'],
+    ['blue.png', '"../../images/blue.png"'],
+    ['blue@2x.png', '"../../images/blue@2x.png"'],
+    ['../img/loading.gif', '"../../images/loading.gif"'],
+    ['../img/loading-sm.gif', '"../../images/loading-sm.gif"']
 ];
 
 elixir(function(mix) {
     mix
         .scripts(vendor_js.concat([
             'resources/assets/js/utils.js'
-        ]), 'assets/js/app.min.js', './')
+        ]), 'resources/dist/js/app.min.js', './')
 
-        .styles(vendor_css, 'assets/css/app.min.css', './')
-        .replace('assets/css/app.min.css', replacements)
+        .styles(vendor_css, 'resources/dist/css/app.min.css', './')
+        .replace('resources/dist/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/')
+            'resources/src/bower_components/bootstrap/dist/fonts/**',
+            'resources/src/bower_components/font-awesome/fonts/**'
+        ], 'resources/fonts/')
         .copy([
-            'resources/assets/bower_components/iCheck/skins/square/blue.png',
-            'resources/assets/bower_components/iCheck/skins/square/blue@2x.png',
-            'resources/assets/bower_components/bootstrap-fileinput/img/loading.gif',
-            'resources/assets/bower_components/bootstrap-fileinput/img/loading-sm.gif'
-        ], 'assets/images/')
+            'resources/src/bower_components/iCheck/skins/square/blue.png',
+            'resources/src/bower_components/iCheck/skins/square/blue@2x.png',
+            'resources/src/bower_components/bootstrap-fileinput/img/loading.gif',
+            'resources/src/bower_components/bootstrap-fileinput/img/loading-sm.gif'
+        ], 'resources/images/')
 
         .task('sass')
         .task('uglify');
@@ -74,16 +76,16 @@ elixir(function(mix) {
 
 // compile sass
 gulp.task('sass', function () {
-    gulp.src('resources/assets/sass/*.scss')
+    gulp.src('resources/src/sass/*.scss')
         .pipe(sass().on('error', sass.logError))
         .pipe(cleanCss())
-        .pipe(gulp.dest('./assets/css'));
+        .pipe(gulp.dest('./resources/dist/css'));
 });
 
 gulp.task('uglify', function() {
-    gulp.src('resources/assets/js/*.js')
+    gulp.src('resources/src/js/*.js')
         .pipe(uglify())
-        .pipe(gulp.dest('./assets/js'));
+        .pipe(gulp.dest('./resources/dist/js'));
 });
 
 // release
diff --git a/assets/css/.gitignore b/resources/dist/.gitignore
similarity index 100%
rename from assets/css/.gitignore
rename to resources/dist/.gitignore
diff --git a/assets/fonts/FontAwesome.otf b/resources/fonts/FontAwesome.otf
similarity index 100%
rename from assets/fonts/FontAwesome.otf
rename to resources/fonts/FontAwesome.otf
diff --git a/assets/fonts/fontawesome-webfont.eot b/resources/fonts/fontawesome-webfont.eot
similarity index 100%
rename from assets/fonts/fontawesome-webfont.eot
rename to resources/fonts/fontawesome-webfont.eot
diff --git a/assets/fonts/fontawesome-webfont.svg b/resources/fonts/fontawesome-webfont.svg
similarity index 100%
rename from assets/fonts/fontawesome-webfont.svg
rename to resources/fonts/fontawesome-webfont.svg
diff --git a/assets/fonts/fontawesome-webfont.ttf b/resources/fonts/fontawesome-webfont.ttf
similarity index 100%
rename from assets/fonts/fontawesome-webfont.ttf
rename to resources/fonts/fontawesome-webfont.ttf
diff --git a/assets/fonts/fontawesome-webfont.woff b/resources/fonts/fontawesome-webfont.woff
similarity index 100%
rename from assets/fonts/fontawesome-webfont.woff
rename to resources/fonts/fontawesome-webfont.woff
diff --git a/assets/fonts/fontawesome-webfont.woff2 b/resources/fonts/fontawesome-webfont.woff2
similarity index 100%
rename from assets/fonts/fontawesome-webfont.woff2
rename to resources/fonts/fontawesome-webfont.woff2
diff --git a/assets/fonts/glyphicons-halflings-regular.eot b/resources/fonts/glyphicons-halflings-regular.eot
similarity index 100%
rename from assets/fonts/glyphicons-halflings-regular.eot
rename to resources/fonts/glyphicons-halflings-regular.eot
diff --git a/assets/fonts/glyphicons-halflings-regular.svg b/resources/fonts/glyphicons-halflings-regular.svg
similarity index 100%
rename from assets/fonts/glyphicons-halflings-regular.svg
rename to resources/fonts/glyphicons-halflings-regular.svg
diff --git a/assets/fonts/glyphicons-halflings-regular.ttf b/resources/fonts/glyphicons-halflings-regular.ttf
similarity index 100%
rename from assets/fonts/glyphicons-halflings-regular.ttf
rename to resources/fonts/glyphicons-halflings-regular.ttf
diff --git a/assets/fonts/glyphicons-halflings-regular.woff b/resources/fonts/glyphicons-halflings-regular.woff
similarity index 100%
rename from assets/fonts/glyphicons-halflings-regular.woff
rename to resources/fonts/glyphicons-halflings-regular.woff
diff --git a/assets/fonts/glyphicons-halflings-regular.woff2 b/resources/fonts/glyphicons-halflings-regular.woff2
similarity index 100%
rename from assets/fonts/glyphicons-halflings-regular.woff2
rename to resources/fonts/glyphicons-halflings-regular.woff2
diff --git a/assets/fonts/minecraft.eot b/resources/fonts/minecraft.eot
similarity index 100%
rename from assets/fonts/minecraft.eot
rename to resources/fonts/minecraft.eot
diff --git a/assets/fonts/minecraft.svg b/resources/fonts/minecraft.svg
similarity index 100%
rename from assets/fonts/minecraft.svg
rename to resources/fonts/minecraft.svg
diff --git a/assets/fonts/minecraft.ttf b/resources/fonts/minecraft.ttf
similarity index 100%
rename from assets/fonts/minecraft.ttf
rename to resources/fonts/minecraft.ttf
diff --git a/assets/fonts/minecraft.woff b/resources/fonts/minecraft.woff
similarity index 100%
rename from assets/fonts/minecraft.woff
rename to resources/fonts/minecraft.woff
diff --git a/assets/fonts/minecraft.woff2 b/resources/fonts/minecraft.woff2
similarity index 100%
rename from assets/fonts/minecraft.woff2
rename to resources/fonts/minecraft.woff2
diff --git a/assets/fonts/ubuntu.woff2 b/resources/fonts/ubuntu.woff2
similarity index 100%
rename from assets/fonts/ubuntu.woff2
rename to resources/fonts/ubuntu.woff2
diff --git a/assets/images/bg.jpg b/resources/images/bg.jpg
similarity index 100%
rename from assets/images/bg.jpg
rename to resources/images/bg.jpg
diff --git a/assets/images/blue.png b/resources/images/blue.png
similarity index 100%
rename from assets/images/blue.png
rename to resources/images/blue.png
diff --git a/assets/images/blue@2x.png b/resources/images/blue@2x.png
similarity index 100%
rename from assets/images/blue@2x.png
rename to resources/images/blue@2x.png
diff --git a/assets/images/favicon.ico b/resources/images/favicon.ico
similarity index 100%
rename from assets/images/favicon.ico
rename to resources/images/favicon.ico
diff --git a/assets/images/loading-sm.gif b/resources/images/loading-sm.gif
similarity index 100%
rename from assets/images/loading-sm.gif
rename to resources/images/loading-sm.gif
diff --git a/assets/images/loading.gif b/resources/images/loading.gif
similarity index 100%
rename from assets/images/loading.gif
rename to resources/images/loading.gif
diff --git a/resources/assets/js/admin.js b/resources/src/js/admin.js
similarity index 100%
rename from resources/assets/js/admin.js
rename to resources/src/js/admin.js
diff --git a/resources/assets/js/auth.js b/resources/src/js/auth.js
similarity index 100%
rename from resources/assets/js/auth.js
rename to resources/src/js/auth.js
diff --git a/resources/assets/js/skinlib.js b/resources/src/js/skinlib.js
similarity index 100%
rename from resources/assets/js/skinlib.js
rename to resources/src/js/skinlib.js
diff --git a/resources/assets/js/user.js b/resources/src/js/user.js
similarity index 100%
rename from resources/assets/js/user.js
rename to resources/src/js/user.js
diff --git a/resources/assets/js/utils.js b/resources/src/js/utils.js
similarity index 100%
rename from resources/assets/js/utils.js
rename to resources/src/js/utils.js
diff --git a/resources/assets/sass/admin.scss b/resources/src/sass/admin.scss
similarity index 100%
rename from resources/assets/sass/admin.scss
rename to resources/src/sass/admin.scss
diff --git a/resources/assets/sass/auth.scss b/resources/src/sass/auth.scss
similarity index 100%
rename from resources/assets/sass/auth.scss
rename to resources/src/sass/auth.scss
diff --git a/resources/assets/sass/index.scss b/resources/src/sass/index.scss
similarity index 100%
rename from resources/assets/sass/index.scss
rename to resources/src/sass/index.scss
diff --git a/resources/assets/sass/install.scss b/resources/src/sass/install.scss
similarity index 100%
rename from resources/assets/sass/install.scss
rename to resources/src/sass/install.scss
diff --git a/resources/assets/sass/skinlib.scss b/resources/src/sass/skinlib.scss
similarity index 100%
rename from resources/assets/sass/skinlib.scss
rename to resources/src/sass/skinlib.scss
diff --git a/resources/assets/sass/style.scss b/resources/src/sass/style.scss
similarity index 86%
rename from resources/assets/sass/style.scss
rename to resources/src/sass/style.scss
index f7e4879f..46430a51 100644
--- a/resources/assets/sass/style.scss
+++ b/resources/src/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-28 13:32:56
+ * @Last Modified time: 2016-09-14 22:35:45
  */
 
 $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/assets/sass/user.scss b/resources/src/sass/user.scss
similarity index 100%
rename from resources/assets/sass/user.scss
rename to resources/src/sass/user.scss
diff --git a/assets/libs/highlight/LICENSE b/resources/vendor/highlight/LICENSE
similarity index 100%
rename from assets/libs/highlight/LICENSE
rename to resources/vendor/highlight/LICENSE
diff --git a/assets/libs/highlight/README.md b/resources/vendor/highlight/README.md
similarity index 100%
rename from assets/libs/highlight/README.md
rename to resources/vendor/highlight/README.md
diff --git a/assets/libs/highlight/highlight.min.js b/resources/vendor/highlight/highlight.min.js
similarity index 100%
rename from assets/libs/highlight/highlight.min.js
rename to resources/vendor/highlight/highlight.min.js
diff --git a/assets/libs/highlight/styles/arduino-light.css b/resources/vendor/highlight/styles/arduino-light.css
similarity index 100%
rename from assets/libs/highlight/styles/arduino-light.css
rename to resources/vendor/highlight/styles/arduino-light.css
diff --git a/assets/libs/skin-preview/three.min.js b/resources/vendor/skin-preview/three.min.js
similarity index 100%
rename from assets/libs/skin-preview/three.min.js
rename to resources/vendor/skin-preview/three.min.js
diff --git a/assets/libs/skin-preview/three.msp.js b/resources/vendor/skin-preview/three.msp.js
similarity index 100%
rename from assets/libs/skin-preview/three.msp.js
rename to resources/vendor/skin-preview/three.msp.js
diff --git a/assets/libs/skins/_all-skins.css b/resources/vendor/skins/_all-skins.css
similarity index 100%
rename from assets/libs/skins/_all-skins.css
rename to resources/vendor/skins/_all-skins.css
diff --git a/assets/libs/skins/_all-skins.min.css b/resources/vendor/skins/_all-skins.min.css
similarity index 100%
rename from assets/libs/skins/_all-skins.min.css
rename to resources/vendor/skins/_all-skins.min.css
diff --git a/assets/libs/skins/skin-black-light.css b/resources/vendor/skins/skin-black-light.css
similarity index 100%
rename from assets/libs/skins/skin-black-light.css
rename to resources/vendor/skins/skin-black-light.css
diff --git a/assets/libs/skins/skin-black-light.min.css b/resources/vendor/skins/skin-black-light.min.css
similarity index 100%
rename from assets/libs/skins/skin-black-light.min.css
rename to resources/vendor/skins/skin-black-light.min.css
diff --git a/assets/libs/skins/skin-black.css b/resources/vendor/skins/skin-black.css
similarity index 100%
rename from assets/libs/skins/skin-black.css
rename to resources/vendor/skins/skin-black.css
diff --git a/assets/libs/skins/skin-black.min.css b/resources/vendor/skins/skin-black.min.css
similarity index 100%
rename from assets/libs/skins/skin-black.min.css
rename to resources/vendor/skins/skin-black.min.css
diff --git a/assets/libs/skins/skin-blue-light.css b/resources/vendor/skins/skin-blue-light.css
similarity index 100%
rename from assets/libs/skins/skin-blue-light.css
rename to resources/vendor/skins/skin-blue-light.css
diff --git a/assets/libs/skins/skin-blue-light.min.css b/resources/vendor/skins/skin-blue-light.min.css
similarity index 100%
rename from assets/libs/skins/skin-blue-light.min.css
rename to resources/vendor/skins/skin-blue-light.min.css
diff --git a/assets/libs/skins/skin-blue.css b/resources/vendor/skins/skin-blue.css
similarity index 100%
rename from assets/libs/skins/skin-blue.css
rename to resources/vendor/skins/skin-blue.css
diff --git a/assets/libs/skins/skin-blue.min.css b/resources/vendor/skins/skin-blue.min.css
similarity index 100%
rename from assets/libs/skins/skin-blue.min.css
rename to resources/vendor/skins/skin-blue.min.css
diff --git a/assets/libs/skins/skin-green-light.css b/resources/vendor/skins/skin-green-light.css
similarity index 100%
rename from assets/libs/skins/skin-green-light.css
rename to resources/vendor/skins/skin-green-light.css
diff --git a/assets/libs/skins/skin-green-light.min.css b/resources/vendor/skins/skin-green-light.min.css
similarity index 100%
rename from assets/libs/skins/skin-green-light.min.css
rename to resources/vendor/skins/skin-green-light.min.css
diff --git a/assets/libs/skins/skin-green.css b/resources/vendor/skins/skin-green.css
similarity index 100%
rename from assets/libs/skins/skin-green.css
rename to resources/vendor/skins/skin-green.css
diff --git a/assets/libs/skins/skin-green.min.css b/resources/vendor/skins/skin-green.min.css
similarity index 100%
rename from assets/libs/skins/skin-green.min.css
rename to resources/vendor/skins/skin-green.min.css
diff --git a/assets/libs/skins/skin-purple-light.css b/resources/vendor/skins/skin-purple-light.css
similarity index 100%
rename from assets/libs/skins/skin-purple-light.css
rename to resources/vendor/skins/skin-purple-light.css
diff --git a/assets/libs/skins/skin-purple-light.min.css b/resources/vendor/skins/skin-purple-light.min.css
similarity index 100%
rename from assets/libs/skins/skin-purple-light.min.css
rename to resources/vendor/skins/skin-purple-light.min.css
diff --git a/assets/libs/skins/skin-purple.css b/resources/vendor/skins/skin-purple.css
similarity index 100%
rename from assets/libs/skins/skin-purple.css
rename to resources/vendor/skins/skin-purple.css
diff --git a/assets/libs/skins/skin-purple.min.css b/resources/vendor/skins/skin-purple.min.css
similarity index 100%
rename from assets/libs/skins/skin-purple.min.css
rename to resources/vendor/skins/skin-purple.min.css
diff --git a/assets/libs/skins/skin-red-light.css b/resources/vendor/skins/skin-red-light.css
similarity index 100%
rename from assets/libs/skins/skin-red-light.css
rename to resources/vendor/skins/skin-red-light.css
diff --git a/assets/libs/skins/skin-red-light.min.css b/resources/vendor/skins/skin-red-light.min.css
similarity index 100%
rename from assets/libs/skins/skin-red-light.min.css
rename to resources/vendor/skins/skin-red-light.min.css
diff --git a/assets/libs/skins/skin-red.css b/resources/vendor/skins/skin-red.css
similarity index 100%
rename from assets/libs/skins/skin-red.css
rename to resources/vendor/skins/skin-red.css
diff --git a/assets/libs/skins/skin-red.min.css b/resources/vendor/skins/skin-red.min.css
similarity index 100%
rename from assets/libs/skins/skin-red.min.css
rename to resources/vendor/skins/skin-red.min.css
diff --git a/assets/libs/skins/skin-yellow-light.css b/resources/vendor/skins/skin-yellow-light.css
similarity index 100%
rename from assets/libs/skins/skin-yellow-light.css
rename to resources/vendor/skins/skin-yellow-light.css
diff --git a/assets/libs/skins/skin-yellow-light.min.css b/resources/vendor/skins/skin-yellow-light.min.css
similarity index 100%
rename from assets/libs/skins/skin-yellow-light.min.css
rename to resources/vendor/skins/skin-yellow-light.min.css
diff --git a/assets/libs/skins/skin-yellow.css b/resources/vendor/skins/skin-yellow.css
similarity index 100%
rename from assets/libs/skins/skin-yellow.css
rename to resources/vendor/skins/skin-yellow.css
diff --git a/assets/libs/skins/skin-yellow.min.css b/resources/vendor/skins/skin-yellow.min.css
similarity index 100%
rename from assets/libs/skins/skin-yellow.min.css
rename to resources/vendor/skins/skin-yellow.min.css
diff --git a/resources/views/admin/customize.tpl b/resources/views/admin/customize.tpl
index e29bb65a..735c0e86 100644
--- a/resources/views/admin/customize.tpl
+++ b/resources/views/admin/customize.tpl
@@ -3,7 +3,7 @@
 @section('title', '个性化')
 
 @section('style')
-<link rel="stylesheet" href="{{ assets('libs/skins/_all-skins.min.css') }}">
+<link rel="stylesheet" href="{{ assets('vendor/skins/_all-skins.min.css') }}">
 @endsection
 
 @section('content')
diff --git a/resources/views/admin/master.tpl b/resources/views/admin/master.tpl
index b27af1cc..10f8cfe7 100644
--- a/resources/views/admin/master.tpl
+++ b/resources/views/admin/master.tpl
@@ -10,7 +10,7 @@
     <!-- App Styles -->
     <link rel="stylesheet" href="{{ assets('css/app.min.css') }}">
     <!-- AdminLTE Skins -->
-    <link rel="stylesheet" href="{{ assets('libs/skins/'.Option::get('color_scheme').'.min.css') }}">
+    <link rel="stylesheet" href="{{ assets('vendor/skins/'.Option::get('color_scheme').'.min.css') }}">
 
     <link rel="stylesheet" href="{{ assets('css/admin.css') }}">
 
diff --git a/resources/views/auth/master.tpl b/resources/views/auth/master.tpl
index b5fa06e4..6afbb180 100644
--- a/resources/views/auth/master.tpl
+++ b/resources/views/auth/master.tpl
@@ -9,7 +9,7 @@
     <!-- App Styles -->
     <link rel="stylesheet" href="{{ assets('css/app.min.css') }}">
 
-    <link rel="stylesheet" href="{{ assets('libs/skins/'.Option::get('color_scheme').'.min.css') }}">
+    <link rel="stylesheet" href="{{ assets('vendor/skins/'.Option::get('color_scheme').'.min.css') }}">
 
     <link rel="stylesheet" href="{{ assets('css/auth.css') }}">
 
diff --git a/resources/views/index.tpl b/resources/views/index.tpl
index 5e6ad377..73a6ae73 100644
--- a/resources/views/index.tpl
+++ b/resources/views/index.tpl
@@ -10,7 +10,7 @@
     <!-- App Styles -->
     <link rel="stylesheet" href="{{ assets('css/app.min.css') }}">
     <!-- AdminLTE Skins -->
-    <link rel="stylesheet" href="{{ assets('libs/skins/'.Option::get('color_scheme').'.min.css') }}">
+    <link rel="stylesheet" href="{{ assets('vendor/skins/'.Option::get('color_scheme').'.min.css') }}">
 
     <link rel="stylesheet" href="{{ assets('css/index.css') }}">
 
diff --git a/resources/views/skinlib/master.tpl b/resources/views/skinlib/master.tpl
index 203ad794..d6e1a0ac 100644
--- a/resources/views/skinlib/master.tpl
+++ b/resources/views/skinlib/master.tpl
@@ -10,7 +10,7 @@
     <!-- App Styles -->
     <link rel="stylesheet" href="{{ assets('css/app.min.css') }}">
     <!-- AdminLTE Skins -->
-    <link rel="stylesheet" href="{{ url('assets/libs/skins/'.Option::get('color_scheme').'.min.css') }}">
+    <link rel="stylesheet" href="{{ assets('vendor/skins/'.Option::get('color_scheme').'.min.css') }}">
 
     <link rel="stylesheet" href="{{ assets('css/skinlib.css') }}">
 
diff --git a/resources/views/skinlib/show.tpl b/resources/views/skinlib/show.tpl
index d8a6c433..6faa8f01 100644
--- a/resources/views/skinlib/show.tpl
+++ b/resources/views/skinlib/show.tpl
@@ -160,8 +160,8 @@
     </div><!-- /.container -->
 </div><!-- /.content-wrapper -->
 
-<script type="text/javascript" src="{{ assets('libs/skin-preview/three.min.js') }}"></script>
-<script type="text/javascript" src="{{ assets('libs/skin-preview/three.msp.js') }}"></script>
+<script type="text/javascript" src="{{ assets('vendor/skin-preview/three.min.js') }}"></script>
+<script type="text/javascript" src="{{ assets('vendor/skin-preview/three.msp.js') }}"></script>
 
 @endsection
 
diff --git a/resources/views/skinlib/upload.tpl b/resources/views/skinlib/upload.tpl
index c517a34c..de3561f7 100644
--- a/resources/views/skinlib/upload.tpl
+++ b/resources/views/skinlib/upload.tpl
@@ -106,8 +106,8 @@ label[for="type-cape"] {
     </div><!-- /.container -->
 </div><!-- /.content-wrapper -->
 
-<script type="text/javascript" src="{{ assets('libs/skin-preview/three.min.js') }}"></script>
-<script type="text/javascript" src="{{ assets('libs/skin-preview/three.msp.js') }}"></script>
+<script type="text/javascript" src="{{ assets('vendor/skin-preview/three.min.js') }}"></script>
+<script type="text/javascript" src="{{ assets('vendor/skin-preview/three.msp.js') }}"></script>
 @endsection
 
 @section('script')
diff --git a/resources/views/user/closet.tpl b/resources/views/user/closet.tpl
index 36a68c20..c7703909 100644
--- a/resources/views/user/closet.tpl
+++ b/resources/views/user/closet.tpl
@@ -133,8 +133,8 @@
     </div><!-- /.modal-dialog -->
 </div><!-- /.modal -->
 
-<script type="text/javascript" src="{{ assets('libs/skin-preview/three.min.js') }}"></script>
-<script type="text/javascript" src="{{ assets('libs/skin-preview/three.msp.js') }}"></script>
+<script type="text/javascript" src="{{ assets('vendor/skin-preview/three.min.js') }}"></script>
+<script type="text/javascript" src="{{ assets('vendor/skin-preview/three.msp.js') }}"></script>
 
 @endsection
 
diff --git a/resources/views/user/config.tpl b/resources/views/user/config.tpl
index 13a832c9..9b7e21f2 100644
--- a/resources/views/user/config.tpl
+++ b/resources/views/user/config.tpl
@@ -3,7 +3,7 @@
 @section('title', '配置生成')
 
 @section('style')
-<link rel="stylesheet" href="{{ assets('libs/highlight/styles/arduino-light.css') }}">
+<link rel="stylesheet" href="{{ assets('vendor/highlight/styles/arduino-light.css') }}">
 <style> pre { border: 0; } td[class='key'], td[class='value'] { border-top: 0 !important; } </style>
 @endsection
 
@@ -133,7 +133,7 @@ Cape: http://skins.minecraft.net/MinecraftCloaks/%s.png
 @endsection
 
 @section('script')
-<script type="text/javascript" src="{{ assets('/libs/highlight/highlight.min.js') }}"></script>
+<script type="text/javascript" src="{{ assets('vendor/highlight/highlight.min.js') }}"></script>
 <script>
     $(document).ready(function() {
         $('pre').each(function(i, block) {
diff --git a/resources/views/user/master.tpl b/resources/views/user/master.tpl
index 1fa602b4..0b9905cd 100644
--- a/resources/views/user/master.tpl
+++ b/resources/views/user/master.tpl
@@ -10,7 +10,7 @@
     <!-- App Styles -->
     <link rel="stylesheet" href="{{ assets('css/app.min.css') }}">
     <!-- AdminLTE Skins -->
-    <link rel="stylesheet" href="{{ assets('libs/skins/'.Option::get('color_scheme').'.min.css') }}">
+    <link rel="stylesheet" href="{{ assets('vendor/skins/'.Option::get('color_scheme').'.min.css') }}">
 
     <link rel="stylesheet" href="{{ assets('css/user.css') }}">
 
diff --git a/resources/views/user/player.tpl b/resources/views/user/player.tpl
index 7750b54a..b4ddbcbf 100644
--- a/resources/views/user/player.tpl
+++ b/resources/views/user/player.tpl
@@ -141,8 +141,8 @@
     </div><!-- /.modal-dialog -->
 </div><!-- /.modal -->
 
-<script type="text/javascript" src="{{ assets('libs/skin-preview/three.min.js') }}"></script>
-<script type="text/javascript" src="{{ assets('libs/skin-preview/three.msp.js') }}"></script>
+<script type="text/javascript" src="{{ assets('vendor/skin-preview/three.min.js') }}"></script>
+<script type="text/javascript" src="{{ assets('vendor/skin-preview/three.msp.js') }}"></script>
 
 @endsection