Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 11 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
language: node_js
node_js:
- 12
script: cd client ; npm install ; npm test
- 14
install:
- npm install -g codecov
script:
- cd client ; npm install
- npm test
- cd ..
- cd server ; npm install
- npm test
- cd ..
- codecov
6 changes: 6 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
FROM node:latest
COPY . /opt/office-queue
WORKDIR /opt/office-queue
RUN cd client; npm install; cd ..
RUN cd server; npm install; cd ..
CMD CI=true npm start --prefix ./client & npm start --prefix ./server
14,143 changes: 0 additions & 14,143 deletions client/package-lock.json

This file was deleted.

9 changes: 6 additions & 3 deletions client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,13 @@
"react-bootstrap-typeahead": "^5.1.2",
"react-dom": "^16.14.0",
"react-router-dom": "^5.2.0",
"react-scripts": "3.4.3",
"moment": "^2.26.0"
},
"proxy": "http://localhost:3001",
"scripts": {
"start": "react-scripts start",
"build": "react-scripts build",
"test": "react-scripts test",
"test": "react-scripts test --ci --coverage --watchAll=false",
"eject": "react-scripts eject"
},
"eslintConfig": {
Expand Down Expand Up @@ -71,5 +70,9 @@
"email": "",
"url": ""
}
]
],
"devDependencies": {
"nyc": "^15.1.0",
"react-scripts": "^3.4.3"
}
}
2 changes: 1 addition & 1 deletion client/src/tests/App.test.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from 'reactcallNextCustomer';
import React from 'react';
import { render } from '@testing-library/react';
import App from '../App';

Expand Down
Binary file modified server/models/db/database.db
Binary file not shown.
Loading