Skip to content

#68 Use list #69

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.

Sign up for GitHub

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

Merged
mwarman merged 1 commit into from
Sep 1, 2024
Merged

#68 Use list #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 0 additions & 13 deletions src/pages/Account/AccountPage.scss
View file
Open in desktop

This file was deleted.

40 changes: 22 additions & 18 deletions src/pages/Account/AccountPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,21 @@ import {
IonGrid,
IonItem,
IonLabel,
IonList,
IonListHeader,
IonPage,
IonRow,
IonText,
useIonRouter,
} from '@ionic/react';
import { useState } from 'react';
import dayjs from 'dayjs';

import './AccountPage.scss';
import { PropsWithTestId } from 'common/components/types';
import { useConfig } from 'common/hooks/useConfig';
import ProgressProvider from 'common/providers/ProgressProvider';
import Header from 'common/components/Header/Header';
import SettingsForm from './components/Settings/SettingsForm';
import List from 'common/components/List/List';

/**
* The `AccountPage` component renders a list of account related items which
Expand Down Expand Up @@ -53,46 +53,50 @@ const AccountPage = ({ testid = 'page-account' }: PropsWithTestId): JSX.Element
<IonGrid fixed>
<IonRow>
<IonCol size="12" sizeLg="6">
<IonList>
<List>
<IonListHeader>
<IonLabel>Account</IonLabel>
</IonListHeader>
<IonItem detail lines="full" routerLink="/tabs/account/profile">
<IonLabel>Profile</IonLabel>

<IonItem className="text-sm" detail routerLink="/tabs/account/profile">
<IonLabel className="font-medium ion-margin-end">Profile</IonLabel>
</IonItem>
<IonItem detail lines="full" routerLink="/auth/signout">
<IonLabel>Sign Out</IonLabel>
<IonItem className="text-sm" detail routerLink="/auth/signout">
<IonLabel className="font-medium ion-margin-end">Sign Out</IonLabel>
</IonItem>
</IonList>
</List>
</IonCol>

<IonCol size="12" sizeLg="6">
<SettingsForm />
</IonCol>

<IonCol size="12" sizeLg="6">
<IonList>
<List>
<IonListHeader>
<IonLabel>Legal</IonLabel>
</IonListHeader>
<IonItem lines="full">
<IonLabel>Privacy policy</IonLabel>

<IonItem className="text-sm">
<IonLabel className="font-medium">Privacy policy</IonLabel>
</IonItem>
<IonItem lines="full">
<IonLabel>Terms and conditions</IonLabel>
<IonItem className="text-sm">
<IonLabel className="font-medium">Terms and conditions</IonLabel>
</IonItem>
</IonList>
</List>
</IonCol>

<IonCol size="12" sizeLg="6">
<IonList>
<List>
<IonListHeader>
<IonLabel>About</IonLabel>
</IonListHeader>
<IonItem lines="full" onClick={() => onDiagnosticsClick()}>
<IonLabel>Version {version}</IonLabel>

<IonItem className="text-sm" onClick={() => onDiagnosticsClick()}>
<IonLabel className="font-medium ion-margin-end">Version</IonLabel>
<IonText>{version}</IonText>
</IonItem>
</IonList>
</List>
</IonCol>
</IonRow>
</IonGrid>
Expand Down
17 changes: 10 additions & 7 deletions src/pages/Account/components/Settings/SettingsForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { IonItem, IonLabel, IonList, IonListHeader } from '@ionic/react';
import { IonItem, IonLabel, IonListHeader } from '@ionic/react';
import classNames from 'classnames';
import { Form, Formik } from 'formik';
import { boolean, object } from 'yup';
Expand All @@ -12,6 +12,7 @@ import { useToasts } from 'common/hooks/useToasts';
import { DismissButton } from 'common/components/Toast/Toast';
import ToggleInput from 'common/components/Input/ToggleInput';
import LoaderSkeleton from 'common/components/Loader/LoaderSkeleton';
import List from 'common/components/List/List';

/**
* Settings form values.
Expand Down Expand Up @@ -43,14 +44,15 @@ const SettingsForm = ({
if (isLoading) {
return (
<div className={classNames('form-settings', className)} data-testid={`${testid}-loading`}>
<IonList>
<List>
<IonListHeader>
<IonLabel>Settings</IonLabel>
</IonListHeader>
<IonItem lines="full">

<IonItem>
<LoaderSkeleton animated heightStyle="1.5rem" />
</IonItem>
</IonList>
</List>
</div>
);
}
Expand Down Expand Up @@ -92,11 +94,12 @@ const SettingsForm = ({
>
{({ isSubmitting, submitForm }) => (
<Form data-testid={testid} className={classNames('form-settings', className)}>
<IonList>
<List>
<IonListHeader>
<IonLabel>Settings</IonLabel>
</IonListHeader>
<IonItem lines="full">

<IonItem className="text-sm font-medium">
<ToggleInput
name="allowNotifications"
disabled={isSubmitting}
Expand All @@ -106,7 +109,7 @@ const SettingsForm = ({
Notifications
</ToggleInput>
</IonItem>
</IonList>
</List>
</Form>
)}
</Formik>
Expand Down