Skip to content

Commit 39b025e

Browse files
committed
Rename to backend and add a .env config file
1 parent 3266873 commit 39b025e

File tree

5 files changed

+18
-27
lines changed

5 files changed

+18
-27
lines changed

.env.backend

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
DATABASE_URL=postgres://db:5432
2+
PORT=8000
3+
HALO_API_KEY=12345

backend/docker-compose.yml

Lines changed: 0 additions & 18 deletions
This file was deleted.

backend/package.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,10 @@
1111
"author": "Duncan Finney",
1212
"license": "ISC",
1313
"dependencies": {
14+
"bluebird": "^3.4.1",
15+
"bluebird-co": "^2.1.2",
1416
"dotenv": "^2.0.0",
15-
"express": "^4.14.0"
17+
"express": "^4.14.0",
18+
"haloapi": "^0.5.0"
1619
}
1720
}

backend/routes.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
const express = require('express');
2+
const HaloAPI = require('haloapi');
3+
const co = require('bluebird-co').co;
4+
5+
const h5 = new HaloAPI(process.env.HALO_API_KEY);
26

37
const router = express.Router();
4-
router.get('/', function(req, res) {
5-
res.send('Hello world');
6-
});
8+
router.get('/gamertags/:gamertag/matches', (req, res) => {
9+
res.end('hello there');
10+
})
711

812
module.exports = router;

docker-compose.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ services:
33
db:
44
image: postgres
55

6-
web:
6+
backend:
77
build:
88
context: ./backend
99
dockerfile: Dockerfile.dev
@@ -15,16 +15,15 @@ services:
1515
- ./backend:/code
1616
links:
1717
- db
18-
environment:
19-
- DATABASE_URL=postgres://db:5432
20-
- PORT=8000
18+
env_file: .env.backend
2119

2220
frontend:
2321
build:
2422
context: ./frontend
2523
dockerfile: Dockerfile.dev
24+
2625
depends_on:
27-
- web
26+
- backend
2827
ports:
2928
- "3000:3000"
3029
volumes:

0 commit comments

Comments
 (0)