Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dev to main: 08.2023 release #173

Merged
merged 96 commits into from
Aug 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
96 commits
Select commit Hold shift + click to select a range
71ddea9
feat: add jest support for testing (#122)
ponomareva-frontend Jun 9, 2023
7f37d31
feat(Banner): add adaptiv and rewrite to SCSS
Artyom774 Jun 9, 2023
5954c7a
Merge pull request #123 from Lapkipomoshi/feat/Promo
Artyom774 Jun 12, 2023
d519261
fix: fix Login page
bevuxyna Jun 15, 2023
2b9609b
fix: fix Password input
bevuxyna Jun 15, 2023
0fc6cd1
fix: fix Input
bevuxyna Jun 15, 2023
06e3ccf
fix: validate inputs after user leaves the input
bevuxyna Jun 17, 2023
2d1b4b6
feat: add the displaying of shelters on the map according to the warn…
ponomareva-frontend Jun 18, 2023
32efd3c
fix: fix NewPassword page
bevuxyna Jun 19, 2023
9af6e75
UMAK-201: Длинный пароль перекрывает иконку глаза на странице Регистр…
bevuxyna Jun 21, 2023
bce3e10
UMAK-204: Кнопка Зарегистрироваться становится активна, если в поле П…
bevuxyna Jun 21, 2023
690e211
UMAK-203: Не появляется ошибка если ввести значение без букв в поле И…
bevuxyna Jun 21, 2023
87819a9
UMAK-203: fix regex
bevuxyna Jun 21, 2023
c158989
UMAK-195: Добавить крестик на popup
bevuxyna Jun 22, 2023
7d62fe4
UMAK-194: Закрытие popup по клику вне области popup
bevuxyna Jun 22, 2023
abe01f3
feat(AddShelterPage): add the mainPhoto inpit
Artyom774 Jun 23, 2023
7327f1d
fix(AddShelterPage): change the message before form
Artyom774 Jun 23, 2023
5de94fe
fix(AddShelterPage): change font-family of add-shelter__step
Artyom774 Jun 23, 2023
de03cd9
fix(DeclarationInput): decrease paddings
Artyom774 Jun 23, 2023
4b3c88b
refactor(AddShelterPage): replace the photo block to separate ui-comp…
Artyom774 Jun 24, 2023
c1881d4
feat(AddshelterPage): add the second checkbox
Artyom774 Jun 24, 2023
bb4d772
feat(AddShelterPage): add the invalid modificators for time-inputs an…
Artyom774 Jun 25, 2023
3e08fe4
fix: fix update user info
bevuxyna Jun 28, 2023
56d887e
fix
bevuxyna Jun 29, 2023
47d5568
fix: off camelcase rule
bevuxyna Jun 29, 2023
f4ceb0a
fix: fix after PR
bevuxyna Jun 30, 2023
007359c
fix: fix after review
bevuxyna Jul 1, 2023
0f53e74
Fix/profile (#126)
bevuxyna Jul 1, 2023
e004cd3
fix: change user profile depend on status
bevuxyna Jul 1, 2023
1ceac89
Merge branch 'dev' into fix/profile
bevuxyna Jul 1, 2023
ccd8f51
feat(AddShelterPage): add the image validation
Artyom774 Jun 26, 2023
c4d0da8
Merge pull request #129 from Lapkipomoshi/fix/add-shelter
Artyom774 Jul 2, 2023
6709b84
fix: fix after review
bevuxyna Jul 2, 2023
2b4fdb8
New profile (#130)
bevuxyna Jul 2, 2023
231f8ac
fix: fix InfoToolTip
bevuxyna Jul 2, 2023
a7c2828
feat: add emailConfirmationTemplate
bevuxyna Jul 4, 2023
54b103b
fix: fix font
bevuxyna Jul 6, 2023
d61c85c
refactor(App): setting the ProtectedRoute component
Artyom774 Jul 7, 2023
53a0ebd
feat: add PrivacyPolicyPage (#132)
ponomareva-frontend Jul 11, 2023
e506a95
feat: add displaying SheltersList according to the shelter warning co…
ponomareva-frontend Jul 13, 2023
f22df35
feat: add a table to PrivacyPolicyPage (#137)
ponomareva-frontend Jul 13, 2023
639f378
Merge branch 'dev' into fix/infotooltip
bevuxyna Jul 13, 2023
8b2031e
fix: close InfoTooltip after 15 seconds
bevuxyna Jul 13, 2023
6c8a134
fix: fix standard font's weight
bevuxyna Jul 13, 2023
430cf52
fix
bevuxyna Jul 13, 2023
5e56bac
Merge pull request #131 from Lapkipomoshi/fix/infotooltip
bevuxyna Jul 13, 2023
a1a5e0c
chore(ShelterSamePets): change api for pets and refactor ShelterSameP…
Artyom774 Jul 13, 2023
ea59ed3
feat: add template for email confirmation
bevuxyna Jul 13, 2023
de480f1
feat: add template for success registration
bevuxyna Jul 16, 2023
1a88b2b
fix styles
bevuxyna Jul 16, 2023
a68c8ba
feat: add template for reset password
bevuxyna Jul 16, 2023
be64cb8
feat: add template for change email
bevuxyna Jul 16, 2023
28031d0
fix text
bevuxyna Jul 16, 2023
c318f0f
feat: add template for change password
bevuxyna Jul 16, 2023
2ffee4b
fix styles
bevuxyna Jul 16, 2023
6c6c956
Merge branch 'dev' into fix/profile
bevuxyna Jul 16, 2023
660a042
fix profile popup
bevuxyna Jul 16, 2023
7e0bb61
fix: change validation on onChange
bevuxyna Jul 16, 2023
ba2b54e
fix: change autocomplete background-color
bevuxyna Jul 16, 2023
8653c78
feat(App): add app with the site data
Artyom774 Jul 11, 2023
fb8a89c
fix after review
bevuxyna Jul 16, 2023
b571e60
fix after W3C validation
bevuxyna Jul 16, 2023
64c62e0
Merge pull request #145 from Lapkipomoshi/fix/profile
bevuxyna Jul 17, 2023
63e13a6
Merge pull request #141 from Lapkipomoshi/email_template
bevuxyna Jul 17, 2023
d05495e
feat: add scroll to slider (#143)
ponomareva-frontend Jul 18, 2023
a59fa12
feat: add new filter to shelters list page (#144)
ponomareva-frontend Jul 18, 2023
40c9946
Merge branch 'dev' into refactor/ProtectedRoute
Artyom774 Jul 18, 2023
c429910
Update conflicts App.jsx
Artyom774 Jul 18, 2023
a27ff2b
Merge pull request #135 from Lapkipomoshi/refactor/ProtectedRoute
Artyom774 Jul 18, 2023
011fc19
feat: add terms page (#142)
ponomareva-frontend Jul 19, 2023
2c480a6
feat: add links (#146)
ponomareva-frontend Jul 19, 2023
2262bdd
feat(ShelterPage): create the PetModule without api
Artyom774 Jul 26, 2023
647925a
feat: add functionality for the owner to AboutShelter page (#148)
ponomareva-frontend Jul 28, 2023
0c8cc57
feat: add tests for AboutShelter component (#151)
ponomareva-frontend Jul 30, 2023
1a8f995
fix: delete unnecessary text
bevuxyna Jul 31, 2023
9cffba8
feat: add template for change email
bevuxyna Jul 31, 2023
d762497
Merge branch 'dev' into feat/PetPage
Artyom774 Aug 1, 2023
ec93f62
Merge pull request #149 from Lapkipomoshi/feat/PetPage
Artyom774 Aug 1, 2023
4e2e9df
Merge pull request #154 from Lapkipomoshi/email_template
bevuxyna Aug 1, 2023
d88eb7c
feat: add owners buttons and api to ShelterVacancies page (#152)
ponomareva-frontend Aug 1, 2023
3be22b8
fix(App): delete repeating route
Artyom774 Aug 1, 2023
b1eb76a
Merge pull request #155 from Lapkipomoshi/fix/App
Artyom774 Aug 2, 2023
da0b636
fix: add fit-content for links
bevuxyna Aug 12, 2023
f3a74d3
Merge pull request #157 from Lapkipomoshi/fix/profile
bevuxyna Aug 15, 2023
40b8747
Test (#160)
ponomareva-frontend Aug 15, 2023
f13d831
fix: github actions (#161)
ponomareva-frontend Aug 15, 2023
eeb61ce
feat: add form for vacancy page (#156)
ponomareva-frontend Aug 21, 2023
f646a8d
Fix small bag (#163)
ponomareva-frontend Aug 22, 2023
af52406
refactor: split form into modular components (#166)
ponomareva-frontend Aug 23, 2023
84637e1
fix: remove-homepage (#168)
ponomareva-frontend Aug 24, 2023
6eff75b
fix: add slider on profile page
bevuxyna Aug 26, 2023
d119c9a
Merge pull request #169 from Lapkipomoshi/fix/profile
bevuxyna Aug 27, 2023
9200a29
feat: add infoTooltip after submit (#170)
ponomareva-frontend Aug 27, 2023
a479650
fix: change button disable and clear inputs
bevuxyna Aug 28, 2023
ecd50aa
feat: add metrics output (#171)
ponomareva-frontend Aug 29, 2023
a44682b
Merge pull request #172 from Lapkipomoshi/fix/profile
bevuxyna Aug 29, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 23 additions & 4 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,23 @@
{
"env": {
"browser": true,
"es2021": true
"es2021": true,
"jest/globals": true
},
"extends": ["plugin:react/recommended", "airbnb", "prettier"],
"overrides": [],
"overrides": [
{
"files": ["test/**"],
"plugins": ["jest"],
"extends": ["plugin:jest/recommended"],
"rules": { "jest/prefer-expect-assertions": "off" }
}
],
"parserOptions": {
"ecmaVersion": "latest",
"sourceType": "module"
},
"plugins": ["react", "import"],
"plugins": ["react", "import", "jest"],
"rules": {
"prefer-destructuring": [
"error",
Expand All @@ -21,6 +29,14 @@
"enforceForRenamedProperties": false
}
],
"jest/no-disabled-tests": "warn",
"jest/no-focused-tests": "error",
"jest/no-identical-title": "error",
"jest/prefer-to-have-length": "warn",
"jest/valid-expect": "error",
"jest/expect-expect": "error",
"jest/no-test-prefixes": "error",
"jest/no-test-return-statement": "error",
"quotes": ["error", "single", { "avoidEscape": true }],
"jsx-quotes": ["error", "prefer-single"],
"semi": ["error", "always"],
Expand All @@ -47,6 +63,9 @@
"react/jsx-filename-extension": [1, { "extensions": [".js", ".jsx"] }],
"class-methods-use-this": "warn",
"prefer-promise-reject-errors": "warn",
"react/jsx-one-expression-per-line": "off"
"react/jsx-one-expression-per-line": "off",
"react/destructuring-assignment": "off",
"no-unused-expressions": "warn",
"camelcase": [1, { "properties": "never" }]
}
}
84 changes: 84 additions & 0 deletions .github/workflows/pr_closed.yml
Original file line number Diff line number Diff line change
@@ -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 }} закрыт без мержа, деплой не производился.
85 changes: 85 additions & 0 deletions .github/workflows/pr_closed_test.yml
Original file line number Diff line number Diff line change
@@ -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 }} закрыт без мержа, деплой не производился.
19 changes: 19 additions & 0 deletions .github/workflows/pr_opened.yml
Original file line number Diff line number Diff line change
@@ -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 }}
Loading
Loading