Dev #11

Merged
serega404 merged 87 commits from dev into main 2026-05-25 03:22:55 +03:00
4 changed files with 22 additions and 5 deletions
Showing only changes of commit 3af1932480 - Show all commits
+3 -3
View File
@@ -29,7 +29,7 @@ builder.Services.AddDbContext<AppDbContext>(options =>
npgsql => npgsql =>
{ {
npgsql.EnableRetryOnFailure(3); npgsql.EnableRetryOnFailure(3);
npgsql.MigrationsAssembly("UniVerse.Infrastructure"); npgsql.MigrationsAssembly("UniVerse.Infrastructure"); // Указывает EF Core, в какой сборке искать/хранить миграции.
}); });
}); });
@@ -50,7 +50,7 @@ builder.Services.AddAuthentication(options =>
ValidIssuer = builder.Configuration["Jwt:Issuer"], ValidIssuer = builder.Configuration["Jwt:Issuer"],
ValidAudience = builder.Configuration["Jwt:Audience"], ValidAudience = builder.Configuration["Jwt:Audience"],
IssuerSigningKey = new SymmetricSecurityKey( IssuerSigningKey = new SymmetricSecurityKey(
Encoding.UTF8.GetBytes(builder.Configuration["Jwt:Secret"] ?? "default-dev-secret-key-change-in-production-32chars!!")) Encoding.UTF8.GetBytes(builder.Configuration["Jwt:Secret"]!))
}; };
}); });
builder.Services.AddAuthorization(); builder.Services.AddAuthorization();
@@ -114,7 +114,7 @@ builder.Services.AddSwaggerGen(options =>
{ {
Title = "UniVerse API", Title = "UniVerse API",
Version = "v1", Version = "v1",
Description = "University schedule, reviews, and gamification platform" Description = "Universe"
}); });
options.AddSecurityDefinition("Bearer", new OpenApiSecurityScheme options.AddSecurityDefinition("Bearer", new OpenApiSecurityScheme
@@ -4,7 +4,7 @@ services:
image: git.zetcraft.ru/serega404/universe/backend:main image: git.zetcraft.ru/serega404/universe/backend:main
restart: always restart: always
ports: ports:
- "8088:8080" - "8080:8080"
environment: environment:
- ASPNETCORE_FORWARDEDHEADERS_ENABLED=true - ASPNETCORE_FORWARDEDHEADERS_ENABLED=true
@@ -35,6 +35,7 @@ services:
- ConnectionStrings:DefaultConnection=Host=db;Port=5432;Database=${POSTGRES_DATABASE:-universe};Username=${POSTGRES_USER};Password=${POSTGRES_PASSWORD} - ConnectionStrings:DefaultConnection=Host=db;Port=5432;Database=${POSTGRES_DATABASE:-universe};Username=${POSTGRES_USER};Password=${POSTGRES_PASSWORD}
networks: networks:
- backend - backend
- frontend
db: db:
image: postgres:18-alpine image: postgres:18-alpine
@@ -56,6 +57,14 @@ services:
retries: 3 retries: 3
start_period: 30s start_period: 30s
frontend:
image: git.zetcraft.ru/serega404/universe/frontend:main
restart: unless-stopped
ports:
- "80"
networks:
- frontend
networks: networks:
frontend: frontend:
backend: backend:
@@ -54,3 +54,11 @@ services:
timeout: 5s timeout: 5s
retries: 3 retries: 3
start_period: 30s start_period: 30s
frontend:
build:
context: ./frontend
dockerfile: Dockerfile
ports:
- "80"
restart: unless-stopped
+1 -1
View File
@@ -4,7 +4,7 @@
<meta charset="UTF-8"> <meta charset="UTF-8">
<link rel="icon" href="/favicon.ico"> <link rel="icon" href="/favicon.ico">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Vite App</title> <title>UniVerse</title>
</head> </head>
<body> <body>
<div id="app"></div> <div id="app"></div>