From 40b874733d2aefd9500141fe86d4aad9ad320072 Mon Sep 17 00:00:00 2001 From: Tatiana Ponomareva Date: Tue, 15 Aug 2023 15:50:18 +0400 Subject: [PATCH 01/10] Test (#160) * Revert "fix" * Create pr_closed.yml --- .github/workflows/pr_closed.yml | 84 +++++++++++++++++++++++ .github/workflows/pr_closed_test.yml | 85 ++++++++++++++++++++++++ .github/workflows/pr_opened.yml | 19 ++++++ package.json | 1 + src/pages/PrivacyPolicyPage/constants.js | 1 - 5 files changed, 189 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/pr_closed.yml create mode 100644 .github/workflows/pr_closed_test.yml create mode 100644 .github/workflows/pr_opened.yml diff --git a/.github/workflows/pr_closed.yml b/.github/workflows/pr_closed.yml new file mode 100644 index 00000000..4d08a068 --- /dev/null +++ b/.github/workflows/pr_closed.yml @@ -0,0 +1,84 @@ +name: PR_CLOSED DEPLOY AND TG ALERT + +on: + pull_request: + types: [closed] + branches: + - main + + +jobs: + build_and_push_to_docker_hub: + name: Push Docker image to Docker Hub + if: github.event.pull_request.merged == true + runs-on: ubuntu-latest + steps: + - name: Check out the repo + uses: actions/checkout@v2 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v1 + - name: Login to Docker + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + - name: Push to Docker Hub + uses: docker/build-push-action@v2 + with: + push: true + tags: lapkipomoshi/help_paw_f:latest + + deploy: + runs-on: ubuntu-latest + needs: build_and_push_to_docker_hub + steps: + - name: executing remote ssh commands to deploy + uses: appleboy/ssh-action@master + with: + host: ${{ secrets.HOST }} + username: ${{ secrets.USER }} + password: ${{ secrets.PASSWORD }} + script: | + cd ~/test + sudo docker-compose stop + rm .env + touch .env + echo DB_ENGINE=${{ secrets.DB_ENGINE }} >> .env + echo DB_NAME=${{ secrets.DB_NAME }} >> .env + echo POSTGRES_USER=${{ secrets.POSTGRES_USER }} >> .env + echo POSTGRES_PASSWORD=${{ secrets.POSTGRES_PASSWORD }} >> .env + echo DB_HOST=${{ secrets.DB_HOST }} >> .env + echo DB_PORT=${{ secrets.DB_PORT }} >> .env + echo D_KEY=${{ secrets.D_KEY }} >> .env + echo LOCAL=${{ secrets.LOCAL }} >> .env + echo BOT=${{ secrets.BOT }} >> .env + echo ALERT_CHANNEL=${{ secrets.ALERT_CHANNEL }} >> .env + echo EMAIL_HOST=${{ secrets.EMAIL_HOST }} >> .env + echo EMAIL_PORT=${{ secrets.EMAIL_PORT }} >> .env + echo EMAIL_HOST_USER=${{ secrets.EMAIL_HOST_USER }} >> .env + echo EMAIL_HOST_PASSWORD=${{ secrets.EMAIL_HOST_PASSWORD }} >> .env + echo EMAIL_USE_SSL=${{ secrets.EMAIL_USE_SSL }} >> .env + echo EMAIL_USE_TLS=${{ secrets.EMAIL_USE_TLS }} >> .env + echo DEBUG=${{ secrets.DEBUG }} >> .env + echo EMAIL_BACKEND_TYPE=${{ secrets.EMAIL_BACKEND_TYPE }} >> .env + sudo docker-compose pull + sudo docker-compose up -d + + send_message: + runs-on: ubuntu-latest + needs: deploy + steps: + - name: send message + if: github.event.pull_request.merged == true + uses: appleboy/telegram-action@master + with: + to: ${{ secrets.ALERT_CHANNEL }} + token: ${{ secrets.BOT }} + message: FRONTEND - ${{ github.event_name }} ветки ${{ github.head_ref }} успешно смержен в ${{ github.base_ref }}, LAPKIPOMOSHI.RU обновлен и перезапущен + - name: send message merged + if: github.event.pull_request.merged == false + uses: appleboy/telegram-action@master + with: + to: ${{ secrets.ALERT_CHANNEL }} + token: ${{ secrets.BOT }} + message: FRONTEND - ${{ github.event_name }} ветки ${{ github.head_ref }} в ${{ github.base_ref }} закрыт без мержа, деплой не производился. diff --git a/.github/workflows/pr_closed_test.yml b/.github/workflows/pr_closed_test.yml new file mode 100644 index 00000000..23205c2b --- /dev/null +++ b/.github/workflows/pr_closed_test.yml @@ -0,0 +1,85 @@ +name: PR_CLOSED DEPLOY AND TG ALERT + +on: + pull_request: + types: [closed] + branches: + - test + + +jobs: + build_and_push_to_docker_hub: + name: Push Docker image to Docker Hub + if: github.event.pull_request.merged == true + runs-on: ubuntu-latest + steps: + - name: Check out the repo + uses: actions/checkout@v2 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v1 + - name: Login to Docker + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + - name: Push to Docker Hub + uses: docker/build-push-action@v2 + with: + push: true + tags: lapkipomoshi/help_paw_f:test + + deploy: + runs-on: ubuntu-latest + needs: build_and_push_to_docker_hub + steps: + - name: executing remote ssh commands to deploy + uses: appleboy/ssh-action@master + with: + host: ${{ secrets.TEST_HOST }} + username: ${{ secrets.USER }} + password: ${{ secrets.PASSWORD }} + script: | + cd ~/test + sudo docker-compose stop + rm .env + touch .env + echo DB_ENGINE=${{ secrets.DB_ENGINE }} >> .env + echo DB_NAME=${{ secrets.DB_NAME }} >> .env + echo POSTGRES_USER=${{ secrets.POSTGRES_USER }} >> .env + echo POSTGRES_PASSWORD=${{ secrets.POSTGRES_PASSWORD }} >> .env + echo DB_HOST=${{ secrets.DB_HOST }} >> .env + echo DB_PORT=${{ secrets.DB_PORT }} >> .env + echo D_KEY=${{ secrets.D_KEY }} >> .env + echo LOCAL=${{ secrets.LOCAL }} >> .env + echo BOT=${{ secrets.BOT }} >> .env + echo ALERT_CHANNEL=${{ secrets.ALERT_CHANNEL }} >> .env + echo EMAIL_HOST=${{ secrets.EMAIL_HOST }} >> .env + echo EMAIL_PORT=${{ secrets.EMAIL_PORT }} >> .env + echo EMAIL_HOST_USER=${{ secrets.EMAIL_HOST_USER }} >> .env + echo EMAIL_HOST_PASSWORD=${{ secrets.EMAIL_HOST_PASSWORD }} >> .env + echo EMAIL_USE_SSL=${{ secrets.EMAIL_USE_SSL }} >> .env + echo EMAIL_USE_TLS=${{ secrets.EMAIL_USE_TLS }} >> .env + echo DEBUG=${{ secrets.TEST_DEBUG }} >> .env + echo EMAIL_BACKEND_TYPE=${{ secrets.EMAIL_BACKEND_TYPE }} >> .env + echo REACT_APP_SERVER_TYPE=${{ secrets.REACT_APP_SERVER_TYPE_TEST }} >> .env + sudo docker-compose pull + sudo docker-compose up -d + + send_message: + runs-on: ubuntu-latest + needs: deploy + steps: + - name: send message + if: github.event.pull_request.merged == true + uses: appleboy/telegram-action@master + with: + to: ${{ secrets.ALERT_CHANNEL }} + token: ${{ secrets.BOT }} + message: FRONTEND - ${{ github.event_name }} ветки ${{ github.head_ref }} успешно смержен в ${{ github.base_ref }}, TEST обновлен и перезапущен + - name: send message merged + if: github.event.pull_request.merged == false + uses: appleboy/telegram-action@master + with: + to: ${{ secrets.ALERT_CHANNEL }} + token: ${{ secrets.BOT }} + message: FRONTEND - ${{ github.event_name }} ветки ${{ github.head_ref }} в ${{ github.base_ref }} закрыт без мержа, деплой не производился. diff --git a/.github/workflows/pr_opened.yml b/.github/workflows/pr_opened.yml new file mode 100644 index 00000000..a9b423d0 --- /dev/null +++ b/.github/workflows/pr_opened.yml @@ -0,0 +1,19 @@ +name: PR_OPENED TG ALERT + +on: + pull_request: + types: [opened] + branches: + - main + - test + +jobs: + send_message: + runs-on: ubuntu-latest + steps: + - name: send message + uses: appleboy/telegram-action@master + with: + to: ${{ secrets.ALERT_CHANNEL }} + token: ${{ secrets.BOT }} + message: FRONTEND - ${{ github.actor }} открыл ${{ github.event_name }} ветки ${{ github.head_ref }} в ${{ github.base_ref }} diff --git a/package.json b/package.json index bc78fa58..cce148da 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,7 @@ { "name": "help_paw_frontend", "version": "0.1.0", + "homepage": "https://lapkipomoshi.github.io/help_paw_frontend/", "private": true, "dependencies": { "@pbe/react-yandex-maps": "^1.2.2", diff --git a/src/pages/PrivacyPolicyPage/constants.js b/src/pages/PrivacyPolicyPage/constants.js index 7addd8bc..875efedb 100644 --- a/src/pages/PrivacyPolicyPage/constants.js +++ b/src/pages/PrivacyPolicyPage/constants.js @@ -25,7 +25,6 @@ const dataPrivacyPolicy = [ которую Оператор может получить о посетителях веб-сайта https://lapkipomoshi.ru/.`, ], }, - { id: 2, rendererComponent: ParagraphList, From f13d831ddeec37ff93ad793a3654b71ee4b285f5 Mon Sep 17 00:00:00 2001 From: Tatiana Ponomareva Date: Tue, 15 Aug 2023 15:55:38 +0400 Subject: [PATCH 02/10] fix: github actions (#161) From eeb61ced79580d0bf0936cc003584e90a80cd421 Mon Sep 17 00:00:00 2001 From: Tatiana Ponomareva Date: Mon, 21 Aug 2023 14:49:23 +0400 Subject: [PATCH 03/10] feat: add form for vacancy page (#156) * feat: add form for vacancy page --- src/components/VacancyCard/VacancyCard.jsx | 6 +- .../vacancy-card__icon-button.scss | 2 - .../EditPenIcon.jsx => EditIcon/EditIcon.jsx} | 6 +- .../EditIcon.scss} | 0 src/modules/AboutShelter/AboutShelter.jsx | 4 +- .../about-shelter__icon-button.scss | 2 +- .../AddVacancyForm/AddVacancyForm.jsx | 153 +++++++++++++++++ .../AddVacancyForm/AddVacancyForm.scss | 39 +++++ .../ShelterVacancies/ShelterVacancies.jsx | 33 ++-- .../ShelterVacancies/ShelterVacancies.scss | 14 +- src/modules/ShelterVacancies/VacancyList.jsx | 30 ++++ .../__column/add-shelter-form__column.css | 3 +- .../__flex/add-shelter-form__flex.css | 3 +- src/ui/DeclarationInput/DeclarationInput.jsx | 14 +- src/ui/DeclarationInput/DeclarationInput.scss | 4 +- src/ui/Select/OptionList.jsx | 27 +++ src/ui/Select/Select.jsx | 95 +++++++++++ src/ui/Select/Select.scss | 161 ++++++++++++++++++ src/ui/Select/svg/Arrow.css | 16 ++ src/ui/Select/svg/Arrow.jsx | 17 ++ src/utils/errorMessage.js | 29 +++- 21 files changed, 610 insertions(+), 48 deletions(-) rename src/images/{EditPenIcon/EditPenIcon.jsx => EditIcon/EditIcon.jsx} (89%) rename src/images/{EditPenIcon/EditPenIcon.scss => EditIcon/EditIcon.scss} (100%) create mode 100644 src/modules/ShelterVacancies/AddVacancyForm/AddVacancyForm.jsx create mode 100644 src/modules/ShelterVacancies/AddVacancyForm/AddVacancyForm.scss create mode 100644 src/modules/ShelterVacancies/VacancyList.jsx create mode 100644 src/ui/Select/OptionList.jsx create mode 100644 src/ui/Select/Select.jsx create mode 100644 src/ui/Select/Select.scss create mode 100644 src/ui/Select/svg/Arrow.css create mode 100644 src/ui/Select/svg/Arrow.jsx diff --git a/src/components/VacancyCard/VacancyCard.jsx b/src/components/VacancyCard/VacancyCard.jsx index 63573737..383d4f8a 100644 --- a/src/components/VacancyCard/VacancyCard.jsx +++ b/src/components/VacancyCard/VacancyCard.jsx @@ -1,7 +1,7 @@ import React from 'react'; import { useOutletContext } from 'react-router-dom'; import './VacancyCard.scss'; -import EditPenIcon from '../../images/EditPenIcon/EditPenIcon'; +import EditIcon from '../../images/EditIcon/EditIcon'; import DeleteIcon from '../../images/DeleteIcon/DeleteIcon'; const VacancyCard = ({ title, salary, schedule, description, education, isLoading }) => { @@ -18,9 +18,9 @@ const VacancyCard = ({ title, salary, schedule, description, education, isLoadin {isOwner && ( <> - {/* TODO функционал реализую в след PR */} + {/* TODO функционал реализую в след PR */} {/* TODO DeleteIcon функционал реализую в след PR */}