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.

Sign up for GitHub

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

Jump to bottom

Updates to the how you compare front page #109

Merged
merged 48 commits into from
Apr 24, 2021
Merged

Updates to the how you compare front page #109

merged 48 commits into from
Apr 24, 2021

Conversation

wasade
Copy link
Member

@wasade wasade commented Mar 18, 2021

Resolves items from the attached mockup with the exception of:

  • Item "3", inserting a switch for 16S <-> shotgun into the breadcrumb bar would require either a modification to sitebase.html or some fancy Javascript to resolve. Deferring that item
  • A pill for for "microbes and health" was not added as that is pending some additional conversations

how_you_compare

dhakim87 and others added 3 commits March 19, 2021 17:55
@dhakim87
Query the emperor route but feed to a plotly scatter plot
470040d
@dhakim87
Moved some functions to top level, added logNNResults to print out wh…
218d537 
…at we get, set categories to what I think we need based on mockups. Just need to replace logNNResults with writing to selectors once we have the html skeleton up
@wasade
Formatting for microbial maps
a106af4
@wasade
Copy link
Member Author

wasade commented Mar 23, 2021

Microbial maps formatting with draft text

Screen Shot 2021-03-22 at 7 51 55 PM

@wasade
Copy link
Member Author

wasade commented Mar 23, 2021

@dhakim87, just fyi, formatting and draft text for microbial maps in with at the moment some placeholder images, some "pcoa-..." ID'd divs.

dhakim87
dhakim87 reviewed Mar 23, 2021
View reviewed changes
microsetta_interface/templates/new_results_page.jinja2 Outdated
height:500px;
width:500px;
background:#eee;
}
Copy link
Contributor

Choose a reason for hiding this comment

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

May have to mess with the sizing, the plotly plots tend to be wider than tall and do weird text cutoffs sometimes, but this is the right ballpark.

Copy link
Member Author

Choose a reason for hiding this comment

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

Ya figured we'd have to poke it a bunch to get it to look right... but wanted to ahve some place holders in to eyeball how things look

dhakim87 and others added 20 commits March 23, 2021 14:26
@dhakim87
Updated div selectors to match new microbial maps page
665fbec
@dhakim87
Merged microbial maps template pages
ac6e371
@dhakim87
Changes from meeting today
6e443e3
@dhakim87
Change to unweighted_unifrac
8962744
@dhakim87
Vars to lets, == to === and other cleanup suggested by pycharm pro ed…
09eb8ee 
…ition
@dhakim87
Changed default dataset when there are no datasets containing sample
8e032d3
@dhakim87
Removed plotly tick labels and lines at zero
df3217e
@wasade
Merge pull request #1 from biocore/st_dh_plotly_2d_emperor
d827f51 
Query the emperor route but feed to a plotly scatter plot
@wasade
Merge branch 'moremorerevisions' into st_dh_nn_queries
0978cfa
@wasade
Merge pull request #2 from biocore/st_dh_nn_queries
c3462d2 
Nearest neighbor and metadata queries for similarity pages
@dhakim87
Pointed to real multipop route (but still have no multipop wgs data, …
4d6c915 
…argh)
@wasade
DO NOT USE THIS COMMIT
ffc7204
@dhakim87
Removed old emperor code, set min widths for plotly plots and surroun…
9d0521b 
…ding text, messed with bootstrap grid layouts
@dhakim87
Merge branch 'moremorerevisions' into moremorerevs_madlibs
da73498
@dhakim87
Restored plotly, commented out gplot
e06fb3e
@wasade
Merge pull request #3 from biocore/moremorerevs_madlibs
a90ede0 
Fixes the plotly layouts
@dhakim87
Fills everything but diet on Diversity similarities page, waiting on …
5463666 
…metadata field to be added
@dhakim87
Sample diversity page
93d1f31
@wasade
Merge pull request #4 from biocore/moremorerevs_madlibs
b76eb21 
Fills in alpha diversity and nearest neighbor pages
@wasade
Marker size, add lifestage map, use revised metadata categories for m…
875d128 
…icrobial maps
wasade and others added 9 commits March 26, 2021 13:19
@wasade
Force 16S, use water rather than fermented, and show diversity in sample
4b3c0bd
@wasade
graft missing items
4163cc7
@wasade
icon size
bd8c8e6 
similarity matching colors
accordions for the microbiome maps
text revisions and popups in many places
using rasterized pcoas
tooltips for taxonomy
page headers revised and sync'd
clarifications on alpha div values
@wasade
Brief text reduction
ee6b472
@dhakim87
Recolored login image
0197845
@dhakim87
Made profile image 150% larger
e6f890f
@dhakim87
Color css
15c61d5
@dhakim87
Descendent based styling for links, any link for which any surroundin…
6bdfea5 
…g tag has a tmi-content class will be styled with the default tmi styling
@dhakim87
Hide breadcrumb from /results-experimental, these links are all broke…
fcb7450 
…n because the user is not actually authenticated.
@wasade
Copy link
Member Author

wasade commented Apr 6, 2021

fixes #60

dhakim87 and others added 13 commits April 6, 2021 14:31
@dhakim87
tmi styling for active nav pill. Fixed missing <p> tag
2d65aaf
@wasade
Merge pull request #5 from biocore/moremorerevs_madlibs
494a069 
TMI stylesheet
@dhakim87
Ripped the help bar from microsetta.ucsd.edu, tweaked for bootstrap a…
2ec7bb1 
…nd plugged it in as our footer, minus the telephone number
@wasade
Merge pull request #6 from biocore/moremorerevs_madlibs
de00ee8 
Pretty Footer
@gwarmstrong
NEW diversity page update styling
c12c3c1
@gwarmstrong
How you compare css updates
9685f12
@gwarmstrong
add hero image to how you compare page
cb2d0be
@wasade
Merge pull request #7 from gwarmstrong/moremorerevisions
f75c1a6 
NEW diversity page update styling
@wasade
Reflect @gwarmstrong's chagnes on Diversity to Similarity, center tax…
3f9f409 
…a ranks plot
@wasade
Use lifestage dataset
a00a3da
@wasade
Merge branch 'master' of github.com:biocore/microsetta-interface into…
ab567af 
… moremorerevisions
@wasade
Dataset details, similarity changes, and improved responsiveness on s…
9701e83 
…imilarities
@wasade
Change to results-example
d7364f4
@wasade
Copy link
Member Author

wasade commented Apr 24, 2021

Merging this as the changes are getting large and its oriented at an example still

@wasade wasade merged commit d99de95 into biocore:master Apr 24, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dhakim87 dhakim87 dhakim87 left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@wasade @dhakim87 @gwarmstrong