Fixed https | wss websocket issues

This commit is contained in:
Vivek Teega 2020-09-01 11:28:45 +05:30
parent f396a5a608
commit 2f4ac33cb6
2 changed files with 31 additions and 18 deletions

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
.vscode/

View File

@ -336,6 +336,7 @@
<div id='user-button' style="float: right; font-family: 'Roboto'; margin:1rem; cursor:pointer; display: none;"> <div id='user-button' style="float: right; font-family: 'Roboto'; margin:1rem; cursor:pointer; display: none;">
<span style="padding-right: 0.5rem; font-weight:bold"><i class="fa fa-user-circle-o fa-2x" <span style="padding-right: 0.5rem; font-weight:bold"><i class="fa fa-user-circle-o fa-2x"
aria-hidden="true"></i></div> aria-hidden="true"></i></div>
</div> </div>
<div id='homepage'> <div id='homepage'>
@ -504,12 +505,13 @@
//for cloud apps //for cloud apps
subAdmins: [], subAdmins: [],
webAppURL: "167.172.219.249:8368", webAppURL: "ranchimalltimes-webappserver.duckdns.org",
application: "TestApp", application: "TestApp",
vectorClock: {}, vectorClock: {},
appObjects: {}, appObjects: {},
generalData: {}, generalData: {},
generalVC: {} generalVC: {}
} }
</script> </script>
@ -9876,24 +9878,28 @@
console.log('woohooo I just clicked') console.log('woohooo I just clicked')
let columnName = element.id.split('_')[0] let columnName = element.id.split('_')[0]
if (element.classList.value == 'fa fa-thumbs-o-up') { if (typeof mainObj !== 'undefined') {
if (element.classList.value == 'fa fa-thumbs-o-up') {
let articlekey = document.getElementById(columnName).dataset.articlekey let articlekey = document.getElementById(columnName).dataset.articlekey
let mainObj = { let mainObj = {
'floID': myFloID, 'floID': myFloID,
'articlekey': articlekey 'articlekey': articlekey
}
floCloudAPI.sendGeneralData(JSON.stringify(mainObj), 'test').then((result, mainObj) => {
element.classList.value = 'fa fa-thumbs-up'
if (document.getElementById(`${columnName}_count`).innerText == '') {
document.getElementById(`${columnName}_count`).innerText = '1'
} else {
document.getElementById(`${columnName}_count`).innerText = parseInt(document.getElementById(
`${columnName}_count`).innerText) + 1
} }
})
floCloudAPI.sendGeneralData(JSON.stringify(mainObj), 'test').then((result, mainObj) => {
element.classList.value = 'fa fa-thumbs-up'
if (document.getElementById(`${columnName}_count`).innerText == '') {
document.getElementById(`${columnName}_count`).innerText = '1'
} else {
document.getElementById(`${columnName}_count`).innerText = parseInt(document.getElementById(
`${columnName}_count`).innerText) + 1
}
})
}
}
else {
alert("Please login to vote")
} }
} }
@ -9981,6 +9987,12 @@
}) })
} }
document.getElementById("user-button").addEventListener("click", function () {
floDapps.clearCredentials()
alert('Successfully cleared credentials')
//location.reload()
});
function onLoadStartUp() { function onLoadStartUp() {
//floDapps.addStartUpFunction('Sample', Promised Function) //floDapps.addStartUpFunction('Sample', Promised Function)