morgan/Tennis-Site
1
0
Fork 0
mirror of https://github.com/LOBSTERVOVA/Tennis-Site.git synced 2026-04-17 17:40:49 +03:00
Code Issues Packages Projects Releases Wiki Activity

правки

Browse Source
This commit is contained in:
Lobstervova
2026-04-15 14:03:11 +03:00
parent 506f4421df
commit a885279475
2 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/example/dateplanner/configurations/AppConfig.java
View File

@@ -14,7 +14,7 @@ import reactor.core.publisher.Mono;
@Configuration @Configuration
public class AppConfig { public class AppConfig {
private final String username = "morgan"; private final String username = "mohaned.alhalili@yandex.ru";
private final String password = "Admin_123!"; private final String password = "Admin_123!";
@Bean @Bean

27
src/main/java/com/example/dateplanner/controllers/web/HomeController.java
View File

@@ -41,26 +41,21 @@ public class HomeController extends BaseWebController {
return siteSettingsRepository.save(s); return siteSettingsRepository.save(s);
})); }));
Mono<GalleryPost> latestPostMono = galleryPostRepository.findFirstByIsPublishedTrueOrderByPublishedAtDesc(); Mono<GalleryPost> latestPostMono = galleryPostRepository.findFirstByIsPublishedTrueOrderByPublishedAtDesc()
.onErrorResume(e -> {
log.warn("Failed to fetch latest gallery post: {}", e.getMessage());
return Mono.empty();
});
return Mono.zip(settingsMono, latestPostMono) return settingsMono
.map(tuple -> { .flatMap(settings -> {
SiteSettings settings = tuple.getT1();
GalleryPost latestPost = tuple.getT2();
model.put("heroImageUrl", settings.getHeroImageUrl() != null ? settings.getHeroImageUrl() : DEFAULT_HERO_IMAGE); model.put("heroImageUrl", settings.getHeroImageUrl() != null ? settings.getHeroImageUrl() : DEFAULT_HERO_IMAGE);
model.put("backgroundImageUrl", settings.getBackgroundImageUrl() != null ? settings.getBackgroundImageUrl() : DEFAULT_HERO_IMAGE); model.put("backgroundImageUrl", settings.getBackgroundImageUrl() != null ? settings.getBackgroundImageUrl() : DEFAULT_HERO_IMAGE);
if (latestPost != null) { return latestPostMono
model.put("latestGalleryPost", latestPost); .doOnNext(post -> model.put("latestGalleryPost", post))
} .thenReturn(model)
return model; .switchIfEmpty(Mono.just(model));
}) })
.switchIfEmpty(Mono.zip(settingsMono, Mono.just((GalleryPost) null))
.map(tuple -> {
SiteSettings settings = tuple.getT1();
model.put("heroImageUrl", settings.getHeroImageUrl() != null ? settings.getHeroImageUrl() : DEFAULT_HERO_IMAGE);
model.put("backgroundImageUrl", settings.getBackgroundImageUrl() != null ? settings.getBackgroundImageUrl() : DEFAULT_HERO_IMAGE);
return model;
}))
.flatMap(this::addAuthToModel) .flatMap(this::addAuthToModel)
.map(m -> Rendering.view("template").model(m).build()); .map(m -> Rendering.view("template").model(m).build());
} }