Move the content of the api folder to the root of the repository

NijiDigital · Apr 4, 2017 · 827046c · 827046c
1 parent 38ab333
commit 827046c
Show file tree

Hide file tree

Showing 16 changed files with 9 additions and 12 deletions.
diff --git a/api/.editorconfig → .editorconfig b/api/.editorconfig → .editorconfig
diff --git a/.gitignore b/.gitignore
@@ -6,7 +6,6 @@ logs/*
 .maestro.yml
 automation/bin/ansible-deploy
 vendor/
-/api/config/env.json
 
 ### JetBrains template
 # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio

diff --git a/README.md b/README.md
@@ -165,14 +165,14 @@ Please choose one of the following install option:
 
 <details open="1">
 <summary>Install with yarn</summary>
-From the `api/` folder:
+From the root folder:
 ```sh
 yarn
 ```
 </details>
 <details>
 <summary>Install with npm</summary>
-From the `api/` folder:  
+From the root folder:  
 ```sh
 npm install
 ```
@@ -182,16 +182,16 @@ npm install
 
 <details open="1">
 <summary>Launch with pm2</summary>
-From the `api/` folder:  
+From the root folder:  
 ```sh
-pm2 start app.js --name="mockiji-api" -- --api-base-path ../mocks
+pm2 start app.js --name="mockiji-api"
 ```
 </details>
 <details>
 <summary>Launch with Node</summary>
-From the `api/` folder:  
+From the root folder:  
 ```sh
-node app --api-base-path ../mocks
+node app
 ```
 </details>
 </details>
@@ -228,7 +228,7 @@ Usage: `mockiji --port 8001 --api-base-path ./my-mocks/`
 | logger-level  | ['trace', 'debug', 'info', 'warn', 'error', 'fatal'] | warn                    | Logs level                             |
 
 ### Configuration file
-The whole [node-convict configuration schema](https://github.com/mozilla/node-convict#the-schema) can be found in the `api/src/utils/configuration.js` file.
+The whole [node-convict configuration schema](https://github.com/mozilla/node-convict#the-schema) can be found in the `src/utils/configuration.js` file.
 
 You can override the default values by specifying a JSON configuration file when running Mockiji, e.g. `mockiji --config-file mockiji.json`.
 
@@ -243,7 +243,7 @@ As an example, using a config file:
 {
   "logger": {
     "name": "api-mockiji",
-    "filepath": "../logs/api-mockiji.log",
+    "filepath": "./logs/api-mockiji.log",
     "level": "warn",
     "type": "rotating-file",
     "period": "1d",

diff --git a/api/app.js → app.js b/api/app.js → app.js
diff --git a/automation/bin/install b/automation/bin/install
@@ -20,11 +20,9 @@ echo     INSTALL mockiji
 #hook pre
 pre_bin
 
-pwd
-cd api
 npm install
 
-pm2 start app.js --name="mockiji-api" -- --config-file ../../mocks/data/dev.json
+pm2 start app.js --name="mockiji-api" -- --config-file ../mocks/data/dev.json
 pm2 save
 
 #hook post

diff --git a/api/npm-shrinkwrap.json → npm-shrinkwrap.json b/api/npm-shrinkwrap.json → npm-shrinkwrap.json
diff --git a/api/package.json → package.json b/api/package.json → package.json
diff --git a/api/src/controllers/MockCtrl.js → src/controllers/MockCtrl.js b/api/src/controllers/MockCtrl.js → src/controllers/MockCtrl.js
diff --git a/api/src/routes/index.js → src/routes/index.js b/api/src/routes/index.js → src/routes/index.js
diff --git a/api/src/services/FileLoaderService.js → src/services/FileLoaderService.js b/api/src/services/FileLoaderService.js → src/services/FileLoaderService.js
diff --git a/api/src/services/FilePathBuilderService.js → src/services/FilePathBuilderService.js b/api/src/services/FilePathBuilderService.js → src/services/FilePathBuilderService.js
diff --git a/api/src/services/URLRecomposerService.js → src/services/URLRecomposerService.js b/api/src/services/URLRecomposerService.js → src/services/URLRecomposerService.js
diff --git a/api/src/utils/Toolbox.js → src/utils/Toolbox.js b/api/src/utils/Toolbox.js → src/utils/Toolbox.js
diff --git a/api/src/utils/configuration.js → src/utils/configuration.js b/api/src/utils/configuration.js → src/utils/configuration.js
diff --git a/api/src/utils/logger.js → src/utils/logger.js b/api/src/utils/logger.js → src/utils/logger.js
diff --git a/api/yarn.lock → yarn.lock b/api/yarn.lock → yarn.lock