lucas.mathieu/cachet-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Store only build compiled assets on public

Browse Source
This commit is contained in:
Joseph Cohen
2015-02-21 01:36:01 -06:00
committed by James Brooks
parent ac32ba20a6
commit 65cf59f982
22 changed files with 2338 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
-1
View File
@@ -12,7 +12,6 @@ config.codekit
# Assets # Assets
app/assets/bower_components app/assets/bower_components
node_modules node_modules
public/build
public/css public/css
public/js public/js
app/assets/js/start.js → app/assets/js/app.js
View File
app/assets/sass/_status-page.scss
+2 -3
View File
@@ -133,7 +133,7 @@ body.status-page {
height: 100%; height: 100%;
background: #7266BA; background: #7266BA;
} }
.icon { .status-icon {
background: #fff; background: #fff;
width: 35px; width: 35px;
height: 35px; height: 35px;
@@ -142,7 +142,7 @@ body.status-page {
position: absolute; position: absolute;
left: 25px; left: 25px;
top: 14px; top: 14px;
.ion { .icon {
position: absolute; position: absolute;
&.ion-flag { &.ion-flag {
top: 10px; top: 10px;
@@ -273,4 +273,3 @@ body.status-page {
background-color: lighten($cachet_gray_light, 5%); background-color: lighten($cachet_gray_light, 5%);
} }
} }
app/assets/sass/main.scss
+4
View File
@@ -1,5 +1,8 @@
@import "palette"; @import "palette";
$ionicons-font-path: "../../../fonts" !default;
@import "../bower_components/ionicons/scss/ionicons";
@import "modules/bootstrap"; @import "modules/bootstrap";
html, body { html, body {
@@ -24,6 +27,7 @@ html, body {
// Styles for specific page // Styles for specific page
@import "pages/login"; @import "pages/login";
@import "pages/setup"; @import "pages/setup";
@import "pages/dashboard";
// Styles for plugins // Styles for plugins
@import "plugins/messenger"; @import "plugins/messenger";
app/assets/sass/pages/_dashboard.scss
+8
View File
@@ -0,0 +1,8 @@
.componet-inline-update {
@extend .text-right;
padding-top: 8px;
label {
display: initial;
font-weight: normal;
}
}
app/views/dashboard/index.blade.php
+1 -1
View File
@@ -22,7 +22,7 @@
<div class="col-lg-4 col-sm-12"> <div class="col-lg-4 col-sm-12">
<h4>{{ $component->name }}</h4> <h4>{{ $component->name }}</h4>
</div> </div>
<div class="col-lg-8 col-sm-12 radio-items"> <div class="col-lg-8 col-sm-12 radio-items componet-inline-update">
@foreach(trans('cachet.components.status') as $statusID => $status) @foreach(trans('cachet.components.status') as $statusID => $status)
<div class="radio-inline"> <div class="radio-inline">
<label> <label>
app/views/layout/master.blade.php
+2 -2
View File
@@ -33,7 +33,7 @@
<title>{{ $pageTitle ?: Setting::get('app_name') }} Status</title> <title>{{ $pageTitle ?: Setting::get('app_name') }} Status</title>
<link href="//fonts.googleapis.com/css?family=Open+Sans:300,400,700" rel="stylesheet" type="text/css"> <link href="//fonts.googleapis.com/css?family=Open+Sans:300,400,700" rel="stylesheet" type="text/css">
<link rel="stylesheet" href="{{ elixir('css/all.css') }}"> <link rel="stylesheet" href="{{ elixir('dist/css/all.css') }}">
@include('partials.stylesheet') @include('partials.stylesheet')
@@ -49,7 +49,7 @@
var Global = {}; var Global = {};
Global.locale = '{{ Setting::get('app_locale') }}'; Global.locale = '{{ Setting::get('app_locale') }}';
</script> </script>
<script src="{{ elixir('js/all.js') }}"></script> <script src="{{ elixir('dist/js/all.js') }}"></script>
</head> </head>
<body class="status-page"> <body class="status-page">
<div class="container"> <div class="container">
app/views/partials/dashboard/head.blade.php
+2 -2
View File
@@ -21,7 +21,7 @@
<title>{{ isset($pageTitle) ? $pageTitle : Setting::get('app_name') }} | Cachet</title> <title>{{ isset($pageTitle) ? $pageTitle : Setting::get('app_name') }} | Cachet</title>
<link href="//fonts.googleapis.com/css?family=Open+Sans:300,400,700" rel="stylesheet" type="text/css"> <link href="//fonts.googleapis.com/css?family=Open+Sans:300,400,700" rel="stylesheet" type="text/css">
<link rel="stylesheet" href="{{ elixir('css/all.css') }}"> <link rel="stylesheet" href="{{ elixir('dist/css/all.css') }}">
@include('partials.crowdin') @include('partials.crowdin')
@@ -29,6 +29,6 @@
var Global = {}; var Global = {};
Global.locale = '{{ Setting::get('app_locale') }}'; Global.locale = '{{ Setting::get('app_locale') }}';
</script> </script>
<script src="{{ elixir('js/all.js') }}"></script> <script src="{{ elixir('dist/js/all.js') }}"></script>
</head> </head>
app/views/partials/incidents.blade.php
+1 -1
View File
@@ -5,7 +5,7 @@
<div class="moment {{ $incidentID === 0 ? 'first' : null }}"> <div class="moment {{ $incidentID === 0 ? 'first' : null }}">
<div class="row event clearfix"> <div class="row event clearfix">
<div class="col-sm-1"> <div class="col-sm-1">
<div class="icon status-{{ $incident->status }}" data-toggle="tooltip" title="{{ $incident->humanStatus }}" data-placement="left"> <div class="status-icon status-{{ $incident->status }}" data-toggle="tooltip" title="{{ $incident->humanStatus }}" data-placement="left">
<i class="{{ $incident->icon }}"></i> <i class="{{ $incident->icon }}"></i>
</div> </div>
</div> </div>
bower.json
+18 -18
View File
@@ -1,20 +1,20 @@
{ {
"name": "Cachet", "name": "Cachet",
"dependencies": { "dependencies": {
"bootstrap-sass": "~3.3.3", "bootstrap-sass": "~3.3.3",
"humane-js": "~3.2.2", "humane-js": "~3.2.2",
"ionicons": "~2.0.0", "ionicons": "~2.0.0",
"jquery": "~2.1.1", "jquery": "~2.1.1",
"jquery-minicolors": "~2.1.10", "jquery-minicolors": "~2.1.10",
"jquery-serialize-object": "~2.4.3", "jquery-serialize-object": "~2.4.3",
"lodash": "~2.4", "lodash": "~2.4",
"messenger": "~1.4.1", "messenger": "~1.4.1",
"Sortable": "~1.0.0", "Sortable": "~1.0.0",
"animate-sass": "~0.6.2", "animate-sass": "~0.6.2",
"moment": "~2.9", "moment": "~2.9",
"livestampjs": "~1.1.2" "livestampjs": "~1.1.2"
}, },
"resolutions": { "resolutions": {
"jquery": "~2.1.1" "jquery": "~2.1.1"
} }
} }
elixir.json
+2
View File
@@ -1,5 +1,7 @@
{ {
"assetsDir": "app/assets/", "assetsDir": "app/assets/",
"bowerDir": "app/assets/bower_components", "bowerDir": "app/assets/bower_components",
"cssOutput": "public/dist/css",
"jsOutput": "public/dist/js",
"production": true "production": true
} }
gulpfile.js
+24 -36
View File
@@ -1,40 +1,28 @@
var del = require('del');
var elixir = require('laravel-elixir'); var elixir = require('laravel-elixir');
var gulp = require('gulp');
var jshint = require('laravel-elixir-jshint');
elixir.extend('rm', function(source) { require('laravel-elixir-jshint');
gulp.task('rm', function(callback) {
del(source, callback);
});
return this.queueTask('rm'); elixir(function (mix) {
}); mix.sass('app/assets/sass/main.scss')
.jshint('app/assets/js/*.js')
gulp.task('default', function() { .styles([
elixir(function (mix) { 'app/assets/bower_components/ionicons/css/ionicons.css',
mix.sass('app/assets/sass/main.scss') 'app/assets/bower_components/jquery-minicolors/jquery.minicolors.css',
.rm('public/build/fonts') 'public/dist/css/main.css'
.jshint('app/assets/js/*.js') ], 'public/dist/css/all.css', './')
.styles([ .scripts([
'app/assets/bower_components/ionicons/css/ionicons.min.css', 'bower_components/jquery/dist/jquery.js',
'app/assets/bower_components/jquery-minicolors/jquery.minicolors.css', 'bower_components/bootstrap-sass/assets/javascripts/bootstrap.js',
'public/css/main.css', 'bower_components/lodash/dist/lodash.js',
], './') 'bower_components/messenger/build/js/messenger.js',
.scripts([ 'bower_components/Sortable/Sortable.js',
'bower_components/jquery/dist/jquery.js', 'bower_components/moment/min/moment-with-locales.js',
'bower_components/bootstrap-sass-official/assets/javascripts/bootstrap.js', 'bower_components/livestampjs/livestamp.js',
'bower_components/lodash/dist/lodash.js', 'bower_components/jquery-minicolors/jquery.minicolors.js',
'bower_components/messenger/build/js/messenger.js', 'bower_components/jquery-serialize-object/jquery.serialize-object.js',
'bower_components/Sortable/Sortable.js', 'js/app.js',
'bower_components/moment/min/moment-with-locales.js', 'js/**/*.js'
'bower_components/livestampjs/livestamp.js', ], 'public/dist/js/all.js', './app/assets/')
'bower_components/jquery-minicolors/jquery.minicolors.js', .version(['public/dist/css/all.css', 'public/dist/js/all.js'])
'bower_components/jquery-serialize-object/jquery.serialize-object.js', .copy('app/assets/bower_components/ionicons/fonts', 'public/fonts');
'js/app.js',
'js/**/*.js',
], './app/assets/')
.version(['public/css/all.css', 'public/js/all.js'])
.copy('app/assets/bower_components/ionicons/fonts', 'public/build/fonts');
});
}); });
package.json
+2 -4
View File
@@ -2,11 +2,9 @@
"name": "cachet", "name": "cachet",
"author": "James Brooks <jbrooksuk@me.com>", "author": "James Brooks <jbrooksuk@me.com>",
"dependencies": { "dependencies": {
"array-union": "~1.0.1",
"bower": "~1.3.12", "bower": "~1.3.12",
"del": "~1.1.1", "gulp": "~3.8.8",
"gulp": "~3.8.11", "laravel-elixir": "~0.10.7",
"laravel-elixir": "~0.9.1",
"laravel-elixir-jshint": "^0.1.6" "laravel-elixir-jshint": "^0.1.6"
}, },
"preferGlobal": true "preferGlobal": true
public/build/dist/css/all-3929b4f6.css
Vendored
+21
View File
File diff suppressed because one or more lines are too long
public/build/dist/js/all-38248441.js
Vendored
+11
View File
File diff suppressed because one or more lines are too long
public/build/rev-manifest.json
+4
View File
@@ -0,0 +1,4 @@
{
"dist/css/all.css": "dist/css/all-3929b4f6.css",
"dist/js/all.js": "dist/js/all-38248441.js"
}
public/dist/.gitignore
+2
View File
@@ -0,0 +1,2 @@
*
!.gitignore
public/fonts/ionicons.eot
BIN
View File
Binary file not shown.
public/fonts/ionicons.svg
+2230
View File
File diff suppressed because it is too large Load Diff
Side by Side

After

Width:  |  Height:  |  Size: 326 KiB

public/fonts/ionicons.ttf
BIN
View File
Binary file not shown.
public/fonts/ionicons.woff
BIN
View File
Binary file not shown.
src/Models/Incident.php
+4 -4
View File
@@ -93,13 +93,13 @@ class Incident extends Model implements TransformableInterface, PresenterInterfa
{ {
switch ($this->status) { switch ($this->status) {
case 1: case 1:
return 'ion ion-flag'; return 'icon ion-flag';
case 2: case 2:
return 'ion ion-alert'; return 'icon ion-alert';
case 3: case 3:
return 'ion ion-eye'; return 'icon ion-eye';
case 4: case 4:
return 'ion ion-checkmark'; return 'icon ion-checkmark';
default: default:
return ''; return '';
} }