Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
385 commits
Select commit Hold shift + click to select a range
6595eb4
Merge branch 'dev' into dev_rebeca
anasosl Feb 19, 2024
20a6629
Merge pull request #28 from RebecaMenezess/dev_rebeca
anasosl Feb 19, 2024
29388f3
Merge branch 'dev' into dev
anasosl Feb 20, 2024
529a2d1
Merge pull request #30 from Jvrco/dev
anasosl Feb 20, 2024
cea162c
fix(user): route with wrong variables
anasosl Feb 20, 2024
c5f97f0
refactor(*): add comon file to tests and fix restaurant error test
JVMergulho Feb 20, 2024
c14aec7
Merge branch 'dev' of https://github.com/mleticiamn/ess-compartilhame…
mleticiamn Feb 20, 2024
ace9b65
feat(user): add edit and remove tests
gui-maranhao Feb 20, 2024
f7d3fb3
feat(user): Sign in and Sign out tests
Jvrco Feb 20, 2024
6f5c946
fix(*): update readme with run info
anasosl Feb 20, 2024
3feae1c
Merge branch 'dev' into dev
anasosl Feb 20, 2024
56ed6a5
Merge pull request #31 from mleticiamn/dev
anasosl Feb 20, 2024
61f9c91
Merge pull request #32 from gui-maranhao/dev-user
anasosl Feb 20, 2024
ebb9dca
Merge pull request #33 from Jvrco/dev
anasosl Feb 20, 2024
1e1a5f1
fix(list): delete unused route
anasosl Feb 20, 2024
92547f8
feat(user): Fixing some errors int the tests and adding one more to t…
Jvrco Feb 21, 2024
1bd5d79
Merge pull request #34 from Jvrco/dev
anasosl Feb 21, 2024
5be6dd6
Merge pull request #35 from JVMergulho/dev
JVMergulho Feb 21, 2024
2279da1
Merge commit '5be6dd623b4c9749982c827525f0761c32d62dd2' into dev-rest…
JVMergulho Feb 21, 2024
dedc68f
feat(users+followers): create database for tests
anasosl Feb 21, 2024
54dce1d
Merge branch 'dev' of https://github.com/anasosl/ess-compartilhamento…
anasosl Feb 21, 2024
cf33902
feat(*): add test data base
JVMergulho Feb 21, 2024
220c082
Merge remote-tracking branch 'origin/dev-restaurants' into dev
JVMergulho Feb 21, 2024
d170049
fix(users): fix users test data base
JVMergulho Feb 21, 2024
bc82334
Merge pull request #36 from JVMergulho/dev
JVMergulho Feb 21, 2024
b196205
Fixing errors in searchesController.js
RebecaMenezess Feb 21, 2024
112fc76
Merge pull request #37 from RebecaMenezess/dev_rebeca
anasosl Feb 21, 2024
7493ebb
fix(*): fix lib in readme
anasosl Feb 21, 2024
b0352cb
Creates searches1.steps.ts
RebecaMenezess Feb 21, 2024
d7df017
Creates searches2.steps.ts
RebecaMenezess Feb 21, 2024
739ab24
Creates searches1.feature
RebecaMenezess Feb 21, 2024
3e2668c
Creates searches2.feature
RebecaMenezess Feb 21, 2024
11471d0
feature: tests
mleticiamn Feb 21, 2024
e23cef1
fix: syntax
mleticiamn Feb 21, 2024
936fc8b
feature: listController
mleticiamn Feb 21, 2024
9a3d870
refactor: list model
mleticiamn Feb 21, 2024
d23cf42
Delete backend/models/listCollection.js
mleticiamn Feb 21, 2024
9c8e9f8
feature: list router
mleticiamn Feb 21, 2024
98f77dc
refactor: server
mleticiamn Feb 21, 2024
ea9fe26
Merge branch 'dev' of https://github.com/mleticiamn/ess-compartilhame…
mleticiamn Feb 21, 2024
efa4fe4
Merge branch 'dev' of https://github.com/mleticiamn/ess-compartilhame…
mleticiamn Feb 21, 2024
37f2766
Merge branch 'dev' into dev
mleticiamn Feb 21, 2024
4873a8c
Merge pull request #38 from mleticiamn/dev
mleticiamn Feb 21, 2024
3e7f575
Add files via upload
mleticiamn Feb 21, 2024
9033103
Merge pull request #39 from mleticiamn/dev
mleticiamn Feb 21, 2024
682f32c
Updating searches1.steps.ts
RebecaMenezess Feb 21, 2024
dcc2772
Updating searches2.steps.ts
RebecaMenezess Feb 21, 2024
cbf78f5
test(lists): fix tests and database
anasosl Feb 21, 2024
a863e81
Delete backend/tests/controllers/searches/searches2.steps.ts
RebecaMenezess Feb 23, 2024
36140e4
Delete backend/tests/features/searches/searches2.feature
RebecaMenezess Feb 23, 2024
19281bb
Merge commit 'd170049f95087380456732767f92cdd4b119759d' into dev-rest…
JVMergulho Mar 3, 2024
3fce177
Merge branch 'anasosl:main' into dev_rebeca
RebecaMenezess Mar 3, 2024
0d7ec8a
feat(*): frontend base project
JVMergulho Mar 3, 2024
c85823d
Merge commit '0d7ec8a1e895f644b26c09d158ab0427f1199f92' into dev
JVMergulho Mar 3, 2024
d5b9af6
Merge pull request #41 from JVMergulho/dev
JVMergulho Mar 3, 2024
c59b128
Update feedController.js
RebecaMenezess Mar 3, 2024
b12b554
Update reviewController.js
RebecaMenezess Mar 3, 2024
8707607
Delete backend/routes/tendenciesRouter.js
RebecaMenezess Mar 3, 2024
b1ebb0d
Create feedRouter.js
RebecaMenezess Mar 3, 2024
1136088
Update reviewRouter.js
RebecaMenezess Mar 3, 2024
30221ac
Update server.js
RebecaMenezess Mar 3, 2024
9e6a70b
feat(restaurants): add restaurant page basic structure
JVMergulho Mar 4, 2024
22ffa72
feat(*): include cors in the server
JVMergulho Mar 4, 2024
021a768
Update feedController.js
RebecaMenezess Mar 5, 2024
9d1ea2c
Update feedRouter.js
RebecaMenezess Mar 5, 2024
0bfb867
fix(followers): fix id on test scenario
anasosl Mar 6, 2024
813bc30
feat(restaurants): restaurant profile basic structure
JVMergulho Mar 6, 2024
c49e2fc
feat(restaurants): add create new restaurant page
JVMergulho Mar 6, 2024
e828503
Merge pull request #42 from JVMergulho/dev
JVMergulho Mar 6, 2024
d64efe6
Merge branch 'dev' into dev-restaurants
JVMergulho Mar 6, 2024
b75fee3
feat(followers): add followers and following buttons to user page
anasosl Mar 6, 2024
dce0dbc
Merge branch 'dev' of https://github.com/anasosl/ess-compartilhamento…
anasosl Mar 6, 2024
d4798dd
feat(restaurants): form working
JVMergulho Mar 8, 2024
d1b1a58
feat(user): add first version of user page
gui-maranhao Mar 8, 2024
992d387
fix(user): cookies for signin
anasosl Mar 8, 2024
ba73a49
feat(user): create new profile classes
gui-maranhao Mar 8, 2024
0efd73c
feat(user): adapt uploaded images format
gui-maranhao Mar 8, 2024
356c1d0
fix(user): error in style
gui-maranhao Mar 8, 2024
9d18177
feat(*): add landing page
Jvrco Mar 9, 2024
5f0f0c5
feat(restaurants): add profile images to restaurant profile and list …
JVMergulho Mar 9, 2024
0ac3003
style(restaurants): change create-button
JVMergulho Mar 9, 2024
aa20568
feat(login): add login page prototype
Jvrco Mar 9, 2024
76504e9
feat(restaurants): basic struture of restaurant update page
JVMergulho Mar 9, 2024
b7d60a2
Merge pull request #1 from anasosl/dev
RebecaMenezess Mar 9, 2024
10281e4
Merge pull request #44 from gui-maranhao/dev
anasosl Mar 9, 2024
a4c9955
feat(user): add followers and following in user profile
anasosl Mar 9, 2024
7c7862f
Merge branch 'dev' of https://github.com/gui-maranhao/ess-compartilha…
anasosl Mar 9, 2024
2d74af9
Create test
RebecaMenezess Mar 9, 2024
f688cdd
Add files via upload
RebecaMenezess Mar 9, 2024
95f3dd1
Delete frontend/src/assets/test
RebecaMenezess Mar 9, 2024
86e1da9
Add files via upload
RebecaMenezess Mar 9, 2024
3da5216
Merge pull request #45 from RebecaMenezess/dev_rebeca
anasosl Mar 9, 2024
cd5fa00
feat(restaurants): modal
JVMergulho Mar 9, 2024
7890d3d
Create Header.js
RebecaMenezess Mar 10, 2024
c660bed
Create Feed.js
RebecaMenezess Mar 10, 2024
49c49b4
Update Header.js
RebecaMenezess Mar 10, 2024
2a84574
Create Feed.css
RebecaMenezess Mar 10, 2024
439515e
Update index.js
RebecaMenezess Mar 10, 2024
abd068c
Update Header.js
RebecaMenezess Mar 10, 2024
78c69b1
Update Feed.js
RebecaMenezess Mar 10, 2024
bd0605a
Update Feed.css
RebecaMenezess Mar 10, 2024
d2c7193
Create Header.css
RebecaMenezess Mar 10, 2024
db3ba65
Add files via upload
RebecaMenezess Mar 10, 2024
a39c851
Delete frontend/src/assets/search.png
RebecaMenezess Mar 10, 2024
e95e4da
Update Feed.js
RebecaMenezess Mar 10, 2024
91be8d0
Update Feed.css
RebecaMenezess Mar 10, 2024
25d40a2
Update Header.css
RebecaMenezess Mar 10, 2024
22e74ad
fix(followers): add full json of each user
anasosl Mar 10, 2024
0796036
Create Feed.js
RebecaMenezess Mar 10, 2024
9850c14
Delete frontend/src/routes/Feed.js
RebecaMenezess Mar 10, 2024
f04bce6
Update Feed.js
RebecaMenezess Mar 10, 2024
93b090c
Update index.js
RebecaMenezess Mar 10, 2024
be8f2cb
Add files via upload
RebecaMenezess Mar 10, 2024
84e2a9c
feat(restaurants): edit page is working
JVMergulho Mar 10, 2024
9534208
style(restaurants): improve restaurant profile page data organization
JVMergulho Mar 10, 2024
e356b0a
Delete frontend/src/assets/triangle.png
RebecaMenezess Mar 10, 2024
8d6c5f4
Add files via upload
RebecaMenezess Mar 10, 2024
d39a29c
Add files via upload
RebecaMenezess Mar 10, 2024
a84726e
feat(restaurants): add cover image
JVMergulho Mar 10, 2024
af26dde
fix(restaurants): scroll to top when a restaurant was deleted
JVMergulho Mar 10, 2024
28366d1
Merge branch 'dev-restaurants' into dev
JVMergulho Mar 10, 2024
3757e1d
build(*): change db name
JVMergulho Mar 10, 2024
c5a5867
Merge pull request #48 from JVMergulho/dev
JVMergulho Mar 10, 2024
eec02f7
feat(user): add user sign up page
Jvrco Mar 10, 2024
dfb8ffa
feat(user): add sign up post request
Jvrco Mar 10, 2024
a744a22
Delete frontend/src/assets/left_triangle.png
RebecaMenezess Mar 10, 2024
3cb92ec
Rename right_triangle.png to triangle.png
RebecaMenezess Mar 10, 2024
97c6f7e
Update Header.js
RebecaMenezess Mar 10, 2024
9e554c9
Update Feed.js
RebecaMenezess Mar 10, 2024
40f0359
Create SearchResult.js
RebecaMenezess Mar 10, 2024
c54a931
Update Feed.css
RebecaMenezess Mar 10, 2024
e8cae51
Update Header.css to include more things
RebecaMenezess Mar 10, 2024
755c761
Create SearchResult.css
RebecaMenezess Mar 10, 2024
5899d2a
Update index.js
RebecaMenezess Mar 10, 2024
5fd2299
feat(user): add sign in post request
Jvrco Mar 10, 2024
3d7d27a
fix(user): fix login button design
Jvrco Mar 10, 2024
af31438
Add files via upload
RebecaMenezess Mar 11, 2024
80c2c64
feat(followers): add lists feature with css
anasosl Mar 11, 2024
ca4ec27
feat(user): add token for user login verification
Jvrco Mar 11, 2024
a8be9c9
Merge pull request #2 from anasosl/dev
RebecaMenezess Mar 11, 2024
c7533a1
Merge branch 'dev' into dev
JVMergulho Mar 11, 2024
0a521eb
Merge pull request #49 from Jvrco/dev
JVMergulho Mar 11, 2024
8fa628d
fix(*): fixing merge bugs
Jvrco Mar 11, 2024
280de31
Delete frontend/src/assets/search.svg
RebecaMenezess Mar 11, 2024
81d9932
Add files via upload
RebecaMenezess Mar 11, 2024
1087a93
Update Header.js
RebecaMenezess Mar 11, 2024
330ff7c
Update Feed.css
RebecaMenezess Mar 11, 2024
231e226
Update Header.css
RebecaMenezess Mar 11, 2024
f1a6170
feat(user): add edit user page
gui-maranhao Mar 11, 2024
582d518
Merge pull request #51 from Jvrco/dev
Jvrco Mar 11, 2024
d2b60a2
feat(user): add user profile style
gui-maranhao Mar 11, 2024
e6e918c
Merge branch 'dev' into dev_rebeca
JVMergulho Mar 11, 2024
41d7897
Merge pull request #50 from RebecaMenezess/dev_rebeca
JVMergulho Mar 11, 2024
83355d2
Merge branch 'dev' into dev
JVMergulho Mar 11, 2024
1c58d4d
Merge pull request #52 from gui-maranhao/dev
JVMergulho Mar 11, 2024
bdcbdbb
fix(*): fix CSS class names
Jvrco Mar 11, 2024
1fe8e75
Merge pull request #53 from Jvrco/dev
Jvrco Mar 11, 2024
7602f4f
fix(*): fix landing page CSS file
Jvrco Mar 11, 2024
57b65bf
fix(user): change userEdit classnames
gui-maranhao Mar 11, 2024
05810a5
fix(user): change userProfile classnames
gui-maranhao Mar 11, 2024
3159a28
fix(user): change userEdit style classnames
gui-maranhao Mar 11, 2024
592ab97
fix(user): change userProfile style classnames
gui-maranhao Mar 11, 2024
8dc3455
Merge pull request #55 from gui-maranhao/dev
JVMergulho Mar 11, 2024
0e5b526
Merge pull request #54 from Jvrco/dev
JVMergulho Mar 11, 2024
f95f0ec
feat(followers): add follow button on profile page
anasosl Mar 11, 2024
dd0d67e
Merge branch 'dev' of https://github.com/gui-maranhao/ess-compartilha…
anasosl Mar 11, 2024
3f8375c
fix(*): fixing problem from merge
anasosl Mar 11, 2024
eb14393
fix(restaurants): fix css problems
JVMergulho Mar 11, 2024
e9f59ff
Merge branch 'dev' into dev
JVMergulho Mar 11, 2024
96e671b
fix(*): fix landing page header size
Jvrco Mar 11, 2024
4e649ca
feat(user): add profile and cover images edit
gui-maranhao Mar 11, 2024
450e27a
feat(user): add profile and cover images edit
gui-maranhao Mar 11, 2024
b505e61
feat(user): add profile and cover images edit
gui-maranhao Mar 11, 2024
4cb8bd8
Merge branch 'dev' of https://github.com/Jvrco/ess-compartilhamento-d…
Jvrco Mar 11, 2024
3911d76
feat(user): add user login error message
Jvrco Mar 11, 2024
02b8f71
fix(user): fix user return status
Jvrco Mar 11, 2024
9d3cf06
feat(user): add Sign in password and email requirement messages
Jvrco Mar 11, 2024
bf366d3
fix(*): followers and following routes
JVMergulho Mar 11, 2024
c331a06
feat(user): add users page prototype
Jvrco Mar 12, 2024
aaea8dd
feat(user): add edit password and remove account popups
gui-maranhao Mar 12, 2024
130734f
fix(restaurants): fix function type on restaurantController
PedroMonte Mar 12, 2024
36c3fe7
fix(reviews): add rating edit function to controller
PedroMonte Mar 12, 2024
5809af7
fix(reviews) fix backend paths and functions
PedroMonte Mar 12, 2024
7252288
feat(reviews): add several pages
PedroMonte Mar 12, 2024
6503179
Merge pull request #58 from PedroMonte/dev
JVMergulho Mar 12, 2024
93fda02
Merge branch 'dev' into dev
JVMergulho Mar 12, 2024
9547caa
Merge pull request #59 from Jvrco/dev
JVMergulho Mar 12, 2024
b7771e0
feat: add cypress, restaurant teste and fix header css
JVMergulho Mar 12, 2024
f0d40c4
Merge branch 'dev' into dev
JVMergulho Mar 12, 2024
1005a96
Merge pull request #57 from JVMergulho/dev
JVMergulho Mar 12, 2024
7d62127
style: improve error 404 page
JVMergulho Mar 12, 2024
6581fa9
fix(reviews): fix routes on index.js
Mar 12, 2024
d899360
feat(user): user list now redirects to a specific user profile
Jvrco Mar 12, 2024
d6fde18
Merge pull request #60 from PedroMonte/dev
JVMergulho Mar 12, 2024
3833c8b
fix(restaurants): fix restaurants path
Jvrco Mar 12, 2024
2663068
style(restaurants): fix stars position in restaurant profile
JVMergulho Mar 12, 2024
bbeb264
fix(user): fix profile and cover images
gui-maranhao Mar 12, 2024
b452973
Merge pull request #61 from gui-maranhao/dev
Jvrco Mar 12, 2024
e7b8a35
feat(user): add user login redirect to user profile
Jvrco Mar 12, 2024
b01cf17
Merge branch 'dev' into dev
Jvrco Mar 12, 2024
3dee137
feat(reviews): add token validation to reviews
Mar 12, 2024
3becc7e
Merge pull request #62 from Jvrco/dev
gui-maranhao Mar 12, 2024
2d4a38f
feat(user): add token verification to user edit and user page
gui-maranhao Mar 12, 2024
d63374d
feat(*): add missing routes
gui-maranhao Mar 12, 2024
e374121
Merge pull request #64 from gui-maranhao/dev
Jvrco Mar 12, 2024
4f1fafa
fix(*): profile image not showing on header
gui-maranhao Mar 12, 2024
1740f7c
fix(*): header redirection to profile
gui-maranhao Mar 12, 2024
3ff6190
Merge pull request #66 from gui-maranhao/dev
gui-maranhao Mar 12, 2024
d3fecb4
Merge pull request #67 from JVMergulho/dev
JVMergulho Mar 12, 2024
4a00904
feat(user): add user list search bar
Jvrco Mar 12, 2024
9f95fab
Merge branch 'anasosl:dev' into dev
PedroMonte Mar 12, 2024
5130a5f
Merge pull request #63 from PedroMonte/dev
JVMergulho Mar 12, 2024
2cd991d
fix(followers): fix follow button when user is on its own page
anasosl Mar 12, 2024
9a5ef2b
feat(user): add users profile picture in the users page
Jvrco Mar 12, 2024
fc4e0b8
test(followers): test for following an user on the profile page
anasosl Mar 12, 2024
d6514b3
Merge branch 'dev' of https://github.com/anasosl/ess-compartilhamento…
anasosl Mar 12, 2024
c7775a0
refactor(*): made the initial header a component
Jvrco Mar 13, 2024
51969fc
fix(*): catch erros
anasosl Mar 13, 2024
850b3d5
feat(user): user signup now redirects to login page
Jvrco Mar 13, 2024
7711188
Merge branch 'dev' into dev
Jvrco Mar 13, 2024
d92fe12
Merge pull request #71 from Jvrco/dev
anasosl Mar 13, 2024
2a54c37
refactor(restaurants): wider page profile
JVMergulho Mar 13, 2024
a653c3f
Merge pull request #73 from JVMergulho/dev
JVMergulho Mar 13, 2024
36eddd7
fix(*): header not rendering images
gui-maranhao Mar 13, 2024
420348a
Merge pull request #74 from gui-maranhao/dev
anasosl Mar 13, 2024
2d430b8
test(user): add sign in and login tests
Jvrco Mar 13, 2024
1b08fcb
feat(followers): modal for notification
anasosl Mar 13, 2024
b4b27b8
Merge branch 'dev' of https://github.com/anasosl/ess-compartilhamento…
anasosl Mar 13, 2024
1589230
fix(followers): loading page and modal in user profile
anasosl Mar 13, 2024
471b35a
Merge pull request #75 from Jvrco/dev
Jvrco Mar 13, 2024
cd2d0b9
refactor: change html tags for testing
JVMergulho Mar 13, 2024
54f19db
Merge branch 'anasosl:dev' into dev
JVMergulho Mar 13, 2024
0aacb19
Merge pull request #76 from JVMergulho/dev
JVMergulho Mar 13, 2024
0c71857
test(followers): tests e2e
anasosl Mar 13, 2024
f584834
Merge branch 'dev' of https://github.com/anasosl/ess-compartilhamento…
anasosl Mar 13, 2024
c8a81b9
fix(followers): db for test
anasosl Mar 13, 2024
96bb89c
refactor(followers): component list
anasosl Mar 13, 2024
e60c370
refactor(followers): discard duplicates at index.js and delete useles…
anasosl Mar 13, 2024
e29d87c
refactor(user): generalize the verification of user components
gui-maranhao Mar 13, 2024
a18c472
refactor(user): remove unused code lines
gui-maranhao Mar 13, 2024
fcb5301
fix(user): edit profile page not appearing
gui-maranhao Mar 13, 2024
cae20c9
tests(*): add e2e tests
anasosl Mar 14, 2024
49b261d
refactor(*): change app name and logo
anasosl Mar 14, 2024
bb18031
style: add hamster to error page
JVMergulho Mar 14, 2024
488421b
Merge branch 'dev' into dev
anasosl Mar 14, 2024
cb2bd1f
Merge branch 'dev' of github.com:JVMergulho/ess-compartilhamento-de-r…
JVMergulho Mar 14, 2024
e2749b8
Merge pull request #79 from gui-maranhao/dev
anasosl Mar 14, 2024
014e5f7
Merge pull request #80 from JVMergulho/dev
JVMergulho Mar 14, 2024
5ce9074
refactor(*); remove popup dead code
JVMergulho Mar 14, 2024
4e64ba0
Merge pull request #81 from JVMergulho/dev
anasosl Mar 14, 2024
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
137 changes: 136 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,139 @@
__pycache__/

*.log
*.swp
*.swp

backend/node_modules
frontend/node_modules

package-lock.json

# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
lerna-debug.log*
.pnpm-debug.log*

# Diagnostic reports (https://nodejs.org/api/report.html)
report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json

# Runtime data
pids
*.pid
*.seed
*.pid.lock

# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov

# Coverage directory used by tools like istanbul
coverage
*.lcov

# nyc test coverage
.nyc_output

# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
.grunt

# Bower dependency directory (https://bower.io/)
bower_components

# node-waf configuration
.lock-wscript

# Compiled binary addons (https://nodejs.org/api/addons.html)
build/Release

# Dependency directories
node_modules/
jspm_packages/

# Snowpack dependency directory (https://snowpack.dev/)
web_modules/

# TypeScript cache
*.tsbuildinfo

# Optional npm cache directory
.npm

# Optional eslint cache
.eslintcache

# Optional stylelint cache
.stylelintcache

# Microbundle cache
.rpt2_cache/
.rts2_cache_cjs/
.rts2_cache_es/
.rts2_cache_umd/

# Optional REPL history
.node_repl_history

# Output of 'npm pack'
*.tgz

# Yarn Integrity file
.yarn-integrity

# dotenv environment variable files
.env.development.local
.env.test.local
.env.production.local
.env.local

# parcel-bundler cache (https://parceljs.org/)
.cache
.parcel-cache

# Next.js build output
.next
out

# Nuxt.js build / generate output
.nuxt
dist

# Gatsby files
.cache/
# Comment in the public line in if your project uses Gatsby and not Next.js
# https://nextjs.org/blog/next-9-1#public-directory-support
# public

# vuepress build output
.vuepress/dist

# vuepress v2.x temp and cache directory
.temp
.cache

# Docusaurus cache and generated files
.docusaurus

# Serverless directories
.serverless/

# FuseBox cache
.fusebox/

# DynamoDB Local files
.dynamodb/

# TernJS port file
.tern-port

# Stores VSCode versions used for testing VSCode extensions
.vscode-test

# yarn v2
.yarn/cache
.yarn/unplugged
.yarn/build-state.yml
.yarn/install-state.gz
.pnp.*
77 changes: 42 additions & 35 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,65 +1,72 @@
# Bem-vindo ao ESS Base Project! 🗂 🛠
# Bem-vindo ao Projeto de ESS

Este projeto serve como ponto de partida para o desenvolvimento de aplicações utilizando os *frameworks* de *backend* e *frontend* escolhidos pela equipe.
Este projeto foi desenvolvido para a disciplina de ESS, no período 2023.2.

---
## Grupo

## Sobre o Projeto
Ana Sofia Lima (asosl),
Guilherme Maranhão (gmsmr),
João Victor Omena (jvrco),
João Vitor Mergulhão (jvlm2),
Luís Guilherme Nunes (lgmmn),
Maria Letícia Nascimento (mlmn3),
Pedro Vítor Monte (pvom),
Rebeca Menezes (ram3).

O Projeto Base de ESS utiliza o conceito de ***[Subtrees]('https://www.atlassian.com/br/git/tutorials/git-subtree')*** do Git para integrar dois repositórios separados, um para o *backend* e outro para o *frontend*. Esses repositórios são clonados dentro deste projeto, em pastas separadas, permitindo o desenvolvimento simultâneo das camadas de *frontend* e *backend*.
# Framework

MERN: NodeJS, React, Express e MongoDB.

## Passo a Passo 🚶
## Rodando a primeira vez

### Crie um *Fork*
Baixe NodeJS, React e MongoDB.

Se você ainda não tem, faça um *fork* **[deste repositório](https://github.com/Software-Engineering-Assistantship/ess-base-project)** para a sua conta do GitHub.
### No *backend*:

### Clone o seu *Fork*

Clone o repositório forkado para o seu ambiente de desenvolvimento local.
### Instale o *Python 3* 🐍
```sh
npm i bcrypt cors dotenv express mongoose multer nodemailer nodemon jsonwebtoken cookie-parser

Certifique-se de ter o *Python* instalado em seu sistema. Se necessário, faça o download e a instalação do *Python* em https://www.python.org/.
```

### Abra o seu projeto localmente 💻
No *.env* coloque a porta 3001 e um nome para o banco de dados.

Abra o terminal e navegue até o diretório do seu projeto base.
Após a configuração inicial,

### Escolha os *Frameworks* 📝
```sh
npm run dev

Para prosseguir com a criação do projeto base, é importante que você e sua equipe tenham decidido previamente quais *frameworks* de *backend* e *frontend* serão utilizados.
```

#### *Frameworks* Suportados:
No terminal, deverá aparecer:

- ***Frontend*:** React ⚛️, Angular 🅰️, Vue.js 🔥 e Next.js 🇳
- ***Backend*:** NodeJS 🚀 e FastAPI ⚡️
Server started on port 3001
Connected to data base

Certifique-se de que todos estejam alinhados na escolha dos *frameworks* antes de prosseguir com o processo de criação do projeto. Isso garantirá que você esteja utilizando as tecnologias desejadas e poderá aproveitar ao máximo o potencial oferecido por cada *framework* selecionado.
#### Para rodar os testes:

### Crie o Projeto Base 📁
Pela primeira vez:

Para criar o projeto, execute o comando abaixo:
```sh
pip install inquirer && python3 ./config/cli.py
npm i axios ts-jest jest-cucumber

```
ou, caso o comando ```python3``` não exista em sua máquina, execute:
Para rodar:


```sh
pip install inquirer && python ./config/cli.py
```
npm run test

Esse comando instalará a biblioteca [inquirer](https://python-inquirer.readthedocs.io/en/latest/) e executará o arquivo cli.py localizado na pasta config. A partir desse momento, você terá acesso a um processo interativo que irá guiá-lo durante a configuração do projeto.
```
### No *frontend*:

### Comece a desenvolver! 🚀
```sh
npm i react-scripts

Comece a desenvolver sua aplicação utilizando esse projeto base como ponto de partida!
Após a conclusão do processo de criação, o projeto já estará estruturado com os diretórios de *backend* e *frontend* separados. Cada um desses projetos é baseado nos *frameworks* que você escolheu, e eles contêm um arquivo README com instruções detalhadas sobre como configurar e executar cada um deles. Portanto, é altamente recomendado que você leia os respectivos READMEs para obter as informações necessárias. Não deixe essa etapa de lado, pois os READMEs fornecerão orientações valiosas para começar a trabalhar nos projetos de *backend* e *frontend* com facilidade.
```

*Que a força esteja com vocês! 🪐💪✨*
Após a configuração inicial,

---
## Contribuindo 🤝
```sh
npm start

Se você tiver sugestões de melhorias ou encontrar problemas no projeto base, sinta-se à vontade para abrir uma issue neste repositório. Sua contribuição é valiosa para aprimorarmos continuamente o projeto.
```
2 changes: 2 additions & 0 deletions backend/.env
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
PORT=3001
DBNAME=test2
36 changes: 36 additions & 0 deletions backend/config/middleware.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
const jwt = require('jsonwebtoken');

// Função para gerar um token JWT
const generateToken = (user) => {
return jwt.sign({ userId: user._id }, 'secreto', { expiresIn: '1h' });
};

// Middleware para verificar o token em cada requisição
const verifyToken = (req, res, next) => {
const token = req.headers.authorization;
if (!token) {
return res.status(401).json({ error: 'Token não fornecido' });
}

jwt.verify(token, 'secreto', (err, decodedToken) => {
if (err) {
return res.status(403).json({ error: 'Token inválido' });
}
req.userId = decodedToken.userId;
next();
});
};

// Rota de login
const user_login = async (req, res) => {
// Verificação de credenciais aqui

// Se o usuário for autenticado com sucesso
const token = generateToken(user);
return res.json({ token });
};

module.exports = {
user_login,
verifyToken
};
15 changes: 15 additions & 0 deletions backend/config/multer.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
const multer = require("multer")
const path = require("path")

const storage = multer.diskStorage({
destination: function(req, file, cb){
cb(null, "uploads/")
},
filename: function(req, file, cb){
cb(null, Date.now() + path.extname(file.originalname))
}
})

const upload = multer({ storage })

module.exports = upload
47 changes: 47 additions & 0 deletions backend/controllers/feedController.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
const Restaurant = require("../models/Restaurant")
const Review = require("../models/Review")

// selects 5 random restaurants registered
const get_random_restaurants = async (req, res) => {
const restaurants = await Restaurant.find()

if (restaurants.length === 0) {
return res.status(404).json({ error: 'Ainda não há restaurantes cadastrados' })
}
else {
const random_restaurants = restaurants.sort(() => Math.random() - 0.5).slice(0, 5);
res.json(random_restaurants)
}
}

// selects 5 random reviews registered
const get_random_reviews = async (req, res) => {
const reviews = await Review.find()

if (reviews.length === 0) {
return res.status(404).json({ error: 'Ainda não há reviews cadastradas' })
}
else {
const random_reviews = reviews.sort(() => Math.random() - 0.5).slice(0, 5);
res.json(random_reviews)
}
}

// finds the 5 most liked reviews
const get_most_liked_reviews = async (req, res) => {
const reviews = await Review.find()

if (reviews.length === 0) {
return res.status(404).json({ error: 'Ainda não há reviews cadastradas' })
}
else {
const most_liked_reviews = await Review.find().sort({ likes: -1 }).limit(5);
res.json(most_liked_reviews)
}
}

module.exports = {
get_random_restaurants,
get_random_reviews,
get_most_liked_reviews
}
Loading