Skip to content

Adding support for Vaadin 8. #4

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
phillipjohnson wants to merge 1 commit into
base: master
Choose a base branch
from
+17 −14
Open

Adding support for Vaadin 8. #4

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
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,6 @@
webcam/target
webcam-demo/target
webcam-demo/src/main/webapp/VAADIN/widgetsets

.idea
*.iml
12 changes: 6 additions & 6 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Webcam Add-on for Vaadin 7
# Webcam Add-on for Vaadin 8

Webcam is an HTML5 webcam component for Vaadin 7.
Webcam is an HTML5 webcam component for Vaadin 8.

## Online demo

Expand All @@ -14,10 +14,10 @@ Official releases of this add-on will later be available at Vaadin Directory. Fo

## Building and running demo

- git clone https://github.com/tehapo/webcam.git
- mvn clean install
- cd demo
- mvn jetty:run
- `git clone https://github.com/tehapo/webcam.git`
- `mvn clean install`
- `cd webcam-demo`
- `mvn jetty:run`

To see the demo, navigate to http://localhost:8080/

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<groupId>org.vaadin.teemu</groupId>
<artifactId>webcam-root</artifactId>
<packaging>pom</packaging>
<version>0.3.0</version>
<version>0.3.1-SNAPSHOT</version>
<name>Webcam Add-on Root Project</name>

<modules>
Expand Down
4 changes: 2 additions & 2 deletions webcam-demo/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
<groupId>org.vaadin.teemu</groupId>
<artifactId>webcam-demo</artifactId>
<packaging>war</packaging>
<version>0.3.0</version>
<version>0.3.1-SNAPSHOT</version>
<name>Webcam Add-on Demo</name>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<vaadin.version>7.0.7</vaadin.version>
<vaadin.version>8.0.5</vaadin.version>
<vaadin.plugin.version>${vaadin.version}</vaadin.plugin.version>
</properties>

Expand Down
6 changes: 3 additions & 3 deletions webcam-demo/src/main/webapp/VAADIN/themes/demo/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "../reindeer/reindeer.scss";
@import "../valo/valo.scss";

$blue: #00b4f0;
$gray: #d1d1cf;
Expand Down Expand Up @@ -35,8 +35,8 @@ $darkgreen: darken($green, 30%);
// Prefix all selectors in your theme with .demo
.demo {

// Include reindeer theme styles in your theme
@include reindeer;
// Include valo theme styles in your theme
@include valo;

// You can style your demo app right here
.demoContentLayout {
Expand Down
4 changes: 2 additions & 2 deletions webcam/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
<groupId>org.vaadin.teemu</groupId>
<artifactId>webcam</artifactId>
<packaging>jar</packaging>
<version>0.3.0</version>
<version>0.3.1-SNAPSHOT</version>
<name>Webcam</name>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<vaadin.version>7.0.7</vaadin.version>
<vaadin.version>8.0.5</vaadin.version>
<vaadin.plugin.version>${vaadin.version}</vaadin.plugin.version>

<!-- ZIP Manifest fields -->
Expand Down