Skip to content

Commit 8569e1c

Browse files
Merge pull request #5 from julien-bouyer/feature/v1.1
Feature/v1.1
2 parents 02bff83 + fa8148c commit 8569e1c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+13608
-4697
lines changed

.env

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
NODE_ENV=development
2+
EQUIPES_BACKEND_URL=http://localhost:9009/api/equipes
3+
TOURNOIS_BACKEND_URL=http://localhost:9009/api/tournois

.env.production

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
NODE_ENV=production
2+
EQUIPES_BACKEND_URL=https://node-service.famille-bouyer.fr/api/equipes
3+
TOURNOIS_BACKEND_URL=https://node-service.famille-bouyer.fr/api/tournois

.eslintrc.js

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
module.exports = {
2+
root: true,
3+
env: {
4+
node: true
5+
},
6+
'extends': [
7+
'plugin:vue/essential',
8+
'eslint:recommended'
9+
],
10+
rules: {
11+
'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
12+
'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off'
13+
},
14+
parserOptions: {
15+
parser: 'babel-eslint'
16+
}
17+
}

.gitignore

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,21 @@
1-
/node_modules/*
2-
/.git/*
1+
.DS_Store
2+
node_modules
3+
/dist
4+
5+
# local env files
6+
.env.local
7+
.env.*.local
8+
9+
# Log files
10+
npm-debug.log*
11+
yarn-debug.log*
12+
yarn-error.log*
13+
14+
# Editor directories and files
15+
.idea
16+
.vscode
17+
*.suo
18+
*.ntvs*
19+
*.njsproj
20+
*.sln
21+
*.sw?

.jsconfig.json

Whitespace-only changes.

README.md

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,9 @@ Run : `npm install`
1010

1111
### Run
1212

13-
In debug mode :
13+
`npm run server`
1414

15-
`DEBUG=myapp:* npm start`
16-
17-
18-
`npm run start`
15+
`npm run client`
1916

2017
### Database
2118

@@ -25,5 +22,5 @@ In debug mode :
2522
`docker-compose up -d`
2623
`docker-compose down`
2724

28-
`docker exec -it mariadb bash`
29-
`docker exec -it mariadb mysql -u root -p`
25+
`docker exec -it basketdb-docker bash`
26+
`docker exec -it basketdb-docker mysql -u root -p`

_server/app.js

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
'use strict';
2+
3+
const express = require('express'),
4+
bodyParser = require('body-parser'),
5+
equipesRouter = require('./routes/equipes'),
6+
joueursRouter = require('./routes/joueurs'),
7+
matchsRouter = require('./routes/matchs'),
8+
phasesRouter = require('./routes/phases'),
9+
tournoisRouter = require('./routes/tournois'),
10+
usersRouter = require('./routes/users'),
11+
cors = require('cors');
12+
13+
const app = express();
14+
15+
app.set('port', process.env.PORT || 9009);
16+
app.use(bodyParser.json());
17+
app.use(cors());
18+
app.use(bodyParser.urlencoded({extended: true}));
19+
20+
app.use(function(req, res, next) {
21+
res.header("Access-Control-Allow-Origin", "*");
22+
res.header("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept");
23+
res.header("Access-Control-Allow-Methods", "PUT, DELETE");
24+
next();
25+
});
26+
27+
app.use('/api/equipes', equipesRouter);
28+
app.use('/api/joueurs', joueursRouter);
29+
app.use('/api/matchs', matchsRouter);
30+
app.use('/api/phases', phasesRouter);
31+
app.use('/api/tournois', tournoisRouter);
32+
app.use('/api/users', usersRouter);
33+
34+
// // catch 404 and forward to error handler
35+
// app.use(function(req, res, next) {
36+
// next(createError(404));
37+
// });
38+
//
39+
// // error handler
40+
// app.use(function(err, req, res, next) {
41+
// // set locals, only providing error in development
42+
// res.locals.message = err.message;
43+
// res.locals.error = req.app.get('env') === 'development' ? err : {};
44+
//
45+
// // render the error page
46+
// res.status(err.status || 500);
47+
// res.render('error');
48+
// });
49+
50+
app.listen(app.get('port'), function () {
51+
console.log('✔Express server listening on http://localhost:%d/', app.get('port'));
52+
});
53+

db/database.js renamed to _server/db/database.js

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
const mysql = require('mysql');
22

3-
var connection = mysql.createPool({
4-
host : 'localhost',
5-
user : 'root',
6-
port : 3385,
7-
password : 'root',
8-
database : 'basket_tournament'
3+
const connection = mysql.createPool({
4+
host: 'localhost',
5+
user: 'root',
6+
port: 3385,
7+
password: 'root',
8+
database: 'basket_tournament',
9+
charset: 'LATIN1_GENERAL_CI'
910
});
1011

1112
// (function checkConnection(connection) {
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)