Put all back related file in a single folder

betagouv · Sep 2, 2016 · e745cab · e745cab
1 parent 032b6e6
commit e745cab
Show file tree

Hide file tree

Showing 14 changed files with 56 additions and 22 deletions.
diff --git a/circle.yml b/circle.yml
@@ -5,4 +5,4 @@ test:
   pre:
     - npm run lint
   post:
-    - cat ./coverage/lcov.info | ./node_modules/.bin/coveralls --verbose
+    - cd server && cat ./coverage/lcov.info | ./node_modules/.bin/coveralls --verbose
diff --git a/package.json b/package.json
@@ -3,9 +3,16 @@
   "version": "0.0.1",
   "description": "Faciliter l'accès au statut et à ses bénéfices",
   "scripts": {
-    "start": "./bin/api.js",
-    "test": "./node_modules/.bin/istanbul cover --print details node_modules/mocha/bin/_mocha -- -R spec api/*/test/** --recursive",
-    "lint": "./node_modules/.bin/eslint api/ bin/"
+    "preinstall": "npm-run-all --sequential install:back install:front",
+    "install:back": "cd server && npm install",
+    "install:front": "echo 'front install'",
+    "start": "cd server && npm run start",
+    "test": "npm-run-all --sequential test:back test:front",
+    "test:back": "cd server && npm test",
+    "test:front": "echo 'front test'",
+    "lint": "npm-run-all --sequential lint:back lint:front",
+    "lint:back": "cd server && npm run lint",
+    "lint:front": "echo 'front lint'"
   },
   "repository": {
     "type": "git",
@@ -17,24 +24,8 @@
     "url": "https://github.com/sgmap/etudiant-entrepreneur/issues"
   },
   "homepage": "https://github.com/sgmap/etudiant-entrepreneur#readme",
-  "dependencies": {
-    "body-parser": "1.15.2",
-    "bunyan": "1.8.1",
-    "bunyan-blackhole": "1.1.1",
-    "bunyan-format": "0.2.1",
-    "express": "4.14.0",
-    "express-bunyan-logger": "1.3.0",
-    "http-measuring-client": "0.3.7",
-    "istanbul": "0.4.4",
-    "mocha": "2.5.3",
-    "nconf": "0.8.4",
-    "standard-error": "1.1.0",
-    "string": "3.3.1"
-  },
+  "dependencies": {},
   "devDependencies": {
-    "coveralls": "2.11.9",
-    "eslint": "3.0.0",
-    "npm-run-all": "2.3.0",
-    "supertest": "1.2.0"
+    "npm-run-all": "3.1.0"
   }
 }
diff --git a/.eslintrc → server/.eslintrc b/.eslintrc → server/.eslintrc
diff --git a/server/.istanbul.yml b/server/.istanbul.yml
@@ -0,0 +1,3 @@
+instrumentation:
+  excludes: ['*.test.js']
+  extensions: ['.js']
diff --git a/api/lib/middlewares/formatError.js → server/api/lib/middlewares/formatError.js b/api/lib/middlewares/formatError.js → server/api/lib/middlewares/formatError.js
diff --git a/api/routes/index.js → server/api/routes/index.js b/api/routes/index.js → server/api/routes/index.js
diff --git a/api/server.js → server/api/server.js b/api/server.js → server/api/server.js
diff --git a/api/system/index.js → server/api/system/index.js b/api/system/index.js → server/api/system/index.js
diff --git a/api/system/system.controller.js → server/api/system/system.controller.js b/api/system/system.controller.js → server/api/system/system.controller.js
diff --git a/api/system/test/system.api.test.js → server/api/system/test/system.api.test.js b/api/system/test/system.api.test.js → server/api/system/test/system.api.test.js
diff --git a/apps.json → server/apps.json b/apps.json → server/apps.json
diff --git a/bin/api.js → server/bin/api.js b/bin/api.js → server/bin/api.js
diff --git a/defaults.json → server/defaults.json b/defaults.json → server/defaults.json
diff --git a/server/package.json b/server/package.json
@@ -0,0 +1,40 @@
+{
+  "name": "etudiant-entrepreneur",
+  "version": "0.0.1",
+  "description": "Faciliter l'accès au statut et à ses bénéfices",
+  "scripts": {
+    "start": "./bin/api.js",
+    "test": "./node_modules/.bin/istanbul cover --print details node_modules/mocha/bin/_mocha -- -R spec api/*/test/** --recursive",
+    "lint": "./node_modules/.bin/eslint api/ bin/"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/sgmap/etudiant-entrepreneur.git"
+  },
+  "author": "Nicolas Brohée",
+  "license": "AGPL-3.0",
+  "bugs": {
+    "url": "https://github.com/sgmap/etudiant-entrepreneur/issues"
+  },
+  "homepage": "https://github.com/sgmap/etudiant-entrepreneur#readme",
+  "dependencies": {
+    "body-parser": "1.15.2",
+    "bunyan": "1.8.1",
+    "bunyan-blackhole": "1.1.1",
+    "bunyan-format": "0.2.1",
+    "express": "4.14.0",
+    "express-bunyan-logger": "1.3.0",
+    "http-measuring-client": "0.3.7",
+    "istanbul": "0.4.4",
+    "mocha": "2.5.3",
+    "nconf": "0.8.4",
+    "standard-error": "1.1.0",
+    "string": "3.3.1"
+  },
+  "devDependencies": {
+    "coveralls": "2.11.9",
+    "eslint": "3.0.0",
+    "npm-run-all": "2.3.0",
+    "supertest": "1.2.0"
+  }
+}