Skip to content

Commit 8a7b4d7

Browse files
tnagorrafrozenhelium
authored andcommitted
Fix issue with submission of form
- Fix issue with submission of information pages - Re-calculate page number for information page - Move components to views - Open prop to expand exandable container - Add headingLabel on MobilePreview - Pass disabled prop on inputs - Set ESRI as defualt tileserver b - Update type for geojson type
1 parent 11f0186 commit 8a7b4d7

File tree

22 files changed

+238
-128
lines changed

22 files changed

+238
-128
lines changed

manager-dashboard/app/components/ExpandableContainer/index.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ interface Props {
1212
actions?: React.ReactNode;
1313
className?: string;
1414
children?: React.ReactNode;
15+
openByDefault?: boolean;
1516
}
1617

1718
function ExpandableContainer(props: Props) {
@@ -21,9 +22,10 @@ function ExpandableContainer(props: Props) {
2122
icons,
2223
header,
2324
actions,
25+
openByDefault = false,
2426
} = props;
2527

26-
const [isExpanded, setIsExpanded] = React.useState(false);
28+
const [isExpanded, setIsExpanded] = React.useState(openByDefault);
2729

2830
return (
2931
<div

manager-dashboard/app/components/ExpandableContainer/styles.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
border: var(--width-separator-thin) solid var(--color-separator);
88
border-top-left-radius: var(--radius-card-border);
99
border-top-right-radius: var(--radius-card-border);
10+
background-color: var(--color-background-accent-hint);
1011
padding: var(--spacing-medium);
1112

1213
.header {

manager-dashboard/app/components/MobilePreview/index.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import styles from './styles.css';
88

99
interface Props {
1010
className?: string;
11+
headingLabel?: React.ReactNode;
1112
heading?: React.ReactNode;
1213
actions?: React.ReactNode;
1314
children?: React.ReactNode;
@@ -21,6 +22,7 @@ interface Props {
2122
function MobilePreview(props: Props) {
2223
const {
2324
className,
25+
headingLabel,
2426
heading,
2527
actions,
2628
children,
@@ -42,7 +44,7 @@ function MobilePreview(props: Props) {
4244
level={5}
4345
>
4446
<div className={styles.label}>
45-
You are looking for:
47+
{headingLabel}
4648
</div>
4749
<div>
4850
{heading}

manager-dashboard/app/components/OrganisationFormModal/index.tsx renamed to manager-dashboard/app/views/Home/OrganisationFormModal/index.tsx

File renamed without changes.

manager-dashboard/app/components/OrganisationFormModal/styles.css renamed to manager-dashboard/app/views/Home/OrganisationFormModal/styles.css

File renamed without changes.

manager-dashboard/app/components/OrganisationList/index.tsx renamed to manager-dashboard/app/views/Home/OrganisationList/index.tsx

File renamed without changes.

manager-dashboard/app/components/OrganisationList/styles.css renamed to manager-dashboard/app/views/Home/OrganisationList/styles.css

File renamed without changes.

manager-dashboard/app/components/TutorialList/index.tsx renamed to manager-dashboard/app/views/Home/TutorialList/index.tsx

File renamed without changes.

manager-dashboard/app/components/TutorialList/styles.css renamed to manager-dashboard/app/views/Home/TutorialList/styles.css

File renamed without changes.

manager-dashboard/app/views/Home/index.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ import SmartLink from '#base/components/SmartLink';
1212
import useBooleanState from '#hooks/useBooleanState';
1313

1414
import Button from '#components/Button';
15-
import OrganisationFormModal from '#components/OrganisationFormModal';
16-
import TutorialList from '#components/TutorialList';
17-
import OrganisationList from '#components/OrganisationList';
1815
import TextInput from '#components/TextInput';
1916
import useInputState from '#hooks/useInputState';
2017

18+
import OrganisationFormModal from './OrganisationFormModal';
19+
import OrganisationList from './OrganisationList';
20+
import TutorialList from './TutorialList';
2121
import styles from './styles.css';
2222

2323
interface Props {

0 commit comments

Comments
 (0)