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.

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

Release 1 #127

Merged
merged 168 commits into from
Dec 2, 2020
Merged
Changes from 1 commit
Commits
Show all changes
168 commits
Select commit Hold shift + click to select a range
a79069c
added model folder and user.js file
marcosgtavares Sep 15, 2020
da94259
add user model
marcosgtavares Sep 15, 2020
d405e28
added controllers folder and loginController.js file
marcosgtavares Sep 15, 2020
6fe31c1
add login controller
marcosgtavares Sep 15, 2020
3be36b8
added '/' route to router
marcosgtavares Sep 15, 2020
3b5a87a
login controller added to index
marcosgtavares Sep 15, 2020
23b96ac
added jasonwebtoken dependency
marcosgtavares Sep 15, 2020
ba0c561
added token to login controller
marcosgtavares Sep 15, 2020
f0c43b5
added config folder and auth.json file
marcosgtavares Sep 15, 2020
4318bf7
added secret (hash md5) to auth.json
marcosgtavares Sep 15, 2020
1523dbc
auth.json imported to login controller and expiration time added to t…
marcosgtavares Sep 15, 2020
0a210d1
token added to res
marcosgtavares Sep 15, 2020
cc07117
corrected jasonwebtoken to jsonwebtoken
marcosgtavares Sep 16, 2020
0ebf63b
corrected jsonwebtoker to jsonwebtoken
marcosgtavares Sep 16, 2020
71c912d
added model folder and user.js file
marcosgtavares Sep 15, 2020
2717190
add user model
marcosgtavares Sep 15, 2020
bf7c99f
added controllers folder and loginController.js file
marcosgtavares Sep 15, 2020
86e156e
add login controller
marcosgtavares Sep 15, 2020
daeca39
added '/' route to router
marcosgtavares Sep 15, 2020
1e318e8
login controller added to index
marcosgtavares Sep 15, 2020
d52413d
added jasonwebtoken dependency
marcosgtavares Sep 15, 2020
0f70b3b
added token to login controller
marcosgtavares Sep 15, 2020
6b22380
added config folder and auth.json file
marcosgtavares Sep 15, 2020
cc65471
added secret (hash md5) to auth.json
marcosgtavares Sep 15, 2020
a0bce35
auth.json imported to login controller and expiration time added to t…
marcosgtavares Sep 15, 2020
1cdf360
token added to res
marcosgtavares Sep 15, 2020
337fd35
corrected jasonwebtoken to jsonwebtoken
marcosgtavares Sep 16, 2020
260da0f
corrected jsonwebtoker to jsonwebtoken
marcosgtavares Sep 16, 2020
c0c6a5c
solve conflics
marcosgtavares Sep 17, 2020
e02a9a9
solving errors
marcosgtavares Sep 17, 2020
174497b
test case comment
marcosgtavares Sep 17, 2020
6f56db5
create logout controller
marcosgtavares Sep 17, 2020
de37faf
add logout controller to index.js
marcosgtavares Sep 17, 2020
043fb92
changes requested applied
marcosgtavares Sep 24, 2020
9cb8250
solving conflicts
marcosgtavares Sep 24, 2020
91976f2
error solving
marcosgtavares Sep 24, 2020
70629cd
change header field to lower case
marcosgtavares Sep 24, 2020
e8206a4
Added UserSchema
faco400 Sep 29, 2020
efeff82
A#dd topic creation and error handlers
senaarth Sep 24, 2020
da39988
Add update, delete and list topics functions
senaarth Sep 24, 2020
31d2a3b
Add comment model and its creation route
senaarth Sep 24, 2020
910e5a1
Create update comment function
senaarth Sep 24, 2020
519683c
Create comment Routes file
senaarth Sep 24, 2020
4ea0900
A#dd topic creation and error handlers
senaarth Sep 24, 2020
b1ccbf1
Add update, delete and list topics functions
senaarth Sep 24, 2020
3b5df2f
Add comment model and its creation route
senaarth Sep 24, 2020
f527be6
Create update comment function
senaarth Sep 24, 2020
a55668a
Create comment Routes file
senaarth Sep 24, 2020
55337da
Solve conflicts that were created after rebase
senaarth Oct 9, 2020
b6db8bb
Fix error handling to follow project pattern
senaarth Oct 9, 2020
52f17dc
Adds upvote and downvote to topics
senaarth Oct 9, 2020
a81b874
Fix error handling to follow project pattern and add comment properties
senaarth Oct 9, 2020
1db34ad
Associate topic with specific plant
senaarth Oct 11, 2020
a777192
Add comment deletion
senaarth Oct 11, 2020
c886568
Add comment upvote and downvote
senaarth Oct 11, 2020
864e362
Add topic schema and verificate if comment is not empty
senaarth Oct 11, 2020
516d4b3
Finish topic removal
senaarth Oct 11, 2020
72128b8
Finish comment removal
senaarth Oct 11, 2020
7c459ef
Merge branch 'develop' of https://github.com/fga-eps-mds/2020.1-Grupo…
senaarth Oct 11, 2020
60891d0
Fix password authentication in login
faco400 Oct 12, 2020
7c64a57
Fix problems from review
senaarth Oct 13, 2020
55dbe32
Remove item files.
senaarth Oct 15, 2020
25fbeba
Merge pull request #82 from fga-eps-mds/US27_topic_creation
guilhermedelyra Oct 15, 2020
ca3fda5
auth function was added and logout route was deleted
Marofelipe Oct 16, 2020
ef14cb5
put secret on .env
Marofelipe Oct 16, 2020
1ab5a79
uninstalled i dependence
Marofelipe Oct 16, 2020
e90afef
Merge branch 'develop' into i07_fazer_logout_no_aplicativo
rafaelmakaha Oct 16, 2020
2104f8b
removed item and changed imports on authRoutes
Marofelipe Oct 16, 2020
d828970
Removes user.js and Update User.js
rafaelmakaha Oct 16, 2020
4e2f1bc
Merge pull request #18 from fga-eps-mds/i07_fazer_logout_no_aplicativo
rafaelmakaha Oct 16, 2020
bbc0c8a
adding eslint https://github.com/fga-eps-mds/2020.1-GaiaDex-wiki/issu…
guilhermedelyra Oct 19, 2020
55b0fb5
Create .stickler.yml
guilhermedelyra Oct 20, 2020
2c7a368
Update .stickler.yml
guilhermedelyra Oct 20, 2020
550f9d4
fixing .eslintrc (using very useful script in here -> https://github.…
guilhermedelyra Oct 20, 2020
475672d
Merge branch 'adding_eslint' of https://github.com/fga-eps-mds/2020.1…
guilhermedelyra Oct 20, 2020
8d41c59
Merge branch 'adding_eslint' of https://github.com/fga-eps-mds/2020.1…
guilhermedelyra Oct 20, 2020
3a1a747
Merge branch 'adding_eslint' of https://github.com/fga-eps-mds/2020.1…
guilhermedelyra Oct 20, 2020
83580eb
Update .stickler.yml
guilhermedelyra Oct 20, 2020
80c0674
fixing lint errors
guilhermedelyra Oct 20, 2020
ec4801e
Merge branch 'adding_eslint' of https://github.com/fga-eps-mds/2020.1…
guilhermedelyra Oct 20, 2020
b005261
adding github action
guilhermedelyra Oct 20, 2020
3e6fd0a
adding precommit hook
guilhermedelyra Oct 20, 2020
b976873
Merge pull request #115 from fga-eps-mds/adding_eslint
joaovitorml Oct 22, 2020
aaae2b0
Fix default mongodb url
rafaelmakaha Nov 3, 2020
524a6f4
Adding scanner plant rounter
RuanMoura Oct 20, 2020
105d785
adding topic search by id and change the response to like qnt
Marofelipe Oct 30, 2020
c154191
change port to 3000 at index.js
Marofelipe Oct 30, 2020
96d68cc
adding some changes to err treatment
Marofelipe Nov 3, 2020
171589a
rebase
Marofelipe Nov 3, 2020
2c80cc3
Removes unused dependencies on package.json
rafaelmakaha Nov 3, 2020
18f2b1a
Renew eslint
rafaelmakaha Nov 3, 2020
f8cf96b
Fix ES-lint errors
rafaelmakaha Nov 3, 2020
cdb336b
Change husky script call
rafaelmakaha Nov 3, 2020
30b77d6
Add prettier module to package.json
rafaelmakaha Nov 3, 2020
b7d6c62
Fix eslint errors
rafaelmakaha Nov 3, 2020
9b293a4
change the response of routes to be a topic, to upgrade the refresh page
Marofelipe Nov 6, 2020
9ee9b96
Fix dev dependencies
rafaelmakaha Nov 9, 2020
0b991fd
Modified response of Comment create, and add topic find by id router
RuanMoura Nov 10, 2020
552a584
Adding Likes's model and commentLike route and this route check if th…
Marofelipe Nov 11, 2020
2afa3cc
Adding topicLike route and this route check if the user is auth
Marofelipe Nov 11, 2020
0faa6d2
Adding dislike toppic and comment routes
Marofelipe Nov 11, 2020
1d40bb7
userId now came from authtoken, not url more
Marofelipe Nov 11, 2020
1f0e2e3
adding eslint on my pages
Marofelipe Nov 11, 2020
b56a03c
Merge pull request #122 from fga-eps-mds/i121_dependencies_refactor
joaovitorml Nov 14, 2020
3b530e4
Create myPlant model, router and schema.
senaarth Oct 16, 2020
252f721
Update PR to follow codacy patterns
senaarth Oct 27, 2020
b81344d
Create myPlant model, router and schema.
senaarth Oct 16, 2020
2b16aef
Update PR to follow codacy patterns
senaarth Oct 27, 2020
a47fc11
Fix lint errors
senaarth Nov 3, 2020
6e31723
Fix creation of a myPlant bug
senaarth Nov 14, 2020
7914a74
Post myPlant now returns myPlant body instead of success message
joaovitorml Nov 15, 2020
7daed4d
Merge pull request #114 from fga-eps-mds/i85_visualizar_planta
joaovitorml Nov 15, 2020
854d1f6
Create add favorite plant feature
senaarth Nov 13, 2020
5814de3
Create favorite listing feature
victordsantoss Nov 13, 2020
88a721f
Create deleting favorite plant feature
faco400 Nov 13, 2020
b77e8c5
Merge pull request #124 from fga-eps-mds/i106_favorites
joaovitorml Nov 15, 2020
8140bcd
Update linters.yml
joaovitorml Nov 15, 2020
b8b7e89
Create collection route and model
faco400 Oct 21, 2020
4bbf4c9
Fix visualize_my_collection
faco400 Oct 27, 2020
df53210
Fix collections
marcosgtavares Oct 27, 2020
08ba10e
New model plantNotifications
marcosgtavares Oct 28, 2020
e82d5a4
Create plantNotification model and added to collectionRoute
faco400 Oct 28, 2020
f7df17a
fix spelling on collectionRoutes and Plant model
faco400 Oct 28, 2020
a0f0991
Adding new likes request
Marofelipe Nov 17, 2020
d5ea5ca
Adding user finOne routerand changing the schema reference at user model
Marofelipe Nov 18, 2020
181d5da
Create collection route and model
faco400 Oct 21, 2020
17a693e
Fix visualize_my_collection
faco400 Oct 27, 2020
a40d571
New model plantNotifications
marcosgtavares Oct 28, 2020
af05962
Create plantNotification model and added to collectionRoute
faco400 Oct 28, 2020
e692e1e
Configure eslint, remove plantNotifications model, add water and fert…
faco400 Nov 1, 2020
b6e691f
Fix collectionRoutes and delete Collection model
faco400 Nov 18, 2020
baa5b2c
run lint to fix errors
faco400 Nov 18, 2020
a155628
Merge pull request #118 from fga-eps-mds/i84_visualize_my_collection
joaovitorml Nov 18, 2020
e88fbe3
Delete myPlant.js
joaovitorml Nov 18, 2020
f6d11e1
Merge pull request #125 from fga-eps-mds/i95_Visualizar_Prefil_De_Out…
rafaelmakaha Nov 18, 2020
e592044
resolved bug on like dislike
Marofelipe Nov 25, 2020
b9f259f
adding comment and topic correct response
Marofelipe Nov 25, 2020
cff2d16
Modified response of Comment create, and add topic find by id router
RuanMoura Nov 10, 2020
5ce9193
Adding Likes's model and commentLike route and this route check if th…
Marofelipe Nov 11, 2020
4fb71c1
Adding topicLike route and this route check if the user is auth
Marofelipe Nov 11, 2020
c3c50d9
Adding dislike toppic and comment routes
Marofelipe Nov 11, 2020
b09af19
userId now came from authtoken, not url more
Marofelipe Nov 11, 2020
3bac912
adding eslint on my pages
Marofelipe Nov 11, 2020
2870fed
Adding new likes request
Marofelipe Nov 17, 2020
1de0aeb
resolved bug on like dislike
Marofelipe Nov 25, 2020
d8319d2
adding comment and topic correct response
Marofelipe Nov 25, 2020
8fd6fd8
Merge branch 'i119_Modificar_Funcionamento_Do_Like' of https://github…
Marofelipe Nov 25, 2020
ddb4190
Adding scanner plant rounter
RuanMoura Oct 20, 2020
38ebda2
adding topic search by id and change the response to like qnt
Marofelipe Oct 30, 2020
a4cb6ba
change port to 3000 at index.js
Marofelipe Oct 30, 2020
b4c6f3a
adding some changes to err treatment
Marofelipe Nov 3, 2020
397e8f2
rebase
Marofelipe Nov 3, 2020
4be49ce
change the response of routes to be a topic, to upgrade the refresh page
Marofelipe Nov 6, 2020
9ddd130
change the response of routes to be a topic, to upgrade the refresh page
Marofelipe Nov 6, 2020
d35fe36
Merge branch 'i83_scannear_planta' of https://github.com/fga-eps-mds/…
Marofelipe Nov 26, 2020
cea945e
Merge pull request #117 from fga-eps-mds/i83_scannear_planta
joaovitorml Nov 26, 2020
7fd373b
Modified response of Comment create, and add topic find by id router
RuanMoura Nov 10, 2020
0653cc7
Adding Likes's model and commentLike route and this route check if th…
Marofelipe Nov 11, 2020
6b761e5
Adding dislike toppic and comment routes
Marofelipe Nov 11, 2020
0287882
userId now came from authtoken, not url more
Marofelipe Nov 11, 2020
eb6cc0d
adding eslint on my pages
Marofelipe Nov 11, 2020
d8efa86
Adding new likes request
Marofelipe Nov 17, 2020
0e04c62
adding comment and topic correct response
Marofelipe Nov 25, 2020
202d92d
Merge branch 'i119_Modificar_Funcionamento_Do_Like' of https://github…
Marofelipe Nov 28, 2020
4d05a7b
Merge branch 'develop' into i119_Modificar_Funcionamento_Do_Like
Marofelipe Dec 2, 2020
5cdc217
resolve eslint bugs
Marofelipe Dec 2, 2020
c5cadc1
Update .dockerignore
rafaelmakaha Dec 2, 2020
fd213e9
Merge pull request #123 from fga-eps-mds/i119_Modificar_Funcionamento…
rafaelmakaha Dec 2, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
token added to res
Co-authored-by: Vinicius Vieira de Souza <vd.souza1999@gmail.com>
  • Loading branch information
marcosgtavares and faco400 committed Sep 17, 2020
commit 1cdf360ff3c59f20ce8a7911835aeefb04dff957
2 changes: 1 addition & 1 deletion src/controllers/loginController.js
Original file line number Diff line number Diff line change
@@ -31,7 +31,7 @@ router.post('/login', async(req, res) => {
expiresIn: 86400,
});

res.send({ user });
res.send({ user, token });
});

module.exports = app => app.use('/', router);