diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index 261eeb9..0000000
--- a/LICENSE
+++ /dev/null
@@ -1,201 +0,0 @@
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
diff --git a/app.js b/app.js
index da11e2e..55fcec1 100644
--- a/app.js
+++ b/app.js
@@ -1,737 +1,197 @@
-var displayAddress = "oKv51tWdZWJyMJfVCtQoTo2FxrPicPtWbe";
-var floidToOnion = {};
window.indexedDB = window.indexedDB || window.mozIndexedDB || window.webkitIndexedDB || window.msIndexedDB;
-
-window.IDBTransaction = window.IDBTransaction || window.webkitIDBTransaction ||
-window.msIDBTransaction;
-window.IDBKeyRange = window.IDBKeyRange ||
-window.webkitIDBKeyRange || window.msIDBKeyRange
+window.IDBTransaction = window.IDBTransaction || window.webkitIDBTransaction || window.msIDBTransaction;
+window.IDBKeyRange = window.IDBKeyRange || window.webkitIDBKeyRange || window.msIDBKeyRange;
if (!window.indexedDB) {
window.alert("Your browser doesn't support a stable version of IndexedDB.")
}
+contacts = []
+
function convertStringToInt(string){
return parseInt(string,10);
}
-let ajax = function (uri, params, req_type, callback) {
- let url = `https://testnet.flocha.in/${uri}`;
-
- let response = {};
- var http = new XMLHttpRequest();
- http.open(req_type, url, true);
+function userDataStartUp(){
+ console.log("StartUp");
+ getDatafromAPI().then(function (res) {
+ console.log(res);
+ }).catch(function (error) {
+ console.log(error.message);
+ });
- http.onreadystatechange = function () {
- if (http.readyState == 4 && http.status == 200) {
- response.success = true;
- response.data = http.responseText;
- callback(response.data);
- } else {
- response.success = false;
- }
- }
+ function storedata(data){
+ return new Promise(
+ function(resolve, reject) {
+ var idb = indexedDB.open("FLO_Chat");
+ idb.onerror = function(event) {
+ console.log("Error in opening IndexedDB!");
+ };
+ idb.onsuccess = function(event) {
+ var db = event.target.result;
+ var obs = db.transaction('contacts', "readwrite").objectStore('contacts');
+ objectRequest = obs.put(data);
+ objectRequest.onerror = function(event) {
+ reject(Error('Error occured: Unable to store data'));
+ };
- http.send(params);
- }
+ objectRequest.onsuccess = function(event) {
+ resolve('Data saved OK');
+ db.close();
+ };
+ };
+ }
+ );
+ }
-function getTotalPages(address){
- var uri = "api/txs/?address="+address;
- try {
- let res = ajax(uri, null, 'GET', function (response) {
- try {
- let data = JSON.parse(response);
- getTransactionsByPage(address,convertStringToInt(data["pagesTotal"]+''));
- } catch (error) {
- console.log(error);
- }
- });
- } catch (error) {
- console.error(error);
- }
-}
-
-function getTransactionsByPage(address,totalPages){
- var cnt = 0;
- for(var i=0;i/g, ">");
- //console.log(msg);
- var message = buildMessageReceived(msg,moment().format('h:mm A'));
- if(msgArray[2] === recipientId){
- conversation.appendChild(message);
- //add blue tick to the sender of received message
}
- else{
- //implement badge unread message
- var contactListElement = document.getElementById('contact-list');
- //console.log(typeof contactListElement.innerHTML);
- var items = contactListElement.getElementsByTagName('li');
- var itemsLen = items.length;
- for(var i=0;i/g, ">");
- //console.log(input.value);
- var message = buildUnSentMessage(input.value,moment().format('h:mm A')); //Need to change span tag of build
- console.log(message);
- console.log("APPENDED",message);
- conversation.appendChild(message);
- //animateMessage(message);
- console.log("Network Status",isNetwork);
- temp_input = input.value;
- if(isNetwork === 0){
- console.log("Network Status Offline");
- addUnsentChat(temp_input,timing,recipientId);
- input.value = '';
- conversation.scrollTop = conversation.scrollHeight;
- e.preventDefault();
- return;
- }
- //websocket.send(input.value);
- /*recipient_websocket.onopen = function(event){
- recipient_websocket.send(recipientId+" "+floId+" "+temp_input);
- //recipient_websocket.close();
- }
- recipient_websocket.onerror = function(event){
- console.log("Message Not Sent To Recipient!Try Again!");
- }*/
- recursion_called = 0;
- sendMessage(recipientId+" "+floId+" "+temp_input,timing,message);
- }
- input.value = '';
- conversation.scrollTop = conversation.scrollHeight;
-
- e.preventDefault();
- }
-
- function sendMessage(msg,timer,message){
- // Wait until the state of the socket is not ready and send the message when it is...
- var msgArray = msg.split(' ');
- var ws,send_check = 0;
- console.log('check');
- if(msgArray[0] === "id2")
- ws = new WebSocket("ws://"+floidToOnion[msgArray[0]]+":8000/ws");
- else
- ws = new WebSocket("ws://"+floidToOnion[msgArray[0]]+"/ws");
-
- ws.onopen = function(evt){
- console.log('open');
- ws.send(msg);
- send_check = 1;
- recursion_called = 0;
- addSentChat(msg.substring(2+msgArray[0].length+msgArray[1].length),timer,msgArray[0]);
- addTick(message);
- }
- ws.onclose = function(evt){
- console.log("connection closed");
- if(network === 1 && send_check === 0 && recursion_called <= 5){
- recursion_called++;
- sendMessage(msg,timer,message);
- return;
- }
- addUnsentChat(msg.substring(2+msgArray[0].length+msgArray[1].length),timer,msgArray[0]);
- }
- ws.onerror = function(evt){
- console.log('error');
- if(isNetwork === 1 && send_check === 0 && recursion_called <= 5){
- recursion_called++;
- sendMessage(msg,timer,message);
- return;
- }
- addUnsentChat(msg.substring(2+msgArray[0].length+msgArray[1].length),timer,msgArray[0]);
- //conversation.innerHTML = "";
- //readFromDb(msgArray[0]);
- }
-}
-
- function buildUnSentMessage(text,time) {
- var element = document.createElement('div');
- timing = time;
- element.classList.add('message', 'sent');
-
- element.innerHTML = text +
- '' +
- '' + time + '' + '';
-
- return element;
- }
-
- function buildMessageSent(text,time) {
- var element = document.createElement('div');
- timing = time;
- element.classList.add('message', 'sent');
-
- element.innerHTML = text +
- '' +
- '' + time + '' +
- '' +
- '' +
- '' +
- '' +
- '';
-
- return element;
- }
-
- function buildMessageReceived(text,time) {
- var element = document.createElement('div');
- timing = time;
- element.classList.add('message', 'received');
-
- element.innerHTML = text +
- '' +
- '' + time + '' +
- '' +
- '' +
- '' +
- '' +
- '';
-
- return element;
- }
-
- function blueTickMessage(message) {
- setTimeout(function() {
- var tick = message.querySelector('.tick');
- tick.classList.remove('tick-animation');
- }, 500);
- }
-
- function addTick(message) {
- setTimeout(function() {
- var timerElement = message.querySelector('.unsend_msg');
- timerElement.outerHTML = '' +
- '' +
- '' +
- '' +
- '';
- //tick.classList.remove('tick-animation');
- }, 500);
- }
-
- window.addEventListener('online', function(e) {
- console.log('And we\'re back :).');
- //conversation.innerHTML = "";
- if(recipientId !== '' && recipientId !== undefined){
- addNetworkStatusOfRecipient(recipientId);
- readFromDb(recipientId);
- }
- //makeOnline();
- isNetwork = 1;
- //alert('You Have Been Disconnected!');
- //window.location.href = floidToOnion[floId];
- }, false);
-
- window.addEventListener('offline', function(e) {
- console.log('Connection is down.');
- //makeOffline();
- if(recipientId !== '' && recipientId !== undefined)
- document.getElementsByClassName('status')[0].innerHTML = "Unknown";
- isNetwork = 0;
- }, false);
-
- function makeOnline(){
- console.log(document.getElementsByClassName('status')[0]);
- document.getElementsByClassName('status')[0].innerHTML = "Online";
- }
-
- function makeOffline(){
- document.getElementsByClassName('status')[0].innerHTML = "Offline";
- }
-
- //window.addEventListener("load", init, false);
-
+ );
}
+getuserID();
\ No newline at end of file
diff --git a/app2.js b/app2.js
new file mode 100644
index 0000000..b765aca
--- /dev/null
+++ b/app2.js
@@ -0,0 +1,734 @@
+var displayAddress = "F6LUnwRRjFuEW97Y4av31eLqqVMK9FrgE2";
+var floidToOnion = {};
+
+window.indexedDB = window.indexedDB || window.mozIndexedDB || window.webkitIndexedDB || window.msIndexedDB;
+window.IDBTransaction = window.IDBTransaction || window.webkitIDBTransaction || window.msIDBTransaction;
+window.IDBKeyRange = window.IDBKeyRange || window.webkitIDBKeyRange || window.msIDBKeyRange;
+
+if (!window.indexedDB) {
+ window.alert("Your browser doesn't support a stable version of IndexedDB.")
+}
+
+function convertStringToInt(string){
+ return parseInt(string,10);
+}
+
+let ajax = function (uri, params, req_type, callback) {
+ let url = `https://livenet.flocha.in/${uri}`;
+
+ let response = {};
+ var http = new XMLHttpRequest();
+ http.open(req_type, url, true);
+
+ http.onreadystatechange = function () {
+ if (http.readyState == 4 && http.status == 200) {
+ response.success = true;
+ response.data = http.responseText;
+ callback(response.data);
+ } else {
+ response.success = false;
+ }
+ }
+
+ http.send(params);
+ }
+
+function getTotalPages(address){
+ var uri = "api/txs/?address="+address;
+ try {
+ let res = ajax(uri, null, 'GET', function (response) {
+ try {
+ let data = JSON.parse(response);
+ getTransactionsByPage(address,convertStringToInt(data["pagesTotal"]+''));
+ } catch (error) {
+ console.log(error);
+ }
+ });
+ } catch (error) {
+ console.error(error);
+ }
+}
+
+function getTransactionsByPage(address,totalPages){
+ var cnt = 0;
+ for(var i=0;i/g, ">");
+ //console.log(msg);
+ var message = buildMessageReceived(msg,moment().format('h:mm A'));
+ if(msgArray[2] === recipientId){
+ conversation.appendChild(message);
+ //add blue tick to the sender of received message
+ }
+ else{
+ //implement badge unread message
+ var contactListElement = document.getElementById('contact-list');
+ //console.log(typeof contactListElement.innerHTML);
+ var items = contactListElement.getElementsByTagName('li');
+ var itemsLen = items.length;
+ for(var i=0;i/g, ">");
+ //console.log(input.value);
+ var message = buildUnSentMessage(input.value,moment().format('h:mm A')); //Need to change span tag of build
+ console.log(message);
+ console.log("APPENDED",message);
+ conversation.appendChild(message);
+ //animateMessage(message);
+ console.log("Network Status",isNetwork);
+ temp_input = input.value;
+ if(isNetwork === 0){
+ console.log("Network Status Offline");
+ addUnsentChat(temp_input,timing,recipientId);
+ input.value = '';
+ conversation.scrollTop = conversation.scrollHeight;
+ e.preventDefault();
+ return;
+ }
+ //websocket.send(input.value);
+ /*recipient_websocket.onopen = function(event){
+ recipient_websocket.send(recipientId+" "+floId+" "+temp_input);
+ //recipient_websocket.close();
+ }
+ recipient_websocket.onerror = function(event){
+ console.log("Message Not Sent To Recipient!Try Again!");
+ }*/
+ recursion_called = 0;
+ sendMessage(recipientId+" "+floId+" "+temp_input,timing,message);
+ }
+ input.value = '';
+ conversation.scrollTop = conversation.scrollHeight;
+
+ e.preventDefault();
+ }
+
+ function sendMessage(msg,timer,message){
+ // Wait until the state of the socket is not ready and send the message when it is...
+ var msgArray = msg.split(' ');
+ var ws,send_check = 0;
+ console.log('check');
+ if(msgArray[0] === "id2")
+ ws = new WebSocket("ws://"+floidToOnion[msgArray[0]]+":8000/ws");
+ else
+ ws = new WebSocket("ws://"+floidToOnion[msgArray[0]]+"/ws");
+
+ ws.onopen = function(evt){
+ console.log('open');
+ ws.send(msg);
+ send_check = 1;
+ recursion_called = 0;
+ addSentChat(msg.substring(2+msgArray[0].length+msgArray[1].length),timer,msgArray[0]);
+ addTick(message);
+ }
+ ws.onclose = function(evt){
+ console.log("connection closed");
+ if(network === 1 && send_check === 0 && recursion_called <= 5){
+ recursion_called++;
+ sendMessage(msg,timer,message);
+ return;
+ }
+ addUnsentChat(msg.substring(2+msgArray[0].length+msgArray[1].length),timer,msgArray[0]);
+ }
+ ws.onerror = function(evt){
+ console.log('error');
+ if(isNetwork === 1 && send_check === 0 && recursion_called <= 5){
+ recursion_called++;
+ sendMessage(msg,timer,message);
+ return;
+ }
+ addUnsentChat(msg.substring(2+msgArray[0].length+msgArray[1].length),timer,msgArray[0]);
+ //conversation.innerHTML = "";
+ //readFromDb(msgArray[0]);
+ }
+}
+
+ function buildUnSentMessage(text,time) {
+ var element = document.createElement('div');
+ timing = time;
+ element.classList.add('message', 'sent');
+
+ element.innerHTML = text +
+ '' +
+ '' + time + '' + '';
+
+ return element;
+ }
+
+ function buildMessageSent(text,time) {
+ var element = document.createElement('div');
+ timing = time;
+ element.classList.add('message', 'sent');
+
+ element.innerHTML = text +
+ '' +
+ '' + time + '' +
+ '' +
+ '' +
+ '' +
+ '' +
+ '';
+
+ return element;
+ }
+
+ function buildMessageReceived(text,time) {
+ var element = document.createElement('div');
+ timing = time;
+ element.classList.add('message', 'received');
+
+ element.innerHTML = text +
+ '' +
+ '' + time + '' +
+ '' +
+ '' +
+ '' +
+ '' +
+ '';
+
+ return element;
+ }
+
+ function blueTickMessage(message) {
+ setTimeout(function() {
+ var tick = message.querySelector('.tick');
+ tick.classList.remove('tick-animation');
+ }, 500);
+ }
+
+ function addTick(message) {
+ setTimeout(function() {
+ var timerElement = message.querySelector('.unsend_msg');
+ timerElement.outerHTML = '' +
+ '' +
+ '' +
+ '' +
+ '';
+ //tick.classList.remove('tick-animation');
+ }, 500);
+ }
+
+ window.addEventListener('online', function(e) {
+ console.log('And we\'re back :).');
+ //conversation.innerHTML = "";
+ if(recipientId !== '' && recipientId !== undefined){
+ addNetworkStatusOfRecipient(recipientId);
+ readFromDb(recipientId);
+ }
+ //makeOnline();
+ isNetwork = 1;
+ //alert('You Have Been Disconnected!');
+ //window.location.href = floidToOnion[floId];
+ }, false);
+
+ window.addEventListener('offline', function(e) {
+ console.log('Connection is down.');
+ //makeOffline();
+ if(recipientId !== '' && recipientId !== undefined)
+ document.getElementsByClassName('status')[0].innerHTML = "Unknown";
+ isNetwork = 0;
+ }, false);
+
+ function makeOnline(){
+ console.log(document.getElementsByClassName('status')[0]);
+ document.getElementsByClassName('status')[0].innerHTML = "Online";
+ }
+
+ function makeOffline(){
+ document.getElementsByClassName('status')[0].innerHTML = "Offline";
+ }
+
+ //window.addEventListener("load", init, false);
+
+}
diff --git a/index.html b/index.html
index 4d43cdf..1a5abf5 100644
--- a/index.html
+++ b/index.html
@@ -83,6 +83,7 @@
+