refactor - routes

Author: jing

src/app.js

@@ -6,6 +6,8 @@ const debug = require('debug')('app');
 const morgan = require('morgan');
 
 const {accounts, users, writeJSON} = require('./data');
+const accountRoutes = require('./routes/accounts');
+const servicesRoutes = require('./routes/services');
 
 const app = express();
 const PORT = process.env.PORT || 3000;
@@ -18,6 +20,8 @@ app.set('view engine', 'ejs');
 app.use(express.static(path.join(__dirname, 'public')));
 app.use(morgan('tiny'));
 app.use(express.urlencoded({extended: true}));
+app.use('/account', accountRoutes);
+app.use('/services', servicesRoutes);
 
 
 app.get('/', (req, res) => {
@@ -26,37 +30,10 @@ app.get('/', (req, res) => {
 		accounts,
 	});
 })
-app.get('/savings', (req, res) => {
-	res.render('account', {account: accounts.savings});
-})
-app.get('/checking', (req, res) => {
-	res.render('account', {account: accounts.checking});
-})
-app.get('/credit', (req, res) => {
-	res.render('account', {account: accounts.credit});
-})
+
 app.get('/profile', (req, res) => {
 	res.render('profile', {user: users[0]});
 })
-app.get('/transfer', (req, res) => {
-	res.render('transfer');
-})
-app.post('/transfer', (req, res) => {
-	accounts[req.body.from].balance = accounts[req.body.from].balance - req.body.amount;
-	accounts[req.body.to].balance = parseInt(accounts[req.body.to].balance) + parseInt(req.body.amount, 10);
-	writeJSON();
-	res.render('transfer', {message: 'Transfer Completed'});
-})
-
-app.get('/payment', (req, res) => {
-	res.render('payment', {account: accounts.credit});
-})
 
-app.post('/payment', (req, res) => {
-	accounts.credit.balance -= req.body.amount;
-	accounts.credit.available += parseInt(req.body.amount, 10);
-	writeJSON();
-	res.render('payment', {message: 'Payment successful', account: accounts.credit});
-})
 
 app.listen(PORT, () => debug(`Listerning on port ${chalk.green(PORT)}`));

src/routes/accounts.js

@@ -0,0 +1,15 @@
+const express = require('express');
+const router = express.Router();
+const {accounts} = require('../data');
+
+router.get('/savings', (req, res) => {
+	res.render('account', {account: accounts.savings});
+})
+router.get('/checking', (req, res) => {
+	res.render('account', {account: accounts.checking});
+})
+router.get('/credit', (req, res) => {
+	res.render('account', {account: accounts.credit});
+})
+
+module.exports = router;

src/routes/services.js

@@ -0,0 +1,26 @@
+const express = require('express');
+const router = express.Router();
+const {accounts, writeJSON} = require('../data');
+
+router.get('/transfer', (req, res) => {
+	res.render('transfer');
+})
+router.post('/transfer', (req, res) => {
+	accounts[req.body.from].balance = accounts[req.body.from].balance - req.body.amount;
+	accounts[req.body.to].balance = parseInt(accounts[req.body.to].balance) + parseInt(req.body.amount, 10);
+	writeJSON();
+	res.render('transfer', {message: 'Transfer Completed'});
+})
+
+router.get('/payment', (req, res) => {
+	res.render('payment', {account: accounts.credit});
+})
+
+router.post('/payment', (req, res) => {
+	accounts.credit.balance -= req.body.amount;
+	accounts.credit.available += parseInt(req.body.amount, 10);
+	writeJSON();
+	res.render('payment', {message: 'Payment successful', account: accounts.credit});
+})
+
+module.exports = router;

src/views/account.ejs

@@ -3,7 +3,7 @@
   <%- include('transactions', {account: account}); %>
 
   <% if (account.unique_name == 'credit' && account.balance > 0) { %>
-    <br><a href="/payment">Make a Payment</a>
+    <br><a href="/services/payment">Make a Payment</a>
   <% } %>
 
   <br><a href="/">Back to Accounts Summary</a>

src/views/index.ejs

@@ -10,5 +10,5 @@
 
 
 <br>
-<a href="/transfer">Transfer</a>
+<a href="/services/transfer">Transfer</a>
 <%- include('footer.ejs'); %>

src/views/payment.ejs

@@ -8,7 +8,7 @@
   <span class="error"></span>
 
   <p>Current Balance: $<%= account.balance %></p>
-  <form id="paymentForm" action="/payment" method="POST">
+  <form id="paymentForm" action="/services/payment" method="POST">
     <label for="amount">Payment: <input type="number" name="amount" id="amount" required placeholder="amount" step="0.01"></label>
     <button type="submit">Submit Payment</button>
   </form>

src/views/summary.ejs

@@ -12,14 +12,14 @@
     <th>Current Balance</th>
   </tr>
   <tr>
-    <td><a href="/<%= account.unique_name %>"><%= account.nickname %></a></td>
+    <td><a href="/account/<%= account.unique_name %>"><%= account.nickname %></a></td>
     <td><%= account.account_number %></td>
     <% if (account.unique_name == 'credit') { %>
       <td>$<%= account.available %></td>
     <% } else { %>
       <td>$<%= account.prior_balance %></td>
     <% } %>
-    
+
     <td>$<%= account.balance %></td>
   </tr>
 </table>

src/views/transfer.ejs

@@ -7,7 +7,7 @@
   <% } %>
   <span class="error"></span>
 
-  <form id="transferForm" action="/transfer" method="post">
+  <form id="transferForm" action="/services/transfer" method="post">
     <span>Transfer From: </span>
     <select required name="from" id="from">
       <option value="checking">Checking</option>