8000 Merge branch 'master' of https://github.com/dodortus/simple-chat · codejs-kr/simple-chat@37fd438 · GitHub
[go: up one dir, main page]
Skip to content

Commit 37fd438

Browse files
codejs-krcodejs-kr
committed
Merge branch 'master' of https://github.com/dodortus/simple-chat 
2 parents 57c3f68 + 0193deb commit 37fd438

File tree

6 files changed

+33
-18
lines changed

6 files changed

+33
-18
lines changed

‎README.md

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,6 @@
33
Simple web chat application
44
![Simple chat web application](http://play.codejs.co.kr/dist/img/preview.a40feb81e83bb9458b81dddada7c3b45.gif)
55

6-
## Install
7-
8-
- frontend (cd frontend && npm install)
9-
- backend (cd backend && npm install)
10-
11-
## Start
12-
13-
npm start
14-
156
## Tech Stack
167

178
- react
@@ -21,3 +12,26 @@ npm start
2112
- lodash
2213
- moment
2314
- socket.io
15+
- test (cypress)
16+
17+
## Install
18+
1. First concurrently module installation
19+
``` javascript
20+
npm install
21+
```
22+
2. All install backend, frontend packages
23+
``` javascript
24+
npm run install
25+
```
26+
- backend (npm install)
27+
- frontend (npm install)
28+
29+
## Start
30+
``` javascript
31+
npm start
32+
```
33+
34+
## Test (cypress)
35+
``` javascript
36+
npm run test
37+
```

‎backend/package-lock.json

10000 Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎backend/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"author": "dodortus",
33
"name": "simple-chat-server",
4-
"version": "0.8.1",
4+
"version": "1.0.1",
55
"description": "Simple Web chat app",
66
"dependencies": {
77
"express": "^4.17.1",
@@ -15,6 +15,6 @@
1515
},
1616
"scripts": {
1717
"start": "node app",
18-
"start:dev": "nodemon --watch ./app.js --watch ./controllers"
18+
"start:nodemon": "nodemon --watch ./app.js --watch ./controllers"
1919
}
2020
}

‎frontend/package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎frontend/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"author": "dodortus",
33
"name": "simple-chat-client",
4-
"version": "0.8.1",
4+
"version": "1.0.1",
55
"description": "Simple Web chat app",
66
"dependencies": {
77
"@babel/polyfill": "^7.6.0",

‎package.json

Lines changed: 5 additions & 4 deletions
{
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
22
"author": "dodortus",
33
"name": "simple-chat",
4-
"version": "0.8.1",
4+
"version": "1.0.1",
55
"description": "Simple Web chat app",
66
"repository": "https://github.com/dodortus/simple-chat.git",
77
"keywords": [
@@ -17,10 +17,11 @@
1717
"concurrently": "^5.0.1"
1818
},
1919
"scripts": {
20+
"install": "concurrently \"cd backend && npm install\" \"cd frontend && npm install\"",
21+
"start": "concurrently \"npm run start:backend\" \"npm run start:frontend\"",
22+
"test": "concurrently \"npm run start:backend\" \"npm run start:frontend\" \"npm run start:test\"",
2023
"start:backend": "cd backend && npm start",
2124
"start:frontend": "cd frontend && npm start",
22-
"start:test": "cd frontend && npm run test:open",
23-
"start": "concurrently \"npm run start:backend\" \"npm run start:frontend\"",
24-
"test": "concurrently \"npm run start:backend\" \"npm run start:frontend\" \"npm run start:test\""
25+
"start:test": "cd frontend && npm run test:open"
2526
}
2627
}

0 commit comments

Comments
 (0)
0