RanchiMall/Flo-Whatsapp
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update v0.5

Browse Source 
Added msg-time and Store msgs in IDB
This commit is contained in:
sairajzero 2019-04-10 17:36:24 +05:30
parent e3d1dcec5d
commit 9f47a7461a
4 changed files with 46 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
app.js
View File

@ -36,7 +36,7 @@ function userDataStartUp(){
}).catch(function (error) { }).catch(function (error) {
console.log(error.message); console.log(error.message);
}); });
}
function arrayToObject(array){ function arrayToObject(array){
obj = {}; obj = {};
array.forEach(element => { array.forEach(element => {
@ -140,9 +140,6 @@ function userDataStartUp(){
} }
}
userDataStartUp();
function getuserID(){ function getuserID(){
return new Promise( return new Promise(
function(resolve,reject){ function(resolve,reject){
@ -224,6 +221,26 @@ function getDatafromIDB(){
); );
} }
function storeMsg(data){
var idb = indexedDB.open("FLO_Chat",2);
idb.onerror = function(event) {
console.log("Error in opening IndexedDB!");
};
idb.onupgradeneeded = function(event) {
var objectStore = event.target.result.createObjectStore("messages",{ keyPath: 'time' });
objectStore.createIndex('text', 'text', { unique: false });
objectStore.createIndex('floID', 'floID', { unique: false });
objectStore.createIndex('type', 'type', { unique: false });
};
idb.onsuccess = function(event) {
var db = event.target.result;
var obs = db.transaction("messages", "readwrite").objectStore("messages");
obs.add(data);
db.close();
};
}
function displayContacts(){ function displayContacts(){
console.log('displayContacts'); console.log('displayContacts');
var listElement = document.getElementById('contact-display'); var listElement = document.getElementById('contact-display');
@ -263,6 +280,7 @@ function initselfWebSocket(){
try{ try{
var disp = document.getElementById("conversation"); var disp = document.getElementById("conversation");
var data = JSON.parse(evt.data); var data = JSON.parse(evt.data);
var time = Date.now();
var msgdiv = document.createElement('div'); var msgdiv = document.createElement('div');
msgdiv.setAttribute("class", "row message-body"); msgdiv.setAttribute("class", "row message-body");
msgdiv.innerHTML = `<div class="col-sm-12 message-main-receiver"> msgdiv.innerHTML = `<div class="col-sm-12 message-main-receiver">
@ -271,12 +289,12 @@ function initselfWebSocket(){
<b>${data.from} : </b><br/>${data.msg} <b>${data.from} : </b><br/>${data.msg}
</span> </span>
<span class="message-time pull-right"> <span class="message-time pull-right">
Time ${getTime(time)}
</span> </span>
</div> </div>
</div> </div>`;
`;
disp.appendChild(msgdiv); disp.appendChild(msgdiv);
storeMsg({time:time,floID:data.from,text:data.msg,type:"R"});
}catch(err){ }catch(err){
if(evt.data[0]=='$') if(evt.data[0]=='$')
alert(evt.data); alert(evt.data);
@ -295,15 +313,28 @@ function changeReceiver(param){
document.getElementById('recipient-floID').innerHTML = receiverID; document.getElementById('recipient-floID').innerHTML = receiverID;
} }
function getTime(time){
var t = new Date(time);
var months = ['Jan','Feb','Mar','Apr','May','Jun','Jul','Aug','Sep','Oct','Nov','Dec']
var fn = function(n){
if(n<10)
return '0'+n;
else
return n;
};
var tmp = `${months[t.getMonth()]} ${fn(t.getDate())} ${t.getFullYear()} ${fn(t.getHours())}:${fn(t.getMinutes())}`;
return tmp;
}
function sendMsg(){ function sendMsg(){
var msg = document.getElementById('sendMsgInput').value; var msg = document.getElementById('sendMsgInput').value;
console.log(msg); console.log(msg);
var ws = new WebSocket("ws://"+contacts[receiverID].onionAddr+"/ws"); var ws = new WebSocket("ws://"+contacts[receiverID].onionAddr+"/ws");
ws.onopen = function(evt){ ws.onopen = function(evt){
var data = {from:senderID,msg:msg}; var data = JSON.stringify({from:senderID,msg:msg});
data = JSON.stringify(data);
ws.send(data); ws.send(data);
console.log(`sentMsg : ${data}`); console.log(`sentMsg : ${data}`);
time = Date.now();
var disp = document.getElementById("conversation"); var disp = document.getElementById("conversation");
var msgdiv = document.createElement('div'); var msgdiv = document.createElement('div');
msgdiv.setAttribute("class", "row message-body"); msgdiv.setAttribute("class", "row message-body");
@ -312,11 +343,12 @@ function sendMsg(){
<span class="message-text"><b>${receiverID} : </b><br/>${msg} <span class="message-text"><b>${receiverID} : </b><br/>${msg}
</span> </span>
<span class="message-time pull-right"> <span class="message-time pull-right">
Time ${getTime(time)}
</span> </span>
</div> </div>
</div>`; </div>`;
disp.appendChild(msgdiv); disp.appendChild(msgdiv);
storeMsg({time:time,floID:receiverID,text:msg,type:"S"});
//send_check = 1; //send_check = 1;
//recursion_called = 0; //recursion_called = 0;
//addSentChat(msg.substring(2+msgArray[0].length+msgArray[1].length),timer,msgArray[0]); //addSentChat(msg.substring(2+msgArray[0].length+msgArray[1].length),timer,msgArray[0]);

2
index.html
View File

@ -14,7 +14,7 @@
</head> </head>
<body> <body onload = "userDataStartUp();">
<div class="container app"> <div class="container app">
<div class="row app-one"> <div class="row app-one">

4
registerID.js
View File

@ -1,6 +1,6 @@
const mainnet = `https://livenet.flocha.in`; const mainnet = `http://ranchimall.duckdns.org:8080`;
const testnet = `https://testnet.flocha.in`; const testnet = `http://ranchimall1.duckdns.org:8080`;
let server = mainnet; let server = mainnet;
const sendAmt = 0.001 ; const sendAmt = 0.001 ;

1
styles.css
View File

@ -393,6 +393,7 @@ body {
} }
.sender { .sender {
float: right;
width: auto !important; width: auto !important;
height: auto; height: auto;
background: gray; background: gray;