fix merge conflicts with main

linea-it · Sep 17, 2024 · f04c0a5 · f04c0a5
1 parent be9611b
commit f04c0a5
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 105 deletions.
diff --git a/frontend/pages/pz_pipelines.js b/frontend/pages/pz_pipelines.js
@@ -2,11 +2,8 @@ import Grid from '@mui/material/Grid'
 import Typography from '@mui/material/Typography'
 import Link from '@mui/material/Link'
 import Breadcrumbs from '@mui/material/Breadcrumbs'
-<<<<<<< HEAD
-=======
 import ArrowBackIos from '@mui/icons-material/ArrowBackIos'
 import IconButton from '@mui/material/IconButton'
->>>>>>> origin
 import React from 'react'
 import SpeczCatalogs from '../components/SpeczCatalogs'
 import TrainingSetMaker from '../components/TrainingSetMaker'
@@ -22,18 +19,12 @@ function PZPipelines() {
         mb={5}
         mr={55}
       >
-<<<<<<< HEAD
-        <Breadcrumbs aria-label="breadcrumb" sx={{ ml: -30 }}>
-=======
         <Breadcrumbs aria-label="breadcrumb" sx={{ mt: '25px' }}>
->>>>>>> origin
           <Link color="inherit" href="/">
             Home
           </Link>
           <Typography color="textPrimary">Pipelines</Typography>
         </Breadcrumbs>
-<<<<<<< HEAD
-=======
         <IconButton
           color="primary"
           edge="start"
@@ -42,7 +33,6 @@ function PZPipelines() {
         >
           <ArrowBackIos />
         </IconButton>
->>>>>>> origin
         Photo-z Server Pipelines
       </Typography>
 

diff --git a/frontend/pages/specz_catalogs.js b/frontend/pages/specz_catalogs.js
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 import InfoIcon from '@mui/icons-material/Info'
 import Box from '@mui/material/Box'
 import Button from '@mui/material/Button'
@@ -21,16 +20,6 @@ import SearchField from '../components/SearchField'
 import SearchRadius from '../components/SearchRadius'
 import SpeczData from '../components/SpeczData'
 import { useTheme } from '@mui/system'
-=======
-import React from 'react'
-import { Typography, Box } from '@mui/material'
-import Breadcrumbs from '@mui/material/Breadcrumbs'
-import Link from '@mui/material/Link'
-import Grid from '@mui/material/Grid'
-import IconButton from '@mui/material/IconButton'
-import InfoIcon from '@mui/icons-material/Info'
-import ArrowBackIos from '@mui/icons-material/ArrowBackIos'
->>>>>>> origin
 
 function SpeczCatalogs() {
   const theme = useTheme()
@@ -81,7 +70,6 @@ function SpeczCatalogs() {
   }
 
   return (
-<<<<<<< HEAD
     <Paper style={styles.root}>
       <CardContent>
         <Grid container spacing={3}>
@@ -211,41 +199,6 @@ function SpeczCatalogs() {
         </Snackbar>
       </CardContent>
     </Paper>
-=======
-    <Grid flexGrow={1} mt={3}>
-      <Breadcrumbs aria-label="breadcrumb" ml={1}>
-        <Link color="inherit" href="/">
-          Home
-        </Link>
-        <Link color="inherit" href="pz_pipelines">
-          Pipelines
-        </Link>
-        <Typography color="textPrimary">Combine Spec-z Catalogs</Typography>
-      </Breadcrumbs>
-      <Grid>
-        <Typography variant="h5" textAlign={'left'} ml={1} mt={1}>
-          <IconButton
-            color="primary"
-            aria-label="Go back"
-            onClick={() => window.history.back()}
-          >
-            <ArrowBackIos />
-          </IconButton>
-          Combine Spec-z Catalogs
-          <IconButton
-            color="primary"
-            aria-label="info"
-            title="Creates a single spec-z sample from the multiple spatial cross-matching (all-to-all) of a list of pre-registered individual Spec-z Catalogs."
-          >
-            <InfoIcon />
-          </IconButton>
-        </Typography>
-      </Grid>
-      <Box textAlign={'center'} mt={30}>
-        <Typography variant="h4">Coming soon...</Typography>
-      </Box>
-    </Grid>
->>>>>>> origin
   )
 }
 

diff --git a/frontend/pages/training_set_maker.js b/frontend/pages/training_set_maker.js
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 import InfoIcon from '@mui/icons-material/Info'
 import Box from '@mui/material/Box'
 import Button from '@mui/material/Button'
@@ -21,16 +20,6 @@ import SearchField from '../components/SearchField'
 import SearchRadius from '../components/SearchRadius'
 import TsmData from '../components/TsmData'
 import { useTheme } from '@mui/system'
-=======
-import React from 'react'
-import { Typography, Box } from '@mui/material'
-import Breadcrumbs from '@mui/material/Breadcrumbs'
-import Link from '@mui/material/Link'
-import Grid from '@mui/material/Grid'
-import IconButton from '@mui/material/IconButton'
-import InfoIcon from '@mui/icons-material/Info'
-import ArrowBackIos from '@mui/icons-material/ArrowBackIos'
->>>>>>> origin
 
 function TrainingSetMaker() {
   const theme = useTheme()
@@ -43,7 +32,7 @@ function TrainingSetMaker() {
   const [email, setEmail] = useState('')
   const [snackbarOpen, setSnackbarOpen] = useState(false)
   const [selectedLsstCatalog, setSelectedLsstCatalog] = useState('DP0.2')
-
+  
   const handleCatalogNameChange = event => {
     setCombinedCatalogName(event.target.value)
   }
@@ -87,7 +76,6 @@ function TrainingSetMaker() {
   }
 
   return (
-<<<<<<< HEAD
     <Paper style={styles.root}>
       <CardContent>
         <Grid container spacing={3}>
@@ -185,6 +173,13 @@ function TrainingSetMaker() {
                   searchRadius={searchRadius}
                   onChange={handleSearchRadiusChange}
                 />
+              </Grid>
+                <Grid item xs={12}>
+                <span>n neighbors:</span>{' '}
+                <SearchRadius
+                  searchRadius={searchRadius}
+                  onChange={handleSearchRadiusChange}
+                />
               </Grid>
               <Grid item xs={12}>
                 <span>
@@ -241,41 +236,6 @@ function TrainingSetMaker() {
         </Snackbar>
       </CardContent>
     </Paper>
-=======
-    <Grid flexGrow={1} mt={3}>
-      <Breadcrumbs aria-label="breadcrumb" ml={1}>
-        <Link color="inherit" href="/">
-          Home
-        </Link>
-        <Link color="inherit" href="pz_pipelines">
-          Pipelines
-        </Link>
-        <Typography color="textPrimary">Training Set Maker</Typography>
-      </Breadcrumbs>
-      <Grid>
-        <Typography variant="h5" textAlign={'left'} ml={1} mt={1}>
-          <IconButton
-            color="primary"
-            aria-label="Go back"
-            onClick={() => window.history.back()}
-          >
-            <ArrowBackIos />
-          </IconButton>
-          Training Set Maker
-          <IconButton
-            color="primary"
-            aria-label="info"
-            title="Creates a training set from the spatial cross-matching of a given Spec - z Catalog and the LSST Objects Catalogs.Training Set Maker"
-          >
-            <InfoIcon />
-          </IconButton>
-        </Typography>
-      </Grid>
-      <Box textAlign={'center'} mt={30}>
-        <Typography variant="h4">Coming soon...</Typography>
-      </Box>
-    </Grid>
->>>>>>> origin
   )
 }