Merge develop into main #50

gloginov · 2024-11-22T00:48:00Z

Merge develop into main

… функции

…onent

…to SOK-22_user_profile_page

+add backendApi +create axios interceptors +add userReducer and create function for use yandex api +add env *update SignIn.tsx for use backendApi *update SignUp.tsx for use backendApi *format and lint

*fix lint error *add types from yandex api for user

*rename UserReducer to AuthReducer *rename methods in auth-reducer.ts -remove origin host from methods in auth-reducer.ts because base url set in backendApi

*update backendApi *change reducer for async/await *redirects with router (spa) +add toast for error message

*fix format *fix lint

… name

*fix some comment for PR

*format *fix lint

[SOK-16]

*validation *fix mistakes

*change word mistake

*add type for button

*fix cors host

Resolve SOK-18

*add oauth redirect url

…инте с .env

feat: docker file target for prod

[SOK-81] Fixes

Timur233 and others added 30 commits September 29, 2024 05:51

Экран окончания игры

d4deb1d

Правки ревью k0ndratov

9daba7e

[SOK-27] fix: lives

8be6f1b

[SOK-27] fix: изьавился от default

f2af052

[SOK-27] fix: изменил работу handleKey функций

4e0b9b3

[SOK-27] fix: Настроил сравнение с canvas

ed29145

[SOK-27] fix: Настроил движение и проверку колизии с объектом в одной…

959c1b4

… функции

[SOK-27] fix: Настроил fps игры

11532f6

added: profile page, change password page, from component, input comp…

a61b010

…onent

added: profile page, change password page, from component, input comp…

f9a4f97

…onent

Merge branch 'develop' of https://github.com/Timur233/falcon-tanks in…

61ab747

…to SOK-22_user_profile_page

fix profile page layout, fix styles

0d46090

[SOK-27] fix: hasCollision

6b32d3a

[SOK-27] fix: +hasCollision ограничение количества проверок коллизий

4b02ce2

[SOK-27] fix: убрал не нужный комментарий о завершении игры

caf795a

Добавил состояние для загрузки спрайта иконок

0fbd8c9

[SOK-27] fix: настроил запуск игры

e7499c0

[SOK-16]

057aab9

+add backendApi +create axios interceptors +add userReducer and create function for use yandex api +add env *update SignIn.tsx for use backendApi *update SignUp.tsx for use backendApi *format and lint

[SOK-16]

cf1f851

*fix lint error *add types from yandex api for user

[SOK-16]

d993cc1

*rename UserReducer to AuthReducer *rename methods in auth-reducer.ts -remove origin host from methods in auth-reducer.ts because base url set in backendApi

[SOK-16]

9960d7c

*update backendApi *change reducer for async/await *redirects with router (spa) +add toast for error message

[SOK-16]

0234024

*fix format *fix lint

fix avatar component, fix profile page layout, fix default form class…

7b59c39

… name

Fix input, fix change password page, fix page & styles

dff7926

Fix profile page background images

3cb9e99

[SOK-16]

6dcb54e

*fix some comment for PR

[SOK-16]

94da985

*format *fix lint

Merge pull request #8 from Timur233/SOK-16_authorization

2def654

[SOK-16]

Merge with develop

b39dbb2

[SOK-27] fix: настроил переход на страницу поражения

64eb487

iskandarov and others added 30 commits November 25, 2024 01:23

Поправил theme toggle

8a83a16

Поправил стили тут и там

2d83f4a

Merge branch 'develop' into SOK-54_missing-bullets

eb60f5b

Merge pull request #52 from Timur233/SOK-80_bug-fix

4601550

Merge pull request #33 from Timur233/SOK-54_missing-bullets

e4fa9e1

[SOK-fix-docker]

763fe6f

final forum fixes

80aa50f

Merge pull request #51 from Timur233/SOK-71_forum_fix

84f7fdd

[SOK-18]

6ba2087

*validation *fix mistakes

[SOK]

4799ace

*change word mistake

[SOK-18]

3555d56

*add type for button

[SOK-18]

0403f08

*fix cors host

Merge pull request #54 from Timur233/SOK-18

9c2111e

Resolve SOK-18

[SOK]

a474412

*add oauth redirect url

fix: копирование .env.sample в том случае если нет .env

8bb7ba9

fix: убрал монтирование проекта

53db484

fix: перенес команды билдинга на этап base

20f926b

fix: вернул yarn build на место

ce3188e

fix: настроил получение ссылки на хост сервера из .env localApi

36f7033

fix: дополнительные настройки для CORS

a490642

feat: docker file target for prod

3444d9e

fix linter

4650dad

wip

fd160d2

Пофиксил кнопку на главно

93203ad

fix: добавил условие в Dockerfile, для обхода ошибки в линте с .env

190725d

fix: убрал условие, немного изменил предыдущее, для обхода ошибки в л…

188a17e

…инте с .env

fix: ещё попытка обхода ошибки в линте с .env

5818287

Merge pull request #55 from Timur233/dockerfile-target-for-prod

cd8871c

feat: docker file target for prod

Merge pull request #57 from Timur233/SOK-81_fixes

e9a1a85

[SOK-81] Fixes

doc: актуализировал документацию игры

e8f021e

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge develop into main #50

Merge develop into main #50

gloginov commented Nov 22, 2024

Merge develop into main #50

Are you sure you want to change the base?

Merge develop into main #50

Conversation

gloginov commented Nov 22, 2024