Demo5 - #6

Open

DeKapito wants to merge 128 commits into

devfrom

Commits on Oct 2, 2018

added server part for password restoring
RomanPuriy
committed
8c7fde4
Started writing upload files
DeKapito
committed
fc8c38d

Commits on Oct 3, 2018

after merge
Nebozavr
committed
60da8f9
add Place_Manager model
Nebozavr
committed
86d6417
change place_manager model
Nebozavr
committed
d663979
add repository and controller for find places managers
Nebozavr
committed
a30d772
add methods to check all ROLES in local storage
Nebozavr
committed
3ae314f
add ManagerBlock components
Nebozavr
committed
d5ad896
Refactor repository query
Oleksandra Kaminska
committed
99841e0
Add component Cancel to modal. Changes css
Oleksandra Kaminska
committed
37bb94d
Add user id to routes from local storage
Oleksandra Kaminska
committed
e598480
Add review limitation for UserPlaces page
Oleksandra Kaminska
committed
2cb1646
Add creation date to feedback model and tables
Oleksandra Kaminska
committed
63975b0
implemented client side for password restore
RomanPuriy
committed
445aade
Implement method for upload/download files
DeKapito
committed
4834a0e

Commits on Oct 4, 2018

implement deleting place_manager
Nebozavr
committed
a6201c4
add component for delete manager from place
Nebozavr
committed
ba4126f
Add component for deleting comment, changed component design
Oleksandra Kaminska
committed
b6a2f1b

Commits on Oct 5, 2018

Implemented image validation, started writing frontend for upload images
DeKapito
committed
9aaf17c

Commits on Oct 6, 2018

implement add manager feature
Nebozavr
committed
aa24136
Add method book place
sergiy-oliynik
committed
3daccae
added private routes
RomanPuriy
committed
68d7589
Deleting commets done
Oleksandra Kaminska
committed
a624bb9

Commits on Oct 7, 2018

Add method getBookings
sergiy-oliynik
committed
935e6af
Fixed private route bug. Added loading indecator, NotFound and ServerError pages
RomanPuriy
committed
b2b4397

Commits on Oct 8, 2018

refactoring
Nebozavr
committed
dd8f28b
refactoring
Nebozavr
committed
3739cf0
Implement change user avatar
DeKapito
committed
99ad62d
refactored private route
RomanPuriy
committed
bc153a7
add method cancelBooking
sergiy-oliynik
committed
df1c79d
Added loading indecator for login and registration pages
RomanPuriy
committed
a15a97f

Commits on Oct 9, 2018

refactoring
Nebozavr
committed
81490df
catch error
Nebozavr
committed
4e6e0ed
add simple test
Nebozavr
committed
3f40ed8
implement method to get all managers by user-owner
Nebozavr
committed
6bddff1
minor changes in login possibillity
RomanPuriy
committed
0d12f6a
Fixed set-avatar
DeKapito
committed
c02c1b6
Design set-avatar
DeKapito
committed
4e1f077

Commits on Oct 10, 2018

after merge feature/set-avatar
Nebozavr
committed
4331c36
Added dependency to package.json
DeKapito
committed
ebc2d99
fixed auth bug for admin
RomanPuriy
committed
dc1782b
Implement methods for get not approved places
DeKapito
committed
e03c13c

Commits on Oct 11, 2018

Added methods for adding comments. Changed contollers structure
RomanPuriy
committed
a271671
Added booking time
sergiy-oliynik
committed
204d785
changed DB stucture. Added places rating implementation on server side
RomanPuriy
committed
4b7fb09
Implemented possibility to add comment. Changed DB structure
RomanPuriy
committed
281b1e1
Create and design components for frontend (approve/reject places)
DeKapito
committed
96d5ce0
Changed db structure, added PlaceReject model, changed methods for extract places from db
DeKapito
committed
27c6f0c
Add admin profile component, admin menu. Css and backend
Oleksandra Kaminska
committed
1688311
Refactor
Oleksandra Kaminska
committed
54de1ce
Implement approve/reject place
DeKapito
committed
c480e50

Commits on Oct 12, 2018

add component My managers
Nebozavr
committed
10416bb
implement feature to edit my managers list!
Nebozavr
committed
f161f8b
Implement status of place on owner-page
DeKapito
committed
f986111
Validation done
Oleksandra Kaminska
committed
cbab819
after feature/delete-comment merge
RomanPuriy
committed
31eb062
Add admin and base dropdown
Oleksandra Kaminska
committed
8dff1cc
refactored review component
RomanPuriy
committed
6009260

Commits on Oct 13, 2018

add simple test
Nebozavr
committed
7ad20f4
add simple test
Nebozavr
committed
91401fe
implement feature to get manager possibility change count of free places
Nebozavr
committed
9cfba55
add simple test
Nebozavr
committed
e15ff70

Commits on Oct 14, 2018

Add users list to admin dashboard
Oleksandra Kaminska
committed
c954c7d

Commits on Oct 15, 2018

Added style for booking item, added unit test
sergiy-oliynik
committed
ea94e90
Removed user_id from UserPage
sergiy-oliynik
committed
9089a7d
Navigation done
Oleksandra Kaminska
committed
9dff105
Refactored comment design and password restore feature
RomanPuriy
committed
d131ad1
User filters done
Oleksandra Kaminska
committed
f5f6c42
Add places list and filter
Oleksandra Kaminska
committed
1552efe
Added method sendBookingConfirmation
sergiy-oliynik
committed
7d4e9d7
Added modal window for place marking. Changed confirmation email design. Minor changes in forgot/restore password forms
RomanPuriy
committed
d1cd1ba

Commits on Oct 16, 2018

Merged feature/delete-comment, resolve conflicts, merged components
DeKapito
committed
c98e6b2
Refactor Admin Page
Oleksandra Kaminska
committed
5e97576
Refactor filter
Oleksandra Kaminska
committed
d51070d
asd
Nebozavr
committed
f876f30
Disable possibility for unloged-in user to mark place
RomanPuriy
committed
67fdfe1
Fixed log out bug
RomanPuriy
committed
a9f9e3d
after merge
Nebozavr
committed
fdc42cb
after merge delete-comment
Nebozavr
committed
b9c7061
after merger booking
Nebozavr
committed
b298302
after feature/feedbach merge
Nebozavr
committed
0fc68bd
Fixed several problems
DeKapito
committed
0c54b7b
Fixed removed of booking
sergiy-oliynik
committed
e8c8bb4
fixed bugs. Added user's avatar in comments
RomanPuriy
committed
2f7fc6e
Merge branch 'demo4' of https://github.com/Social-projects-Rivne/findmyplace into demo4
RomanPuriy
committed
c677869

Commits on Oct 17, 2018

Fixed avatars, different changes
DeKapito
committed
922b940

Commits on Oct 18, 2018

Added manager page
sergiy-oliynik
committed
3f2f19e
Added gallery to edit place
DeKapito
committed
2da2d03

Commits on Oct 19, 2018

fix access managers and owner to set count free places
Nebozavr
committed
498ef7c
fix access owner to view manager places add delete managers
Nebozavr
committed
e14d7a6
Fixed deleting of place, changed color add review button
DeKapito
committed
62722d8

Commits on Oct 20, 2018

Commits on Oct 21, 2018

Changed input in Booking
DeKapito
committed
dbb073a
Fixed filter on map
DeKapito
committed
4ef6e34
Added confirm password to admin profile, fixed password check
DeKapito
committed
e9717d3
Merge branch 'demo4' of https://github.com/Social-projects-Rivne/findmyplace into edit-place
DeKapito
committed
bd982fe
Merge branch 'demo4' of https://github.com/Social-projects-Rivne/findmyplace into feature/manager_page
sergiy-oliynik
committed
89a0b4f
Small fixes on admin page
sergiy-oliynik
committed
361cd56
unworking image upload
DeKapito
committed
0b46777
Added methods for approving/rejecting of booking
sergiy-oliynik
committed
f045566
Changed response message
sergiy-oliynik
committed
2e6cb73
Changed place register
DeKapito
committed
6d75038
Added new user profile
sergiy-oliynik
committed
4a759a1
Merge branch 'demo4' of https://github.com/Social-projects-Rivne/findmyplace into feature/manager_page
sergiy-oliynik
committed
32f5064
Changed place register styles, add set-avatar in profile
DeKapito
committed
8832cfc
Small fixes
sergiy-oliynik
committed
6ea7743
Removed unused links
sergiy-oliynik
committed
a51d44e
Fixed avatar when add new comment, fixed scrolls in modals, changed users avatar in admin dashboard, different changes
DeKapito
committed
0b5f90c
Merge branch 'demo4' of https://github.com/Social-projects-Rivne/findmyplace into demo4
DeKapito
committed
affdd65

Commits on Oct 22, 2018

Merge branch 'demo4' of https://github.com/Social-projects-Rivne/findmyplace into edit-place
DeKapito
committed
8e3c742
Added backend for image upload/delete, added model for place images, added frontend components for upload place images
DeKapito
committed
fdcc966

Commits on Oct 23, 2018

Implemented deleting existing images
DeKapito
committed
df6d691

Commits on Oct 24, 2018

Implemented methods for edit place, design edit place
DeKapito
committed
8e55eeb
Design edit place and edit images of place
DeKapito
committed
1c27945

Commits on Oct 26, 2018

Added gallery to place page, fixed comments, added pictures to places (replace hardcode)
DeKapito
committed
5b5a38a

Commits on Oct 28, 2018

Adde notification about new booking
sergiy-oliynik
committed
3382f8f
Implemented sending email to user from admin-dashboard
DeKapito
committed
512fe37
Added favorite list
sergiy-oliynik
committed
8157637
Merge branch 'feature/booking_notification' into demo4
sergiy-oliynik
committed
e334669
Removed unused character
sergiy-oliynik
committed
121b1f8
Implemented sending email to admin
DeKapito
committed
95907bb

Commits on Oct 29, 2018

Writed tests for update-place, send email to user/admin
DeKapito
committed
888b0af
Merged favorite-places
DeKapito
committed
5225b07
Small fix
sergiy-oliynik
committed
8af77ec
Fixed favorite list visibility
sergiy-oliynik
committed
d57dd30
Changed button's name
sergiy-oliynik
committed
ae74a02
Added loading when send email
Oleksandra Kaminska
committed
84dea8d