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

feat: updates to the minimal mode version #146

Merged
merged 25 commits into from
Aug 9, 2024
Merged
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
59e4e91
chore: add boostrap
crfmc Jun 3, 2024
da23214
feat: add placeholder icons for each track in breakpoint and alignmen…
sehilyi Jun 12, 2024
e45b712
Merge remote-tracking branch 'origin/sehilyi/info-icons' into crfmc/m…
crfmc Jun 13, 2024
13df5a5
-chore: import images
crfmc Jun 26, 2024
1dc412c
-chore: import popover images
crfmc Jun 26, 2024
68ca9c9
-chore: add genome and variant view images/content
crfmc Jun 26, 2024
5576da9
-chore: update images
crfmc Jul 11, 2024
415c52b
-chore: update variant view images
crfmc Jul 11, 2024
c972a03
chore: update SV screenshot
crfmc Jul 11, 2024
fa71ef1
-refactor: move track data into separate file
crfmc Jul 11, 2024
ca8ba6c
-feat: update cnv block
crfmc Jul 11, 2024
8380012
fix: bootstrap boz-sizing issue
crfmc Jul 15, 2024
47e84b5
fix: page header style issue
crfmc Jul 15, 2024
dcbe5ef
chore: add coverage alignment and sequence images
crfmc Jul 18, 2024
94826ce
chore: update images and indel copy
crfmc Jul 18, 2024
15262c7
-refactor/accessibility: add alt text for images
crfmc Jul 18, 2024
f251d69
fix: bootstrap adding padding to move-to-top button
crfmc Jul 19, 2024
57470cc
-feat: global tooltip
crfmc Jul 30, 2024
ec87244
-fix: re-run bootstrap related JS when Sv selected
crfmc Jul 30, 2024
23537dd
-feat: remove duplicated tooltips
crfmc Aug 5, 2024
77c1620
chore: remove padding from right track titiles
crfmc Aug 6, 2024
baafc2d
fix: restore padding under normal chromoscopemode
crfmc Aug 6, 2024
df792b4
-style: adjust variant view scroll margin
crfmc Aug 7, 2024
4074e98
-refactor: new file for navigation buttons
crfmc Aug 7, 2024
a9d6cb2
chore: update cnv image
crfmc Aug 9, 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
Prev Previous commit
Next Next commit
-chore: add genome and variant view images/content
-style: style content
crfmc committed Jun 26, 2024
commit 68ca9c940c9f7fbc740e17ac69c3b086a4dc7831
77 changes: 77 additions & 0 deletions src/App.css
Original file line number Diff line number Diff line change
@@ -1058,6 +1058,83 @@ a:hover {
.modal-dialog {
width: 100%;
}
.modal-body {
max-height: 80vh;
overflow-y: scroll;
padding: 24px 36px;
.section {
/* margin-bottom: 20px; */

h4 {
font-size: 1.25rem;
font-weight: 600;
margin-bottom: 4px;
}

hr {
color: #cdcdcd;
border-width: 1px;
margin: 0px;
}
hr.header {
color: #b0b0b0;
border-width: 2px;
}

.block {
margin: 32px 0px;
display: flex;
min-height: 120px;
}
.block.with-image {
justify-content: flex-start;
height: auto;

.image-container.two-image {
display: flex;
flex-direction: column;
}

img {
width: 300px;
height: fit-content;
margin: auto 0px;
border: 2px solid #ebebeb;
object-fit: contain;
}

.text {
display: flex;
width: 400px;
flex-direction: column;
justify-content: space-evenly;
margin-left: 60px;

p {
margin-bottom: 0px;

span.text-button-example {
display: inline-flex;
justify-content: center;
background-color: #efefef;
width: 25px;
height: 25px;
border-radius: 10px 0px 0px 10px;
border: 1px solid lightgray;

b {
line-height: 20px;
margin: auto auto 5px;
}
}
span.text-button-example.right {
border-radius: 0px 10px 10px 0px;
}
}
}
}
}
}
}
}
}
2 changes: 0 additions & 2 deletions src/App.tsx
Original file line number Diff line number Diff line change
@@ -794,10 +794,8 @@ function App(props: RouteComponentProps) {
<p>When showing large chromosomal regions, Chromoscope selects 500 indels in each visible tile (see documentation on sampling).</p>
</div>
</div>
<hr />
</div>
</div>
<hr />
<div class='section interactions'>
<h4>Interactions</h4>
<hr class="header" />
Binary file modified src/script/img/modal_images/genome_view/interactions_1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/script/img/modal_images/genome_view/interactions_2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/script/img/modal_images/genome_view/interactions_3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/script/img/modal_images/genome_view/interactions_4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/script/img/modal_images/variant_view/interactions_1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/script/img/modal_images/variant_view/interactions_2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/script/img/modal_images/variant_view/interactions_3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/script/img/modal_images/variant_view/interactions_4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/script/img/modal_images/variant_view/interpretation_1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
29 changes: 24 additions & 5 deletions src/ui/GenomeViewModal.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
import React from 'react';
import genome_interactions_1 from '../script/img/modal_images/genome_view/interactions_1.png';
import genome_interactions_2 from '../script/img/modal_images/genome_view/interactions_2.png';
import genome_interactions_3 from '../script/img/modal_images/genome_view/interactions_3.png';
import genome_interactions_4 from '../script/img/modal_images/genome_view/interactions_4.png';

export const GenomeViewModal = () => {
return (
@@ -28,18 +31,34 @@ export const GenomeViewModal = () => {
<img src={genome_interactions_1} alt="" />
<div className="text">
<p>
<b>Circle with a dot</b> - denotes bi-allelic gene loss.
<b>Click and drag</b> the blue selection brush to highlight regions of
the genome.
</p>
</div>
</div>
<div className="block with-image">
<img src={genome_interactions_2} alt="" />
<div className="text">
<p>
<b>Circle without a dot</b> - denotes one mutation in gene.
<b>Click and drag</b> the edges of the selection brush to resize it.
</p>
</div>
</div>
<hr />
<div className="block with-image">
<img src={genome_interactions_1} alt="" />
<img src={genome_interactions_3} alt="" />
<div className="text">
<p>Driver mutations are also annotated by name in the genome view.</p>
<p>
<b>Hover</b> over a structural variant to see detailed information.
</p>
</div>
</div>
<div className="block with-image">
<img src={genome_interactions_4} alt="" />
<div className="text">
<p>
<b>Click</b> on a structural variant to inspect breakpoints in other
views.
</p>
</div>
</div>
</div>
83 changes: 82 additions & 1 deletion src/ui/VariantViewModal.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
import React from 'react';
import variant_interpretation_1 from '../script/img/modal_images/variant_view/interpretation_1.png';
import variant_interactions_1 from '../script/img/modal_images/variant_view/interactions_1.png';
import variant_interactions_2 from '../script/img/modal_images/variant_view/interactions_2.png';
import variant_interactions_3 from '../script/img/modal_images/variant_view/interactions_3.png';
import variant_interactions_4 from '../script/img/modal_images/variant_view/interactions_4.png';

export const VariantViewModal = () => {
return (
@@ -17,7 +22,83 @@ export const VariantViewModal = () => {
</h1>
<button type="button" className="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div className="modal-body"></div>
<div className="modal-body">
<div className="popover-content">
<div className="section interpretation">
<h4>Interpretation</h4>
<hr className="header" />
<div className="section-content">
<div className="block with-image">
<img src={variant_interpretation_1} alt="" />
<div className="text">
<p>
A structural variant may leave a footprint on the copy number profile
and may perturb genes.
</p>
</div>
</div>
</div>
</div>
<div className="section interactions">
<h4>Interactions</h4>
<hr className="header" />
<div className="section-content">
<div className="block with-image">
<img src={variant_interactions_1} alt="" />
<div className="text">
<p>
<b>Hover</b> - over a structural variant to see detailed information.
</p>
</div>
</div>
<div className="block with-image">
<img src={variant_interactions_2} alt="" />
<div className="text">
<p>
<b>Click</b> - on a structural variant to show its breakpoints in the
Read View.
</p>
<p>
The positions of breakpoints are highlighted by dashed, vertical lines.
</p>
</div>
</div>
<div className="block with-image">
<img src={variant_interactions_3} alt="" />
<div className="text">
<p>
<b>Zoom in and out</b> on chromosomal regions by clicking the{' '}
<span className="text-button-example">
<b>+</b>
</span>{' '}
and{' '}
<span className="text-button-example right">
<b>-</b>
</span>{' '}
buttons.
</p>
</div>
</div>
<div className="block with-image">
<img src={variant_interactions_4} alt="" />
<div className="text">
<p>
<b>Pan left and right</b> around the current region by clicking the{' '}
<span className="text-button-example">
<b>&larr;</b>
</span>{' '}
and{' '}
<span className="text-button-example right">
<b>&rarr;</b>
</span>{' '}
buttons.
</p>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>