Merge 76e21ef into b021d05

neuroscout/frontend/cypress/integration/home_spec.js

@@ -3,54 +3,53 @@ describe('The Home Page', () => {
     cy.visit('/')
   })
 
-
-  it('navigation bar contents', () =>{
-    cy.get('.ant-menu').contains('Neuroscout').should(
-      'have.attr', 'href', '/'
-    )
+  it('navigation bar contents', () => {
+    cy.get('.ant-menu').contains('Neuroscout').should('have.attr', 'href', '/')
     cy.get('.ant-menu').contains('Browse')
     cy.get('.ant-menu').not('Public Analyses')
     cy.get('.ant-menu').contains('Browse').click()
     cy.get('.ant-menu').contains('Browse').trigger('mouseover')
     cy.wait(100)
-    cy.get('.ant-menu').contains('Public Analyses').should(
-      'have.attr', 'href', '/public'
-    )
+    cy.get('.ant-menu')
+      .contains('Public Analyses')
+      .should('have.attr', 'href', '/public')
     cy.get('.ant-menu').not('My Analyses')
-    cy.get('.ant-menu').contains('Help').should(
-      'have.attr', 'href', 'https://neuroscout.github.io/neuroscout/'
-    )
+    cy.get('.ant-menu')
+      .contains('Help')
+      .should('have.attr', 'href', 'https://neuroscout.github.io/neuroscout/')
     cy.get('.ant-menu').contains('Sign in')
     cy.get('.ant-menu').contains('Sign up')
-
   })
 
   it('splash page contents', () => {
     cy.get('.splashLogo').should('have.length', 4)
-    cy.contains('A platform for fast and flexible re-analysis of (naturalistic) fMRI studies')
-    cy.get('.ant-btn').contains('Browse public analyses').parent().should(
-      'have.attr', 'href', '/public')
-    cy.get('.ant-btn').contains('Learn more').parent().should(
-      'have.attr', 'href', 'https://neuroscout.github.io/neuroscout/'
+    cy.contains(
+      'A platform for fast and flexible re-analysis of (naturalistic) fMRI studies',
     )
-
+    cy.get('.ant-btn')
+      .contains('Browse public analyses')
+      .parent()
+      .should('have.attr', 'href', '/public')
+    cy.get('.ant-btn')
+      .contains('Learn more')
+      .parent()
+      .should('have.attr', 'href', 'https://neuroscout.github.io/neuroscout/')
   })
 
   it('test sign up button 1', () => {
     cy.get('.ant-modal-content').should('not.exist')
-    cy.get('.ant-btn').contains('Sign up to create analyses!').parent().click()
+    cy.get('.ant-btn').contains('Sign up to get started!').parent().click()
     cy.get('.ant-modal-content')
-    cy.contains("Sign up for a Neuroscout account")
+    cy.contains('Sign up for a Neuroscout account')
     cy.get('.ant-modal-close-x').click()
     cy.get('.ant-modal-content').should('not.exist')
-
   })
 
   it('test sign up button 2', () => {
     cy.get('.ant-modal-content').should('not.exist')
     cy.get('.ant-btn').contains('Sign up').parent().click()
     cy.get('.ant-modal-content')
-    cy.contains("Sign up for a Neuroscout account")
+    cy.contains('Sign up for a Neuroscout account')
     cy.get('.ant-modal-close-x').click()
     cy.get('.ant-modal-content').should('not.exist')
   })
@@ -59,9 +58,8 @@ describe('The Home Page', () => {
     cy.get('.ant-modal-content').should('not.exist')
     cy.get('.ant-menu').contains('Sign in').click()
     cy.get('.ant-modal-content')
-    cy.contains("Log into Neuroscout")
+    cy.contains('Log into Neuroscout')
     cy.get('.ant-modal-close-x').click()
     cy.get('.ant-modal-content').should('not.exist')
   })
-
 })

neuroscout/frontend/src/Home.tsx

@@ -47,15 +47,15 @@ class Home extends React.Component<UserStore, Record<string, never>> {
                   type="default"
                   href="/predictors"
                 >
-                  Browse predictors
+                  Explore predictors
                 </Button>
                 <Button
                   size="large"
                   className="splashButton"
                   type="default"
                   href="/datasets"
                 >
-                  Browse datasets
+                  View datasets
                 </Button>
                 <br />
                 {this.props.loggedIn === false && (
@@ -65,7 +65,7 @@ class Home extends React.Component<UserStore, Record<string, never>> {
                     type="primary"
                     onClick={e => this.props.update({ openSignup: true })}
                   >
-                    Sign up to create analyses!
+                    Sign up to get started!
                   </Button>
                 )}
               </div>

neuroscout/frontend/src/analysis_builder/Overview.tsx

@@ -327,7 +327,7 @@ export class OverviewTab extends React.Component<
     return (
       <div className="builderCol">
         <Form layout="vertical">
-          <FormItem label="Analysis name" required>
+          <FormItem label="Name" required>
             <Row justify="space-between">
               <Col xs={24}>
                 <Input

neuroscout/frontend/src/analysis_builder/Status.tsx

@@ -1,5 +1,14 @@
 import * as React from 'react'
-import { Alert, Button, Card, Checkbox, Modal, Tooltip, Switch } from 'antd'
+import {
+  Alert,
+  Button,
+  Card,
+  Checkbox,
+  Modal,
+  Tooltip,
+  Switch,
+  Typography,
+} from 'antd'
 import memoize from 'memoize-one'
 
 import { config } from '../config'
@@ -11,6 +20,7 @@ import { Tracebacks } from './Report'
 import NeurovaultLinks from './NeuroVault'
 
 const domainRoot = config.server_url
+const { Text } = Typography
 
 export class DLLink extends React.Component<{
   status?: string
@@ -254,23 +264,42 @@ export class StatusTab extends React.Component<submitProps, statusTabState> {
           <div>
             <h3>Analysis Passed</h3>
             <p>
-              {this.props.userOwns &&
-                'Congratulations, your analysis has been compiled!'}
+              {this.props.userOwns && (
+                <Alert
+                  message="Passed"
+                  description="Analysis ID: {this.props.analysisId} has been validated and compiled."
+                  type="success"
+                  showIcon
+                />
+              )}
               <br />
-              Run the analysis with this this command, replacing
-              &apos;/local/outputdirectory&apos; with a local directory. See the{' '}
-              <a href="https://neuroscout.github.io/neuroscout/cli/">
-                neuroscout-cli documentation{' '}
-              </a>
-              for a complete user guide.
+              Run the analysis using Docker, replacing
+              <Text code>/mydir</Text> with a local directory.
             </p>
             <pre>
               <code>
-                docker run --rm -it -v /local/outputdirectory:/out
-                {` neuroscout/neuroscout-cli${this.state.imageVersion}`} run
+                docker run --rm -it -v /mydir:/out
+                {` neuroscout/neuroscout-cli${this.state.imageVersion} run `}
                 {this.props.analysisId} /out
               </code>
             </pre>
+            <p>
+              For help on how to use the <Text code>neuroscout-cli</Text>{' '}
+              execution engine, try:
+            </p>
+            <pre>
+              <code>
+                docker run --rm -it
+                {` neuroscout/neuroscout-cli${this.state.imageVersion} --help `}
+              </code>
+            </pre>
+            <p>
+              See the neuroscout-cli{' '}
+              <a href="https://neuroscout.github.io/neuroscout/cli/">
+                documentation{' '}
+              </a>
+              for a complete user guide.
+            </p>
             <Card
               size="small"
               title="System Requirements"