Skip to content

Commit

Permalink
transition to investigate
Browse files Browse the repository at this point in the history
  • Loading branch information
salimkanoun committed May 18, 2023
1 parent f812358 commit 98bbd42
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 15 deletions.
17 changes: 7 additions & 10 deletions FrontEnd/src/assets/styles/orthancToolsJs.scss
Original file line number Diff line number Diff line change
Expand Up @@ -37,25 +37,22 @@ body {
color: #636A6E;
}

.alert-enter {
.main-enter {
opacity: 0;
transform: scale(0.9);
}

.alert-enter-active {
opacity: 1;
transform: translateX(0);
transition: opacity 300ms, transform 300ms;
.main-enter-active {
opacity: 0.5;
transition: opacity 1000ms
}

.alert-exit {
.main-exit {
opacity: 1;
}

.alert-exit-active {
.main-exit-active {
opacity: 0;
transform: scale(0.9);
transition: opacity 300ms, transform 300ms;
transition: opacity 1500ms
}

.bg-green {
Expand Down
2 changes: 1 addition & 1 deletion FrontEnd/src/components/Main/MainRoot.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ const AnimatedSwitch = () => {
const location = useLocation()
return (
<TransitionGroup>
<CSSTransition key={location.key} timeout={500} unmountOnExit classNames={"alert"}>
<CSSTransition key={location.pathname} unmountOnExit classNames={"main"}>
<Routes location={location}>
<Route path='/import' element={<ImportRootPanel />} />
<Route path='/query' element={<Query />} />
Expand Down
8 changes: 4 additions & 4 deletions FrontEnd/src/components/MyDicom/MyDicomRoot.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { useSelector } from 'react-redux'
import { useCustomQuery } from '../../services/ReactQuery/hooks'
import { keys } from '../../model/Constant'
import Spinner from '../CommonComponents/Spinner'
import { Container } from 'react-bootstrap'

export default () => {

Expand All @@ -20,11 +21,10 @@ export default () => {
)

if (isLoading) return <Spinner/>

console.log(labels)

return (
<>
<Container fluid>
In construction
</>
</Container>
)
}

0 comments on commit 98bbd42

Please sign in to comment.