Skip to content

[ADE-200] Fix icons #134

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
adamrefaey merged 2 commits into from
Apr 30, 2025
Merged

[ADE-200] Fix icons #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2da4a49
Fix Reports icon
GuidoBR Apr 30, 2025
5e9937b
Fix bookmark icon
GuidoBR Apr 30, 2025
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
5 changes: 3 additions & 2 deletions frontend/src/assets/icons/bookmark.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 10 additions & 12 deletions frontend/src/pages/Home/components/ReportItem/ReportItem.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,21 +51,19 @@
display: flex;
align-items: center;
justify-content: center;
background-color: #FFFFFF;
border-radius: 50%;
transition: background-color 0.2s ease;
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.08);

&--active {
background-color: #435FF0;
height: 34px;

}

&-icon {
width: 15px;
transition: all 0.2s ease;
display: flex;
align-items: center;
justify-content: center;
border-radius: 50%;
padding: 11px 7px;

&--active {
color: white;
background-color: #4765ff;
box-shadow: none;
}
}
}

Expand Down
18 changes: 10 additions & 8 deletions frontend/src/pages/Home/components/ReportItem/ReportItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import { IonIcon } from '@ionic/react';
import { format } from 'date-fns';
import { useTranslation } from 'react-i18next';
import { MedicalReport, ReportCategory } from 'common/models/medicalReport';
import { bookmarkOutline } from 'ionicons/icons';
import './ReportItem.scss';

// Import SVG icons
import healthIcon from 'assets/icons/health.svg';
import brainIcon from 'assets/icons/brain.svg';
import heartIcon from 'assets/icons/heart.svg';
import bookmarkIcon from 'assets/icons/bookmark.svg';
import bookmarkFilledIcon from 'assets/icons/bookmark-filled.svg';

interface ReportItemProps {
report: MedicalReport;
Expand Down Expand Up @@ -100,12 +100,14 @@ const ReportItem: React.FC<ReportItemProps> = ({
</div>

{showBookmarkButton && (
<div className="report-item__bookmark" onClick={handleBookmarkClick}>
<IonIcon
icon={bookmarkOutline}
className={`report-item__bookmark-icon ${
bookmarked ? 'report-item__bookmark-icon--active' : ''
}`}
<div
className={`report-item__bookmark ${bookmarked ? 'report-item__bookmark--active' : ''}`}
onClick={handleBookmarkClick}
>
<img
src={bookmarked ? bookmarkFilledIcon : bookmarkIcon}
alt={t('actions.bookmark', { ns: 'common', defaultValue: 'Bookmark' })}
className="report-item__bookmark-icon"
/>
</div>
)}
Expand Down
11 changes: 8 additions & 3 deletions frontend/src/pages/Reports/ReportsListPage.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,15 @@
align-items: center;
}

&__title-icon {
font-size: 1.5rem;
&__icon-wrapper {
display: flex;
align-items: center;
justify-content: center;
background-color: #EBECFD;
border-radius: 50%;
width: 36px;
height: 36px;
margin-right: 0.5rem;
color: var(--ion-color-primary);
}

&__title {
Expand Down
15 changes: 12 additions & 3 deletions frontend/src/pages/Reports/ReportsListPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import {
IonLabel,
IonSegment,
IonSegmentButton,
IonIcon,
IonButton,
IonToast,
IonModal,
Expand All @@ -23,9 +22,10 @@ import ReportItem from 'pages/Home/components/ReportItem/ReportItem';
import NoReportsMessage from 'pages/Home/components/NoReportsMessage/NoReportsMessage';
import { useState, useMemo, useEffect, useRef } from 'react';
import { MedicalReport } from 'common/models/medicalReport';
import { documentTextOutline } from 'ionicons/icons';
import sortSvg from 'assets/icons/sort.svg';
import filterOutlineIcon from 'assets/icons/filter-outline.svg';
import reportsIcon from 'assets/icons/reports.svg';
import SvgIcon from 'common/components/Icon/SvgIcon';
import FilterPanel, { CategoryOption } from './components/FilterPanel/FilterPanel';
import CategoryTag from './components/CategoryTag/CategoryTag';
import ReportsFilterEmpty from './components/ReportsFilterEmpty/ReportsFilterEmpty';
Expand Down Expand Up @@ -262,7 +262,16 @@ const ReportsListPage: React.FC = () => {
}}
>
<div className="reports-list-page__title-container">
<IonIcon icon={documentTextOutline} className="reports-list-page__title-icon" />
<div className="reports-list-page__icon-wrapper">
<SvgIcon
src={reportsIcon}
alt={t('list.icon', { ns: 'report' })}
className="reports-list-page__title-icon"
color="#313E4C"
width={20}
height={20}
/>
</div>
<h1 className="reports-list-page__title">{t('list.title', { ns: 'report' })}</h1>
</div>
<div className="reports-list-page__actions">
Expand Down