Skip to content

refactor: upgrade to v25 #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

refactor: upgrade to v25 #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 11 additions & 16 deletions vcf-splide-demo/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,11 @@
</organization>

<properties>
<vaadin.version>14.7.8</vaadin.version>
<flow.version>2.7.6</flow.version>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<vaadin.version>25.0.0-beta1</vaadin.version>
<jetty.plugin.version>12.1.2</jetty.plugin.version>
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<failOnMissingWebXml>false</failOnMissingWebXml>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -58,13 +57,6 @@
<artifactId>vcf-splide</artifactId>
<version>${project.version}</version>
</dependency>

<!-- demo specific -->
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>flow-component-demo-helpers</artifactId>
<version>${flow.version}</version>
</dependency>

<!-- externals -->
<dependency>
Expand Down Expand Up @@ -100,14 +92,17 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>3.3.1</version>
<configuration>
<failOnMissingWebXml>false</failOnMissingWebXml>
</configuration>
</plugin>
<!-- We use jetty plugin, replace it with your favourite developing servlet container -->
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>9.4.43.v20210629</version>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-maven-plugin</artifactId>
<version>${jetty.plugin.version}</version>
<configuration>
<scanIntervalSeconds>1</scanIntervalSeconds>
<scan>5</scan>
</configuration>
</plugin>
<!--
Expand Down
35 changes: 27 additions & 8 deletions vcf-splide-demo/src/main/java/com/vaadin/componentfactory/demo/SplideDemoView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,30 +4,35 @@
import com.vaadin.componentfactory.addons.splide.Splide;
import com.vaadin.componentfactory.addons.splide.VideoSlide;
import com.vaadin.componentfactory.addons.splide.VideoType;
import com.vaadin.flow.component.Component;
import com.vaadin.flow.component.dependency.StyleSheet;
import com.vaadin.flow.component.html.Div;
import com.vaadin.flow.component.html.H2;
import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
import com.vaadin.flow.demo.DemoView;
import com.vaadin.flow.router.Route;
import com.vaadin.flow.theme.lumo.Lumo;

import java.util.Arrays;

/**
* View for {@link Splide} demo.
*/
@Route("")
public class SplideDemoView extends DemoView {
@StyleSheet(Lumo.STYLESHEET)
public class SplideDemoView extends Div {

@Override
public void initView() {
createImageSliderDemo();
createImageAndVideoSliderDemo();
}
public SplideDemoView() {
createImageSliderDemo();
createImageAndVideoSliderDemo();
}

private void createImageSliderDemo() {

// begin-source-example
// source-example-heading: Images slider demo
ImageSlide slide1 = new ImageSlide("images/slide_1.jpg");
ImageSlide slide2 = new ImageSlide("images/slide_2.png");
ImageSlide slide3 = new ImageSlide("https://source.unsplash.com/random/1000x1000?sig=3");
ImageSlide slide3 = new ImageSlide("https://picsum.photos/1000/1000");

Splide slider = new Splide(Arrays.asList(slide1, slide2, slide3));
slider.setId("images-slider-demo");
Expand Down Expand Up @@ -73,4 +78,18 @@ private void createImageAndVideoSliderDemo() {
addCard("Images and videos slider demo", sliderLayoutContainer);
}

private void addCard(String title, Component content) {
H2 cardTitle = new H2(title);

Div card = new Div();
card.getStyle().setMargin("40px auto");
card.getStyle().setMaxWidth("1000px");
card.getStyle().setMaxWidth("1000px");

card.add(cardTitle);
card.add(content);

add(card);
}

}
20 changes: 10 additions & 10 deletions vcf-splide/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
</organization>

<properties>
<vaadin.version>14.7.8</vaadin.version>
<flow.version>2.7.6</flow.version>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<vaadin.version>25.0.0-beta1</vaadin.version>
<jakarta.servlet.api.version>5.0.0</jakarta.servlet.api.version>
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
</properties>

<dependencyManagement>
Expand All @@ -45,7 +45,7 @@
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>flow-test-generic</artifactId>
<version>${flow.version}</version>
<version>${vaadin.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -61,11 +61,11 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.0.1</version>
<scope>provided</scope>
</dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>${jakarta.servlet.api.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>

<build>
Expand Down
7 changes: 4 additions & 3 deletions vcf-splide/src/main/java/com/vaadin/componentfactory/addons/splide/Splide.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
import java.util.ArrayList;
import java.util.List;
import org.apache.commons.lang3.StringUtils;
import tools.jackson.databind.JsonNode;

import com.vaadin.flow.component.AttachEvent;
import com.vaadin.flow.component.ClientCallable;
import com.vaadin.flow.component.DetachEvent;
Expand All @@ -33,7 +35,6 @@
import com.vaadin.flow.component.html.ListItem;
import com.vaadin.flow.dom.Element;
import com.vaadin.flow.dom.ElementFactory;
import elemental.json.JsonValue;

/**
* Splide component definition. Splide uses splide library to display images and videos as a
Expand Down Expand Up @@ -107,8 +108,8 @@ private Element createSlidesDom(List<Slide> slides) {
liSlide.getElement().addEventListener(
"click",
e -> {
JsonValue detail = e.getEventData().get("event.detail");
if (detail.asNumber() > 1 || fullScreen) {
JsonNode detail = e.getEventData().get("event.detail");
if (detail.asInt() > 1 || fullScreen) {
// do nothing, just ignore
} else {
this.displayFullScreenMode();
Expand Down
Loading