Merge branch 'main' into dev

.github/workflows/deploy.yaml

@@ -0,0 +1,63 @@
+name: Frontend Build
+
+on:
+ push:
+ branches:
+ - main
+
+
+jobs:
+ lint:
+ runs-on: ubuntu-latest
+ steps:
+ - name: Install Node
+ uses: actions/setup-node@v1
+ with:
+ node-version: 14
+
+ - name: Checkout code
+ uses: actions/checkout@v2
+
+ build:
+ runs-on: ubuntu-latest
+
+ steps:
+ - name: Install Node
+ uses: actions/setup-node@v1
+ with:
+ node-version: 14
+
+ - name: Checkout code
+ uses: actions/checkout@v2
+
+ - name: Install deps
+ run: yarn
+
+ - name: Build
+ run: npm run build && ls
+
+ - name: Upload build result
+ uses: actions/upload-artifact@v1
+ with:
+ name: dist
+ path: ./dist
+
+ deploy:
+ runs-on: ubuntu-latest
+ needs: build
+ steps:
+ - name: Download build
+ uses: actions/download-artifact@v1
+ with:
+ name: dist
+
+ - name: Transfer build files to server
+ uses: appleboy/[email protected]
+ with:
+ host: 87.242.127.254
+ username: root
+ port: 22
+ password: ${{ secrets.PASSWORD }}
+ source: "dist"
+ target: "/home/ubuntu/deployFront"
+ strip_components: 1

src/components/Map/Map.jsx

@@ -93,7 +93,7 @@ const AppMap = React.memo((props) => {
 
  return (
  <div className="layer">
- <YMaps query={{apikey: '2d683523-0eda-4943-91e0-73597aca4777'}}>
+ <YMaps query={{ apikey: '2d683523-0eda-4943-91e0-73597aca4777' }}>
  <Map
  state={mapState}
  onClick={closeCurrentBalloon}