Browse Source

usage of term "card"

master
GAM 4 years ago
parent
commit
10519b7ce0
5 changed files with 18 additions and 18 deletions
  1. +2
    -2
      frontend/app/views/main/main-view.css
  2. +5
    -5
      src/main/java/app/views/matchday/MatchdayView.java
  3. +3
    -3
      src/main/java/app/views/matchday/components/matchdayCard.java
  4. +5
    -5
      src/main/java/app/views/table/TableView.java
  5. +3
    -3
      src/main/java/app/views/table/components/TableCard.java

+ 2
- 2
frontend/app/views/main/main-view.css View File

@ -8,14 +8,14 @@
min-height: 100%; min-height: 100%;
} }
.grid-wrapper {
.grid-card {
background-color: var(--lumo-base-color); background-color: var(--lumo-base-color);
border-radius: var(--lumo-border-radius); border-radius: var(--lumo-border-radius);
box-shadow: var(--lumo-box-shadow-xs); box-shadow: var(--lumo-box-shadow-xs);
padding: 0 var(--lumo-space-m) var(--lumo-space-m); padding: 0 var(--lumo-space-m) var(--lumo-space-m);
} }
.wrapper {
.card {
background-color: var(--lumo-base-color); background-color: var(--lumo-base-color);
border-radius: var(--lumo-border-radius); border-radius: var(--lumo-border-radius);
box-shadow: var(--lumo-box-shadow-xs); box-shadow: var(--lumo-box-shadow-xs);


+ 5
- 5
src/main/java/app/views/matchday/MatchdayView.java View File

@ -3,7 +3,7 @@ package app.views.matchday;
import app.navigation.NavigationLevel; import app.navigation.NavigationLevel;
import app.navigation.NavigationService; import app.navigation.NavigationService;
import app.views.main.MainView; import app.views.main.MainView;
import app.views.matchday.components.MatchdayComponent;
import app.views.matchday.components.matchdayCard;
import app.views.navigation.NavigationViewBase; import app.views.navigation.NavigationViewBase;
import com.vaadin.flow.component.dependency.CssImport; import com.vaadin.flow.component.dependency.CssImport;
import com.vaadin.flow.router.PageTitle; import com.vaadin.flow.router.PageTitle;
@ -15,7 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
@PageTitle("Schachliga DACH - Results - Matchdays") @PageTitle("Schachliga DACH - Results - Matchdays")
public class MatchdayView extends NavigationViewBase { public class MatchdayView extends NavigationViewBase {
private MatchdayComponent matchdayComponent;
private matchdayCard matchdayCard;
public MatchdayView(@Autowired NavigationService navigationService) { public MatchdayView(@Autowired NavigationService navigationService) {
super(navigationService, "matchday", NavigationLevel.MATCHDAY); super(navigationService, "matchday", NavigationLevel.MATCHDAY);
@ -30,8 +30,8 @@ public class MatchdayView extends NavigationViewBase {
//////////// ////////////
private void configureLayout() { 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 @Override
protected void configureContent() { protected void configureContent() {
matchdayComponent.configureContent();
matchdayCard.configureContent();
} }
} }

src/main/java/app/views/matchday/components/MatchdayComponent.java → src/main/java/app/views/matchday/components/matchdayCard.java View File

@ -23,7 +23,7 @@ import com.vaadin.flow.component.orderedlayout.VerticalLayout;
import java.util.NoSuchElementException; import java.util.NoSuchElementException;
public class MatchdayComponent extends Div implements ContentConfigurable {
public class matchdayCard extends Div implements ContentConfigurable {
private final Navigation navigation; private final Navigation navigation;
@ -31,10 +31,10 @@ public class MatchdayComponent extends Div implements ContentConfigurable {
private final Label headerLabel = new Label(); private final Label headerLabel = new Label();
private final Grid<CalculatedMatch> grid = new Grid<>(); private final Grid<CalculatedMatch> grid = new Grid<>();
public MatchdayComponent(Navigation navigation) {
public matchdayCard(Navigation navigation) {
this.navigation = navigation; this.navigation = navigation;
addClassName("wrapper");
addClassName("card");
VerticalLayout inner = new VerticalLayout(); VerticalLayout inner = new VerticalLayout();
add(inner); add(inner);
inner.add(header, grid); inner.add(header, grid);

+ 5
- 5
src/main/java/app/views/table/TableView.java View File

@ -5,7 +5,7 @@ import app.navigation.NavigationLevel;
import app.navigation.NavigationService; import app.navigation.NavigationService;
import app.views.main.MainView; import app.views.main.MainView;
import app.views.navigation.NavigationViewBase; 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.component.dependency.CssImport;
import com.vaadin.flow.router.PageTitle; import com.vaadin.flow.router.PageTitle;
import com.vaadin.flow.router.Route; import com.vaadin.flow.router.Route;
@ -20,7 +20,7 @@ public class TableView extends NavigationViewBase {
private final PlayerService playerService; private final PlayerService playerService;
private TableComponent tableComponent;
private TableCard tableCard;
public TableView(@Autowired NavigationService navigationService, public TableView(@Autowired NavigationService navigationService,
@Autowired PlayerService playerService) { @Autowired PlayerService playerService) {
@ -39,8 +39,8 @@ public class TableView extends NavigationViewBase {
//////////// ////////////
private void defineLayout() { 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 @Override
protected void configureContent() { protected void configureContent() {
tableComponent.configureContent();
tableCard.configureContent();
} }
} }

src/main/java/app/views/table/components/TableComponent.java → src/main/java/app/views/table/components/TableCard.java View File

@ -16,7 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import java.util.NoSuchElementException; import java.util.NoSuchElementException;
public class TableComponent extends Div implements ContentConfigurable {
public class TableCard extends Div implements ContentConfigurable {
private final Navigation navigation; private final Navigation navigation;
@ -24,11 +24,11 @@ public class TableComponent extends Div implements ContentConfigurable {
private final Grid<PlayerForTable> grid = new Grid<>(); private final Grid<PlayerForTable> grid = new Grid<>();
public TableComponent(Navigation navigation, @Autowired PlayerService playerService) {
public TableCard(Navigation navigation, @Autowired PlayerService playerService) {
this.navigation = navigation; this.navigation = navigation;
this.playerService = playerService; this.playerService = playerService;
addClassName("grid-wrapper");
addClassName("grid-card");
add(grid); add(grid);
defineGrid(); defineGrid();

Loading…
Cancel
Save