From 4e35f35adabc91bec32e6368f4583865fa52abd8 Mon Sep 17 00:00:00 2001 From: Johannes Klein Date: Mon, 14 Jul 2025 15:59:57 +0200 Subject: [PATCH 001/108] Update CodeHighlight.js --- src/app/components/CodeHighlight.js | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/src/app/components/CodeHighlight.js b/src/app/components/CodeHighlight.js index 24db98b..fa6f126 100644 --- a/src/app/components/CodeHighlight.js +++ b/src/app/components/CodeHighlight.js @@ -1,25 +1,15 @@ import React, { useRef, useEffect } from 'react'; import PropTypes from 'prop-types'; -import { makeStyles } from '@mui/styles'; +import { Box } from '@mui/material'; import Prism from 'prismjs'; import 'prismjs-bibtex'; import 'prismjs/themes/prism.css'; import 'prismjs/themes/prism-okaidia.css'; // coy, dark, funky, okaidia, solarizedlight, tomorrow, twilight -const useStyles = makeStyles(() => ({ - code: { - fontSize: 10, - overflowWrap: 'break-word', - whiteSpace: 'pre-wrap', - } -})); - function CodeHighlight({ code, language, className }) { const codeNode = useRef(null); - const classes = useStyles(); useEffect(() => { - // const code = codeNode.current.textContent; if (Prism.languages.hasOwnProperty(language)) { const highlightHTML = Prism.highlight(code, Prism.languages[language], language); codeNode.current.innerHTML = highlightHTML; @@ -27,11 +17,19 @@ function CodeHighlight({ code, language, className }) { }, [code, language]); return ( - 
-      
+    
+      
         { code }
-      
-
+ + ); } From dee97a26fbf193cc44a8be65aa0c2be2a750b260 Mon Sep 17 00:00:00 2001 From: Johannes Klein Date: Mon, 14 Jul 2025 16:43:08 +0200 Subject: [PATCH 002/108] CitationModal --- src/app/CitationModal.js | 49 ++++++++++++++--------------- src/app/components/CodeHighlight.js | 5 +-- 2 files changed, 26 insertions(+), 28 deletions(-) diff --git a/src/app/CitationModal.js b/src/app/CitationModal.js index d320dbe..8dd56a6 100644 --- a/src/app/CitationModal.js +++ b/src/app/CitationModal.js @@ -1,7 +1,6 @@ import React from 'react'; import { observer } from 'mobx-react'; import PropTypes from 'prop-types'; -import { makeStyles } from '@mui/styles'; import Button from '@mui/material/Button'; import Card from '@mui/material/Card'; import CardContent from '@mui/material/CardContent'; @@ -13,31 +12,25 @@ import ToggleButtonGroup from '@mui/material/ToggleButtonGroup'; import CodeHighlight from './components/CodeHighlight'; -const useStyles = makeStyles(theme => ({ - CitationModal: { - backgroundColor: theme.palette.output.background, - display: 'flex', - flexDirection: 'column', - alignItems: 'center', - maxWidth: '700px' - }, - content: { - maxHeight: '600px', - overflowY: 'auto' - }, - code: { - backgroundColor: theme.palette.console.background, - borderRadius: '4px', - padding: '4px' - } -})); - function CitationModal({ citation }) { - const classes = useStyles(); return ( - - + theme.palette.output.background, + display: 'flex', + flexDirection: 'column', + alignItems: 'center', + maxWidth: '700px' + }} + > + How to cite? Please include the following references in your preferred format: @@ -67,19 +60,23 @@ function CitationModal({ citation }) { theme.palette.output.background, + borderRadius: '4px', + padding: '4px' + }} /> ))} - + diff --git a/src/app/components/CodeHighlight.js b/src/app/components/CodeHighlight.js index fa6f126..fb59e38 100644 --- a/src/app/components/CodeHighlight.js +++ b/src/app/components/CodeHighlight.js @@ -6,7 +6,7 @@ import 'prismjs-bibtex'; import 'prismjs/themes/prism.css'; import 'prismjs/themes/prism-okaidia.css'; // coy, dark, funky, okaidia, solarizedlight, tomorrow, twilight -function CodeHighlight({ code, language, className }) { +function CodeHighlight({ code, language, className, sx }) { const codeNode = useRef(null); useEffect(() => { @@ -17,7 +17,7 @@ function CodeHighlight({ code, language, className }) { }, [code, language]); return ( - + Date: Mon, 14 Jul 2025 16:52:35 +0200 Subject: [PATCH 003/108] Update Model.js --- src/app/Model.js | 72 ++++++++++++++++++++++++++++++------------------ 1 file changed, 45 insertions(+), 27 deletions(-) diff --git a/src/app/Model.js b/src/app/Model.js index b4dc3f2..c6f9015 100644 --- a/src/app/Model.js +++ b/src/app/Model.js @@ -1,59 +1,65 @@ import React from 'react'; import { observer } from 'mobx-react'; import PropTypes from 'prop-types'; -import { makeStyles } from '@mui/styles'; import Box from '@mui/material/Box'; import OptionSelect from './components/OptionSelect'; import OptionCheck from './components/OptionCheck'; import TextField from '@mui/material/TextField'; import Typography from '@mui/material/Typography'; -const useStyles = makeStyles(theme => ({ - Model: { - padding: '10px', - display: 'flex', - flexDirection: 'column', - }, - form: { - '& > *': { - marginRight: '10px', - } - }, -})); - const Model = ({ run }) => { - const classes = useStyles(); - // TODO: Check marginTop: 2 hack, doesn't seem exactly aligned to top if (run.usesModeltestNg) { return ( -
+ Select the best-fit model of evolution for a single DNA or protein alignment -
+ ); } if (run.usesAstral) { return ( -
+ Calculate species tree from a set of gene trees -
+ ); } return ( -
+ *': { + marginRight: '10px', + } + }} noValidate autoComplete="off" > @@ -72,7 +78,11 @@ const Model = ({ run }) => { mb={2} display="flex" alignItems="start" - className={classes.form} + sx={{ + '& > *': { + marginRight: '10px', + } + }} noValidate autoComplete="off" > @@ -82,7 +92,7 @@ const Model = ({ run }) => { variant="standard" helperText="Seed" title="Random seed" - style={{ width: 60 }} + sx={{ width: 60 }} value={run.randomSeed} onChange={(e) => run.setRandomSeed(e.target.value)} /> ) : null} @@ -93,7 +103,11 @@ const Model = ({ run }) => { mb={2} display="flex" alignItems="start" - className={classes.form} + sx={{ + '& > *': { + marginRight: '10px', + } + }} noValidate autoComplete="off" > @@ -106,7 +120,11 @@ const Model = ({ run }) => { mb={2} display="flex" alignItems="start" - className={classes.form} + sx={{ + '& > *': { + marginRight: '10px', + } + }} noValidate autoComplete="off" > @@ -116,7 +134,7 @@ const Model = ({ run }) => { -
+ ); }; From f349d472835c1d6d43db546455aa4682e3da6e7f Mon Sep 17 00:00:00 2001 From: Johannes Klein Date: Mon, 14 Jul 2025 16:55:01 +0200 Subject: [PATCH 004/108] Update Model.js --- src/app/Model.js | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/src/app/Model.js b/src/app/Model.js index c6f9015..a88cdee 100644 --- a/src/app/Model.js +++ b/src/app/Model.js @@ -56,9 +56,7 @@ const Model = ({ run }) => { display="flex" alignItems="start" sx={{ - '& > *': { - marginRight: '10px', - } + gap: '10px', }} noValidate autoComplete="off" @@ -79,9 +77,7 @@ const Model = ({ run }) => { display="flex" alignItems="start" sx={{ - '& > *': { - marginRight: '10px', - } + gap: '10px', }} noValidate autoComplete="off" @@ -104,9 +100,7 @@ const Model = ({ run }) => { display="flex" alignItems="start" sx={{ - '& > *': { - marginRight: '10px', - } + gap: '10px', }} noValidate autoComplete="off" @@ -121,9 +115,7 @@ const Model = ({ run }) => { display="flex" alignItems="start" sx={{ - '& > *': { - marginRight: '10px', - } + gap: '10px', }} noValidate autoComplete="off" From 6fc3a62e7252b00fbe98ff55c110c70e1fa8700a Mon Sep 17 00:00:00 2001 From: Johannes Klein Date: Mon, 14 Jul 2025 17:02:01 +0200 Subject: [PATCH 005/108] Update TreeCard.js --- src/app/TreeCard.js | 101 +++++++++++--------------------------------- 1 file changed, 24 insertions(+), 77 deletions(-) diff --git a/src/app/TreeCard.js b/src/app/TreeCard.js index 86fc0b7..392f593 100644 --- a/src/app/TreeCard.js +++ b/src/app/TreeCard.js @@ -1,10 +1,8 @@ import React from 'react'; import { observer } from 'mobx-react'; import PropTypes from 'prop-types'; -import { makeStyles } from '@mui/styles'; import IconButton from '@mui/material/IconButton'; import MoreVertIcon from '@mui/icons-material/MoreVert'; -import classNames from 'classnames'; import CircularProgress from "@mui/material/CircularProgress"; import Chip from "@mui/material/Chip"; import Menu from '@mui/material/Menu'; @@ -12,75 +10,9 @@ import MenuItem from '@mui/material/MenuItem'; import Card from '@mui/material/Card'; import CardHeader from '@mui/material/CardHeader'; import CardContent from '@mui/material/CardContent'; - -const useStyles = makeStyles(theme => ({ - TreeCard: { - backgroundColor: theme.palette.input.main, - border: `1px solid ${theme.palette.input.light}`, - }, - heading: { - display: 'flex', - alignItems: 'center', - }, - content: { - display: 'flex', - alignItems: 'center', - }, - name: { - marginRight: theme.spacing(1), - }, - chip: { - height: '30px', - backgroundColor: theme.palette.input.dark, - border: `1px solid ${theme.palette.input.light}`, - }, - link: { - cursor: 'pointer', - color: theme.palette.secondary.main - }, - secondaryText: { - color: theme.palette.input.secondaryText, - }, - divider: { - margin: '0 4px', - }, - fileInfo: { - color: '#ccc', - fontSize: '0.75em', - marginTop: '0.25em', - overflowWrap: 'break-word', - }, - path: { - cursor: 'pointer', - color: theme.palette.secondary.main, - marginLeft: 4, - }, - button: { - margin: theme.spacing(1), - }, - rightIcon: { - marginLeft: theme.spacing(1), - }, - iconSmall: { - fontSize: 20, - }, - outputButton: { - marginLeft: theme.spacing(1), - }, - loading: { - marginLeft: '10px', - }, - remove: { - flexGrow: 1, - display: 'flex', - justifyContent: 'flex-end', - } - -})); +import Box from '@mui/material/Box'; function TreeCard({ className, tree }) { - - const classes = useStyles(); const [anchorEl, setAnchorEl] = React.useState(null); function handleMenuClick(event) { @@ -99,13 +31,28 @@ function TreeCard({ className, tree }) { } return ( - + theme.palette.input.main, + border: (theme) => `1px solid ${theme.palette.input.light}`, + }} + > + theme.palette.input.dark, + border: (theme) => `1px solid ${theme.palette.input.light}`, + }} + /> } action={ -
+ Show folder Remove -
+ } title={ tree.name } subheader={ '' } /> -
+ { tree.loading ? ( -
+ -
+ ) : null } -
+ From e63093c91224f03cc6fa1e0f7d5a4243333d2ad7 Mon Sep 17 00:00:00 2001 From: Johannes Klein Date: Mon, 14 Jul 2025 17:05:07 +0200 Subject: [PATCH 006/108] Update TreeCard.js --- src/app/TreeCard.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/app/TreeCard.js b/src/app/TreeCard.js index 392f593..29ed0e6 100644 --- a/src/app/TreeCard.js +++ b/src/app/TreeCard.js @@ -46,8 +46,9 @@ function TreeCard({ className, tree }) { color="secondary" sx={{ height: '30px', - backgroundColor: (theme) => theme.palette.input.dark, - border: (theme) => `1px solid ${theme.palette.input.light}`, + color: (theme) => theme.palette.input.contrastText, + backgroundColor: (theme) => theme.palette.input.main, + border: (theme) => `1px solid ${theme.palette.input.darker}`, }} /> } From f01b17515e50addced55de43eab44ff576e460b5 Mon Sep 17 00:00:00 2001 From: Johannes Klein Date: Mon, 14 Jul 2025 17:05:11 +0200 Subject: [PATCH 007/108] Update CodeHighlight.js --- src/app/components/CodeHighlight.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/app/components/CodeHighlight.js b/src/app/components/CodeHighlight.js index fb59e38..7edd331 100644 --- a/src/app/components/CodeHighlight.js +++ b/src/app/components/CodeHighlight.js @@ -6,7 +6,7 @@ import 'prismjs-bibtex'; import 'prismjs/themes/prism.css'; import 'prismjs/themes/prism-okaidia.css'; // coy, dark, funky, okaidia, solarizedlight, tomorrow, twilight -function CodeHighlight({ code, language, className, sx }) { +function CodeHighlight({ code, language, sx }) { const codeNode = useRef(null); useEffect(() => { @@ -17,7 +17,7 @@ function CodeHighlight({ code, language, className, sx }) { }, [code, language]); return ( - + Date: Mon, 14 Jul 2025 19:12:33 +0200 Subject: [PATCH 008/108] Update Input.js --- src/app/Input.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/app/Input.js b/src/app/Input.js index c872c3a..ce69ec8 100644 --- a/src/app/Input.js +++ b/src/app/Input.js @@ -47,9 +47,6 @@ const useStyles = makeStyles((theme) => ({ width: '380px', height: '100px', }, - finalInput: { - padding: '10px', - }, concatenatedAlignment: { width: '550px', height: '200px', @@ -261,7 +258,7 @@ const Input = ({ run }) => { )} {run.alignments.length <= 1 ? null : ( - + Concatenated alignment Date: Tue, 15 Jul 2025 10:14:35 +0200 Subject: [PATCH 009/108] Update FinalAlignmentCard --- src/app/AlignmentCard.js | 12 +++++++++--- src/app/Input.js | 9 ++++----- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/app/AlignmentCard.js b/src/app/AlignmentCard.js index 2c138a3..0417d88 100644 --- a/src/app/AlignmentCard.js +++ b/src/app/AlignmentCard.js @@ -342,7 +342,7 @@ function AlignmentCard({ className, alignment }) { ); } -function FinalAlignmentCard({ className, alignment }) { +function FinalAlignmentCard({ sx, alignment }) { const classes = useStyles(); const [anchorEl, setAnchorEl] = React.useState(null); @@ -374,7 +374,13 @@ function FinalAlignmentCard({ className, alignment }) { ); return ( - + theme.palette.input.light, + border: (theme) => `1px solid ${theme.palette.input.border}`, + ...sx, + }} + > ({ width: '380px', height: '100px', }, - concatenatedAlignment: { - width: '550px', - height: '200px', - }, resultingPartitionCard: { width: '350px', height: '200px', @@ -262,7 +258,10 @@ const Input = ({ run }) => { Concatenated alignment )} From 6dbccda0dc57fe49a1c6f90f1215035f09172cd9 Mon Sep 17 00:00:00 2001 From: Johannes Klein Date: Tue, 15 Jul 2025 10:16:22 +0200 Subject: [PATCH 010/108] Update Input.js --- src/app/Input.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/app/Input.js b/src/app/Input.js index dbc72e8..c6e123b 100644 --- a/src/app/Input.js +++ b/src/app/Input.js @@ -223,7 +223,10 @@ const Input = ({ run }) => { ) : ( )} - + )} {run.multifurcatingConstraint.notAvailable ? null : ( From a1cb52d8ff67b9941ab48540d76a1d1fed5a9263 Mon Sep 17 00:00:00 2001 From: Johannes Klein Date: Tue, 15 Jul 2025 10:57:12 +0200 Subject: [PATCH 024/108] Update Input.js --- src/app/Input.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/Input.js b/src/app/Input.js index 697e848..5f02f96 100644 --- a/src/app/Input.js +++ b/src/app/Input.js @@ -250,7 +250,7 @@ const Input = ({ run }) => { )} {run.multifurcatingConstraint.notAvailable ? null : ( -
+ {run.multifurcatingConstraint.haveFile ? ( { Add Multifurcating Constraint )} -
+ )} From 6196b5e05926612f1d51994de978eac72242d8e3 Mon Sep 17 00:00:00 2001 From: Johannes Klein Date: Tue, 15 Jul 2025 10:57:17 +0200 Subject: [PATCH 025/108] Update Input.js --- src/app/Input.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/app/Input.js b/src/app/Input.js index 5f02f96..51b64a9 100644 --- a/src/app/Input.js +++ b/src/app/Input.js @@ -20,9 +20,6 @@ const useStyles = makeStyles((theme) => ({ // borderLeft: `5px solid ${theme.palette.secondary.main}`, padding: '10px', }, - alignments: { - display: 'flex', - }, addAlignmentOrPartition: { minWidth: '200px', flexGrow: 1, From e7da4dfbbc7e553016fb07927ec8c949c4241ff1 Mon Sep 17 00:00:00 2001 From: Johannes Klein Date: Tue, 15 Jul 2025 10:57:32 +0200 Subject: [PATCH 026/108] Update Input.js --- src/app/Input.js | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/src/app/Input.js b/src/app/Input.js index 51b64a9..9db4011 100644 --- a/src/app/Input.js +++ b/src/app/Input.js @@ -220,7 +220,14 @@ const Input = ({ run }) => { )} {run.backboneConstraint.notAvailable ? null : ( - + {run.backboneConstraint.haveFile ? ( { )} {run.multifurcatingConstraint.notAvailable ? null : ( - + {run.multifurcatingConstraint.haveFile ? ( Date: Tue, 15 Jul 2025 10:57:46 +0200 Subject: [PATCH 027/108] Update Input.js --- src/app/Input.js | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/app/Input.js b/src/app/Input.js index 9db4011..6af039e 100644 --- a/src/app/Input.js +++ b/src/app/Input.js @@ -13,13 +13,6 @@ import Dropzone from 'react-dropzone'; import { webUtils } from 'electron'; const useStyles = makeStyles((theme) => ({ - treeList: { - display: 'flex', - flexWrap: 'nowrap', - overflowX: 'auto', - // borderLeft: `5px solid ${theme.palette.secondary.main}`, - padding: '10px', - }, addAlignmentOrPartition: { minWidth: '200px', flexGrow: 1, @@ -194,8 +187,15 @@ const Input = ({ run }) => { {run.tree.notAvailable ? null : ( - -
+ + {run.tree.haveFile ? ( { Add Tree )} -
+ )} {run.backboneConstraint.notAvailable ? null : ( From 449d11ddb525ce19fb71e582b6785ce12fe871f4 Mon Sep 17 00:00:00 2001 From: Johannes Klein Date: Tue, 15 Jul 2025 10:58:03 +0200 Subject: [PATCH 028/108] Update Input.js --- src/app/Input.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/app/Input.js b/src/app/Input.js index 6af039e..e1f418f 100644 --- a/src/app/Input.js +++ b/src/app/Input.js @@ -13,10 +13,6 @@ import Dropzone from 'react-dropzone'; import { webUtils } from 'electron'; const useStyles = makeStyles((theme) => ({ - addAlignmentOrPartition: { - minWidth: '200px', - flexGrow: 1, - }, resultingPartitionCard: { width: '350px', height: '200px', @@ -164,7 +160,10 @@ const Input = ({ run }) => { > From e82e63b8da729e10bda76fb2c0a0434eb3c801d4 Mon Sep 17 00:00:00 2001 From: Johannes Klein Date: Wed, 23 Jul 2025 10:31:16 +0200 Subject: [PATCH 053/108] Update PartitionEditor.js --- src/app/PartitionEditor.js | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/app/PartitionEditor.js b/src/app/PartitionEditor.js index 158eb31..935402d 100644 --- a/src/app/PartitionEditor.js +++ b/src/app/PartitionEditor.js @@ -15,12 +15,6 @@ import LinearProgress from '@mui/material/LinearProgress'; import Typography from '@mui/material/Typography'; const useStyles = makeStyles(theme => ({ - Partition: { - backgroundColor: theme.palette.input.background, - display: 'flex', - flexDirection: 'column', - alignItems: 'flex-start' - }, formControl: { marginLeft: 5, marginRight: 10 @@ -53,7 +47,16 @@ function PartitionEditor({ alignment }) { const { partToAdd } = partition; return ( - ( + ( theme.palette.input.background, + display: 'flex', + flexDirection: 'column', + alignItems: 'flex-start' + }} + > Partition editor From df42c47d7fa0056cc8f1e029393a460da620e319 Mon Sep 17 00:00:00 2001 From: Johannes Klein Date: Wed, 23 Jul 2025 13:20:54 +0200 Subject: [PATCH 054/108] Update PartitionEditor.js --- src/app/PartitionEditor.js | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/app/PartitionEditor.js b/src/app/PartitionEditor.js index 935402d..38e8b3d 100644 --- a/src/app/PartitionEditor.js +++ b/src/app/PartitionEditor.js @@ -158,13 +158,6 @@ PartitionEditor.propTypes = { const PartitionEditorObserver = observer(PartitionEditor); const useStylesOnCard = makeStyles(theme => ({ - partition: { - padding: 0, - marginTop: -30, - backgroundColor: 'rgba(0,0,0,0)', // transparent background - display: 'flex', - alignItems: 'flex-start' - }, content: { padding: 0 }, @@ -200,7 +193,6 @@ function PartitionOnCard({ alignment }) { const hasChange = partitionText !== alignment.partitionText; return ( -
+
) : null } - ) + ) ); }; From 36e7444c30496a020721466e877dbaeb0be0aa30 Mon Sep 17 00:00:00 2001 From: Johannes Klein Date: Wed, 23 Jul 2025 23:30:22 +0200 Subject: [PATCH 067/108] Update Output.js --- src/app/Output.js | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/src/app/Output.js b/src/app/Output.js index 821042b..623dddd 100644 --- a/src/app/Output.js +++ b/src/app/Output.js @@ -10,12 +10,6 @@ import FileIcon from '@mui/icons-material/InsertDriveFileSharp'; import { join } from 'path'; const useStyles = makeStyles((theme) => ({ - form: { - width: '100%', - '& > *:not(:first-child)': { - marginTop: theme.spacing(3), - }, - }, })); const Output = ({ run }) => { @@ -26,13 +20,25 @@ const Output = ({ run }) => { const haveResult = resultFilenames.length > 0; return ( - ( + Date: Wed, 23 Jul 2025 23:30:26 +0200 Subject: [PATCH 068/108] Update Output.js --- src/app/Output.js | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/app/Output.js b/src/app/Output.js index 623dddd..a77f0c3 100644 --- a/src/app/Output.js +++ b/src/app/Output.js @@ -1,7 +1,6 @@ import React from 'react'; import { observer } from 'mobx-react'; import PropTypes from 'prop-types'; -import { makeStyles } from '@mui/styles'; import Box from '@mui/material/Box'; import TextField from '@mui/material/TextField'; import Button from '@mui/material/Button'; @@ -9,13 +8,7 @@ import { Link, Typography } from '@mui/material'; import FileIcon from '@mui/icons-material/InsertDriveFileSharp'; import { join } from 'path'; -const useStyles = makeStyles((theme) => ({ -})); - const Output = ({ run }) => { - - const classes = useStyles(); - const { resultFilenames } = run; const haveResult = resultFilenames.length > 0; From 97997faf56e317cbc664ed3eee57b40246969ecc Mon Sep 17 00:00:00 2001 From: Johannes Klein Date: Wed, 23 Jul 2025 23:38:49 +0200 Subject: [PATCH 069/108] Update PartitionFileCard.js --- src/app/PartitionFileCard.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/app/PartitionFileCard.js b/src/app/PartitionFileCard.js index c542910..8b61990 100644 --- a/src/app/PartitionFileCard.js +++ b/src/app/PartitionFileCard.js @@ -33,10 +33,6 @@ const useStyles = makeStyles((theme) => { deleteChipIcon: { opacity: 1, }, - partitionFileContainer: { - overflowY: 'auto', - height: '150px', - }, partitionFileContent: { color: theme.palette.primary.contrastText, fontFamily: 'Consolas, "Liberation Mono", Menlo, Courier, monospace', @@ -88,11 +84,16 @@ function PartitionFileCard({ className, run }) { style={{ paddingBottom: 4 }} /> -
+ { run.partitionFileContent } -
+ ); From e5ae8eb3f2887a2f23be13582a2bed585dd30520 Mon Sep 17 00:00:00 2001 From: Johannes Klein Date: Wed, 23 Jul 2025 23:39:19 +0200 Subject: [PATCH 070/108] Update PartitionFileCard.js --- src/app/PartitionFileCard.js | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/src/app/PartitionFileCard.js b/src/app/PartitionFileCard.js index 8b61990..72493d7 100644 --- a/src/app/PartitionFileCard.js +++ b/src/app/PartitionFileCard.js @@ -33,14 +33,6 @@ const useStyles = makeStyles((theme) => { deleteChipIcon: { opacity: 1, }, - partitionFileContent: { - color: theme.palette.primary.contrastText, - fontFamily: 'Consolas, "Liberation Mono", Menlo, Courier, monospace', - fontSize: '12px', - height: '100%', - overflowWrap: 'break-word', - whiteSpace: 'pre-wrap', - }, path: { cursor: 'pointer', color: theme.palette.secondary.main, @@ -84,15 +76,25 @@ function PartitionFileCard({ className, run }) { style={{ paddingBottom: 4 }} /> - + theme.palette.primary.contrastText, + fontFamily: 'Consolas, "Liberation Mono", Menlo, Courier, monospace', + fontSize: '12px', + height: '100%', + overflowWrap: 'break-word', + whiteSpace: 'pre-wrap', + }} + > { run.partitionFileContent } - + From 63f4d3d471d984122789c0a1954d539671ca84df Mon Sep 17 00:00:00 2001 From: Johannes Klein Date: Wed, 23 Jul 2025 23:40:46 +0200 Subject: [PATCH 071/108] Update PartitionFileCard.js --- src/app/PartitionFileCard.js | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/app/PartitionFileCard.js b/src/app/PartitionFileCard.js index 72493d7..f32ea08 100644 --- a/src/app/PartitionFileCard.js +++ b/src/app/PartitionFileCard.js @@ -19,12 +19,6 @@ const useStyles = makeStyles((theme) => { display: 'flex', flexDirection: 'column', }, - chip: { - height: '30px', - color: theme.palette.input.contrastText, - backgroundColor: theme.palette.input.main, - border: `1px solid ${theme.palette.input.darker}`, - }, deleteChip: { backgroundColor: 'transparent', border: 'none', @@ -54,7 +48,12 @@ function PartitionFileCard({ className, run }) { theme.palette.input.contrastText, + backgroundColor: (theme) => theme.palette.input.main, + border: (theme) => `1px solid ${theme.palette.input.darker}`, + }} label="Partition" color="secondary" /> From 032b283a708111a3af9f29cf441479c16ea713be Mon Sep 17 00:00:00 2001 From: Johannes Klein Date: Wed, 23 Jul 2025 23:41:25 +0200 Subject: [PATCH 072/108] Update PartitionFileCard.js --- src/app/PartitionFileCard.js | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/app/PartitionFileCard.js b/src/app/PartitionFileCard.js index f32ea08..b4262ed 100644 --- a/src/app/PartitionFileCard.js +++ b/src/app/PartitionFileCard.js @@ -12,13 +12,6 @@ import CardContent from '@mui/material/CardContent'; // const useStyles = makeStyles(theme => ({ const useStyles = makeStyles((theme) => { return { - PartitionFileCard: { - backgroundColor: theme.palette.input.light, - border: `1px solid ${theme.palette.input.border}`, - height: '200px', - display: 'flex', - flexDirection: 'column', - }, deleteChip: { backgroundColor: 'transparent', border: 'none', @@ -44,7 +37,15 @@ function PartitionFileCard({ className, run }) { } return ( - + theme.palette.input.light, + border: (theme) => `1px solid ${theme.palette.input.border}`, + height: '200px', + display: 'flex', + flexDirection: 'column', + }} + > Date: Wed, 23 Jul 2025 23:44:23 +0200 Subject: [PATCH 073/108] Update PartitionFileCard.js --- src/app/PartitionFileCard.js | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/src/app/PartitionFileCard.js b/src/app/PartitionFileCard.js index b4262ed..35bd645 100644 --- a/src/app/PartitionFileCard.js +++ b/src/app/PartitionFileCard.js @@ -12,14 +12,6 @@ import CardContent from '@mui/material/CardContent'; // const useStyles = makeStyles(theme => ({ const useStyles = makeStyles((theme) => { return { - deleteChip: { - backgroundColor: 'transparent', - border: 'none', - marginRight: -5, - }, - deleteChipIcon: { - opacity: 1, - }, path: { cursor: 'pointer', color: theme.palette.secondary.main, @@ -62,9 +54,13 @@ function PartitionFileCard({ className, run }) { action={
} onDelete={run.removePartitionFile} From c5034e9029893aebb46c865cec4c118f4faddc24 Mon Sep 17 00:00:00 2001 From: Johannes Klein Date: Wed, 23 Jul 2025 23:44:35 +0200 Subject: [PATCH 074/108] Update PartitionFileCard.js --- src/app/PartitionFileCard.js | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/src/app/PartitionFileCard.js b/src/app/PartitionFileCard.js index 35bd645..06e0cc9 100644 --- a/src/app/PartitionFileCard.js +++ b/src/app/PartitionFileCard.js @@ -1,29 +1,14 @@ import React from 'react'; import { observer } from 'mobx-react'; import PropTypes from 'prop-types'; -import { makeStyles } from '@mui/styles'; import DeleteForeverIcon from '@mui/icons-material/DeleteForever'; -import classNames from 'classnames'; import Chip from '@mui/material/Chip'; import Card from '@mui/material/Card'; import CardHeader from '@mui/material/CardHeader'; import CardContent from '@mui/material/CardContent'; - -// const useStyles = makeStyles(theme => ({ -const useStyles = makeStyles((theme) => { - return { - path: { - cursor: 'pointer', - color: theme.palette.secondary.main, - marginLeft: 4, - }, - }; -}); - +import Box from '@mui/material/Box'; function PartitionFileCard({ className, run }) { - const classes = useStyles(); - if (!run.havePartitionFile) { return null; } From a4f935412697a53d354f42cd7c877c17c3ed979b Mon Sep 17 00:00:00 2001 From: Johannes Klein Date: Wed, 23 Jul 2025 23:46:05 +0200 Subject: [PATCH 075/108] Update PartitionFileCard.js --- src/app/PartitionFileCard.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/app/PartitionFileCard.js b/src/app/PartitionFileCard.js index 06e0cc9..a9fc114 100644 --- a/src/app/PartitionFileCard.js +++ b/src/app/PartitionFileCard.js @@ -8,7 +8,7 @@ import CardHeader from '@mui/material/CardHeader'; import CardContent from '@mui/material/CardContent'; import Box from '@mui/material/Box'; -function PartitionFileCard({ className, run }) { +function PartitionFileCard({ run }) { if (!run.havePartitionFile) { return null; } @@ -84,7 +84,6 @@ function PartitionFileCard({ className, run }) { PartitionFileCard.propTypes = { run: PropTypes.object.isRequired, - className: PropTypes.string, }; const PartitionFileCardObserver = observer(PartitionFileCard); From 58592812aa629b34cc32fdfe3bb7827e24f1658c Mon Sep 17 00:00:00 2001 From: Johannes Klein Date: Thu, 24 Jul 2025 10:55:56 +0200 Subject: [PATCH 076/108] Update App.js --- src/app/App.js | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/app/App.js b/src/app/App.js index cf272b0..5c49a8c 100644 --- a/src/app/App.js +++ b/src/app/App.js @@ -107,9 +107,6 @@ const useStyles = makeStyles(theme => ({ rightPanel: { borderLeft: '1px solid #ccc', }, - ioWrapper: { - width: '100%', - }, ioItem: { width: '100%', height: '100%', @@ -120,9 +117,6 @@ const useStyles = makeStyles(theme => ({ borderBottom: '2px solid #ccc', backgroundColor: theme.palette.model.background, }, - input: { - backgroundColor: theme.palette.input.background, - }, output: { flexGrow: 1, backgroundColor: theme.palette.output.background, @@ -304,7 +298,10 @@ const App = () => { > theme.palette.input.background, + }} > Date: Thu, 24 Jul 2025 10:56:36 +0200 Subject: [PATCH 077/108] Update App.js --- src/app/App.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/app/App.js b/src/app/App.js index 5c49a8c..e662229 100644 --- a/src/app/App.js +++ b/src/app/App.js @@ -117,10 +117,6 @@ const useStyles = makeStyles(theme => ({ borderBottom: '2px solid #ccc', backgroundColor: theme.palette.model.background, }, - output: { - flexGrow: 1, - backgroundColor: theme.palette.output.background, - }, verticalHeading: { writingMode: 'vertical-rl', textOrientation: 'upright', @@ -327,7 +323,11 @@ const App = () => { theme.palette.output.background, + }} > Date: Thu, 24 Jul 2025 10:57:13 +0200 Subject: [PATCH 078/108] Update App.js --- src/app/App.js | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/app/App.js b/src/app/App.js index e662229..2a4b803 100644 --- a/src/app/App.js +++ b/src/app/App.js @@ -71,9 +71,6 @@ const useStyles = makeStyles(theme => ({ alignItems: 'center', justifyContent: 'space-between', }, - statusVersion: { - marginRight: 20, - }, statusCite: { color: theme.palette.status.contrastText, cursor: 'pointer', @@ -395,12 +392,12 @@ const App = () => { {/* In dev mode the app version shown is from electron, in production it is ours */} -
+ raxmlGUI {store.version} -
-
+ + {binary.value} {binary.version} -
+ From d04ff2e3c69af58e07ad154db7efb0ffccd29dca Mon Sep 17 00:00:00 2001 From: Johannes Klein Date: Thu, 24 Jul 2025 10:57:42 +0200 Subject: [PATCH 079/108] Update App.js --- src/app/App.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/app/App.js b/src/app/App.js index 2a4b803..069bc14 100644 --- a/src/app/App.js +++ b/src/app/App.js @@ -71,11 +71,6 @@ const useStyles = makeStyles(theme => ({ alignItems: 'center', justifyContent: 'space-between', }, - statusCite: { - color: theme.palette.status.contrastText, - cursor: 'pointer', - marginLeft: 20, - }, statusFeedback: { color: theme.palette.status.contrastText, marginLeft: 20, @@ -401,14 +396,19 @@ const App = () => { - theme.palette.status.contrastText, + cursor: 'pointer', + marginLeft: '20px', + }} onClick={store.citation.show} > How to cite? - href="mailto:raxmlgui.help@googlemail.com?subject=Feedback" > For questions or suggestions contact us! From 526379d41cf66f4679530b87b009a197941dfcaa Mon Sep 17 00:00:00 2001 From: Johannes Klein Date: Thu, 24 Jul 2025 11:20:47 +0200 Subject: [PATCH 080/108] Update App.js --- src/app/App.js | 68 +++++++++++++++++++++++++++++++++----------------- 1 file changed, 45 insertions(+), 23 deletions(-) diff --git a/src/app/App.js b/src/app/App.js index 069bc14..1e3d0f9 100644 --- a/src/app/App.js +++ b/src/app/App.js @@ -50,27 +50,6 @@ const useStyles = makeStyles(theme => ({ overflowY: 'auto', paddingBottom: '20px', }, - statusBar: { - top: 'auto', - bottom: 0, - height: 20, - minHeight: 20, - width: '100%', - margin: 0, - padding: 0, - backgroundColor: theme.palette.status.main, - borderTop: `1px solid ${theme.palette.status.border}`, - color: theme.palette.status.contrastText, - fontSize: 12, - }, - statusToolbar: { - minHeight: 20, - margin: 0, - padding: '0 8px', - display: 'flex', - alignItems: 'center', - justifyContent: 'space-between', - }, statusFeedback: { color: theme.palette.status.contrastText, marginLeft: 20, @@ -375,8 +354,51 @@ const App = () => { - - + theme.palette.status.main, + borderTop: (theme) => `1px solid ${theme.palette.status.border}`, + color: (theme) => theme.palette.status.contrastText, + fontSize: 12, + }} + > + store.config.setDarkMode(!store.config.isDarkMode)} size="small" From d35b0bdbcd445d44a6804d4233df3f59ab1589b7 Mon Sep 17 00:00:00 2001 From: Johannes Klein Date: Thu, 24 Jul 2025 11:21:21 +0200 Subject: [PATCH 081/108] Update App.js --- src/app/App.js | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/app/App.js b/src/app/App.js index 1e3d0f9..c9415bb 100644 --- a/src/app/App.js +++ b/src/app/App.js @@ -146,12 +146,6 @@ const useStyles = makeStyles(theme => ({ color: '#999', }, }, - Modal: { - margin: 'auto', - display: 'flex', - alignItems: 'center', - justifyContent: 'center', - } })); const App = () => { @@ -475,7 +469,12 @@ const App = () => { aria-labelledby="show-partition" open={true} onClose={run.hidePartition} - className={classes.Modal} + sx={{ + margin: 'auto', + display: 'flex', + alignItems: 'center', + justifyContent: 'center', + }} >
@@ -487,7 +486,12 @@ const App = () => { aria-labelledby="show-citation" open={true} onClose={store.citation.hide} - className={classes.Modal} + sx={{ + margin: 'auto', + display: 'flex', + alignItems: 'center', + justifyContent: 'center', + }} >
From 51d8a4ba33c288139401278895330fa81154d383 Mon Sep 17 00:00:00 2001 From: Johannes Klein Date: Thu, 24 Jul 2025 11:23:14 +0200 Subject: [PATCH 082/108] Update App.js --- src/app/App.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/app/App.js b/src/app/App.js index c9415bb..ea60482 100644 --- a/src/app/App.js +++ b/src/app/App.js @@ -50,10 +50,6 @@ const useStyles = makeStyles(theme => ({ overflowY: 'auto', paddingBottom: '20px', }, - statusFeedback: { - color: theme.palette.status.contrastText, - marginLeft: 20, - }, AppBar: { display: 'flex', flexDirection: 'row', @@ -422,13 +418,17 @@ const App = () => { onClick={store.citation.show} > How to cite? - + theme.palette.status.contrastText, + marginLeft: '20px', + }} > For questions or suggestions contact us! - + From d1da156c4f8db10a422c512ded3da0e9f5129360 Mon Sep 17 00:00:00 2001 From: Johannes Klein Date: Thu, 24 Jul 2025 11:24:05 +0200 Subject: [PATCH 083/108] Update App.js --- src/app/App.js | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/app/App.js b/src/app/App.js index ea60482..b8339d2 100644 --- a/src/app/App.js +++ b/src/app/App.js @@ -137,11 +137,6 @@ const useStyles = makeStyles(theme => ({ height: '100%', borderTop: '2px solid #ccc', }, - deleteIcon: { - '&:hover': { - color: '#999', - }, - }, })); const App = () => { @@ -332,7 +327,11 @@ const App = () => { {run.stdout === '' && run.stderr === '' ? null : ( )} From b1419eafdf17b2169943677f2c3b2dcd354d8b8f Mon Sep 17 00:00:00 2001 From: Johannes Klein Date: Thu, 24 Jul 2025 11:25:43 +0200 Subject: [PATCH 084/108] Update App.js --- src/app/App.js | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/app/App.js b/src/app/App.js index b8339d2..2839c70 100644 --- a/src/app/App.js +++ b/src/app/App.js @@ -79,11 +79,6 @@ const useStyles = makeStyles(theme => ({ height: '100%', overflowX: 'hidden', }, - model: { - borderTop: '2px solid #ccc', - borderBottom: '2px solid #ccc', - backgroundColor: theme.palette.model.background, - }, verticalHeading: { writingMode: 'vertical-rl', textOrientation: 'upright', @@ -129,14 +124,6 @@ const useStyles = makeStyles(theme => ({ outputContainer: { // backgroundColor: theme.palette.output.dark, }, - raxml: { - backgroundColor: theme.palette.raxml.background, - }, - console: { - backgroundColor: theme.palette.console.background, - height: '100%', - borderTop: '2px solid #ccc', - }, })); const App = () => { @@ -266,7 +253,12 @@ const App = () => { theme.palette.model.background, + }} > { > theme.palette.raxml.background, + }} > { theme.palette.console.background, + height: '100%', + borderTop: '2px solid #ccc', + }} > Date: Thu, 24 Jul 2025 11:27:18 +0200 Subject: [PATCH 085/108] Update App.js --- src/app/App.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/app/App.js b/src/app/App.js index 2839c70..9906104 100644 --- a/src/app/App.js +++ b/src/app/App.js @@ -55,9 +55,6 @@ const useStyles = makeStyles(theme => ({ flexDirection: 'row', backgroundColor: theme.palette.input.background, }, - Toolbar: { - minHeight: 0 - }, tab: { display: 'flex', alignItems: 'center', @@ -220,7 +217,7 @@ const App = () => { > {TabItems} - + From d24bf984f5aacd1404d722571f5f072f8c985c42 Mon Sep 17 00:00:00 2001 From: Johannes Klein Date: Thu, 24 Jul 2025 11:32:26 +0200 Subject: [PATCH 086/108] Update App.js --- src/app/App.js | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/app/App.js b/src/app/App.js index 9906104..e146844 100644 --- a/src/app/App.js +++ b/src/app/App.js @@ -50,11 +50,6 @@ const useStyles = makeStyles(theme => ({ overflowY: 'auto', paddingBottom: '20px', }, - AppBar: { - display: 'flex', - flexDirection: 'row', - backgroundColor: theme.palette.input.background, - }, tab: { display: 'flex', alignItems: 'center', @@ -210,7 +205,16 @@ const App = () => {
{store.runs.length <= 1 ? null : ( - + theme.palette.input.background, + borderBottom: (theme) => `1px solid ${theme.palette.status.border}`, + }} + > store.setActive(value)} From 2e4ec2fdc8f59f23dbd67328da6a764f708ffd79 Mon Sep 17 00:00:00 2001 From: Johannes Klein Date: Thu, 24 Jul 2025 11:32:55 +0200 Subject: [PATCH 087/108] Update App.js --- src/app/App.js | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/src/app/App.js b/src/app/App.js index e146844..bedc54a 100644 --- a/src/app/App.js +++ b/src/app/App.js @@ -50,17 +50,6 @@ const useStyles = makeStyles(theme => ({ overflowY: 'auto', paddingBottom: '20px', }, - tab: { - display: 'flex', - alignItems: 'center', - padding: '0 40px', - position: 'relative' - }, - tabChip: { - border: 'none', - }, - tabIcon: { - }, leftPanel: { }, rightPanel: { @@ -125,14 +114,20 @@ const App = () => { + @@ -143,7 +138,7 @@ const App = () => { }} variant="outlined" /> - + } /> )); From 84a63b1b8bca9c96012d2f3dbe23c149ffff5b62 Mon Sep 17 00:00:00 2001 From: Johannes Klein Date: Thu, 24 Jul 2025 11:37:40 +0200 Subject: [PATCH 088/108] Update App.js --- src/app/App.js | 54 ++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 39 insertions(+), 15 deletions(-) diff --git a/src/app/App.js b/src/app/App.js index bedc54a..074148e 100644 --- a/src/app/App.js +++ b/src/app/App.js @@ -105,6 +105,13 @@ const useStyles = makeStyles(theme => ({ outputContainer: { // backgroundColor: theme.palette.output.dark, }, +const VerticalHeading = styled(Typography)(({ theme }) => ({ + writingMode: 'vertical-rl', + textOrientation: 'upright', + padding: '10px 5px', + letterSpacing: '0.25em', + textTransform: 'uppercase', + borderRight: '1px solid #ccc', })); const App = () => { @@ -238,12 +245,16 @@ const App = () => { backgroundColor: (theme) => theme.palette.input.background, }} > - theme.palette.input.main, + borderRight: (theme) => + `1px solid ${theme.palette.input.border}`, + }} > Input -
+
@@ -256,12 +267,16 @@ const App = () => { backgroundColor: (theme) => theme.palette.model.background, }} > - theme.palette.model.main, + borderRight: (theme) => + `1px solid ${theme.palette.model.border}`, + }} > Analysis -
+
@@ -273,12 +288,16 @@ const App = () => { backgroundColor: (theme) => theme.palette.output.background, }} > - theme.palette.output.main, + borderRight: (theme) => + `1px solid ${theme.palette.output.border}`, + }} > Output -
+
@@ -298,12 +317,14 @@ const App = () => { backgroundColor: (theme) => theme.palette.raxml.background, }} > - theme.palette.raxml.main, + }} > RAxML -
+
@@ -316,8 +337,11 @@ const App = () => { borderTop: '2px solid #ccc', }} > - theme.palette.console.main, + zIndex: 10, + }} > Console {run.stdout === '' && run.stderr === '' ? null : ( @@ -331,8 +355,8 @@ const App = () => { title="Clear console" /> )} -
+
From 00fa31703c9b9e60c655a8a011a7e754fa756ca5 Mon Sep 17 00:00:00 2001 From: Johannes Klein Date: Thu, 24 Jul 2025 12:37:09 +0200 Subject: [PATCH 089/108] Update App.js --- src/app/App.js | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/app/App.js b/src/app/App.js index 074148e..bd6876f 100644 --- a/src/app/App.js +++ b/src/app/App.js @@ -38,12 +38,6 @@ import ModifiedDialog from './components/ModifiedDialog'; import './App.css'; const useStyles = makeStyles(theme => ({ - App: { - display: 'flex', - flexDirection: 'column', - height: '100vh', - backgroundColor: theme.palette.primary.background, - }, ioContainer: { // height: 'calc(100vh - 20px)', height: '100%', @@ -205,7 +199,14 @@ const App = () => { return ( -
+ theme.palette.primary.background, + }} + > {store.runs.length <= 1 ? null : ( { ) : null} -
+ ); }; From cc3cf919b18dcb2de15b0fbceef60695bf2c6280 Mon Sep 17 00:00:00 2001 From: Johannes Klein Date: Thu, 24 Jul 2025 12:37:18 +0200 Subject: [PATCH 090/108] Update App.js --- src/app/App.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/App.js b/src/app/App.js index bd6876f..f7d1c7b 100644 --- a/src/app/App.js +++ b/src/app/App.js @@ -99,6 +99,7 @@ const useStyles = makeStyles(theme => ({ outputContainer: { // backgroundColor: theme.palette.output.dark, }, +// Styled components for main layout const VerticalHeading = styled(Typography)(({ theme }) => ({ writingMode: 'vertical-rl', textOrientation: 'upright', From 6ba66f0415b4eee43f96b37165a1df993cd91f36 Mon Sep 17 00:00:00 2001 From: Johannes Klein Date: Thu, 24 Jul 2025 12:38:43 +0200 Subject: [PATCH 091/108] Update App.js --- src/app/App.js | 42 +++++++++++++++++++----------------------- 1 file changed, 19 insertions(+), 23 deletions(-) diff --git a/src/app/App.js b/src/app/App.js index f7d1c7b..dec905f 100644 --- a/src/app/App.js +++ b/src/app/App.js @@ -38,22 +38,6 @@ import ModifiedDialog from './components/ModifiedDialog'; import './App.css'; const useStyles = makeStyles(theme => ({ - ioContainer: { - // height: 'calc(100vh - 20px)', - height: '100%', - overflowY: 'auto', - paddingBottom: '20px', - }, - leftPanel: { - }, - rightPanel: { - borderLeft: '1px solid #ccc', - }, - ioItem: { - width: '100%', - height: '100%', - overflowX: 'hidden', - }, verticalHeading: { writingMode: 'vertical-rl', textOrientation: 'upright', @@ -90,9 +74,6 @@ const useStyles = makeStyles(theme => ({ // boxShadow: `2px 0 5px ${theme.palette.console.shadow}`, zIndex: 10, }, - inputContainer: { - // backgroundColor: theme.palette.input.dark, - }, modelContainer: { // backgroundColor: theme.palette.model.dark, }, @@ -238,7 +219,11 @@ const App = () => { { }} > Input -
+ -
+ { Date: Thu, 24 Jul 2025 12:38:52 +0200 Subject: [PATCH 092/108] Update App.js --- src/app/App.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/app/App.js b/src/app/App.js index dec905f..3d3bba0 100644 --- a/src/app/App.js +++ b/src/app/App.js @@ -197,7 +197,8 @@ const App = () => { display: 'flex', flexDirection: 'row', backgroundColor: (theme) => theme.palette.input.background, - borderBottom: (theme) => `1px solid ${theme.palette.status.border}`, + borderBottom: (theme) => + `1px solid ${theme.palette.status.border}`, }} > Date: Thu, 24 Jul 2025 12:39:04 +0200 Subject: [PATCH 093/108] Update App.js --- src/app/App.js | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/app/App.js b/src/app/App.js index 3d3bba0..f4c9394 100644 --- a/src/app/App.js +++ b/src/app/App.js @@ -74,9 +74,6 @@ const useStyles = makeStyles(theme => ({ // boxShadow: `2px 0 5px ${theme.palette.console.shadow}`, zIndex: 10, }, - modelContainer: { - // backgroundColor: theme.palette.model.dark, - }, outputContainer: { // backgroundColor: theme.palette.output.dark, }, @@ -269,10 +266,16 @@ const App = () => { }} > Analysis -
+ -
+ Date: Thu, 24 Jul 2025 12:39:11 +0200 Subject: [PATCH 094/108] Update App.js --- src/app/App.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/app/App.js b/src/app/App.js index f4c9394..b7375ea 100644 --- a/src/app/App.js +++ b/src/app/App.js @@ -325,10 +325,16 @@ const App = () => { }} > RAxML -
+ -
+ Date: Thu, 24 Jul 2025 12:39:16 +0200 Subject: [PATCH 095/108] Update App.js --- src/app/App.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/app/App.js b/src/app/App.js index b7375ea..d237a0e 100644 --- a/src/app/App.js +++ b/src/app/App.js @@ -363,10 +363,16 @@ const App = () => { title="Clear console" /> )} -
+ -
+ From d3e34139f27802fe716e50d198f76f22d87396c2 Mon Sep 17 00:00:00 2001 From: Johannes Klein Date: Thu, 24 Jul 2025 12:39:25 +0200 Subject: [PATCH 096/108] Update App.js --- src/app/App.js | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/app/App.js b/src/app/App.js index d237a0e..87dbb56 100644 --- a/src/app/App.js +++ b/src/app/App.js @@ -74,9 +74,6 @@ const useStyles = makeStyles(theme => ({ // boxShadow: `2px 0 5px ${theme.palette.console.shadow}`, zIndex: 10, }, - outputContainer: { - // backgroundColor: theme.palette.output.dark, - }, // Styled components for main layout const VerticalHeading = styled(Typography)(({ theme }) => ({ writingMode: 'vertical-rl', @@ -293,10 +290,16 @@ const App = () => { }} > Output -
+ -
+ From bcc1878c94285c7ef15f22289d5f869d21996b75 Mon Sep 17 00:00:00 2001 From: Johannes Klein Date: Thu, 24 Jul 2025 12:40:07 +0200 Subject: [PATCH 097/108] Update App.js --- src/app/App.js | 41 +---------------------------------------- 1 file changed, 1 insertion(+), 40 deletions(-) diff --git a/src/app/App.js b/src/app/App.js index 87dbb56..2cb55b0 100644 --- a/src/app/App.js +++ b/src/app/App.js @@ -1,9 +1,8 @@ import React from 'react'; import { observer } from 'mobx-react'; -import clsx from 'clsx'; import { Allotment } from 'allotment'; import 'allotment/dist/style.css'; -import { makeStyles } from '@mui/styles'; +import { styled } from '@mui/material/styles'; import CssBaseline from '@mui/material/CssBaseline'; import IconButton from '@mui/material/IconButton'; import Chip from '@mui/material/Chip'; @@ -37,43 +36,6 @@ import ModifiedDialog from './components/ModifiedDialog'; import './App.css'; -const useStyles = makeStyles(theme => ({ - verticalHeading: { - writingMode: 'vertical-rl', - textOrientation: 'upright', - // textAlign: 'right', - // transform: 'rotate(180deg)', - // textAlign: 'center', - padding: '10px 5px', - // fontWeight: 'bold', - letterSpacing: '0.25em', - textTransform: 'uppercase', - borderRight: '1px solid #ccc', - }, - inputHeading: { - backgroundColor: theme.palette.input.main, - borderRight: `1px solid ${theme.palette.input.border}`, - // boxShadow: `2px 0 5px ${theme.palette.input.shadow}`, - }, - modelHeading: { - backgroundColor: theme.palette.model.main, - borderRight: `1px solid ${theme.palette.model.border}`, - // boxShadow: `2px 0 5px ${theme.palette.model.shadow}`, - }, - outputHeading: { - backgroundColor: theme.palette.output.main, - borderRight: `1px solid ${theme.palette.output.border}`, - // boxShadow: `2px 0 5px ${theme.palette.output.shadow}`, - }, - raxmlHeading: { - backgroundColor: theme.palette.raxml.main, - // boxShadow: `2px 0 5px ${theme.palette.raxml.shadow}`, - }, - consoleHeading: { - backgroundColor: theme.palette.console.main, - // boxShadow: `2px 0 5px ${theme.palette.console.shadow}`, - zIndex: 10, - }, // Styled components for main layout const VerticalHeading = styled(Typography)(({ theme }) => ({ writingMode: 'vertical-rl', @@ -85,7 +47,6 @@ const VerticalHeading = styled(Typography)(({ theme }) => ({ })); const App = () => { - const classes = useStyles(); const TabItems = store.runs.map((run) => ( Date: Thu, 24 Jul 2025 13:51:20 +0200 Subject: [PATCH 098/108] Update Console.js --- src/app/Console.js | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/app/Console.js b/src/app/Console.js index e4a5ad5..207158e 100644 --- a/src/app/Console.js +++ b/src/app/Console.js @@ -6,20 +6,6 @@ import clsx from 'clsx'; const styles = theme => ({ - Console: { - color: theme.palette.console.contrastText, - background: theme.palette.console.background, - // flexGrow: 1, - // padding: '0 4px', - padding: '10px', - width: '100% ', - height: '100%', - }, - stdoutContainer: { - overflowY: 'auto', - height: '100%', - position: 'relative', - }, code: { color: theme.palette.console.contrastText, fontFamily: 'Consolas, "Liberation Mono", Menlo, Courier, monospace', @@ -63,15 +49,23 @@ class Console extends React.Component { render() { const { run, classes } = this.props; return ( -
theme.palette.console.contrastText, + background: (theme) => theme.palette.console.background, + padding: '10px', + width: '100%', + height: '100%', + overflowY: 'auto', + position: 'relative', + }} >
{run.stdout && {run.stdout}} {run.stderr && {run.stderr}}
-
+ ); } } From 235b997532fdb3ee620f1aaa2d0c7acd6afd3a30 Mon Sep 17 00:00:00 2001 From: Johannes Klein Date: Thu, 24 Jul 2025 13:51:48 +0200 Subject: [PATCH 099/108] Update Console.js --- src/app/Console.js | 58 +++++++++++++++++++++++++++++----------------- 1 file changed, 37 insertions(+), 21 deletions(-) diff --git a/src/app/Console.js b/src/app/Console.js index 207158e..15ae338 100644 --- a/src/app/Console.js +++ b/src/app/Console.js @@ -1,23 +1,7 @@ import React from 'react'; import { observer } from 'mobx-react'; import PropTypes from 'prop-types'; -import { withStyles } from '@mui/styles'; -import clsx from 'clsx'; - - -const styles = theme => ({ - code: { - color: theme.palette.console.contrastText, - fontFamily: 'Consolas, "Liberation Mono", Menlo, Courier, monospace', - fontSize: '12px', - height: '100%', - position: 'absolute', - width: '100%', - // overflowWrap: 'anywhere', // currently not available in Chrome - whiteSpace: 'pre-wrap', - wordBreak: 'break-all', - } -}); +import Box from '@mui/material/Box'; @observer class Console extends React.Component { @@ -47,7 +31,7 @@ class Console extends React.Component { }; render() { - const { run, classes } = this.props; + const { run } = this.props; return (
- {run.stdout && {run.stdout}} - {run.stderr && {run.stderr}} + {run.stdout && ( + theme.palette.console.contrastText, + fontFamily: 'Consolas, "Liberation Mono", Menlo, Courier, monospace', + fontSize: '12px', + height: '100%', + position: 'absolute', + width: '100%', + whiteSpace: 'pre-wrap', + wordBreak: 'break-all', + }} + > + {run.stdout} + + )} + {run.stderr && ( + theme.palette.console.contrastText, + fontFamily: 'Consolas, "Liberation Mono", Menlo, Courier, monospace', + fontSize: '12px', + height: '100%', + position: 'absolute', + width: '100%', + whiteSpace: 'pre-wrap', + wordBreak: 'break-all', + }} + > + {run.stderr} + + )}
); @@ -74,4 +90,4 @@ Console.propTypes = { run: PropTypes.object.isRequired }; -export default withStyles(styles)(Console); +export default Console; From 58ba656f2baa48e793312fdff8267de88a54435c Mon Sep 17 00:00:00 2001 From: Johannes Klein Date: Thu, 24 Jul 2025 13:56:18 +0200 Subject: [PATCH 100/108] Remove clsx --- package.json | 1 - yarn.lock | 5 ----- 2 files changed, 6 deletions(-) diff --git a/package.json b/package.json index 53373d5..42fa697 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,6 @@ "allotment": "^1.20.4", "classnames": "^2.3.2", "clean-stack": "3.0.1", - "clsx": "^1.2.1", "computed-async-mobx": "^4.2.0", "cpus": "^1.0.3", "d3-array": "^3.2.4", diff --git a/yarn.lock b/yarn.lock index ec905fb..e31b309 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5368,11 +5368,6 @@ clone-response@^1.0.2: dependencies: mimic-response "^1.0.0" -clsx@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/clsx/-/clsx-1.2.1.tgz#0ddc4a20a549b59c93a4116bb26f5294ca17dc12" - integrity sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg== - clsx@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/clsx/-/clsx-2.1.1.tgz#eed397c9fd8bd882bfb18deab7102049a2f32999" From 166120ac54760edd3d0dc07ababb92638e9dd060 Mon Sep 17 00:00:00 2001 From: Johannes Klein Date: Thu, 24 Jul 2025 14:04:55 +0200 Subject: [PATCH 101/108] Update AlignmentCard.js --- src/app/AlignmentCard.js | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/app/AlignmentCard.js b/src/app/AlignmentCard.js index 681469e..ce9f3bd 100644 --- a/src/app/AlignmentCard.js +++ b/src/app/AlignmentCard.js @@ -1,7 +1,7 @@ import React from 'react'; import { observer } from 'mobx-react'; import PropTypes from 'prop-types'; -import { withStyles } from '@mui/styles'; +import { styled } from '@mui/material/styles'; import IconButton from '@mui/material/IconButton'; import MoreVertIcon from '@mui/icons-material/MoreVert'; import DeleteForeverIcon from '@mui/icons-material/DeleteForever'; @@ -22,8 +22,8 @@ import CardActions from '@mui/material/CardActions'; import Box from '@mui/material/Box'; import Button from '@mui/material/Button'; -const InputSwitch = withStyles((theme) => ({ - switchBase: { +const InputSwitch = styled(Switch)(({ theme }) => ({ + '& .MuiSwitch-switchBase': { color: theme.palette.input.secondaryText, '&.Mui-checked': { color: theme.palette.input.dark, @@ -32,9 +32,7 @@ const InputSwitch = withStyles((theme) => ({ backgroundColor: theme.palette.input.dark, }, }, - checked: {}, - track: {}, -}))(Switch); +})); function _ModelTestButton({ alignment }) { if (!alignment.modelTestCanRun) { From f3b572b7761dc4e328130f7fc6134ef2e9aa1202 Mon Sep 17 00:00:00 2001 From: Johannes Klein Date: Thu, 24 Jul 2025 14:14:03 +0200 Subject: [PATCH 102/108] Update AlignmentCard.js --- src/app/AlignmentCard.js | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/src/app/AlignmentCard.js b/src/app/AlignmentCard.js index ce9f3bd..6e6b97c 100644 --- a/src/app/AlignmentCard.js +++ b/src/app/AlignmentCard.js @@ -1,7 +1,6 @@ import React from 'react'; import { observer } from 'mobx-react'; import PropTypes from 'prop-types'; -import { styled } from '@mui/material/styles'; import IconButton from '@mui/material/IconButton'; import MoreVertIcon from '@mui/icons-material/MoreVert'; import DeleteForeverIcon from '@mui/icons-material/DeleteForever'; @@ -22,18 +21,6 @@ import CardActions from '@mui/material/CardActions'; import Box from '@mui/material/Box'; import Button from '@mui/material/Button'; -const InputSwitch = styled(Switch)(({ theme }) => ({ - '& .MuiSwitch-switchBase': { - color: theme.palette.input.secondaryText, - '&.Mui-checked': { - color: theme.palette.input.dark, - }, - '&.Mui-checked + .Mui-track': { - backgroundColor: theme.palette.input.dark, - }, - }, -})); - function _ModelTestButton({ alignment }) { if (!alignment.modelTestCanRun) { return null; @@ -384,7 +371,7 @@ function FinalAlignmentCard({ sx, alignment }) { { alignment.setFillTaxonGapsWithEmptySeqeunces( @@ -392,6 +379,14 @@ function FinalAlignmentCard({ sx, alignment }) { ); }} value="fillTaxonGapsWithEmptySeqeunces" + sx={{ + '& .MuiSwitch-switchBase': { + color: (theme) => theme.palette.input.secondaryText, + '&.Mui-checked': { + color: (theme) => theme.palette.input.dark, + }, + }, + }} /> } label={ From 950ddf73e13df56feb696c0548d4e47d07ebb28d Mon Sep 17 00:00:00 2001 From: Johannes Klein Date: Thu, 24 Jul 2025 14:15:09 +0200 Subject: [PATCH 103/108] Update Raxml.js --- src/app/Raxml.js | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/app/Raxml.js b/src/app/Raxml.js index b823ce0..c80f099 100644 --- a/src/app/Raxml.js +++ b/src/app/Raxml.js @@ -18,12 +18,6 @@ const styles = (theme) => ({ width: '100%', flexShrink: 0, }, - form: { - // '& > *:not(:first-child)': { - '& > *+*': { - marginLeft: '20px', - }, - }, formItem: { // marginRight: '20px', }, @@ -65,10 +59,14 @@ class Raxml extends React.Component { mt={1} mb={2} display="flex" - className={classes.form} noValidate autoComplete="off" alignItems="center" + sx={{ + '& > *+*': { + marginLeft: '20px', + }, + }} > From fb3e9518c459086afd55cf4161804acea0357900 Mon Sep 17 00:00:00 2001 From: Johannes Klein Date: Thu, 24 Jul 2025 14:15:36 +0200 Subject: [PATCH 104/108] Update Raxml.js --- src/app/Raxml.js | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/app/Raxml.js b/src/app/Raxml.js index c80f099..cc722b4 100644 --- a/src/app/Raxml.js +++ b/src/app/Raxml.js @@ -18,9 +18,6 @@ const styles = (theme) => ({ width: '100%', flexShrink: 0, }, - formItem: { - // marginRight: '20px', - }, button: { marginRight: theme.spacing(1), }, @@ -68,8 +65,8 @@ class Raxml extends React.Component { }, }} > - - + + {run.modelTestIsRunningOnAlignment ? ( ) : null} @@ -113,8 +91,7 @@ class Raxml extends React.Component { } Raxml.propTypes = { - classes: PropTypes.object.isRequired, run: PropTypes.object.isRequired, }; -export default withStyles(styles)(Raxml); +export default Raxml; From c31fc31ca4efcd400449668deb267046cf84d8b3 Mon Sep 17 00:00:00 2001 From: Johannes Klein Date: Thu, 24 Jul 2025 14:28:00 +0200 Subject: [PATCH 108/108] Remove mui styles --- package.json | 1 - yarn.lock | 120 +-------------------------------------------------- 2 files changed, 2 insertions(+), 119 deletions(-) diff --git a/package.json b/package.json index 42fa697..f8c00f9 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,6 @@ "@mui/icons-material": "^6.5.0", "@mui/lab": "^6.0.1-beta.36", "@mui/material": "^6.5.0", - "@mui/styles": "^6.5.0", "@sentry/electron": "^4.0.2", "allotment": "^1.20.4", "classnames": "^2.3.2", diff --git a/yarn.lock b/yarn.lock index e31b309..673f200 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1848,7 +1848,7 @@ resolved "https://registry.yarnpkg.com/@babel/regjsgen/-/regjsgen-0.8.0.tgz#f0ba69b075e1f05fb2825b7fad991e7adbb18310" integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA== -"@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.15.4", "@babel/runtime@^7.16.3", "@babel/runtime@^7.18.3", "@babel/runtime@^7.26.0", "@babel/runtime@^7.3.1", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7": +"@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.15.4", "@babel/runtime@^7.16.3", "@babel/runtime@^7.18.3", "@babel/runtime@^7.26.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7": version "7.27.6" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.27.6.tgz#ec4070a04d76bae8ddbb10770ba55714a417b7c6" integrity sha512-vbavdySgbTTrmFE+EsiqUTzlOr5bzlnJtUv9PynGCAKvfQqjIXbvFdumPM/GxMDfyuGMJaJAU6TO4zc1Jf1i8Q== @@ -2743,29 +2743,6 @@ csstype "^3.1.3" prop-types "^15.8.1" -"@mui/styles@^6.5.0": - version "6.5.0" - resolved "https://registry.yarnpkg.com/@mui/styles/-/styles-6.5.0.tgz#52f67c5b10b66b84300717923d20aba13d6d05bd" - integrity sha512-DeE/S/l6adnMpKfgx6l7UaQwYuf+gD4FCp6En3Vdg2Er+CTArj4DcHNFVzb8HZ2nNqACwmSm16/P08m1vAxv2w== - dependencies: - "@babel/runtime" "^7.26.0" - "@emotion/hash" "^0.9.2" - "@mui/private-theming" "^6.4.9" - "@mui/types" "~7.2.24" - "@mui/utils" "^6.4.9" - clsx "^2.1.1" - csstype "^3.1.3" - hoist-non-react-statics "^3.3.2" - jss "^10.10.0" - jss-plugin-camel-case "^10.10.0" - jss-plugin-default-unit "^10.10.0" - jss-plugin-global "^10.10.0" - jss-plugin-nested "^10.10.0" - jss-plugin-props-sort "^10.10.0" - jss-plugin-rule-value-function "^10.10.0" - jss-plugin-vendor-prefixer "^10.10.0" - prop-types "^15.8.1" - "@mui/system@^6.5.0": version "6.5.0" resolved "https://registry.yarnpkg.com/@mui/system/-/system-6.5.0.tgz#52751ac4e3a546f53bc34fd2ef2731c28a824b92" @@ -5854,14 +5831,6 @@ css-tree@^1.1.2, css-tree@^1.1.3: mdn-data "2.0.14" source-map "^0.6.1" -css-vendor@^2.0.8: - version "2.0.8" - resolved "https://registry.yarnpkg.com/css-vendor/-/css-vendor-2.0.8.tgz#e47f91d3bd3117d49180a3c935e62e3d9f7f449d" - integrity sha512-x9Aq0XTInxrkuFeHKbYC7zWY8ai7qJ04Kxd9MnvbC1uO5DagxoHQjm4JvG+vCdXOoFtCjbL2XSZfxmoYa9uQVQ== - dependencies: - "@babel/runtime" "^7.8.3" - is-in-browser "^1.0.2" - css-what@^3.2.1: version "3.4.2" resolved "https://registry.yarnpkg.com/css-what/-/css-what-3.4.2.tgz#ea7026fcb01777edbde52124e21f327e7ae950e4" @@ -8393,7 +8362,7 @@ he@^1.2.0: resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw== -hoist-non-react-statics@^3.3.1, hoist-non-react-statics@^3.3.2: +hoist-non-react-statics@^3.3.1: version "3.3.2" resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45" integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw== @@ -8657,11 +8626,6 @@ human-signals@^2.1.0: resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw== -hyphenate-style-name@^1.0.3: - version "1.1.0" - resolved "https://registry.yarnpkg.com/hyphenate-style-name/-/hyphenate-style-name-1.1.0.tgz#1797bf50369588b47b72ca6d5e65374607cf4436" - integrity sha512-WDC/ui2VVRrz3jOVi+XtjqkDjiVjTtFaAGiW37k6b+ohyQ5wYDOGkvCZa8+H0nx3gyvv0+BST9xuOgIyGQ00gw== - iconv-corefoundation@^1.1.7: version "1.1.7" resolved "https://registry.yarnpkg.com/iconv-corefoundation/-/iconv-corefoundation-1.1.7.tgz#31065e6ab2c9272154c8b0821151e2c88f1b002a" @@ -9079,11 +9043,6 @@ is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1: dependencies: is-extglob "^2.1.1" -is-in-browser@^1.0.2, is-in-browser@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/is-in-browser/-/is-in-browser-1.1.3.tgz#56ff4db683a078c6082eb95dad7dc62e1d04f835" - integrity sha512-FeXIBgG/CPGd/WUxuEyvgGTEfwiG9Z4EKGxjNMRqviiIIfsmgrpnHLffEDdwUHqNva1VEW91o3xBT/m8Elgl9g== - is-map@^2.0.2, is-map@^2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.3.tgz#ede96b7fe1e270b3c4465e3a465658764926d62e" @@ -10119,76 +10078,6 @@ jsprim@^1.2.2: json-schema "0.4.0" verror "1.10.0" -jss-plugin-camel-case@^10.10.0: - version "10.10.0" - resolved "https://registry.yarnpkg.com/jss-plugin-camel-case/-/jss-plugin-camel-case-10.10.0.tgz#27ea159bab67eb4837fa0260204eb7925d4daa1c" - integrity sha512-z+HETfj5IYgFxh1wJnUAU8jByI48ED+v0fuTuhKrPR+pRBYS2EDwbusU8aFOpCdYhtRc9zhN+PJ7iNE8pAWyPw== - dependencies: - "@babel/runtime" "^7.3.1" - hyphenate-style-name "^1.0.3" - jss "10.10.0" - -jss-plugin-default-unit@^10.10.0: - version "10.10.0" - resolved "https://registry.yarnpkg.com/jss-plugin-default-unit/-/jss-plugin-default-unit-10.10.0.tgz#db3925cf6a07f8e1dd459549d9c8aadff9804293" - integrity sha512-SvpajxIECi4JDUbGLefvNckmI+c2VWmP43qnEy/0eiwzRUsafg5DVSIWSzZe4d2vFX1u9nRDP46WCFV/PXVBGQ== - dependencies: - "@babel/runtime" "^7.3.1" - jss "10.10.0" - -jss-plugin-global@^10.10.0: - version "10.10.0" - resolved "https://registry.yarnpkg.com/jss-plugin-global/-/jss-plugin-global-10.10.0.tgz#1c55d3c35821fab67a538a38918292fc9c567efd" - integrity sha512-icXEYbMufiNuWfuazLeN+BNJO16Ge88OcXU5ZDC2vLqElmMybA31Wi7lZ3lf+vgufRocvPj8443irhYRgWxP+A== - dependencies: - "@babel/runtime" "^7.3.1" - jss "10.10.0" - -jss-plugin-nested@^10.10.0: - version "10.10.0" - resolved "https://registry.yarnpkg.com/jss-plugin-nested/-/jss-plugin-nested-10.10.0.tgz#db872ed8925688806e77f1fc87f6e62264513219" - integrity sha512-9R4JHxxGgiZhurDo3q7LdIiDEgtA1bTGzAbhSPyIOWb7ZubrjQe8acwhEQ6OEKydzpl8XHMtTnEwHXCARLYqYA== - dependencies: - "@babel/runtime" "^7.3.1" - jss "10.10.0" - tiny-warning "^1.0.2" - -jss-plugin-props-sort@^10.10.0: - version "10.10.0" - resolved "https://registry.yarnpkg.com/jss-plugin-props-sort/-/jss-plugin-props-sort-10.10.0.tgz#67f4dd4c70830c126f4ec49b4b37ccddb680a5d7" - integrity sha512-5VNJvQJbnq/vRfje6uZLe/FyaOpzP/IH1LP+0fr88QamVrGJa0hpRRyAa0ea4U/3LcorJfBFVyC4yN2QC73lJg== - dependencies: - "@babel/runtime" "^7.3.1" - jss "10.10.0" - -jss-plugin-rule-value-function@^10.10.0: - version "10.10.0" - resolved "https://registry.yarnpkg.com/jss-plugin-rule-value-function/-/jss-plugin-rule-value-function-10.10.0.tgz#7d99e3229e78a3712f78ba50ab342e881d26a24b" - integrity sha512-uEFJFgaCtkXeIPgki8ICw3Y7VMkL9GEan6SqmT9tqpwM+/t+hxfMUdU4wQ0MtOiMNWhwnckBV0IebrKcZM9C0g== - dependencies: - "@babel/runtime" "^7.3.1" - jss "10.10.0" - tiny-warning "^1.0.2" - -jss-plugin-vendor-prefixer@^10.10.0: - version "10.10.0" - resolved "https://registry.yarnpkg.com/jss-plugin-vendor-prefixer/-/jss-plugin-vendor-prefixer-10.10.0.tgz#c01428ef5a89f2b128ec0af87a314d0c767931c7" - integrity sha512-UY/41WumgjW8r1qMCO8l1ARg7NHnfRVWRhZ2E2m0DMYsr2DD91qIXLyNhiX83hHswR7Wm4D+oDYNC1zWCJWtqg== - dependencies: - "@babel/runtime" "^7.3.1" - css-vendor "^2.0.8" - jss "10.10.0" - -jss@10.10.0, jss@^10.10.0: - version "10.10.0" - resolved "https://registry.yarnpkg.com/jss/-/jss-10.10.0.tgz#a75cc85b0108c7ac8c7b7d296c520a3e4fbc6ccc" - integrity sha512-cqsOTS7jqPsPMjtKYDUpdFC0AbhYFLTcuGRqymgmdJIeQ8cH7+AgX7YSgQy79wXloZq2VvATYxUOUQEvS1V/Zw== - dependencies: - "@babel/runtime" "^7.3.1" - csstype "^3.0.2" - is-in-browser "^1.1.3" - tiny-warning "^1.0.2" - "jsx-ast-utils@^2.4.1 || ^3.0.0", jsx-ast-utils@^3.3.5: version "3.3.5" resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz#4766bd05a8e2a11af222becd19e15575e52a853a" @@ -14533,11 +14422,6 @@ timed-out@^4.0.1: resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f" integrity sha512-G7r3AhovYtr5YKOWQkta8RKAPb+J9IsO4uVmzjl8AZwfhs8UcUwTiD6gcJYSgOtzyjvQKrKYn41syHbUWMkafA== -tiny-warning@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.3.tgz#94a30db453df4c643d0fd566060d60a875d84754" - integrity sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA== - tmp-promise@^3.0.2: version "3.0.3" resolved "https://registry.yarnpkg.com/tmp-promise/-/tmp-promise-3.0.3.tgz#60a1a1cc98c988674fcbfd23b6e3367bdeac4ce7"