diff --git a/backend/UniVerse.Api/Program.cs b/backend/UniVerse.Api/Program.cs index 4aeda3a..076268e 100644 --- a/backend/UniVerse.Api/Program.cs +++ b/backend/UniVerse.Api/Program.cs @@ -29,7 +29,7 @@ builder.Services.AddDbContext(options => npgsql => { 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"], ValidAudience = builder.Configuration["Jwt:Audience"], 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(); @@ -114,7 +114,7 @@ builder.Services.AddSwaggerGen(options => { Title = "UniVerse API", Version = "v1", - Description = "University schedule, reviews, and gamification platform" + Description = "Universe" }); options.AddSecurityDefinition("Bearer", new OpenApiSecurityScheme diff --git a/backend/docker-compose-prod.yml b/docker-compose-prod.yml similarity index 90% rename from backend/docker-compose-prod.yml rename to docker-compose-prod.yml index 4f21a13..b5a96db 100644 --- a/backend/docker-compose-prod.yml +++ b/docker-compose-prod.yml @@ -4,7 +4,7 @@ services: image: git.zetcraft.ru/serega404/universe/backend:main restart: always ports: - - "8088:8080" + - "8080:8080" environment: - 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} networks: - backend + - frontend db: image: postgres:18-alpine @@ -56,6 +57,14 @@ services: retries: 3 start_period: 30s + frontend: + image: git.zetcraft.ru/serega404/universe/frontend:main + restart: unless-stopped + ports: + - "80" + networks: + - frontend + networks: frontend: backend: diff --git a/backend/docker-compose-test.yml b/docker-compose-test.yml similarity index 93% rename from backend/docker-compose-test.yml rename to docker-compose-test.yml index 6513329..8915fd7 100644 --- a/backend/docker-compose-test.yml +++ b/docker-compose-test.yml @@ -54,3 +54,11 @@ services: timeout: 5s retries: 3 start_period: 30s + + frontend: + build: + context: ./frontend + dockerfile: Dockerfile + ports: + - "80" + restart: unless-stopped diff --git a/frontend/index.html b/frontend/index.html index 9e5fc8f..ed3f053 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -4,7 +4,7 @@ - Vite App + UniVerse