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

Dashboard initial design #6229

Closed
wants to merge 2 commits into from
Closed

Dashboard initial design #6229

wants to merge 2 commits into from

Conversation

gautamig54
Copy link
Contributor

Fixes #6072 (<=== Add issue number here)

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!

@gautamig54
Copy link
Contributor Author

gautamig54 commented Sep 1, 2019

The current screenshot :

Screen Shot 2019-09-01 at 6 34 47 PM

Screen Shot 2019-09-01 at 6 34 54 PM

We show the topic cards of the topics a user follows

@@ -0,0 +1,60 @@
<div class="card-view" style="margin-left: -13px;">
<% current_user.subscriptions(:tag).each do |tag| %>
Copy link
Member

Choose a reason for hiding this comment

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

We shouldn't have tags as per current user right ? It should be all the latest tags in dashboard I guess ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Hi! As from what I understood, it should be specific to a user. I had a discussion about the same with @gauravano as well. The topic cards should be the ones followed by the user and all the updates regarding that.

Copy link
Member

Choose a reason for hiding this comment

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

Actually, let's ask @jywarren as he's available now for more clarity on this.

</div>
<div class="card-body" style="padding:0.8em;">
<div class="node-list">
<% Tag.find_nodes_by_type(tag.tagname, type = 'note', limit = 3).each do |node| %>
Copy link
Member

Choose a reason for hiding this comment

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

In dashboard, we require all the nodes, Comments, wikis, Questions too I guess wiki too. I think this would be updated in profile page too. I'll update it for profile page.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Okay! I'll add them as well. Thanks!

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Hi @CleverFool77! How do I add comments here, because we cannot associate comments with any topic?

Copy link
Member

Choose a reason for hiding this comment

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

Shall we approach this the same way as on the profile page, by making a new page similar to /comments, but for /comments/warren for example -- all comments by an author? Then we can link there from the dashboard AND from the profile page.

Copy link
Member

Choose a reason for hiding this comment

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

We could make it a pretty simple page, just a table like /comments maybe?

</div>
</div>
<div class="card-footer" style="background-color: inherit; border:none;">
<a style="text-decoration: underline; color: #808080; display: inline-block;" href="/tag/<%= tag.tagname %>"><%= Tag.follower_count(tag.tagname).to_i-1 %> <%= t('tag.index.more_posts') %> <i class="fa fa-angle-double-right"></i></a>
Copy link
Member

Choose a reason for hiding this comment

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

Similar as above, Not just notes, but need to include comments,questions too.
This will be added in profile page soon too.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Questions and notes have already been added!

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Here notes are covering all the posts made. I think the only portion not covered here are the wikis and the comments. We can discuss about them with @jywarren !

@CleverFool77
Copy link
Member

Hi @gautamig54 I requested some changes for the cards.
Thanks !!

@@ -1,14 +1,15 @@
<div class="row header">

<% if current_user %>
<h1><%= t('dashboard._header.dashboard') %></h1>
<h4><%= t('dashboard._header.dashboard') %></h4>&nbsp&nbsp
Copy link
Member

Choose a reason for hiding this comment

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

If I'm not wrong, &nbsp; ends with a semicolon.

Copy link
Member

Choose a reason for hiding this comment

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

yeah it's &nbsp;
cc: @gautamig54

<% end %>

</div>

<div class="row stats">
<!-- <div class="row stats">
<h4 class="col-lg-8">
Copy link
Member

Choose a reason for hiding this comment

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

Hi @gautamig54 May I know why is this section commented ? 🤔

Copy link
Contributor Author

Choose a reason for hiding this comment

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

We do not have the welcome text as such in the new design. It is more like an alert message. I'll add the alert message text. Should I completely delete this part?

<small><a href="/tags" class="form-grey" style="margin-left:-13px;">Trending topics:</a></small>
<span class="topics-span">
<% cache('trending-tags', expires_in: 24.hours, skip_digest: true) do %>
<% Tag.trending.each do |i| %>
Copy link
Member

Choose a reason for hiding this comment

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

Maybe we can have better naming ? instead of i

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sure!

@plotsbot
Copy link
Collaborator

plotsbot commented Sep 3, 2019

1 Warning
⚠️ There was an error with Danger bot’s Junit parsing: No JUnit file was found at output.xml
3 Messages
📖 @gautamig54 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)

6229-test_viewing_question_post.png

6229-test_signup_modal.png

6229-test_wiki.png

6229-test_tag_page.png

6229-test_searching_an_item_from_the_homepage.png

6229-test_blog_page_with_location_modal.png

6229-test_login.png

6229-test_wiki_page_with_inline_grids.png

6229-test_questions.png

6229-test_methods.png

6229-test_tag_by_author_page.png

6229-test_viewing_the_dropdown_menu.png

6229-test_simple-data-grapher_powertag.png

6229-test_viewing_the_settings_page.png

6229-test_login_modal.png

6229-test_comments.png

6229-test_stats.png

6229-test_tags.png

6229-test_wiki_revisions.png

6229-test_people.png

6229-test_front.png

6229-failures_test_viewing_the_dashboard.png

6229-test_signup.png

6229-test_questions_shadow.png

6229-test_blog.png

6229-test_question_page.png

6229-test_front_page_with_navbar_search_autocomplete.png

6229-test_viewing_the_dashboard.png

Learn about automated screenshots

Generated by 🚫 Danger

@CleverFool77
Copy link
Member

Hi @gautamig54 Is there any update on this ? Would you like me to take this up ?

@SidharthBansal
Copy link
Member

As the person is inactive for more than a month, I am closing the PR. In case you want to push changes please feel free to open a new PR OR reopen this PR and add additional changes to it.
Thanks for contributing on Public Lab

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.

Dashboard Design as per new style guide
7 participants