Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(api changes): switch api redux to rtk query #91

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
New features, fixed bugs, known defects and other noteworthy changes to each release of the Catena-X Portal Frontend Registration.

### Unreleased
- Change API calls to RTK queries


## 1.5.4
Expand Down
4 changes: 2 additions & 2 deletions DEPENDENCIES
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ npm/npmjs/-/csso/4.2.0, MIT, approved, clearlydefined
npm/npmjs/-/cssom/0.3.8, MIT, approved, clearlydefined
npm/npmjs/-/cssom/0.4.4, MIT, approved, clearlydefined
npm/npmjs/-/cssstyle/2.3.0, MIT, approved, clearlydefined
npm/npmjs/-/csstype/3.1.2, MIT, approved, clearlydefined
npm/npmjs/-/csstype/3.1.2, MIT, approved, #11847
npm/npmjs/-/damerau-levenshtein/1.0.8, BSD-2-Clause, approved, clearlydefined
npm/npmjs/-/data-urls/2.0.0, MIT, approved, clearlydefined
npm/npmjs/-/date-fns/2.30.0, MIT, approved, clearlydefined
Expand Down Expand Up @@ -1323,7 +1323,7 @@ npm/npmjs/@types/istanbul-lib-coverage/2.0.4, MIT, approved, clearlydefined
npm/npmjs/@types/istanbul-lib-report/3.0.1, MIT, approved, clearlydefined
npm/npmjs/@types/istanbul-reports/3.0.2, MIT, approved, clearlydefined
npm/npmjs/@types/jest/27.5.2, MIT, approved, clearlydefined
npm/npmjs/@types/jest/29.5.5, MIT, approved, clearlydefined
npm/npmjs/@types/jest/29.5.5, MIT, approved, #11951
npm/npmjs/@types/json-schema/7.0.13, MIT, approved, clearlydefined
npm/npmjs/@types/json5/0.0.29, MIT, approved, clearlydefined
npm/npmjs/@types/mime/1.3.3, MIT, approved, #10834
Expand Down
2 changes: 1 addition & 1 deletion public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<div id="root" style='width:100%; height:100%'></div>
<!-- Do NOT change 'ENV' without changing 'custom_env_vars_anchor' in scripts/inject-dynamic-env.sh as well -->
<script>
const ENV = {PORTAL_ASSETS_URL:"http://localhost:3000/assets",PORTAL_BACKEND_URL:"https://portal-backend.dev.demo.catena-x.net",CENTRALIDP_URL:"https://centralidp.dev.demo.catena-x.net/auth"}
const ENV = {PORTAL_ASSETS_URL:"http://localhost:3000/assets",PORTAL_BACKEND_URL:"https://portal-backend.dev.demo.catena-x.net",CENTRALIDP_URL:"https://centralidp.dev.demo.catena-x.net/auth",BPDM_API_URL:"https://business-partners.dev.demo.catena-x.net/pool/api",}
</script>
</body>

Expand Down
2 changes: 1 addition & 1 deletion src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import '../node_modules/bootstrap/dist/css/bootstrap.min.css'
import 'react-toastify/dist/ReactToastify.css'
import Landing from './components/landing'
import InitialLoader from './components/initial-loader'
import RegistrationCax from './components/cax-registration'
import { RegistrationCax } from './components/cax-registration'
import Finish from './components/finish'
import Authinfo from './components/authinfo'
import ProtectedRoute from './helpers/authorisation/ProtectedRoute'
Expand Down
131 changes: 67 additions & 64 deletions src/components/ErrorPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,71 +23,74 @@ import { useTranslation } from 'react-i18next'
import Button from './button'

export const ErrorPage = () => {
const { t } = useTranslation()
return (
const { t } = useTranslation()
return (
<Box
sx={{
position: 'absolute',
top: '20%',
left: '16%',
display: 'flex',
flexDirection: 'row',
justifyContent: 'center',
margin: 'auto auto',
}}
>
<Box
sx={{
minWidth: '400px',
}}
>
<img
src="/registration/robot-sw.925342207cc863d3ed2cc9c65ffb7c33.svg"
alt=""
/>
</Box>
<Box>
<Typography
variant="h5"
sx={{
fontFamily: 'LibreFranklin-Light',
fontWeight: '600',
marginBottom: '10px',
}}
>
{t('errorPage.heading')}
</Typography>
<Typography
variant="body1"
style={{
fontSize: '18px',
fontFamily: 'LibreFranklin-Light',
marginBottom: '20px',
}}
>
{t('errorPage.title')}
</Typography>
<Typography
variant="body1"
style={{
fontFamily: 'LibreFranklin-Light',
fontSize: '18px',
width: '640px',
marginBottom: '20px',
}}
>
{t('errorPage.description')}
</Typography>
<Box
sx={{
position: 'absolute',
top: '20%',
left: '16%',
display: 'flex',
flexDirection: 'row',
justifyContent: 'center',
margin: 'auto auto',
}}
sx={{
position: 'absolute',
left: '60%',
}}
>
<Box
sx={{
minWidth: '400px',
}}
>
<img src="/registration/robot-sw.925342207cc863d3ed2cc9c65ffb7c33.svg" alt="" />
</Box>
<Box>
<Typography
variant="h5"
sx={{
fontFamily: 'LibreFranklin-Light',
fontWeight: '600',
marginBottom: '10px',
}}
>
{t('errorPage.heading')}
</Typography>
<Typography
variant="body1"
style={{
fontSize: '18px',
fontFamily: 'LibreFranklin-Light',
marginBottom: '20px'
}}
>
{t('errorPage.title')}
</Typography>
<Typography
variant="body1"
style={{
fontFamily: 'LibreFranklin-Light',
fontSize: '18px',
width: '640px',
marginBottom: '20px'
}}
>
{t('errorPage.description')}
</Typography>
<Box
sx={{
position: 'absolute',
left: '60%'
}}
>
<Button
label={t('button.reload')}
styleClass='button btn-default'
handleClick={() => location.reload()}
/>
</Box>
</Box>
<Button
label={t('button.reload')}
styleClass="button btn-default"
handleClick={() => location.reload()}
/>
</Box>
)
</Box>
</Box>
)
}
2 changes: 1 addition & 1 deletion src/components/about.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import { useTranslation } from 'react-i18next'
import { AboutCard } from './AboutCard'
import legalJson from '../notice/legal-notice.json'
import Footer from './footer'
import Header from './cax-header'
import { Header } from './cax-header'
import { Container, Row, Col } from 'react-bootstrap'
import { Box } from '@mui/material'
import { withRouter } from 'react-router-dom'
Expand Down
Loading