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

For route and redux ssr #44

Open
wants to merge 139 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
139 commits
Select commit Hold shift + click to select a range
312f6bf
Настроил eslint для клиента
EgorRyazanov Oct 11, 2023
e89e25c
Попроваил lefthook
EgorRyazanov Oct 11, 2023
6b06fa8
Исправил ошибки с eslint
EgorRyazanov Oct 12, 2023
6f43327
Отформатировал проект
EgorRyazanov Oct 12, 2023
b6682fd
добавил структуру проекта по папкам
Aristockij Oct 13, 2023
4aaadbc
Merge branch 'feature/configuration' into canvas-engine
Aristockij Oct 13, 2023
1701764
feature_(formInput): add formInput_15.10.23.
EvgeniyGrokholskiy Oct 15, 2023
0174b30
feature_(loginPage): add login page_15.10.23.
EvgeniyGrokholskiy Oct 15, 2023
a90cb1d
feature_(registrationPage): add registrationPage_15.10.23.
EvgeniyGrokholskiy Oct 15, 2023
773ea8e
feature_(React Router): add React Router and dummy pages_15.10.23.
EvgeniyGrokholskiy Oct 15, 2023
04ddea0
feature_(Error_404): add Error_404 page_15.10.23.
EvgeniyGrokholskiy Oct 15, 2023
176fa02
feature_(Error_5XX): add Error_5XX page_15.10.23.
EvgeniyGrokholskiy Oct 15, 2023
19ccd47
feature_(authApi): add authApi_15.10.23.
EvgeniyGrokholskiy Oct 15, 2023
b22ff59
fix_(lerna.json): add useWorkspaces_18.10.23.
EvgeniyGrokholskiy Oct 18, 2023
3b76a32
fix_(APP): fixed import paths_18.10.23.
EvgeniyGrokholskiy Oct 18, 2023
5257966
fix_(jest): fix tests_18.10.23.
EvgeniyGrokholskiy Oct 18, 2023
227f352
Merge pull request #3 from EgorRyazanov/formsAndRouter
Aristockij Oct 18, 2023
4650a15
Merge branch 'dev' into canvas-engine
Aristockij Oct 18, 2023
4d0c022
add mainPage
tata1988 Oct 19, 2023
ec3f0be
настройки
tata1988 Oct 19, 2023
f58efb3
правка роута
tata1988 Oct 19, 2023
a408fd2
HeaderNavLink, Header, GoBack, стр LeaderBordPage
tata1988 Oct 20, 2023
ea30be4
вынесла цвет в переменную variables
tata1988 Oct 20, 2023
8adc1d9
добавил движок игры
Aristockij Oct 21, 2023
8a9accd
style_(APP): fix page styles_22.10.23.
EvgeniyGrokholskiy Oct 22, 2023
305b906
style_(App.scss): style fix_22.10.23.
EvgeniyGrokholskiy Oct 22, 2023
0ba5da7
feature_(Froms): add forms validation_22.10.23.
EvgeniyGrokholskiy Oct 22, 2023
55e7b4c
Merge pull request #6 from EgorRyazanov/styleFix
EvgeniyGrokholskiy Oct 22, 2023
c680b1c
Merge pull request #8 from EgorRyazanov/formInputValidate
EvgeniyGrokholskiy Oct 22, 2023
9ce939a
добавила св-ва для img,svg
tata1988 Oct 22, 2023
59ac3bb
заменила переменные цветов
tata1988 Oct 22, 2023
d24fae3
убрала пустые строки
tata1988 Oct 22, 2023
8d16a81
убрала последнюю строчку в variables
tata1988 Oct 22, 2023
e67f9a9
убрала переменные
tata1988 Oct 22, 2023
0df0dc5
вернула назад
tata1988 Oct 22, 2023
53757aa
изменила переменные в variables
tata1988 Oct 22, 2023
d73a644
св-ва для img, svg
tata1988 Oct 22, 2023
727553c
Merge branch 'dev' into mainPage
EvgeniyGrokholskiy Oct 22, 2023
d952bdf
Merge pull request #4 from EgorRyazanov/mainPage
EvgeniyGrokholskiy Oct 22, 2023
77d7040
исправил замечания
Aristockij Oct 23, 2023
7285e5a
Merge branch 'dev' into canvas-engine
Aristockij Oct 23, 2023
a812e7b
правки: перенес mouse{} enemies и waypoints в Canvas
Aristockij Oct 23, 2023
07f24be
фикс конфликтов
Aristockij Oct 23, 2023
58b2a0e
фикс конфликтов
Aristockij Oct 23, 2023
46bed5d
фикс конфликтов
Aristockij Oct 23, 2023
2bcaf20
добавила стр MainPage
tata1988 Oct 23, 2023
7298fd9
change mainPage
tata1988 Oct 23, 2023
e19440a
исправил замечания
Aristockij Oct 23, 2023
fb99aad
переместил переменные внутрь useEffect
Aristockij Oct 23, 2023
a3e0a3b
Merge pull request #9 from EgorRyazanov/leaderBordPage
tata1988 Oct 24, 2023
521f4f7
добавил base-component
EgorRyazanov Oct 24, 2023
a7d1db8
Поправил тест и курсор
EgorRyazanov Oct 24, 2023
8f37671
Убрал тесты из автопроверки
EgorRyazanov Oct 24, 2023
d63d5f9
Вернул форум
EgorRyazanov Oct 24, 2023
965d3b2
feature_(UserProfile): add UserProfile page_25.10.23.
EvgeniyGrokholskiy Oct 24, 2023
12b3e7e
fix_(APP): fix errors_25.10.23.
EvgeniyGrokholskiy Oct 24, 2023
a3857fb
fix_(APP): fix errors_25.10.23.
EvgeniyGrokholskiy Oct 24, 2023
6b9c064
Убрал memo
EgorRyazanov Oct 25, 2023
cae019b
Merge pull request #12 from EgorRyazanov/fix/base-component
EgorRyazanov Oct 25, 2023
9b9cea3
Добавил error-boundary
EgorRyazanov Oct 25, 2023
32b2fe9
Убрал моковую ошибку
EgorRyazanov Oct 25, 2023
8bb7e2d
Merge pull request #14 from EgorRyazanov/feature/error-boundary
EgorRyazanov Oct 25, 2023
2b38a08
Добавил страницу создания топика, улучшил кастомный инпут
EgorRyazanov Oct 26, 2023
6b1cb6b
fix_(userProfile): corrected reviewer's comments_26.10.23.
EvgeniyGrokholskiy Oct 26, 2023
f0b84be
Merge pull request #13 from EgorRyazanov/userProfile
EvgeniyGrokholskiy Oct 26, 2023
5e707af
style_(FormInput): fix input style_26.10.23.
EvgeniyGrokholskiy Oct 26, 2023
c3c88a7
fix_(APP): add <img /> for svg_26.10.23.
EvgeniyGrokholskiy Oct 26, 2023
253b8c5
style_(APP): style fix_26.10.23.
EvgeniyGrokholskiy Oct 26, 2023
e1ca1b7
Merge branch 'dev' into userProfile
EvgeniyGrokholskiy Oct 26, 2023
7f3a525
Добавил страницу детальный информации форума
EgorRyazanov Oct 26, 2023
6b3a7e5
Merge pull request #15 from EgorRyazanov/userProfile
EvgeniyGrokholskiy Oct 26, 2023
bc08f55
Смерджил с девом
EgorRyazanov Oct 26, 2023
3efd052
fix_(UserProfile): fix content and style_27.10.23.
EvgeniyGrokholskiy Oct 26, 2023
9319cd5
fix_(App.test): fix test_27.10.23.
EvgeniyGrokholskiy Oct 26, 2023
a5ecf2c
Merge pull request #16 from EgorRyazanov/fixUserProfile
EvgeniyGrokholskiy Oct 26, 2023
3d52e15
исправил название классов, исправил компонент аватара
EgorRyazanov Oct 26, 2023
e96bf42
Исправил тесты
EgorRyazanov Oct 26, 2023
5da5252
добавила react-redux, reduxjs/toolkit
tata1988 Oct 28, 2023
1016000
изм
tata1988 Oct 28, 2023
236f962
изм
tata1988 Oct 28, 2023
bc6de34
Merge branch 'dev' of https://github.com/EgorRyazanov/cherry-pies-gam…
tata1988 Oct 28, 2023
9cb9240
добавила слайс для usera, в App после авторизации данные сохр в store
tata1988 Oct 28, 2023
df99421
provider
tata1988 Oct 28, 2023
e8f1e01
добавила provider в App.test.tsx
tata1988 Oct 29, 2023
6c9ea17
поменяла структуру папки store
tata1988 Oct 29, 2023
52f583a
вынесла асинхр ф-ю в thunk
tata1988 Oct 29, 2023
72e669f
Типизировал утилитные функции, убрал лишнюю логику
EgorRyazanov Oct 29, 2023
17371a4
Merge pull request #17 from EgorRyazanov/feature/forum-page
EgorRyazanov Oct 29, 2023
df6e9c0
Merge pull request #7 from EgorRyazanov/canvas-engine
Aristockij Oct 30, 2023
707a6f0
вынесла thunk в отдельный файл actions, убрала await, убрала try catch
tata1988 Oct 31, 2023
b93ce30
Merge branch 'dev' of https://github.com/EgorRyazanov/cherry-pies-gam…
tata1988 Oct 31, 2023
63783b0
feature_(WithAuthCheck): add HOC WithAuthCheck_31.10.23.
EvgeniyGrokholskiy Oct 31, 2023
ee6b2d4
fix_(test): fix test error_31.10.23.
EvgeniyGrokholskiy Oct 31, 2023
27bf9d3
добавила условие в addCase для rejected
tata1988 Oct 31, 2023
ccacebd
Merge pull request #18 from EgorRyazanov/redux-toolkit
tata1988 Oct 31, 2023
2b76f64
fix_(HOC/HOOK): corrected reviewer's comments_01.11.23.
EvgeniyGrokholskiy Nov 1, 2023
0122b8f
feature_(WithAuthCheck): add HOC WithAuthCheck_31.10.23.
EvgeniyGrokholskiy Oct 31, 2023
2b34e0b
fix_(test): fix test error_31.10.23.
EvgeniyGrokholskiy Oct 31, 2023
86d4260
fix_(HOC/HOOK): corrected reviewer's comments_01.11.23.
EvgeniyGrokholskiy Nov 1, 2023
41f7b61
Merge remote-tracking branch 'origin/withAuthHOC' into withAuthHOC
EvgeniyGrokholskiy Nov 1, 2023
af33fd9
feature_(slice): add isAuth and isDataFetched in slice_02.11.23.
EvgeniyGrokholskiy Nov 2, 2023
a845724
Merge pull request #20 from EgorRyazanov/withAuthHOC
EvgeniyGrokholskiy Nov 3, 2023
a4dd69a
добавил конец игры, изменил логику
Aristockij Nov 4, 2023
97a3897
добавил спрайты
Aristockij Nov 4, 2023
835656c
feature_(useFullScreen): add useFullScreen hook_05.11.23.
EvgeniyGrokholskiy Nov 5, 2023
e239a91
feature_(redux): add redux_05.11.23.
EvgeniyGrokholskiy Nov 5, 2023
ed2eb5f
feature_(APP): rename colors in variable.scss file_05.11.23.
EvgeniyGrokholskiy Nov 5, 2023
93e442a
reract_(APP): remove unused component_05.11.23.
EvgeniyGrokholskiy Nov 5, 2023
f35758a
добавил экраны начала и окончания игры
Aristockij Nov 5, 2023
3e0e1d7
Добавил service worker
EgorRyazanov Nov 5, 2023
d6216cc
убрал лишние конфигурации
EgorRyazanov Nov 5, 2023
c9e7f3a
Merge branch 'dev' into canvasEngineUpdate
Aristockij Nov 5, 2023
16fec9e
fix
Aristockij Nov 5, 2023
b765f15
Merge remote-tracking branch 'origin/canvasEngineUpdate' into canvasE…
Aristockij Nov 5, 2023
32bd016
убираю башни, когда начинается новая игра
Aristockij Nov 5, 2023
400e5f0
Переименовал файл и добавил условие на mode
EgorRyazanov Nov 5, 2023
49cd674
Merge pull request #24 from EgorRyazanov/feature/service-worker
EgorRyazanov Nov 5, 2023
f94c943
правки
Aristockij Nov 5, 2023
7986f98
Merge pull request #21 from EgorRyazanov/useFullScreen
EvgeniyGrokholskiy Nov 6, 2023
1ea169b
Merge pull request #22 from EgorRyazanov/refactoring
EvgeniyGrokholskiy Nov 6, 2023
61724b4
Merge branch 'dev' into canvasEngineUpdate
Aristockij Nov 7, 2023
160cdd7
fix
Aristockij Nov 7, 2023
d8a9ce5
Merge remote-tracking branch 'origin/canvasEngineUpdate' into canvasE…
Aristockij Nov 7, 2023
6eec8a2
app fix
Aristockij Nov 7, 2023
ce75420
Update App.tsx
Aristockij Nov 7, 2023
79867e1
Update game index.tsx
Aristockij Nov 7, 2023
73e93db
Merge pull request #23 from EgorRyazanov/canvasEngineUpdate
Aristockij Nov 7, 2023
227af44
добавил readme
Aristockij Nov 8, 2023
61f92ab
Add files via upload
EgorRyazanov Nov 8, 2023
23535a4
Merge remote-tracking branch 'origin/dev' into dev
Aristockij Nov 8, 2023
5ee37dc
feature_(leaderboard): add get leaderboard logic_22.11.23.
EvgeniyGrokholskiy Nov 21, 2023
0fc10c1
feature_(liderBoardApi): add getAllLeaderBoardItems()_23.11.23.
EvgeniyGrokholskiy Nov 22, 2023
5cf5eda
Merge pull request #25 from EgorRyazanov/leaderBoardApi
Aristockij Nov 24, 2023
b6a6111
Merge remote-tracking branch 'origin/dev' into dev
Aristockij Nov 24, 2023
8ee6f33
fix_(LeaderBoard): remove input fpom page_24.11.23.
EvgeniyGrokholskiy Nov 24, 2023
238d9e8
Merge pull request #27 from EgorRyazanov/leaderBoardApi
EvgeniyGrokholskiy Nov 25, 2023
b68a746
Merge remote-tracking branch 'origin/dev' into dev
Aristockij Nov 26, 2023
5df18fd
раздача статики с помощью ssr
Aristockij Nov 26, 2023
9faf603
добавлен redux для ssr и router
Dec 3, 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
Binary file added .DS_Store
Binary file not shown.
13 changes: 12 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
### SSR

1. cd client
2. yarn build:ssr
3. yarm build
4. yarn link "client"
5. cd server
6. yarn link client
7. yarn build
8. NODE_ENV=development node dist/index.js

### Как запускать?

1. Убедитесь что у вас установлен `node` и `docker`
Expand Down Expand Up @@ -73,4 +84,4 @@
3. postgres, вашу базу данных (postgres)

Если вам понадобится только один сервис, просто уточните какой в команде
`docker compose up {sevice_name}`, например `docker compose up server`
`docker compose up {sevice_name}`, например `docker compose up server`
7 changes: 4 additions & 3 deletions init.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
const fs = require('fs')
//eslint-disable-next-line
const fs = require('fs');

fs.copyFileSync('.env.sample', '.env')
fs.copyFileSync('.env.sample', '.env');

fs.mkdirSync('tmp/pgdata', { recursive: true })
fs.mkdirSync('tmp/pgdata', { recursive: true });
4 changes: 2 additions & 2 deletions lefthook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ pre-commit:
commands:
lint:
glob: '*.{ts,tsx}'
run: yarn eslint {staged_files}
run: yarn run lint
prettier:
glob: '*.{ts,tsx,css}'
run: yarn prettier -w {staged_files}
run: yarn prettier -w {staged_files} && git add {staged_files}
stage_fixed: true
4 changes: 2 additions & 2 deletions lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"$schema": "node_modules/lerna/schemas/lerna-schema.json",
"useNx": true,
"npmClient": "yarn",
"useWorkspaces": true,
"version": "0.0.0"
"version": "0.0.0",
"useWorkspaces": true
}
Loading