From ca9445e6777cea1dd777c936c2692c47a3da717c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bernardo=20de=20la=20Sierra=20R=C3=A1bago?=
<93608793+Bdelas777@users.noreply.github.com>
Date: Wed, 5 Jun 2024 12:28:06 -0600
Subject: [PATCH] Fix: Styles, opcional data and add cypress
---
cypress.config.ts | 16 +-
cypress/e2e/CreateChallenge.cy.ts | 43 +
package-lock.json | 1137 +++++++++++++++--
package.json | 1 +
.../(pages)/(main)/home/generalData/page.tsx | 8 +-
.../(main)/reminders/crudreminders/page.tsx | 31 +-
.../crudreminders/remindersStyle.css | 16 +
src/app/(pages)/healthdata/page.tsx | 15 +-
src/components/Inputs/Input.tsx | 21 +-
src/inputStyles.css | 16 +
src/validations/HealthSchema.tsx | 20 -
tsconfig.json | 12 +-
12 files changed, 1157 insertions(+), 179 deletions(-)
create mode 100644 cypress/e2e/CreateChallenge.cy.ts
create mode 100644 src/app/(pages)/(main)/reminders/crudreminders/remindersStyle.css
create mode 100644 src/inputStyles.css
diff --git a/cypress.config.ts b/cypress.config.ts
index 17161e32..a96860c9 100644
--- a/cypress.config.ts
+++ b/cypress.config.ts
@@ -1,9 +1,19 @@
-import { defineConfig } from "cypress";
+import { defineConfig } from 'cypress'
+import cypressSplit from 'cypress-split'
export default defineConfig({
e2e: {
+ baseUrl: 'http://localhost:3000/',
+ supportFile: 'cypress/support/e2e.ts',
+ fixturesFolder: 'cypress/fixtures',
setupNodeEvents(on, config) {
- // implement node event listeners here
+ cypressSplit(on, config)
+ // IMPORTANT: return the config object
+ return config
},
+ defaultCommandTimeout: 10000, // Tiempo de espera aumentado a 10 segundos
},
-});
+ env: {
+ API_URL: 'http://localhost:3000/',
+ },
+})
diff --git a/cypress/e2e/CreateChallenge.cy.ts b/cypress/e2e/CreateChallenge.cy.ts
new file mode 100644
index 00000000..788f9b75
--- /dev/null
+++ b/cypress/e2e/CreateChallenge.cy.ts
@@ -0,0 +1,43 @@
+///
- {userData && userData.bodyFat}
+ {userData && userData.bodyFat
+ ? userData.bodyFat
+ : 'Sin información'}
%
@@ -267,7 +269,9 @@ const GeneralData = () => {
) : (
- {userData && userData.muscularMass}
+ {userData && userData.muscularMass
+ ? userData.muscularMass
+ : 'Sin información'}
)}
diff --git a/src/app/(pages)/(main)/reminders/crudreminders/page.tsx b/src/app/(pages)/(main)/reminders/crudreminders/page.tsx
index 228638e6..fa9da395 100644
--- a/src/app/(pages)/(main)/reminders/crudreminders/page.tsx
+++ b/src/app/(pages)/(main)/reminders/crudreminders/page.tsx
@@ -5,6 +5,7 @@ import { FaBell } from 'react-icons/fa'
import axios from 'axios'
import Swal from 'sweetalert2'
import { useRouter } from 'next/navigation'
+import './remindersStyle.css'
const CrudReminders = () => {
const router = useRouter()
@@ -98,36 +99,6 @@ const CrudReminders = () => {
return (
<>
-
Crea un recordatorio
- {errors.bodyFat.message}
-
- )}
-
- {errors.muscularMass &&
- typeof errors.muscularMass.message === 'string' && (
-
- {errors.muscularMass.message}
-
- )}
-
= ({
{showPassword ?
)
}
diff --git a/src/inputStyles.css b/src/inputStyles.css
new file mode 100644
index 00000000..2d032142
--- /dev/null
+++ b/src/inputStyles.css
@@ -0,0 +1,16 @@
+/* inputStyles.css */
+/* Estilo para todos los navegadores */
+input[type="date"]::-webkit-calendar-picker-indicator {
+ filter: invert(1); /* Safari y Chrome */
+ }
+ input[type="date"]::-webkit-inner-spin-button,
+ input[type="date"]::-webkit-clear-button {
+ filter: invert(1); /* Safari */
+ }
+ input[type="date"]::-webkit-calendar-picker-indicator:after {
+ filter: invert(0); /* Safari */
+ }
+ input[type="date"]::-ms-clear {
+ filter: invert(1); /* IE */
+ }
+
\ No newline at end of file
diff --git a/src/validations/HealthSchema.tsx b/src/validations/HealthSchema.tsx
index fbf56395..e740e5eb 100644
--- a/src/validations/HealthSchema.tsx
+++ b/src/validations/HealthSchema.tsx
@@ -50,24 +50,4 @@ export const HealthSchema = z.object({
message: 'Debes tener al menos 15 años para registrarte',
},
),
- bodyFat: z.coerce
- .number({
- invalid_type_error: 'El valor de la grasa corporal debe ser un número',
- })
- .gt(0, {
- message: 'Debes ingresar una grasa corporal mayor a 0%',
- })
- .lte(60, {
- message: 'Debes ingresar una grasa corporal menor o igual a 60%',
- }),
- muscularMass: z.coerce
- .number({
- invalid_type_error: 'El valor de la masa muscular debe ser un número',
- })
- .gt(0, {
- message: 'Debes ingresar una masa muscular mayor a 0 kg',
- })
- .lte(80, {
- message: 'Debes ingresar una masa muscular menor o igual a 80 kg',
- }),
})
diff --git a/tsconfig.json b/tsconfig.json
index 053fc417..68300fa4 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -22,7 +22,15 @@
}
},
- "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts", "src/app/api/auth/route.tss", "migrate.mtss", "src/app/api/reminders/[idReminders]"],
- "exclude": ["node_modules","sst.config.ts","sst.config.ts"],
+ "include": [
+ "next-env.d.ts",
+ "**/*.ts",
+ "**/*.tsx",
+ ".next/types/**/*.ts",
+ "src/app/api/auth/route.tss",
+ "migrate.mtss",
+ "src/app/api/reminders/[idReminders]"
+ ],
+ "exclude": ["node_modules", "sst.config.ts", "sst.config.ts"],
"types": ["vitest/globals"]
}