Skip to content

Commit 99ea0be

Browse files
committed
Fixes on Scales and styles
1 parent f6473d4 commit 99ea0be

File tree

9 files changed

+179
-137
lines changed

9 files changed

+179
-137
lines changed

.vscode/settings.json

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
11
{
2-
"editor.tabSize": 4
2+
"prettier.singleQuote": false,
3+
"prettier.trailingComma": "none",
4+
"prettier.arrowParens": "always",
5+
"prettier.printWidth": 80,
6+
"prettier.tabWidth": 2,
7+
"prettier.useTabs": false,
8+
"prettier.semi": false,
9+
"prettier.bracketSpacing": true,
10+
"prettier.bracketSameLine": false,
11+
"prettier.jsxSingleQuote": false,
12+
"prettier.proseWrap": "preserve",
13+
"prettier.requireConfig": false,
14+
"[javascript]": {
15+
"editor.defaultFormatter": "esbenp.prettier-vscode"
16+
},
17+
"[javascriptreact]": {
18+
"editor.defaultFormatter": "esbenp.prettier-vscode"
19+
},
320
}

src/components/Buttons/Scale.jsx

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -28,28 +28,18 @@ export default function ScaleButton({
2828
return (
2929
<div
3030
className={
31-
"flex items-center justify-between gap-4" +
32-
" px-5 " +
31+
"flex items-center justify-start gap-2.5 px-3 py-2 " +
3332
"max-w-xs sm:max-w-md md:max-w-none w-full md:w-fit rounded " +
3433
"text-base sm:text-2xl md:text-2xl " +
3534
"text-gray-900 dark:text-gray-50 font-medium " +
3635
"backdrop-blur-sm backdrop-brightness-50 backdrop-opacity-10 dark:backdrop-brightness-200 dark:backdrop-opacity-60 " +
37-
`border-4 ${className}`
36+
`border-4 cursor-pointer ${className}`
3837
}
3938
>
40-
<div className="my-2 flex gap-1">
4139
<InfoCircleButton onClick={showBasicModal} />
42-
<button
43-
title={`Ir a escala: ${name}`}
44-
className="grow md:grow-0 w-max h-full text-left font-light"
45-
onClick={() => {
46-
navigate(`/app/scales/${id + 1}`);
47-
}}
48-
>
49-
{name}
50-
</button>
51-
</div>
52-
<FavoriteButton id={id} />
40+
<span onClick={() => navigate(`/app/scales/${id + 1}`) }>{name}</span>
41+
<div className="grow" onClick={() => navigate(`/app/scales/${id + 1}`) }></div>
42+
<FavoriteButton id={id} className="justify-self-end" />
5343
</div>
5444
);
5545
}

src/components/MainContent.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ export default function MainContent ({ className = "", landing = false, children
22
return (
33
<main className={
44
"flex flex-col items-center " +
5-
"mx-auto px-5 md:px-20 xl:px-0 " +
6-
"min-h-[calc(100vh-75px)] max-w-7xl " +
5+
"mx-auto px-5 md:px-12 xl:px-0 " +
6+
"min-h-[calc(100vh-75px)] max-w-5xl " +
77
((landing) ? "relative w-full " : "pt-8 pb-12 ") +
88
`${className}`
99
}>

src/components/ScoreVerdict.jsx

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,7 @@ import Icon from "./Icon";
33
import { addResult } from "../utils/api";
44
import toast from "react-hot-toast";
55

6-
export default function ScoreVerdict({
7-
scaleResults,
8-
totalScore,
9-
dni,
10-
scaleName,
11-
scaleSphere,
12-
}) {
6+
export default function ScoreVerdict({ scaleResults, totalScore, dni, scaleName, scaleSphere }) {
137
const [isSubmitting, setIsSubmitting] = useState(false);
148
async function handleSave(e) {
159
e.preventDefault();

src/libs/framinghamHombres.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -162,28 +162,28 @@
162162
"interpretations": {
163163
"results": [
164164
{
165-
"min": -2,
166-
"max": 2,
165+
"min": -9999,
166+
"max": 5,
167167
"result": "Bajo riesgo."
168168
},
169169
{
170-
"min": 3,
171-
"max": 5,
170+
"min": 5,
171+
"max": 9,
172172
"result": "Riesgo ligero."
173173
},
174174
{
175-
"min": 6,
176-
"max": 8,
175+
"min": 10,
176+
"max": 19,
177177
"result": "Riesgo moderado."
178178
},
179179
{
180-
"min": 9,
181-
"max": 12,
180+
"min": 20,
181+
"max": 39,
182182
"result": "Riesgo alto."
183183
},
184184
{
185-
"min": 13,
186-
"max": 19,
185+
"min": 39,
186+
"max": 9999,
187187
"result": "Riesgo muy alto."
188188
}
189189
],

src/libs/framinghamMujeres.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -162,29 +162,29 @@
162162
"interpretations": {
163163
"results": [
164164
{
165-
"min": -2,
165+
"min": -9999,
166166
"max": 5,
167167
"result": "Riesgo bajo."
168168
},
169169
{
170-
"min": 6,
170+
"min": 5,
171171
"max": 9,
172172
"result": "Riesgo ligero."
173173
},
174174
{
175175
"min": 10,
176-
"max": 14,
176+
"max": 19,
177177
"result": "Riesgo moderado."
178178
},
179179
{
180-
"min": 15,
181-
"max": 24,
180+
"min": 20,
181+
"max": 39,
182182
"result": "Riesgo alto."
183183
},
184184
{
185-
"min": 19,
186-
"max": 23,
187-
"result": "Sin riesgo de desarrollar úlceras por presión."
185+
"min": 39,
186+
"max": 9999,
187+
"result": "Riesgo muy alto."
188188
}
189189
],
190190
"titles": ["Resultado", "Riesgo coronario a 10 años."]

src/main.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ ReactDOM.render(
3131
</Route>
3232
<Route path="scales" element={<Scales />} />
3333
<Route path="scales">
34-
<Route path="9" element={<FraminghamScale />} />
34+
<Route path="8" element={<FraminghamScale />} />
3535
<Route path=":scaleId" element={<Scale />} />
3636
</Route>
3737
<Route path="favorites" element={<Favorites />} />

0 commit comments

Comments
 (0)