Merge pull request #4 from hyeri-woo/develop

Merge 메인 브랜치로 병합

.eslintrc.json

@@ -1,23 +1,24 @@
 {
-    "env": {
-      "browser": true,
-      "es2021": true
-    },
-    "extends": ["eslint:recommended", "plugin:react/recommended"],
-    "parserOptions": {
-      "ecmaVersion": "latest",
-      "sourceType": "module"
-    },
-    "plugins": ["react", "prettier"],
-    "rules": {
-      "prettier/prettier": "error",
-      "react/react-in-jsx-scope": "off",
-      "indent": ["error", 2],
-      "linebreak-style": ["error", "unix"],
-      "quotes": ["error", "single"],
-      "semi": ["error", "always"],
-      "no-extra-semi": "error",
-      "no-tabs": ["error", { "allowIndentationTabs": true }]
-    }
+  "env": {
+    "browser": true,
+    "es2021": true
+  },
+  "extends": ["eslint:recommended", "plugin:react/recommended"],
+  "parserOptions": {
+    "ecmaVersion": "latest",
+    "sourceType": "module"
+  },
+  "plugins": ["react", "prettier"],
+  "rules": {
+    "prettier/prettier": "warn",
+    "react/react-in-jsx-scope": "off",
+    "linebreak-style": ["error", "unix"],
+    "quotes": ["error", "single"],
+    "semi": ["error", "always"],
+    "no-extra-semi": "error",
+    "no-tabs": ["error", { "allowIndentationTabs": true }],
+    "react/prop-types": "off",
+    "no-unused-vars": "off",
+    "indent": "off"
   }
-  
+}

.github/workflows/main.yml

@@ -0,0 +1,29 @@
+name: 'weather-api-workflow'
+
+on: 
+  push:
+    branches: ['main', 'develop']
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:  
+      - uses: actions/checkout@v2
+      - name: Create env
+        run: |
+          echo "REACT_APP_WEATHER_API_KEY=$REACT_APP_WEATHER_API_KEY" >> .env
+        env:
+         REACT_APP_WEATHER_API_KEY: ${{ secrets.REACT_APP_WEATHER_API_KEY }} 
+      - name: Install
+        run: rm -f package-lock.json && npm install
+      - name: Build
+        run: npm run build
+      - name: Deploy to Netlify
+        uses: nwtgck/[email protected]
+        with:
+          publish-dir: './build'     
+          production-branch: develop
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+        env:
+          NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
+          NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}

.gitignore

@@ -11,6 +11,8 @@
 # production
 /build
 
+.env
+
 # misc
 .DS_Store
 .env.local

.prettierrc

@@ -6,5 +6,6 @@
     "semi": true,
     "trailingComma": "all",
     "bracketSpacing": true,
-    "arrowParens": "always"
+    "arrowParens": "always",
+    "quoteProps": "preserve"
 }