diff --git a/src/App.js b/src/App.js index 5fddba39235fa7b33c96188d88253efccec63af6..7a0fbe36b267e6836c3e14951b2038ea2daf3189 100644 --- a/src/App.js +++ b/src/App.js @@ -23,14 +23,7 @@ function App() { <Router> <div className="App"> <Switch> - {sessionStorage.Conda == "true" ? ( - <Route exact path="/" component={Landing} /> - ) : ( - <h1> - It seems like you're missing conda , this software is a vital - dependancy for BiSePS - </h1> - )} + <Route exact path="/" component={Landing} /> <Route exact path="/register" component={Register} /> <Route exact path="/login" component={Login} /> <PrivateRoute exact path="/newrun" component={RunBoard} /> diff --git a/src/components/Landing/Landing.js b/src/components/Landing/Landing.js index 781fdef3f6ec936867a44b9923fea537782cc358..5303a93d34937ee3421fbc75afb50f8acf4b0ddd 100644 --- a/src/components/Landing/Landing.js +++ b/src/components/Landing/Landing.js @@ -7,10 +7,11 @@ import Grid from "@material-ui/core/Grid"; import Typography from "@material-ui/core/Typography"; import { makeStyles } from "@material-ui/core/styles"; import Container from "@material-ui/core/Container"; -import AppBar from "@material-ui/core/AppBar"; import Box from "@material-ui/core/Box"; +import Linky from "@material-ui/core/Link"; + +const { shell } = window.require("electron"); -import Toolbar from "@material-ui/core/Toolbar"; const useStyles = makeStyles((theme) => ({ heroContent: { backgroundColor: theme.palette.background.paper, @@ -49,39 +50,64 @@ const Landing = () => { color="textPrimary" gutterBottom > - <b>Run</b> our powerful DMR Identification Pipeline{" "} - <b> - <span style={{ fontFamily: "monospace" }}>BiSePS</span> - </b>{" "} - from a User-Friendly <b>GUI!</b> + {sessionStorage.Conda == "true" ? ( + <> + <b>Run</b> our Snakemake DMR Identification Pipeline{" "} + <b> + <span style={{ fontFamily: "monospace" }}>BiSePS</span> + </b>{" "} + from a User-Friendly <b>GUI!</b>{" "} + </> + ) : ( + <> + <b>Oops..</b> it seems like you're missing conda in your $PATH + <b></b> + <div> + {" "} + You can install <b>Miniconda</b> following this{" "} + <Linky + onClick={() => + shell.openExternal( + "https://docs.conda.io/en/latest/miniconda.html" + ) + } + > + link + </Linky>{" "} + </div> + </> + )} </Typography> - - <div className={classes.heroButtons}> - <Grid container spacing={2} justify="center"> - <Grid item> - <Button - size="large" - variant="contained" - component={Link} - to="/register" - color="primary" - > - Register - </Button> - </Grid> - <Grid item> - <Button - size="large" - variant="outlined" - component={Link} - to="/login" - color="primary" - > - Login - </Button> + {sessionStorage.Conda == "true" ? ( + <div className={classes.heroButtons}> + <Grid container spacing={2} justify="center"> + <Grid item> + <Button + size="large" + variant="contained" + component={Link} + to="/register" + color="primary" + > + Register + </Button> + </Grid> + <Grid item> + <Button + size="large" + variant="outlined" + component={Link} + to="/login" + color="primary" + > + Login + </Button> + </Grid> </Grid> - </Grid> - </div> + </div> + ) : ( + "" + )} </Container> </div> </Box> diff --git a/src/components/Tableau/listItems.js b/src/components/Tableau/listItems.js index 5cae82f02c774471694e09b35c2decbdc558dae4..cdb286527030cb037ae60b58dfee457461eef3a5 100644 --- a/src/components/Tableau/listItems.js +++ b/src/components/Tableau/listItems.js @@ -2,13 +2,9 @@ import React from "react"; import ListItem from "@material-ui/core/ListItem"; import ListItemIcon from "@material-ui/core/ListItemIcon"; import ListItemText from "@material-ui/core/ListItemText"; -import ListSubheader from "@material-ui/core/ListSubheader"; import DashboardIcon from "@material-ui/icons/Dashboard"; -import ShoppingCartIcon from "@material-ui/icons/ShoppingCart"; -import PeopleIcon from "@material-ui/icons/People"; import BarChartIcon from "@material-ui/icons/BarChart"; import LayersIcon from "@material-ui/icons/Layers"; -import AssignmentIcon from "@material-ui/icons/Assignment"; import { Link } from "react-router-dom"; export const mainListItems = (