From cac1b2109dedadf79e0ab7ac837fa398b9c34a0f Mon Sep 17 00:00:00 2001 From: Daniela Date: Tue, 16 Jan 2024 13:50:10 +0100 Subject: [PATCH] migrate to mantine7 --- package.json | 3 ++- src/Backend/ReactionCIMEBackend.ts | 5 ++++- src/ReactionCIMEApp.tsx | 9 ++++----- src/Utility/HeaderCustomization.tsx | 6 +++--- src/initialize.tsx | 2 +- 5 files changed, 14 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index bdb3c3e..e43f84c 100644 --- a/package.json +++ b/package.json @@ -90,7 +90,8 @@ "@types/react-dom": "~18.2.0", "react": "~18.2.0", "react-dom": "~18.2.0", - "vega-lite@4.16.8": "patch:vega-lite@npm:4.16.8#.yarn/patches/vega-lite-npm-4.16.8-2acecf824b.patch" + "vega-lite@4.16.8": "patch:vega-lite@npm:4.16.8#.yarn/patches/vega-lite-npm-4.16.8-2acecf824b.patch", + "visyn_core": "git+ssh://git@github.com/datavisyn/visyn_core#mantine7" }, "visyn": { "entries": { diff --git a/src/Backend/ReactionCIMEBackend.ts b/src/Backend/ReactionCIMEBackend.ts index 3708e48..49cbd08 100644 --- a/src/Backend/ReactionCIMEBackend.ts +++ b/src/Backend/ReactionCIMEBackend.ts @@ -10,7 +10,10 @@ export class ReactionCIMEBackend { protected cache = {}; - constructor(public readonly baseUrl: string, public readonly fetchParams: Parameters[1] = {}) {} + constructor( + public readonly baseUrl: string, + public readonly fetchParams: Parameters[1] = {}, + ) {} protected handleSmilesCache = (smiles: string, highlight = false) => { // already downloaded this image -> saved in smiles cache diff --git a/src/ReactionCIMEApp.tsx b/src/ReactionCIMEApp.tsx index 16dc0dc..bfc5524 100644 --- a/src/ReactionCIMEApp.tsx +++ b/src/ReactionCIMEApp.tsx @@ -16,10 +16,9 @@ import { connect, ConnectedProps, useDispatch } from 'react-redux'; import HelpIcon from '@mui/icons-material/Help'; import { IconButton, Tooltip } from '@mui/material'; import { useVisynAppContext, VisynApp, VisynHeader } from 'visyn_core/app'; -import { Anchor, useMantineTheme } from '@mantine/core'; +import { Anchor, useMantineTheme, MantineColorShade } from '@mantine/core'; import { BrowserRouter, useSearchParams } from 'react-router-dom'; -import { IClientConfig } from 'visyn_core/base'; import { LineUpContext } from './LineUpContext'; import { LineUpTabPanel } from './Overrides/LineUpTabPanel'; import { AppState, CIME4RViewActions, createCIMERootReducer } from './State/Store'; @@ -269,7 +268,7 @@ export function ReactionCIMEApp() { <> ) : ( , @@ -286,7 +285,7 @@ export function ReactionCIMEApp() { href="https://www.bayer.com/" rel="noreferrer" target="_blank" - sx={{ + style={{ // Center the image display: 'flex', alignItems: 'center', @@ -298,7 +297,7 @@ export function ReactionCIMEApp() { href="https://jku-vds-lab.at/" rel="noreferrer" target="_blank" - sx={{ + style={{ // Center the image display: 'flex', alignItems: 'center', diff --git a/src/Utility/HeaderCustomization.tsx b/src/Utility/HeaderCustomization.tsx index d5e4f76..92fe9b6 100644 --- a/src/Utility/HeaderCustomization.tsx +++ b/src/Utility/HeaderCustomization.tsx @@ -5,7 +5,7 @@ import vdsLogo from '../assets/jku-vds-lab-logo.svg'; export function BuildInfoContent() { return ( - + CIME4R is a web-based tool for interactive exploration of chemical reaction optimization data. CIME4R allows chemists to better understand the decision process of AI models and enhances human-AI collaboration. @@ -16,8 +16,8 @@ export function BuildInfoContent() { export function BuildInfoLogos() { return ( - - + + logo diff --git a/src/initialize.tsx b/src/initialize.tsx index dccc854..27a15eb 100644 --- a/src/initialize.tsx +++ b/src/initialize.tsx @@ -13,7 +13,7 @@ declare module 'visyn_core/base' { } createRoot(document.getElementById('app')).render( - + , );