Skip to content

Commit 2ba3ffb

Browse files
committed
Merge branch 'feature/frontend/#33' into develop
2 parents 4d48f56 + 1c70c6e commit 2ba3ffb

237 files changed

Lines changed: 6652 additions & 4314 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

โ€Ž.eslintrc.jsonโ€Ž

Lines changed: 14 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,17 @@
11
{
2-
"env": {
3-
"browser": true,
4-
"es2021": true
2+
"env": {
3+
"browser": true,
4+
"es2021": true
5+
},
6+
"extends": ["plugin:react/recommended", "airbnb"],
7+
"parser": "@typescript-eslint/parser",
8+
"parserOptions": {
9+
"ecmaFeatures": {
10+
"jsx": true
511
},
6-
"extends": [
7-
"plugin:react/recommended",
8-
"airbnb"
9-
],
10-
"parser": "@typescript-eslint/parser",
11-
"parserOptions": {
12-
"ecmaFeatures": {
13-
"jsx": true
14-
},
15-
"ecmaVersion": 12,
16-
"sourceType": "module"
17-
},
18-
"plugins": [
19-
"react",
20-
"@typescript-eslint"
21-
],
22-
"rules": {
23-
}
12+
"ecmaVersion": 12,
13+
"sourceType": "module"
14+
},
15+
"plugins": ["react", "@typescript-eslint"],
16+
"rules": {}
2417
}

โ€Ž.github/workflows/main.ymlโ€Ž

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ name: CI
66
on:
77
# Triggers the workflow on push events but only for the develop branch
88
push:
9-
branches: [ develop ]
9+
branches: [develop]
1010

1111
# Allows you to run this workflow manually from the Actions tab
1212
workflow_dispatch:
@@ -18,15 +18,15 @@ jobs:
1818
name: Build & Deploy
1919
# The type of runner that the job will run on
2020
runs-on: ubuntu-latest
21-
21+
2222
steps:
23-
- name: Executing remote ssh commands
24-
# Uses ssh-action. Check https://github.com/marketplace/actions/ssh-remote-commands for more
25-
uses: appleboy/ssh-action@master
26-
with:
27-
host: ${{ secrets.HOST }}
28-
username: ${{ secrets.USERNAME }}
29-
password: ${{ secrets.PASSWORD }}
30-
port: ${{ secrets.PORT }}
31-
script_stop: true # Stop script after first failure
32-
script: cd ~/workspace/handover && /bin/sh ./scripts/deploy.sh
23+
- name: Executing remote ssh commands
24+
# Uses ssh-action. Check https://github.com/marketplace/actions/ssh-remote-commands for more
25+
uses: appleboy/ssh-action@master
26+
with:
27+
host: ${{ secrets.HOST }}
28+
username: ${{ secrets.USERNAME }}
29+
password: ${{ secrets.PASSWORD }}
30+
port: ${{ secrets.PORT }}
31+
script_stop: true # Stop script after first failure
32+
script: cd ~/workspace/handover && /bin/sh ./scripts/deploy.sh

โ€Ž.vscode/extensions.jsonโ€Ž

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
{
2-
"recommendations": [
3-
"eamodio.gitlens"
4-
]
5-
}
2+
"recommendations": ["eamodio.gitlens"]
3+
}

โ€ŽREADME.mdโ€Ž

Lines changed: 24 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,38 @@
11
# Handover
2+
23
![Logo](https://logosbynick.com/wp-content/uploads/2018/03/final-logo-example.png)
34

45
ํ”„๋กœ์ ํŠธ๋ช… ๋˜๋Š” ํ”„๋กœ์ ํŠธ ๋กœ๊ณ  ์ด๋ฏธ์ง€ **(ํƒ1)**
56

67
## ํ”„๋กœ์žญํŠธ ์†Œ๊ฐœ
7-
- ์„ค๋ช… ๊ธฐ์ž…
88

9+
- ์„ค๋ช… ๊ธฐ์ž…
910

1011
## ๊ธฐ๋Šฅ ์„ค๋ช…
11-
- ์„ค๋ช… ๊ธฐ์ž…
12+
13+
- ์„ค๋ช… ๊ธฐ์ž…
1214

1315
## ์ปดํ“จํ„ฐ ๊ตฌ์„ฑ / ํ•„์ˆ˜ ์กฐ๊ฑด ์•ˆ๋‚ด (Prerequisites)
14-
* ECMAScript 6 ์ง€์› ๋ธŒ๋ผ์šฐ์ € ์‚ฌ์šฉ
15-
* ๊ถŒ์žฅ: Google Chrome ๋ฒ„์ ผ 77 ์ด์ƒ
1616

17-
## ๊ธฐ์ˆ  ์Šคํƒ (Technique Used)
17+
- ECMAScript 6 ์ง€์› ๋ธŒ๋ผ์šฐ์ € ์‚ฌ์šฉ
18+
- ๊ถŒ์žฅ: Google Chrome ๋ฒ„์ ผ 77 ์ด์ƒ
19+
20+
## ๊ธฐ์ˆ  ์Šคํƒ (Technique Used)
21+
1822
### Server(back-end)
19-
- nodejs 14.17.6
20-
- expressjs
21-
- MariaDB, MongoDB
22-
23+
24+
- nodejs 14.17.6
25+
- expressjs
26+
- MariaDB, MongoDB
27+
2328
### Front-end
24-
- react.js
25-
- UI framework
26-
- ๊ธฐํƒ€ ์‚ฌ์šฉํ•œ ๋ผ์ด๋ธŒ๋Ÿฌ๋ฆฌ
29+
30+
- react.js
31+
- UI framework
32+
- ๊ธฐํƒ€ ์‚ฌ์šฉํ•œ ๋ผ์ด๋ธŒ๋Ÿฌ๋ฆฌ
2733

2834
## ์„ค์น˜ ์•ˆ๋‚ด (Installation Process)
35+
2936
```bash
3037
$ git clone osamhack2021/App_Flutter_Web_Express_Handover_TeamName
3138
$ yarn install
@@ -38,9 +45,9 @@ $ yarn start
3845
๊ตฌ๊ธ€ ๊ฒ€์ƒ‰ - ๋งˆํฌ๋‹ค์šด ๋ฌธ๋ฒ•
3946
[https://post.naver.com/viewer/postView.nhn?volumeNo=24627214&memberNo=42458017](https://post.naver.com/viewer/postView.nhn?volumeNo=24627214&memberNo=42458017)
4047

41-
ํŽธํ•œ ๋งˆํฌ๋‹ค์šด ์—๋””ํ„ฐ๋ฅผ ์ฐพ์•„์„œ ์‚ฌ์šฉ
42-
์ƒ˜ํ”Œ ์—๋””ํ„ฐ [https://stackedit.io/app#](https://stackedit.io/app#)
43-
48+
ํŽธํ•œ ๋งˆํฌ๋‹ค์šด ์—๋””ํ„ฐ๋ฅผ ์ฐพ์•„์„œ ์‚ฌ์šฉ
49+
์ƒ˜ํ”Œ ์—๋””ํ„ฐ [https://stackedit.io/app#](https://stackedit.io/app#)
50+
4451
## ํŒ€ ์ •๋ณด (Team Information)
4552

4653
<table width="788">
@@ -186,7 +193,8 @@ $ yarn start
186193
</table>
187194

188195
## ์ €์ž‘๊ถŒ ๋ฐ ์‚ฌ์šฉ๊ถŒ ์ •๋ณด (Copyleft / End User License)
189-
* [MIT](https://github.com/osam2020-WEB/Sample-ProjectName-TeamName/blob/master/license.md)
196+
197+
- [MIT](https://github.com/osam2020-WEB/Sample-ProjectName-TeamName/blob/master/license.md)
190198

191199
This project is licensed under the terms of the MIT license.
192200

0 commit comments

Comments
ย (0)