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

Connects to #279. Misc UI updates. #280

Merged
merged 6 commits into from
Jan 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions src/LandingPage/components/figure1c.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@ const assayMap = {
};

const omeColors = [
{ type: 'Genomics', color: '#FC8D62' },
{ type: 'Proteomics', color: '#8DA0CB' },
{ type: 'Metabolomics', color: '#66C2A5' },
{ type: 'Immunoassays', color: '#E78AC3' },
{ type: 'Genomics', color: '#ff8839' },
{ type: 'Proteomics', color: '#dba0ff' },
{ type: 'Immunoassays', color: '#f9e802' },
{ type: 'Metabolomics', color: '#31fd94' },
];

/**
Expand Down
36 changes: 26 additions & 10 deletions src/LandingPage/landingPage.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,13 @@ export function LandingPage({ isAuthenticated, profile }) {
console.log(networkNodes);
}, [networkNodes]);

const goToExternalLink = useCallback(() => {
window.open(
'https://www.biorxiv.org/content/10.1101/2022.09.21.508770v3',
'_blank',
);
}, []);

// Redirect authenticated users to protected route
const hasAccess = profile.user_metadata && profile.user_metadata.hasAccess;
if (isAuthenticated && hasAccess) {
Expand All @@ -191,7 +198,7 @@ export function LandingPage({ isAuthenticated, profile }) {
<h1 className="display-1">About MoTrPAC</h1>
<p className="lead">
<span className="font-weight-bold">
Molecular Transducers of Physical Activity Consortium
Molecular Transducers of Physical Activity Consortium (MoTrPAC)
</span>{' '}
is a national research consortium. Its goal is to{' '}
<span className="font-italic about-motrpac-emphasis">
Expand All @@ -201,16 +208,25 @@ export function LandingPage({ isAuthenticated, profile }) {
activity improves and preserves health. We aim to generate a
molecular map of the effects of exercise.
</p>
<Link
to="/project-overview"
className="btn btn-primary btn-lg mt-4"
role="button"
>
PROJECT OVERVIEW
</Link>
<div className="highlighted-links-container">
<Link
to="/project-overview"
className="btn btn-primary btn-lg mt-4"
role="button"
>
PROJECT OVERVIEW
</Link>
<Link
to="/tutorial"
className="btn btn-primary btn-lg mt-4"
role="button"
>
VIDEO TUTORIALS
</Link>
</div>
<div className="office-hour-anchor-link-container">
<a href="#join-office-hour" className="office-hour-anchor-link">
Join us at the monthly office hour to learn more
Join our monthly open office event to learn more
</a>
</div>
</div>
Expand Down Expand Up @@ -287,7 +303,7 @@ export function LandingPage({ isAuthenticated, profile }) {
LEARN MORE
</a>
</div>
<div className="feature-image col-12 col-md-6 mx-auto">
<div className="feature-image col-12 col-md-6 mx-auto" onClick={goToExternalLink}>
<img
src={LandscapePreprintAbstract}
className="img-fluid data-layer-runner"
Expand Down
10 changes: 8 additions & 2 deletions src/MainStudy/mainStudy.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ import { Link } from 'react-router-dom';
import PageTitle from '../lib/ui/pageTitle';
import BrowseDataActions from '../BrowseDataPage/browseDataActions';
import PASS1B06TimeCourse from '../assets/figures/pass1b-06-time-course.png';
import PASS1B06Profiling from '../assets/figures/pass1b-06-molecular-profiling.png';
import PASS1B06Profiling from '../assets/figures/pass1b-06-molecular-profiling.svg';
import ToggleShowHide from './components/toggleShowHide';
import ExternalLink from '../lib/ui/externalLink';

function MainStudy({ profile, allFiles, handleDataFetch }) {
const [showSummary, setShowSummary] = useState(true);
Expand Down Expand Up @@ -149,7 +150,12 @@ function MainStudy({ profile, allFiles, handleDataFetch }) {
tissues. Rats were endurance-exercise trained on treadmills and
tissue samples were collected at either 1, 2, 4, or 8 weeks of
training, with a 48 hour rest or wash out period before samples were
collected.
collected. See the{' '}
<ExternalLink
to="http://study-docs.motrpac-data.org/Animal_Protocol.pdf"
label="animal protocol"
/>{' '}
to learn more.
</p>
<div className="main-study-content-container mt-5">
<div className="d-flex align-items-center sub-section-title">
Expand Down
Binary file not shown.
Loading
Loading