From 9916bd78c6ec237aa346f0056826db10baaf0979 Mon Sep 17 00:00:00 2001
From: Jonas Brunvoll Larsson <59939294+jonasbrunvoll@users.noreply.github.com>
Date: Mon, 21 Oct 2024 17:50:41 +0200
Subject: [PATCH] chore: update components import (#399)

* rename the folder 'input' to 'inputs', 'RadioInput' to 'Radio' and 'file.tsx' to 'file-input.tsx'.

* Update component imports

* Rename from 'inputs' to 'form'.
---
 .../components/{input => form}/checkbox.tsx   |  2 +-
 .../{input => form}/description-modal.tsx     |  0
 .../{input => form}/error-message.tsx         |  0
 .../{input/file.tsx => form/file-input.tsx}   |  2 +-
 .../contact/components/form/index.ts          | 13 +++++++++++++
 .../{input => form}/input.module.css          |  0
 .../components/{input => form}/input.tsx      |  0
 .../components/{input => form}/radio.tsx      |  2 +-
 .../form/searchable-select/index.tsx          |  2 ++
 .../searchable-select/searchable-select.tsx}  |  0
 .../searchable-select/utils.ts                |  2 +-
 .../components/{input => form}/select.tsx     |  0
 .../components/{input => form}/textarea.tsx   |  2 +-
 src/page-modules/contact/components/index.tsx | 14 ++++++++++++++
 .../contact/components/input/index.ts         |  1 -
 .../contact/group-travel/index.tsx            | 16 ++++++++--------
 .../means-of-transport/forms/delayForm.tsx    | 15 ++++++++-------
 .../means-of-transport/forms/driverForm.tsx   | 14 +++++++-------
 .../means-of-transport/forms/injuryForm.tsx   | 14 +++++++-------
 .../forms/serviceOfferingForm.tsx             | 15 +++++++--------
 .../means-of-transport/forms/stopForm.tsx     | 14 +++++++-------
 .../forms/transportationForm.tsx              | 16 ++++++++--------
 .../contact/means-of-transport/index.tsx      |  5 ++---
 .../ticket-control/forms/feeComplaintForm.tsx | 19 ++++++++++---------
 .../ticket-control/forms/feedbackForm.tsx     | 14 +++++++-------
 .../ticket-control/forms/postponePayment.tsx  |  3 +--
 .../contact/ticket-control/index.tsx          |  7 +++----
 .../forms/priceAndTicketTypesForm.tsx         |  5 +----
 src/page-modules/contact/ticketing/index.tsx  |  5 ++---
 .../travel-guarantee/forms/refundCarForm.tsx  | 16 ++++++++--------
 .../travel-guarantee/forms/refundTaxiForm.tsx | 16 ++++++++--------
 .../contact/travel-guarantee/index.tsx        |  6 ++----
 32 files changed, 130 insertions(+), 110 deletions(-)
 rename src/page-modules/contact/components/{input => form}/checkbox.tsx (97%)
 rename src/page-modules/contact/components/{input => form}/description-modal.tsx (100%)
 rename src/page-modules/contact/components/{input => form}/error-message.tsx (100%)
 rename src/page-modules/contact/components/{input/file.tsx => form/file-input.tsx} (98%)
 create mode 100644 src/page-modules/contact/components/form/index.ts
 rename src/page-modules/contact/components/{input => form}/input.module.css (100%)
 rename src/page-modules/contact/components/{input => form}/input.tsx (100%)
 rename src/page-modules/contact/components/{input => form}/radio.tsx (96%)
 create mode 100644 src/page-modules/contact/components/form/searchable-select/index.tsx
 rename src/page-modules/contact/components/{input/searchable-select/index.tsx => form/searchable-select/searchable-select.tsx} (100%)
 rename src/page-modules/contact/components/{input => form}/searchable-select/utils.ts (90%)
 rename src/page-modules/contact/components/{input => form}/select.tsx (100%)
 rename src/page-modules/contact/components/{input => form}/textarea.tsx (83%)
 create mode 100644 src/page-modules/contact/components/index.tsx
 delete mode 100644 src/page-modules/contact/components/input/index.ts

diff --git a/src/page-modules/contact/components/input/checkbox.tsx b/src/page-modules/contact/components/form/checkbox.tsx
similarity index 97%
rename from src/page-modules/contact/components/input/checkbox.tsx
rename to src/page-modules/contact/components/form/checkbox.tsx
index 29b46feb0..34ca2ca26 100644
--- a/src/page-modules/contact/components/input/checkbox.tsx
+++ b/src/page-modules/contact/components/form/checkbox.tsx
@@ -15,7 +15,7 @@ export type CheckboxProps = {
   onClick?: () => void;
 };
 
-export function Checkbox({
+export default function Checkbox({
   onChange,
   error,
   disabled = false,
diff --git a/src/page-modules/contact/components/input/description-modal.tsx b/src/page-modules/contact/components/form/description-modal.tsx
similarity index 100%
rename from src/page-modules/contact/components/input/description-modal.tsx
rename to src/page-modules/contact/components/form/description-modal.tsx
diff --git a/src/page-modules/contact/components/input/error-message.tsx b/src/page-modules/contact/components/form/error-message.tsx
similarity index 100%
rename from src/page-modules/contact/components/input/error-message.tsx
rename to src/page-modules/contact/components/form/error-message.tsx
diff --git a/src/page-modules/contact/components/input/file.tsx b/src/page-modules/contact/components/form/file-input.tsx
similarity index 98%
rename from src/page-modules/contact/components/input/file.tsx
rename to src/page-modules/contact/components/form/file-input.tsx
index 269a7d04c..f1cba7065 100644
--- a/src/page-modules/contact/components/input/file.tsx
+++ b/src/page-modules/contact/components/form/file-input.tsx
@@ -13,7 +13,7 @@ export type FileInputProps = {
 
 const MAX_ALLOWED_FILE_SIZE = 10 * 1024 * 1024; // 10MB
 
-export function FileInput({ onChange, label, name }: FileInputProps) {
+export default function FileInput({ onChange, label, name }: FileInputProps) {
   const { t } = useTranslation();
   const id = useId();
   const { static: staticColors } = useTheme();
diff --git a/src/page-modules/contact/components/form/index.ts b/src/page-modules/contact/components/form/index.ts
new file mode 100644
index 000000000..262e73896
--- /dev/null
+++ b/src/page-modules/contact/components/form/index.ts
@@ -0,0 +1,13 @@
+export { default as Checkbox } from './checkbox';
+export { default as DescriptionModal } from './description-modal';
+export { default as ErrorMessage } from './error-message';
+export { default as FileInput } from './file-input';
+export { default as Input } from './input';
+export { default as Radio } from './radio';
+export { default as Select } from './select';
+export { default as Textarea } from './textarea';
+export {
+  SearchableSelect,
+  getLineOptions,
+  getStopOptions,
+} from './searchable-select';
diff --git a/src/page-modules/contact/components/input/input.module.css b/src/page-modules/contact/components/form/input.module.css
similarity index 100%
rename from src/page-modules/contact/components/input/input.module.css
rename to src/page-modules/contact/components/form/input.module.css
diff --git a/src/page-modules/contact/components/input/input.tsx b/src/page-modules/contact/components/form/input.tsx
similarity index 100%
rename from src/page-modules/contact/components/input/input.tsx
rename to src/page-modules/contact/components/form/input.tsx
diff --git a/src/page-modules/contact/components/input/radio.tsx b/src/page-modules/contact/components/form/radio.tsx
similarity index 96%
rename from src/page-modules/contact/components/input/radio.tsx
rename to src/page-modules/contact/components/form/radio.tsx
index 7526997b3..38e2d396e 100644
--- a/src/page-modules/contact/components/input/radio.tsx
+++ b/src/page-modules/contact/components/form/radio.tsx
@@ -7,7 +7,7 @@ export type RadioInputProps = {
   onChange?: (event: ChangeEvent<HTMLInputElement>) => void;
 } & JSX.IntrinsicElements['input'];
 
-export function RadioInput({
+export default function Radio({
   onChange,
   checked,
   label,
diff --git a/src/page-modules/contact/components/form/searchable-select/index.tsx b/src/page-modules/contact/components/form/searchable-select/index.tsx
new file mode 100644
index 000000000..318668d9e
--- /dev/null
+++ b/src/page-modules/contact/components/form/searchable-select/index.tsx
@@ -0,0 +1,2 @@
+export { default as SearchableSelect } from './searchable-select';
+export { getLineOptions, getStopOptions } from './utils';
diff --git a/src/page-modules/contact/components/input/searchable-select/index.tsx b/src/page-modules/contact/components/form/searchable-select/searchable-select.tsx
similarity index 100%
rename from src/page-modules/contact/components/input/searchable-select/index.tsx
rename to src/page-modules/contact/components/form/searchable-select/searchable-select.tsx
diff --git a/src/page-modules/contact/components/input/searchable-select/utils.ts b/src/page-modules/contact/components/form/searchable-select/utils.ts
similarity index 90%
rename from src/page-modules/contact/components/input/searchable-select/utils.ts
rename to src/page-modules/contact/components/form/searchable-select/utils.ts
index 4606f98ee..1deda9b8d 100644
--- a/src/page-modules/contact/components/input/searchable-select/utils.ts
+++ b/src/page-modules/contact/components/form/searchable-select/utils.ts
@@ -1,5 +1,5 @@
 import { Line } from '@atb/page-modules/contact';
-import { Option } from './index';
+import { Option } from './searchable-select';
 
 export const getLineOptions = (lines: Line[]): Option<Line>[] => {
   return lines.map((line) => ({
diff --git a/src/page-modules/contact/components/input/select.tsx b/src/page-modules/contact/components/form/select.tsx
similarity index 100%
rename from src/page-modules/contact/components/input/select.tsx
rename to src/page-modules/contact/components/form/select.tsx
diff --git a/src/page-modules/contact/components/input/textarea.tsx b/src/page-modules/contact/components/form/textarea.tsx
similarity index 83%
rename from src/page-modules/contact/components/input/textarea.tsx
rename to src/page-modules/contact/components/form/textarea.tsx
index a4e458c7c..4c6abf955 100644
--- a/src/page-modules/contact/components/input/textarea.tsx
+++ b/src/page-modules/contact/components/form/textarea.tsx
@@ -7,7 +7,7 @@ export type CheckboxProps = {
   value: string;
 };
 
-export function Textarea({ onChange, error, value }: CheckboxProps) {
+export default function Textarea({ onChange, error, value }: CheckboxProps) {
   return (
     <div>
       <textarea className={style.textarea} value={value} onChange={onChange} />
diff --git a/src/page-modules/contact/components/index.tsx b/src/page-modules/contact/components/index.tsx
new file mode 100644
index 000000000..edc61d0a5
--- /dev/null
+++ b/src/page-modules/contact/components/index.tsx
@@ -0,0 +1,14 @@
+export {
+  Checkbox,
+  DescriptionModal,
+  ErrorMessage,
+  FileInput,
+  Input,
+  Radio,
+  Select,
+  Textarea,
+  SearchableSelect,
+  getLineOptions,
+  getStopOptions,
+} from './form';
+export { SectionCard } from './section-card';
diff --git a/src/page-modules/contact/components/input/index.ts b/src/page-modules/contact/components/input/index.ts
deleted file mode 100644
index 3f24ecaf7..000000000
--- a/src/page-modules/contact/components/input/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default as Input } from './input';
diff --git a/src/page-modules/contact/group-travel/index.tsx b/src/page-modules/contact/group-travel/index.tsx
index ab8cbe2b4..32f63e51c 100644
--- a/src/page-modules/contact/group-travel/index.tsx
+++ b/src/page-modules/contact/group-travel/index.tsx
@@ -1,20 +1,20 @@
 import { useMachine } from '@xstate/react';
 import { groupTravelStateMachine } from './group-travel-state-machine';
-import { SectionCard } from '../components/section-card';
 import { PageText, useTranslation } from '@atb/translations';
 import style from '../contact.module.css';
-import { RadioInput } from '../components/input/radio';
 import { Typo } from '@atb/components/typography';
 import { useLines } from '../lines/use-lines';
 import { Line } from '../server/journey-planner/validators';
-import { Input } from '../components/input';
-import { Textarea } from '../components/input/textarea';
 import { Button } from '@atb/components/button';
-import SearchableSelect from '../components/input/searchable-select';
 import {
+  Radio,
+  Textarea,
+  Input,
+  SectionCard,
+  SearchableSelect,
   getLineOptions,
   getStopOptions,
-} from '../components/input/searchable-select/utils';
+} from '../components';
 
 export default function GroupTravelContent() {
   const { t } = useTranslation();
@@ -42,7 +42,7 @@ export default function GroupTravelContent() {
       <SectionCard title={t(PageText.Contact.groupTravel.title)}>
         <ul className={style.form_options__list}>
           <li>
-            <RadioInput
+            <Radio
               label={t(PageText.Contact.groupTravel.travelTypeBus.radioLabel)}
               value={'bus'}
               checked={travelType === 'bus'}
@@ -52,7 +52,7 @@ export default function GroupTravelContent() {
             />
           </li>
           <li>
-            <RadioInput
+            <Radio
               label={t(PageText.Contact.groupTravel.travelTypeBoat.radioLabel)}
               value={'boat'}
               checked={travelType === 'boat'}
diff --git a/src/page-modules/contact/means-of-transport/forms/delayForm.tsx b/src/page-modules/contact/means-of-transport/forms/delayForm.tsx
index a3ba132b1..bf1d2a4a5 100644
--- a/src/page-modules/contact/means-of-transport/forms/delayForm.tsx
+++ b/src/page-modules/contact/means-of-transport/forms/delayForm.tsx
@@ -1,21 +1,22 @@
 import { PageText, useTranslation } from '@atb/translations';
 import { useLines } from '../../lines/use-lines';
-import { SectionCard } from '../../components/section-card';
 import { Typo } from '@atb/components/typography';
-import Select from '../../components/input/select';
 import { ComponentText } from '@atb/translations';
-import { Input } from '../../components/input';
 import { TransportModeType } from '@atb-as/config-specs';
 import { Line } from '../..';
-import { FileInput } from '../../components/input/file';
-import { Textarea } from '../../components/input/textarea';
 import { ContextProps } from '../means-of-transport-form-machine';
 import { meansOfTransportFormEvents } from '../events';
-import SearchableSelect from '../../components/input/searchable-select';
 import {
+  SectionCard,
+  Select,
+  Input,
+  FileInput,
+  Textarea,
+  SearchableSelect,
   getLineOptions,
   getStopOptions,
-} from '../../components/input/searchable-select/utils';
+} from '../../components';
+
 type DelayFormProps = {
   state: { context: ContextProps };
   send: (event: typeof meansOfTransportFormEvents) => void;
diff --git a/src/page-modules/contact/means-of-transport/forms/driverForm.tsx b/src/page-modules/contact/means-of-transport/forms/driverForm.tsx
index 524782bfd..af669d50b 100644
--- a/src/page-modules/contact/means-of-transport/forms/driverForm.tsx
+++ b/src/page-modules/contact/means-of-transport/forms/driverForm.tsx
@@ -1,21 +1,21 @@
 import { PageText, useTranslation } from '@atb/translations';
 import { ContextProps } from '../means-of-transport-form-machine';
 import { useLines } from '../../lines/use-lines';
-import { SectionCard } from '../../components/section-card';
 import { Typo } from '@atb/components/typography';
-import Select from '../../components/input/select';
 import { ComponentText } from '@atb/translations';
-import { Input } from '../../components/input';
 import { TransportModeType } from '@atb-as/config-specs';
 import { Line } from '../..';
-import { FileInput } from '../../components/input/file';
-import { Textarea } from '../../components/input/textarea';
 import { meansOfTransportFormEvents } from '../events';
-import SearchableSelect from '../../components/input/searchable-select';
 import {
+  SectionCard,
+  Select,
+  Input,
+  FileInput,
+  Textarea,
+  SearchableSelect,
   getLineOptions,
   getStopOptions,
-} from '../../components/input/searchable-select/utils';
+} from '../../components';
 
 type DriverFormProps = {
   state: { context: ContextProps };
diff --git a/src/page-modules/contact/means-of-transport/forms/injuryForm.tsx b/src/page-modules/contact/means-of-transport/forms/injuryForm.tsx
index 024b162d4..b4e73a74f 100644
--- a/src/page-modules/contact/means-of-transport/forms/injuryForm.tsx
+++ b/src/page-modules/contact/means-of-transport/forms/injuryForm.tsx
@@ -1,21 +1,21 @@
 import { PageText, useTranslation } from '@atb/translations';
 import { ContextProps } from '../means-of-transport-form-machine';
 import { useLines } from '../../lines/use-lines';
-import { SectionCard } from '../../components/section-card';
 import { Typo } from '@atb/components/typography';
-import Select from '../../components/input/select';
 import { ComponentText } from '@atb/translations';
-import { Input } from '../../components/input';
 import { TransportModeType } from '@atb-as/config-specs';
 import { Line } from '../..';
-import { FileInput } from '../../components/input/file';
-import { Textarea } from '../../components/input/textarea';
 import { meansOfTransportFormEvents } from '../events';
-import SearchableSelect from '../../components/input/searchable-select';
 import {
+  SectionCard,
+  Select,
+  Input,
+  FileInput,
+  Textarea,
+  SearchableSelect,
   getLineOptions,
   getStopOptions,
-} from '../../components/input/searchable-select/utils';
+} from '../../components';
 
 type InjuryFormProps = {
   state: { context: ContextProps };
diff --git a/src/page-modules/contact/means-of-transport/forms/serviceOfferingForm.tsx b/src/page-modules/contact/means-of-transport/forms/serviceOfferingForm.tsx
index b22731136..efaaf2095 100644
--- a/src/page-modules/contact/means-of-transport/forms/serviceOfferingForm.tsx
+++ b/src/page-modules/contact/means-of-transport/forms/serviceOfferingForm.tsx
@@ -1,21 +1,20 @@
 import { PageText, useTranslation } from '@atb/translations';
 import { ContextProps } from '../means-of-transport-form-machine';
 import { useLines } from '../../lines/use-lines';
-import { SectionCard } from '../../components/section-card';
 import { Typo } from '@atb/components/typography';
-import Select from '../../components/input/select';
 import { ComponentText } from '@atb/translations';
-import { Input } from '../../components/input';
 import { TransportModeType } from '@atb-as/config-specs';
 import { Line } from '../..';
-import { FileInput } from '../../components/input/file';
-import { Textarea } from '../../components/input/textarea';
 import { meansOfTransportFormEvents } from '../events';
-import SearchableSelect from '../../components/input/searchable-select';
 import {
+  SectionCard,
+  Select,
+  Input,
+  FileInput,
+  Textarea,
+  SearchableSelect,
   getLineOptions,
-  getStopOptions,
-} from '../../components/input/searchable-select/utils';
+} from '../../components';
 
 type ServiceOfferingFormProps = {
   state: { context: ContextProps };
diff --git a/src/page-modules/contact/means-of-transport/forms/stopForm.tsx b/src/page-modules/contact/means-of-transport/forms/stopForm.tsx
index 0519b1073..3d187a614 100644
--- a/src/page-modules/contact/means-of-transport/forms/stopForm.tsx
+++ b/src/page-modules/contact/means-of-transport/forms/stopForm.tsx
@@ -1,21 +1,21 @@
 import { PageText, useTranslation } from '@atb/translations';
 import { ContextProps } from '../means-of-transport-form-machine';
 import { useLines } from '../../lines/use-lines';
-import { SectionCard } from '../../components/section-card';
 import { Typo } from '@atb/components/typography';
-import Select from '../../components/input/select';
 import { ComponentText } from '@atb/translations';
-import { Input } from '../../components/input';
 import { TransportModeType } from '@atb-as/config-specs';
 import { Line } from '../..';
-import { FileInput } from '../../components/input/file';
-import { Textarea } from '../../components/input/textarea';
 import { meansOfTransportFormEvents } from '../events';
-import SearchableSelect from '../../components/input/searchable-select';
 import {
+  SectionCard,
+  Select,
+  Input,
+  FileInput,
+  Textarea,
+  SearchableSelect,
   getLineOptions,
   getStopOptions,
-} from '../../components/input/searchable-select/utils';
+} from '../../components';
 
 type StopFormProps = {
   state: { context: ContextProps };
diff --git a/src/page-modules/contact/means-of-transport/forms/transportationForm.tsx b/src/page-modules/contact/means-of-transport/forms/transportationForm.tsx
index 1d7e39bcb..83b092987 100644
--- a/src/page-modules/contact/means-of-transport/forms/transportationForm.tsx
+++ b/src/page-modules/contact/means-of-transport/forms/transportationForm.tsx
@@ -1,22 +1,22 @@
 import { PageText, useTranslation } from '@atb/translations';
 import { ContextProps } from '../means-of-transport-form-machine';
 import { useLines } from '../../lines/use-lines';
-import { SectionCard } from '../../components/section-card';
 import { Typo } from '@atb/components/typography';
-import Select from '../../components/input/select';
 import { ComponentText } from '@atb/translations';
-import { Input } from '../../components/input';
 import { TransportModeType } from '@atb-as/config-specs';
 import { Line } from '../..';
-import { FileInput } from '../../components/input/file';
-import { Textarea } from '../../components/input/textarea';
 import { meansOfTransportFormEvents } from '../events';
-import { Checkbox } from '../../components/input/checkbox';
-import SearchableSelect from '../../components/input/searchable-select';
 import {
+  SectionCard,
+  Select,
+  Input,
+  FileInput,
+  Textarea,
+  Checkbox,
+  SearchableSelect,
   getLineOptions,
   getStopOptions,
-} from '../../components/input/searchable-select/utils';
+} from '../../components';
 
 type TransportationFormProps = {
   state: { context: ContextProps };
diff --git a/src/page-modules/contact/means-of-transport/index.tsx b/src/page-modules/contact/means-of-transport/index.tsx
index c3ce07fda..030e29032 100644
--- a/src/page-modules/contact/means-of-transport/index.tsx
+++ b/src/page-modules/contact/means-of-transport/index.tsx
@@ -14,8 +14,7 @@ import {
 import { Button } from '@atb/components/button';
 import { PageText, useTranslation } from '@atb/translations';
 import { FormEventHandler, useState } from 'react';
-import { SectionCard } from '../components/section-card';
-import { RadioInput } from '../components/input/radio';
+import { Radio, SectionCard } from '../components';
 import style from '../contact.module.css';
 
 const MeansOfTransportContent = () => {
@@ -41,7 +40,7 @@ const MeansOfTransportContent = () => {
         <ul className={style.form_options__list}>
           {Object.values(FormType).map((formType) => (
             <li key={formType}>
-              <RadioInput
+              <Radio
                 label={t(
                   PageText.Contact.modeOfTransport[formType].description,
                 )}
diff --git a/src/page-modules/contact/ticket-control/forms/feeComplaintForm.tsx b/src/page-modules/contact/ticket-control/forms/feeComplaintForm.tsx
index 1eff66dd0..a3529974d 100644
--- a/src/page-modules/contact/ticket-control/forms/feeComplaintForm.tsx
+++ b/src/page-modules/contact/ticket-control/forms/feeComplaintForm.tsx
@@ -1,15 +1,16 @@
 import style from '../../contact.module.css';
-import { Input } from '../../components/input';
-import { SectionCard } from '../../components/section-card';
 import { PageText, TranslatedString, useTranslation } from '@atb/translations';
-import { Checkbox } from '../../components/input/checkbox';
 import { Typo } from '@atb/components/typography';
-import { RadioInput } from '../../components/input/radio';
-import { Textarea } from '../../components/input/textarea';
-import ErrorMessage from '../../components/input/error-message';
-import { FileInput } from '../../components/input/file';
 import { ContextProps } from '../ticket-control-form-machine';
 import { ticketControlFormEvents } from '../events';
+import {
+  Input,
+  SectionCard,
+  Checkbox,
+  Radio,
+  Textarea,
+  FileInput,
+} from '../../components';
 
 type FeeComplaintFormProps = {
   state: { context: ContextProps };
@@ -132,7 +133,7 @@ const FormContent = ({ state, send }: FormProps) => {
           )}
         </Typo.h3>
 
-        <RadioInput
+        <Radio
           label={t(
             PageText.Contact.ticketControl.feeComplaint.ticketStorage.app.title,
           )}
@@ -146,7 +147,7 @@ const FormContent = ({ state, send }: FormProps) => {
             })
           }
         />
-        <RadioInput
+        <Radio
           label={t(PageText.Contact.input.travelCardNumber.label)}
           name="isAppTicketStorageMode"
           checked={!state.context.isAppTicketStorageMode}
diff --git a/src/page-modules/contact/ticket-control/forms/feedbackForm.tsx b/src/page-modules/contact/ticket-control/forms/feedbackForm.tsx
index b302db5e1..e7a04fe19 100644
--- a/src/page-modules/contact/ticket-control/forms/feedbackForm.tsx
+++ b/src/page-modules/contact/ticket-control/forms/feedbackForm.tsx
@@ -1,20 +1,20 @@
-import { SectionCard } from '../../components/section-card';
 import { ComponentText, PageText, useTranslation } from '@atb/translations';
 import { TransportModeType } from '@atb-as/config-specs';
-import { Input } from '../../components/input';
 import { Line } from '../..';
-import { Textarea } from '../../components/input/textarea';
 import { Typo } from '@atb/components/typography';
-import { FileInput } from '../../components/input/file';
 import { ticketControlFormEvents } from '../events';
 import { ContextProps } from '../ticket-control-form-machine';
-import Select from '../../components/input/select';
 import { useLines } from '../../lines/use-lines';
-import SearchableSelect from '../../components/input/searchable-select';
 import {
+  SectionCard,
+  Input,
+  Textarea,
+  FileInput,
+  Select,
+  SearchableSelect,
   getLineOptions,
   getStopOptions,
-} from '../../components/input/searchable-select/utils';
+} from '../../components';
 
 type FeedbackFormProps = {
   state: { context: ContextProps };
diff --git a/src/page-modules/contact/ticket-control/forms/postponePayment.tsx b/src/page-modules/contact/ticket-control/forms/postponePayment.tsx
index e14aefc59..0cf0f3ec2 100644
--- a/src/page-modules/contact/ticket-control/forms/postponePayment.tsx
+++ b/src/page-modules/contact/ticket-control/forms/postponePayment.tsx
@@ -1,5 +1,4 @@
-import { Input } from '../../components/input';
-import { SectionCard } from '../../components/section-card';
+import { Input, SectionCard } from '../../components';
 import { PageText, useTranslation } from '@atb/translations';
 import { ticketControlFormEvents } from '../events';
 import { ContextProps } from '../ticket-control-form-machine';
diff --git a/src/page-modules/contact/ticket-control/index.tsx b/src/page-modules/contact/ticket-control/index.tsx
index 689ca388e..75565ef89 100644
--- a/src/page-modules/contact/ticket-control/index.tsx
+++ b/src/page-modules/contact/ticket-control/index.tsx
@@ -5,13 +5,12 @@ import {
   FormType,
   ticketControlFormMachine,
 } from './ticket-control-form-machine';
-import { SectionCard } from '../components/section-card';
 import style from '../contact.module.css';
-import { RadioInput } from '../components/input/radio';
+import { Button } from '@atb/components/button';
 import FeeComplaintForm from './forms/feeComplaintForm';
 import FeedbackForm from './forms/feedbackForm';
-import { Button } from '@atb/components/button';
 import PostponePaymentForm from './forms/postponePayment';
+import { SectionCard, Radio } from '../components';
 
 const TicketControlPageContent = () => {
   const { t } = useTranslation();
@@ -40,7 +39,7 @@ const TicketControlPageContent = () => {
         <ul className={style.form_options__list}>
           {Object.values(FormType).map((formType) => (
             <li key={formType}>
-              <RadioInput
+              <Radio
                 label={t(PageText.Contact.ticketControl[formType].description)}
                 value={formType}
                 checked={state.context.formType === formType}
diff --git a/src/page-modules/contact/ticketing/forms/priceAndTicketTypesForm.tsx b/src/page-modules/contact/ticketing/forms/priceAndTicketTypesForm.tsx
index fa816cf51..00387cc09 100644
--- a/src/page-modules/contact/ticketing/forms/priceAndTicketTypesForm.tsx
+++ b/src/page-modules/contact/ticketing/forms/priceAndTicketTypesForm.tsx
@@ -1,11 +1,8 @@
-import { SectionCard } from '../../components/section-card';
 import { PageText, useTranslation } from '@atb/translations';
 import { TicketingContextType } from '../ticketingStateMachine';
 import { Typo } from '@atb/components/typography';
-import { Textarea } from '../../components/input/textarea';
-import { FileInput } from '../../components/input/file';
-import { Input } from '../../components/input';
 import { ticketingFormEvents } from '../events';
+import { SectionCard, Input, Textarea, FileInput } from '../../components';
 
 type PriceAndTicketTypesFormProps = {
   state: { context: TicketingContextType };
diff --git a/src/page-modules/contact/ticketing/index.tsx b/src/page-modules/contact/ticketing/index.tsx
index cc06f1bd7..2afa14b2f 100644
--- a/src/page-modules/contact/ticketing/index.tsx
+++ b/src/page-modules/contact/ticketing/index.tsx
@@ -2,11 +2,10 @@ import style from '../contact.module.css';
 import { PageText, useTranslation } from '@atb/translations';
 import { useMachine } from '@xstate/react';
 import { FormEventHandler } from 'react';
-import { SectionCard } from '../components/section-card';
-import { RadioInput } from '../components/input/radio';
 import { FormCategory, ticketingStateMachine } from './ticketingStateMachine';
 import PriceAndTicketTypesForm from './forms/priceAndTicketTypesForm';
 import { Button } from '@atb/components/button';
+import { SectionCard, Radio } from '../components';
 
 const TicketingContent = () => {
   const { t } = useTranslation();
@@ -23,7 +22,7 @@ const TicketingContent = () => {
         <ul className={style.form_options__list}>
           {Object.values(FormCategory).map((formCategory) => (
             <li key={formCategory}>
-              <RadioInput
+              <Radio
                 label={t(PageText.Contact.ticketing[formCategory].description)}
                 checked={state.matches({ editing: formCategory })}
                 onChange={() =>
diff --git a/src/page-modules/contact/travel-guarantee/forms/refundCarForm.tsx b/src/page-modules/contact/travel-guarantee/forms/refundCarForm.tsx
index f11dc56e6..4e0aa2f4a 100644
--- a/src/page-modules/contact/travel-guarantee/forms/refundCarForm.tsx
+++ b/src/page-modules/contact/travel-guarantee/forms/refundCarForm.tsx
@@ -1,20 +1,20 @@
-import { SectionCard } from '../../components/section-card';
 import { ComponentText, PageText, useTranslation } from '@atb/translations';
 import { useLines } from '../../lines/use-lines';
 import { TransportModeType } from '@atb-as/config-specs';
-import { Input } from '../../components/input';
 import { Line } from '../..';
-import Select from '../../components/input/select';
 import { TravelGuaranteeFormEvents } from '../events';
 import { ContextProps } from '../travelGuaranteeFormMachine';
-import { Checkbox } from '../../components/input/checkbox';
-import { Textarea } from '../../components/input/textarea';
-import { FileInput } from '../../components/input/file';
-import SearchableSelect from '../../components/input/searchable-select';
 import {
+  SectionCard,
+  Input,
+  Select,
+  Checkbox,
+  Textarea,
+  FileInput,
+  SearchableSelect,
   getLineOptions,
   getStopOptions,
-} from '../../components/input/searchable-select/utils';
+} from '../../components';
 
 type RefundCarFormProps = {
   state: { context: ContextProps };
diff --git a/src/page-modules/contact/travel-guarantee/forms/refundTaxiForm.tsx b/src/page-modules/contact/travel-guarantee/forms/refundTaxiForm.tsx
index 7429d0e64..821181aec 100644
--- a/src/page-modules/contact/travel-guarantee/forms/refundTaxiForm.tsx
+++ b/src/page-modules/contact/travel-guarantee/forms/refundTaxiForm.tsx
@@ -1,20 +1,20 @@
-import { SectionCard } from '../../components/section-card';
 import { ComponentText, PageText, useTranslation } from '@atb/translations';
 import { useLines } from '../../lines/use-lines';
 import { TransportModeType } from '@atb-as/config-specs';
-import { Input } from '../../components/input';
 import { Line } from '../..';
-import Select from '../../components/input/select';
 import { TravelGuaranteeFormEvents } from '../events';
 import { ContextProps } from '../travelGuaranteeFormMachine';
-import { Checkbox } from '../../components/input/checkbox';
-import { Textarea } from '../../components/input/textarea';
-import { FileInput } from '../../components/input/file';
-import SearchableSelect from '../../components/input/searchable-select';
 import {
+  SectionCard,
+  Input,
+  Select,
+  Checkbox,
+  Textarea,
+  FileInput,
+  SearchableSelect,
   getLineOptions,
   getStopOptions,
-} from '../../components/input/searchable-select/utils';
+} from '../../components';
 
 type RefundTaxiFormProps = {
   state: { context: ContextProps };
diff --git a/src/page-modules/contact/travel-guarantee/index.tsx b/src/page-modules/contact/travel-guarantee/index.tsx
index abfe7948f..30db7983e 100644
--- a/src/page-modules/contact/travel-guarantee/index.tsx
+++ b/src/page-modules/contact/travel-guarantee/index.tsx
@@ -5,11 +5,9 @@ import { FormEventHandler, useState } from 'react';
 import { Button } from '@atb/components/button';
 import RefundTaxiForm from './forms/refundTaxiForm';
 import RefundCarForm from './forms/refundCarForm';
-import { SectionCard } from '../components/section-card';
 import style from '../contact.module.css';
-import { RadioInput } from '../components/input/radio';
 import { Typo } from '@atb/components/typography';
-import { Checkbox } from '../components/input/checkbox';
+import { SectionCard, Radio, Checkbox } from '../components';
 
 const TravelGuaranteeContent = () => {
   const { t } = useTranslation();
@@ -96,7 +94,7 @@ const TravelGuaranteeContent = () => {
           <ul className={style.form_options__list}>
             {Object.values(FormType).map((formType) => (
               <li key={formType}>
-                <RadioInput
+                <Radio
                   label={t(
                     PageText.Contact.travelGuarantee[formType].description,
                   )}