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

Финальное ревью #75

Merged
merged 25 commits into from
Jan 24, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
23e3f3a
Merge branch 'sprint-04' into deploy
shoom1337 Dec 2, 2021
53c6d95
Merge branch 'sprint-04' into deploy
shoom1337 Dec 2, 2021
1be9d4f
Merge branch 'feature/auth-middleware' into deploy
shoom1337 Dec 4, 2021
bc8338b
Merge branch 'feature/auth-middleware' into deploy
shoom1337 Dec 4, 2021
20ad6df
Merge branch 'feature/auth-middleware' into deploy
shoom1337 Dec 4, 2021
fcf53c5
Финальное ревью
shoom1337 Dec 5, 2021
dad73bc
Исправил DB_PASSWORD в docker-compose и env-example
shoom1337 Dec 5, 2021
4b37806
Endgame, final boss - Peach
Alkamenos Dec 5, 2021
9f80e82
Exit button
Alkamenos Dec 5, 2021
4d86f5d
Фикс к предыдущему
shoom1337 Dec 5, 2021
55d8022
убрал логи
Alkamenos Dec 5, 2021
20597ce
Добавил сидеры БД
shoom1337 Dec 5, 2021
ae2ed42
Merge branch 'final-review' of github.com:Berlevog/yandex.middlefront…
shoom1337 Dec 5, 2021
b523724
Update README.md
shoom1337 Dec 5, 2021
81721fa
Исправил тесты UI
shoom1337 Dec 6, 2021
881cf98
Merge branch 'deploy' into final-review
shoom1337 Dec 6, 2021
864d638
Merge branch 'final-review' of github.com:Berlevog/yandex.middlefront…
shoom1337 Dec 6, 2021
66dd42b
Обновил тесты
Alkamenos Dec 6, 2021
db19ea4
Добавил coverage скрипты
Alkamenos Dec 6, 2021
f374739
исправил actions
Alkamenos Dec 6, 2021
e150230
исправил actions
Alkamenos Dec 6, 2021
95326d7
Убрал падающий тест
Alkamenos Dec 6, 2021
909073a
Исправил падающий тест
Alkamenos Dec 6, 2021
136b871
Поправил ссылку oauth для прода
shoom1337 Dec 7, 2021
70245d9
fix for prev
shoom1337 Dec 7, 2021
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
6 changes: 3 additions & 3 deletions .github/workflows/actions.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
name: build-test
on: [pull_request, push]
on: [pull_request]
jobs:
Testing:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: "14"
node-version: "16"
- run: npm install
- run: npm run test:client
- run: npm run test
20 changes: 11 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,20 @@
_Командный проект 5-9 спринта_

[![build-test](https://github.com/Berlevog/yandex.middlefrontend.mario/actions/workflows/actions.yml/badge.svg)](https://github.com/Berlevog/yandex.middlefrontend.mario/actions/workflows/actions.yml)
[![Heroku](https://heroku-badge.herokuapp.com/?app=super-mario-yandex&style=flat)](https://super-mario-yandex.herokuapp.com/)

Запуск проекта - `npm start`
Запуск проекта:

Сборка - `npm run build`
`npm run docker:build`

Тесты - `npm run test`
`npm run docker:start`

Demo - https://super-mario-yandex.herokuapp.com/
После запуска узнать CONTAINER_ID контейнера mario_app:

## Темизация
`docker ps`
Засидировать БД:

После запуска проекта в докере, в БД нужно внести две записи в таблицу theme:
name: light, theme: {}
name: dark, theme: {"palette": {"type": "dark", "primary": {"main": "#303030"}}}
`docker exec -it {CONTAINER_ID} npm run db:seed:undo`

`docker exec -it {CONTAINER_ID} npm run db:seed`

Demo - https://berlevog-mario-08.ya-praktikum.tech/app
6 changes: 3 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ services:
user: "${UID}:${GID}"
environment:
POSTGRES_PASSWORD: ${DB_USER}
POSTGRES_USER: ${DB_PASS}
POSTGRES_USER: ${DB_PASSWORD}
POSTGRES_DB: ${DB_DATABASE}
volumes:
- ${DB_VOLUME}:/var/lib/postgresql/data
Expand All @@ -28,14 +28,14 @@ services:
ports:
- "${APP_PORT}:${APP_PORT}"
volumes:
- ./:/usr/src/app
- ./packages:/usr/src/app/packages
user: "${UID}:${GID}"
environment:
DB_HOST: ${DB_HOST}
DB_PORT: ${DB_PORT}
DB_DRIVER: ${DB_DRIVER}
DB_USER: ${DB_USER}
DB_PASSWORD: ${DB_PASS}
DB_PASSWORD: ${DB_PASSWORD}
DB_DATABASE: ${DB_DATABASE}
APP_PORT: ${APP_PORT}
SSL_MODE: ${SSL_MODE}
Expand Down
6 changes: 4 additions & 2 deletions env-example
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
COMPOSE_PROJECT_NAME=MARIO
DB_HOST=db
DB_PORT=5432
DB_DRIVER=postgres # sequelize dialect: mysql, postgres, sqlite, mariadb or mssql
# sequelize dialect: mysql, postgres, sqlite, mariadb or mssql
DB_DRIVER=postgres
DB_USER=root
DB_PASSWORD=root
DB_DATABASE=mariodb
DB_VOLUME=.dbdata

SSL_MODE= # 'on' for enable dev SSL
# 'on' for enable dev SSL
SSL_MODE=

APP_PORT=3000
UID=1000
Expand Down
Loading