riddhidave18/Gazebo_simulation-Frontend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: riddhidave18:c1934e000c0010d2ff48a778205ef5ec7e8f58d5
Branches Tags
riddhidave18:master
riddhidave18:feature-login
riddhidave18:vagrant-ansible
..
compare: riddhidave18:c586e2ed33e32759d09bee2828510f20b52cebcd
Branches Tags
riddhidave18:feature-login
riddhidave18:vagrant-ansible
riddhidave18:master

No commits in common. "c1934e000c0010d2ff48a778205ef5ec7e8f58d5" and "c586e2ed33e32759d09bee2828510f20b52cebcd" have entirely different histories.
c1934e000c ... c586e2ed33

3 changed files with 59 additions and 102 deletions
Show Stats Expand all files Collapse all files

1
nginx-conf/nginx.conf
View File

@ -6,7 +6,6 @@ server {
set $cors 'true'; set $cors 'true';

5
public/config.js
View File

@ -1,7 +1,4 @@
var configs = { var configs = {
//"authUrl": "http://localhost:8000", "authUrl": "https://localhost:8433",
"authUrl": "https://{{base_url}}{{port_str}}",
//"authUrl": "https://localhost:8433",
"front_endUrl": "https://sim.{{base_url}}{{port_str}}/" "front_endUrl": "https://sim.{{base_url}}{{port_str}}/"
//"front_endUrl": "http://localhost:3006"
}; };

155
src/components/App.js
View File

@ -15,16 +15,13 @@ import { thisExpression } from '@babel/types';
class App extends Component{ class App extends Component{
state = { state = {
data: [],
isLoading: false, isLoading: false,
isAuthenticated: false, isAuthenticated: false,
isLoggedin: false, user: undefined,
isUser: "",
launch: false, launch: false,
isNavbar: false, isNavbar: false,
url: "", url: "",
backend_url: "", backend_url: ""
data: {}
}; };
constructor(props){ constructor(props){
@ -42,7 +39,6 @@ class App extends Component{
this.login = this.login.bind(this); this.login = this.login.bind(this);
this.logout = this.logout.bind(this); this.logout = this.logout.bind(this);
this.routeMain =this.routeMain.bind(this); this.routeMain =this.routeMain.bind(this);
this.fetchusers =this.fetchusers.bind(this);
this.submit = this.submit.bind(this); this.submit = this.submit.bind(this);
//this.getSimulator = this.settingsSimulator.bind(this); //this.getSimulator = this.settingsSimulator.bind(this);
@ -52,53 +48,20 @@ class App extends Component{
this.wait = this.wait.bind(this); this.wait = this.wait.bind(this);
} }
async componentDidMount() {
async componentDidMount () { console.log(this.state.backend_url)
const body = this.fetchusers(); const response = await fetch(`${this.authip}/api/user_`,{credentials: 'include'});
//const response = await axios.get('https://localhost:8433/api/curuser/'); console.log(response.ok);
//this.setState({isUser: response.data.fetchuser},()=>console.log('hey riddhi',this.state.isUser)); const body = await response.text();
this.timer = setInterval(() => this.fetchusers(), 5000);
if (body === '') { if (body === '') {
this.setState(({isAuthenticated: false})) this.setState(({isAuthenticated: false}))
this.login() this.login()
} else { } else {
this.setState({isAuthenticated: true}) this.setState({isAuthenticated: true, user: JSON.parse(body)})
} }
console.log(this.state.isAuthenticated);
} }
async fetchusers () {
try {
await fetch("http://localhost:8000/api/curuser/", {credentials: 'include'})
.then(response => {
if (response.status > 400) {
return this.setState(() => {
return { placeholder: "Something went wrong!" };
});
}
return response.json();
})
.then(data => {
this.setState(() => {
return {
data,
isAuthenticated : data.isLoggedin,
isUser : data.fetchuser
};
});
})
//.then(console.log(this.state.isUser))
.then(console.log(this.state.isAuthenticated));
}
catch (e) {
console.log('Error is:',e.response);
this.login()
}
}
routeMain(){ routeMain(){
let path = '/'; let path = '/';
this.props.history.push(path); this.props.history.push(path);
@ -107,6 +70,7 @@ class App extends Component{
login() { login() {
console.log(window.location) console.log(window.location)
window.location.href = `${this.authip}/login`; window.location.href = `${this.authip}/login`;
} }
wait(ms){ wait(ms){
var start = new Date().getTime(); var start = new Date().getTime();
@ -123,36 +87,36 @@ class App extends Component{
async logout() { async logout() {
fetch(`${this.authip}/logout`, fetch(`${this.authip}/logout`,
{ //{
// method : 'GET', //method : 'GET',
mode: 'no-cors', //mode: 'no-cors',
credentials: 'include', // credentials: 'include',
headers: { //headers: {
'Content-Type': 'application/json' //'Content-Type': 'application/json'
}, //},
} //}
) )
// .then((response) => response) /*.then((response) => response)
// .then((json) => { .then((json) => {
// console.log('Gotcha'); console.log('Gotcha');
// console.log(json.status === 204); console.log(json.status === 204);
// console.log(json.status); console.log(json.status);
// console.log(this.state.isAuthenticated); console.log(this.state.isAuthenticated);
// if (json.status === 204) { if (json.status === 204) {
// this.state.isAuthenticated = false; this.state.isAuthenticated = false;
// this.routeMain(); this.routeMain();
// } }
// if (json.status === 200) { if (json.status === 200) {
// this.state.isAuthenticated = false; this.state.isAuthenticated = false;
// this.routeMain(); this.routeMain();
// } }
// console.log(this.state.isAuthenticated); console.log(this.state.isAuthenticated);
// }) })*/
// .then(reponse => { .then(reponse => {
// window.location.href = this.authip; window.location.href = this.authip;
// }) })
.then(response => { .then(reponse => {
//this.wait(3000); this.wait(3000);
window.location.href = this.frontendip; window.location.href = this.frontendip;
}); });
} }
@ -173,10 +137,7 @@ class App extends Component{
] ]
}); });
}; };
componentWillUnmount() {
clearInterval(this.timer);
this.timer = null;
}
attach() { attach() {
this.timer = setInterval(()=> this.heartbeat(), 10000); this.timer = setInterval(()=> this.heartbeat(), 10000);
@ -198,33 +159,33 @@ class App extends Component{
handleUrl = (urlValue) => { handleUrl = (urlValue) => {
this.setState({url: urlValue}); this.setState({url: urlValue});
} }
settingsSimulator(launch) { /*settingsSimulator(launch) {
if (launch){ if (launch){
// const httpClient = axios.create(); const httpClient = axios.create();
// httpClient.defaults.timeout = 600000; httpClient.defaults.timeout = 600000;
// TODO : detach the heartbeat // TODO : detach the heartbeat
// httpClient.get(`http://${this.backendip}/simulator/stop/${this.state.user.sub}`, { withCredentials: true }) httpClient.get(`http://${this.backendip}/simulator/stop/${this.state.user.sub}`, { withCredentials: true })
// .then(res => { .then(res => {
// this.setState({launch: false}); this.setState({launch: false});
// }) })
} }
else { else {
this.setState({isLoading : true, launch: true}); this.setState({isLoading : true, launch: true});
//this.attach(this.state.launch); this.attach(this.state.launch);
// const httpClient = axios.create(); const httpClient = axios.create();
// httpClient.defaults.timeout = 600000; httpClient.defaults.timeout = 600000;
// httpClient.get(`http://${this.backendip}/simulator/start/${this.state.user.sub}/${this.state.user.given_name}/spiri-friend2019@`, { withCredentials: true }) httpClient.get(`http://${this.backendip}/simulator/start/${this.state.user.sub}/${this.state.user.given_name}/spiri-friend2019@`, { withCredentials: true })
// .then(res => { .then(res => {
// this.setState({simulator: res.data, isLoading: false, url: this.state.simulator.publicIp }); this.setState({simulator: res.data, isLoading: false, url: this.state.simulator.publicIp });
// this.launchSimulator(this.state.simulator.publicIp); this.launchSimulator(this.state.simulator.publicIp);
// }) })
} }
} }*/
@ -260,8 +221,8 @@ class App extends Component{
const launch_ = this.state.launch ? const launch_ = this.state.launch ?
<div> <div>
<div id="sim"> <div id="sim">
<iframe name="top_" src={'https://'+ '3.238.149.224' +':4200'} width="100%" height="375px" frameBorder="0"></iframe> <iframe name="top_" src={'https://'+ '3.238.9.151' +':4200'} width="100%" height="375px" frameBorder="0"></iframe>
<iframe name="bottom_" src={'https://'+ 'http://3.238.149.224' +':8888'} width="100%" height="375px" frameBorder="0"></iframe> <iframe name="bottom_" src={'https://'+ '3.238.9.151' +':8888'} width="100%" height="375px" frameBorder="0"></iframe>
</div> </div>
</div>: </div>:
<div class="SpiriImage"> <div class="SpiriImage">