BytecodeAgency
diff --git a/‎README.md‎
Lines changed: 22 additions & 0 deletions b/‎README.md‎
Lines changed: 22 additions & 0 deletions
diff --git a/‎controllers/controllers.js‎
Lines changed: 6 additions & 6 deletions b/‎controllers/controllers.js‎
Lines changed: 6 additions & 6 deletions
diff --git a/‎…grations/20181030235206_initial_setup.js‎ ‎…grations/20181030235206_initial_setup.js‎migrations/20181030235206_initial_setup.js renamed to database/migrations/20181030235206_initial_setup.js b/‎…grations/20181030235206_initial_setup.js‎ ‎…grations/20181030235206_initial_setup.js‎migrations/20181030235206_initial_setup.js renamed to database/migrations/20181030235206_initial_setup.js
diff --git a/‎seeds/test-data.js‎ ‎database/seeds/test-data.js‎seeds/test-data.js renamed to database/seeds/test-data.js b/‎seeds/test-data.js‎ ‎database/seeds/test-data.js‎seeds/test-data.js renamed to database/seeds/test-data.js
diff --git a/‎knexfile-test.js‎
Lines changed: 4 additions & 0 deletions b/‎knexfile-test.js‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎knexfile.js‎
Lines changed: 6 additions & 0 deletions b/‎knexfile.js‎
Lines changed: 6 additions & 0 deletions
diff --git a/‎package.json‎
Lines changed: 2 additions & 2 deletions b/‎package.json‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎app.js‎ ‎server/app.js‎app.js renamed to server/app.js b/‎app.js‎ ‎server/app.js‎app.js renamed to server/app.js
diff --git a/‎controllers/authors-controller.js‎ ‎server/controllers/authors-server.js‎controllers/authors-controller.js renamed to server/controllers/authors-server.js
Lines changed: 1 addition & 1 deletion b/‎controllers/authors-controller.js‎ ‎server/controllers/authors-server.js‎controllers/authors-controller.js renamed to server/controllers/authors-server.js
Lines changed: 1 addition & 1 deletion
diff --git a/‎controllers/categories-controller.js‎ ‎server/controllers/categories-server.js‎controllers/categories-controller.js renamed to server/controllers/categories-server.js b/‎controllers/categories-controller.js‎ ‎server/controllers/categories-server.js‎controllers/categories-controller.js renamed to server/controllers/categories-server.js
@@ -44,10 +44,12 @@ to start using the package, create a new instance of the NodeBlog class
 
 ```js
 const nodeBlogConfig = {
+    client: 'YOUR_DB_CLIENT' // for more info, see https://knexjs.org/
     host: 'YOUR_DB_HOST'
     database: 'YOUR_DB_NAME'
     user: 'YOUR_DB_USER'
     pass: 'YOUR_DB_PASS'
+    debug: true || false
 };
 const nodeBlog = new NodeBlog(nodeBlogConfig);
 ```
@@ -80,8 +82,27 @@ For development, the following commands are available:
 | `yarn run migrate` | Migrates your database (normal one, not test database) to the most recent migration, seeds will not be ran |
 | `yarn run reinstall` | Deletes the `node_modules/` folder and reinstalls everything, if you get some stange dependency errors, run this command |
 
+### Folder structure
+
+```md
+├── controllers         Controller logic for the module based API
+├── database            All database related files
+│   ├── migrations
+│   └── seeds
+├── helpers             Helper files, for example: logger, database instance
+├── server              Server configuration
+│   ├── controllers
+│   ├── middleware
+│   │   └── modules
+│   └── routes
+└── tests               All tests written
+    ├── config
+    └── database
+```
+
 # Todo
 
+* Add Yarn seed command
 * Add authentication, password hashing -> also improve seed scripts
     * Add auth routes to get JWT
     * Using https://thejackalofjavascript.com/architecting-a-restful-node-js-app/
@@ -92,6 +113,7 @@ For development, the following commands are available:
 * Make sure the application is available both as a NPM module and as a standalone service
 * Integrate https://github.com/semantic-release/semantic-release
 * Split up standalone and module
+* Add XML feed
 
 ## Notes
 
 
@@ -1,9 +1,9 @@
-/* eslint-disable global-require */
+const Authors = require('./authors');
+const Users = require('./users');
+// const Categories = require('./categories');
+// const Posts = require('./posts');
 
 module.exports = {
-    Status: require('./status-controller'),
-    Authors: require('./authors-controller'),
-    Users: require('./users-controller'),
-    Categories: require('./categories-controller'),
-    Posts: require('./posts-controller'),
+    Authors,
+    Users,
 };
@@ -26,7 +26,11 @@ module.exports = {
     },
     migrations: {
         tableName: 'knex_migrations',
+        directory: './database/migrations',
     },
     debug,
     asyncStackTraces: debug,
+    seeds: {
+        directory: './database/seeds',
+    },
 };
@@ -1,3 +1,5 @@
+// TODO: Improve file: https://knexjs.org/#knexfile, move file to ./database
+
 require('dotenv').config();
 
 // eslint-disable-next-line
@@ -26,7 +28,11 @@ module.exports = {
     },
     migrations: {
         tableName: 'knex_migrations',
+        directory: './database/migrations',
     },
     debug,
     asyncStackTraces: debug,
+    seeds: {
+        directory: './database/seeds',
+    },
 };
@@ -25,8 +25,8 @@
     "node": ">=8.0.0"
   },
   "scripts": {
-    "dev": "nodemon",
-    "start": "node server.js",
+    "dev": "nodemon server/server.js",
+    "start": "node server/server.js",
     "lint": "eslint --ext .jsx,.js,.ts .",
     "test": "NODE_ENV=TEST jest -i",
     "test:watch": "NODE_ENV=TEST jest -i --watch",
 
@@ -1,4 +1,4 @@
-const { listAuthors } = require('./authors');
+const { listAuthors } = require('../../controllers/authors');
 
 const list = async (req, res) => {
     const authors = await listAuthors();
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-const { listAuthors } = require('./authors');`
	`1`	`+const { listAuthors } = require('../../controllers/authors');`
`2`	`2`
`3`	`3`	`const list = async (req, res) => {`
`4`	`4`	`const authors = await listAuthors();`