Merge pull request #13 from andela/ch-setup-project-folders-163115287

#163115287 Setup project folder structure
andela · Jan 14, 2019 · 2a3b93c · 2a3b93c
2 parents 92dc6ee + 436c17a
commit 2a3b93c
Show file tree

Hide file tree

Showing 13 changed files with 10 additions and 199 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,7 @@
+#### What does this PR do?
+
+#### Description of Task to be completed?
+
+#### How should this be manually tested?
+
+#### What are the relevant pivotal tracker stories?
diff --git a/config/index.js b/config/index.js
diff --git a/config/passport.js b/config/passport.js
diff --git a/models/User.js b/models/User.js
diff --git a/package.json b/package.json
@@ -9,8 +9,8 @@
     "comp": "babel index.js -d build",
     "clear": "rimraf build && babel index.js -d build",
     "start": "npm run comp && node build/index.js",
-    "dev-start": "nodemon -w src --exec npm run start",
-    "test": "nyc --reporter=html --reporter=text --require @babel/register mocha --exit --timeout=20000",
+    "start:dev": "nodemon -w src --exec npm run start",
+    "test": "nyc --reporter=html --reporter=text --require @babel/register mocha server/test/**/*.js --exit --timeout=20000",
     "coverage": "nyc report --reporter=text-lcov | coveralls"
   },
   "author": "Andela Simulations Programme",

diff --git a/routes/api/index.js b/routes/api/index.js
diff --git a/routes/api/users.js b/routes/api/users.js
diff --git a/routes/index.js b/routes/index.js
diff --git a/server/controllers/.gitkeep b/server/controllers/.gitkeep
diff --git a/server/helpers/.gitkeep b/server/helpers/.gitkeep
diff --git a/server/middlewares/.gitkeep b/server/middlewares/.gitkeep
diff --git a/server/routes/.gitkeep b/server/routes/.gitkeep
diff --git a/test/sampleTest.js → server/test/sampleTest.js b/test/sampleTest.js → server/test/sampleTest.js
@@ -1,3 +1,4 @@
+// eslint-disable-next-line import/no-extraneous-dependencies
 import { expect } from 'chai';