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

report overhaul phase 1 #324

Merged
merged 23 commits into from
Nov 13, 2024
Merged
Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
2619b87
converted side menu to new top menu
ayobi Oct 29, 2024
3889b80
Merge branch 'biocore:master' into report_overhaul_phase_1
ayobi Oct 29, 2024
f11a6ef
added media for smaller screens, fixed font/colors
ayobi Oct 30, 2024
d8f16eb
increase thickness of bar
ayobi Oct 30, 2024
85e08f3
change font weight from bold to normal
ayobi Oct 30, 2024
5925093
toward specs of figma design
ayobi Nov 4, 2024
e4ff2eb
change active nav item to gray 90
ayobi Nov 4, 2024
fd4e30c
change fonts
ayobi Nov 4, 2024
fa56cc9
improvements on collapsed menu
ayobi Nov 6, 2024
9ffe48d
fix breadcrumbs and breakpoint
ayobi Nov 7, 2024
e26b112
lint
ayobi Nov 7, 2024
65d0d80
improvements
ayobi Nov 8, 2024
88fd24e
fix grey bar
ayobi Nov 12, 2024
3bc102f
prevent text wrap on dropdown menu
ayobi Nov 12, 2024
43c4e63
extend blue bar
ayobi Nov 12, 2024
5d345f0
Update microsetta_interface/static/css/minimal_interface.css
cassidysymons Nov 13, 2024
3fd98c9
Update microsetta_interface/static/css/minimal_interface.css
cassidysymons Nov 13, 2024
056b6e5
Update microsetta_interface/static/css/minimal_interface.css
cassidysymons Nov 13, 2024
5350989
Update microsetta_interface/static/css/minimal_interface.css
cassidysymons Nov 13, 2024
b5f90e8
Update microsetta_interface/static/css/minimal_interface.css
cassidysymons Nov 13, 2024
b4ebe46
Update microsetta_interface/templates/new_results_page.jinja2
cassidysymons Nov 13, 2024
4538c89
Update microsetta_interface/static/css/minimal_interface.css
cassidysymons Nov 13, 2024
912cfa5
Update microsetta_interface/static/css/minimal_interface.css
cassidysymons Nov 13, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 12 additions & 10 deletions microsetta_interface/implementation.py
Original file line number Diff line number Diff line change
Expand Up @@ -2592,16 +2592,18 @@ def get_sample_results_experimental_authenticated(*, account_id=None,
if has_error:
return sample_output

return _render_with_defaults('new_results_page.jinja2',
account_id=account_id,
source_id=source_id,
sample=sample_output,
source_name=source_output['source_name'],
taxonomy=SERVER_CONFIG["taxonomy_resource"],
alpha_metric=SERVER_CONFIG["alpha_metric"],
beta_metric=SERVER_CONFIG["beta_metric"],
barcode_prefix=SERVER_CONFIG["barcode_prefix"]
)
return _render_with_defaults(
'new_results_page.jinja2',
account_id=account_id,
source_id=source_id,
sample=sample_output,
source_name=source_output['source_name'],
taxonomy=SERVER_CONFIG["taxonomy_resource"],
alpha_metric=SERVER_CONFIG["alpha_metric"],
beta_metric=SERVER_CONFIG["beta_metric"],
barcode_prefix=SERVER_CONFIG["barcode_prefix"],
show_breadcrumbs=True
)


# Note: ideally this would be represented as a DELETE, not as a GET
Expand Down
189 changes: 189 additions & 0 deletions microsetta_interface/static/css/minimal_interface.css
Original file line number Diff line number Diff line change
Expand Up @@ -1435,3 +1435,192 @@ input.barcode-checkbox[type=checkbox]:checked+label {
.orange-text {
color: var(--tmi-orange);
}

@media (min-width: 576px) {
.report-nav-container {
position: relative;
max-width: 1280px;
margin-left: auto;
margin-right: auto;
}

#profile-kebab-dropdown {
margin-top: 58px;
border: 1px solid var(--tmi-gray-70);
border-radius: 5px;
width: 40px;
height: 40px;
}
cassidysymons marked this conversation as resolved.
Show resolved Hide resolved
}

@media (max-width: 1280px) {
.report-nav-container {
position: relative;
max-width: 1280px;
margin-left: auto;
margin-right: auto;
}

#profile-kebab-dropdown {
margin-top: 24px;
border: 1px solid var(--tmi-gray-70);
border-radius: 5px;
width: 40px;
height: 40px;
}
cassidysymons marked this conversation as resolved.
Show resolved Hide resolved
}

.report-nav {
position: relative;
width: 100%;
}
cassidysymons marked this conversation as resolved.
Show resolved Hide resolved

.report-nav::before {
content: '';
position: relative;
top: 56px;
bottom: 0;
left: 0;
right: 0;
max-width: 1280px;
width: 100%;
background: var(--tmi-gray-60);
flex-shrink: 0;
height: 8px;
border-radius: 100px;
z-index: 1;
}

.report-nav > .nav-item {
width: 220px;
text-align: center;
align-items: center;
font-size: 24px;
line-height: 40px;
background-color: white;
display: flex;
flex-direction: column;
}

@media (max-width: 575.98px) {
.report-nav > .nav-item {
text-align: left;
padding-left: 12px;
}
}

.report-nav > .nav-item > a {
color: var(--tmi-gray-80);
}

.report-nav > .nav-item > .active {
background-color: white;
color: var(--tmi-gray-90);
position: relative;
}

.report-nav > .nav-item > .active:after {
content: '';
position: relative;
background: var(--tmi-light-blue);
width: 220px;
height: 8px;
border-radius: 10px;
z-index: 2;
flex-direction: column;
align-items: center;
display: flex;
}

@media (max-width: 1279.8px) {
.report-nav > .nav-item {
display: block;
width: 100%;
text-align: left;
}

.report-nav::before {
display: none;
}

.report-nav > .nav-item > .active:after {
content: '';
position: relative;
background: var(--tmi-light-blue);
width: 220px;
height: 8px;
border-radius: 10px;
z-index: 2;
flex-direction: column;
align-items: center;
display: flex; }

.navbar-toggler.nav-toggle::after {
display: none;
}
}

.report-text {
text-align: left;
max-width: 1280px;
margin-left: auto;
margin-right: auto;
}

.breadcrumb-container {
width: 1280px;
margin-left: auto;
margin-right: auto;
display: flex;
}

.nav-toggle-report {
width: 240px;
text-align: center;
font-size: 24px;
line-height: 40px;
background-color: white;
color: var(--tmi-gray-80);
gap: 8px;
justify-content: space-between;
cassidysymons marked this conversation as resolved.
Show resolved Hide resolved
display: flex;
}

.nav-toggle-report:after {
content: '';
position: absolute;
bottom: 0;
left: 0;
right: 0;
background: var(--tmi-light-blue);
height: 8px;
border-radius: 4px 4px 4px 4px;
width: 240px;
}
@media (min-width: 1280px){
.navbar-expand-custom {
flex-direction: row;
flex-wrap: nowrap;
justify-content: flex-start;
}
.navbar-expand-custom .navbar-nav {
flex-direction: row;
}
.navbar-expand-custom .dropdown-menu {
position: absolute;
}
.navbar-expand-custom .nav-link {
padding-right: .5rem;
padding-left: .5rem;
}
.navbar-expand-custom > .container {
flex-wrap: nowrap;
}
.navbar-expand-custom .navbar-collapse {
display: flex!important;
flex-basis: auto;
}
.navbar-expand-custom .navbar-toggler {
display: none;
}
}
3 changes: 3 additions & 0 deletions microsetta_interface/static/img/nav_down_report.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading