Skip to content

Commit

Permalink
Merge pull request #273 from FRONTENDSCHOOL5/develop
Browse files Browse the repository at this point in the history
[chore]: main으로 머지
  • Loading branch information
sy-paik authored Mar 20, 2024
2 parents e03e571 + e75876b commit bad7e90
Show file tree
Hide file tree
Showing 165 changed files with 8,310 additions and 421 deletions.
3 changes: 3 additions & 0 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"presets": ["@babel/preset-env", "@babel/preset-react"]
}
2 changes: 2 additions & 0 deletions .env
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
REACT_APP_API_URL=https://api.mandarin.weniv.co.kr
REACT_APP_KAKAO_MAP_API_KEY=07370665e0e1e807567377079eb77409
19 changes: 6 additions & 13 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,8 @@
{
"env": {
"browser": true,
"es2021": true,
"node": true
},
"extends": "airbnb",
"parserOptions": {
"ecmaVersion": "latest",
"sourceType": "module"
},
"rules": {
"react/jsx-filename-extension": [1, { "extensions": [".js", ".jsx"] }]
}
"extends": ["react-app", "react-app/jest", "prettier"],
"rules": {
"react/jsx-filename-extension": [1, { "extensions": [".js", ".jsx"] }],
"linebreak-style": 0,
"no-unused-vars": "off"
}
}
28 changes: 28 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: Front Deployment

on:
pull_request:
branches:
- main
push:
branches:
- main

jobs:
build:
name: react build & deploy
runs-on: ubuntu-latest
steps:
- name: checkout Github Action
uses: actions/checkout@v3
# .env에 있던 환경변수들을 등록해주는 단계
- name: .env setting
run: |
echo "REACT_APP_KAKAOMAP=${{ secrets.REACT_APP_KAKAOMAP }}" >> .env
- name: install npm dependencies
run: npm install

- name: react build
run: npm run build
12 changes: 8 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,15 @@

# misc
.DS_Store
.env.local
.env.development.local
.env.test.local
.env.production.local

# debug
npm-debug.log*
yarn-debug.log*
yarn-error.log*

# local env files
.env
.env*.local
.env.development.local
.env.test.local
.env.production.local
9 changes: 9 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"trailingComma": "es5",
"tabWidth": 2,
"semi": true,
"singleQuote": true,
"useTabs": false,
"endOfLine": "auto",
"jsxSingleQuote": true
}
6 changes: 0 additions & 6 deletions .prettierrc.json

This file was deleted.

547 changes: 432 additions & 115 deletions README.md

Large diffs are not rendered by default.

Loading

0 comments on commit bad7e90

Please sign in to comment.