#4 read force-update-url from init.json

dukecon · Mar 12, 2018 · 21db642 · 21db642
1 parent e7628ce
commit 21db642
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 10 deletions.
diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html
@@ -18,8 +18,8 @@
 
     <div v-if="loginAvailable" id="login-area">
         <div>
-            <a class="button" v-bind:class="{ show: !loggedIn }" v-on:click="login"><img alt="Sign in/Register" title="Sign in/Register" src="img/unlock_24px.svg"></a>
-            <a class="button" v-bind:class="{ show: loggedIn }" v-on:click="logout"><img alt="Sign Out" title="Sign Out" src="img/lock_24px.svg"></a>
+            <a class="button" :class="{ show: !loggedIn }" v-on:click="login"><img alt="Sign in/Register" title="Sign in/Register" src="img/unlock_24px.svg"></a>
+            <a class="button" :class="{ show: loggedIn }" v-on:click="logout"><img alt="Sign Out" title="Sign Out" src="img/lock_24px.svg"></a>
         </div>
     </div>
 
@@ -31,7 +31,7 @@ <h1>Javaland Room Control</h1>
     <div id="loading" v-if="loading"></div>
     <h2 class="dark">
         <div>Current talks</div>
-        <div><a v-if="loggedIn && !updating" v-on:click="sendWithBearer" href="../rest/conferences/update/javaland2018">Force Update of Talks Data</a></div>
+        <div><a v-if="loggedIn && !updating" v-on:click="forceUpdate" href="#">Force Update of Talks Data</a></div>
         <input type="search" v-on:keyup="emptyOnEsc" placeholder="Quick Filter" aria-label="Quick filter" v-model="quickFilter">
         <button v-on:click="refresh" id="refresh">&thinsp;</button>
     </h2>
@@ -72,7 +72,7 @@ <h2 class="dark">
                         <input type="number" :data-id="index" :disabled="!talk.availableSeats" width="4" :value="talk.occupiedSeats"><span>/{{talk.availableSeats}} </span> <button :data-id="index" :disabled="!talk.availableSeats" class="setOccupied" @click="update">Set</button>
                     </div>
                     <div>
-                        <input type="checkbox" :id="index" :data-id="index" :disabled="!talk.availableSeats" v-model="talk.fullyBooked" @click="toggleFull"><label v-bind:for="index"></label>
+                        <input type="checkbox" :id="index" :data-id="index" :disabled="!talk.availableSeats" v-model="talk.fullyBooked" @click="toggleFull"><label :for="index"></label>
                     </div>
                 </td>
             </tr>
@@ -81,7 +81,7 @@ <h2 class="dark">
 </div>
 
 <footer>
-    <a target="new" rel="noopener noreferrer" href="https://programm.javaland.eu">Return to Javaland 2017 Program</a>
+    <a target="new" rel="noopener noreferrer" href="https://programm.javaland.eu">Return to Javaland Program</a>
     <span>powered by<a href="http://www.dukecon.org" target="_blank" rel="noopener noreferrer">DukeCon</a></span>
 </footer>
 </body>

diff --git a/src/main/webapp/js/store/talks.js b/src/main/webapp/js/store/talks.js
@@ -5,10 +5,10 @@ define(['store', 'computed', 'request', 'popups', 'dataHelper', 'scrollHelper'],
 		}
 	}
 
-	function sendWithBearer(event) {
+	function forceUpdate(event) {
 		event.preventDefault();
 		store.updating = true;
-		var href = event.currentTarget.href;
+		var href = request.getForceUpdateUrl();
 		console.log(href);
 		request.getWithToken(href, store.token, function(result) {
 			popups.alert("Refresh Data", "Success!", function() {
@@ -59,7 +59,7 @@ define(['store', 'computed', 'request', 'popups', 'dataHelper', 'scrollHelper'],
 				loadTalks();
 			},
 			function() {
-				theTalk.fullyBooked = isFullyBooked(previousSeats, theTalk.availableSeats);;
+				theTalk.fullyBooked = isFullyBooked(previousSeats, theTalk.availableSeats);
 				theTalk.occupiedSeats = previousSeats;
 				console.log("aborted");
 			}
@@ -128,7 +128,7 @@ define(['store', 'computed', 'request', 'popups', 'dataHelper', 'scrollHelper'],
 		emptyOnEsc: emptyOnEsc,
 		update: confirmAndUpdateOccupiedSeats,
 		toggleFull: confirmAndToggleFull,
-		sendWithBearer: sendWithBearer,
+        forceUpdate: forceUpdate,
 		refresh: loadTalks
 	}
 });
diff --git a/src/main/webapp/js/utils/request.js b/src/main/webapp/js/utils/request.js
@@ -4,6 +4,7 @@ define(['dataHelper'], function (helper) {
 	var urls = {
 		conferenceUrl: null,
 		bookingsUrl: null,
+        forceUpdateUrl: null,
 		adminUrl: null,
 		keyCloakUrl: null,
 		errorState: false
@@ -53,6 +54,7 @@ define(['dataHelper'], function (helper) {
                 urls.keyCloakUrl = result.keycloak;
 				urls.conferenceUrl = result.conferences;
 				urls.bookingsUrl = result.events;
+				urls.forceUpdateUrl = result.forceUpdate;
 				urls.adminUrl = result.admin || "";
 				urls.adminUrl = urls.adminUrl.replace(/\/$/ig, ""); // make sure there is no space at the end
 				urls.errorState = false;
@@ -153,10 +155,15 @@ define(['dataHelper'], function (helper) {
         httpRequest(urls.bookingsUrl + "/" + talk.id, "POST", onSuccess, onError, headers, data);
     }
 
+    function getForceUpdateUrl() {
+        return urls.forceUpdateUrl;
+    }
+
     return {
 		initialize : initialize,
         get: getList,
         update: update,
-        getWithToken: getWithToken
+        getWithToken: getWithToken,
+        getForceUpdateUrl: getForceUpdateUrl
     };
 });