From 08b3c3a460c4c334c4cc819a48b69134198b580b Mon Sep 17 00:00:00 2001 From: parham R Date: Wed, 11 Jan 2023 21:04:13 +0330 Subject: [PATCH 1/8] fix https://github.com/pondersource/oc-sciencemesh/issues/36 --- css/style.css | 31 +++++++++++++++++++ js/contacts.js | 81 +++++++++++++++++++++++++------------------------- 2 files changed, 71 insertions(+), 41 deletions(-) diff --git a/css/style.css b/css/style.css index 57470d1..cb842e2 100644 --- a/css/style.css +++ b/css/style.css @@ -133,3 +133,34 @@ text-align: center; border-radius: 100%; } + + + +#elem{ + padding: 5px; +} + +#elem:hover{ + background-color: #00000011; + padding: 5px; +} + + +.text-error{ + color:red !important; +} + +.text-success{ + color: green !important; +} + +.profile-item{ + display: inline-flex; + width: 100%; +} + + +.profile-item-username{ + width: 100%; + padding: 0px 5px; +} \ No newline at end of file diff --git a/js/contacts.js b/js/contacts.js index a89c207..f0d5c6b 100644 --- a/js/contacts.js +++ b/js/contacts.js @@ -8,51 +8,50 @@ $.ajax({ }).done(function (response) { if(response === '' || response === false) { var element = document.getElementById("test_error"); - element.innerHTML= 'No connection with reva'; + element.innerHTML= 'No Sciencemesh Connection'; $('#test_error').show(); } else { - let token = JSON.parse(response); - for(tokenData in token) { - if(token.hasOwnProperty(tokenData)) { - console.log(tokenData); - if(tokenData === 'accepted_users') { - let accepted_users = token.accepted_users - for(accept in accepted_users) { - const displayName = accepted_users[accept].display_name; - const username = accepted_users[accept].id.opaque_id; - const idp = accepted_users[accept].id.idp; - const provider = new URL(idp).host; - const result = ` -
-
- -
-
-

${displayName}

${username}@${provider}

-
-
`; - var element = document.getElementById("test_error"); - element.innerHTML = result; - } + let token = JSON.parse(response); + for(tokenData in token) { + if(token.hasOwnProperty(tokenData)) { + if(tokenData === 'accepted_users') { + let accepted_users = token.accepted_users + for(accept in accepted_users) { + const displayName = accepted_users[accept].display_name; + const username = accepted_users[accept].id.opaque_id; + const idp = accepted_users[accept].id.idp; + const provider = new URL(idp).host; + const result = ` +
+
+ +
+
+

${displayName}

${username}@${provider}

+
+
`; + var element = document.getElementById("test_error"); + element.innerHTML = result; + // } - $('#test_error').show(); - }else{ - const result = ` -
-
-
-
-

There're no contacts!

-
-
`; - var element = document.getElementById("test"); - element.innerHTML = result; - $('#test_error').show(); + $('#test_error').show(); + }else{ + const result = ` +
+
+
+
+

There're no contacts!

+
+
`; + var element = document.getElementById("test"); + element.innerHTML = result; + $('#test_error').show(); - } - } + } + } + } } -} }).fail(function (response, code) { console.log(response) //alert('The token is invalid') @@ -76,7 +75,7 @@ document.getElementById('elem').onclick = function () { if(response === '' || response === false) { var element = document.getElementById("test_error"); - element.innerHTML= 'No connection with reva'; + element.innerHTML= 'No Sciencemesh Connection'; } else { let result = JSON.parse(response); if(result.hasOwnProperty('message')) { From 5d4a5803bc229a39e38f81b1ea1777cea7747f3b Mon Sep 17 00:00:00 2001 From: parham R Date: Wed, 11 Jan 2023 21:09:10 +0330 Subject: [PATCH 2/8] fix https://github.com/pondersource/oc-sciencemesh/issues/36 --- js/generate.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/generate.js b/js/generate.js index afea0ed..b318a4e 100644 --- a/js/generate.js +++ b/js/generate.js @@ -15,7 +15,7 @@ document.addEventListener("DOMContentLoaded", function(event) { element.innerHTML = 'No connection with reva'; } else { var element = document.getElementById("show_result"); - element.innerHTML = `

New Token Generated!

Verify Token
`; + element.innerHTML = `

New Token Generated!

View Token
`; $('#test').show(); } }).fail(function (response, code) { From 23243645b52822012ab38c0a7f85c9902a3c4c14 Mon Sep 17 00:00:00 2001 From: parham R Date: Wed, 11 Jan 2023 21:10:13 +0330 Subject: [PATCH 3/8] fix https://github.com/pondersource/oc-sciencemesh/issues/36 --- js/contacts.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/contacts.js b/js/contacts.js index f0d5c6b..fa1364d 100644 --- a/js/contacts.js +++ b/js/contacts.js @@ -32,7 +32,7 @@ $.ajax({ `; var element = document.getElementById("test_error"); element.innerHTML = result; - // } + } $('#test_error').show(); }else{ From 102653186fab85f61c73555d77fc797f8f5481cf Mon Sep 17 00:00:00 2001 From: parham R Date: Fri, 13 Jan 2023 13:44:56 +0330 Subject: [PATCH 4/8] fix https://github.com/pondersource/oc-sciencemesh/pull/37 --- css/style.css | 9 ++-- js/contacts.js | 129 +++++++++++++++++-------------------------------- 2 files changed, 50 insertions(+), 88 deletions(-) diff --git a/css/style.css b/css/style.css index cb842e2..c27252b 100644 --- a/css/style.css +++ b/css/style.css @@ -125,13 +125,14 @@ } .app-content-list-item-icon{ - width: 20px; - height: 20px; + width: 30px; + height: 30px; margin: 10px; - color: white; font-size: large; text-align: center; border-radius: 100%; + padding: 3.3px; + border: 1px solid #0002; } @@ -162,5 +163,5 @@ .profile-item-username{ width: 100%; - padding: 0px 5px; + padding: 3px 10px; } \ No newline at end of file diff --git a/js/contacts.js b/js/contacts.js index 0515cc4..bfe50cc 100644 --- a/js/contacts.js +++ b/js/contacts.js @@ -1,99 +1,60 @@ document.addEventListener("DOMContentLoaded", function(event) { //Everything will be for working with contacts -var baseUrl = OC.generateUrl('/apps/sciencemesh'); -$('#test_error').hide(); -$.ajax({ - url: baseUrl + '/contacts/users', - type: 'GET', - contentType: 'application/json', -}).done(function (response) { - if(response === '' || response === false) { - var element = document.getElementById("test_error"); - element.innerHTML= 'No Sciencemesh Connection'; - $('#test_error').show(); - } else { - let token = JSON.parse(response); - for(tokenData in token) { - if(token.hasOwnProperty(tokenData)) { - if(tokenData === 'accepted_users') { - let accepted_users = token.accepted_users - for(accept in accepted_users) { - const displayName = accepted_users[accept].display_name; - const username = accepted_users[accept].id.opaque_id; - const idp = accepted_users[accept].id.idp; - const provider = new URL(idp).host; - const result = ` -
-
- -
-
-

${displayName}

${username}@${provider}

-
-
`; - var element = document.getElementById("test_error"); - element.innerHTML = result; - } - - $('#test_error').show(); - }else{ - const result = ` -
-
-
-
-

There're no contacts!

-
-
`; - var element = document.getElementById("test"); - element.innerHTML = result; - $('#test_error').show(); - - } - } - } - } -}).fail(function (response, code) { - console.log(response) - //alert('The token is invalid') -}); -document.getElementById('elem').onclick = function () { - console.log('clicked'); - var parts = document.getElementById('token').value.split('@'); - var token = parts[0]; - var providerDomain = parts[1]; - - var data = 'providerDomain=' + encodeURIComponent(providerDomain) + - '&token=' + encodeURIComponent(token); - var baseUrl = OC.generateUrl('/apps/sciencemesh'); + $('#test_error').hide(); $.ajax({ - url: baseUrl + '/contacts/accept', - type: 'POST', - contentType: 'application/x-www-form-urlencoded', - data: data + url: baseUrl + '/contacts/users', + type: 'GET', + contentType: 'application/json', }).done(function (response) { - - if(response === '' || response === false) { + if(response === '' || response === false) { var element = document.getElementById("test_error"); element.innerHTML= 'No Sciencemesh Connection'; + $('#test_error').show(); } else { - let result = JSON.parse(response); - if(result.hasOwnProperty('message')) { - let test = result.message - var element = document.getElementById("test_error"); - element.innerHTML=test; + let token = JSON.parse(response); + for(tokenData in token) { + if(token.hasOwnProperty(tokenData)) { + if(tokenData === 'accepted_users') { + let accepted_users = token.accepted_users + for(accept in accepted_users) { + const displayName = accepted_users[accept].display_name; + const username = accepted_users[accept].id.opaque_id; + const idp = accepted_users[accept].id.idp; + const provider = new URL(idp).host; + const result = ` +
+
+ +
+
+

${displayName}

${username}@${provider}

+
+
`; + var element = document.getElementById("test_error"); + element.innerHTML = result; + } + + $('#test_error').show(); + }else{ + const result = ` +
+
+
+
+

There're no contacts!

+
+
`; + var element = document.getElementById("test"); + element.innerHTML = result; + $('#test_error').show(); - $('#provider').hide(); - $('#display_name').hide(); - } else { - console.log(result) + } + } } } - }).fail(function (response, code) { console.log(response) //alert('The token is invalid') }); -}; -}); \ No newline at end of file +}) \ No newline at end of file From de7c81fdd79949978d1563c32c2c23bd0e71ff15 Mon Sep 17 00:00:00 2001 From: Michiel de Jong Date: Fri, 13 Jan 2023 11:35:54 +0000 Subject: [PATCH 5/8] undo indent --- js/contacts.js | 74 +++++++++++++++++++++++++------------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/js/contacts.js b/js/contacts.js index bfe50cc..5384c1b 100644 --- a/js/contacts.js +++ b/js/contacts.js @@ -12,45 +12,45 @@ document.addEventListener("DOMContentLoaded", function(event) { element.innerHTML= 'No Sciencemesh Connection'; $('#test_error').show(); } else { - let token = JSON.parse(response); - for(tokenData in token) { - if(token.hasOwnProperty(tokenData)) { - if(tokenData === 'accepted_users') { - let accepted_users = token.accepted_users - for(accept in accepted_users) { - const displayName = accepted_users[accept].display_name; - const username = accepted_users[accept].id.opaque_id; - const idp = accepted_users[accept].id.idp; - const provider = new URL(idp).host; - const result = ` -
-
- -
-
-

${displayName}

${username}@${provider}

-
-
`; - var element = document.getElementById("test_error"); - element.innerHTML = result; - } + let token = JSON.parse(response); + for(tokenData in token) { + if(token.hasOwnProperty(tokenData)) { + if(tokenData === 'accepted_users') { + let accepted_users = token.accepted_users + for(accept in accepted_users) { + const displayName = accepted_users[accept].display_name; + const username = accepted_users[accept].id.opaque_id; + const idp = accepted_users[accept].id.idp; + const provider = new URL(idp).host; + const result = ` +
+
+ +
+
+

${displayName}

${username}@${provider}

+
+
`; + var element = document.getElementById("test_error"); + element.innerHTML = result; + } - $('#test_error').show(); - }else{ - const result = ` -
-
-
-
-

There're no contacts!

-
-
`; - var element = document.getElementById("test"); - element.innerHTML = result; - $('#test_error').show(); + $('#test_error').show(); + }else{ + const result = ` +
+
+
+
+

There are no contacts!

+
+
`; + var element = document.getElementById("show_result"); + element.innerHTML = result; + $('#test_error').show(); - } - } + } + } } } }).fail(function (response, code) { From 546f81f6cf7acdf10be74bceb5a0a97a56967d36 Mon Sep 17 00:00:00 2001 From: Michiel de Jong Date: Fri, 13 Jan 2023 11:36:22 +0000 Subject: [PATCH 6/8] profile-item-img unused --- js/contacts.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/contacts.js b/js/contacts.js index 5384c1b..e1b2a98 100644 --- a/js/contacts.js +++ b/js/contacts.js @@ -24,7 +24,7 @@ document.addEventListener("DOMContentLoaded", function(event) { const provider = new URL(idp).host; const result = `
-
+
From 0ea2996f99e6c5705bdb9c48960b7f0d785085e4 Mon Sep 17 00:00:00 2001 From: Michiel de Jong Date: Fri, 13 Jan 2023 11:36:54 +0000 Subject: [PATCH 7/8] bring back semicolon --- js/contacts.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/contacts.js b/js/contacts.js index e1b2a98..298c66f 100644 --- a/js/contacts.js +++ b/js/contacts.js @@ -57,4 +57,4 @@ document.addEventListener("DOMContentLoaded", function(event) { console.log(response) //alert('The token is invalid') }); -}) \ No newline at end of file +}); \ No newline at end of file From 34b9b7710c3ea876fac955f7a0e236242990072f Mon Sep 17 00:00:00 2001 From: Michiel de Jong Date: Fri, 13 Jan 2023 11:40:29 +0000 Subject: [PATCH 8/8] Minimize diff --- js/contacts.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/js/contacts.js b/js/contacts.js index 298c66f..3dbfbc0 100644 --- a/js/contacts.js +++ b/js/contacts.js @@ -15,6 +15,7 @@ document.addEventListener("DOMContentLoaded", function(event) { let token = JSON.parse(response); for(tokenData in token) { if(token.hasOwnProperty(tokenData)) { + console.log(tokenData); if(tokenData === 'accepted_users') { let accepted_users = token.accepted_users for(accept in accepted_users) { @@ -51,8 +52,8 @@ document.addEventListener("DOMContentLoaded", function(event) { } } - } } + } }).fail(function (response, code) { console.log(response) //alert('The token is invalid')