Skip to content

Commit 500623f

Browse files
committed
Improving layout
1 parent 9472726 commit 500623f

File tree

2 files changed

+54
-38
lines changed

2 files changed

+54
-38
lines changed

frontend/src/pages/Reports/ReportDetailPage.scss

Lines changed: 30 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,35 @@
11
.report-detail-page {
22
--background: var(--ion-color-light);
33

4-
ion-toolbar {
5-
--background: #fff;
4+
&__header {
5+
background-color: #fff;
6+
border-bottom: 1px solid var(--ion-color-light-shade);
7+
padding-bottom: 1rem;
8+
9+
&--loading {
10+
height: 100%;
11+
display: flex;
12+
align-items: center;
13+
justify-content: center;
14+
}
615
}
716

8-
ion-back-button {
9-
--color: var(--ion-color-primary);
17+
&__back-button {
18+
margin-bottom: 0.5rem;
19+
20+
ion-back-button {
21+
--color: var(--ion-color-primary);
22+
--icon-margin-end: 0;
23+
--padding-start: 0;
24+
--padding-end: 0;
25+
display: inline-block;
26+
}
1027
}
1128

12-
&__header {
13-
background-color: #fff;
14-
border-bottom: 1px solid var(--ion-color-light-shade);
29+
&__title-row {
30+
display: flex;
31+
justify-content: space-between;
32+
align-items: center;
1533
}
1634

1735
.report-category {
@@ -24,6 +42,7 @@
2442
margin: 0;
2543
font-size: 1.75rem;
2644
font-weight: 700;
45+
flex: 1;
2746
}
2847

2948
.report-content-card {
@@ -49,6 +68,10 @@
4968

5069
.bookmark-button {
5170
--color: var(--ion-color-primary);
71+
--padding-start: 0;
72+
--padding-end: 0;
73+
--background: transparent;
74+
margin: 0;
5275

5376
&--active {
5477
--color: var(--ion-color-primary);

frontend/src/pages/Reports/ReportDetailPage.tsx

Lines changed: 24 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
import {
22
IonBackButton,
3-
IonButtons,
43
IonContent,
5-
IonHeader,
64
IonPage,
7-
IonTitle,
8-
IonToolbar,
95
IonSegment,
106
IonSegmentButton,
117
IonLabel,
@@ -131,17 +127,14 @@ const ReportDetailPage: React.FC = () => {
131127
if (!report) {
132128
return (
133129
<IonPage className="report-detail-page">
134-
<IonHeader>
135-
<IonToolbar>
136-
<IonButtons slot="start">
137-
<IonBackButton defaultHref="/tabs/home" />
138-
</IonButtons>
139-
<IonTitle>{t('detail.loading')}</IonTitle>
140-
</IonToolbar>
141-
</IonHeader>
142130
<IonContent>
143-
<div className="ion-padding">
144-
<IonText>{t('detail.loading')}</IonText>
131+
<div className="report-detail-page__header report-detail-page__header--loading">
132+
<div className="ion-padding">
133+
<div className="report-detail-page__back-button">
134+
<IonBackButton defaultHref="/tabs/home" text="" />
135+
</div>
136+
<IonText>{t('detail.loading')}</IonText>
137+
</div>
145138
</div>
146139
</IonContent>
147140
</IonPage>
@@ -150,27 +143,27 @@ const ReportDetailPage: React.FC = () => {
150143

151144
return (
152145
<IonPage className="report-detail-page">
153-
<IonHeader>
154-
<IonToolbar>
155-
<IonButtons slot="start">
156-
<IonBackButton defaultHref="/tabs/home" />
157-
</IonButtons>
158-
<IonTitle>{t('detail.title')}</IonTitle>
159-
<IonButtons slot="end">
160-
<IonButton
161-
className={`bookmark-button ${report.bookmarked ? 'bookmark-button--active' : 'bookmark-button--inactive'}`}
162-
onClick={handleBookmarkClick}
163-
>
164-
<IonIcon slot="icon-only" icon={report.bookmarked ? bookmark : bookmarkOutline} />
165-
</IonButton>
166-
</IonButtons>
167-
</IonToolbar>
168-
</IonHeader>
169146
<IonContent>
170147
<div className="report-detail-page__header">
171148
<div className="ion-padding">
149+
<div className="report-detail-page__top">
150+
<div className="report-detail-page__back-button">
151+
<IonBackButton defaultHref="/tabs/home" text="" />
152+
</div>
153+
</div>
154+
172155
<div className="report-category">{report.category}</div>
173-
<h1 className="report-title">{report.title}</h1>
156+
157+
<div className="report-detail-page__title-row">
158+
<h1 className="report-title">{report.title}</h1>
159+
<IonButton
160+
fill="clear"
161+
className={`bookmark-button ${report.bookmarked ? 'bookmark-button--active' : 'bookmark-button--inactive'}`}
162+
onClick={handleBookmarkClick}
163+
>
164+
<IonIcon slot="icon-only" icon={report.bookmarked ? bookmark : bookmarkOutline} />
165+
</IonButton>
166+
</div>
174167
</div>
175168
</div>
176169

0 commit comments

Comments
 (0)