Fix (contacts page style, extra js contacts.js, view token word in generate token page) #37
Conversation
|
Can you resolve the conflicts? |
|
The title and the screenshot in the first comment don't seem to be about the CSS of the contacts list that is described in #36 - can you align both of them? |
|
@michielbdejong it was related to the CSS that missing from style.css. I already commit them and PR is merged here https://github.com/pondersource/oc-sciencemesh/pull/37/files#diff-1fc556f95754ee7e33d91044125c44bb9f750c99be4406756ffb27413adfcaf5 |
|
Thanks for resolving the merge conflict; still, getting back to #37 (comment) ... |
js/contacts.js
Outdated
| console.log(response) | ||
| //alert('The token is invalid') | ||
| }); | ||
| document.getElementById('elem').onclick = function () { |
There was a problem hiding this comment.
Why are you adding this here? What does it do?
I think this is code from accept.js that accidentally ended up in contacts.js
I removed it in https://github.com/pondersource/oc-sciencemesh/pull/35/files#diff-865e798ad64e5c4f552f82b73ce546ec3f2150da625ad60bb83db07c0e2d03ccL60-L68
But now you're adding it back, so that looks like you incorrectly resolved the merge conflict, probably?
|
|
I still see the title of this PR as "Frontend"? |
parhamin2010
changed the title
|
|
There was a problem hiding this comment.
CSS looks good!
Why is Marie showing up twice in the list?
The sentence "List of contacts that you were add them inside the cloud servers" doesn't make sense to me. I don't know what "the cloud servers" are, and there seem to be two verbs "were add". I think what you mean is "List of contacts inside remote servers that you added". But maybe a better phrasing would be "List of your ScienceMesh contacts", can you update that?
Fix #36
Fix view token word here