Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
533 commits
Select commit Hold shift + click to select a range
ea12879
feat: create SelectReservation page
victoriacfigueiredo Jul 13, 2024
a1903d4
feat: creat MyReservations page
victoriacfigueiredo Jul 13, 2024
24a7105
feat: create UpdateReservation pages
victoriacfigueiredo Jul 13, 2024
2c3a090
feat: update PayReservation page
victoriacfigueiredo Jul 13, 2024
6939d2e
feat: adding paths for reservation pages
victoriacfigueiredo Jul 13, 2024
9afd76b
update: package json files
victoriacfigueiredo Jul 13, 2024
7c5abff
refact: moving just-spider file to reservation components folder
victoriacfigueiredo Jul 13, 2024
6e765c9
refact: deleting useless files
victoriacfigueiredo Jul 13, 2024
7232e4e
refact: moving reservation files to reservation pages folder
victoriacfigueiredo Jul 13, 2024
bf9ab05
refact: adding background component
victoriacfigueiredo Jul 13, 2024
3de6730
fix: updating imports
victoriacfigueiredo Jul 13, 2024
8c77162
fix: use new_price to calculate reservation price
victoriacfigueiredo Jul 13, 2024
3eb802c
fix: find paymentMethodId by it's number
victoriacfigueiredo Jul 14, 2024
33ac6b1
fix: updating package lock json to avoid merge conflicts
victoriacfigueiredo Jul 14, 2024
d5862da
Merge branch 'main' into main
victoriacfigueiredo Jul 14, 2024
02cfca3
fix: one curly bracket missing
victoriacfigueiredo Jul 14, 2024
931040e
fix: missing brackets
victoriacfigueiredo Jul 14, 2024
c523c63
fix: install react packages
victoriacfigueiredo Jul 14, 2024
baa9ae7
Merge pull request #45 from victoriacfigueiredo/main
duartebianca Jul 14, 2024
0ee0dd6
feat: create register client page
duartebianca Jul 14, 2024
ce4ead2
fix: recovery import
duartebianca Jul 15, 2024
ed057a0
chore: refactor search backend
MateusGaldinoLG Jul 18, 2024
78c9b65
feat: begins search feature frontend implementation
MateusGaldinoLG Jul 19, 2024
1dee698
fix: remove dependencies not used
MateusGaldinoLG Jul 19, 2024
5c1b5a6
Merge pull request #46 from MateusGaldinoLG/main
duartebianca Jul 19, 2024
1061464
fix: size of avatars and remove member
duartebianca Jul 19, 2024
746ceaf
feat: update flip words title font size
duartebianca Jul 19, 2024
070eee8
feat(home): adjust search bar and card component styles
duartebianca Jul 19, 2024
40ba74c
feat(home): add "saiba mais" effect, adjust search bar and card compo…
duartebianca Jul 19, 2024
f0fd192
feat: Add react-toastify for login success and error messages
duartebianca Jul 19, 2024
f00c934
feat(hotelier): update login page with react-toastify for success and…
duartebianca Jul 19, 2024
df82bd7
feat(home): update cin ufpe logo URL
duartebianca Jul 20, 2024
67cedd3
fix(rate): fix editSavedReservation
AmandaCLima Jul 20, 2024
3fef35d
feat: add pages of profile, rate and whishlist
AmandaCLima Jul 20, 2024
f16ce1a
Merge remote-tracking branch 'upstream/main' into main
AmandaCLima Jul 20, 2024
4891021
feat(home): update tooltip preview design and content
duartebianca Jul 20, 2024
039fc50
feat: make query hook for client and hotelier and add user type on to…
duartebianca Jul 20, 2024
9847d28
feat(auth): update reset password page with form submission handling
duartebianca Jul 20, 2024
1208415
feat(auth): add registerHotelierMutation hook for hotelier registration
duartebianca Jul 20, 2024
46e46b9
feat(client): create edit profile client page
duartebianca Jul 20, 2024
b7d55f0
feat(nav-bar): updated nav bar to conditionally display pages based o…
duartebianca Jul 20, 2024
ca83cef
fix: remove unused imports
duartebianca Jul 20, 2024
8728fec
fix: import recoveryForm
duartebianca Jul 20, 2024
9fe32ab
fix: recovery-form import
duartebianca Jul 20, 2024
998235e
fix: change form type files to use snake case instead of camel case
duartebianca Jul 20, 2024
7714e7a
fix: delete frontend/src/shared/assets/spider.png:Zone.Identifier
duartebianca Jul 20, 2024
9c9580a
fix: delete frontend/src/shared/assets/net.png:Zone.Identifier
duartebianca Jul 20, 2024
6ea1b20
Merge branch 'main' into dev
duartebianca Jul 20, 2024
93e0a0b
Merge pull request #47 from duartebianca/dev
victoriacfigueiredo Jul 20, 2024
2847545
feat: updated the URL for manage reservations in the nav bar
leticiagaspar Jul 20, 2024
3a799bb
feat: updated component URLs
leticiagaspar Jul 20, 2024
084ebac
feat: added context and provider for published reservations
leticiagaspar Jul 20, 2024
3be7c20
feat: updated exception message
leticiagaspar Jul 20, 2024
f457a07
feat: add price update in the reservation update method
leticiagaspar Jul 20, 2024
9f3f22c
feat: replaced reservation ID in URL with Context API and add IDs to …
leticiagaspar Jul 20, 2024
a32c7eb
feat: add IDs to inputs for testing and adjusted URLs
leticiagaspar Jul 20, 2024
06e5808
feat: replaced reservation ID in URL with Context API and add IDs to …
leticiagaspar Jul 20, 2024
3354b24
feat: add sort to list reservations by id order
leticiagaspar Jul 20, 2024
dfaa0f8
feat: replaced reservation ID in URL with Context API and add IDs to …
leticiagaspar Jul 20, 2024
9963859
add examples of hotel room images
leticiagaspar Jul 20, 2024
cc38f4a
test: setup system for Cypress testing and add GUI scenarios
leticiagaspar Jul 20, 2024
817474b
Merge branch 'main' into main
leticiagaspar Jul 20, 2024
88eba07
Merge pull request #48 from leticiagaspar/main
MatheusMnt Jul 20, 2024
19fa0a7
fix: change routes
AmandaCLima Jul 20, 2024
f95dcd2
Merge remote-tracking branch 'upstream/main' into main
AmandaCLima Jul 20, 2024
dfe0d03
feat(): paymentMethods
MatheusMnt Jul 20, 2024
3be97fb
sinc
MatheusMnt Jul 20, 2024
16b7aea
copia de yarn.lock
MatheusMnt Jul 20, 2024
beb0c9d
fix: corrects stylistic mistakes
MateusGaldinoLG Jul 20, 2024
cd72455
Merge pull request #4 from duartebianca/main
MatheusMnt Jul 20, 2024
2448848
Merge branch 'dev'
MatheusMnt Jul 20, 2024
d514791
Merge branch 'main' of https://github.com/MatheusMnt/hotel-trancinvania
MatheusMnt Jul 20, 2024
f447dee
feat: further implementation of search feature frontend
MateusGaldinoLG Jul 20, 2024
95f97b2
fix(): feature paymentMethods
MatheusMnt Jul 20, 2024
0bf752b
fix: corrects styles and model file
MateusGaldinoLG Jul 20, 2024
61bd847
ajustes para sync
MatheusMnt Jul 20, 2024
a43dd52
Merge pull request #50 from MateusGaldinoLG/main
duartebianca Jul 20, 2024
676925f
feat(nav-bar): update nav bar links for hotelier profile
duartebianca Jul 20, 2024
00bfc20
refactor: client and hotelier repositories
duartebianca Jul 20, 2024
ef09a23
feat: add hotelier profile page to navigation bar
duartebianca Jul 20, 2024
c25c84c
feat(hotelier): create hotelier profile page
duartebianca Jul 20, 2024
26d742c
feat: create custom input mask component
duartebianca Jul 20, 2024
273acda
chore: update react-hook-form to version 7.52.1
duartebianca Jul 20, 2024
f40ee3c
ajustes em testes
MatheusMnt Jul 20, 2024
0dd9aac
fix: update main.tsx to use React.StrictMode
duartebianca Jul 20, 2024
451698f
feat: delete buttom of wishlist page
AmandaCLima Jul 20, 2024
4a51d59
ajustes
MatheusMnt Jul 21, 2024
62d0e56
feat: setup enviroment to use backend functions
victoriacfigueiredo Jul 21, 2024
94b47e6
feat: create page to see client reservation details
victoriacfigueiredo Jul 21, 2024
bfb76f1
fix: create new endpoints for get and delete routs
victoriacfigueiredo Jul 21, 2024
bae0778
fix: add step functions in create reservation page
victoriacfigueiredo Jul 21, 2024
73f101f
fix: add step functions in edit reservation page
victoriacfigueiredo Jul 21, 2024
3938ad2
refac: update myreservations page interface to match reservations page
victoriacfigueiredo Jul 21, 2024
d03dbfe
feat: call backend functions in selectReservation page
victoriacfigueiredo Jul 21, 2024
c84912e
feat: update App and Provider files
victoriacfigueiredo Jul 21, 2024
3e99f87
feat: link reservations page to select reservation page
victoriacfigueiredo Jul 21, 2024
5ed7e23
Merge branch 'main' into main
victoriacfigueiredo Jul 21, 2024
677f634
Merge branch 'duartebianca:main' into main
AmandaCLima Jul 21, 2024
97033c1
fix: cancelReservation endpoint in reservation and email tests
victoriacfigueiredo Jul 21, 2024
b7dbc64
Merge remote-tracking branch 'origin/main'
victoriacfigueiredo Jul 21, 2024
fb11683
ajustes em testes
MatheusMnt Jul 21, 2024
0819889
Merge pull request #52 from victoriacfigueiredo/main
duartebianca Jul 21, 2024
ace1304
Merge remote-tracking branch 'upstream/main' into main
AmandaCLima Jul 21, 2024
32c63f6
delete images of reservations
leticiagaspar Jul 21, 2024
9054bac
fix: database bug in client and hotelier repositories
leticiagaspar Jul 21, 2024
2f26316
feat: add hotelier_id filter in promotionInReservation method
leticiagaspar Jul 21, 2024
6c5ae0b
feat: add hotelier_id filter in promotionInReservation method
leticiagaspar Jul 21, 2024
51bd7db
feat: update service scenarios to use hotelier username instead of email
leticiagaspar Jul 21, 2024
da08d8e
fix: modify GUI scenarios to fix test compatibility
leticiagaspar Jul 21, 2024
8abc37c
fix(): client_id no endpoint de paymentMethods
MatheusMnt Jul 21, 2024
46898e4
feat: add ID in the login button
leticiagaspar Jul 21, 2024
c17e864
fix: adjust spacing in navbar
leticiagaspar Jul 21, 2024
dcf5cf5
feat: implement e2e test steps
leticiagaspar Jul 21, 2024
0a286fe
feat: integrate hotelier hook in published reservation components
leticiagaspar Jul 21, 2024
512e26d
fix(auth): fix reset client and change token duration from 1 to 24h
duartebianca Jul 21, 2024
e24cbe4
feat(hotelier): update CEP validation in register form and fix regist…
duartebianca Jul 21, 2024
c6acc36
fix: remove spaces and accents from published reservation names for IDs
leticiagaspar Jul 21, 2024
cdc7a94
fix: save reservation in select-reservations page
AmandaCLima Jul 21, 2024
261b5ea
feat(profile - client): update profile client page and logic
duartebianca Jul 21, 2024
f447fbd
feat: add images folder to .gitignore
leticiagaspar Jul 21, 2024
f18a7d5
Merge pull request #51 from MatheusMnt/main
duartebianca Jul 21, 2024
4ca9689
Merge branch 'main' into main
leticiagaspar Jul 21, 2024
ba3b5a5
Merge pull request #53 from leticiagaspar/main
duartebianca Jul 21, 2024
7d1407d
refactor(navbar): use useNavbarUserData hook for fetching navbar user…
duartebianca Jul 21, 2024
1eeea37
refactor(client, hotelier register): change the toast for success
duartebianca Jul 21, 2024
f56c716
feat: save bottom
AmandaCLima Jul 21, 2024
4facabb
feat(reset): add toast notifications for password reset client and ho…
duartebianca Jul 21, 2024
0a4770f
Merge remote-tracking branch 'upstream/main' into main
AmandaCLima Jul 21, 2024
046fe59
Merge remote-tracking branch 'upstream/main' into main
AmandaCLima Jul 21, 2024
a5eede3
fix: save buttom
AmandaCLima Jul 21, 2024
bc66b73
Merge branch 'main' of github.com:AmandaCLima/hotel-trancinvania into…
AmandaCLima Jul 21, 2024
78c0821
refactor(reset): improve password visibility toggle in reset password…
duartebianca Jul 21, 2024
ce4cfbb
refactor(login): add password visibility toggle in login forms
duartebianca Jul 21, 2024
4af9678
refactor(auth): update registration forms and hooks
duartebianca Jul 21, 2024
416254e
Merge pull request #5 from duartebianca/main
MatheusMnt Jul 21, 2024
c00679d
fix: removing unused libraries
AmandaCLima Jul 21, 2024
45bcda6
feat: add hotel room example picture
victoriacfigueiredo Jul 21, 2024
ed1570b
feat: get updated versions of client and hotelier repositories
victoriacfigueiredo Jul 21, 2024
4c969fc
feat: install react packages
victoriacfigueiredo Jul 21, 2024
df064d7
fix: call right params at sendEmail function
victoriacfigueiredo Jul 21, 2024
ed11f5d
fix: client login rout
victoriacfigueiredo Jul 21, 2024
a736c09
integrate post and put routes and fix get rout
victoriacfigueiredo Jul 21, 2024
16f709a
feat(profile - client): update profile client page and logic
duartebianca Jul 21, 2024
f5cdbf3
fix: commenting unused libraries
AmandaCLima Jul 21, 2024
16a7370
Merge pull request #54 from AmandaCLima/main
duartebianca Jul 21, 2024
4d59bc9
Merge branch 'main' into main
victoriacfigueiredo Jul 21, 2024
6b2937a
delete extra package json files
victoriacfigueiredo Jul 21, 2024
39aac75
Merge pull request #55 from victoriacfigueiredo/main
duartebianca Jul 21, 2024
b73a55e
refactor(auth): update registration forms and hooks
duartebianca Jul 21, 2024
277011c
refactor(auth): improve authorization and authentication in frontend
duartebianca Jul 21, 2024
1a67e46
fix(hotelier-profile): adjust frontend and integrate with backend
duartebianca Jul 21, 2024
8a00a66
refactor(hotelier-profile): update profile form layout for hotelier p…
duartebianca Jul 21, 2024
a82b9e7
fix: update Cypress tests to use data-cy selectors instead of IDs
leticiagaspar Jul 21, 2024
0e2ebaa
Merge pull request #56 from leticiagaspar/main
duartebianca Jul 21, 2024
6428a7d
Merge branch 'main' into feat/front
duartebianca Jul 22, 2024
001045e
refactor(nav-bar): update navigation links for client profile and pay…
duartebianca Jul 22, 2024
88f890a
refactor: update navigation links for hotelier and client profile
duartebianca Jul 22, 2024
d67384b
Merge pull request #57 from duartebianca/feat/front
victoriacfigueiredo Jul 22, 2024
fd15a0b
tela 'Carteira'
MatheusMnt Jul 22, 2024
e1650c4
feat: begins E2E testing
MateusGaldinoLG Jul 22, 2024
e92d77b
feat: add share buttons
AmandaCLima Jul 22, 2024
31786a3
feat: insert client payment methods on reservation pages
victoriacfigueiredo Jul 22, 2024
2a32ff5
feat: improving reservation pages
victoriacfigueiredo Jul 22, 2024
fd06201
feat: progress to put hotel adress at reservation pages
victoriacfigueiredo Jul 22, 2024
3c07b61
feat: get updated versions of paymentMethod repository
victoriacfigueiredo Jul 22, 2024
c1ce960
Merge branch 'main' into main
victoriacfigueiredo Jul 22, 2024
d41ef83
Merge pull request #58 from MateusGaldinoLG/main
victoriacfigueiredo Jul 22, 2024
0c1e77b
Merge pull request #59 from victoriacfigueiredo/main
victoriacfigueiredo Jul 22, 2024
9567b5b
feat: add check in update reservation method to verify if reservation…
leticiagaspar Jul 22, 2024
a9a2e41
feat: add input validation to prevent non-numeric characters in numbe…
leticiagaspar Jul 22, 2024
8c586a6
fix: adjust exception message
leticiagaspar Jul 22, 2024
e3ab516
Merge pull request #60 from leticiagaspar/main
victoriacfigueiredo Jul 22, 2024
63e6c52
feat: add rate and rating pages
AmandaCLima Jul 22, 2024
779ff9e
refactor: update login error messages for client and hotelier pages
duartebianca Jul 22, 2024
ba7a7c6
refactor: update letter spacing in profile, WishList and rate pages
duartebianca Jul 22, 2024
9a34315
ajuste em tela de carteira
MatheusMnt Jul 22, 2024
c41d750
ajustes do CRUD de cartões
MatheusMnt Jul 22, 2024
4aa6d80
refactor: update spacing letter
duartebianca Jul 22, 2024
b7a71a7
refactor(auth): add toast notifications to AuthWrapper component
duartebianca Jul 22, 2024
7f6d26f
feat: adjust reservation details component
leticiagaspar Jul 22, 2024
22fe477
refactor: change styling
MateusGaldinoLG Jul 22, 2024
882a6ef
fix: corrects search behaviour
MateusGaldinoLG Jul 22, 2024
1543416
feat: implements further search tests
MateusGaldinoLG Jul 22, 2024
1ea14e8
Merge branch 'duartebianca:main' into main
MateusGaldinoLG Jul 22, 2024
53c2b53
Merge pull request #61 from leticiagaspar/main
duartebianca Jul 22, 2024
1b02e54
fix: fix heading search result
MateusGaldinoLG Jul 22, 2024
5a56546
fix: fix heading search-result and test data
MateusGaldinoLG Jul 22, 2024
1c1280b
fix: corrige search
MateusGaldinoLG Jul 22, 2024
0cffb9f
refactor: extract card component
MateusGaldinoLG Jul 22, 2024
3c8b90e
feat: implements further tests
MateusGaldinoLG Jul 22, 2024
cdd502e
Merge pull request #62 from MateusGaldinoLG/main
duartebianca Jul 22, 2024
a26cf91
fix: rate My Rates page
AmandaCLima Jul 22, 2024
e5f7e16
fix: adjust update method for published reservation
leticiagaspar Jul 22, 2024
7b53e93
ajustes
MatheusMnt Jul 23, 2024
1da9c53
Merge branch 'main' of https://github.com/duartebianca/hotel-trancinv…
MatheusMnt Jul 23, 2024
9ba2e35
Merge branch 'duartebianca-main'
MatheusMnt Jul 23, 2024
7a392e5
test: add E2E frontend tests to client register
duartebianca Jul 23, 2024
4233c0f
fix: corrige erro em alguns testes
MateusGaldinoLG Jul 23, 2024
6b9a29a
feat: add Reservations tests
victoriacfigueiredo Jul 23, 2024
c3ddb16
Merge remote-tracking branch 'upstream/main' into main
AmandaCLima Jul 23, 2024
75aced0
frontend completo
MatheusMnt Jul 23, 2024
18aba09
Merge branch 'duartebianca:main' into main
victoriacfigueiredo Jul 23, 2024
5d366dd
test: add E2E tests for client login feature
duartebianca Jul 23, 2024
5c801c4
test: add E2E tests for hotelier login feature
duartebianca Jul 23, 2024
9763653
test: add E2E tests for hotelier register feature
duartebianca Jul 23, 2024
851572d
refactor: add data-cy attributes to input fields in login and registe…
duartebianca Jul 23, 2024
2818cba
fix: remove broken database migration file and create migration file …
duartebianca Jul 23, 2024
f036039
refactor: Remove unused code for dependency injection and examples
duartebianca Jul 23, 2024
b8acf70
Merge pull request #67 from duartebianca/fix/unused-code
victoriacfigueiredo Jul 23, 2024
d45664f
Merge branch 'main' into feat/front
duartebianca Jul 23, 2024
42117c8
fix: backend tests to client and hotelier
duartebianca Jul 23, 2024
e62fad7
refactor: adjust layout in hotelier profile page
duartebianca Jul 23, 2024
44bcd4d
test: update client login feature with successful login scenario
duartebianca Jul 23, 2024
282d631
test: Adicionar testes E2E para a funcionalidade de recuperação de senha
duartebianca Jul 23, 2024
3ae256f
test: update E2E test for register hotelier
duartebianca Jul 23, 2024
b2ccb14
fix: removing libraries from whishlist
AmandaCLima Jul 23, 2024
69a7493
Merge branch 'duartebianca:main' into main
MateusGaldinoLG Jul 23, 2024
3e5e338
fix: fix margin in search result
MateusGaldinoLG Jul 23, 2024
2103fc4
fix: correct reservation card style
MateusGaldinoLG Jul 23, 2024
965fe4c
Merge pull request #63 from leticiagaspar/main
victoriacfigueiredo Jul 23, 2024
6f333ff
feat: add hotel address on reservation pages
victoriacfigueiredo Jul 23, 2024
2c46306
add() testes e2e paymentMethods
MatheusMnt Jul 23, 2024
b3b9534
Merge pull request #69 from victoriacfigueiredo/main
duartebianca Jul 23, 2024
ed670a8
Merge pull request #64 from MateusGaldinoLG/main
victoriacfigueiredo Jul 23, 2024
2327023
Merge branch 'main' into feat/front
victoriacfigueiredo Jul 23, 2024
b6a54a1
ajuste para sync
MatheusMnt Jul 23, 2024
d95f468
Merge pull request #68 from duartebianca/feat/front
duartebianca Jul 23, 2024
4c1884b
Merge pull request #65 from MatheusMnt/main
victoriacfigueiredo Jul 23, 2024
28639e9
fix: App imports
AmandaCLima Jul 23, 2024
00ed17a
Merge pull request #7 from duartebianca/main
MatheusMnt Jul 23, 2024
432a8cd
nothing, just testing
victoriacfigueiredo Jul 23, 2024
d5d5c90
Merge branch 'main' into main
victoriacfigueiredo Jul 23, 2024
32f4171
Merge pull request #70 from victoriacfigueiredo/main
duartebianca Jul 23, 2024
8fc1118
Merge pull request #8 from duartebianca/main
MatheusMnt Jul 23, 2024
1cc3e16
Merge remote-tracking branch 'upstream/main' into main
AmandaCLima Jul 23, 2024
9e3d1ee
fix(client/login/index.tsx): ajustando encoding para UTF-8
MatheusMnt Jul 23, 2024
b1c2cc7
Merge pull request #71 from MatheusMnt/main
duartebianca Jul 23, 2024
57ea1a0
last details
victoriacfigueiredo Jul 23, 2024
66955a8
fix: import
AmandaCLima Jul 23, 2024
3b29222
Merge branch 'main' into main
victoriacfigueiredo Jul 23, 2024
b207aa7
fix words
victoriacfigueiredo Jul 23, 2024
51b2999
fix word
victoriacfigueiredo Jul 23, 2024
c46d8a8
Merge pull request #66 from AmandaCLima/main
victoriacfigueiredo Jul 23, 2024
e7d9537
Merge pull request #72 from victoriacfigueiredo/main
duartebianca Jul 23, 2024
1c4beb3
fix: fixing deploy links adding vercel.json
duartebianca Jul 23, 2024
7aeb2cd
Merge pull request #74 from duartebianca/fix/deployment-links
victoriacfigueiredo Jul 23, 2024
97f0c21
final details
victoriacfigueiredo Jul 23, 2024
46bc232
Merge pull request #75 from victoriacfigueiredo/main
duartebianca Jul 23, 2024
246c9fb
docs: update README.md
duartebianca Jul 25, 2024
279b421
docs: update README.md
duartebianca Jul 25, 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
79 changes: 78 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,81 @@
__pycache__/

*.log
*.swp
*.swp

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

node_modules
dist
dist-ssr
*.local
coverage
cypress-coverage
.nyc_output
cypress/screenshots
cypress/videos
cypress/downloads

# Editor directories and files
.vscode/*
!.vscode/extensions.json
.idea
.DS_Store
*.suo
*.ntvs*
*.njsproj
*.sln
*.sw?

# Env
.env
.env.local
.env.test
.env.testing
.env.development
.env.staging
.env.production

# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
coverage/

# Dependency directories
node_modules/

# Optional npm cache directory
.npm

# TypeScript cache
*.tsbuildinfo

# System files
.DS_Store
Thumbs.db

# Editor files
.vscode/

# Build files
dist/
lib/

# Env
.env
.env.test
.env.dev
.env.prod

# Deploy
.vercel
16 changes: 16 additions & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

cd backend
npm run lint

cd ../frontend
npm run lint
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

cd backend
npm run lint

cd ../frontend
npm run lint
16 changes: 16 additions & 0 deletions .husky/pre-push
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

cd backend
npm run test

cd ../frontend
npm run test
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

cd backend
npm run test

cd ../frontend
npm run test
184 changes: 120 additions & 64 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,65 +1,121 @@
# Bem-vindo ao ESS Base Project! 🗂 🛠

Este projeto serve como ponto de partida para o desenvolvimento de aplicações utilizando os *frameworks* de *backend* e *frontend* escolhidos pela equipe.

---

## Sobre o Projeto

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*.


## Passo a Passo 🚶

### Crie um *Fork*

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.

### Clone o seu *Fork*

Clone o repositório forkado para o seu ambiente de desenvolvimento local.
### Instale o *Python 3* 🐍

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 💻

Abra o terminal e navegue até o diretório do seu projeto base.

### Escolha os *Frameworks* 📝

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:

- ***Frontend*:** React ⚛️, Angular 🅰️, Vue.js 🔥 e Next.js 🇳
- ***Backend*:** NodeJS 🚀 e FastAPI ⚡️

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.

### Crie o Projeto Base 📁

Para criar o projeto, execute o comando abaixo:
```sh
pip install inquirer && python3 ./config/cli.py

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

```sh
pip install inquirer && python ./config/cli.py
<img src="https://i.imgur.com/45KAhZK.png" alt="logo" width="200" />

# Hotel Trancinvânia

Hotel Trancinvânia é um projeto de sistema de gerenciamento de reservas de hotel, desenvolvido para a disciplina de Engenharia de Software e Sistemas (IF682) do CIn-UFPE, no curso de Engenharia da Computação. Este repositório contém tanto o backend quanto o frontend da aplicação.

## Índice

- [Visão Geral](#visão-geral)
- [Equipe](#equipe)
- [Tecnologias Utiizadas](#tecnologias-utilizadas)
- [Estrutura do Projeto](#estrutura-do-projeto)
- [Configuração e Instalação](#configuração-e-instalação)
- [Comandos Úteis](#comandos-úteis)

## Visão Geral
Este projeto é um sistema completo de gerenciamento de hotel, permitindo as seguintes features:
- Cadastro e Login
- Usuário Hoteleiro e Cliente
- Login com autenticação local e JWT
- Alteração de cadastro, podendo alterar e-mail, username e senha
- Recuperação de senha através de token enviado por e-mail
- Publicar, Gerenciar e Realizar Reservas
- Salvar, Gostar, Compartilhar e Avaliar Reservas
- Busca de Reservas com Filtros
- Cadastro e Manutenção de Métodos de Pagamento
- Cadastro e Manutenção de Promoções
- Disparo de E-mails

### Tipos de Usuário
#### Cliente
O usuário cliente é aquele que pode realizar, salvar, gostar e compartilhar reservas. Reservas só podem ser avaliadas após ter passado o período de estadia.
#### Hoteleiro
O usuário hoteleiro é aquele que publica e gerencia reservas en seu hotel, podendo cadastrar e gerenciar promoções.

## Equipe
As pessoas que compõem a equipe são:
- Amanda Cristina Fernandes Medeiros de Lima (acfml)
- Bianca Duarte Santos (bds)
- Maria Letícia do Nascimento Gaspar (mlng)
- Matheus Augusto Monte Silva (mams4)
- Mateus Galdino de Lima Guilherme (mglg)
- Victoria Barbosa Cesar Figueiredo (vbcf)

## Tecnologias Utilizadas

### Back-End
- Node.js, Express e TypeScript
- WSL, Docker, Prisma, PostgreSQL
- Zod
- Passport, JWT e bcrypt

### Front-End
- React e TypeScript
- React Hook Form
- Chakra UI e Aceternity UI
- ViaCEP API

### Deployment
- Render (back-end)
- Vercel (front-end)

### Testes
- Jest-Cucumber (back-end)
- Cypress (front-end)

### Outras Ferramentas
- **Gerenciamento de Projetos**: Notion
- **Design**: Figma, Canva e Calligraphr
- **Comunicação**: Discord e WhatsApp

## Estrutura do Projeto
Abaixo está a estrutura principal dos diretórios e arquivos do projeto:
- **backend**: Contém o código fonte do backend da aplicação.
- **docker**: Configurações e dados do Docker.
- **prisma**: Configurações e migrações do Prisma.
- **src**: Código fonte do backend, incluindo controllers, services, repositories, entitites, enums, middleware, routes, utils, etc.
- **tests**: Testes do backend.
- **config**: Scripts e configurações adicionais.
- **frontend**: Contém o código fonte do frontend da aplicação, que segue a estrutura abaixo:
![image](https://github.com/user-attachments/assets/109668d6-59a8-4ab0-a136-f9e3a025b534)


## Configuração e Instalação

### Pré-requisitos

- Node.js
- Docker
- Docker Compose
- React

### Passos de Instalação

1. Clone o repositório:
```bash
git clone https://github.com/duartebianca/hotel-trancinvania.git
cd hotel-trancinvania
```
2. Configure e inicie o backend:
```bash
cd backend
npm install
docker compose up
npx prisma migrate dev
npm run start
```
3. Configure e inicie o frontend:
```bash
cd frontend
npm install
npm run dev
```

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.

### Comece a desenvolver! 🚀

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! 🪐💪✨*

---
## Contribuindo 🤝

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.
### Configuração do Banco de Dados
O banco de dados é configurado e gerenciado pelo Prisma. Certifique-se de que o Docker está em execução e que o serviço de banco de dados está ativo.

## Comandos Úteis
- npm run start: Inicia o servidor.
- npm run test: Executa os testes.
- npm run dev: Inicia o frontend.
- npx prisma migrate dev: Executa migrações de banco de dados.
9 changes: 9 additions & 0 deletions backend/.editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#Configuracoes para defini os parametros do editor de texto, Ex tamanho do espacamento dentre outros.
root = true

[*]
indent_style = space
indent_size = 2
end_of_line = lf
charset = utf-8
trim_trailing_whitespace =
26 changes: 26 additions & 0 deletions backend/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
module.exports = {
parser: '@typescript-eslint/parser',
parserOptions: {
project: 'tsconfig.json',
tsconfigRootDir: __dirname,
sourceType: 'module',
},
plugins: ['@typescript-eslint/eslint-plugin'],
extends: [
'plugin:@typescript-eslint/recommended',
'plugin:prettier/recommended',
],
root: true,
env: {
node: true,
jest: true,
},
ignorePatterns: ['.eslintrc.js'],
rules: {
'prettier/prettier': ['error', { endOfLine: 'auto' }, { usePrettierrc: true }],
'@typescript-eslint/interface-name-prefix': 'off',
'@typescript-eslint/explicit-function-return-type': 'off',
'@typescript-eslint/explicit-module-boundary-types': 'off',
'@typescript-eslint/no-explicit-any': 'off',
},
};
42 changes: 42 additions & 0 deletions backend/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
coverage/

# Dependency directories
node_modules/

# Optional npm cache directory
.npm

# TypeScript cache
*.tsbuildinfo

# System files
.DS_Store
Thumbs.db

# Editor files
.vscode/

# Build files
dist/
lib/

# Env
.env
.env.test
.env.dev
.env.prod

# Deploy
.vercel

#docker

docker/

src/images/
7 changes: 7 additions & 0 deletions backend/.prettierrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
module.exports = {
semi: true,
trailingComma: 'all',
singleQuote: true,
printWidth: 100,
tabWidth: 4,
};
Loading