diff --git a/compose/neurosynth-frontend/src/components/SleuthImportWizard/SleuthImportWizardCreateMetaAnalysesBase.tsx b/compose/neurosynth-frontend/src/components/SleuthImportWizard/SleuthImportWizardCreateMetaAnalysesBase.tsx index a4fb981a3..077e57fc9 100644 --- a/compose/neurosynth-frontend/src/components/SleuthImportWizard/SleuthImportWizardCreateMetaAnalysesBase.tsx +++ b/compose/neurosynth-frontend/src/components/SleuthImportWizard/SleuthImportWizardCreateMetaAnalysesBase.tsx @@ -33,18 +33,20 @@ const SleuthImportWizardCreateMetaAnalysesBase: React.FC<{ const navigate = useNavigate(); const [currView, setCurrView] = useState<'CONFIG' | 'CREATE'>('CONFIG'); - const handleCreateMetaAnalyses = () => { - // if (shouldCreateMetaAnalyses === false) { - // navigate(`/projects/${projectId}/meta-analyses`); - // } else { - // setCurrView('CREATE'); - // } + const handleCreateMetaAnalysisDetails = (selectedAlgorithm: IAlgorithmSelection | null) => { + if (selectedAlgorithm === null) { + navigate(`/projects/${projectId}/meta-analyses`); + } else { + setCurrView('CREATE'); + } }; return ( {currView === 'CONFIG' ? ( - {}} /> + ) : ( )} diff --git a/compose/neurosynth-frontend/src/components/SleuthImportWizard/SleuthImportWizardCreateMetaAnalysesConfig.tsx b/compose/neurosynth-frontend/src/components/SleuthImportWizard/SleuthImportWizardCreateMetaAnalysesConfig.tsx index c01222886..aabc0f7ed 100644 --- a/compose/neurosynth-frontend/src/components/SleuthImportWizard/SleuthImportWizardCreateMetaAnalysesConfig.tsx +++ b/compose/neurosynth-frontend/src/components/SleuthImportWizard/SleuthImportWizardCreateMetaAnalysesConfig.tsx @@ -24,7 +24,7 @@ function SleuthImportWizardCreateMetaAnalysesDetails({ }: { onNext: (selectedAlgorithm: IAlgorithmSelection | null) => void; }) { - const [shouldCreateMetaAnalyses, setCreateMetaAnalyses] = useState(); + const [shouldCreateMetaAnalyses, setShouldCreateMetaAnalyses] = useState(); const [selectedMetaAnalysisAlgorithm, setSelectedMetaAnalysisAlgorithm] = useState({ estimator: null, @@ -48,7 +48,9 @@ function SleuthImportWizardCreateMetaAnalysesDetails({ return metaAnalyticAlgorithms.filter((x) => x.label === 'MKDADensity' || x.label === 'ALE'); }, []); - const handleNext = () => {}; + const handleNext = () => { + onNext(shouldCreateMetaAnalyses ? selectedMetaAnalysisAlgorithm : null); + }; return ( @@ -64,7 +66,7 @@ function SleuthImportWizardCreateMetaAnalysesDetails({ value={shouldCreateMetaAnalyses} exclusive onChange={(e, value) => { - setCreateMetaAnalyses(value); + setShouldCreateMetaAnalyses(value); if (!value) { return setSelectedMetaAnalysisAlgorithm({ estimator: null, diff --git a/compose/neurosynth-frontend/src/pages/ImportSleuthPage/ImportSleuthPage.tsx b/compose/neurosynth-frontend/src/pages/ImportSleuthPage/ImportSleuthPage.tsx index 9594712bc..652163cba 100644 --- a/compose/neurosynth-frontend/src/pages/ImportSleuthPage/ImportSleuthPage.tsx +++ b/compose/neurosynth-frontend/src/pages/ImportSleuthPage/ImportSleuthPage.tsx @@ -8,7 +8,7 @@ import SleuthImportWizardUpload from 'components/SleuthImportWizard/SleuthImport import { useState } from 'react'; const ImportSleuthPage: React.FC = (props) => { - const [activeStep, setActiveStep] = useState(3); + const [activeStep, setActiveStep] = useState(0); const [uploadedSleuthFiles, setUploadedSleuthFiles] = useState([]); const [projectId, setProjectId] = useState(''); diff --git a/compose/neurosynth-frontend/src/pages/Projects/ProjectsPage/ProjectsPage.tsx b/compose/neurosynth-frontend/src/pages/Projects/ProjectsPage/ProjectsPage.tsx index 638eee4de..9961033b2 100644 --- a/compose/neurosynth-frontend/src/pages/Projects/ProjectsPage/ProjectsPage.tsx +++ b/compose/neurosynth-frontend/src/pages/Projects/ProjectsPage/ProjectsPage.tsx @@ -40,19 +40,26 @@ const ProjectsPage: React.FC = (props) => { pageOfResults={(projectsResponse?.results || []).length === 0 ? 1 : pageOfResults} > - {(projectsResponse?.results || []).map((project) => ( - - - - ))} + {(projectsResponse?.results || []).length > 0 ? ( + (projectsResponse?.results || []).map((project) => ( + + + + )) + ) : ( + + You have not created a project yet. Click the "NEW PROJECT" button above + to create a new project. + + )} diff --git a/store/nginx/nginx.conf b/store/nginx/nginx.conf index 57bcd6938..109b30696 100644 --- a/store/nginx/nginx.conf +++ b/store/nginx/nginx.conf @@ -76,6 +76,7 @@ http { #include /etc/nginx/sites-enabled/*; server { + listen 80; server_name _; location /api {