Skip to content

merge request #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rupertgh wants to merge 8 commits into
base: master
Choose a base branch
from
Open

merge request #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8e3f5ff
Update mysql ip
rupertgh Nov 22, 2017
7e048f9
Update index.ejs
rupertgh Nov 22, 2017
28c551b
Update customers_web_all.ejs
rupertgh Nov 22, 2017
fdfaeb6
Update app.js
rupertgh Nov 22, 2017
855aee3
Update app.js
rupertgh Nov 22, 2017
953abb1
Update package.json
rupertgh Nov 22, 2017
188bddf
Update package.json
rupertgh Nov 22, 2017
1fbf9d4
Update app.js
rupertgh Nov 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ var express = require('express');
var routes = require('./routes');
var http = require('http');
var path = require('path');
var restclient = require('node-rest-client');

//load list route
var customersweb = require('./routes/customersweb');
Expand All @@ -25,6 +26,8 @@ app.use(express.json());
app.use(express.urlencoded());
app.use(express.methodOverride());

app.locals.apiurl = process.env.APIURL;

app.use(express.static(path.join(__dirname, 'public')));

// development only
Expand All @@ -41,7 +44,7 @@ app.use(

connection(mysql,{

host: '172.30.235.5', // host mysql service
host: '172.30.110.147', // host mysql service
user: 'dbuser',
password : 'password',
port : 3306, // port mysql service
Expand All @@ -60,5 +63,5 @@ app.get('/', customersweb.listall);
app.use(app.router);

http.createServer(app).listen(app.get('port'), function(){
console.log('Express server listening on port ' + app.get('port'));
console.log('Express server listening on port ' + app.get('port') + app.locals.apiurl);
});
3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"express": "3.5.1",
"express-myconnection": "1.0.4",
"jade": "*",
"mysql": "2.2.0"
"mysql": "2.2.0",
"node-rest-client": "3.1.0"
}
}
2 changes: 1 addition & 1 deletion views/customers_web_all.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<table class="table-fill">
<thead>
<tr>
<th class="text-left">Customer ID</th>
<th class="text-left">Ruperts Customer ID</th>
<th class="text-left">VIP Status</th>
<th class="text-left">Balance</th>
</tr>
Expand Down
2 changes: 1 addition & 1 deletion views/index.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</head>
<body>

<h2>Customers<h2>
<h2>Ruperts Customers<h2>
</body>

</html>