Commit 8f1f1573 authored by konfiot's avatar konfiot

LA CI MARCHE

parent 4861de57
......@@ -7,7 +7,7 @@ install: notroot
node_modules/.bin/bower install &&\
rm -rf dist.bak &&\
if [ -d dist ] ; then mv dist dist.bak ; fi ;\
sudo node_modules/.bin/gulp build ;\
node_modules/.bin/gulp build ;\
clean:
rm -rf .npm
......
......@@ -162,7 +162,6 @@ angular.module('bars.api.food', [
})
.state('bar.food.details', {
url: "/:id",
controller: 'api.ctrl.food_details',
resolve: {
food_item: ['$stateParams', 'api.models.sellitem', function($stateParams, SellItem) {
return SellItem.getSync($stateParams.id);
......@@ -185,7 +184,7 @@ angular.module('bars.api.food', [
controller: 'api.ctrl.food_details.stocks',
},
'graphs@bar.food.details': {
templateUrl: "components/API/food/views/details-graphs.html",
templateUrl: "components/API/food/views/details-graphs.html",
controller: 'api.ctrl.food_details.graphs',
},
'ranking@bar.food.details': {
......
......@@ -25,7 +25,7 @@
<!-- endbuild -->
<!-- build:js scripts/modernizr.js -->
<script src="../bower_components/html5-boilerplate/dist/js/vendor/modernizr-2.8.3.min.js"></script>
<script src="../bower_components/html5-boilerplate/dist/js/vendor/modernizr-3.6.0.min.js"></script>
<!-- endbuild -->
</head>
<body ng-app="barsApp">
......@@ -73,8 +73,10 @@
<!-- build:js scripts/vendor.js -->
<!-- bower:js -->
<script src="../bower_components/jquery/dist/jquery.js"></script>
<script src="../bower_components/angular/angular.js"></script>
<script src="../bower_components/json3/lib/json3.js"></script>
<script src="../bower_components/es5-shim/es5-shim.js"></script>
<script src="../bower_components/jquery/dist/jquery.js"></script>
<script src="../bower_components/angular-animate/angular-animate.js"></script>
<script src="../bower_components/angular-cookies/angular-cookies.js"></script>
<script src="../bower_components/angular-messages/angular-messages.js"></script>
......@@ -99,7 +101,7 @@
<script src="../bower_components/moment/locale/fr.js"></script>
<!-- endbuild -->
<!-- build:js({.tmp,app}) scripts/scripts.js -->
<!-- build:js({app,.tmp}) scripts/scripts.js -->
<script src="assets/js/angular-locale_fr-fr.js"></script>
<script src="config.js"></script>
......
'use strict';
'use strict';
var gulp = require('gulp');
var fs = require('fs');
......@@ -27,7 +27,7 @@ gulp.task('partials', function () {
}))
.pipe(gulp.dest('.tmp'))
.pipe($.size());
});
});
gulp.task('html', ['wiredep', 'scripts', 'partials'], function () {
var htmlFilter = $.filter('*.html');
......@@ -39,37 +39,36 @@ gulp.task('html', ['wiredep', 'scripts', 'partials'], function () {
return gulp.src('app/*.html')
.pipe($.inject(gulp.src('.tmp/**/*.js'), {
read: false,
//read: false,
starttag: '<!-- inject:partials -->',
addRootSlash: false,
addPrefix: '../'
}))
.pipe(assets = $.useref.assets())
.pipe($.rev())
.pipe($.useref({ searchPath: 'app' }))
.pipe(jsFilter)
.pipe($.stripDebug())
.pipe($.ngAnnotate())
.pipe($.uglify({preserveComments: $.uglifySaveLicense}))
.pipe(jsFilter.restore())
//.pipe($.rev())
.pipe($.debug({title: 'unicorn:'}))
.pipe(cssFilter)
.pipe($.csso())
.pipe(cssFilter.restore())
//.pipe(jsFilter)
//.pipe($.stripDebug())
//.pipe($.ngAnnotate())
//.pipe($.uglify({preserveComments: $.uglifySaveLicense}))
//.pipe(jsFilter.restore)
.pipe(assets.restore())
//.pipe(cssFilter)
//.pipe($.csso())
//.pipe(cssFilter.restore)
.pipe($.useref())
.pipe($.revReplace())
//.pipe($.revReplace())
.pipe(htmlFilter)
.pipe($.minifyHtml({
empty: true,
spare: true,
quotes: true
}))
.pipe(htmlFilter.restore())
//.pipe(htmlFilter)
//.pipe($.minifyHtml({
// empty: true,
// spare: true,
// quotes: true
//}))
//.pipe(htmlFilter.restore)
.pipe(gulp.dest('dist'))
.pipe($.size());
......
......@@ -5,56 +5,56 @@
"description": "Front-end of https://github.com/BinetReseau/bars",
"repository": "https://github.com/Nadrieril/bars-angular",
"devDependencies": {
"browser-sync": "^1.3.6",
"chalk": "^0.4.0",
"del": "^0.1.3",
"grunt": "^0.4.1",
"grunt-autoprefixer": "^0.7.3",
"grunt-concurrent": "^0.5.0",
"grunt-contrib-clean": "^0.5.0",
"grunt-contrib-concat": "^0.4.0",
"grunt-contrib-connect": "^0.7.1",
"grunt-contrib-copy": "^0.5.0",
"grunt-contrib-cssmin": "^0.9.0",
"grunt-contrib-htmlmin": "^0.3.0",
"grunt-contrib-imagemin": "^0.8.1",
"grunt-contrib-jshint": "^0.10.0",
"grunt-contrib-uglify": "^0.4.0",
"grunt-contrib-watch": "^0.6.1",
"grunt-filerev": "^0.2.1",
"grunt-newer": "^0.7.0",
"grunt-ng-annotate": "^0.4.0",
"grunt-svgmin": "^0.4.0",
"grunt-usemin": "^2.1.1",
"grunt-wiredep": "^1.7.0",
"gulp": "^3.8.0",
"gulp-autoprefixer": "^0.0.6",
"gulp-cache": "^0.2.0",
"gulp-csso": "^0.2.6",
"gulp-filter": "^1.0.0",
"gulp-flatten": "^0.0.2",
"gulp-git": "^1.0.1",
"gulp-inject": "^1.0.0",
"gulp-jshint": "^1.8.0",
"gulp-load-plugins": "^0.6.0",
"gulp-minify-html": "^0.1.3",
"gulp-ng-annotate": "^0.5.0",
"gulp-ng-html2js": "^0.1.6",
"gulp-replace": "^0.4.0",
"gulp-rev": "^1.1.0",
"gulp-rev-replace": "^0.3.0",
"gulp-size": "^1.1.0",
"gulp-strip-debug": "^1.0.2",
"gulp-uglify": "^1.0.0",
"gulp-useref": "^1.0.0",
"browser-sync": "^2.24.4",
"chalk": "^2.4.1",
"del": "^3.0.0",
"grunt": "^1.0.2",
"grunt-autoprefixer": "^3.0.4",
"grunt-concurrent": "^2.3.1",
"grunt-contrib-clean": "^1.1.0",
"grunt-contrib-concat": "^1.0.1",
"grunt-contrib-connect": "^1.0.2",
"grunt-contrib-copy": "^1.0.0",
"grunt-contrib-cssmin": "^2.2.1",
"grunt-contrib-htmlmin": "^2.4.0",
"grunt-contrib-imagemin": "^2.0.1",
"grunt-contrib-jshint": "^1.1.0",
"grunt-contrib-uglify": "^3.3.0",
"grunt-contrib-watch": "^1.1.0",
"grunt-filerev": "^2.3.1",
"grunt-newer": "^1.3.0",
"grunt-ng-annotate": "^3.0.0",
"grunt-svgmin": "^5.0.0",
"grunt-usemin": "^3.1.1",
"grunt-wiredep": "^3.0.1",
"gulp": "^3.9.1",
"gulp-autoprefixer": "^5.0.0",
"gulp-cache": "^1.0.2",
"gulp-csso": "^3.0.1",
"gulp-filter": "^5.1.0",
"gulp-flatten": "^0.4.0",
"gulp-git": "^2.6.0",
"gulp-inject": "^4.3.2",
"gulp-jshint": "^2.1.0",
"gulp-load-plugins": "^1.5.0",
"gulp-minify-html": "^1.0.6",
"gulp-ng-annotate": "^2.1.0",
"gulp-ng-html2js": "^0.2.2",
"gulp-replace": "^1.0.0",
"gulp-rev": "^8.1.1",
"gulp-rev-replace": "^0.4.4",
"gulp-size": "^3.0.0",
"gulp-strip-debug": "^3.0.0",
"gulp-uglify": "^3.0.0",
"gulp-useref": "^3.1.5",
"http-proxy": "^1.3.0",
"jshint-stylish": "^0.4.0",
"load-grunt-tasks": "^0.4.0",
"jshint-stylish": "^2.2.1",
"load-grunt-tasks": "^4.0.0",
"main-bower-files": "^2.0.0",
"require-dir": "^1.0.0",
"time-grunt": "^0.3.1",
"time-grunt": "^1.4.0",
"uglify-save-license": "^0.4.1",
"wiredep": "^1.8.5"
"wiredep": "^4.0.0"
},
"engines": {
"node": ">=0.10.0"
......@@ -62,5 +62,9 @@
"scripts": {
"serve": "grunt serve",
"build": "gulp build"
},
"dependencies": {
"bower": "^1.8.4",
"gulp-debug": "^4.0.0"
}
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment