Skip to content

Commit b6daa9d

Browse files
committed
Merge branch 'master' into #96-Create-storage-contract-and-mocked-storage
2 parents 6feda9f + 9b9bfe0 commit b6daa9d

5 files changed

Lines changed: 701 additions & 648 deletions

File tree

‎back/package.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
"start:dev": "nodemon --exec babel-node --extensions \".ts\" src/index.ts",
99
"start:debug": "run-p -l type-check:watch \"start:dev -- --inspect-brk\"",
1010
"start:prod": "node ./dist/index.js",
11+
"start:mock-repository": "cross-env MOCK_REPOSITORY=true npm run start",
12+
"start:local-db": "docker-compose up || echo \"Run docker-compose up manually\"",
13+
"stop:local-db": "docker-compose down || echo \"Run docker-compose down manually\"",
1114
"build": "run-p -l type-check build:prod",
1215
"build:prod": "npm run clean && babel src -d dist --ignore=\"./src/test-runners\" --extensions \".ts\"",
1316
"build:dev": "npm run clean && babel src -d dist --ignore=\"./src/test-runners\" --extensions \".ts\" --source-maps",
@@ -38,6 +41,7 @@
3841
"@types/cors": "^2.8.7",
3942
"@types/express": "^4.17.7",
4043
"@types/jest": "^26.0.15",
44+
"@types/mongoose": "^5.7.37",
4145
"@types/socket.io": "^2.1.10",
4246
"cross-env": "^7.0.2",
4347
"jest": "^26.6.1",
@@ -53,6 +57,7 @@
5357
"dotenv": "^8.2.0",
5458
"express": "^4.17.1",
5559
"immer": "^7.0.9",
60+
"mongoose": "^5.10.11",
5661
"regenerator-runtime": "^0.13.7",
5762
"socket.io": "^2.3.0"
5863
}

‎front/config/webpack/base.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ module.exports = merge(
5858
patterns: [
5959
{ from: '../static/index.html', to: 'index.html' },
6060
{ from: '../static/styles.css', to: 'styles.css' },
61+
{ from: '../static/assets', to: 'assets' },
6162
],
6263
}),
6364
],

‎front/static/assets/sprite.svg‎

Lines changed: 37 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)