Skip to content
This repository has been archived by the owner on Dec 17, 2020. It is now read-only.

Commit

Permalink
Fixed progress bubble demo. (#204)
Browse files Browse the repository at this point in the history
  • Loading branch information
SomeoneToIgnore authored Mar 7, 2017
1 parent 9348e78 commit 13ea376
Show file tree
Hide file tree
Showing 5 changed files with 76 additions and 42 deletions.
40 changes: 40 additions & 0 deletions demo-web-component-progress-bubble/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<packaging>war</packaging>

<properties>
<js.working.directory>src/main/webapp/js</js.working.directory>
</properties>

<dependencies>
Expand All @@ -28,4 +29,43 @@
<artifactId>demo-test-util</artifactId>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<configuration>
<webResources>
<resource>
<!-- this is relative to the pom.xml directory -->
<directory>${js.working.directory}</directory>
<include>bower_components/**</include>
</resource>
</webResources>
</configuration>
</plugin>

<plugin>
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
<version>1.3</version>
<configuration>
<nodeVersion>v7.7.1</nodeVersion>
<npmVersion>4.1.2</npmVersion>
<workingDirectory>${js.working.directory}</workingDirectory>
</configuration>
<executions>
<execution>
<id>install-node-and-npm</id>
<goals>
<goal>install-node-and-npm</goal>
<goal>npm</goal> <!-- runs 'install' by default -->
<goal>bower</goal> <!-- runs 'install' by default -->
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
* @author Vaadin Ltd
*/
@Tag("progress-bubble")
@HtmlImport(PolyGit.BASE_URL + "progress-bubble/progress-bubble.html")
@HtmlImport("js/bower_components/progress-bubble/progress-bubble.html")
public class ProgressBubble extends Component {

/**
Expand Down
20 changes: 20 additions & 0 deletions demo-web-component-progress-bubble/src/main/webapp/js/bower.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"name": "demo-addressbook-polymer",
"homepage": "https://github.com/vaadin/hummingbird-demo",
"authors": [
],
"description": "",
"main": "",
"license": "Apache2",
"private": true,
"ignore": [
"**/.*",
"node_modules",
"bower_components",
"test",
"tests"
],
"dependencies": {
"progress-bubble": "1.3.0"
}
}
15 changes: 15 additions & 0 deletions demo-web-component-progress-bubble/src/main/webapp/js/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"name": "demo-addressbook-polymer",
"version": "1.0.0",
"description": "This file exists only to define the Bower version",
"main": "",
"dependencies": {
"bower": "^1.8.0"
},
"devDependencies": {},
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"author": "",
"license": "Apache-2.0"
}

0 comments on commit 13ea376

Please sign in to comment.