Skip to content

Commit

Permalink
Ensure UI links adhere to the current protocol being used (closes #127)
Browse files Browse the repository at this point in the history
  • Loading branch information
aldemirenes authored and BenFradet committed Dec 21, 2017
1 parent 66b472a commit 860d60e
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 16 deletions.
16 changes: 13 additions & 3 deletions provisioning/resources/ui/assets/css/main.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* Common */
a,p,h1,h2,h3,h4,li {
a,p,h1,h2,h3,h4,li,label,input {
-webkit-font-smoothing: antialiased;
font-family: "myriad-pro", "Helvetica Neue", Helvetica, sans-serif;
font-weight: 300;
Expand All @@ -17,8 +17,18 @@ body {
margin: 0px;
}

label {
display: inline-block;
width: 250px;
text-align: left;
}

input {
width: 200px;
}

/* Header */
.header {
.header {
background-color: #3F435F;
height: 80px;
width: 100%;
Expand Down Expand Up @@ -135,4 +145,4 @@ body {

.tab-content img {
max-width: 750px;
}
}
Binary file modified provisioning/resources/ui/assets/img/snowplow-mini-topology.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions provisioning/resources/ui/js/components/Elasticsearch.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ export class Elasticsearch extends React.Component<{}, {}> {
</p>
<h3>Quicklinks:</h3>
<ul>
<li>Link to <a href={'http://' + window.location.host + '/kibana/'}>Kibana</a></li>
<li>Link to the <a href={'http://' + window.location.host + '/elasticsearch/_plugin/head/'}>Elasticsearch Head Plugin</a></li>
<li>Link to <a href={location.protocol +'//' + window.location.host + '/kibana/'}>Kibana</a></li>
<li>Link to the <a href={location.protocol + '//' + window.location.host + '/elasticsearch/_plugin/head/'}>Elasticsearch Head Plugin</a></li>
</ul>
</div>
);
Expand Down
2 changes: 1 addition & 1 deletion provisioning/resources/ui/js/components/IgluServer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export class IgluServer extends React.Component<{}, {}> {
</p>
<h3>Quicklinks:</h3>
<ul>
<li>Link to <a href={'http://' + window.location.host + '/iglu-server/'}>Iglu Server management</a> page</li>
<li>Link to <a href={location.protocol + '//' + window.location.host + '/iglu-server/'}>Iglu Server management</a> page</li>
</ul>
</div>
);
Expand Down
21 changes: 11 additions & 10 deletions provisioning/resources/ui/js/components/Overview.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,16 @@ export class Overview extends React.Component<{}, {}> {

public render() {

var collector: string = 'http://' + window.location.host;
var kibana: string = 'http://' + window.location.host + '/kibana/';
var head_plugin: string = 'http://' + window.location.host + '/elasticsearch/_plugin/head/';
var elasticsearch: string = 'http://' + window.location.host + '/elasticsearch';
var collector: string = location.protocol + '//' + window.location.host;
var kibana: string = location.protocol + '//' + window.location.host + '/kibana/';
var head_plugin: string = location.protocol + '//' + window.location.host + '/elasticsearch/_plugin/head/';
var elasticsearch: string = location.protocol + '//' + window.location.host + '/elasticsearch';

return (
<div className="tab-content">
<p>
Snowplow Mini is, in essence, the Snowplow real time pipeline contained within a single box.
In place of Kinesis Streams we are using named unix pipes and instead of distributing all of the applications across Autoscaling Groups they are deployed onto a single instance.
Snowplow Mini is, in essence, the Snowplow real time pipeline contained within a single box.
In place of Kinesis Streams we are using NSQ and instead of distributing all of the applications across Autoscaling Groups they are deployed onto a single instance.
</p>
<h3>1. Sending events</h3>
<p>You can send events into Snowplow Mini automatically from the <a href="#/example-events">Example events</a> page. Simply go to that page and click the sample event buttons.</p>
Expand All @@ -49,10 +49,11 @@ export class Overview extends React.Component<{}, {}> {
</ul>
<h3>The software stack installed: </h3>
<ul>
<li>Snowplow Stream Collector 0.9.0</li>
<li>Snowplow Stream Enrich 0.10.0</li>
<li>Snowplow Elasticsearch Sink 0.8.0</li>
<li>Snowplow Iglu Server 0.8.0</li>
<li>Snowplow Stream Collector 0.11.0</li>
<li>Snowplow Stream Enrich 0.12.0</li>
<li>Snowplow Elasticsearch Sink 0.10.1</li>
<li>Snowplow Iglu Server 0.2.0</li>
<li>NSQ 1.0.0</li>
<li>Elasticsearch 1.7.5</li>
<li>Kibana 4.0.1</li>
</ul>
Expand Down

0 comments on commit 860d60e

Please sign in to comment.