Commit 271645bf authored by Wilson JALLET's avatar Wilson JALLET 💸

Merge branch 'master' into 'master'

Master

See merge request br/chocapix-client!4
parents edc64a99 a30e2745
Pipeline #4426 passed with stage
in 25 minutes and 21 seconds
......@@ -14,6 +14,9 @@ module.exports = function (grunt) {
// Time how long tasks take. Can help when optimizing build times
require('time-grunt')(grunt);
// Load serve-static
var serveStatic = require('serve-static');
// Configurable paths for the application
var appConfig = {
......@@ -82,12 +85,12 @@ module.exports = function (grunt) {
open: true,
middleware: function (connect) {
return [
connect.static('.tmp'),
serveStatic('.tmp'),
connect().use(
'/bower_components',
connect.static('./bower_components')
serveStatic('./bower_components')
),
connect.static(appConfig.app)
serveStatic(appConfig.app)
];
}
}
......@@ -97,13 +100,13 @@ module.exports = function (grunt) {
port: 9001,
middleware: function (connect) {
return [
connect.static('.tmp'),
connect.static('test'),
serveStatic('.tmp'),
serveStatic('test'),
connect().use(
'/bower_components',
connect.static('./bower_components')
serveStatic('./bower_components')
),
connect.static(appConfig.app)
serveStatic(appConfig.app)
];
}
}
......
......@@ -3,7 +3,7 @@
<h3>Auto-Appro : Ooshop</h3>
<div class="col-md-10">
<div class="well">
Séléctionne la facture de l’appro au format PDF (à télécharger sur la page <a href="https://www.ooshop.carrefour.com/orders">Mes dernières commandes</a>).
Séléctionne la facture de l’appro au format PDF (à télécharger sur la page <a href="https://ooshop.carrefour.fr/orders">Mes dernières commandes</a>).
</div>
<form class="form-horizontal" ng-submit="validate()">
<div class="form-group">
......
......@@ -237,7 +237,7 @@ angular.module('bars.admin.food', [
* https://stackoverflow.com/questions/1554280/extract-text-from-pdf-in-javascript#29111164
*/
function pdfToText(data) {
pdfjsLib.workerSrc = '//mozilla.github.io/pdf.js/build/pdf.worker.js';
pdfjsLib.workerSrc = '../../../../bower_components/pdfjs-dist/build/pdf.worker.min.js';
pdfjsLib.cMapUrl = 'js/vendor/pdfjs/cmaps/';
pdfjsLib.cMapPacked = true;
......
......@@ -77,6 +77,7 @@
<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/bootstrap/dist/js/bootstrap.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>
......@@ -97,6 +98,8 @@
<script src="../bower_components/angular-ui-bootstrap-datetimepicker/datetimepicker.js"></script>
<script src="../bower_components/angular-loading-bar/build/loading-bar.js"></script>
<script src="../bower_components/js-sha1/build/sha1.min.js"></script>
<script src="../bower_components/pdfjs-dist/build/pdf.js"></script>
<script src="../bower_components/pdfjs-dist/build/pdf.worker.js"></script>
<!-- endbower -->
<script src="../bower_components/moment/locale/fr.js"></script>
<!-- endbuild -->
......
......@@ -29,7 +29,8 @@
"ngInfiniteScroll": "1.2.0",
"angular-ui-bootstrap-datetimepicker": "*",
"angular-loading-bar": "~0.8.0",
"js-sha1": "~0.3.0"
"js-sha1": "~0.3.0",
"pdfjs-dist": "^2.0.550"
},
"devDependencies": {
"angular-mocks": "~1.3.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