From 10519b7ce0ab788a675e625f4ef3a5564c62f227 Mon Sep 17 00:00:00 2001 From: GAM Date: Sat, 20 Mar 2021 08:28:53 +0100 Subject: [PATCH] usage of term "card" --- frontend/app/views/main/main-view.css | 4 ++-- src/main/java/app/views/matchday/MatchdayView.java | 10 +++++----- .../{MatchdayComponent.java => matchdayCard.java} | 6 +++--- src/main/java/app/views/table/TableView.java | 10 +++++----- .../components/{TableComponent.java => TableCard.java} | 6 +++--- 5 files changed, 18 insertions(+), 18 deletions(-) rename src/main/java/app/views/matchday/components/{MatchdayComponent.java => matchdayCard.java} (96%) rename src/main/java/app/views/table/components/{TableComponent.java => TableCard.java} (95%) diff --git a/frontend/app/views/main/main-view.css b/frontend/app/views/main/main-view.css index 43714e4..2202c01 100644 --- a/frontend/app/views/main/main-view.css +++ b/frontend/app/views/main/main-view.css @@ -8,14 +8,14 @@ min-height: 100%; } -.grid-wrapper { +.grid-card { background-color: var(--lumo-base-color); border-radius: var(--lumo-border-radius); box-shadow: var(--lumo-box-shadow-xs); padding: 0 var(--lumo-space-m) var(--lumo-space-m); } -.wrapper { +.card { background-color: var(--lumo-base-color); border-radius: var(--lumo-border-radius); box-shadow: var(--lumo-box-shadow-xs); diff --git a/src/main/java/app/views/matchday/MatchdayView.java b/src/main/java/app/views/matchday/MatchdayView.java index 881ccfd..a659ba8 100644 --- a/src/main/java/app/views/matchday/MatchdayView.java +++ b/src/main/java/app/views/matchday/MatchdayView.java @@ -3,7 +3,7 @@ package app.views.matchday; import app.navigation.NavigationLevel; import app.navigation.NavigationService; import app.views.main.MainView; -import app.views.matchday.components.MatchdayComponent; +import app.views.matchday.components.matchdayCard; import app.views.navigation.NavigationViewBase; import com.vaadin.flow.component.dependency.CssImport; import com.vaadin.flow.router.PageTitle; @@ -15,7 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired; @PageTitle("Schachliga DACH - Results - Matchdays") public class MatchdayView extends NavigationViewBase { - private MatchdayComponent matchdayComponent; + private matchdayCard matchdayCard; public MatchdayView(@Autowired NavigationService navigationService) { super(navigationService, "matchday", NavigationLevel.MATCHDAY); @@ -30,8 +30,8 @@ public class MatchdayView extends NavigationViewBase { //////////// private void configureLayout() { - matchdayComponent = new MatchdayComponent(navigation); - add(matchdayComponent); + matchdayCard = new matchdayCard(navigation); + add(matchdayCard); } ///////////// @@ -40,6 +40,6 @@ public class MatchdayView extends NavigationViewBase { @Override protected void configureContent() { - matchdayComponent.configureContent(); + matchdayCard.configureContent(); } } diff --git a/src/main/java/app/views/matchday/components/MatchdayComponent.java b/src/main/java/app/views/matchday/components/matchdayCard.java similarity index 96% rename from src/main/java/app/views/matchday/components/MatchdayComponent.java rename to src/main/java/app/views/matchday/components/matchdayCard.java index 05d1522..53a0d23 100644 --- a/src/main/java/app/views/matchday/components/MatchdayComponent.java +++ b/src/main/java/app/views/matchday/components/matchdayCard.java @@ -23,7 +23,7 @@ import com.vaadin.flow.component.orderedlayout.VerticalLayout; import java.util.NoSuchElementException; -public class MatchdayComponent extends Div implements ContentConfigurable { +public class matchdayCard extends Div implements ContentConfigurable { private final Navigation navigation; @@ -31,10 +31,10 @@ public class MatchdayComponent extends Div implements ContentConfigurable { private final Label headerLabel = new Label(); private final Grid grid = new Grid<>(); - public MatchdayComponent(Navigation navigation) { + public matchdayCard(Navigation navigation) { this.navigation = navigation; - addClassName("wrapper"); + addClassName("card"); VerticalLayout inner = new VerticalLayout(); add(inner); inner.add(header, grid); diff --git a/src/main/java/app/views/table/TableView.java b/src/main/java/app/views/table/TableView.java index 6d53945..9a6c568 100644 --- a/src/main/java/app/views/table/TableView.java +++ b/src/main/java/app/views/table/TableView.java @@ -5,7 +5,7 @@ import app.navigation.NavigationLevel; import app.navigation.NavigationService; import app.views.main.MainView; import app.views.navigation.NavigationViewBase; -import app.views.table.components.TableComponent; +import app.views.table.components.TableCard; import com.vaadin.flow.component.dependency.CssImport; import com.vaadin.flow.router.PageTitle; import com.vaadin.flow.router.Route; @@ -20,7 +20,7 @@ public class TableView extends NavigationViewBase { private final PlayerService playerService; - private TableComponent tableComponent; + private TableCard tableCard; public TableView(@Autowired NavigationService navigationService, @Autowired PlayerService playerService) { @@ -39,8 +39,8 @@ public class TableView extends NavigationViewBase { //////////// private void defineLayout() { - tableComponent = new TableComponent(navigation, playerService); - add(tableComponent); + tableCard = new TableCard(navigation, playerService); + add(tableCard); } ///////////// @@ -49,6 +49,6 @@ public class TableView extends NavigationViewBase { @Override protected void configureContent() { - tableComponent.configureContent(); + tableCard.configureContent(); } } diff --git a/src/main/java/app/views/table/components/TableComponent.java b/src/main/java/app/views/table/components/TableCard.java similarity index 95% rename from src/main/java/app/views/table/components/TableComponent.java rename to src/main/java/app/views/table/components/TableCard.java index 68e00a3..39d5cc1 100644 --- a/src/main/java/app/views/table/components/TableComponent.java +++ b/src/main/java/app/views/table/components/TableCard.java @@ -16,7 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired; import java.util.NoSuchElementException; -public class TableComponent extends Div implements ContentConfigurable { +public class TableCard extends Div implements ContentConfigurable { private final Navigation navigation; @@ -24,11 +24,11 @@ public class TableComponent extends Div implements ContentConfigurable { private final Grid grid = new Grid<>(); - public TableComponent(Navigation navigation, @Autowired PlayerService playerService) { + public TableCard(Navigation navigation, @Autowired PlayerService playerService) { this.navigation = navigation; this.playerService = playerService; - addClassName("grid-wrapper"); + addClassName("grid-card"); add(grid); defineGrid();