Skip to content

Commit c488d52

Browse files
harryandriyanharryandriyan
committed
feat(admin-ui): update edit and page card design
1 parent 17254c0 commit c488d52

File tree

7 files changed

+40
-37
lines changed

7 files changed

+40
-37
lines changed

‎admin-ui/plugins/admin/components/CustomScripts/CustomScriptAddPage.js

+11-12
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
import React, { useEffect } from 'react'
22
import { connect } from 'react-redux'
33
import { useHistory } from 'react-router-dom'
4-
import { Container, CardBody, Card } from 'Components'
4+
import { CardBody, Card } from 'Components'
55
import CustomScriptForm from './CustomScriptForm'
66
import { addCustomScript } from 'Plugins/admin/redux/actions/CustomScriptActions'
77
import { buildPayload } from 'Utils/PermChecker'
88
import GluuAlert from 'Routes/Apps/Gluu/GluuAlert'
99
import { useTranslation } from 'react-i18next'
10+
import applicationStyle from 'Routes/Apps/Gluu/styles/applicationstyle'
1011

1112
function CustomScriptAddPage({ scripts, dispatch, saveOperationFlag, errorInSaveOperationFlag }) {
1213
const userAction = {}
@@ -33,17 +34,15 @@ function CustomScriptAddPage({ scripts, dispatch, saveOperationFlag, errorInSave
3334
message={t('messages.error_in_saving')}
3435
show={errorInSaveOperationFlag}
3536
/>
36-
<Container>
37-
<Card className="mb-3">
38-
<CardBody>
39-
<CustomScriptForm
40-
item={new Object()}
41-
scripts={scripts}
42-
handleSubmit={handleSubmit}
43-
/>
44-
</CardBody>
45-
</Card>
46-
</Container>
37+
<Card className="mb-3" style={applicationStyle.mainCard}>
38+
<CardBody>
39+
<CustomScriptForm
40+
item={new Object()}
41+
scripts={scripts}
42+
handleSubmit={handleSubmit}
43+
/>
44+
</CardBody>
45+
</Card>
4746
</React.Fragment>
4847
)
4948
}

‎admin-ui/plugins/admin/components/CustomScripts/CustomScriptEditPage.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import { editCustomScript } from 'Plugins/admin/redux/actions/CustomScriptAction
88
import { buildPayload } from 'Utils/PermChecker'
99
import GluuAlert from 'Routes/Apps/Gluu/GluuAlert'
1010
import { useTranslation } from 'react-i18next'
11+
import applicationStyle from 'Routes/Apps/Gluu/styles/applicationstyle'
1112

1213
function CustomScriptEditPage({ item, scripts, loading, dispatch, saveOperationFlag, errorInSaveOperationFlag }) {
1314
const userAction = {}
@@ -21,20 +22,21 @@ function CustomScriptEditPage({ item, scripts, loading, dispatch, saveOperationF
2122

2223
function handleSubmit(data) {
2324
if (data) {
24-
let message = data.customScript.action_message
25+
const message = data.customScript.action_message
2526
delete data.customScript.action_message
2627
buildPayload(userAction, message, data)
2728
dispatch(editCustomScript(userAction))
2829
}
2930
}
31+
3032
return (
3133
<GluuLoader blocking={loading}>
3234
<GluuAlert
3335
severity={t('titles.error')}
3436
message={t('messages.error_in_saving')}
3537
show={errorInSaveOperationFlag}
3638
/>
37-
<Card className="mb-3">
39+
<Card className="mb-3" style={applicationStyle.mainCard}>
3840
<CardBody>
3941
<CustomScriptForm
4042
item={item}

‎admin-ui/plugins/auth-server/components/Scopes/ScopeAddPage.js

+12-13
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React, { useEffect } from 'react'
22
import { connect } from 'react-redux'
33
import { useHistory } from 'react-router-dom'
4-
import { Container, CardBody, Card } from 'Components'
4+
import { CardBody, Card } from 'Components'
55
import ScopeForm from './ScopeForm'
66
import { addScope } from 'Plugins/auth-server/redux/actions/ScopeActions'
77
import { buildPayload } from 'Utils/PermChecker'
@@ -12,6 +12,7 @@ import {
1212
} from 'Redux/actions/InitActions'
1313
import GluuAlert from 'Routes/Apps/Gluu/GluuAlert'
1414
import { useTranslation } from 'react-i18next'
15+
import applicationStyle from 'Routes/Apps/Gluu/styles/applicationstyle'
1516

1617
function ScopeAddPage({ scripts, dispatch, attributes, loading, saveOperationFlag, errorInSaveOperationFlag }) {
1718
const userAction = {}
@@ -63,18 +64,16 @@ function ScopeAddPage({ scripts, dispatch, attributes, loading, saveOperationFla
6364
message={t('messages.error_in_saving')}
6465
show={errorInSaveOperationFlag}
6566
/>
66-
<Container>
67-
<Card className="mb-3">
68-
<CardBody>
69-
<ScopeForm
70-
scope={scope}
71-
scripts={scripts}
72-
attributes={attributes}
73-
handleSubmit={handleSubmit}
74-
/>
75-
</CardBody>
76-
</Card>
77-
</Container>
67+
<Card className="mb-3" style={applicationStyle.mainCard}>
68+
<CardBody>
69+
<ScopeForm
70+
scope={scope}
71+
scripts={scripts}
72+
attributes={attributes}
73+
handleSubmit={handleSubmit}
74+
/>
75+
</CardBody>
76+
</Card>
7877
</GluuLoader>
7978
)
8079
}

‎admin-ui/plugins/auth-server/components/Scopes/ScopeEditPage.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import {
1212
} from 'Redux/actions/InitActions'
1313
import GluuAlert from 'Routes/Apps/Gluu/GluuAlert'
1414
import { useTranslation } from 'react-i18next'
15+
import applicationStyle from 'Routes/Apps/Gluu/styles/applicationstyle'
1516

1617
function ScopeEditPage({ scope, loading, dispatch, scripts, attributes, saveOperationFlag, errorInSaveOperationFlag }) {
1718
const userAction = {}
@@ -58,7 +59,7 @@ function ScopeEditPage({ scope, loading, dispatch, scripts, attributes, saveOper
5859
message={t('messages.error_in_saving')}
5960
show={errorInSaveOperationFlag}
6061
/>
61-
<Card className="mb-3">
62+
<Card className="mb-3" style={applicationStyle.mainCard}>
6263
<CardBody>
6364
<ScopeForm
6465
scope={scope}

‎admin-ui/plugins/schema/components/Person/AttributeAddPage.js

+7-7
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ import { useHistory } from 'react-router-dom'
44
import { Container, CardBody, Card } from 'Components'
55
import AttributeForm from './AttributeForm'
66
import { addAttribute } from 'Plugins/schema/redux/actions/AttributeActions'
7+
import applicationStyle from 'Routes/Apps/Gluu/styles/applicationstyle'
8+
79
function AttributeAddPage({ dispatch }) {
810
const history = useHistory()
911
function onSubmit(data) {
@@ -23,13 +25,11 @@ function AttributeAddPage({ dispatch }) {
2325
}
2426
return (
2527
<React.Fragment>
26-
<Container>
27-
<Card className="mb-3">
28-
<CardBody>
29-
<AttributeForm item={defautAttribute} customOnSubmit={onSubmit} />
30-
</CardBody>
31-
</Card>
32-
</Container>
28+
<Card className="mb-3" style={applicationStyle.mainCard}>
29+
<CardBody>
30+
<AttributeForm item={defautAttribute} customOnSubmit={onSubmit} />
31+
</CardBody>
32+
</Card>
3333
</React.Fragment>
3434
)
3535
}

‎admin-ui/plugins/schema/components/Person/AttributeEditPage.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import { CardBody, Card } from 'Components'
55
import AttributeForm from './AttributeForm'
66
import GluuLoader from 'Routes/Apps/Gluu/GluuLoader'
77
import { editAttribute } from 'Plugins/schema/redux/actions/AttributeActions'
8+
import applicationStyle from 'Routes/Apps/Gluu/styles/applicationstyle'
89

910
function AttributeEditPage({ item, loading, dispatch }) {
1011
if (!item.attributeValidation) {
@@ -23,7 +24,7 @@ function AttributeEditPage({ item, loading, dispatch }) {
2324
}
2425
return (
2526
<GluuLoader blocking={loading}>
26-
<Card className="mb-3">
27+
<Card className="mb-3" style={applicationStyle.mainCard}>
2728
<CardBody>
2829
<AttributeForm item={item} customOnSubmit={customHandleSubmit} />
2930
</CardBody>

‎admin-ui/plugins/schema/components/Person/AttributeViewPage.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import { CardBody, Card } from 'Components'
55
import GluuLoader from 'Routes/Apps/Gluu/GluuLoader'
66
import AttributeForm from './AttributeForm'
77
import { editAttribute } from 'Plugins/schema/redux/actions/AttributeActions'
8+
import applicationStyle from 'Routes/Apps/Gluu/styles/applicationstyle'
89

910
function AttributeEditPage({ item, loading, dispatch }) {
1011
if (!item.attributeValidation) {
@@ -23,7 +24,7 @@ function AttributeEditPage({ item, loading, dispatch }) {
2324
}
2425
return (
2526
<GluuLoader blocking={loading}>
26-
<Card className="mb-3">
27+
<Card className="mb-3" style={applicationStyle.mainCard}>
2728
<CardBody>
2829
<AttributeForm
2930
item={item}

0 commit comments

Comments
 (0)