Skip to content

Commit

Permalink
dependencies: Updates semantic-ui-react to latest
Browse files Browse the repository at this point in the history
  • Loading branch information
jrcastro2 committed Jan 6, 2021
1 parent 81bc1c6 commit a68ec72
Show file tree
Hide file tree
Showing 26 changed files with 243 additions and 225 deletions.
129 changes: 61 additions & 68 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
"yup": "^0.27.0"
},
"devDependencies": {
"@artsy/fresnel": "^1.3.1",
"@babel/runtime": "^7.9.2",
"@craco/craco": "^5.6.4",
"@rollup/plugin-alias": "^3.1.1",
Expand All @@ -61,6 +62,7 @@
"@typescript-eslint/eslint-plugin": "^1.13.0",
"axios": "^0.19.2",
"axios-mock-adapter": "^1.18.1",
"classnames": "^2.2.6",
"cypress": "^5.3.0",
"enzyme": "^3.11.0",
"enzyme-adapter-react-16": "^1.15.2",
Expand Down Expand Up @@ -110,7 +112,7 @@
"rollup-plugin-peer-deps-external": "^2.2.2",
"semantic-ui-calendar-react": "^0.15.3",
"semantic-ui-less": "^2.4.1",
"semantic-ui-react": "^0.88.2",
"semantic-ui-react": "^2.0.1",
"yup": "^0.27.0"
},
"author": {
Expand Down
49 changes: 26 additions & 23 deletions src/lib/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import React, { Component } from 'react';
import { connect, Provider } from 'react-redux';
import { Route, Switch } from 'react-router-dom';
import store from './store';
import { MediaContextProvider } from '@components/Media';

class FetchUserComponent extends Component {
componentDidMount() {
Expand Down Expand Up @@ -47,29 +48,31 @@ export default class App extends Component {

render() {
return (
<Provider store={store}>
<FetchUser>
<Switch>
<Route exact path={AuthenticationRoutes.login}>
<Login />
</Route>
<AuthenticationGuard
path={AuthenticationRoutes.confirmEmail}
authorizedComponent={ConfirmEmail}
/>
<AuthenticationGuard
path={BackOfficeRoutes.home}
authorizedComponent={BackOffice}
unAuthorizedComponent={UnAuthorized}
roles={['admin', 'librarian']}
/>
<FrontSite />
<Route>
<NotFound />
</Route>
</Switch>
</FetchUser>
</Provider>
<MediaContextProvider>
<Provider store={store}>
<FetchUser>
<Switch>
<Route exact path={AuthenticationRoutes.login}>
<Login />
</Route>
<AuthenticationGuard
path={AuthenticationRoutes.confirmEmail}
authorizedComponent={ConfirmEmail}
/>
<AuthenticationGuard
path={BackOfficeRoutes.home}
authorizedComponent={BackOffice}
unAuthorizedComponent={UnAuthorized}
roles={['admin', 'librarian']}
/>
<FrontSite />
<Route>
<NotFound />
</Route>
</Switch>
</FetchUser>
</Provider>
</MediaContextProvider>
);
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/lib/authentication/pages/Login/Login.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { parseParams } from '@authentication/utils';
import { EnvironmentLabel } from '@components/EnvironmentLabel';
import { Media } from '@components/Media';
import { Notifications } from '@components/Notifications';
import { invenioConfig } from '@config';
import { goTo } from '@history';
Expand All @@ -16,7 +17,6 @@ import {
Icon,
Image,
Popup,
Responsive,
Segment,
} from 'semantic-ui-react';
import { LoginWithLocalAccount } from './LoginWithLocalAccount';
Expand Down Expand Up @@ -118,10 +118,10 @@ const RightCol = ({ hasError, errorMessage, errorHeader }) => (
<Container fluid>
<p>Forgot your password? Recover {notImplementedPopup}.</p>
</Container>
<Responsive {...Responsive.onlyMobile}>
<Media at="mobile">
<Divider />
<SignUp />
</Responsive>
</Media>
</>
)}
</Grid.Column>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ exports[`CancelModal tests should load the cancel loan modal component 1`] = `
content="Please specify a reason."
disabled={false}
eventsEnabled={true}
offset={0}
on={
Array [
"click",
Expand All @@ -55,6 +54,7 @@ exports[`CancelModal tests should load the cancel loan modal component 1`] = `
}
open={false}
pinned={false}
popperModifiers={Array []}
position="bottom left"
/>
</ModalContent>
Expand Down
Loading

0 comments on commit a68ec72

Please sign in to comment.