Skip to content

Commit

Permalink
Merge pull request #957 from neuroscout/homepage
Browse files Browse the repository at this point in the history
Refresh homepage
  • Loading branch information
adelavega committed Jul 21, 2021
2 parents ebad065 + 80c3f38 commit 24c8772
Show file tree
Hide file tree
Showing 4 changed files with 104 additions and 26 deletions.
Binary file added neuroscout/frontend/public/static/nihlogo.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added neuroscout/frontend/public/static/utlogo.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
87 changes: 63 additions & 24 deletions neuroscout/frontend/src/Home.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@ import * as React from 'react'
import { Divider, Row, Col, Button, Card } from 'antd'
import { MainCol } from './HelperComponents'
import { UserStore } from './user'
import { BookOutlined } from '@ant-design/icons'

const titleStyle: any = {
textAlign: 'center' as React.CSSProperties,
fontSize: '20px',
fontSize: '22px',
padding: '0px 0px 0px 0px',
}

Expand Down Expand Up @@ -39,7 +40,6 @@ class Home extends React.Component<UserStore, Record<string, never>> {
href="/public">
Browse public analyses
</Button>{' '}
<br />
{this.props.loggedIn === false && (
<Button
size="large"
Expand All @@ -51,11 +51,32 @@ class Home extends React.Component<UserStore, Record<string, never>> {
)}
</div>
</div>
<br />
<Divider />
</MainCol>
</Row>

<Row justify="center" style={{ background: '#fff', padding: 0 }}>
<Col
xxl={{ span: 5 }}
xl={{ span: 6 }}
lg={{ span: 7 }}
xs={{ span: 8 }}>
<div className="stat-container">
<div className="stat-title">Active Datasets</div>
<div className="stat-value">12</div>
</div>
</Col>
<Col
xxl={{ span: 5 }}
xl={{ span: 6 }}
lg={{ span: 7 }}
xs={{ span: 8 }}>
<div className="stat-container">
<div className="stat-title">Number of Tasks</div>
<div className="stat-value">25</div>
</div>
</Col>
</Row>
<br />
<Row justify="center" style={{ background: '#fff', padding: 0 }}>
<Col
xxl={{ span: 5 }}
Expand All @@ -68,10 +89,12 @@ class Home extends React.Component<UserStore, Record<string, never>> {
bordered={false}>
<img className="splashLogo" src="/static/browse.svg" />
<br />
Select from openly available naturalistic fMRI datasets, from
sources such as
<a href="https://openneuro.org/"> OpenNeuro</a> and{' '}
<a href="https://datalad.org/">DataLad</a>.
<div className="introCardsText">
Select from openly available naturalistic fMRI datasets, from
sources such as
<a href="https://openneuro.org/"> OpenNeuro</a> and{' '}
<a href="https://datalad.org/">DataLad</a>.
</div>
</Card>
</Col>

Expand All @@ -86,11 +109,11 @@ class Home extends React.Component<UserStore, Record<string, never>> {
bordered={false}>
<img className="splashLogo" src="/static/design.svg" />
<br />
Browse hundreds of annotations automatically extracted from
stimuli using <strong>
state-of-the-art machine learning
</strong>{' '}
algorithms, such as Google Cloud Vision, IBM Watson, and more.
<div className="introCardsText">
Browse hundreds of annotations automatically extracted from
stimuli using <strong>state-of-the-art machine learning</strong>{' '}
platforms, such as Google Cloud Vision, TensorFlow and more.
</div>
</Card>
</Col>

Expand All @@ -105,10 +128,13 @@ class Home extends React.Component<UserStore, Record<string, never>> {
bordered={false}>
<img className="splashLogo" src="/static/share.svg" />
<br />
Portable BIDS pipelines enable execution with no configuration.
Results are automatically uploaded to
<a href="https://neurovault.org/"> NeuroVault</a> for easy
sharing.
<div className="introCardsText">
Portable BIDS pipelines enable{' '}
<strong>execution with no configuration</strong>. Results are
automatically uploaded to
<a href="https://neurovault.org/"> NeuroVault</a> for easy
sharing.
</div>
</Card>
</Col>
</Row>
Expand All @@ -120,22 +146,35 @@ class Home extends React.Component<UserStore, Record<string, never>> {
size="large"
className="splashButton"
href="https://neuroscout.github.io/neuroscout/">
<BookOutlined />
Learn more
</Button>
</div>

<br />
<Divider />
</MainCol>
</Row>
<Row justify="center" style={{ background: '#fff', padding: 0 }}>
<MainCol>
<Card
title="Support provided by"
headStyle={titleStyle}
bordered={false}>
<Row justify="center">
<Col span={5}>
<img className="instLogo2" src="/static/utlogo.png" />
</Col>
<Col span={5} offset={3}>
<img className="instLogo2" src="/static/nihlogo.png" />
</Col>
</Row>
</Card>
</MainCol>
</Row>
<Row justify="center" style={{ background: '#fff', padding: 0 }}>
<MainCol>
<div className="footerText">
<p>
Created by the Psychoinformatics Lab at the University of Texas
at Austin. Supported by NIH award R01MH109682-03.
<br />
Icons by Smashicons from www.flaticon.com
Supported by NIH award R01MH109682-03. Icons by Smashicons from
www.flaticon.com
</p>
</div>
</MainCol>
Expand Down
43 changes: 41 additions & 2 deletions neuroscout/frontend/src/css/App.css
Original file line number Diff line number Diff line change
Expand Up @@ -66,17 +66,35 @@ pre {
display: block;
margin-left: auto;
margin-right: auto;
width: 36%;
width: 33%;
}

.instLogo {
display: block;
margin-left: auto;
margin-right: auto;
width: 15%;
}

.instLogo2 {
height: auto;
width: 100%
}


.splashText {
text-align: center;
font-size: 25px;
}

.introCardsText {
font-size: 16px;
}


.footerText {
text-align: center;
font-size: 12px;
font-size: 10px;
}

.splashButtonParent {
Expand Down Expand Up @@ -176,3 +194,24 @@ pre {
.ant-checkbox-wrapper + .ant-checkbox-wrapper {
margin-left: 0px;
}

.home-flex-item {
display: flex;
justify-content: center;
flex-wrap: wrap;
}

.stat-title {
color: rgba(0, 0, 0, 0.45);
font-size: 20px;
}
.stat-value {
font-size: 28px;
color: #3f8600;
}
.stat-container {
display: flex;
flex-direction: column;
justify-content: center;
text-align: center;
}

0 comments on commit 24c8772

Please sign in to comment.