234 Commits

Author SHA1 Message Date
José Corte
bb84a6424e Merge branch 'administativePages' into 'dev'
Administative pages

See merge request kluppsoftware/smart-energia-web!69
2022-06-23 13:38:15 +00:00
joseCorte-exe
8eacf7b3e6 fixing industryInfo administrative page 2022-06-23 10:31:58 -03:00
joseCorte-exe
e40626f859 fixing login pages 2022-06-23 10:24:26 -03:00
joseCorte-exe
990e47aa01 fix admin tabls 2022-06-23 10:09:18 -03:00
Alex Santos
0192b2bb28 update 2022-06-23 10:05:47 -03:00
Alex Santos
19f4c6ce23 Merge branch 'administativePages' of https://gitlab.com/kluppsoftware/smart-energia-web into administativePages 2022-06-22 15:28:30 -03:00
Alex Santos
1540a1a63a udpate 2022-06-22 15:28:08 -03:00
joseCorte-exe
4159a8096a Merge branch 'administativePages' of https://gitlab.com/kluppsoftware/smart-energia-web into administativePages 2022-06-22 15:26:33 -03:00
joseCorte-exe
85558b1386 fix user logo to api 2022-06-22 15:26:11 -03:00
Alex Santos
41cd2f7b0c update consumo API 2022-06-22 14:19:16 -03:00
Alex Santos
0e5cb5b632 update API 2022-06-22 14:16:59 -03:00
joseCorte-exe
6d48f954b7 push fix 2022-06-22 14:16:23 -03:00
Alex Santos
8c0f803ac1 update Consumiption API 2022-06-22 14:10:00 -03:00
José Corte
3ec2cc423d Merge branch 'administativePages' into 'dev'
Administative pages

See merge request kluppsoftware/smart-energia-web!68
2022-06-21 12:53:47 +00:00
joseCorte-exe
ce4ade1e95 fixing issues pointed out in list 2022-06-20 19:11:22 -03:00
Alex Santos
60a0461d27 Merge branch 'administativePages' of https://gitlab.com/kluppsoftware/smart-energia-web into administativePages 2022-06-20 14:50:54 -03:00
Alex Santos
f88dd4fa80 update Modal 2022-06-20 14:50:01 -03:00
joseCorte-exe
51ccc268a1 adding pld maps and percentage in charts 2022-06-20 11:51:04 -03:00
Alex Da Silva Santos
ce59afc095 Merge branch 'administativePages' into 'dev'
update Chart

See merge request kluppsoftware/smart-energia-web!67
2022-06-17 21:07:34 +00:00
Alex Santos
131fa9fbe2 update Chart 2022-06-17 18:04:13 -03:00
Alex Da Silva Santos
c8473002a8 Merge branch 'administativePages' into 'dev'
Administative pages

See merge request kluppsoftware/smart-energia-web!65
2022-06-17 21:00:37 +00:00
Alex Santos
8cad85d9ef update chart 2022-06-17 16:35:56 -03:00
Alex Santos
0396f685f0 Merge branch 'administativePages' of https://gitlab.com/kluppsoftware/smart-energia-web into administativePages 2022-06-17 16:29:43 -03:00
Alex Santos
db99880217 udpate chart 2022-06-17 16:29:27 -03:00
José Corte
b1e7b322e7 Merge branch 'administativePages' into 'dev'
Administative pages

See merge request kluppsoftware/smart-energia-web!64
2022-06-17 19:27:40 +00:00
joseCorte-exe
624719bd48 integrate charts 2022-06-17 16:24:23 -03:00
Alex Santos
a6feabd9de update graph 2022-06-17 16:18:50 -03:00
Alex Santos
035c03afb5 update Consumo Api 2022-06-17 11:56:21 -03:00
Alex Santos
b7ea553886 update Graph 2022-06-17 11:53:45 -03:00
joseCorte-exe
b045a2e541 starting clients charts 2022-06-17 11:52:26 -03:00
joseCorte-exe
93309759d3 fix tables style 2022-06-16 10:26:20 -03:00
joseCorte-exe
7aef424758 add delete clients and fix clients table 2022-06-16 10:19:30 -03:00
joseCorte-exe
a3f9b5898b add create client 2022-06-15 17:47:48 -03:00
José Corte
6bfe07db84 Merge branch 'administativePages' into 'dev'
fix: delete files without export default in pages folder

See merge request kluppsoftware/smart-energia-web!61
2022-06-15 19:51:05 +00:00
joseCorte-exe
6df25b0766 fix: delete files without export default in pages folder 2022-06-15 16:45:39 -03:00
José Corte
7afe4a817b Merge branch 'administativePages' into 'dev'
fix props validation and key props

See merge request kluppsoftware/smart-energia-web!60
2022-06-15 19:36:26 +00:00
joseCorte-exe
3440ae30e5 fix props validation and key props 2022-06-15 16:35:40 -03:00
José Corte
b3c6948bae Merge branch 'administativePages' into 'dev'
fix import error

See merge request kluppsoftware/smart-energia-web!59
2022-06-15 19:24:51 +00:00
joseCorte-exe
e0d0ddfbbc fix import error 2022-06-15 16:22:50 -03:00
José Corte
3853d8ceb6 Merge branch 'administativePages' into 'dev'
Administative pages

See merge request kluppsoftware/smart-energia-web!58
2022-06-15 19:18:47 +00:00
joseCorte-exe
d92285afe5 preparing to deploy 2022-06-15 16:18:05 -03:00
joseCorte-exe
6ee7e2a375 preparing to release 2022-06-15 16:11:52 -03:00
Alex Santos
e7d49ecf4d Merge branch 'administativePages' of https://gitlab.com/kluppsoftware/smart-energia-web into administativePages 2022-06-15 15:59:05 -03:00
Alex Santos
352c622460 update notificate 2022-06-15 15:58:49 -03:00
joseCorte-exe
ea0225d639 add notification delete 2022-06-15 15:54:42 -03:00
Alex Santos
19dc97d06f Merge branch 'administativePages' of https://gitlab.com/kluppsoftware/smart-energia-web into administativePages 2022-06-15 14:48:38 -03:00
Alex Santos
656f2a67f1 update Faq 2022-06-15 14:47:55 -03:00
joseCorte-exe
e82bf612f9 fix login 2022-06-15 14:20:47 -03:00
joseCorte-exe
481b78ea41 fix pull conflicts 2022-06-15 13:10:17 -03:00
joseCorte-exe
55a206bd3a add auth and user role 2022-06-15 13:09:27 -03:00