Skip to content

🎨 Palette: Improve My Contributions UX #62

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

Open
godie wants to merge 1 commit into
base: master
Choose a base branch
from
Open

🎨 Palette: Improve My Contributions UX #62

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
1 change: 0 additions & 1 deletion src/components/PlayerCasoContainer.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import ExamService from "../services/ExamService";
import { useHistory } from 'react-router-dom';
import { alertError, alertSuccess } from "../services/AlertService";
import CasoContext from "../context/CasoContext";
import { CustomButton } from "./custom";
import EnarmUtil from "../modules/EnarmUtil";
import ContributionTypeSelector from "./ContributionTypeSelector";
import ContributionsSummary from "./ContributionsSummary";
Expand Down
89 changes: 54 additions & 35 deletions src/pages/Player/MyContributions.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,24 @@
import { useState, useEffect, useMemo } from "react";
import { useHistory } from "react-router-dom";
import ExamService from "../../services/ExamService";
import { CustomRow, CustomCol, CustomTable, CustomPreloader } from "../../components/custom";
import {
CustomRow,
CustomCol,
CustomTable,
CustomPreloader,
CustomCard,
CustomButton
} from "../../components/custom";
import EnarmUtil from "../../modules/EnarmUtil";

const STATUS_LABELS = {
pending: <span className="badge yellow darken-1 white-text" style={{ borderRadius: '4px', float: 'none', marginLeft: 0 }}>Pendiente</span>,
published: <span className="badge green darken-1 white-text" style={{ borderRadius: '4px', float: 'none', marginLeft: 0 }}>Publicado</span>,
rejected: <span className="badge red darken-1 white-text" style={{ borderRadius: '4px', float: 'none', marginLeft: 0 }}>Rechazado</span>,
pending: <span className="badge yellow darken-1 white-text enarm-badge-pill" style={{ float: 'none', marginLeft: 0 }}>Pendiente</span>,
published: <span className="badge green darken-1 white-text enarm-badge-pill" style={{ float: 'none', marginLeft: 0 }}>Publicado</span>,
rejected: <span className="badge red darken-1 white-text enarm-badge-pill" style={{ float: 'none', marginLeft: 0 }}>Rechazado</span>,
};

const MyContributions = () => {
const history = useHistory();
const [contributions, setContributions] = useState({ clinical_cases: [], questions: [] });
const [loading, setLoading] = useState(true);
const [error, setError] = useState(null);
Expand Down Expand Up @@ -55,8 +64,8 @@ const MyContributions = () => {

if (loading) {
return (
<div className="center-align" style={{ padding: '3rem' }}>
<CustomPreloader size="big" active />
<div className="center-align enarm-loading-wrapper">
<CustomPreloader size="big" active color="green" />
</div>
);
}
Expand All @@ -70,51 +79,61 @@ const MyContributions = () => {
<div className="container" style={{ marginTop: '2rem' }}>
<h4 className="center grey-text text-darken-3">Mis Contribuciones</h4>

{error && (
{error ? (
<div className="card-panel yellow lighten-4 brown-text center-align">
<i className="material-icons left">info_outline</i>
<i className="material-icons left" aria-hidden="true">info_outline</i>
{error}
</div>
)}

<CustomRow>
<CustomCol s={12}>
<CustomTable striped hoverable className="z-depth-1">
<thead>
<tr>
<th>Tipo</th>
<th>Nombre / Texto</th>
<th>Especialidad</th>
<th>Status</th>
</tr>
</thead>
<tbody>
{allContributions.length === 0 ? (
) : allContributions.length === 0 ? (
<CustomRow>
<CustomCol s={12} m={8} offset="m2">
<CustomCard className="center-align enarm-card-rounded">
<i className="material-icons enarm-empty-state-icon grey-text" aria-hidden="true" style={{ fontSize: '4rem', marginBottom: '1rem' }}>history_edu</i>
<h5 className="grey-text text-darken-3">¿Aún no has contribuido?</h5>
<p className="grey-text text-darken-1">Tus aportaciones ayudan a miles de médicos a prepararse para el ENARM. ¡Comienza hoy mismo!</p>
<CustomButton
className="green darken-1 enarm-mt-10"
onClick={() => history.push('/contribuir')}
icon="add_circle_outline"
iconPosition="left"
>
Nueva Contribución
</CustomButton>
</CustomCard>
</CustomCol>
</CustomRow>
) : (
<CustomRow>
<CustomCol s={12}>
<CustomTable striped hoverable className="z-depth-1">
<thead>
<tr>
<td colSpan="4" className="center-align grey-text">
No has realizado ninguna contribución todavía.
</td>
<th>Tipo</th>
<th>Nombre / Texto</th>
<th>Especialidad</th>
<th>Status</th>
</tr>
) : (
allContributions.map((item, idx) => (
</thead>
<tbody>
{allContributions.map((item, idx) => (
<tr key={`${item.type}-${item.id || idx}`}>
<td><strong>{item.type}</strong></td>
<td className="truncate" style={{ maxWidth: '300px' }}>
{item.display_name}
</td>
<td>
<span className="badge white border darken-1" style={{ float: 'none', marginLeft: 0 }}>
<span className="badge white border darken-1 enarm-badge-pill" style={{ float: 'none', marginLeft: 0 }}>
{especialidadesMap.get(item.category_id?.toString()) || 'N/A'}
</span>
</td>
<td>{STATUS_LABELS[item.status] || item.status}</td>
</tr>
))
)}
</tbody>
</CustomTable>
</CustomCol>
</CustomRow>
))}
</tbody>
</CustomTable>
</CustomCol>
</CustomRow>
)}
</div>
);
};
Expand Down
4 changes: 3 additions & 1 deletion src/pages/Player/MyContributions.test.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@ describe('MyContributions Component', () => {
);

await waitFor(() => {
expect(screen.getByText(/No has realizado ninguna contribución todavía/i)).toBeDefined();
expect(screen.getByText(/¿Aún no has contribuido\?/i)).toBeDefined();
expect(screen.getByText(/Tus aportaciones ayudan a miles de médicos/i)).toBeDefined();
expect(screen.getByText(/Nueva Contribución/i)).toBeDefined();
});
});

Expand Down