Merge pull request #99 from Cavdy/frontend-app

Frontend app
Cavdy · Apr 26, 2019 · 83d6f96 · 83d6f96
2 parents be4dcd3 + 185d049
commit 83d6f96
Show file tree

Hide file tree

Showing 9 changed files with 1,050 additions and 977 deletions.
diff --git a/server/v1/config/database.js b/server/v1/config/database.js
@@ -1,58 +1,61 @@
-import { Pool } from 'pg';
-import debug from 'debug';
-import { parse } from 'pg-connection-string';
-
-let conString;
-
-if (process.env.HEROKU_ACCESS === 'heroku_access') {
-  conString = parse(process.env.BANKA_DB);
-} else {
-  conString = parse(process.env.DB_CONFIG);
-}
-
-const pool = new Pool(conString);
-
-const dbConnection = {
-  /**
-   * Connect to database
-   * @constructor
-   * @param {*} passedQuery - passed in SQL query.
-   * @param {*} passedData -passed in db values
-   */
-  async dbConnect(passedQuery, passedData) {
-    try {
-      return (async () => {
-        const client = await pool.connect();
-        try {
-          return await client.query(passedQuery, passedData);
-        } finally {
-          client.release();
-        }
-      })();
-    } catch (e) {
-      return debug('query')(e.stack);
-    }
-  },
-
-  /**
-   * Connect to database - For test
-   * @constructor
-   * @param {*} passedQuery - passed in SQL query.
-   */
-  async dbTesting(passedQuery) {
-    try {
-      return (async () => {
-        const client = await pool.connect();
-        try {
-          return await client.query(passedQuery);
-        } finally {
-          client.release();
-        }
-      })();
-    } catch (e) {
-      return debug('query')(e.stack);
-    }
-  },
-};
-
-export default dbConnection;
+import { Pool } from 'pg';
+import dotenv from 'dotenv';
+import debug from 'debug';
+import { parse } from 'pg-connection-string';
+
+dotenv.config();
+
+let conString;
+
+if (process.env.HEROKU_ACCESS === 'heroku_access') {
+  conString = parse(process.env.BANKA_DB);
+} else {
+  conString = parse(process.env.DB_CONFIG);
+}
+
+const pool = new Pool(conString);
+
+const dbConnection = {
+  /**
+   * Connect to database
+   * @constructor
+   * @param {*} passedQuery - passed in SQL query.
+   * @param {*} passedData -passed in db values
+   */
+  async dbConnect(passedQuery, passedData) {
+    try {
+      return (async () => {
+        const client = await pool.connect();
+        try {
+          return await client.query(passedQuery, passedData);
+        } finally {
+          client.release();
+        }
+      })();
+    } catch (e) {
+      return debug('query')(e.stack);
+    }
+  },
+
+  /**
+   * Connect to database - For test
+   * @constructor
+   * @param {*} passedQuery - passed in SQL query.
+   */
+  async dbTesting(passedQuery) {
+    try {
+      return (async () => {
+        const client = await pool.connect();
+        try {
+          return await client.query(passedQuery);
+        } finally {
+          client.release();
+        }
+      })();
+    } catch (e) {
+      return debug('query')(e.stack);
+    }
+  },
+};
+
+export default dbConnection;
diff --git a/server/v1/routes/accounts.js b/server/v1/routes/accounts.js
@@ -6,10 +6,20 @@ const router = express.Router();
 
 // creating our routes
 router.get('/', jwtMiddleware.verifyJwt, AccountsController.allAccounts);
-router.get('/:accountNumber', jwtMiddleware.verifyJwt, AccountsController.specificAccounts);
-router.get('/:accountNumber/transactions', jwtMiddleware.verifyJwt, AccountsController.allAccountTransaction);
-router.post('/', jwtMiddleware.verifyJwt, AccountsController.createAccount);
-router.patch('/:accountNumber', jwtMiddleware.verifyJwt, AccountsController.patchAccount);
-router.delete('/:accountNumber', jwtMiddleware.verifyJwt, AccountsController.deleteAccount);
+router.get('/:accountNumber',
+  jwtMiddleware.verifyJwt,
+  AccountsController.specificAccounts);
+router.get('/:accountNumber/transactions',
+  jwtMiddleware.verifyJwt,
+  AccountsController.allAccountTransaction);
+router.post('/',
+  jwtMiddleware.verifyJwt,
+  AccountsController.createAccount);
+router.patch('/:accountNumber',
+  jwtMiddleware.verifyJwt,
+  AccountsController.patchAccount);
+router.delete('/:accountNumber',
+  jwtMiddleware.verifyJwt,
+  AccountsController.deleteAccount);
 
 export default router;
diff --git a/server/v1/routes/auth.js b/server/v1/routes/auth.js
@@ -7,6 +7,10 @@ const router = express.Router();
 // creating our routes
 router.post('/signin', jwtMiddleware.signinJwt, AuthController.loginUser);
 router.post('/signup', jwtMiddleware.signinJwt, AuthController.registerUser);
-router.post('/signup/addstaff', jwtMiddleware.checkToken, jwtMiddleware.signinJwt, jwtMiddleware.verifyJwt, AuthController.createStaffs);
+router.post('/signup/addstaff',
+  jwtMiddleware.checkToken,
+  jwtMiddleware.signinJwt,
+  jwtMiddleware.verifyJwt,
+  AuthController.createStaffs);
 
 export default router;
diff --git a/server/v1/routes/transaction.js b/server/v1/routes/transaction.js
@@ -5,8 +5,14 @@ import TransactionController from '../controllers/transaction';
 const router = express.Router();
 
 // creating our routes
-router.get('/:transactionid', jwtMiddleware.verifyJwt, TransactionController.getSpecificTransaction);
-router.post('/:accountNumber/debit', jwtMiddleware.verifyJwt, TransactionController.debitTransaction);
-router.post('/:accountNumber/credit', jwtMiddleware.verifyJwt, TransactionController.creditTransaction);
+router.get('/:transactionid',
+  jwtMiddleware.verifyJwt,
+  TransactionController.getSpecificTransaction);
+router.post('/:accountNumber/debit',
+  jwtMiddleware.verifyJwt,
+  TransactionController.debitTransaction);
+router.post('/:accountNumber/credit',
+  jwtMiddleware.verifyJwt,
+  TransactionController.creditTransaction);
 
 export default router;
diff --git a/server/v1/routes/users.js b/server/v1/routes/users.js
@@ -6,7 +6,9 @@ const router = express.Router();
 
 // creating our routes
 router.get('/', jwtMiddleware.verifyJwt, UsersController.getAllUsers);
-router.get('/:email/accounts', jwtMiddleware.verifyJwt, UsersController.getUsersAccounts);
+router.get('/:email/accounts',
+  jwtMiddleware.verifyJwt,
+  UsersController.getUsersAccounts);
 router.delete('/:id', jwtMiddleware.verifyJwt, UsersController.deleteUser);
 
 export default router;