URL webapp

Zahrun · Zahrun · commit 0699c72e6f3e · 2016-01-24T16:04:25.000+01:00
diff --git a/webapp/src/java/globals/Globals.java b/webapp/src/java/globals/Globals.java
@@ -11,5 +11,5 @@
  * @author Aroun
  */
 public class Globals {
-    public static final String SERVER_URI="176.31.1.146:8080/webapp2";
+    public static final String SERVER_URI="176.31.1.146:8080/webapp";
 }
diff --git a/webapp/web/index.html b/webapp/web/index.html
@@ -16,7 +16,7 @@
     </head>
     <body>
         <div class="container">
-            <form class="form-signin" action="http://176.31.1.146:8080/webapp2/rest/entities.users/loginAdmin" method="POST">
+            <form class="form-signin" action="http://176.31.1.146:8080/webapp/rest/entities.users/loginAdmin" method="POST">
                 <h2 class="form-signin-heading">Please sign in</h2>
                 <label for="inputEmail" class="sr-only">Email address</label>
                 <input type="email" id="inputEmail" class="form-control" placeholder="Email address" required="" autofocus="" name="mail" />
diff --git a/webapp/web/js/reservations.js b/webapp/web/js/reservations.js
@@ -4,7 +4,7 @@
  * and open the template in the editor.
  */
  
-    var serverURL="176.31.1.146:8080/webapp2";
+    var serverURL="176.31.1.146:8080/webapp";
     
 function initReservationEdit(){
     getReservationList();
diff --git a/webapp/web/js/rooms.js b/webapp/web/js/rooms.js
@@ -2,7 +2,7 @@
 
 // this file is made to control all the interactions from the "Salles" section of the webpage
 
-    var serverURL="176.31.1.146:8080/webapp2";
+    var serverURL="176.31.1.146:8080/webapp";
     
 // REST api -> GET
 function getRoomList() {
diff --git a/webapp/web/js/sites.js b/webapp/web/js/sites.js
@@ -2,7 +2,7 @@
 
 // this file is made to control all the interactions from the "Sites" section of the webpage
  
-    var serverURL="176.31.1.146:8080/webapp2";
+    var serverURL="176.31.1.146:8080/webapp";
     
 // REST api -> GET
 function getSiteList() {    
diff --git a/webapp/web/js/users.js b/webapp/web/js/users.js
@@ -2,7 +2,7 @@
 
 // this file is made to control all the interactions from the "Utilisateurs" section of the webpage
  
-    var serverURL="176.31.1.146:8080/webapp2";
+    var serverURL="176.31.1.146:8080/webapp";
     
 // REST api -> GET
 function getUserList() {

Original file line number	Diff line number	Diff line change
`@@ -11,5 +11,5 @@`
`11`	`11`	`* @author Aroun`
`12`	`12`	`*/`
`13`	`13`	`public class Globals {`
`14`		`- public static final String SERVER_URI="176.31.1.146:8080/webapp2";`
	`14`	`+ public static final String SERVER_URI="176.31.1.146:8080/webapp";`
`15`	`15`	`}`