Skip to content

Commit

Permalink
Banana integration and a D3 example
Browse files Browse the repository at this point in the history
  • Loading branch information
llsposto committed Feb 8, 2016
1 parent 95cf6fa commit 8722fce
Show file tree
Hide file tree
Showing 290 changed files with 135,103 additions and 129 deletions.
3 changes: 2 additions & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
"dependencies": {
"jquery": "~2.2.0",
"bootstrap": "~3.3.6",
"startbootstrap-scrolling-nav": "https://github.com/BlackrockDigital/startbootstrap-scrolling-nav.git#~1.0.4"
"startbootstrap-scrolling-nav": "https://github.com/BlackrockDigital/startbootstrap-scrolling-nav.git#~1.0.4",
"d3": "~3.5.14"
}
}
17 changes: 16 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@
</dependency>
</dependencies>
<build>
<finalName>Polar</finalName>
<resources>
<resource>
<filtering>false</filtering>
Expand All @@ -109,7 +110,7 @@
</excludes>
</resource>
<resource>
<filtering>true</filtering>
<filtering>false</filtering>
<directory>src/main/webapp</directory>
</resource>
</resources>
Expand All @@ -128,6 +129,10 @@
<exclude>**/*.java</exclude>
</excludes>
</testResource>
<testResource>
<filtering>false</filtering>
<directory>src/main/webapp</directory>
</testResource>
</testResources>
<plugins>
<plugin>
Expand Down Expand Up @@ -166,6 +171,16 @@
<wtpversion>${wtp.version}</wtpversion>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.tomcat.maven</groupId>
<artifactId>tomcat7-maven-plugin</artifactId>
<version>2.2</version>
<configuration>
<url>http://localhost:8080/manager</url>
<server>localhost</server>
<path>/</path>
</configuration>
</plugin>
</plugins>
</build>

Expand Down
5 changes: 0 additions & 5 deletions src/main/java/edu/usc/polar/HelloWorld.html

This file was deleted.

63 changes: 0 additions & 63 deletions src/main/java/edu/usc/polar/HomePage.html

This file was deleted.

18 changes: 0 additions & 18 deletions src/main/java/edu/usc/polar/HomePage.java

This file was deleted.

23 changes: 19 additions & 4 deletions src/main/java/edu/usc/polar/Polar.html
Original file line number Diff line number Diff line change
Expand Up @@ -115,16 +115,31 @@ <h1>Contact Section</h1>
</div>
</section>

<section id="d3examples" class="contact-section">
<div class="container">
<div class="row">
<div class="col-lg-12">
<h1>D3 Examples</h1>
<div class="container" id="d3example1">

</div>
</div>
</div>
</div>
</section>

<!-- jQuery -->
<wicket:link>
<script src="js/jquery.min.js"></script>
<!--<script src="js/jquery.min.js"></script>-->

<!-- Bootstrap Core JavaScript -->
<script src="js/bootstrap.min.js"></script>
<!--<script src="js/bootstrap.min.js"></script>-->

<!-- Scrolling Nav JavaScript -->
<script src="js/jquery.easing.min.js"></script>
<script src="js/scrolling-nav.js"></script>
<!--<script src="js/jquery.easing.min.js"></script>-->
<!--<script src="js/scrolling-nav.js"></script>-->
<!--<script src="js/d3.min.js"></script>-->
<!--<script src="js/d3examples.js"></script>-->
</wicket:link>

</body>
Expand Down
38 changes: 38 additions & 0 deletions src/main/java/edu/usc/polar/Polar.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,47 @@
package edu.usc.polar;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.request.resource.PackageResourceReference;
import org.apache.wicket.resource.TextTemplateResourceReference;
import org.apache.wicket.util.lang.Objects;
import org.apache.wicket.util.template.PackageTextTemplate;
import org.apache.wicket.util.template.TextTemplate;

import java.util.HashMap;

public class Polar extends WebPage {
private static final String jsResourceFiles[] = {
"jquery.min.js",
"bootstrap.min.js",
"jquery.easing.min.js",
"scrolling-nav.js",
"d3.min.js"
};
private static final String jsResourceTemplates[] = {
"d3examples.js"
};
public Polar() {
add(new Label("message", "Polar Deep Search Engine!"));
}

public void renderHead(IHeaderResponse response) {
for (String jsFile : jsResourceFiles) {
System.out.println(urlFor(new PackageResourceReference(getClass(), "js/" + jsFile), null));
PackageResourceReference jsRef = new PackageResourceReference(getClass(), "js/" + jsFile);
JavaScriptHeaderItem js = JavaScriptHeaderItem.forReference(jsRef);
response.render(js);
}

for (String jsTemplate : jsResourceTemplates) {
TextTemplate template = new PackageTextTemplate(Polar.class, "js/" + jsTemplate, "text/javascript", "UTF-8");
HashMap<String, Object> vars = new HashMap<String, Object>();
vars.put("dataResourcePath", urlFor(new PackageResourceReference(getClass(), "data/data.tsv"), null));
String jsString = template.asString(vars);
response.render(OnDomReadyHeaderItem.forScript(jsString));
}
}

}
21 changes: 21 additions & 0 deletions src/main/java/edu/usc/polar/PolarApplication.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
package edu.usc.polar;
import org.apache.wicket.markup.html.IPackageResourceGuard;
import org.apache.wicket.markup.html.SecurePackageResourceGuard;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.request.resource.*;
import org.apache.wicket.resource.TextTemplateResourceReference;
import org.apache.wicket.util.resource.IResourceStream;

public class PolarApplication extends WebApplication {
public PolarApplication() {
Expand All @@ -11,4 +16,20 @@ public PolarApplication() {
public Class getHomePage() {
return Polar.class;
}

@Override
protected void init() {
super.init();

IPackageResourceGuard guard = getResourceSettings().getPackageResourceGuard();
if (guard instanceof SecurePackageResourceGuard) {
System.out.println("HERE GUARD");
SecurePackageResourceGuard sguard = (SecurePackageResourceGuard) guard;
sguard.addPattern("+*.tsv");
System.out.println(sguard.getPattern());
}
// final String resourceKey = "data";
// getSharedResources().add(resourceKey, new ByteArrayResource("text/plain", "TESTESTtest".getBytes()));
// mountResource("resources/" + Polar.class.getName(), new PackageResourceReference(resourceKey));
}
}
33 changes: 0 additions & 33 deletions src/main/java/edu/usc/polar/WicketApplication.java

This file was deleted.

80 changes: 80 additions & 0 deletions src/main/resources/edu/usc/polar/data/data.tsv
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
date close
1-May-12 23
24-Apr-12 22
23-Apr-12 19
20-Apr-12 14
9-Apr-12 12
5-Apr-12 15
4-Apr-12 17
27-Mar-12 16
23-Mar-12 20
16-Mar-12 15
6-Mar-12 13
5-Mar-12 12
27-Feb-12 15
24-Feb-12 14
23-Feb-12 15
16-Feb-12 18
15-Feb-12 20
7-Feb-12 21
6-Feb-12 19
31-Jan-12 18
30-Jan-12 16
27-Jan-12 15
18-Jan-12 13
27-Dec-11 14
23-Dec-11 17
22-Dec-11 16
28-Nov-11 14
25-Nov-11 12
23-Nov-11 11
15-Nov-11 10
14-Nov-11 11
10-Nov-11 12
1-Nov-11 12
31-Oct-11 11
28-Oct-11 10
7-Oct-11 11
21-Sep-11 9
20-Sep-11 11
7-Sep-11 12
6-Sep-11 10
2-Sep-11 10
1-Sep-11 12
24-Aug-11 13
11-Aug-11 13
9-Aug-11 12
29-Jul-11 14
27-Jul-11 16
19-Jul-11 17
6-Jul-11 14
27-Jun-11 13
24-Jun-11 11
13-Jun-11 10
10-Jun-11 12
9-Jun-11 14
8-Jun-11 13
1-Jun-11 14
31-May-11 15
19-May-11 13
18-May-11 11
9-May-11 10
5-May-11 12
25-Apr-11 10
21-Apr-11 9
12-Apr-11 7
11-Apr-11 12
8-Apr-11 15
30-Mar-11 13
29-Mar-11 14
28-Mar-11 16
25-Mar-11 16
1-Mar-11 16
28-Feb-11 14
25-Feb-11 15
24-Feb-11 13
15-Feb-11 11
14-Feb-11 10
11-Feb-11 9
25-Jan-11 7
18-Jan-11 6
5 changes: 5 additions & 0 deletions src/main/resources/edu/usc/polar/js/d3.min.js

Large diffs are not rendered by default.

0 comments on commit 8722fce

Please sign in to comment.