Compare commits
5 Commits
feature/br
...
fix/sideba
| Author | SHA1 | Date | |
|---|---|---|---|
| e1043bed36 | |||
| a090ce37ad | |||
| 1142a9755a | |||
| bb3789c01c | |||
| 2422ea88fd |
9
.dockerignore
Normal file
9
.dockerignore
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
.git
|
||||||
|
.gitignore
|
||||||
|
**/.env
|
||||||
|
**/.env.*
|
||||||
|
**/node_modules
|
||||||
|
**/dist
|
||||||
|
**/__pycache__
|
||||||
|
temp
|
||||||
|
*.log
|
||||||
18
CHANGELOG.md
18
CHANGELOG.md
@@ -1,5 +1,23 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## [Frontend 0.9.3] - 2026-08-20
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- Aligned sidebar versions and copyright as separate footer lines and updated the copyright period.
|
||||||
|
|
||||||
|
## [Backend 0.6.8] - 2026-08-20
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- Docker build context now excludes environment files and other local secret-bearing artifacts.
|
||||||
|
|
||||||
|
## [Backend 0.6.7] - 2026-08-20
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
|
||||||
|
- Docker Compose now injects backend configuration from the untracked `backend/.env`; secrets are no longer hard-coded or copied into the image.
|
||||||
|
|
||||||
## [Backend 0.6.6] - 2026-08-19
|
## [Backend 0.6.6] - 2026-08-19
|
||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
|
|||||||
@@ -31,7 +31,6 @@ COPY --from=build /app/backend/dist ./dist
|
|||||||
COPY --from=build /app/backend/package.json ./package.json
|
COPY --from=build /app/backend/package.json ./package.json
|
||||||
COPY --from=build /app/node_modules ./node_modules
|
COPY --from=build /app/node_modules ./node_modules
|
||||||
COPY --from=build /app/backend/node_modules/ ./node_modules/
|
COPY --from=build /app/backend/node_modules/ ./node_modules/
|
||||||
COPY backend/.env .env
|
|
||||||
|
|
||||||
EXPOSE 3000
|
EXPOSE 3000
|
||||||
CMD ["node","dist/app.js"]
|
CMD ["node","dist/app.js"]
|
||||||
|
|||||||
@@ -21,6 +21,8 @@ createdb family_budget
|
|||||||
npm run dev -w backend
|
npm run dev -w backend
|
||||||
```
|
```
|
||||||
|
|
||||||
|
Для Docker Compose production-переменные передаются из `backend/.env`. Файл не хранится в Git и не копируется в Docker image; перед запуском создайте его из `.env.example` и заполните секреты.
|
||||||
|
|
||||||
Сервер стартует на `http://localhost:3000` (или на порту из `PORT`).
|
Сервер стартует на `http://localhost:3000` (или на порту из `PORT`).
|
||||||
|
|
||||||
## Скрипты
|
## Скрипты
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@family-budget/backend",
|
"name": "@family-budget/backend",
|
||||||
"version": "0.6.6",
|
"version": "0.6.8",
|
||||||
"private": true,
|
"private": true,
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "tsx watch src/app.ts",
|
"dev": "tsx watch src/app.ts",
|
||||||
|
|||||||
@@ -7,13 +7,8 @@ services:
|
|||||||
context: .
|
context: .
|
||||||
dockerfile: Dockerfile.backend
|
dockerfile: Dockerfile.backend
|
||||||
container_name: family-budget-backend
|
container_name: family-budget-backend
|
||||||
environment:
|
env_file:
|
||||||
# Имя контейнера/сервиса PostgreSQL — postgres или postgres_budget
|
- ./backend/.env
|
||||||
- DB_HOST=postgres_budget
|
|
||||||
- DB_PORT=5432
|
|
||||||
- DB_NAME=family_budget
|
|
||||||
- DB_USER=budget_user
|
|
||||||
- DB_PASSWORD=difficult_Paaaaaasword
|
|
||||||
ports:
|
ports:
|
||||||
- "3000:3000"
|
- "3000:3000"
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@family-budget/frontend",
|
"name": "@family-budget/frontend",
|
||||||
"version": "0.9.2",
|
"version": "0.9.3",
|
||||||
"private": true,
|
"private": true,
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|||||||
@@ -104,7 +104,7 @@ export function Layout({ children }: { children: ReactNode }) {
|
|||||||
<span className="sidebar__version">
|
<span className="sidebar__version">
|
||||||
FE {__FE_VERSION__} · BE {beVersion ?? '…'}
|
FE {__FE_VERSION__} · BE {beVersion ?? '…'}
|
||||||
</span>
|
</span>
|
||||||
<span className="sidebar__copyright">© 2025 Семейный бюджет</span>
|
<span className="sidebar__copyright">© 2025–2026 Семейный бюджет</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</aside>
|
</aside>
|
||||||
|
|||||||
@@ -242,6 +242,12 @@ button {
|
|||||||
gap: 10px;
|
gap: 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.sidebar__meta {
|
||||||
|
flex-direction: column;
|
||||||
|
align-items: flex-start;
|
||||||
|
gap: 4px;
|
||||||
|
}
|
||||||
|
|
||||||
.sidebar__user {
|
.sidebar__user {
|
||||||
min-width: 0;
|
min-width: 0;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
|
|||||||
Reference in New Issue
Block a user