mirror/blessing-skin-server
2
0
Fork 1
mirror of https://github.com/bs-community/blessing-skin-server.git synced 2025-02-17 14:49:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

change dist directory of assets

Browse Source
This commit is contained in:
printempw 2016-08-28 18:34:41 +08:00
parent cc74d4020d
commit 7e23d08285
16 changed files with 71 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -5,5 +5,6 @@ textures/*
node_modules/*
resources/cache/*
resources/assets/bower_components/*
assets/dist/*
assets/css/*
assets/js/*
koala-config.json

12
config/app.php
View File

@ -1,6 +1,15 @@
<?php
return [
/*
|--------------------------------------------------------------------------
| Application Version
|--------------------------------------------------------------------------
|
| Version of Blessing Skin Server
|
*/
'version' => '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,

33
gulpfile.js
View File

@ -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('../'));

16
resources/assets/sass/style.scss
View File

@ -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 {

8
resources/views/admin/master.tpl
View File

@ -8,11 +8,11 @@
<!-- Tell the browser to be responsive to screen width -->
<meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
<!-- App Styles -->
<link rel="stylesheet" href="../assets/dist/app.min.css">
<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/dist/css/admin.css">
<link rel="stylesheet" href="../assets/css/admin.css">
@yield('style')
@ -127,9 +127,9 @@
</div><!-- ./wrapper -->
<!-- App Scripts -->
<script type="text/javascript" src="../assets/dist/app.min.js"></script>
<script type="text/javascript" src="../assets/js/app.min.js"></script>
<script type="text/javascript" src="../assets/dist/js/admin.js"></script>
<script type="text/javascript" src="../assets/js/admin.js"></script>
@if (Option::get('check_update') == '1')
<script>

8
resources/views/auth/master.tpl
View File

@ -7,10 +7,10 @@
<link rel="shortcut icon" href="../assets/images/favicon.ico">
<meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
<!-- App Styles -->
<link rel="stylesheet" href="../assets/dist/app.min.css">
<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/dist/css/auth.css">
<link rel="stylesheet" href="../assets/css/auth.css">
<style>{{ Option::get('custom_css') }}</style>
</head>
@ -20,9 +20,9 @@
@yield('content')
<!-- App Scripts -->
<script type="text/javascript" src="../assets/dist/app.min.js"></script>
<script type="text/javascript" src="../assets/js/app.min.js"></script>
<script type="text/javascript" src="../assets/dist/js/auth.js"></script>
<script type="text/javascript" src="../assets/js/auth.js"></script>
@if (Session::has('msg'))
<script>

2
resources/views/errors/404.tpl
View File

@ -5,5 +5,5 @@
@section('content')
<h1>404 Not Found</h1>
<p>详细信息：{{ $message }}</p>
<p>详细信息：{{ $message or "Nothing lives here.." }}</p>
@endsection

2
resources/views/errors/general.tpl
View File

@ -5,7 +5,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="robots" content="noindex,nofollow" />
<title>@yield('title') - Blessing Skin Server</title>
<link rel="stylesheet" type="text/css" href="{{ \Http::getBaseUrl() }}/assets/dist/css/style.css">
<link rel="stylesheet" type="text/css" href="{{ \Http::getBaseUrl() }}/assets/css/style.css">
</head>
<body class="container">

6
resources/views/index.tpl
View File

@ -8,11 +8,11 @@
<!-- Tell the browser to be responsive to screen width -->
<meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
<!-- App Styles -->
<link rel="stylesheet" href="./assets/dist/app.min.css">
<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/dist/css/index.css">
<link rel="stylesheet" href="./assets/css/index.css">
<style>
.wrapper {
@ -112,7 +112,7 @@
</div><!-- ./wrapper -->
<!-- App Scripts -->
<script type="text/javascript" src="./assets/dist/app.min.js"></script>
<script type="text/javascript" src="./assets/js/app.min.js"></script>
<script>{!! Option::get('custom_js') !!}</script>
</body>

2
resources/views/setup/master.tpl
View File

@ -6,7 +6,7 @@
<meta name="robots" content="noindex,nofollow" />
<title>Blessing Skin Server 安装程序</title>
<link rel="shortcut icon" href="../assets/images/favicon.ico">
<link rel="stylesheet" type="text/css" href="../assets/dist/css/install.css">
<link rel="stylesheet" type="text/css" href="../assets/css/install.css">
</head>
<body class="container">

2
resources/views/setup/migrations/master.tpl
View File

@ -6,7 +6,7 @@
<meta name="robots" content="noindex,nofollow" />
<title>Blessing Skin Server 数据迁移</title>
<link rel="shortcut icon" href="../../assets/images/favicon.ico">
<link rel="stylesheet" type="text/css" href="../../assets/dist/css/install.css">
<link rel="stylesheet" type="text/css" href="../../assets/css/install.css">
<style>
.container a.button {

2
resources/views/setup/steps/1.tpl
View File

@ -3,7 +3,7 @@
@section('content')
<h1>欢迎</h1>
<p>欢迎使用 Blessing Skin Server V3！</p>
<p>欢迎使用 Blessing Skin Server v{{ config('app.version') }}！</p>
<p>成功连接至 MySQL 服务器 {{ $server }}，点击下一步以开始安装。</p>
<p class="step">

7
resources/views/setup/steps/2.tpl
View File

@ -43,10 +43,9 @@
</tr>
</table>
@if (session()->has('msg'))
<div class="alert alert-warning" role="alert">{{ session('msg') }}</div>
<?php session()->forget('msg'); ?>
@endif
@if (isset($_SESSION['msg']))
<div class="alert alert-warning" role="alert">{{ $_SESSION['msg'] }}</div> <?php unset($_SESSION['msg']); ?>
@endif
<p class="step">
<input type="submit" name="Submit" id="submit" class="button button-large" value="开始安装" />

2
resources/views/setup/updates/master.tpl
View File

@ -6,7 +6,7 @@
<meta name="robots" content="noindex,nofollow" />
<title>Blessing Skin Server 升级程序</title>
<link rel="shortcut icon" href="../../assets/images/favicon.ico">
<link rel="stylesheet" type="text/css" href="../../assets/dist/css/install.css">
<link rel="stylesheet" type="text/css" href="../../assets/css/install.css">
</head>
<body class="container">

8
resources/views/skinlib/master.tpl
View File

@ -8,11 +8,11 @@
<!-- Tell the browser to be responsive to screen width -->
<meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
<!-- App Styles -->
<link rel="stylesheet" href="../assets/dist/app.min.css">
<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/dist/css/skinlib.css">
<link rel="stylesheet" href="../assets/css/skinlib.css">
@yield('style')
@ -139,9 +139,9 @@
</div><!-- ./wrapper -->
<!-- App Scripts -->
<script type="text/javascript" src="../assets/dist/app.min.js"></script>
<script type="text/javascript" src="../assets/js/app.min.js"></script>
<script type="text/javascript" src="../assets/dist/js/skinlib.js"></script>
<script type="text/javascript" src="../assets/js/skinlib.js"></script>
@yield('script')

8
resources/views/user/master.tpl
View File

@ -8,11 +8,11 @@
<!-- Tell the browser to be responsive to screen width -->
<meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
<!-- App Styles -->
<link rel="stylesheet" href="../assets/dist/app.min.css">
<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/dist/css/user.css">
<link rel="stylesheet" href="../assets/css/user.css">
@yield('style')
@ -128,9 +128,9 @@
</div><!-- ./wrapper -->
<!-- App Scripts -->
<script type="text/javascript" src="../assets/dist/app.min.js"></script>
<script type="text/javascript" src="../assets/js/app.min.js"></script>
<script type="text/javascript" src="../assets/dist/js/user.js"></script>
<script type="text/javascript" src="../assets/js/user.js"></script>
@yield('script')