Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/emoji on comment area #6422

Merged
merged 8 commits into from
Apr 22, 2020

Conversation

dzuqe
Copy link
Contributor

@dzuqe dzuqe commented Apr 12, 2020

Description

I created a feature that enables users to post emojis on their comment to an activity

Refers/Fixes

#6035

Testing

Before:
https://imgur.com/a/x4EptXu

After:
https://streamable.com/ujhflw

@codecov
Copy link

codecov bot commented Apr 12, 2020

Codecov Report

Merging #6422 into master will increase coverage by 0.02%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #6422      +/-   ##
==========================================
+ Coverage   27.22%   27.24%   +0.02%     
==========================================
  Files         289      289              
  Lines       26378    26378              
  Branches     3909     3909              
==========================================
+ Hits         7182     7188       +6     
+ Misses      18929    18923       -6     
  Partials      267      267              
Impacted Files Coverage Δ
app/dashboard/embed.py 31.60% <0.00%> (+3.44%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 8eca869...5312f20. Read the comment docs.

@@ -79,6 +79,10 @@ a .sup {
.action.open {
background-color: #eeeeee;
}
.emoji-container,
.comment-area{
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need set the .comment-area to top:0 ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No we didn't, I have since removed the rule and a few others that weren't necessary within inline css.

$(document).on('click', '.emoji_button', function(e) {
e.preventDefault();
var commentArea = $(this).parents('.comment-area')[0];
var emojiContainer = $(this).parents('.emoji-container')[0];
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

^ const

Copy link
Member

@thelostone-mc thelostone-mc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Left a few comments + questions
Apart from that this looks close to completion

…ner styling; remove inline css on js; replace var with const on js;
@dzuqe
Copy link
Contributor Author

dzuqe commented Apr 13, 2020

I've made the requested changes.

Copy link
Contributor

@octavioamu octavioamu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just left a comment, good work

app/assets/v2/js/activity.js Outdated Show resolved Hide resolved
@dzuqe
Copy link
Contributor Author

dzuqe commented Apr 18, 2020

I have changed the duplicate variable name to a more precise name activityCommentTextArea

Copy link
Contributor

@danlipert danlipert left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks pretty good - if you can remove the css style changes then should be good to merge. One question: why do some emojis show up in color and others do not?

@@ -5,26 +5,33 @@
background-color: #ecf0f4;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In general, please do not include arbitrary style changes in PRs as it makes it difficult to do a code review. Please limit your changes to the feature or fix thats described in the PR description - if you want to do a style fix PR, you can submit it separately.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've removed the code style changes and left only changes I've made for the feature. I will follow this rule of thumb from now onwards.

dzuqe added 2 commits April 21, 2020 18:57
…i-container styling; remove inline css on js; replace var with const on js;"

This reverts commit 5551dbc.

undo code style changes
@dzuqe
Copy link
Contributor Author

dzuqe commented Apr 21, 2020

I've made the requested changes. The emojis do have colors, I just had a terrible install of a Fedora Virtual Machine. Was pretty slow too, haha. I've since installed another flavor of Linux straight on the hdd. See video for color emojis https://streamable.com/cxrlp4

@danlipert
Copy link
Contributor

@hydr063n very good work, appreciate the fixes. classic linux lacking emoji support ;)

@thelostone-mc thelostone-mc merged commit 8bcf4bf into gitcoinco:master Apr 22, 2020
@dzuqe dzuqe deleted the feature/emoji-on-comment-area branch December 6, 2020 02:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants