Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Release 1 #127

Merged
merged 168 commits into from
Dec 2, 2020
Merged

Release 1 #127

merged 168 commits into from
Dec 2, 2020

Conversation

rafaelmakaha
Copy link
Collaborator

Funcionalidades

  • Login
  • Logout
  • Criar Conta
  • Editar Dados de conta
  • Scanner de Plantas
  • Salvar Plantas
  • Criar Card de Plantas
  • Editar Card de Plantas
  • Pesquisar Card de Plantas
  • Deletar Card de Plantas
  • Criar Minha Planta
  • Editar Minha Planta
  • Pesquisar Minha Planta
  • Deletar Minha Planta
  • Visualizar Coleção de Minhas Plantas
  • Criar Favoritos
  • Editar Favoritos
  • Pesquisar Favoritos
  • Deletar Favoritos
  • Criar Tópico em uma Planta
  • Editar Tópico em uma Planta
  • Pesquisar Tópico em uma Planta
  • Deletar Tópico em uma Planta
  • Criar Comentário em um tópico
  • Editar Comentário em um tópico
  • Pesquisar Comentário em um tópico
  • Deletar Comentário em um tópico
  • Indicar Like em um Tópico
  • Remover um Like em um Tópico
  • Indicar Like em um Comentário
  • Remover um Like em um Comentário

macrossauro and others added 30 commits September 15, 2020 10:06
@macrossauro @faco400
added model folder and user.js file
a79069c 
Co-authored-by: Vinicius Vieira de Souza <vd.souza1999@gmail.com>
@macrossauro @faco400
add user model
da94259 
Co-authored-by: Vinicius Vieira de Souza <vd.souza1999@gmail.com>
@macrossauro @faco400
added controllers folder and loginController.js file
d405e28 
Co-authored-by: Vinicius Vieira de Souza <vd.souza1999@gmail.com>
@macrossauro @faco400
add login controller
6fe31c1 
Co-authored-by: Vinicius Vieira de Souza <vd.souza1999@gmail.com>
@macrossauro @faco400
added '/' route to router
3be36b8 
Co-authored-by: Vinicius Vieira de Souza <vd.souza1999@gmail.com>
@macrossauro @faco400
login controller added to index
3b5a87a 
Co-authored-by: Vinicius Vieira de Souza <vd.souza1999@gmail.com>
@macrossauro @faco400
added jasonwebtoken dependency
23b96ac 
Co-authored-by: Vinicius Vieira de Souza <vd.souza1999@gmail.com>
@macrossauro @faco400
added token to login controller
ba0c561 
Co-authored-by: Vinicius Vieira de Souza <vd.souza1999@gmail.com>
@macrossauro @faco400
added config folder and auth.json file
f0c43b5 
Co-authored-by: Vinicius Vieira de Souza <vd.souza1999@gmail.com>
@macrossauro @faco400
added secret (hash md5) to auth.json
4318bf7 
Co-authored-by: Vinicius Vieira de Souza <vd.souza1999@gmail.com>
@macrossauro @faco400
auth.json imported to login controller and expiration time added to t…
1523dbc 
…oken

Co-authored-by: Vinicius Vieira de Souza <vd.souza1999@gmail.com>
@macrossauro @faco400
token added to res
0a210d1 
Co-authored-by: Vinicius Vieira de Souza <vd.souza1999@gmail.com>
@macrossauro @faco400
corrected jasonwebtoken to jsonwebtoken
cc07117 
Co-authored-by: Vinicius Vieira de Souza <vd.souza1999@gmail.com>
@macrossauro @faco400
corrected jsonwebtoker to jsonwebtoken
0ebf63b 
Co-authored-by: Vinicius Vieira de Souza <vd.souza1999@gmail.com>
@macrossauro @faco400
added model folder and user.js file
71c912d 
Co-authored-by: Vinicius Vieira de Souza <vd.souza1999@gmail.com>
@macrossauro @faco400
add user model
2717190 
Co-authored-by: Vinicius Vieira de Souza <vd.souza1999@gmail.com>
@macrossauro @faco400
added controllers folder and loginController.js file
bf7c99f 
Co-authored-by: Vinicius Vieira de Souza <vd.souza1999@gmail.com>
@macrossauro @faco400
add login controller
86e156e 
Co-authored-by: Vinicius Vieira de Souza <vd.souza1999@gmail.com>
@macrossauro @faco400
added '/' route to router
daeca39 
Co-authored-by: Vinicius Vieira de Souza <vd.souza1999@gmail.com>
@macrossauro @faco400
login controller added to index
1e318e8 
Co-authored-by: Vinicius Vieira de Souza <vd.souza1999@gmail.com>
@macrossauro @faco400
added jasonwebtoken dependency
d52413d 
Co-authored-by: Vinicius Vieira de Souza <vd.souza1999@gmail.com>
@macrossauro @faco400
added token to login controller
0f70b3b 
Co-authored-by: Vinicius Vieira de Souza <vd.souza1999@gmail.com>
@macrossauro @faco400
added config folder and auth.json file
6b22380 
Co-authored-by: Vinicius Vieira de Souza <vd.souza1999@gmail.com>
@macrossauro @faco400
added secret (hash md5) to auth.json
cc65471 
Co-authored-by: Vinicius Vieira de Souza <vd.souza1999@gmail.com>
@macrossauro @faco400
auth.json imported to login controller and expiration time added to t…
a0bce35 
…oken

Co-authored-by: Vinicius Vieira de Souza <vd.souza1999@gmail.com>
@macrossauro @faco400
token added to res
1cdf360 
Co-authored-by: Vinicius Vieira de Souza <vd.souza1999@gmail.com>
@macrossauro @faco400
corrected jasonwebtoken to jsonwebtoken
337fd35 
Co-authored-by: Vinicius Vieira de Souza <vd.souza1999@gmail.com>
@macrossauro @faco400
corrected jsonwebtoker to jsonwebtoken
260da0f 
Co-authored-by: Vinicius Vieira de Souza <vd.souza1999@gmail.com>
@macrossauro @faco400
solve conflics
c0c6a5c 
Co-authored-by: Vinicius Vieira de Souza <vd.souza1999@gmail.com>
@macrossauro @faco400
solving errors
e02a9a9 
Co-authored-by: Vinicius Vieira de Souza <vd.souza1999@gmail.com>
Marofelipe and others added 27 commits November 25, 2020 19:11
@Marofelipe @RuanMoura
userId now came from authtoken, not url more
b09af19 
Co-authored-by: Antonio Ruan <ruanmoura13@outlook.com>
@Marofelipe @rafaelmakaha @RuanMoura
adding eslint on my pages
3bac912 
Co-authored-by: Rafael Makaha <rafael.makaha@gmail.com>
Co-authored-by: Antonio Ruan <ruanmoura13@outlook.com>
@Marofelipe @rafaelmakaha @joaovitorml
Adding new likes request
2870fed 
Co-authored-by: Rafael Makaha <rafael.makaha@gmail.com>
Co-authored-by: João Vítor Morandi <joao.lemos4000@gmail.com>
@Marofelipe
resolved bug on like dislike
1de0aeb
@Marofelipe
adding comment and topic correct response
d8319d2
@Marofelipe
Merge branch 'i119_Modificar_Funcionamento_Do_Like' of https://github…
8fd6fd8 
….com/fga-eps-mds/2020.1-GaiaDex-BackEnd into i119_Modificar_Funcionamento_Do_Like
@RuanMoura @Marofelipe
Adding scanner plant rounter
ddb4190 
Co-authored-by: Marcos Felipe De Almeida Souza <marofelipe@live.com>
@Marofelipe @rafaelmakaha @RuanMoura
adding topic search by id and change the response to like qnt
38ebda2 
Co-authored-by: Rafael Makaha <rafael.makaha@gmail.com>
Co-authored-by: Antonio Ruan <ruanmoura13@outlook.com>
@Marofelipe
change port to 3000 at index.js
a4cb6ba
@Marofelipe @RuanMoura @rafaelmakaha
adding some changes to err treatment
b4c6f3a 
Co-authored-by: Antonio Ruan <ruanmoura13@outlook.com>
Co-authored-by: Rafael Makaha <rafael.makaha@gmail.com>
@Marofelipe @rafaelmakaha @RuanMoura
rebase
397e8f2 
Co-authored-by: Rafael Makaha <rafael.makaha@gmail.com>
Co-authored-by: Antonio Ruan <ruanmoura13@outlook.com>
@Marofelipe @rafaelmakaha @RuanMoura
change the response of routes to be a topic, to upgrade the refresh page
4be49ce 
Co-authored-by: Rafael Makaha <rafael.makaha@gmail.com>
Co-authored-by: Antonio Ruan <ruanmoura13@outlook.com>
@Marofelipe @rafaelmakaha @RuanMoura
change the response of routes to be a topic, to upgrade the refresh page
9ddd130 
Co-authored-by: Rafael Makaha <rafael.makaha@gmail.com>
Co-authored-by: Antonio Ruan <ruanmoura13@outlook.com>
@Marofelipe
Merge branch 'i83_scannear_planta' of https://github.com/fga-eps-mds/…
d35fe36 
…2020.1-GaiaDex-BackEnd into i83_scannear_planta
@joaovitorml
Merge pull request #117 from fga-eps-mds/i83_scannear_planta
cea945e 
Adding scanner plant router
@RuanMoura @Marofelipe
Modified response of Comment create, and add topic find by id router
7fd373b 
Co-authored-by: Marcos Filipe <marofelipe@live.com>
@Marofelipe
Adding Likes's model and commentLike route and this route check if th…
0653cc7 
…e user liked the post previously
@Marofelipe @RuanMoura
Adding dislike toppic and comment routes
6b761e5 
Co-authored-by: Antonio Ruan <ruanmoura13@outlook.com>
@Marofelipe @RuanMoura
userId now came from authtoken, not url more
0287882 
Co-authored-by: Antonio Ruan <ruanmoura13@outlook.com>
@Marofelipe @rafaelmakaha @RuanMoura
adding eslint on my pages
eb6cc0d 
Co-authored-by: Rafael Makaha <rafael.makaha@gmail.com>
Co-authored-by: Antonio Ruan <ruanmoura13@outlook.com>
@Marofelipe @rafaelmakaha @joaovitorml
Adding new likes request
d8efa86 
Co-authored-by: Rafael Makaha <rafael.makaha@gmail.com>
Co-authored-by: João Vítor Morandi <joao.lemos4000@gmail.com>
@Marofelipe
adding comment and topic correct response
0e04c62
@Marofelipe
Merge branch 'i119_Modificar_Funcionamento_Do_Like' of https://github…
202d92d 
….com/fga-eps-mds/2020.1-GaiaDex-BackEnd into i119_Modificar_Funcionamento_Do_Like
@Marofelipe
Merge branch 'develop' into i119_Modificar_Funcionamento_Do_Like
4d05a7b
@Marofelipe
resolve eslint bugs
5cdc217
@rafaelmakaha
Update .dockerignore
c5cadc1 
Signed-off-by: Rafael Makaha <rafael.makaha@gmail.com>
@rafaelmakaha
Merge pull request #123 from fga-eps-mds/i119_Modificar_Funcionamento…
fd213e9 
…_Do_Like

Modificar funcionamento do like
joaovitorml
joaovitorml approved these changes Dec 2, 2020
View reviewed changes
Copy link
Collaborator

@joaovitorml joaovitorml left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

gostei e aprovei

@joaovitorml joaovitorml merged commit a1e621b into master Dec 2, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@joaovitorml joaovitorml joaovitorml approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@rafaelmakaha @joaovitorml @macrossauro @faco400 @senaarth @guilhermedelyra @Marofelipe @RuanMoura @victordsantoss