From e63f44eddeef4f34a167b746f19a9a5ac8029b42 Mon Sep 17 00:00:00 2001 From: samrabejtic Date: Sun, 16 Jun 2019 15:57:30 +0200 Subject: [PATCH] tokeni --- reactapp/src/ALPHA/EditStudentForma.js | 30 ++++++++++--- reactapp/src/ALPHA/Forma.js | 10 ++++- reactapp/src/ALPHA/FormaAsistent.js | 16 ++++++- reactapp/src/ALPHA/FormaAsistentPred.js | 19 +++++++-- reactapp/src/ALPHA/FormaOdsjek.js | 9 ++-- reactapp/src/ALPHA/FormaOdsjekPred.js | 2 - reactapp/src/ALPHA/FormaPr.js | 16 ++++++- reactapp/src/ALPHA/FormaPredmet.js | 9 +++- reactapp/src/ALPHA/FormaPrikazProf.js | 10 ++++- reactapp/src/ALPHA/FormaPrikazStud.js | 10 ++++- reactapp/src/ALPHA/FormaUpis.js | 18 ++++++-- reactapp/src/ALPHA/FormaUrediAsistenta.js | 25 +++++++++-- reactapp/src/ALPHA/FormaUrediProf.js | 27 ++++++++++-- reactapp/src/ALPHA/editOdsjeka.js | 18 ++++++-- reactapp/src/ALPHA/editPredmeta.js | 26 ++++++++++-- .../src/ALPHA/povezivanjeAsistentPredmet.js | 19 +++++++-- .../src/ALPHA/povezivanjeOdsjekPredmet.js | 18 ++++++-- .../src/ALPHA/povezivanjeProfesorPredmet.js | 18 ++++++-- reactapp/src/ALPHA/prikazAsistenta.js | 18 ++++++-- reactapp/src/ALPHA/prikazOdsjeka.js | 18 ++++++-- reactapp/src/ALPHA/prikazPredmeta.js | 18 ++++++-- reactapp/src/ALPHA/promijeniLozinku.js | 42 ++++++++++++++++--- 22 files changed, 330 insertions(+), 66 deletions(-) diff --git a/reactapp/src/ALPHA/EditStudentForma.js b/reactapp/src/ALPHA/EditStudentForma.js index c5fb88f70..212257457 100644 --- a/reactapp/src/ALPHA/EditStudentForma.js +++ b/reactapp/src/ALPHA/EditStudentForma.js @@ -20,8 +20,13 @@ class Forma extends Component { } componentDidMount(){ - //http://localhost:31901/api/korisnik/getAllStudents - axios.get ('https://si2019alpha.herokuapp.com/api/korisnik/getAllStudents') + var token1 = window.localStorage.getItem("token"); + var token = encodeURI(token1); + var currentUsername = window.localStorage.getItem("username"); + console.log(token); + console.log(currentUsername); + + axios.get ('https://si2019alpha.herokuapp.com/api/korisnik/getAllStudents?currentUsername=' + currentUsername + '&token=' + token) .then(response => { console.log("Lista: ", response.data); this.setState({lista: response.data}); @@ -65,12 +70,19 @@ class Forma extends Component { const body1=JSON.stringify(body); console.log("Body1: ", body1); - xhr.open('POST','https://si2019alpha.herokuapp.com/api/korisnik/updateStudent', true); + var token1 = window.localStorage.getItem("token"); + var token = encodeURI(token1); + var currentUsername = window.localStorage.getItem("username"); + console.log(token); + console.log(currentUsername); + + xhr.open('POST','https://si2019alpha.herokuapp.com/api/korisnik/updateStudent?currentUsername=' + currentUsername + '&token=' + token, true); xhr.setRequestHeader('Content-Type', 'application/json'); xhr.onload = () => { if(xhr.status === 200) { const resp = xhr.responseText; - alert(resp); + // alert(resp); + alert("Uspješno izvršene izmjene!"); } } xhr.onerror = () => { @@ -83,9 +95,17 @@ class Forma extends Component { promote(id){ const json={id}; - axios.post("https://si2019alpha.herokuapp.com/api/korisnik/promoteStudentToAssistant", json) + + var token1 = window.localStorage.getItem("token"); + var token = encodeURI(token1); + var currentUsername = window.localStorage.getItem("username"); + console.log(token); + console.log(currentUsername); + + axios.post("https://si2019alpha.herokuapp.com/api/korisnik/promoteStudentToAssistant?currentUsername=" + currentUsername + "&token=" + token, json) .then(response=>{ console.log(response); + alert("Student uspješno unaprijeđen u asistenta!"); }) .catch(error=>{ console.log(error) diff --git a/reactapp/src/ALPHA/Forma.js b/reactapp/src/ALPHA/Forma.js index 8be92c469..76c5c84d0 100644 --- a/reactapp/src/ALPHA/Forma.js +++ b/reactapp/src/ALPHA/Forma.js @@ -71,12 +71,18 @@ class Forma extends Component { "website":null, "titula":null } - const body = JSON.stringify(json); + const body = JSON.stringify(json); console.log(body); + var token1 = window.localStorage.getItem("token"); + var token = encodeURI(token1); + var currentUsername = window.localStorage.getItem("username"); + console.log(token); + console.log(currentUsername); + //http://localhost:31901/api/korisnik/AddNewStudent - xhr.open('POST', 'https://si2019alpha.herokuapp.com/api/korisnik/AddNewStudent', true); + xhr.open('POST', 'https://si2019alpha.herokuapp.com/api/korisnik/AddNewStudent?currentUsername=' + currentUsername + '&token=' + token, true); xhr.setRequestHeader('Content-Type', 'application/json'); xhr.onload = () => { if(xhr.status === 200) { diff --git a/reactapp/src/ALPHA/FormaAsistent.js b/reactapp/src/ALPHA/FormaAsistent.js index 40262cf13..98cef8228 100644 --- a/reactapp/src/ALPHA/FormaAsistent.js +++ b/reactapp/src/ALPHA/FormaAsistent.js @@ -33,8 +33,13 @@ class FormaAsistent extends Component { } componentDidMount(){ + var token1 = window.localStorage.getItem("token"); + var token = encodeURI(token1); + var currentUsername = window.localStorage.getItem("username"); + console.log(token); + console.log(currentUsername); - axios.get ('https://si2019alpha.herokuapp.com/api/odsjek/GetOdsjeci') + axios.get ('https://si2019alpha.herokuapp.com/api/odsjek/GetOdsjeci?currentUsername=' + currentUsername + '&token=' + token) .then(response => { console.log("Lista: ", response.data); this.setState({lista: response.data}); @@ -90,7 +95,14 @@ class FormaAsistent extends Component { const xhr = new XMLHttpRequest(); const body1 = JSON.stringify(body); - xhr.open('POST', 'https://si2019alpha.herokuapp.com/api/korisnik/AddNewAssistant', true); + + var token1 = window.localStorage.getItem("token"); + var token = encodeURI(token1); + var currentUsername = window.localStorage.getItem("username"); + console.log(token); + console.log(currentUsername); + + xhr.open('POST', 'https://si2019alpha.herokuapp.com/api/korisnik/AddNewAssistant?currentUsername=' + currentUsername + '&token=' + token, true); xhr.setRequestHeader('Content-Type', 'application/json'); xhr.onload = () => { if(xhr.status === 200) { diff --git a/reactapp/src/ALPHA/FormaAsistentPred.js b/reactapp/src/ALPHA/FormaAsistentPred.js index 500eb6bc6..a52ca5ae3 100644 --- a/reactapp/src/ALPHA/FormaAsistentPred.js +++ b/reactapp/src/ALPHA/FormaAsistentPred.js @@ -16,7 +16,13 @@ class FormaProfPred extends Component { } componentDidMount(){ - axios.get ('https://si2019alpha.herokuapp.com/api/korisnik/getAllAssistants') + var token1 = window.localStorage.getItem("token"); + var token = encodeURI(token1); + var currentUsername = window.localStorage.getItem("username"); + console.log(token); + console.log(currentUsername); + + axios.get ('https://si2019alpha.herokuapp.com/api/korisnik/getAllAssistants?currentUsername=' + currentUsername + '&token=' + token) .then(response => { console.log("Lista: ", response.data); this.setState({listaAsistenata: response.data}); @@ -25,7 +31,7 @@ class FormaProfPred extends Component { console.log(error) }) - axios.get ('https://si2019alpha.herokuapp.com/api/predmet/GetPredmeti') + axios.get ('https://si2019alpha.herokuapp.com/api/predmet/GetPredmeti?currentUsername=' + currentUsername + '&token=' + token) .then(response => { console.log("Lista: ", response.data); this.setState({listaPredmeta: response.data}); @@ -52,7 +58,14 @@ class FormaProfPred extends Component { spoji(asistent, predmet){ console.log(asistent,predmet); const json={"idAsistent":asistent, "idPredmet":predmet} - axios.post("https://si2019alpha.herokuapp.com/api/povezivanje/linkAssistantSubject", json) + + var token1 = window.localStorage.getItem("token"); + var token = encodeURI(token1); + var currentUsername = window.localStorage.getItem("username"); + console.log(token); + console.log(currentUsername); + + axios.post("https://si2019alpha.herokuapp.com/api/povezivanje/linkAssistantSubject?currentUsername=" + currentUsername + "&token=" + token, json) .then(response => { console.log(response); }) diff --git a/reactapp/src/ALPHA/FormaOdsjek.js b/reactapp/src/ALPHA/FormaOdsjek.js index 7bd5cec4c..c4f8ea4aa 100644 --- a/reactapp/src/ALPHA/FormaOdsjek.js +++ b/reactapp/src/ALPHA/FormaOdsjek.js @@ -28,11 +28,12 @@ class FormaOdsjek extends Component { const body = JSON.stringify(data); - var token = window.localStorage.getItem("token"); - var currentUsername = window.localStorage.getItem("username"); - + var token1 = window.localStorage.getItem("token"); + var token = encodeURI(token1); + var currentUsername = window.localStorage.getItem("username"); console.log(token); - console.log(currentUsername); + console.log(currentUsername); + //Drugi URL xhr.open('POST', 'https://si2019alpha.herokuapp.com/api/odsjek/AddNewOdsjek?currentUsername=' + currentUsername + '&token=' + token, true); xhr.setRequestHeader('Content-Type', 'application/json'); diff --git a/reactapp/src/ALPHA/FormaOdsjekPred.js b/reactapp/src/ALPHA/FormaOdsjekPred.js index 6c29bf27c..559225859 100644 --- a/reactapp/src/ALPHA/FormaOdsjekPred.js +++ b/reactapp/src/ALPHA/FormaOdsjekPred.js @@ -35,8 +35,6 @@ class FormaOdsjekPred extends Component {
- - diff --git a/reactapp/src/ALPHA/FormaPr.js b/reactapp/src/ALPHA/FormaPr.js index 3af3442ef..ff95f4501 100644 --- a/reactapp/src/ALPHA/FormaPr.js +++ b/reactapp/src/ALPHA/FormaPr.js @@ -33,8 +33,13 @@ class FormaPr extends Component { this.state = this.initialState } componentDidMount(){ + var token1 = window.localStorage.getItem("token"); + var token = encodeURI(token1); + var currentUsername = window.localStorage.getItem("username"); + console.log(token); + console.log(currentUsername); - axios.get ('https://si2019alpha.herokuapp.com/api/odsjek/GetOdsjeci') + axios.get ('https://si2019alpha.herokuapp.com/api/odsjek/GetOdsjeci?currentUsername=' + currentUsername + '&token=' +token) .then(response => { console.log("Lista: ", response.data); this.setState({lista: response.data}); @@ -84,7 +89,14 @@ class FormaPr extends Component { }; const body = JSON.stringify(body1); console.log("Svi potrebni podaci strng: ", body); - xhr.open('POST', 'https://si2019alpha.herokuapp.com/api/korisnik/AddNewProfessor', true); + + var token1 = window.localStorage.getItem("token"); + var token = encodeURI(token1); + var currentUsername = window.localStorage.getItem("username"); + console.log(token); + console.log(currentUsername); + + xhr.open('POST', 'https://si2019alpha.herokuapp.com/api/korisnik/AddNewProfessor?currentUsername=' + currentUsername + '&token=' + token, true); xhr.setRequestHeader('Content-Type', 'application/json'); xhr.onload = () => { if(xhr.status === 200) { diff --git a/reactapp/src/ALPHA/FormaPredmet.js b/reactapp/src/ALPHA/FormaPredmet.js index fcf7ff880..54845b38f 100644 --- a/reactapp/src/ALPHA/FormaPredmet.js +++ b/reactapp/src/ALPHA/FormaPredmet.js @@ -40,7 +40,14 @@ class FormaPredmet extends Component { const xhr = new XMLHttpRequest(); const body = JSON.stringify(data); - xhr.open('POST', 'https://si2019alpha.herokuapp.com/api/predmet/AddNewPredmet', true); + + var token1 = window.localStorage.getItem("token"); + var token = encodeURI(token1); + var currentUsername = window.localStorage.getItem("username"); + console.log(token); + console.log(currentUsername); + + xhr.open('POST', 'https://si2019alpha.herokuapp.com/api/predmet/AddNewPredmet?currentUsername=' + currentUsername + '&token=' + token,true); xhr.setRequestHeader('Content-Type', 'application/json'); xhr.onload = () => { if(xhr.status === 200) { diff --git a/reactapp/src/ALPHA/FormaPrikazProf.js b/reactapp/src/ALPHA/FormaPrikazProf.js index f3e88844d..a70061945 100644 --- a/reactapp/src/ALPHA/FormaPrikazProf.js +++ b/reactapp/src/ALPHA/FormaPrikazProf.js @@ -16,6 +16,12 @@ class prikazAsistenta extends Component{ componentDidMount(param){ var xhttp = new XMLHttpRequest(); var self = this; + + var token1 = window.localStorage.getItem("token"); + var token = encodeURI(token1); + var currentUsername = window.localStorage.getItem("username"); + console.log(token); + console.log(currentUsername); xhttp.onreadystatechange = function(){ if (xhttp.readyState == 4 && xhttp.status == 200){ @@ -25,8 +31,8 @@ class prikazAsistenta extends Component{ } } - if(param!='') xhttp.open("get", "https://si2019alpha.herokuapp.com/api/korisnik/searchProfessor?ime="+param, true); - else xhttp.open("get", "https://si2019alpha.herokuapp.com/api/korisnik/getAllProfessors", true); + if(param!='') xhttp.open("get", "https://si2019alpha.herokuapp.com/api/korisnik/searchProfessor?ime="+param + '¤tUsername=' + currentUsername + '&token=' + token, true); + else xhttp.open("get", "https://si2019alpha.herokuapp.com/api/korisnik/getAllProfessors?currentUsername=" + currentUsername + "&token=" + token, true); xhttp.send(); } diff --git a/reactapp/src/ALPHA/FormaPrikazStud.js b/reactapp/src/ALPHA/FormaPrikazStud.js index 73e04def3..fb1248e3e 100644 --- a/reactapp/src/ALPHA/FormaPrikazStud.js +++ b/reactapp/src/ALPHA/FormaPrikazStud.js @@ -16,6 +16,12 @@ class prikazAsistenta extends Component{ componentDidMount(param){ var xhttp = new XMLHttpRequest(); var self = this; + + var token1 = window.localStorage.getItem("token"); + var token = encodeURI(token1); + var currentUsername = window.localStorage.getItem("username"); + console.log(token); + console.log(currentUsername); xhttp.onreadystatechange = function(){ if (xhttp.readyState == 4 && xhttp.status == 200){ @@ -28,8 +34,8 @@ class prikazAsistenta extends Component{ //"http://localhost:31901/api/korisnik/searchStudent?ime="+param //"http://localhost:31901/api/korisnik/getAllStudents" - if(param!='') xhttp.open("get", "https://si2019alpha.herokuapp.com/api/korisnik/searchStudent?ime="+param, true); - else xhttp.open("get", "https://si2019alpha.herokuapp.com/api/korisnik/getAllStudents", true); + if(param!='') xhttp.open("get", "https://si2019alpha.herokuapp.com/api/korisnik/searchStudent?ime="+param + '¤tUsername=' + currentUsername + '&token=' + token, true); + else xhttp.open("get", "https://si2019alpha.herokuapp.com/api/korisnik/getAllStudents?currentUsername=" + currentUsername + "&token=" + token, true); xhttp.send(); } diff --git a/reactapp/src/ALPHA/FormaUpis.js b/reactapp/src/ALPHA/FormaUpis.js index 56d8f44ad..d5c19ec49 100644 --- a/reactapp/src/ALPHA/FormaUpis.js +++ b/reactapp/src/ALPHA/FormaUpis.js @@ -28,9 +28,15 @@ class FormaUpis extends Component { componentDidMount(param){ console.log(param); + + var token1 = window.localStorage.getItem("token"); + var token = encodeURI(token1); + var currentUsername = window.localStorage.getItem("username"); + console.log(token); + console.log(currentUsername); //"http://localhost:31901/api/korisnik/searchStudent?ime="+param - axios.get ("https://si2019alpha.herokuapp.com/api/korisnik/searchStudent?ime="+param) + axios.get ("https://si2019alpha.herokuapp.com/api/korisnik/searchStudent?ime="+param + "¤tUsername" + currentUsername + "&token=" + token) .then(response => { console.log("Lista: ", response.data); this.setState({lista: response.data}); @@ -69,8 +75,14 @@ class FormaUpis extends Component { const body = JSON.stringify(json); console.log(body); - //NOVI API CE BITI - xhr.open('POST', 'https://si2019alpha.herokuapp.com/api/korisnik/enrollStudentToSemester', true); + + var token1 = window.localStorage.getItem("token"); + var token = encodeURI(token1); + var currentUsername = window.localStorage.getItem("username"); + console.log(token); + console.log(currentUsername); + + xhr.open('POST', 'https://si2019alpha.herokuapp.com/api/korisnik/enrollStudentToSemester?currentUsername=' + currentUsername + '&token=' + token, true); xhr.setRequestHeader('Content-Type', 'application/json'); xhr.onload = () => { if(xhr.status === 200) { diff --git a/reactapp/src/ALPHA/FormaUrediAsistenta.js b/reactapp/src/ALPHA/FormaUrediAsistenta.js index cde78bab0..510cca96e 100644 --- a/reactapp/src/ALPHA/FormaUrediAsistenta.js +++ b/reactapp/src/ALPHA/FormaUrediAsistenta.js @@ -20,7 +20,13 @@ class Forma extends Component { } componentDidMount(){ - axios.get ('https://si2019alpha.herokuapp.com/api/korisnik/getAllAssistants') + var token1 = window.localStorage.getItem("token"); + var token = encodeURI(token1); + var currentUsername = window.localStorage.getItem("username"); + console.log(token); + console.log(currentUsername); + + axios.get ('https://si2019alpha.herokuapp.com/api/korisnik/getAllAssistants?currentUsername=' + currentUsername + '&token=' + token) .then(response => { console.log("Lista: ", response.data); this.setState({lista: response.data}); @@ -71,7 +77,13 @@ class Forma extends Component { const body1=JSON.stringify(body); console.log("Body1: ", body1); - xhr.open('POST','https://si2019alpha.herokuapp.com/api/korisnik/updateAssistant', true); + var token1 = window.localStorage.getItem("token"); + var token = encodeURI(token1); + var currentUsername = window.localStorage.getItem("username"); + console.log(token); + console.log(currentUsername); + + xhr.open('POST','https://si2019alpha.herokuapp.com/api/korisnik/updateAssistant?currentUsername=' + currentUsername + "&token=" + token, true); xhr.setRequestHeader('Content-Type', 'application/json'); xhr.onload = () => { if(xhr.status === 200) { @@ -88,7 +100,14 @@ class Forma extends Component { promote(id){ const json={id}; - axios.post('https://si2019alpha.herokuapp.com/api/korisnik/promoteAssistantToProfessor', json) + + var token1 = window.localStorage.getItem("token"); + var token = encodeURI(token1); + var currentUsername = window.localStorage.getItem("username"); + console.log(token); + console.log(currentUsername); + + axios.post('https://si2019alpha.herokuapp.com/api/korisnik/promoteAssistantToProfessor?currentUsername=' + currentUsername + "&token=" + token, json) .then(response=>{ console.log(response); }) diff --git a/reactapp/src/ALPHA/FormaUrediProf.js b/reactapp/src/ALPHA/FormaUrediProf.js index bc6d55fc4..675fd86a6 100644 --- a/reactapp/src/ALPHA/FormaUrediProf.js +++ b/reactapp/src/ALPHA/FormaUrediProf.js @@ -34,7 +34,13 @@ class Forma extends Component { } componentDidMount(){ - axios.get ('https://si2019alpha.herokuapp.com/api/korisnik/getAllProfessors') + var token1 = window.localStorage.getItem("token"); + var token = encodeURI(token1); + var currentUsername = window.localStorage.getItem("username"); + console.log(token); + console.log(currentUsername); + + axios.get ('https://si2019alpha.herokuapp.com/api/korisnik/getAllProfessors?currentUsername='+currentUsername + '&token=' + token) .then(response => { console.log("Lista: ", response.data); this.setState({lista: response.data}); @@ -43,7 +49,7 @@ class Forma extends Component { console.log(error) }) - axios.get ('https://si2019alpha.herokuapp.com/api/odsjek/GetOdsjeci') + axios.get ('https://si2019alpha.herokuapp.com/api/odsjek/GetOdsjeci?currentUsername='+currentUsername + '&token=' + token) .then(response => { console.log("Lista: ", response.data); this.setState({listaOdsjeka: response.data}); @@ -121,7 +127,13 @@ class Forma extends Component { const body1=JSON.stringify(body); console.log("Body1: ", body1); - xhr.open('POST','https://si2019alpha.herokuapp.com/api/korisnik/updateProfessor', true); + var token1 = window.localStorage.getItem("token"); + var token = encodeURI(token1); + var currentUsername = window.localStorage.getItem("username"); + console.log(token); + console.log(currentUsername); + + xhr.open('POST','https://si2019alpha.herokuapp.com/api/korisnik/updateProfessor?currentUsername=' + currentUsername + '&token=' + token, true); xhr.setRequestHeader('Content-Type', 'application/json'); xhr.onload = () => { if(xhr.status === 200) { @@ -139,7 +151,14 @@ class Forma extends Component { obrisi(id){ const json={id}; console.log(id); - axios.delete('https://si2019alpha.herokuapp.com/api/korisnik/deleteProfessor?id='+id) + + var token1 = window.localStorage.getItem("token"); + var token = encodeURI(token1); + var currentUsername = window.localStorage.getItem("username"); + console.log(token); + console.log(currentUsername); + + axios.delete('https://si2019alpha.herokuapp.com/api/korisnik/deleteProfessor?id='+id + '¤tUsername=' + currentUsername + '&token=' + token) .then(response=>{ console.log(response); }) diff --git a/reactapp/src/ALPHA/editOdsjeka.js b/reactapp/src/ALPHA/editOdsjeka.js index b4a88a487..54a4a8a66 100644 --- a/reactapp/src/ALPHA/editOdsjeka.js +++ b/reactapp/src/ALPHA/editOdsjeka.js @@ -17,7 +17,13 @@ class Forma extends Component { } componentDidMount(){ - axios.get ('https://si2019alpha.herokuapp.com/api/odsjek/GetOdsjeci') + var token1 = window.localStorage.getItem("token"); + var token = encodeURI(token1); + var currentUsername = window.localStorage.getItem("username"); + console.log(token); + console.log(currentUsername); + + axios.get ('https://si2019alpha.herokuapp.com/api/odsjek/GetOdsjeci?currentUsername=' + currentUsername + '&token=' + token) .then(response => { console.log("Lista: ", response.data); this.setState({lista: response.data}); @@ -58,14 +64,18 @@ class Forma extends Component { const body1=JSON.stringify(body); console.log("Body1: ", body1); + + var token1 = window.localStorage.getItem("token"); + var token = encodeURI(token1); + var currentUsername = window.localStorage.getItem("username"); + console.log(token); + console.log(currentUsername); - xhr.open('POST','https://si2019alpha.herokuapp.com/api/odsjek/PromijeniOdsjek', true); + xhr.open('POST','https://si2019alpha.herokuapp.com/api/odsjek/PromijeniOdsjek?currentUsername=' + currentUsername + '&token=' + token, true); xhr.setRequestHeader('Content-Type', 'application/json'); xhr.onload = () => { if(xhr.status === 200) { - const resp = xhr.responseText; - } } xhr.onerror = () => { diff --git a/reactapp/src/ALPHA/editPredmeta.js b/reactapp/src/ALPHA/editPredmeta.js index 90d062f4a..fc8b853f9 100644 --- a/reactapp/src/ALPHA/editPredmeta.js +++ b/reactapp/src/ALPHA/editPredmeta.js @@ -20,7 +20,13 @@ class Forma extends Component { } componentDidMount () { - axios.get ('https://si2019alpha.herokuapp.com/api/predmet/GetPredmeti') + var token1 = window.localStorage.getItem("token"); + var token = encodeURI(token1); + var currentUsername = window.localStorage.getItem("username"); + console.log(token); + console.log(currentUsername); + + axios.get ('https://si2019alpha.herokuapp.com/api/predmet/GetPredmeti?currentUsername=' + currentUsername + '&token=' + token) .then(response => { console.log("Lista: ", response.data); this.setState({lista: response.data}); @@ -65,8 +71,15 @@ class Forma extends Component { const body1=JSON.stringify(body); console.log("Body1: ", body1); + + var token1 = window.localStorage.getItem("token"); + var token = encodeURI(token1); + var currentUsername = window.localStorage.getItem("username"); + console.log(token); + console.log(currentUsername); + if(data.id!="--Predmeti--" && data.id!="" ) { - xhr.open('POST','https://si2019alpha.herokuapp.com/api/predmet/PromijeniPredmet', true); + xhr.open('POST','https://si2019alpha.herokuapp.com/api/predmet/PromijeniPredmet?currentUsername=' + currentUsername + '&token=' + token, true); xhr.setRequestHeader('Content-Type', 'application/json'); xhr.onload = () => { if(xhr.status === 200) { @@ -90,7 +103,14 @@ class Forma extends Component { if(selectedValue!="--Predmeti--" && selectedValue!="" && selectedValue!=undefined ) { const json={naziv}; console.log(naziv); - axios.delete("https://si2019alpha.herokuapp.com/api/predmet/deleteSubject?naziv="+ selectedValue) + + var token1 = window.localStorage.getItem("token"); + var token = encodeURI(token1); + var currentUsername = window.localStorage.getItem("username"); + console.log(token); + console.log(currentUsername); + + axios.delete("https://si2019alpha.herokuapp.com/api/predmet/deleteSubject?naziv="+ selectedValue + "¤tUsername=" + currentUsername + "&token=" + token) .then(response=>{ console.log(response); }) diff --git a/reactapp/src/ALPHA/povezivanjeAsistentPredmet.js b/reactapp/src/ALPHA/povezivanjeAsistentPredmet.js index 71953e330..cd5d46fe0 100644 --- a/reactapp/src/ALPHA/povezivanjeAsistentPredmet.js +++ b/reactapp/src/ALPHA/povezivanjeAsistentPredmet.js @@ -16,7 +16,13 @@ class FormaProfPred extends Component { } componentDidMount(){ - axios.get ('http://localhost:31901/api/korisnik/GetAllAssistants') + var token1 = window.localStorage.getItem("token"); + var token = encodeURI(token1); + var currentUsername = window.localStorage.getItem("username"); + console.log(token); + console.log(currentUsername); + + axios.get ('http://localhost:31901/api/korisnik/GetAllAssistants?currentUsername=' + currentUsername + '&token=' + token) .then(response => { console.log("Lista: ", response.data); this.setState({listaAsistenata: response.data}); @@ -25,7 +31,7 @@ class FormaProfPred extends Component { console.log(error) }) - axios.get ('http://localhost:31901/api/predmet/GetPredmeti') + axios.get ('http://localhost:31901/api/predmet/GetPredmeti?currentUsername=' + currentUsername + '&token=' + token) .then(response => { console.log("Lista: ", response.data); this.setState({listaPredmeta: response.data}); @@ -52,7 +58,14 @@ class FormaProfPred extends Component { spoji(asistent, predmet){ console.log(asistent,predmet); const json={"idUloga":asistent, "idPredmet":predmet, "godina":null, "ciklus":null, "obavezan":null} - axios.post("http://localhost:31901/api/povezivanje/linkAssistantSubject", json) + + var token1 = window.localStorage.getItem("token"); + var token = encodeURI(token1); + var currentUsername = window.localStorage.getItem("username"); + console.log(token); + console.log(currentUsername); + + axios.post("http://localhost:31901/api/povezivanje/linkAssistantSubject?currentUsername=" + currentUsername + "&token=" + token, json) .then(response => { console.log(response); }) diff --git a/reactapp/src/ALPHA/povezivanjeOdsjekPredmet.js b/reactapp/src/ALPHA/povezivanjeOdsjekPredmet.js index 6d5ed190e..6f91c4ada 100644 --- a/reactapp/src/ALPHA/povezivanjeOdsjekPredmet.js +++ b/reactapp/src/ALPHA/povezivanjeOdsjekPredmet.js @@ -21,7 +21,13 @@ class FormaProfPred extends Component { } componentDidMount(){ - axios.get ('https://si2019alpha.herokuapp.com/api/odsjek/GetOdsjeci') + var token1 = window.localStorage.getItem("token"); + var token = encodeURI(token1); + var currentUsername = window.localStorage.getItem("username"); + console.log(token); + console.log(currentUsername); + + axios.get ('https://si2019alpha.herokuapp.com/api/odsjek/GetOdsjeci?currentUsername=' + currentUsername + '&token=' + token) .then(response => { console.log("Lista: ", response.data); this.setState({listaOdsjeka: response.data}); @@ -30,7 +36,7 @@ class FormaProfPred extends Component { console.log(error) }) - axios.get ('https://si2019alpha.herokuapp.com/api/predmet/GetPredmeti') + axios.get ('https://si2019alpha.herokuapp.com/api/predmet/GetPredmeti?currentUsername=' + currentUsername + '&token=' + token) .then(response => { console.log("Lista: ", response.data); this.setState({listaPredmeta: response.data}); @@ -65,7 +71,13 @@ class FormaProfPred extends Component { const xhr = new XMLHttpRequest(); - xhr.open('POST', 'https://si2019alpha.herokuapp.com/api/povezivanje/SpojiOdsjekPredmet', true); + var token1 = window.localStorage.getItem("token"); + var token = encodeURI(token1); + var currentUsername = window.localStorage.getItem("username"); + console.log(token); + console.log(currentUsername); + + xhr.open('POST', 'https://si2019alpha.herokuapp.com/api/povezivanje/SpojiOdsjekPredmet?currentUsername=' + currentUsername + '&token=' + token, true); xhr.setRequestHeader('Content-Type', 'application/json'); xhr.onload = () => { if(xhr.status === 200) { diff --git a/reactapp/src/ALPHA/povezivanjeProfesorPredmet.js b/reactapp/src/ALPHA/povezivanjeProfesorPredmet.js index c243b8bc9..7b3eeb971 100644 --- a/reactapp/src/ALPHA/povezivanjeProfesorPredmet.js +++ b/reactapp/src/ALPHA/povezivanjeProfesorPredmet.js @@ -16,7 +16,13 @@ class FormaProfPred extends Component { } componentDidMount(){ - axios.get ('https://si2019alpha.herokuapp.com/api/korisnik/getAllProfessors') + var token1 = window.localStorage.getItem("token"); + var token = encodeURI(token1); + var currentUsername = window.localStorage.getItem("username"); + console.log(token); + console.log(currentUsername); + + axios.get ('https://si2019alpha.herokuapp.com/api/korisnik/getAllProfessors?currentUsername=' + currentUsername + '&token=' + token) .then(response => { console.log("Lista: ", response.data); this.setState({listaProfesora: response.data}); @@ -25,7 +31,7 @@ class FormaProfPred extends Component { console.log(error) }) - axios.get ('https://si2019alpha.herokuapp.com/api/predmet/GetPredmeti') + axios.get ('https://si2019alpha.herokuapp.com/api/predmet/GetPredmeti?currentUsername=' + currentUsername + '&token=' + token) .then(response => { console.log("Lista: ", response.data); this.setState({listaPredmeta: response.data}); @@ -51,12 +57,18 @@ class FormaProfPred extends Component { spoji(predmet, profesor){ console.log(predmet, profesor) + var token1 = window.localStorage.getItem("token"); + var token = encodeURI(token1); + var currentUsername = window.localStorage.getItem("username"); + console.log(token); + console.log(currentUsername); + if(profesor=='' || predmet=="" || profesor==undefined || predmet==undefined || profesor=="--Profesori--" || predmet=="--Predmeti--") alert("Izaberite profesora i predmet!") else { console.log(profesor,predmet); const json={"idPredmet":predmet, "idProfesor":profesor} - axios.post("https://si2019alpha.herokuapp.com/api/povezivanje/linkProfessorSubject", json) + axios.post("https://si2019alpha.herokuapp.com/api/povezivanje/linkProfessorSubject?currentUsername=" + currentUsername + "&token=" + token, json) .then(response => { console.log(response); }) diff --git a/reactapp/src/ALPHA/prikazAsistenta.js b/reactapp/src/ALPHA/prikazAsistenta.js index fb41b49ff..883b8d88d 100644 --- a/reactapp/src/ALPHA/prikazAsistenta.js +++ b/reactapp/src/ALPHA/prikazAsistenta.js @@ -16,6 +16,12 @@ class prikazAsistenta extends Component{ componentDidMount(param){ var xhttp = new XMLHttpRequest(); var self = this; + + var token1 = window.localStorage.getItem("token"); + var token = encodeURI(token1); + var currentUsername = window.localStorage.getItem("username"); + console.log(token); + console.log(currentUsername); xhttp.onreadystatechange = function(){ if (xhttp.readyState == 4 && xhttp.status == 200){ @@ -25,8 +31,8 @@ class prikazAsistenta extends Component{ } } - if(param!='') xhttp.open("get", "https://si2019alpha.herokuapp.com/api/korisnik/searchAssistant?ime="+param, true); - else xhttp.open("get", "https://si2019alpha.herokuapp.com/api/korisnik/getAllAssistants", true); + if(param!='') xhttp.open("get", "https://si2019alpha.herokuapp.com/api/korisnik/searchAssistant?ime="+param + "¤tUsername=" + currentUsername + "&token=" + token, true); + else xhttp.open("get", "https://si2019alpha.herokuapp.com/api/korisnik/getAllAssistants?currentUsername=" + currentUsername + "&token=" + token, true); xhttp.send(); } @@ -39,7 +45,13 @@ class prikazAsistenta extends Component{ obrisi(id){ console.log(id); - axios.delete("https://si2019alpha.herokuapp.com/api/korisnik/deleteAssistant?id="+id) + var token1 = window.localStorage.getItem("token"); + var token = encodeURI(token1); + var currentUsername = window.localStorage.getItem("username"); + console.log(token); + console.log(currentUsername); + + axios.delete("https://si2019alpha.herokuapp.com/api/korisnik/deleteAssistant?id="+id +"¤tUsername=" + currentUsername + "&token=" + token) .then(response => { console.log(response); }) diff --git a/reactapp/src/ALPHA/prikazOdsjeka.js b/reactapp/src/ALPHA/prikazOdsjeka.js index d3068ff22..d721f056f 100644 --- a/reactapp/src/ALPHA/prikazOdsjeka.js +++ b/reactapp/src/ALPHA/prikazOdsjeka.js @@ -13,8 +13,14 @@ class prikazOdsjeka extends Component{ } componentDidMount(search){ + var token1 = window.localStorage.getItem("token"); + var token = encodeURI(token1); + var currentUsername = window.localStorage.getItem("username"); + console.log(token); + console.log(currentUsername); + if(search==''){ - axios.get ('https://si2019alpha.herokuapp.com/api/odsjek/GetOdsjeci') + axios.get ('https://si2019alpha.herokuapp.com/api/odsjek/GetOdsjeci?currentUsername=' + currentUsername + '&token=' + token) .then(response => { console.log("Lista: ", response.data); this.setState({lista: response.data}); @@ -24,7 +30,7 @@ class prikazOdsjeka extends Component{ }) } else{ - axios.get ('https://si2019alpha.herokuapp.com/api/odsjek/GetOdsjek?naziv='+search) + axios.get ('https://si2019alpha.herokuapp.com/api/odsjek/GetOdsjek?naziv=' + search + '¤tUsername=' + currentUsername + '&token=' + token) .then(response => { console.log("Lista: ", response.data); this.setState({lista: [response.data]}); @@ -43,7 +49,13 @@ class prikazOdsjeka extends Component{ obrisi(naziv){ console.log(naziv); - axios.delete("https://si2019alpha.herokuapp.com/api/odsjek/DeleteOdsjek?naziv="+naziv) + var token1 = window.localStorage.getItem("token"); + var token = encodeURI(token1); + var currentUsername = window.localStorage.getItem("username"); + console.log(token); + console.log(currentUsername); + + axios.delete("https://si2019alpha.herokuapp.com/api/odsjek/DeleteOdsjek?naziv=" + naziv + "¤tUsername=" + currentUsername + "&token=" + token) .then(response => { console.log(response); }) diff --git a/reactapp/src/ALPHA/prikazPredmeta.js b/reactapp/src/ALPHA/prikazPredmeta.js index acb9ba537..6468745d0 100644 --- a/reactapp/src/ALPHA/prikazPredmeta.js +++ b/reactapp/src/ALPHA/prikazPredmeta.js @@ -14,8 +14,14 @@ class prikazAsistenta extends Component{ componentDidMount(search){ + var token1 = window.localStorage.getItem("token"); + var token = encodeURI(token1); + var currentUsername = window.localStorage.getItem("username"); + console.log(token); + console.log(currentUsername); + if(search==''){ - axios.get ('https://si2019alpha.herokuapp.com/api/predmet/GetPredmeti') + axios.get ('https://si2019alpha.herokuapp.com/api/predmet/GetPredmeti?currentUsername=' + currentUsername + '&token=' + token) .then(response => { console.log("Lista: ", response.data); this.setState({lista: response.data}); @@ -25,7 +31,7 @@ class prikazAsistenta extends Component{ }) } else{ - axios.get ('https://si2019alpha.herokuapp.com/api/predmet/GetPredmet?naziv='+search) + axios.get ('https://si2019alpha.herokuapp.com/api/predmet/GetPredmet?naziv='+search + '¤tUsername=' + currentUsername + '&token=' + token) .then(response => { console.log("Lista: ", response.data); this.setState({lista: [response.data]}); @@ -44,7 +50,13 @@ class prikazAsistenta extends Component{ obrisi(naziv){ console.log(naziv); - axios.delete("https://si2019alpha.herokuapp.com/api/predmet/deleteSubject?naziv="+naziv) + var token1 = window.localStorage.getItem("token"); + var token = encodeURI(token1); + var currentUsername = window.localStorage.getItem("username"); + console.log(token); + console.log(currentUsername); + + axios.delete("https://si2019alpha.herokuapp.com/api/predmet/deleteSubject?naziv="+naziv + "¤tUsername=" + currentUsername + "&token=" + token) .then(response => { console.log(response); }) diff --git a/reactapp/src/ALPHA/promijeniLozinku.js b/reactapp/src/ALPHA/promijeniLozinku.js index e788ca668..6c841bc45 100644 --- a/reactapp/src/ALPHA/promijeniLozinku.js +++ b/reactapp/src/ALPHA/promijeniLozinku.js @@ -19,7 +19,13 @@ class promijeniLozinku extends Component { } componentDidMount(){ - axios.get ('https://si2019alpha.herokuapp.com/api/korisnik/getAllProfessors') + var token1 = window.localStorage.getItem("token"); + var token = encodeURI(token1); + var currentUsername = window.localStorage.getItem("username"); + console.log(token); + console.log(currentUsername); + + axios.get ('https://si2019alpha.herokuapp.com/api/korisnik/getAllProfessors?currentUsername=' + currentUsername + '&token=' + token) .then(response => { console.log("Lista: ", response.data); this.setState({lista: response.data}); @@ -56,7 +62,13 @@ class promijeniLozinku extends Component { } dajProfesore() { - axios.get ('https://si2019alpha.herokuapp.com/api/korisnik/getAllProfessors') + var token1 = window.localStorage.getItem("token"); + var token = encodeURI(token1); + var currentUsername = window.localStorage.getItem("username"); + console.log(token); + console.log(currentUsername); + + axios.get ('https://si2019alpha.herokuapp.com/api/korisnik/getAllProfessors?currentUsername=' + currentUsername + '&token=' + token) .then(response => { console.log("Lista: ", response.data); this.setState({lista: response.data}); @@ -67,7 +79,13 @@ class promijeniLozinku extends Component { } dajStudente() { - axios.get ('https://si2019alpha.herokuapp.com/api/korisnik/getAllStudents') + var token1 = window.localStorage.getItem("token"); + var token = encodeURI(token1); + var currentUsername = window.localStorage.getItem("username"); + console.log(token); + console.log(currentUsername); + + axios.get ('https://si2019alpha.herokuapp.com/api/korisnik/getAllStudents?currentUsername=' + currentUsername + '&token=' + token) .then(response => { console.log("Lista: ", response.data); this.setState({lista: response.data}); @@ -78,7 +96,13 @@ class promijeniLozinku extends Component { } dajAsistente() { - axios.get ('https://si2019alpha.herokuapp.com/api/korisnik/getAllAssistants') + var token1 = window.localStorage.getItem("token"); + var token = encodeURI(token1); + var currentUsername = window.localStorage.getItem("username"); + console.log(token); + console.log(currentUsername); + + axios.get ('https://si2019alpha.herokuapp.com/api/korisnik/getAllAssistants?currentUsername=' + currentUsername + '&token=' + token) .then(response => { console.log("Lista: ", response.data); this.setState({lista: response.data}); @@ -101,8 +125,14 @@ class promijeniLozinku extends Component { promijeni(username){ - if(username!="") { - axios.get ('https://si2019alpha.herokuapp.com/api/korisnik/GetNewPassword?username='+username) + var token1 = window.localStorage.getItem("token"); + var token = encodeURI(token1); + var currentUsername = window.localStorage.getItem("username"); + console.log(token); + console.log(currentUsername); + + if(username!="") { + axios.get ('https://si2019alpha.herokuapp.com/api/korisnik/GetNewPassword?username='+username + '¤tUsername=' + currentUsername + '&token=' + token) .then(response => { console.log("Lista: ", response.data); alert("Novi password korisnika je: " + response.data.password);