José Corte
|
40b226adcf
|
Merge branch 'main' into 'feature/nprogress'
# Conflicts:
# README.md
|
2022-05-09 22:29:24 +00:00 |
|
joseCorte-exe
|
de9ab048c5
|
add load progress bar (nprogress) feature
|
2022-05-09 18:13:10 -03:00 |
|
José Corte
|
0a9db132e3
|
Merge branch 'feature/economyPages' into 'dev'
:feature: add economy pages
See merge request kluppsoftware/smart-energia-web!16
|
2022-05-09 20:30:12 +00:00 |
|
joseCorte-exe
|
ab7aa06725
|
updating dev branch
|
2022-05-09 17:28:29 -03:00 |
|
joseCorte-exe
|
400d25fe88
|
:feature: add economy pages
|
2022-05-09 17:00:50 -03:00 |
|
José Corte
|
bd21fd15f3
|
Merge branch 'mergeFix' into 'dev'
uploading to fix marge
See merge request kluppsoftware/smart-energia-web!14
|
2022-05-09 16:11:46 +00:00 |
|
joseCorte-exe
|
4b65ecbffb
|
uploading to fix marge
|
2022-05-09 13:10:18 -03:00 |
|
Alex Da Silva Santos
|
8a0636abee
|
Merge branch 'feature/loginStyledComponents' into 'dev'
Adicionado Reponsividade no login
See merge request kluppsoftware/smart-energia-web!13
|
2022-05-07 00:10:57 +00:00 |
|
Alex Da Silva Santos
|
f04050307c
|
Merge branch 'dev' into 'feature/loginStyledComponents'
# Conflicts:
# pages/index.tsx
|
2022-05-07 00:10:40 +00:00 |
|
Alex Santos
|
99d95c3e1d
|
Adicionado Reponsividade no login
|
2022-05-06 20:50:18 -03:00 |
|
José Corte
|
89e627e1b1
|
Merge branch 'feature/graphCard' into 'dev'
Feature/graph card
See merge request kluppsoftware/smart-energia-web!11
|
2022-05-06 23:47:37 +00:00 |
|
José Corte
|
bf8f67c54f
|
add modified and created components and pages
|
2022-05-06 20:42:48 -03:00 |
|
José Corte
|
9d1741630f
|
Merge branch 'feature/graphCard' into 'dev'
Feature/graph card
See merge request kluppsoftware/smart-energia-web!8
|
2022-05-06 23:37:38 +00:00 |
|
José Corte
|
09d853a960
|
Merge branch 'feature/buttons' into 'dev'
✨ add buttons: loginButton and basicButton
See merge request kluppsoftware/smart-energia-web!7
|
2022-05-06 23:37:08 +00:00 |
|
José Corte
|
3377ceb2df
|
Merge branch 'feature/mapCard' into 'dev'
Feature/map card
See merge request kluppsoftware/smart-energia-web!5
|
2022-05-06 23:30:02 +00:00 |
|
José Corte
|
dd3bc89fae
|
💄 modifing ui of sidebar
|
2022-05-06 19:32:41 -03:00 |
|
José Corte
|
0920abc9d8
|
💄 modifing ui of dashboard
|
2022-05-06 19:25:16 -03:00 |
|
José Corte
|
76fd465ee4
|
💄 modifing ui of card and add chart test
|
2022-05-06 19:21:18 -03:00 |
|
José Corte
|
cba1e66dab
|
🚚 move graphCard to .../graph/graphCard
|
2022-05-06 13:23:33 -03:00 |
|
José Corte
|
ff47a4d1aa
|
✨ add banner component
|
2022-05-06 12:47:34 -03:00 |
|
José Corte
|
dd2c22ec6f
|
✨ add buttons: loginButton and basicButton
|
2022-05-06 12:45:42 -03:00 |
|
José Corte
|
6feac8022b
|
:sprakles: add mapCardComponent
|
2022-05-06 12:41:42 -03:00 |
|
José Corte
|
abbb5a3196
|
✨ add sidebar component
|
2022-05-06 12:37:59 -03:00 |
|
José Corte
|
205c187c5f
|
add login button
|
2022-05-05 15:03:04 -03:00 |
|
José Corte
|
0f399b61be
|
Merge branch 'dashboard' into 'dev'
Dashboard
See merge request kluppsoftware/smart-energia-web!4
|
2022-05-05 14:53:18 +00:00 |
|
José Corte
|
b4c01c9981
|
Merge branch 'dev' into 'dashboard'
# Conflicts:
# pages/_document.tsx
# pages/index.tsx
|
2022-05-05 14:53:05 +00:00 |
|
José Corte
|
164fd2fff1
|
Merge branch 'feature/loginStyledComponents' into 'dev'
✨ add login page
See merge request kluppsoftware/smart-energia-web!3
|
2022-05-05 14:50:33 +00:00 |
|
José Corte
|
c8423628b2
|
🐛 bugfix
|
2022-05-05 11:48:58 -03:00 |
|
José Corte
|
008e701a64
|
✨ dashboard
|
2022-05-05 11:45:14 -03:00 |
|
Alex Santos
|
9d288dbaa4
|
✨ add login page
|
2022-05-05 11:40:27 -03:00 |
|
José Corte
|
9ab5863dc2
|
setup styled-components
|
2022-05-04 09:49:49 -03:00 |
|
José Corte
|
7d312582cd
|
add styled-components
|
2022-05-04 09:11:24 -03:00 |
|
José Corte
|
ed51433d20
|
project next with setup config
|
2022-05-03 17:38:53 -03:00 |
|
Luiz Filipe Cunha
|
8a0a12ee59
|
Initial commit
|
2022-05-03 19:10:01 +00:00 |
|