Merge pull request #10 from takaomoriyama/develop

Allow remote access to Intu dashboard
watson-intu · Jul 15, 2017 · 0b26f42 · 0b26f42
2 parents 49feb47 + 0fb2cdd
commit 0b26f42
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/etc/shared/www/js/TopicClient.js b/etc/shared/www/js/TopicClient.js
@@ -178,7 +178,7 @@ var TopicClient = (function () {
 	return {
 		getInstance: function() {
 			if(!instance) {
-				instance = createInstance('127.0.0.1', 9443);
+				instance = createInstance(location.hostname, location.port);
 			}
 
 			return instance;

diff --git a/etc/shared/www/js/component/audio/audio.html b/etc/shared/www/js/component/audio/audio.html
@@ -1,10 +1,10 @@
 <div draggable=true class="card">
-    <img class="card-img-top" src="http://localhost:9443/topics/fft" alt="Card image cap" style="width: 100%;max-height: 200px;">
+    <img class="card-img-top" src="../topics/fft" alt="Card image cap" style="width: 100%;max-height: 200px;">
     <div class="card-block text-pane" style="height: 200px;">
         <div class="conversation-wrapper" style="height: 80%;overflow-y: auto;">
             <p class="card-text text-left" ng-repeat="text in $root.textObjects" ng-model="text">{{ text.transcription }}</p>
         </div>
         <a href="#image1" ng-click="$root.updateType('audio');"><img class="go-right" src="img/Icon_Expand.png" style="width: 20px;margin-top: 15px;"></a>
         <!--<a href="" ng-click="$root.updateType('audio');"><img class="go-right" src="img/Icon_Expand.png" style="width: 20px;margin-top: 15px;"></a>-->
     </div>
-</div>
+</div>
diff --git a/etc/shared/www/js/component/camera/camera.html b/etc/shared/www/js/component/camera/camera.html
@@ -1,8 +1,8 @@
 <div draggable="true" class="card" style="box-shadow:none;">
-    <img height=270 src="http://localhost:9443/topics/sensor-{{ cameraName }}" id="intu-camera" />
+    <img height=270 src="../topics/sensor-{{ cameraName }}" id="intu-camera" />
     <div class="card-block text-pane" style="padding-top:10px;padding-bottom:10px;background-color: #E7EBEC;">
         <select style="float:left;" ng-options="camera as camera.m_SensorName for camera in cameraParams" ng-model="item" ng-change="update();" ng-init="item = cameraParams[0]" ></select>
         <a href="#image1" ng-click="$root.updateType('camera');"><img class="go-right" src="img/Icon_Expand.png" style="width: 20px;"></a>
         <!--<a href="" ng-click="$root.updateType('camera');"><img class="go-right" src="img/Icon_Expand.png" style="width: 20px;"></a>-->
     </div>
-</div>
+</div>
diff --git a/etc/shared/www/js/partials/main.html b/etc/shared/www/js/partials/main.html
@@ -5,11 +5,11 @@
 				<span ng-if="$root.showFullScreen">
 					<div ng-switch="fullType">
 						<span ng-switch-when="camera">
-							<img style="width:75%;" src="http://localhost:9443/topics/sensor-Camera" />
+							<img style="width:75%;" src="../topics/sensor-Camera" />
 						</span>
 						<span ng-switch-when="audio">
 							<div class="card">
-								<img class="card-img-top" src="http://localhost:9443/topics/fft" alt="Card image cap" style="width: 100%; position:relative;">
+								<img class="card-img-top" src="../topics/fft" alt="Card image cap" style="width: 100%; position:relative;">
 								<div class="card-block text-pane" style="height: 500px;">
 									<div class="conversation-wrapper" style="overflow-y: auto;">
 										<p class="card-text text-left" ng-repeat="text in $root.textObjects" style="font-size:32px;">{{ text.transcription }}</p>
@@ -116,4 +116,4 @@
 		</pre>
 		<a class="close" href="" ng-click="$root.closedAdvanced();"></a>
 	</div>
-</div>
+</div>