senaduka/old-psihologija
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix parsing reports, change tables to use timestamps

Browse Source
This commit is contained in:
Bilal Catic
2019-06-03 09:22:23 +02:00
parent cae217739a
commit c5408c1295
6 changed files with 87 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
package.json
View File

@@ -10,7 +10,7 @@
"docker-build": "docker build -t simaspace .",
"docker-start": "docker run -e POSTGRES_USER=docker -e POSTGRES_PASSWORD=docker -e POSTGRES_DB=CrmIntegration --name pg_simaspace -d -p 5432:5432 simaspace",
"docker-stop": "docker stop pg_simaspace",
"setup": "npm run install-server && npm run install-client && npm run docker-build && npm run docker-start && sleep 2 && npm run migrate",
"setup": "npm run install-server && npm run install-client && npm run docker-build && npm run docker-start && sleep 5 && npm run migrate",
"migrate": "npx sequelize db:migrate",
"start-server": "nodemon server.js",
"start-client": "cd client && yarn start",
@@ -27,6 +27,7 @@
"express": "^4.17.0",
"express-basic-auth": "^1.2.0",
"formidable": "^1.2.1",
"moment": "^2.24.0",
"pg": "^7.11.0",
"sequelize": "^5.8.6",
"sequelize-cli": "^5.4.0"