diff --git a/src/main/java/pro/norbot/application/Application.java b/src/main/java/pro/norbot/application/Application.java index 957b3bd..ae45fdf 100644 --- a/src/main/java/pro/norbot/application/Application.java +++ b/src/main/java/pro/norbot/application/Application.java @@ -26,18 +26,18 @@ SpringApplication.run(Application.class, args); } - @Bean - SqlDataSourceScriptDatabaseInitializer dataSourceScriptDatabaseInitializer(DataSource dataSource, - SqlInitializationProperties properties, UserRepository repository) { - // This bean ensures the database is only initialized when empty - return new SqlDataSourceScriptDatabaseInitializer(dataSource, properties) { - @Override - public boolean initializeDatabase() { - if (repository.count() == 0L) { - return super.initializeDatabase(); - } - return false; - } - }; - } +// @Bean +// SqlDataSourceScriptDatabaseInitializer dataSourceScriptDatabaseInitializer(DataSource dataSource, +// SqlInitializationProperties properties, UserRepository repository) { +// // This bean ensures the database is only initialized when empty +// return new SqlDataSourceScriptDatabaseInitializer(dataSource, properties) { +// @Override +// public boolean initializeDatabase() { +// if (repository.count() == 0L) { +// return super.initializeDatabase(); +// } +// return false; +// } +// }; +// } } diff --git a/src/main/java/pro/norbot/application/views/error/NotFoundView.java b/src/main/java/pro/norbot/application/views/error/NotFoundView.java index 05f8f7f..451c006 100644 --- a/src/main/java/pro/norbot/application/views/error/NotFoundView.java +++ b/src/main/java/pro/norbot/application/views/error/NotFoundView.java @@ -1,17 +1,14 @@ package pro.norbot.application.views.error; import com.vaadin.flow.component.*; -import com.vaadin.flow.component.page.Push; import com.vaadin.flow.router.BeforeEnterEvent; import com.vaadin.flow.router.ErrorParameter; import com.vaadin.flow.router.HasErrorParameter; import com.vaadin.flow.router.NotFoundException; -import com.vaadin.flow.server.VaadinSession; import com.vaadin.flow.shared.communication.PushMode; import jakarta.servlet.http.HttpServletResponse; import lombok.Getter; import lombok.RequiredArgsConstructor; -import lombok.Setter; import java.util.HashMap; import java.util.Map; @@ -50,7 +47,7 @@ @Getter @RequiredArgsConstructor private class CustomSession { - private final AtomicInteger atomicInteger = new AtomicInteger(5); + private final AtomicInteger atomicInteger = new AtomicInteger(3); private final String sessionId; private final String path; private Timer timer = null; @@ -79,7 +76,7 @@ } private String generateText() { - return String.format("Could not navigate to '%s'. Redirection in %s seconds...", getPath(), getAtomicInteger().getAndDecrement()); + return String.format("Could not navigate to '/%s'.\nRedirection in %s seconds...", getPath(), getAtomicInteger().getAndDecrement()); } } } diff --git a/src/main/java/pro/norbot/application/views/main/MainView.java b/src/main/java/pro/norbot/application/views/main/MainView.java index 640b536..cf4d29a 100644 --- a/src/main/java/pro/norbot/application/views/main/MainView.java +++ b/src/main/java/pro/norbot/application/views/main/MainView.java @@ -4,6 +4,7 @@ import com.vaadin.flow.component.html.Image; import com.vaadin.flow.component.orderedlayout.HorizontalLayout; import com.vaadin.flow.component.orderedlayout.VerticalLayout; +import com.vaadin.flow.component.page.Page; import com.vaadin.flow.router.PageTitle; import com.vaadin.flow.router.Route; import com.vaadin.flow.server.auth.AnonymousAllowed; @@ -14,19 +15,8 @@ public class MainView extends VerticalLayout { public MainView() { - setSpacing(false); - -// Image img = new Image("images/empty-plant.png", "placeholder plant"); -// img.setWidth("200px"); -// add(img); -// -// H2 header = new H2("This place intentionally left empty"); -// header.addClassNames(Margin.Top.XLARGE, Margin.Bottom.MEDIUM); -// add(header); -// add(new Paragraph("It’s a place where you can grow your own UI 🤗")); - add(createHorizontalLayout( - createImg("images/discord.png", "discord", "https://discordapp.com/users/287220288205225984") - )); + setSpacing(true); + add(createImg("images/discord.png", "discord", "discord://discordapp.com/users/287220288205225984")); add(createHorizontalLayout( createImg("images/jb_teamcity.png", "teamcity", "/teamcity"), createImg("images/jb_youtrack.png", "youtrack", "/youtrack"), @@ -48,7 +38,13 @@ private Image createImg(String path, String name, String url) { Image img = new Image(path, name); img.setWidth("115px"); - img.addClickListener(event -> getUI().ifPresent(ui -> ui.getPage().setLocation(url))); + img.addClickListener(event -> getUI().ifPresent(ui -> { + Page page = ui.getPage(); + if (url.contains("://")) + page.open(url, "_blank"); + else + page.setLocation(url); + })); return img; } }