ki9
/
tracman-server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merged conflicts

master
Keith Irwin 2018-11-19 09:52:16 -06:00
parent 440e227f04 db86795ada
commit 9383590a73
No known key found for this signature in database
GPG Key ID: 7A2D6993A44010AA
3 changed files with 455 additions and 2041 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Dockerfile
View File

@ -3,12 +3,11 @@
# Node version
FROM node:8.4.0
# Install tracman from Github
RUN git clone https://github.com/Tracman-Org/Server.git /tracman
# Copy files into container
COPY . /tracman
WORKDIR /tracman
# Install dependencies
COPY package.json package-lock.json ./
RUN npm install
# Bundle source

2471
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

20
package.json
View File

@ -11,19 +11,19 @@
"cookie-session": "^2.0.0-beta.2",
"csurf": "^1.9.0",
"debug": "^2.6.9",
"express": "^4.16.3",
"express": "^4.16.4",
"express-request-limit": "^1.0.2",
"helmet": "^3.13.0",
"helmet": "^3.15.0",
"helmet-csp": "^2.7.1",
"jquery": "^3.2.1",
"load-google-maps-api": "^1.0.0",
"minifier": "^0.8.1",
"moment": "^2.22.2",
"mongo-sanitize": "^1.0.0",
"mongoose": "^4.13.15",
"mongoose": "^4.13.17",
"mongoose-unique-validator": "^1.0.6",
"nodemailer": "^4.6.7",
"nunjucks": "^3.1.3",
"nodemailer": "^4.6.8",
"nunjucks": "^3.1.4",
"passport": "^0.3.2",
"passport-facebook": "^2.1.1",
"passport-facebook-token": "^3.3.0",
@ -33,7 +33,7 @@
"passport-twitter": "^1.0.4",
"passport-twitter-token": "^1.3.0",
"request": "^2.88.0",
"slug": "^0.9.1",
"slug": "^0.9.2",
"socket.io": "^2.1.1",
"socket.io-client": "^2.1.1",
"style-loader": "^0.18.2",
@ -43,19 +43,19 @@
"zxcvbn": "^4.4.2"
},
"devDependencies": {
"chai": "^4.1.2",
"chai": "^4.2.0",
"chai-http": "^3.0.0",
"coveralls": "^3.0.2",
"istanbul": "^1.0.0-alpha.2",
"less": "^3.0.1",
"less": "^3.8.1",
"less-plugin-clean-css": "^1.5.1",
"mocha": "^4.0.1",
"mocha-froth": "^0.2.10",
"nodemon": "^1.18.3",
"nodemon": "^1.18.6",
"nsp": "^3.2.1",
"standard": "^10.0.3",
"superagent": "^3.8.3",
"supertest": "^3.1.0"
"supertest": "^3.3.0"
},
"scripts": {
"test": "node_modules/mocha/bin/_mocha",