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

added Bootstrap to editor #7534

Merged
merged 5 commits into from Mar 16, 2020
Merged

Conversation

keshav234156
Copy link
Member

Fixes #7532

Make sure these boxes are checked before your pull request (PR) is ready to be reviewed and merged. Thanks!

  • PR is descriptively titled 📑 and links the original issue above 🔗
  • tests pass -- look for a green checkbox ✔️ a few minutes after opening your PR -- or run tests locally with rake test
  • code is in uniquely-named feature branch and has no merge conflicts 📁
  • screenshots/GIFs are attached 📎 in case of UI updation
  • ask @publiclab/reviewers for help, in a comment below

We're happy to help you get this ready -- don't be afraid to ask for help, and don't be discouraged if your tests fail at first!

If tests do fail, click on the red X to learn why by reading the logs.

Please be sure you've reviewed our contribution guidelines at https://publiclab.org/contributing-to-public-lab-software

Thanks!

@keshav234156 keshav234156 requested a review from a team as a code owner February 18, 2020 14:29
@keshav234156
Copy link
Member Author

@VladimirMikulic @jywarren Please review!!!

@keshav234156
Copy link
Member Author

Screenshot from 2020-02-18 14-00-36
Screenshot from 2020-02-18 14-00-28
Screenshot from 2020-02-18 14-00-23

@keshav234156
Copy link
Member Author

The toolbar is now consistent and code,quote styles are working

@codecov
Copy link

codecov bot commented Feb 18, 2020

Codecov Report

Merging #7534 into master will decrease coverage by 4.8%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #7534      +/-   ##
==========================================
- Coverage   81.87%   77.07%   -4.81%     
==========================================
  Files          97       97              
  Lines        5612     5718     +106     
==========================================
- Hits         4595     4407     -188     
- Misses       1017     1311     +294
Impacted Files Coverage Δ
app/controllers/users_controller.rb 71.18% <100%> (-10.93%) ⬇️
app/controllers/openid_controller.rb 0% <0%> (-53.85%) ⬇️
app/controllers/comment_controller.rb 72.34% <0%> (-14.9%) ⬇️
app/models/comment.rb 68.96% <0%> (-7.94%) ⬇️
app/controllers/application_controller.rb 84.61% <0%> (-7.7%) ⬇️
app/controllers/home_controller.rb 91.93% <0%> (-6.46%) ⬇️
app/controllers/admin_controller.rb 72.15% <0%> (-5.91%) ⬇️
app/services/execute_search.rb 88.88% <0%> (-5.56%) ⬇️
app/api/srch/search.rb 65.35% <0%> (-3.93%) ⬇️
... and 5 more

@plotsbot
Copy link
Collaborator

plotsbot commented Feb 18, 2020

1 Warning
⚠️ There was an error with Danger bot’s Junit parsing: No JUnit file was found at output.xml
3 Messages
📖 @keshav234156 Thank you for your pull request! I’m here to help with some tips and recommendations. Please take a look at the list provided and help us review and accept your contribution! And don’t be discouraged if you see errors – we’re here to help.
📖 It looks like you haven’t marked all the checkboxes. Help us review and accept your suggested changes by going through the steps one by one. If it is still a ‘Work in progress’, please include ‘[WIP]’ in the title.
📖 #
Screenshots 📸 (click to expand)

7534-test_questions.png

7534-test_embeddable_grids.png

7534-test_signup.png

7534-test_viewing_the_settings_page.png

7534-test_tag_by_author_page.png

7534-test_wiki_page_with_inline_grids.png

7534-test_stats.png

7534-test_viewing_the_dashboard.png

7534-test_searching_an_item_from_the_homepage.png

7534-test_signup_modal_form_validation.png

7534-test_tag_stats.png

7534-test_login_modal_form_validation.png

7534-test_questions_shadow.png

7534-test_login_modal.png

7534-test_profile_page.png

7534-test_comments.png

7534-test_tags.png

7534-test_signup_modal.png

7534-test_wiki.png

7534-test_methods.png

7534-test_tag_page.png

7534-test_blog_page_with_location_modal.png

7534-test_tag_wildcard.png

7534-test_signup_modal_disabled_submit_button_on_empty_username.png

7534-test_embeddable_thumbnail_grids.png

7534-test_front_page_with_navbar_search_autocomplete.png

7534-test_spam_moderation_page.png

7534-test_login.png

7534-test_viewing_the_dropdown_menu.png

7534-test_viewing_question_post.png

7534-test_mobile_displays.png

7534-test_simple-data-grapher_powertag.png

7534-test_front.png

7534-test_question_page.png

7534-test_tag_contributors_page.png

7534-test_blog.png

7534-failures_test_changing_and_reverting_versions_works_correctly_for_wiki.png

7534-test_people.png

7534-test_wiki_revisions.png

Learn about automated screenshots

Generated by 🚫 Danger

@VladimirMikulic
Copy link
Contributor

This works, but it breaks existing styles, like the bottom toolbar:

Screenshot_20200218_205610

@keshav234156
Copy link
Member Author

@VladimirMikulic Are you saying box is not appearing around ....It because of extra class that we are having btn-outline-secondary in https://github.com/publiclab/plots2/blob/master/app/views/editor/rich.html.erb#L295

@keshav234156
Copy link
Member Author

@VladimirMikulic why are test failing? Can you please tell the command to run the test of plots2 locally?

@VladimirMikulic
Copy link
Contributor

For some unknown reason, a test fails. I don't have admin access so I can't troubleshoot this further. The command for running tests is rails test.

@cesswairimu
Copy link
Collaborator

restarting travis

@keshav234156
Copy link
Member Author

@cesswairimu @VladimirMikulic this test is failing https://github.com/publiclab/plots2/blob/master/test/system/post_test.rb#L157 .Can you please help me to rectify why it's failing ?

@VladimirMikulic
Copy link
Contributor

@keshav234156 please read again my previous comment.

@cesswairimu
Copy link
Collaborator

@keshav234156 I don't think the travis failure has anything to do with your changes might be some of the travis inconsistency we are experiencing. Restarting travis again. Thanks

@keshav234156
Copy link
Member Author

@cesswairimu Travis inconsistency is still present. It failed first time when I restarted it. It passed the test after I restarted it again

@keshav234156
Copy link
Member Author

keshav234156 commented Mar 10, 2020

@VladimirMikulic Can you please re-review this and let me know inconsistencies present with respect to https://publiclab.org/post

@keshav234156
Copy link
Member Author

@cesswairimu Failed again

@keshav234156
Copy link
Member Author

restarting it again

@keshav234156
Copy link
Member Author

@cesswairimu It Passed!!

@VladimirMikulic
Copy link
Contributor

Hi @keshav234156.
Unfortunately, I don't have a local instance of the repo.

@cesswairimu
Copy link
Collaborator

🎉 🎉

@cesswairimu
Copy link
Collaborator

@keshav234156 which buttons did you change? Can we please see the before and after change? Thanks

@keshav234156
Copy link
Member Author

@cesswairimu
Before changes
Screenshot from 2020-02-22 22-34-47
After changes
Screenshot from 2020-03-05 21-54-44

@cesswairimu
Copy link
Collaborator

@keshav234156 I don't get it, changing the button improve the blockquoting?

@keshav234156
Copy link
Member Author

@cesswairimu As bootstrap was not included so styles for buttons and code,blockquote weren't appearing.so bootstrap is being added in the PR

@cesswairimu
Copy link
Collaborator

Thanks @keshav234156 for explaining all that :+1 this is ready 🎉

@cesswairimu cesswairimu merged commit 8a886f5 into publiclab:master Mar 16, 2020
@welcome
Copy link

welcome bot commented Mar 16, 2020

Congrats on merging your first pull request! 🙌🎉⚡️
Your code will likely be published to PublicLab.org in the next few days, but first it will be published to https://stable.publiclab.org/ (it will take some minutes for this to load, and until then you may see logs from the build process). Please test out your work on this testing server and report back with a comment that all has gone well!
Do join our weekly check-in to share your this week goal and the awesome work you did 😃. Please find the link pinned in the issue section 📝
Now that you've completed this, you can help someone else take their first step!
Reach out to someone else working on theirs on Public Lab's code welcome page (where you'll now be featured as a recent contributor!). Thanks!

Help others take their first step

Now that you've merged your first pull request, you're the perfect person to help someone else out with this challenging first step. 🙌

https://code.publiclab.org

Try looking at this list of `first-timers-only` issues, and see if someone else is waiting for feedback, or even stuck! 😕

People often get stuck at the same steps, so you might be able to help someone get unstuck, or help lead them to some documentation that'd help. Reach out and be encouraging and friendly! 😄 🎉

Read about how to help support another newcomer here, or find other ways to offer mutual support here.

@cesswairimu
Copy link
Collaborator

Welcome to PublicLab @keshav234156 🎈

@jywarren
Copy link
Member

Ah, thank you for the help! something weird happened here and we seem to be having some layout bugs now:

https://stable.publiclab.org/post

I'm going to open a new issue but we may have to do some part of this differently! No worries, we'll figure it out!

keshav234156 added a commit that referenced this pull request Mar 31, 2020
jywarren pushed a commit that referenced this pull request Mar 31, 2020
icarito pushed a commit that referenced this pull request Mar 31, 2020
* integrate editor n plots2

* added bootstrap

* added bootstrap

* removed previous changes

* removing inconsistancies
icarito pushed a commit that referenced this pull request Mar 31, 2020
@keshav234156 keshav234156 mentioned this pull request Apr 7, 2020
5 tasks
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.

Including Bootstrap in plots2/editor
5 participants