Skip to content
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
83 changes: 38 additions & 45 deletions constants/external-links.js
Original file line number Diff line number Diff line change
@@ -1,48 +1,64 @@
// Overture Docs + Demo

export const DEMO_LINK = 'https://demo.overture.bio/';
export const DOCKER_DOWNLOAD =
'https://www.docker.com/products/docker-desktop/';
export const DOCUMENTATION_LINK = 'https://docs.overture.bio/';
export const OVERTURE_GITHUB_LINK = 'https://github.com/overture-stack/';
export const OVERTURE_DOCUMENTATION_CONTRIBUTION_LINK =
'https://docs.overture.bio/community/contribution';
export const OVERTURE_GITHUB_DISSCUSSION_LINK =
'https://github.com/overture-stack/docs/discussions';
export const OVERTURE_DOCUMENTATION_SUPPORT_LINK =
'https://docs.overture.bio/community/support';
export const FEATURE_REQUESTS =
'https://github.com/overture-stack/website/issues/new?assignees=&labels=&projects=&template=Feature_Requests.md';
export const USER_GUIDES = 'https://docs.overture.bio/guides/user-guides/';
export const ADMINISTRATION_GUIDES =
'https://docs.overture.bio/guides/administration-guides/';
export const DEPLOYMENT_GUIDES =
'https://docs.overture.bio/guides/deployment-guide/';
export const API_REFERENCE_GUIDE =
'https://docs.overture.bio/guides/api-reference';
export const OVERTURE_DOCUMENTATION_CORE_SOFTWARE =
'https://docs.overture.bio/docs/core-software/';
export const OVERTURE_DOCUMENTATION_UNDER_DEVELOPMENT =
'https://docs.overture.bio/docs/under-development/';

// Case Study Links

export const ICGC_ARGO_LINK = 'https://www.icgc-argo.org/';
export const ICGC_ARGO_PORTAL_LINK = 'https://platform.icgc-argo.org/';
export const CGC_LINK = 'https://cancercollaboratory.org/';
export const FAQ_LINK =
'https://oicr.on.ca/information-practices-frequently-asked-questions/';
export const GDC_LINK = 'https://portal.gdc.cancer.gov/';
export const OVERTURE_GITHUB_LINK = 'https://github.com/overture-stack/';
export const GITHUB_ISSUES_LINK = `${OVERTURE_GITHUB_LINK}roadmap/issues`;
export const GITHUB_SUBMIT_ISSUES_LINK =
'https://github.com/overture-stack/website/issues/new?assignees=&labels=bug&projects=&template=bug_report.md&title=BUG+-+';
export const GITHUB_REQUEST_FEATURES_LINK =
'https://github.com/overture-stack/website/issues/new?assignees=&labels=new-feature&projects=&template=Feature_Request.md&title=Feature+Request+';
export const HCMIS_LINK = 'https://hcmi-searchable-catalog.nci.nih.gov/';
export const HCMIS_PORTAL_LINK = 'https://hcmi-searchable-catalog.nci.nih.gov/';
export const ICGC_LINK = 'https://dcc.icgc.org/';
export const IHCC_LINK = 'https://ihccglobal.org/';
export const IHCC_PORTAL_LINK = 'https://atlas.ihccglobal.org/';
export const KIDS_FIRST_LINK =
'https://portal.kidsfirstdrc.org/login?redirect_path=/dashboard?';
export const VIRUSSEQ_LINK =
'https://genomecanada.ca/challenge-areas/cancogen/virusseq/';
export const VIRUSSEQ_PORTAL_LINK = 'https://virusseq-dataportal.ca/explorer';
export const ICGC_ARGO_LINK = 'https://www.icgc-argo.org/';
export const ICGC_ARGO_PORTAL_LINK = 'https://platform.icgc-argo.org/';
export const CGC_LINK = 'https://cancercollaboratory.org/';

// Misc Links

export const DOCKER_DOWNLOAD =
'https://www.docker.com/products/docker-desktop/';
export const NETLIFY_IMAGE_LINK =
'https://www.netlify.com/img/global/badges/netlify-color-bg.svg';
export const NETLIFY_LINK = 'https://www.netlify.com/';
export const OICR_LINK = 'https://oicr.on.ca';
export const OVERTURE_YOUTUBE_LINK =
'https://www.youtube.com/embed/NrgL8vpFm5s';
export const POLICIES_LINK = 'https://oicr.on.ca/oicr-policies-and-procedures/';
export const PRIVACY_EMAIL_LINK = 'mailto:privacy@oicr.on.ca';
export const SLACK_LINK =
'https://join.slack.com/t/overture-bio/shared_invite/zt-21tdumtdh-9fP1TFeLepK4~Lc377rOYw';
export const TEAM_BLOG_LINK = 'https://softeng.oicr.on.ca/';
export const TEAM_LINK = 'https://softeng.oicr.on.ca/team/';
export const VIRUSSEQ_LINK =
'https://genomecanada.ca/challenge-areas/cancogen/virusseq/';
export const VIRUSSEQ_PORTAL_LINK = 'https://virusseq-dataportal.ca/explorer';
export const EMAIL_LINK = 'mailto:contact@overture.bio';
export const GI_PROGRAM_LINK =
'https://oicr.on.ca/programs/genome-informatics/';
export const FAQ_LINK =
'https://oicr.on.ca/information-practices-frequently-asked-questions/';

// PRODUCTS LINKS
// Product Links

// arranger
export const ARRANGER_GETTING_STARTED_LINK =
Expand All @@ -53,42 +69,19 @@ export const ARRANGER_UPDATES_LINK =
export const ARRANGER_GITHUB_LINK =
'https://github.com/overture-stack/arranger';

// DMS
export const DMS_RELEASE_NOTES = `${OVERTURE_GITHUB_LINK}dms/releases`;
export const CANARIE_LINK = 'https://www.canarie.ca/';
// stage
export const STAGE_GITHUB_LINK = 'https://github.com/overture-stack/stage';

// ego
export const EGO_SQL_LINK = `${OVERTURE_GITHUB_LINK}ego/blob/develop/src/main/resources/schemas/01-psql-schema.sql`;
export const EGO_UPDATES_LINK = 'https://www.overture.bio/documentation/ego/';
export const EGO_GITHUB_LINK = 'https://github.com/overture-stack/ego';

// jukebox
export const JUKEBOX_BLOG_POST_LINK =
'http://softeng.oicr.on.ca/kevin_hartmann/2018/03/28/Drops-of-Jupyter/';
export const JUPYTER_LINK = 'https://jupyter.org/index.html';
export const JUPYTER_INSTALL_LINK = 'https://jupyter.org/install.html';

// oncojs
export const LOLLIPLOT_EXAMPLE_LINK =
'https://portal.gdc.cancer.gov/genes/ENSG00000183914';
export const ONCOGRID_EXAMPLE_LINK =
'https://dcc.icgc.org/analysis/view/oncogrid/ce6fd9fd-b76e-488d-88a5-93bdc690f79e';
export const SURVIVALPLOT_EXAMPLE_LINK =
'https://dcc.icgc.org/analysis/view/phenotype/15c7c81a-7717-49e3-a0f7-be09fdc400b6';
export const PATHWAYVIEWER_EXAMPLE_LINK =
'https://dcc.icgc.org/genesets/R-HSA-1236974/pathway-viewer';
export const ONCOJS_GITHUB_LINK = 'https://github.com/oncojs';

// maestro
export const MAESTRO_UPDATES_LINK =
'https://www.overture.bio/documentation/maestro/';
export const MAESTRO_GITHUB_LINK = 'https://github.com/overture-stack/maestro';

// persona
export const PERSONA_LOCAL_LINK = 'http://localhost:3232/graphql';
export const PERSONA_ENV_SCHEMA_LINK = `${OVERTURE_GITHUB_LINK}persona/blob/master/.env.schema`;

// song
export const SONG_DOCS_LINK = 'https://www.overture.bio/documentation/song/';
export const SONG_BLOG_POST_LINK =
Expand Down
1 change: 0 additions & 1 deletion constants/pages.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import { internalUrlJoin } from '../utils';
export const ABOUT_US_PATH = '/about-us/';
export const ACKNOWLEDGEMENTS_PATH = '/acknowledgements/';
export const CASE_STUDIES_PATH = '/case-studies/';
export const CONTACT_US_PATH = '/contact-us/';
export const COMMUNITY_PATH = '/community/';
export const GETTING_STARTED_PATH = '/getting-started/';
export const PRIVACY_PATH = '/privacy/';
Expand Down
3 changes: 1 addition & 2 deletions constants/products.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import urlJoin from 'proper-url-join';
import { internalUrlJoin } from '../utils';
import { PRODUCTS_PATH } from './pages';
import { ONCOJS_GITHUB_LINK, OVERTURE_GITHUB_LINK } from './external-links';
import { OVERTURE_GITHUB_LINK } from './external-links';

// products info that is created or accessed programmatically
// for other external link constants use external-links.js
Expand Down Expand Up @@ -43,7 +43,6 @@ const productsObj = {
title: 'Maestro',
},
oncojs: {
githubUrl: ONCOJS_GITHUB_LINK,
iconWhite: 'productOncoWhite',
title: 'OncoJS',
},
Expand Down
8 changes: 7 additions & 1 deletion src/components/AnchorHeading/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,13 @@ import React from 'react';
import { GoLink as LinkIcon } from 'react-icons/go';
import { LinkHelper as Link } from 'components';

export default function AnchorHeading({ children, id, location, size: H, ...props }) {
export default function AnchorHeading({
children,
id,
location,
size: H,
...props
}) {
return (
<H {...props} id={id}>
{/* need ID for the table of contents sidebar in docs section*/}
Expand Down
53 changes: 15 additions & 38 deletions src/components/NavBar/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
* subcomponents: MegaMenu and NavLink
*/
import React, { Component } from 'react';
import MegaMenu from './MegaMenu';
import MegaMenuLink from './MegaMenuLink';
import NavLink from './NavLink';
import { Button, LinkHelper as Link } from 'components';
import {
Expand All @@ -15,20 +13,17 @@ import {
PRODUCTS_PATH,
SERVICES_PATH,
} from 'constants/pages';
import { SLACK_LINK } from 'constants/external-links';
import logo from './assets/overture_logo.svg';
import './styles.scss';
import {
DOCUMENTATION_LINK,
OVERTURE_GITHUB_LINK,
} from '../../../constants/external-links';

class NavBar extends Component {
render() {
const {
closeMenus,
megaMenuType,
mobileMenuOpen,
path,
toggleMegaMenu,
toggleMobileMenu,
} = this.props;
const { closeMenus, megaMenuType, mobileMenuOpen, toggleMobileMenu } =
this.props;

let mobileMenuClass = mobileMenuOpen ? 'is-active' : '';
let navbarMenuClass = `navbar-menu ${mobileMenuClass}`;
Expand Down Expand Up @@ -65,24 +60,11 @@ class NavBar extends Component {
url={PRODUCTS_PATH}
name="Products"
/>
<MegaMenuLink
isActive={megaMenuType === 'documentation'}
<NavLink
closeMenus={closeMenus}
url={DOCUMENTATION_LINK}
name="Documentation"
path={path}
toggleMegaMenu={toggleMegaMenu}
type="documentation"
>
<div ref={(ref) => (this.popoverRef = ref)}>
{mobileMegaCheck && (
<MegaMenu
className="open"
closeMenus={closeMenus}
megaMenuType="documentation"
path={path}
/>
)}
</div>
</MegaMenuLink>
/>
<NavLink
closeMenus={closeMenus}
url={CASE_STUDIES_PATH}
Expand All @@ -101,22 +83,17 @@ class NavBar extends Component {
/>
</div>
{/* grey section with three cubes */}
<div
className={`navbar-mid bg-grey ${
megaMenuType === 'documentation' ? 'is-active' : ''
}`}
></div>
<div className="navbar-end ">
<div className="navbar-item nav-link navbar-buttons">
<Button
link={OVERTURE_GITHUB_LINK}
iconAlt="slack logo"
className="slack-button"
icon="slackNew"
link={SLACK_LINK}
size="navSlack"
className="github-button"
icon="githubMagenta"
size="large"
type="secondary"
>
Join us on Slack
Check us out on GitHub
</Button>

<Button
Expand Down
8 changes: 4 additions & 4 deletions src/components/NavBar/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@
}
}

.slack-button {
.github-button {
margin-right: 1rem;
background: $grey-2;

Expand All @@ -152,17 +152,17 @@
@include breakpoint(navmenu-below) {
gap: 3em;
}
.slack-button {
.github-button {
font-size: 1rem;
font-weight: 500;
font-weight: 600;
}

@media (max-width: 400px) {
flex-direction: column;
justify-content: flex-start;
gap: 0;

.slack-button {
.github-button {
margin: 0.5rem;
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/ProductsPageSection/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export default function ProductPageSection({
const desktopWideViewPort = isBrowser && 1215 < width && width <= 1407;
const desktopUltraWideViewPort = isBrowser && 1408 < width;

const userDocsLink = `https://overture.bio/documentation/${title.toLowerCase()}`;
const userDocsLink = `https://docs.overture.bio/docs/core-software/${title.toLowerCase()}/overview/`;
const gitHubLink = `https://github.com/overture-stack/${title}`;

return (
Expand Down
7 changes: 5 additions & 2 deletions src/components/ServicesPageSection/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
import React from 'react';
import { SLACK_LINK, EMAIL_LINK } from '../../../constants/external-links';
import {
EMAIL_LINK,
OVERTURE_DOCUMENTATION_SUPPORT_LINK,
} from '../../../constants/external-links';
import { Button, P1, H2 } from 'components';
import './styles.scss';

Expand Down Expand Up @@ -47,7 +50,7 @@ const ServicesPageSection = ({
{buttonText && (
<div className="ServicesPageSection__button-holder">
<Button
link={EMAIL_LINK}
link={OVERTURE_DOCUMENTATION_SUPPORT_LINK}
type="primary"
size="medium"
className="ServicesPageSection__button"
Expand Down
Loading