diff --git a/README.md b/README.md
index e6cd240f7503d5b18fd000ca7cbe55c34e89daba..8dd93ec80a544f32ee9420b3903534a9baccd436 100644
--- a/README.md
+++ b/README.md
@@ -125,14 +125,16 @@ To build Cesium, you will have to:
wget -qO- https://raw.githubusercontent.com/creationix/nvm/v0.31.0/install.sh | bash
```
+> Il faut ensuite recharger votre terminal, par exemple en lançant la commande `bash`
+
- Configure NodeJS to use a version 8:
```
- nvm install 7
+ nvm install 5
```
- Installing node.js build tools:
```
- npm install -g gulp ionic@1.7.16 cordova
+ npm install -g gulp bower cordova ionic@1.7.16
```
### Source code
diff --git a/bower.json b/bower.json
new file mode 100644
index 0000000000000000000000000000000000000000..498c7e07368e8d2d6a741b959171c81338922bb6
--- /dev/null
+++ b/bower.json
@@ -0,0 +1,26 @@
+{
+ "name": "cesium",
+ "private": "true",
+ "devDependencies": {
+ "ionic": "driftyco/ionic-bower#1.3.2",
+ "ionic-material": "0.4.2"
+ },
+ "dependencies": {
+ "angular-messages": "1.3.13",
+ "robotodraft": "1.1.0",
+ "angular-moment": "^0.10.3",
+ "angular-animate": "1.4.3",
+ "angular-sanitize": "1.5.3",
+ "angular": "1.5.3",
+ "angular-bind-notifier": "^1.1.7",
+ "angular-image-crop": "^2.0.0",
+ "ng-idle": "^1.3.2",
+ "chart.js": "chartjs#^2.6.0"
+ },
+ "resolutions": {
+ "angular-sanitize": "1.5.3",
+ "angular-animate": "1.5.3",
+ "angular": "1.5.3",
+ "ionic": "1.3.2"
+ }
+}
diff --git a/gulpfile.js b/gulpfile.js
index cbc1d7314936a558c70903cbcb90cd4fb48ea116..f66f755ad146e6fe054b59b5e7e919ad293f18da 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -132,7 +132,6 @@ gulp.task('config', function (done) {
.pipe(rename('config.js'))
.pipe(gulp.dest('www/js'))
.on('end', done);
- ;
});
gulp.task('templatecache', function (done) {
@@ -421,7 +420,7 @@ gulp.task('zip:web', ['clean-unused-directories:web'], function(done) {
.on('end', done);
});
-gulp.task('build:web', ['zip:web'], function(done) {
+gulp.task('build:web', ['git-check', 'zip:web'], function(done) {
var version = JSON.parse(fs.readFileSync('./package.json', 'utf8')).version;
gutil.log(gutil.colors.green("Build for web created at: 'plateforms/web/build/cesium-web-" + version + ".zip'"));
return del([
diff --git a/package.json b/package.json
index baac0e9b1e1ba75c80deddb7dea57613286db0b8..e18273030f59e06b65d4353691d60ff1d75a2dd3 100644
--- a/package.json
+++ b/package.json
@@ -7,6 +7,7 @@
"url": "git@github.com:duniter/cesium.git"
},
"scripts": {
+ "postinstall": "bower install",
"install-for-mobile": "ionic state restore",
"start": "ionic serve"
},
@@ -26,31 +27,21 @@
"new": "https://github.com/duniter/cesium/issues/new?labels=bug"
},
"dependencies": {
- "angular": "1.5.3",
- "angular-animate": "1.4.3",
- "angular-bind-notifier": "^1.1.7",
- "angular-image-crop": "https://github.com/andyshora/angular-image-crop/archive/v2.0.0.tar.gz",
- "angular-messages": "1.3.13",
- "angular-moment": "^0.10.3",
- "angular-sanitize": "1.5.3",
- "chart.js": "^2.6.0",
+ "delete-empty": "^0.1.3",
+ "gulp": "^3.9.1",
+ "bower": "^1.7.3",
"ionic": "^1.7.16",
- "ionic-material": "https://github.com/zachfitz/Ionic-Material/archive/v0.4.2.tar.gz",
- "moment": "^2.10.6",
- "ng-idle": "^1.3.2",
- "robotodraft": "https://github.com/FontFaceKit/robotodraft/tarball/gh-pages"
+ "gulp-bump": "^2.1.0",
+ "gulp-concat": "^2.2.0",
+ "gulp-rename": "^1.2.0",
+ "gulp-sass": "^2.2.0",
+ "node-sass": "^3.3.3"
},
"devDependencies": {
"cordova-uglify": "^0.2.3",
"del": "^2.2.0",
+ "fs": "0.0.2",
"gulp": "^3.9.1",
- "gulp-bump": "^2.1.0",
- "gulp-concat": "^2.2.0",
- "gulp-rename": "^1.2.0",
- "gulp-sass": "^2.2.0",
- "vinyl-fs": "^3.9.2",
- "graceful-fs": "^4.0.0",
- "fs": "^0.0.2",
"gulp-angular-templatecache": "^1.8.0",
"gulp-angular-translate": "^0.1.4",
"gulp-base64": "^0.1.3",
@@ -79,10 +70,7 @@
"mv": "^2.1.1",
"playup": "^1.0.2",
"shelljs": "^0.3.0",
- "yargs": "^4.3.1",
- "minimatch": "^3.0.2",
- "delete-empty": "^0.1.3",
- "node-sass": "^4.5.3"
+ "yargs": "^4.3.1"
},
"cordovaPlugins": [
"cordova-plugin-whitelist",
@@ -108,26 +96,5 @@
"ios",
"android",
"firefoxos"
- ],
- "cordova": {
- "plugins": {
- "cordova-plugin-whitelist": {},
- "cordova-plugin-splashscreen": {},
- "cordova-plugin-console": {},
- "ionic-plugin-keyboard": {},
- "cordova-plugin-device": {},
- "cordova-plugin-statusbar": {},
- "cordova-plugin-camera": {},
- "cordova-plugin-websocket": {},
- "cordova-plugin-vibration": {},
- "cordova-plugin-dialogs": {},
- "cordova-plugin-minisodium": {},
- "cordova-plugin-secure-storage": {},
- "phonegap-plugin-barcodescanner": {
- "CAMERA_USAGE_DESCRIPTION": " "
- },
- "cordova-plugin-inappbrowser": {},
- "cordova-plugin-x-toast": {}
- }
- }
+ ]
}
diff --git a/www/js/config.js b/www/js/config.js
index e28fc7fe468ca6364340bc0c387e59a6d2a78062..7d7b10e7a5a4fc46fbee458b0279425af735286e 100644
--- a/www/js/config.js
+++ b/www/js/config.js
@@ -36,24 +36,24 @@ angular.module("cesium.config", [])
"port": "443"
},
"plugins": {
- "es": {
- "enable": true,
- "askEnable": false,
- "host": "g1.data.duniter.fr",
- "port": "443",
- "notifications": {
- "txSent": true,
- "txReceived": true,
- "certSent": true,
- "certReceived": true
- }
- },
- "rml9": {
- enable: true
- }
- },
+ "es": {
+ "enable": true,
+ "askEnable": false,
+ "host": "g1.data.duniter.fr",
+ "port": "443",
+ "notifications": {
+ "txSent": true,
+ "txReceived": true,
+ "certSent": true,
+ "certReceived": true
+ }
+ },
+ "rml9": {
+ enable: true
+ }
+ },
"version": "0.12.7",
- "build": "2017-05-31T14:31:24.792Z",
+ "build": "2017-06-06T16:36:59.777Z",
"newIssueUrl": "https://github.com/duniter/cesium/issues/new?labels=bug"
})