Commit Graph

105 Commits

Author SHA1 Message Date
IvanAS94
f8c75c3c9c Merge pull request #8 from luanngel/DevMarlene
Login GRH, marca de agua tipo membretado y logo en PNG sin fondo
2026-01-12 18:20:34 -08:00
Marlene-Angel
dd3997a3a8 Login GRH, marca de agua tipo membretado y logo en PNG sin fondo 2026-01-12 13:45:25 -08:00
Exteban08
59067b387c Vite config 2026-01-08 19:43:25 +00:00
Exteban08
fab39f099d Add viewId parameter to fetchProjects query 2026-01-08 19:42:54 +00:00
d147b74a54 Meters columns 2026-01-08 13:36:57 -06:00
c3e39819da Change 2026-01-08 13:32:31 -06:00
fc0f682d98 More conflicts 2026-01-08 13:29:56 -06:00
dd65f48a75 New changes conflicts 2026-01-08 13:27:15 -06:00
90c7b3a1c8 vite changes 2026-01-08 13:21:44 -06:00
e136ea8324 Conflicts 2026-01-08 13:21:25 -06:00
1501b29006 Conflicts 2026-01-08 13:16:50 -06:00
Exteban08
64d1f525ad hmr 2026-01-08 04:58:57 +00:00
Exteban08
5da8c12ccd Configure Vite for Cloudflare Tunnel with HMR support 2026-01-08 02:41:42 +00:00
Exteban08
0fc59bb134 Merge remote changes and update local modifications 2026-01-08 02:23:52 +00:00
Exteban08
215b197572 Vite config changes 2026-01-08 02:06:32 +00:00
juancho1127
d7a551011e Merge pull request #5 from luanngel/DevMarlene
Se quitaron los labels de meter
2026-01-07 18:29:36 -06:00
Marlene-Angel
4d807babf7 Se agrega marca de agua GRH y se corrige interacción de perfil en la interfaz 2026-01-07 15:37:57 -08:00
8bb4942caf vite config fix 2026-01-07 00:49:37 -06:00
dce0e33693 Vite config tunnel and Enpoint changes 2026-01-07 00:20:52 -06:00
Marlene-Angel
4ecdd0d656 Merge remote-tracking branch 'origin/DevEsteban' into DevMarlene 2025-12-30 16:50:12 -08:00
juancho1127
53989714c6 Merge pull request #6 from luanngel/DevEsteban
Dev esteban
2025-12-22 18:03:10 -08:00
bbc86bb2d8 Dashboard logic 2025-12-22 15:40:29 -06:00
Marlene-Angel
25da09352d Corrige overflow del layout y autenticación de la API de proyectos 2025-12-22 13:00:53 -08:00
ee35944c44 Dashboard navigate to meters from Tomas card 2025-12-22 01:31:13 -06:00
b9d7eab9db concentrators logic 2025-12-22 01:20:33 -06:00
5a82a717d8 Meters project selection logic fix 2025-12-22 01:16:15 -06:00
820e14463c Meter edit and create logic form & concentrators project select option 2025-12-22 00:19:09 -06:00
a5fa0cfa64 Concentrators create and edit form logic with TTS mock data 2025-12-20 19:45:27 -06:00
014ac19a4b New concentrators fields 2025-12-20 17:15:02 -06:00
Marlene-Angel
1519548c90 Se quitaron los labels de meter 2025-12-20 14:12:49 -08:00
juancho1127
82fa64320b Merge pull request #4 from luanngel/DevMarlene
Ajustes UI en formulario de concentradores
2025-12-20 13:54:27 -08:00
Marlene-Angel
8221f85bb8 Resuelve conflictos al hacer merge con main 2025-12-20 12:28:22 -08:00
Marlene-Angel
9fc1ea3d96 Ajustes UI en formulario de concentradores 2025-12-20 11:59:24 -08:00
juancho1127
67817c8493 Merge pull request #3 from luanngel/DevEsteban
Meters fix to show data in table component
2025-12-20 10:22:41 -08:00
9ece6ff127 Meters fix to show data in table component 2025-12-20 12:21:11 -06:00
juancho1127
f746c845a7 Merge pull request #2 from luanngel/DevEsteban
Dev esteban
2025-12-19 10:00:56 -08:00
c3655f5222 Meter new fields 2025-12-19 00:39:46 -06:00
ebccdcebb0 Delete comments 2025-12-19 00:27:38 -06:00
55bcea33e0 Meters list and CRUD logic 2025-12-19 00:25:17 -06:00
c4d568553a Concentrator list and CRUD logic 2025-12-19 00:10:05 -06:00
bc9cc3b7f7 Projects api improve 2025-12-18 23:29:15 -06:00
8204804511 Project list and crud logic to endpoints 2025-12-18 23:14:16 -06:00
juancho1127
b93a8d30b0 Merge pull request #1 from luanngel/DevMarlene1
Se agrego la interfaz ProjectsPage
2025-12-18 17:11:58 -08:00
Marlene-Angel
0f0328f41b Se agrego la interfaz ProjectsPage 2025-12-18 14:27:56 -08:00
b82c58e500 Create concentrator logic 2025-12-17 21:17:07 -06:00
854c499fe7 Projects api call to set different values in table component 2025-12-17 20:42:53 -06:00
Marlene-Angel
ae43042ac6 refactor: reorganización de estructura, pages y components 2025-12-17 17:21:51 -08:00
a6d9de5682 Device management table edit and delete logic 2025-12-17 13:45:35 -06:00
917016a7cf Device Management section 2025-12-17 13:18:43 -06:00
fc23b98b18 Merge branch 'main' of https://github.com/luanngel/water-project 2025-12-16 21:18:00 -06:00