Skip to content

Commit 3551f0c

Browse files
committed
Changed hardcoded localhost address in main.js to use frontendUrl variable. Fixed frontendUrls variable array to not be print in top navbar.
1 parent e8b83e0 commit 3551f0c

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

src/main/resources/static/js/main.js

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,24 @@ jQuery(document).ready(function() {
33

44
// Fetch injected URL from DOM
55
var eiffelDocumentationUrlLinks = $('#eiffelDocumentationUrlLinks').text();
6-
6+
var frontendServiceUrl = $('#frontendServiceUrl').text();
7+
78
document.getElementById("testRulesBtn").onclick = function() {
89

910
var iframe = document.getElementById("mainFrame");
10-
iframe.src = "http://localhost:8080/testRules.html";
11+
iframe.src = frontendServiceUrl + "/testRules.html";
1112
}
1213

1314
document.getElementById("eiInfoBtn").onclick = function() {
1415

1516
var iframe = document.getElementById("mainFrame");
16-
iframe.src = "http://localhost:8080/eiInfo.html";
17+
iframe.src = frontendServiceUrl + "/eiInfo.html";
1718
}
1819

1920

2021
function loadLoginPage() {
2122
var iframe = document.getElementById("mainFrame");
22-
iframe.src = "http://localhost:8080/login.html";
23+
iframe.src = frontendServiceUrl + "/login.html";
2324
}
2425

2526
document.getElementById("loginBtn").onclick = function() {
@@ -35,18 +36,18 @@ jQuery(document).ready(function() {
3536
document.getElementById("registerBtn").onclick = function() {
3637

3738
var iframe = document.getElementById("mainFrame");
38-
iframe.src = "http://localhost:8080/register.html";
39+
iframe.src = frontendServiceUrl + "/register.html";
3940
}
4041

4142
document.getElementById("forgotPasswordBtn").onclick = function() {
4243

4344
var iframe = document.getElementById("mainFrame");
44-
iframe.src = "http://localhost:8080/forgot-password.html";
45+
iframe.src = frontendServiceUrl + "/forgot-password.html";
4546
}
4647

4748
function loadMainPage() {
4849
var iframe = document.getElementById("mainFrame");
49-
iframe.src = "http://localhost:8080/subscriptionpage.html";
50+
iframe.src = frontendServiceUrl + "/subscriptionpage.html";
5051
}
5152

5253
document.getElementById("subscriptionBtn").onclick = function() {

src/main/resources/templates/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!DOCTYPE html>
2-
<html lang="en">
2+
<html xmlns:th="http://www.thymeleaf.org" lang="en">
33

44
<head>
55
<meta charset="utf-8" />
@@ -20,7 +20,7 @@
2020

2121
<body class="fixed-nav bg-dark" id="page-top">
2222

23-
<div class="hidden" id="eiffelDocumentationUrlLinks" th:text="${eiffelDocumentationUrlLinks}"></div>
23+
<div class="hidden" style="display: none" id="eiffelDocumentationUrlLinks" th:text="${eiffelDocumentationUrlLinks}"></div>
2424

2525
<!-- Navigation-->
2626
<nav class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top" id="mainNav">

0 commit comments

Comments
 (0)