From d0bac436f5fad7ff87d87501ed7c57bab43ae86a Mon Sep 17 00:00:00 2001 From: Jandson Vitorino Date: Tue, 12 Mar 2024 13:45:15 -0300 Subject: [PATCH 1/2] layout corrections and addition of back to previous page buttons --- .vscode/settings.json | 2 +- frontend/pages/pz_pipelines.js | 27 ++++++++++++++--- frontend/pages/specz_catalogs.js | 44 ++++++++++++++++++++++++++-- frontend/pages/training_set_maker.js | 44 ++++++++++++++++++++++++++-- 4 files changed, 106 insertions(+), 11 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 8feacc9..cd7de01 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,7 +1,7 @@ { "editor.formatOnSave": true, "editor.codeActionsOnSave": { - "source.organizeImports": true, + "source.organizeImports": "explicit" }, "python.analysis.typeCheckingMode": "basic", "files.eol": "\n", diff --git a/frontend/pages/pz_pipelines.js b/frontend/pages/pz_pipelines.js index 696aa73..52ceb84 100644 --- a/frontend/pages/pz_pipelines.js +++ b/frontend/pages/pz_pipelines.js @@ -1,18 +1,37 @@ +import Grid from '@mui/material/Grid' +import Typography from '@mui/material/Typography' +import Link from '@mui/material/Link' +import Breadcrumbs from '@mui/material/Breadcrumbs' +import ArrowBackIos from '@mui/icons-material/ArrowBackIos' +import IconButton from '@mui/material/IconButton' import React from 'react' -import { Grid, Typography } from '@mui/material' import SpeczCatalogs from '../components/SpeczCatalogs' import TrainingSetMaker from '../components/TrainingSetMaker' function PZPipelines() { return ( - + + + + Home + + Pipelines + + window.history.back()} + > + + Photo-z Server Pipelines diff --git a/frontend/pages/specz_catalogs.js b/frontend/pages/specz_catalogs.js index 3cdac39..1e5d133 100644 --- a/frontend/pages/specz_catalogs.js +++ b/frontend/pages/specz_catalogs.js @@ -1,11 +1,49 @@ 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' function SpeczCatalogs() { return ( - - Coming soon... - + + + + Home + + + Pipelines + + + Combine Spec-z Catalogs + + + + + window.history.back()} + > + + + Combine Spec-z Catalogs + + + + + + + Coming soon... + + ) } diff --git a/frontend/pages/training_set_maker.js b/frontend/pages/training_set_maker.js index 30fabef..1e126ce 100644 --- a/frontend/pages/training_set_maker.js +++ b/frontend/pages/training_set_maker.js @@ -1,11 +1,49 @@ 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' function TrainingSetMaker() { return ( - - Coming soon... - + + + + Home + + + Pipelines + + + Training Set Maker + + + + + window.history.back()} + > + + + Training Set Maker + + + + + + + Coming soon... + + ) } From 191620dd3c46cc71b4247aabb65761be03da5d52 Mon Sep 17 00:00:00 2001 From: Jandson Vitorino Date: Tue, 12 Mar 2024 14:01:31 -0300 Subject: [PATCH 2/2] fix ESLint erros --- frontend/pages/pz_pipelines.js | 14 +++++++------- frontend/pages/specz_catalogs.js | 6 ++---- frontend/pages/training_set_maker.js | 4 +--- 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/frontend/pages/pz_pipelines.js b/frontend/pages/pz_pipelines.js index 52ceb84..fcfc229 100644 --- a/frontend/pages/pz_pipelines.js +++ b/frontend/pages/pz_pipelines.js @@ -25,13 +25,13 @@ function PZPipelines() { Pipelines window.history.back()} - > - - + color="primary" + edge="start" + aria-label="Go back" + onClick={() => window.history.back()} + > + + Photo-z Server Pipelines diff --git a/frontend/pages/specz_catalogs.js b/frontend/pages/specz_catalogs.js index 1e5d133..b24392f 100644 --- a/frontend/pages/specz_catalogs.js +++ b/frontend/pages/specz_catalogs.js @@ -17,13 +17,11 @@ function SpeczCatalogs() { Pipelines - - Combine Spec-z Catalogs - + Combine Spec-z Catalogs - window.history.back()} diff --git a/frontend/pages/training_set_maker.js b/frontend/pages/training_set_maker.js index 1e126ce..c261d08 100644 --- a/frontend/pages/training_set_maker.js +++ b/frontend/pages/training_set_maker.js @@ -17,9 +17,7 @@ function TrainingSetMaker() { Pipelines - - Training Set Maker - + Training Set Maker