Skip to content

Commit

Permalink
Dev (#39)
Browse files Browse the repository at this point in the history
* made post model and almost done api

* Signup/login service complete (#2)

* Signup, login, logout API endpoints. Use default user model

* Auth service and signup and login pages

* Feature view posts page (#4)

* made post model and almost done api

* Added view list of posts

* fixed ts errors, added delete post functionality

* redesigned posts, added expand-post functionality

* added css to Post.css

---------

Co-authored-by: Max Rack <[email protected]>

* Feature create post (#3)

* made post model and almost done api

* made create/edit post page

* fixed CORS error

* fixed small error

* Feature home (#5)

* add layout components for homepage and placeholder text for the top categories

* pulled from dev

* done api for home screen and finished the homepage category sections

* Feature sprint1 final (#6)

* made post model and almost done api

* made create/edit post page

* fixed CORS error

* added sprint1 folder and markdown files

* updated styling for homepage

* added page navigation and foreign key to posts. create/edit currently cant get user id and name

* fixed problems and did sprint1 doc

* Update viewPostsByCategory.tsx

* updated RPM.md

* added system design doc

---------

Co-authored-by: Joyce Ang <[email protected]>
Co-authored-by: suhanip1 <[email protected]>

* Merge main to dev to fix tree (#9)

* Create sprint0_mark.md

* Finish sprint 1 (#7)

* Signup/login service complete (#2)

* Signup, login, logout API endpoints. Use default user model

* Auth service and signup and login pages

* Feature view posts page (#4)

* made post model and almost done api

* Added view list of posts

* fixed ts errors, added delete post functionality

* redesigned posts, added expand-post functionality

* added css to Post.css

---------

Co-authored-by: Max Rack <[email protected]>

* Feature create post (#3)

* made post model and almost done api

* made create/edit post page

* fixed CORS error

* fixed small error

* Feature home (#5)

* add layout components for homepage and placeholder text for the top categories

* pulled from dev

* done api for home screen and finished the homepage category sections

* Feature sprint1 final (#6)

* made post model and almost done api

* made create/edit post page

* fixed CORS error

* added sprint1 folder and markdown files

* updated styling for homepage

* added page navigation and foreign key to posts. create/edit currently cant get user id and name

* fixed problems and did sprint1 doc

* Update viewPostsByCategory.tsx

* updated RPM.md

* added system design doc

---------

Co-authored-by: Joyce Ang <[email protected]>
Co-authored-by: suhanip1 <[email protected]>

---------

Co-authored-by: suhanip1 <[email protected]>
Co-authored-by: Max Rack <[email protected]>
Co-authored-by: xamrm3 <[email protected]>
Co-authored-by: JoyceAng <[email protected]>
Co-authored-by: Joyce Ang <[email protected]>

* Merge dev to main to fix tree (#8)

* Signup/login service complete (#2)

* Signup, login, logout API endpoints. Use default user model

* Auth service and signup and login pages

* Feature view posts page (#4)

* made post model and almost done api

* Added view list of posts

* fixed ts errors, added delete post functionality

* redesigned posts, added expand-post functionality

* added css to Post.css

---------

Co-authored-by: Max Rack <[email protected]>

* Feature create post (#3)

* made post model and almost done api

* made create/edit post page

* fixed CORS error

* fixed small error

* Feature home (#5)

* add layout components for homepage and placeholder text for the top categories

* pulled from dev

* done api for home screen and finished the homepage category sections

* Feature sprint1 final (#6)

* made post model and almost done api

* made create/edit post page

* fixed CORS error

* added sprint1 folder and markdown files

* updated styling for homepage

* added page navigation and foreign key to posts. create/edit currently cant get user id and name

* fixed problems and did sprint1 doc

* Update viewPostsByCategory.tsx

* updated RPM.md

* added system design doc

---------

Co-authored-by: Joyce Ang <[email protected]>
Co-authored-by: suhanip1 <[email protected]>

---------

Co-authored-by: suhanip1 <[email protected]>
Co-authored-by: Max Rack <[email protected]>
Co-authored-by: xamrm3 <[email protected]>
Co-authored-by: JoyceAng <[email protected]>
Co-authored-by: Joyce Ang <[email protected]>

---------

Co-authored-by: Jiale Shang <[email protected]>
Co-authored-by: suhanip1 <[email protected]>
Co-authored-by: Max Rack <[email protected]>
Co-authored-by: xamrm3 <[email protected]>
Co-authored-by: JoyceAng <[email protected]>
Co-authored-by: Joyce Ang <[email protected]>

* SCRUM-5/13 Feature profiles (#11)

* SCRUM-55 Profile model and serializer

* SCRUM-56 Profile create, update, get, delete Backend API

* SCRUM-5 register profile model in admin

* Scrum-57 View and edit profile, and fix some bugs with authentication and some CSS changes

* SCRUM-57 Profile frontend location selection and fix wrong profile name

* SCRUM-57 Update readme for world cities db

* SCRUM-57 update location entry field to say City/Town, and add license for worldcities DB

* Feature ratings reviews (#13)

* Scrum-44/45 backend files created

* Scrum-44/45 did model and api for ratings

* Scrum-44/45 did model and api for reviews. added iteration 2 file

* Scrum-46 added temp button on home page to leave rating/review

* Scrum-46 added review card component and removed temp button

* Scrum-46 added viewable review in profile

* Scrum-46 added reviews to profile

* Scrum-7 added backend reviews documentation

* Scrum-7 added backend ratings documentation

* Feature filtering and searching (#14)

* SCRUM-53 updated the backend for search by need and offer

* SCRUM-54 updated the front end to display posts based on search bar for need and offer

* SCRUM-52 and SCRUM-54 worked on the frontend portion of ratings and filtering by offers

* SCRUM-53 and SCRUM-54: created the offer filtering component

* SCRUM-53 and SCRUM-54 missed files from previous commit

* SCRUM-47 and SCRUM-48 done search for users frontend and backend api, will need to link to profile page later (#10)

* SCRUM 49 & 50 finished filtering by location (#12)

* added googlemaps to requirements and minor fixes

* minor changes

* tested filtering

* Scrum-49/50/53/54 combined filter by location and filter by offer buttons

* added documentation for posts backend

* SCRUM 50 fixed getting current user location

* SCRUM-6/18/22 combined all the code together

* SCRUM 50/54 minor css fix

* Update api.md

* pulled from dev and resolved merge conflicts

* fixed merge conflicts

* Scrum-15 added option to use profile location in create post

* Scrum-6 fixed new ratings/reviews not updating on profile

---------

Co-authored-by: Joyce Ang <[email protected]>
Co-authored-by: JoyceAng <[email protected]>
Co-authored-by: Max Rack <[email protected]>

* SCRUM-15 and accounts API documentation (#15)

* Create api.md

* Create api.md

* minor changes to fix an error

* Feature accounts worldcitites api doc (#16)

* Create api.md

* Create api.md

* sprint 2 documentation

---------

Co-authored-by: Antonio Ferreras <[email protected]>

* update dev (#18)

* Dev (#17)

* finished post model and most of api

* finished post model and most of api

* made post model and almost done api

* Signup/login service complete (#2)

* Signup, login, logout API endpoints. Use default user model

* Auth service and signup and login pages

* Feature view posts page (#4)

* made post model and almost done api

* Added view list of posts

* fixed ts errors, added delete post functionality

* redesigned posts, added expand-post functionality

* added css to Post.css

---------

Co-authored-by: Max Rack <[email protected]>

* Feature create post (#3)

* made post model and almost done api

* made create/edit post page

* fixed CORS error

* fixed small error

* Feature home (#5)

* add layout components for homepage and placeholder text for the top categories

* pulled from dev

* done api for home screen and finished the homepage category sections

* Feature sprint1 final (#6)

* made post model and almost done api

* made create/edit post page

* fixed CORS error

* added sprint1 folder and markdown files

* updated styling for homepage

* added page navigation and foreign key to posts. create/edit currently cant get user id and name

* fixed problems and did sprint1 doc

* Update viewPostsByCategory.tsx

* updated RPM.md

* added system design doc

---------

Co-authored-by: Joyce Ang <[email protected]>
Co-authored-by: suhanip1 <[email protected]>

* Merge main to dev to fix tree (#9)

* Create sprint0_mark.md

* Finish sprint 1 (#7)

* Signup/login service complete (#2)

* Signup, login, logout API endpoints. Use default user model

* Auth service and signup and login pages

* Feature view posts page (#4)

* made post model and almost done api

* Added view list of posts

* fixed ts errors, added delete post functionality

* redesigned posts, added expand-post functionality

* added css to Post.css

---------

Co-authored-by: Max Rack <[email protected]>

* Feature create post (#3)

* made post model and almost done api

* made create/edit post page

* fixed CORS error

* fixed small error

* Feature home (#5)

* add layout components for homepage and placeholder text for the top categories

* pulled from dev

* done api for home screen and finished the homepage category sections

* Feature sprint1 final (#6)

* made post model and almost done api

* made create/edit post page

* fixed CORS error

* added sprint1 folder and markdown files

* updated styling for homepage

* added page navigation and foreign key to posts. create/edit currently cant get user id and name

* fixed problems and did sprint1 doc

* Update viewPostsByCategory.tsx

* updated RPM.md

* added system design doc

---------

Co-authored-by: Joyce Ang <[email protected]>
Co-authored-by: suhanip1 <[email protected]>

---------

Co-authored-by: suhanip1 <[email protected]>
Co-authored-by: Max Rack <[email protected]>
Co-authored-by: xamrm3 <[email protected]>
Co-authored-by: JoyceAng <[email protected]>
Co-authored-by: Joyce Ang <[email protected]>

* Merge dev to main to fix tree (#8)

* Signup/login service complete (#2)

* Signup, login, logout API endpoints. Use default user model

* Auth service and signup and login pages

* Feature view posts page (#4)

* made post model and almost done api

* Added view list of posts

* fixed ts errors, added delete post functionality

* redesigned posts, added expand-post functionality

* added css to Post.css

---------

Co-authored-by: Max Rack <[email protected]>

* Feature create post (#3)

* made post model and almost done api

* made create/edit post page

* fixed CORS error

* fixed small error

* Feature home (#5)

* add layout components for homepage and placeholder text for the top categories

* pulled from dev

* done api for home screen and finished the homepage category sections

* Feature sprint1 final (#6)

* made post model and almost done api

* made create/edit post page

* fixed CORS error

* added sprint1 folder and markdown files

* updated styling for homepage

* added page navigation and foreign key to posts. create/edit currently cant get user id and name

* fixed problems and did sprint1 doc

* Update viewPostsByCategory.tsx

* updated RPM.md

* added system design doc

---------

Co-authored-by: Joyce Ang <[email protected]>
Co-authored-by: suhanip1 <[email protected]>

---------

Co-authored-by: suhanip1 <[email protected]>
Co-authored-by: Max Rack <[email protected]>
Co-authored-by: xamrm3 <[email protected]>
Co-authored-by: JoyceAng <[email protected]>
Co-authored-by: Joyce Ang <[email protected]>

---------

Co-authored-by: Jiale Shang <[email protected]>
Co-authored-by: suhanip1 <[email protected]>
Co-authored-by: Max Rack <[email protected]>
Co-authored-by: xamrm3 <[email protected]>
Co-authored-by: JoyceAng <[email protected]>
Co-authored-by: Joyce Ang <[email protected]>

* SCRUM-5/13 Feature profiles (#11)

* SCRUM-55 Profile model and serializer

* SCRUM-56 Profile create, update, get, delete Backend API

* SCRUM-5 register profile model in admin

* Scrum-57 View and edit profile, and fix some bugs with authentication and some CSS changes

* SCRUM-57 Profile frontend location selection and fix wrong profile name

* SCRUM-57 Update readme for world cities db

* SCRUM-57 update location entry field to say City/Town, and add license for worldcities DB

* Feature ratings reviews (#13)

* Scrum-44/45 backend files created

* Scrum-44/45 did model and api for ratings

* Scrum-44/45 did model and api for reviews. added iteration 2 file

* Scrum-46 added temp button on home page to leave rating/review

* Scrum-46 added review card component and removed temp button

* Scrum-46 added viewable review in profile

* Scrum-46 added reviews to profile

* Scrum-7 added backend reviews documentation

* Scrum-7 added backend ratings documentation

* Feature filtering and searching (#14)

* SCRUM-53 updated the backend for search by need and offer

* SCRUM-54 updated the front end to display posts based on search bar for need and offer

* SCRUM-52 and SCRUM-54 worked on the frontend portion of ratings and filtering by offers

* SCRUM-53 and SCRUM-54: created the offer filtering component

* SCRUM-53 and SCRUM-54 missed files from previous commit

* SCRUM-47 and SCRUM-48 done search for users frontend and backend api, will need to link to profile page later (#10)

* SCRUM 49 & 50 finished filtering by location (#12)

* added googlemaps to requirements and minor fixes

* minor changes

* tested filtering

* Scrum-49/50/53/54 combined filter by location and filter by offer buttons

* added documentation for posts backend

* SCRUM 50 fixed getting current user location

* SCRUM-6/18/22 combined all the code together

* SCRUM 50/54 minor css fix

* Update api.md

* pulled from dev and resolved merge conflicts

* fixed merge conflicts

* Scrum-15 added option to use profile location in create post

* Scrum-6 fixed new ratings/reviews not updating on profile

---------

Co-authored-by: Joyce Ang <[email protected]>
Co-authored-by: JoyceAng <[email protected]>
Co-authored-by: Max Rack <[email protected]>

* SCRUM-15 and accounts API documentation (#15)

* Create api.md

* Create api.md

* minor changes to fix an error

* Feature accounts worldcitites api doc (#16)

* Create api.md

* Create api.md

* sprint 2 documentation

---------

Co-authored-by: Antonio Ferreras <[email protected]>

---------

Co-authored-by: Antonio Ferreras <[email protected]>
Co-authored-by: suhanip1 <[email protected]>
Co-authored-by: JoyceAng <[email protected]>
Co-authored-by: Joyce Ang <[email protected]>
Co-authored-by: Jiale Shang <[email protected]>

* fixed minor issues

* combined the api files and added this file into the docs folder

---------

Co-authored-by: xamrm3 <[email protected]>
Co-authored-by: Antonio Ferreras <[email protected]>
Co-authored-by: suhanip1 <[email protected]>
Co-authored-by: Jiale Shang <[email protected]>

* fixed problems in dev

* Feature filter by ratings (#19)

* SCRUM-51/52 done filter by rating feature when searching for user and searching for posts

* update documentation for accounts, posts, and ratings

* Feature update homepage (#22)

* SCRUM-61 changed the homepage layout and used material ui and also updated the posts

* SCRUM-61 edited the post layout

* SCRUM-61 removed unneccessary files

* Feature update homepage (#23)

* SCRUM-61 changed the homepage layout and used material ui and also updated the posts

* SCRUM-61 edited the post layout

* SCRUM-61 removed unneccessary files

* SCRUM-61 fixed minor error in styling

* SCRUM-61 made it so posts made by the current logged in user don't show

* SCRUM-61 fixed minor issues that occured after merge

* Feature suggest posts (#25)

* Dev (#17)

* finished post model and most of api

* finished post model and most of api

* made post model and almost done api

* Signup/login service complete (#2)

* Signup, login, logout API endpoints. Use default user model

* Auth service and signup and login pages

* Feature view posts page (#4)

* made post model and almost done api

* Added view list of posts

* fixed ts errors, added delete post functionality

* redesigned posts, added expand-post functionality

* added css to Post.css

---------

Co-authored-by: Max Rack <[email protected]>

* Feature create post (#3)

* made post model and almost done api

* made create/edit post page

* fixed CORS error

* fixed small error

* Feature home (#5)

* add layout components for homepage and placeholder text for the top categories

* pulled from dev

* done api for home screen and finished the homepage category sections

* Feature sprint1 final (#6)

* made post model and almost done api

* made create/edit post page

* fixed CORS error

* added sprint1 folder and markdown files

* updated styling for homepage

* added page navigation and foreign key to posts. create/edit currently cant get user id and name

* fixed problems and did sprint1 doc

* Update viewPostsByCategory.tsx

* updated RPM.md

* added system design doc

---------

Co-authored-by: Joyce Ang <[email protected]>
Co-authored-by: suhanip1 <[email protected]>

* Merge main to dev to fix tree (#9)

* Create sprint0_mark.md

* Finish sprint 1 (#7)

* Signup/login service complete (#2)

* Signup, login, logout API endpoints. Use default user model

* Auth service and signup and login pages

* Feature view posts page (#4)

* made post model and almost done api

* Added view list of posts

* fixed ts errors, added delete post functionality

* redesigned posts, added expand-post functionality

* added css to Post.css

---------

Co-authored-by: Max Rack <[email protected]>

* Feature create post (#3)

* made post model and almost done api

* made create/edit post page

* fixed CORS error

* fixed small error

* Feature home (#5)

* add layout components for homepage and placeholder text for the top categories

* pulled from dev

* done api for home screen and finished the homepage category sections

* Feature sprint1 final (#6)

* made post model and almost done api

* made create/edit post page

* fixed CORS error

* added sprint1 folder and markdown files

* updated styling for homepage

* added page navigation and foreign key to posts. create/edit currently cant get user id and name

* fixed problems and did sprint1 doc

* Update viewPostsByCategory.tsx

* updated RPM.md

* added system design doc

---------

Co-authored-by: Joyce Ang <[email protected]>
Co-authored-by: suhanip1 <[email protected]>

---------

Co-authored-by: suhanip1 <[email protected]>
Co-authored-by: Max Rack <[email protected]>
Co-authored-by: xamrm3 <[email protected]>
Co-authored-by: JoyceAng <[email protected]>
Co-authored-by: Joyce Ang <[email protected]>

* Merge dev to main to fix tree (#8)

* Signup/login service complete (#2)

* Signup, login, logout API endpoints. Use default user model

* Auth service and signup and login pages

* Feature view posts page (#4)

* made post model and almost done api

* Added view list of posts

* fixed ts errors, added delete post functionality

* redesigned posts, added expand-post functionality

* added css to Post.css

---------

Co-authored-by: Max Rack <[email protected]>

* Feature create post (#3)

* made post model and almost done api

* made create/edit post page

* fixed CORS error

* fixed small error

* Feature home (#5)

* add layout components for homepage and placeholder text for the top categories

* pulled from dev

* done api for home screen and finished the homepage category sections

* Feature sprint1 final (#6)

* made post model and almost done api

* made create/edit post page

* fixed CORS error

* added sprint1 folder and markdown files

* updated styling for homepage

* added page navigation and foreign key to posts. create/edit currently cant get user id and name

* fixed problems and did sprint1 doc

* Update viewPostsByCategory.tsx

* updated RPM.md

* added system design doc

---------

Co-authored-by: Joyce Ang <[email protected]>
Co-authored-by: suhanip1 <[email protected]>

---------

Co-authored-by: suhanip1 <[email protected]>
Co-authored-by: Max Rack <[email protected]>
Co-authored-by: xamrm3 <[email protected]>
Co-authored-by: JoyceAng <[email protected]>
Co-authored-by: Joyce Ang <[email protected]>

---------

Co-authored-by: Jiale Shang <[email protected]>
Co-authored-by: suhanip1 <[email protected]>
Co-authored-by: Max Rack <[email protected]>
Co-authored-by: xamrm3 <[email protected]>
Co-authored-by: JoyceAng <[email protected]>
Co-authored-by: Joyce Ang <[email protected]>

* SCRUM-5/13 Feature profiles (#11)

* SCRUM-55 Profile model and serializer

* SCRUM-56 Profile create, update, get, delete Backend API

* SCRUM-5 register profile model in admin

* Scrum-57 View and edit profile, and fix some bugs with authentication and some CSS changes

* SCRUM-57 Profile frontend location selection and fix wrong profile name

* SCRUM-57 Update readme for world cities db

* SCRUM-57 update location entry field to say City/Town, and add license for worldcities DB

* Feature ratings reviews (#13)

* Scrum-44/45 backend files created

* Scrum-44/45 did model and api for ratings

* Scrum-44/45 did model and api for reviews. added iteration 2 file

* Scrum-46 added temp button on home page to leave rating/review

* Scrum-46 added review card component and removed temp button

* Scrum-46 added viewable review in profile

* Scrum-46 added reviews to profile

* Scrum-7 added backend reviews documentation

* Scrum-7 added backend ratings documentation

* Feature filtering and searching (#14)

* SCRUM-53 updated the backend for search by need and offer

* SCRUM-54 updated the front end to display posts based on search bar for need and offer

* SCRUM-52 and SCRUM-54 worked on the frontend portion of ratings and filtering by offers

* SCRUM-53 and SCRUM-54: created the offer filtering component

* SCRUM-53 and SCRUM-54 missed files from previous commit

* SCRUM-47 and SCRUM-48 done search for users frontend and backend api, will need to link to profile page later (#10)

* SCRUM 49 & 50 finished filtering by location (#12)

* added googlemaps to requirements and minor fixes

* minor changes

* tested filtering

* Scrum-49/50/53/54 combined filter by location and filter by offer buttons

* added documentation for posts backend

* SCRUM 50 fixed getting current user location

* SCRUM-6/18/22 combined all the code together

* SCRUM 50/54 minor css fix

* Update api.md

* pulled from dev and resolved merge conflicts

* fixed merge conflicts

* Scrum-15 added option to use profile location in create post

* Scrum-6 fixed new ratings/reviews not updating on profile

---------

Co-authored-by: Joyce Ang <[email protected]>
Co-authored-by: JoyceAng <[email protected]>
Co-authored-by: Max Rack <[email protected]>

* SCRUM-15 and accounts API documentation (#15)

* Create api.md

* Create api.md

* minor changes to fix an error

* Feature accounts worldcitites api doc (#16)

* Create api.md

* Create api.md

* sprint 2 documentation

---------

Co-authored-by: Antonio Ferreras <[email protected]>

---------

Co-authored-by: Antonio Ferreras <[email protected]>
Co-authored-by: suhanip1 <[email protected]>
Co-authored-by: JoyceAng <[email protected]>
Co-authored-by: Joyce Ang <[email protected]>
Co-authored-by: Jiale Shang <[email protected]>

* fixed minor issues

* combined the api files and added this file into the docs folder

* SCRUM 63 finished backend for suggested posts

* SCRUM 63 updated requirements, readme and api.md

* SCRUM-60/61 added suggested posts to homepage

* edited api.md

* edited api.md

---------

Co-authored-by: xamrm3 <[email protected]>
Co-authored-by: Antonio Ferreras <[email protected]>
Co-authored-by: JoyceAng <[email protected]>
Co-authored-by: Joyce Ang <[email protected]>
Co-authored-by: Jiale Shang <[email protected]>

* updated api.md

* SCRUM-13 Update profile functionality (#20)

* SCRUM-65&59 Offersings field in profile and validation for saving

* SCRUM-64: Redirect to profile when trying to create post without profile

* SCRUM-64 Make homepage and search unusable until profile filled

* SCRUM-69 Profile uploading and viewing

* SCRUM-69 Prfile picture uploading buig fixes and make profile prettier

* SCRUM-69 profile photo in user search

* SCRUM-69 Set topbar profile photo using polling

* Merge fixes

* Feature chat (#26)

* Scrum-66 created initial backend files

* Scrum-66/10 mostly finished backend and started work on frontend chat with another user

* Scrum-67 users can select who to message using search. Scrum 10 mainly done but have some css problems

* added api documentation for chat

* added data params to chat api documentation

* added sprint 3 markdown docs

* added sprint 3 pdfs

* fixed minor bug from merge

* added profile pictures to chat

* Feature get offer list (#27)

* SCRUM-68 fix the filter by offerings to include the list of offerings from profile

* fixed git ignore and search algorithm

* SCRUM-61 had to fix the profile pics in the posts displayed on homepage

---------

Co-authored-by: Suhani <[email protected]>

* removed unneeded files

* fixed create user error

* main to dev to keep them in sync (#29)

* fixed errors

* Create sprint2_mark.md

* Dev (#28)

* finished post model and most of api

* finished post model and most of api

* made post model and almost done api

* Signup/login service complete (#2)

* Signup, login, logout API endpoints. Use default user model

* Auth service and signup and login pages

* Feature view posts page (#4)

* made post model and almost done api

* Added view list of posts

* fixed ts errors, added delete post functionality

* redesigned posts, added expand-post functionality

* added css to Post.css

---------

Co-authored-by: Max Rack <[email protected]>

* Feature create post (#3)

* made post model and almost done api

* made create/edit post page

* fixed CORS error

* fixed small error

* Feature home (#5)

* add layout components for homepage and placeholder text for the top categories

* pulled from dev

* done api for home screen and finished the homepage category sections

* Feature sprint1 final (#6)

* made post model and almost done api

* made create/edit post page

* fixed CORS error

* added sprint1 folder and markdown files

* updated styling for homepage

* added page navigation and foreign key to posts. create/edit currently cant get user id and name

* fixed problems and did sprint1 doc

* Update viewPostsByCategory.tsx

* updated RPM.md

* added system design doc

---------

Co-authored-by: Joyce Ang <[email protected]>
Co-authored-by: suhanip1 <[email protected]>

* Merge main to dev to fix tree (#9)

* Create sprint0_mark.md

* Finish sprint 1 (#7)

* Signup/login service complete (#2)

* Signup, login, logout API endpoints. Use default user model

* Auth service and signup and login pages

* Feature view posts page (#4)

* made post model and almost done api

* Added view list of posts

* fixed ts errors, added delete post functionality

* redesigned posts, added expand-post functionality

* added css to Post.css

---------

Co-authored-by: Max Rack <[email protected]>

* Feature create post (#3)

* made post model and almost done api

* made create/edit post page

* fixed CORS error

* fixed small error

* Feature home (#5)

* add layout components for homepage and placeholder text for the top categories

* pulled from dev

* done api for home screen and finished the homepage category sections

* Feature sprint1 final (#6)

* made post model and almost done api

* made create/edit post page

* fixed CORS error

* added sprint1 folder and markdown files

* updated styling for homepage

* added page navigation and foreign key to posts. create/edit currently cant get user id and name

* fixed problems and did sprint1 doc

* Update viewPostsByCategory.tsx

* updated RPM.md

* added system design doc

---------

Co-authored-by: Joyce Ang <[email protected]>
Co-authored-by: suhanip1 <[email protected]>

---------

Co-authored-by: suhanip1 <[email protected]>
Co-authored-by: Max Rack <[email protected]>
Co-authored-by: xamrm3 <[email protected]>
Co-authored-by: JoyceAng <[email protected]>
Co-authored-by: Joyce Ang <[email protected]>

* Merge dev to main to fix tree (#8)

* Signup/login service complete (#2)

* Signup, login, logout API endpoints. Use default user model

* Auth service and signup and login pages

* Feature view posts page (#4)

* made post model and almost done api

* Added view list of posts

* fixed ts errors, added delete post functionality

* redesigned posts, added expand-post functionality

* added css to Post.css

---------

Co-authored-by: Max Rack <[email protected]>

* Feature create post (#3)

* made post model and almost done api

* made create/edit post page

* fixed CORS error

* fixed small error

* Feature home (#5)

* add layout components for homepage and placeholder text for the top categories

* pulled from dev

* done api for home screen and finished the homepage category sections

* Feature sprint1 final (#6)

* made post model and almost done api

* made create/edit post page

* fixed CORS error

* added sprint1 folder and markdown files

* updated styling for homepage

* added page navigation and foreign key to posts. create/edit currently cant get user id and name

* fixed problems and did sprint1 doc

* Update viewPostsByCategory.tsx

* updated RPM.md

* added system design doc

---------

Co-authored-by: Joyce Ang <[email protected]>
Co-authored-by: suhanip1 <[email protected]>

---------

Co-authored-by: suhanip1 <[email protected]>
Co-authored-by: Max Rack <[email protected]>
Co-authored-by: xamrm3 <[email protected]>
Co-authored-by: JoyceAng <[email protected]>
Co-authored-by: Joyce Ang <[email protected]>

---------

Co-authored-by: Jiale Shang <[email protected]>
Co-authored-by: suhanip1 <[email protected]>
Co-authored-by: Max Rack <[email protected]>
Co-authored-by: xamrm3 <[email protected]>
Co-authored-by: JoyceAng <[email protected]>
Co-authored-by: Joyce Ang <[email protected]>

* SCRUM-5/13 Feature profiles (#11)

* SCRUM-55 Profile model and serializer

* SCRUM-56 Profile create, update, get, delete Backend API

* SCRUM-5 register profile model in admin

* Scrum-57 View and edit profile, and fix some bugs with authentication and some CSS changes

* SCRUM-57 Profile frontend location selection and fix wrong profile name

* SCRUM-57 Update readme for world cities db

* SCRUM-57 update location entry field to say City/Town, and add license for worldcities DB

* Feature ratings reviews (#13)

* Scrum-44/45 backend files created

* Scrum-44/45 did model and api for ratings

* Scrum-44/45 did model and api for reviews. added iteration 2 file

* Scrum-46 added temp button on home page to leave rating/review

* Scrum-46 added review card component and removed temp button

* Scrum-46 added viewable review in profile

* Scrum-46 added reviews to profile

* Scrum-7 added backend reviews documentation

* Scrum-7 added backend ratings documentation

* Feature filtering and searching (#14)

* SCRUM-53 updated the backend for search by need and offer

* SCRUM-54 updated the front end to display posts based on search bar for need and offer

* SCRUM-52 and SCRUM-54 worked on the frontend portion of ratings and filtering by offers

* SCRUM-53 and SCRUM-54: created the offer filtering component

* SCRUM-53 and SCRUM-54 missed files from previous commit

* SCRUM-47 and SCRUM-48 done search for users frontend and backend api, will need to link to profile page later (#10)

* SCRUM 49 & 50 finished filtering by location (#12)

* added googlemaps to requirements and minor fixes

* minor changes

* tested filtering

* Scrum-49/50/53/54 combined filter by location and filter by offer buttons

* added documentation for posts backend

* SCRUM 50 fixed getting current user location

* SCRUM-6/18/22 combined all the code together

* SCRUM 50/54 minor css fix

* Update api.md

* pulled from dev and resolved merge conflicts

* fixed merge conflicts

* Scrum-15 added option to use profile location in create post

* Scrum-6 fixed new ratings/reviews not updating on profile

---------

Co-authored-by: Joyce Ang <[email protected]>
Co-authored-by: JoyceAng <[email protected]>
Co-authored-by: Max Rack <[email protected]>

* SCRUM-15 and accounts API documentation (#15)

* Create api.md

* Create api.md

* minor changes to fix an error

* Feature accounts worldcitites api doc (#16)

* Create api.md

* Create api.md

* sprint 2 documentation

---------

Co-authored-by: Antonio Ferreras <[email protected]>

* update dev (#18)

* Dev (#17)

* finished post model and most of api

* finished post model and most of api

* made post model and almost done api

* Signup/login service complete (#2)

* Signup, login, logout API endpoints. Use default user model

* Auth service and signup and login pages

* Feature view posts page (#4)

* made post model and almost done api

* Added view list of posts

* fixed ts errors, added delete post functionality

* redesigned posts, added expand-post functionality

* added css to Post.css

---------

Co-authored-by: Max Rack <[email protected]>

* Feature create post (#3)

* made post model and almost done api

* made create/edit post page

* fixed CORS error

* fixed small error

* Feature home (#5)

* add layout components for homepage and placeholder text for the top categories

* pulled from dev

* done api for home screen and finished the homepage category sections

* Feature sprint1 final (#6)

* made post model and almost done api

* made create/edit post page

* fixed CORS error

* added sprint1 folder and markdown files

* updated styling for homepage

* added page navigation and foreign key to posts. create/edit currently cant get user id and name

* fixed problems and did sprint1 doc

* Update viewPostsByCategory.tsx

* updated RPM.md

* added system design doc

---------

Co-authored-by: Joyce Ang <[email protected]>
Co-authored-by: suhanip1 <[email protected]>

* Merge main to dev to fix tree (#9)

* Create sprint0_mark.md

* Finish sprint 1 (#7)

* Signup/login service complete (#2)

* Signup, login, logout API endpoints. Use default user model

* Auth service and signup and login pages

* Feature view posts page (#4)

* made post model and almost done api

* Added view list of posts

* fixed ts errors, added delete post functionality

* redesigned posts, added expand-post functionality

* added css to Post.css

---------

Co-authored-by: Max Rack <[email protected]>

* Feature create post (#3)

* made post model and almost done api

* made create/edit post page

* fixed CORS error

* fixed small error

* Feature home (#5)

* add layout components for homepage and placeholder text for the top categories

* pulled from dev

* done api for home screen and finished the homepage category sections

* Feature sprint1 final (#6)

* made post model and almost done api

* made create/edit post page

* fixed CORS error

* added sprint1 folder and markdown files

* updated styling for homepage

* added page navigation and foreign key to posts. create/edit currently cant get user id and name

* fixed problems and did sprint1 doc

* Update viewPostsByCategory.tsx

* updated RPM.md

* added system design doc

---------

Co-authored-by: Joyce Ang <[email protected]>
Co-authored-by: suhanip1 <[email protected]>

---------

Co-authored-by: suhanip1 <[email protected]>
Co-authored-by: Max Rack <[email protected]>
Co-authored-by: xamrm3 <[email protected]>
Co-authored-by: JoyceAng <[email protected]>
Co-authored-by: Joyce Ang <[email protected]>

* Merge dev to main to fix tree (#8)

* Signup/login service complete (#2)

* Signup, login, logout API endpoints. Use default user model

* Auth service and signup and login pages

* Feature view posts page (#4)

* made post model and almost done api

* Added view list of posts

* fixed ts errors, added delete post functionality

* redesigned posts, added expand-post functionality

* added css to Post.css

---------

Co-authored-by: Max Rack <[email protected]>

* Feature create post (#3)

* made post model and almost done api

* made create/edit post page

* fixed CORS error

* fixed small error

* Feature home (#5)

* add layout components for homepage and placeholder text for the top categories

* pulled from dev

* done api for home screen and finished the homepage category sections

* Feature sprint1 final (#6)

* made post model and almost done api

* made create/edit post page

* fixed CORS error

* added sprint1 folder and markdown files

* updated styling for homepage

* added page navigation and foreign key to posts. create/edit currently cant get user id and name

* fixed problems and did sprint1 doc

* Update viewPostsByCategory.tsx

* updated RPM.md

* added system design doc

---------

Co-authored-by: Joyce Ang <[email protected]>
Co-authored-by: suhanip1 <[email protected]>

---------

Co-authored-by: suhanip1 <[email protected]>
Co-authored-by: Max Rack <[email protected]>
Co-authored-by: xamrm3 <[email protected]>
Co-authored-by: JoyceAng <[email protected]>
Co-authored-by: Joyce Ang <[email protected]>

---------

Co-authored-by: Jiale Shang <[email protected]>
Co-authored-by: suhanip1 <[email protected]>
Co-authored-by: Max Rack <[email protected]>
Co-authored-by: xamrm3 <[email protected]>
Co-authored-by: JoyceAng <[email protected]>
Co-authored-by: Joyce Ang <[email protected]>

* SCRUM-5/13 Feature profiles (#11)

* SCRUM-55 Profile model and serializer

* SCRUM-56 Profile create, update, get, delete Backend API

* SCRUM-5 register profile model in admin

* Scrum-57 View and edit profile, and fix some bugs with authentication and some CSS changes

* SCRUM-57 Profile frontend location selection and fix wrong profile name

* SCRUM-57 Update readme for world cities db

* SCRUM-57 update location entry field to say City/Town, and add license for worldcities DB

* Feature ratings reviews (#13)

* Scrum-44/45 backend files created

* Scrum-44/45 did model and api for ratings

* Scrum-44/45 did model and api for reviews. added iteration 2 file

* Scrum-46 added temp button on home page to leave rating/review

* Scrum-46 added review card component and removed temp button

* Scrum-46 added viewable review in profile

* Scrum-46 added reviews to profile

* Scrum-7 added backend reviews documentation

* Scrum-7 added backend ratings documentation

* Feature filtering and searching (#14)

* SCRUM-53 updated the backend for search by need and offer

* SCRUM-54 updated the front end to display posts based on search bar for need and offer

* SCRUM-52 and SCRUM-54 worked on the frontend portion of ratings and filtering by offers

* SCRUM-53 and SCRUM-54: created the offer filtering component

* SCRUM-53 and SCRUM-54 missed files from previous commit

* SCRUM-47 and SCRUM-48 done search for users frontend and backend api, will need to link to profile page later (#10)

* SCRUM 49 & 50 finished filtering by location (#12)

* added googlemaps to requirements and minor fixes

* minor changes

* tested filtering

* Scrum-49/50/53/54 combined filter by location and filter by offer buttons

* added documentation for posts backend

* SCRUM 50 fixed getting current user location

* SCRUM-6/18/22 combined all the code together

* SCRUM 50/54 minor css fix

* Update api.md

* pulled from dev and resolved merge conflicts

* fixed merge conflicts

* Scrum-15 added option to use profile location in create post

* Scrum-6 fixed new ratings/reviews not updating on profile

---------

Co-authored-by: Joyce Ang <[email protected]>
Co-authored-by: JoyceAng <[email protected]>
Co-authored-by: Max Rack <[email protected]>

* SCRUM-15 and accounts API documentation (#15)

* Create api.md

* Create api.md

* minor changes to fix an error

* Feature accounts worldcitites api doc (#16)

* Create api.md

* Create api.md

* sprint 2 documentation

---------

Co-authored-by: Antonio Ferreras <[email protected]>

---------

Co-authored-by: Antonio Ferreras <[email protected]>
Co-authored-by: suhanip1 <[email protected]>
Co-authored-by: JoyceAng <[email protected]>
Co-authored-by: Joyce Ang <[email protected]>
Co-authored-by: Jiale Shang <[email protected]>

* fixed minor issues

* combined the api files and added this file into the docs folder

---------

Co-authored-by: xamrm3 <[email protected]>
Co-authored-by: Antonio Ferreras <[email protected]>
Co-authored-by: suhanip1 <[email protected]>
Co-authored-by: Jiale Shang <[email protected]>

* fixed problems in dev

* Feature filter by ratings (#19)

* SCRUM-51/52 done filter by rating feature when searching for user and searching for posts

* update documentation for accounts, posts, and ratings

* Feature update homepage (#22)

* SCRUM-61 changed the homepage layout and used material ui and also updated the posts

* SCRUM-61 edited the post layout

* SCRUM-61 removed unneccessary files

* Feature update homepage (#23)

* SCRUM-61 changed the homepage layout and used material ui and also updated the posts

* SCRUM-61 edited the post layout

* SCRUM-61 removed unneccessary files

* SCRUM-61 fixed minor error in styling

* SCRUM-61 made it so posts made by the current logged in user don't show

* SCRUM-61 fixed minor issues that occured after merge

* Feature suggest posts (#25)

* Dev (#17)

* finished post model and most of api

* finished post model and most of api

* made post model and almost done api

* Signup/login service complete (#2)

* Signup, login, logout API endpoints. Use default user model

* Auth service and signup and login pages

* Feature view posts page (#4)

* made post model and almost done api

* Added view list of posts

* fixed ts errors, added delete post functionality

* redesigned posts, added expand-post functionality

* added css to Post.css

---------

Co-authored-by: Max Rack <[email protected]>

* Feature create post (#3)

* made post model and almost done api

* made create/edit post page

* fixed CORS error

* fixed small error

* Feature home (#5)

* add layout components for homepage and placeholder text for the top categories

* pulled from dev

* done api for home screen and finished the homepage category sections

* Feature sprint1 final (#6)

* made post model and almost done api

* made create/edit post page

* fixed CORS error

* added sprint1 folder and markdown files

* updated styling for homepage

* added page navigation and foreign key to posts. create/edit currently cant get user id and name

* fixed problems and did sprint1 doc

* Update viewPostsByCategory.tsx

* updated RPM.md

* added system design doc

---------

Co-authored-by: Joyce Ang <[email protected]>
Co-authored-by: suhanip1 <[email protected]>

* Merge main to dev to fix tree (#9)

* Create sprint0_mark.md

* Finish sprint 1 (#7)

* Signup/login service complete (#2)

* Signup, login, logout API endpoints. Use default user model

* Auth service and signup and login pages

* Feature view posts page (#4)

* made post model and almost done api

* Added view list of posts

* fixed ts errors, added delete post functionality

* redesigned posts, added expand-post functionality

* added css to Post.css

---------

Co-authored-by: Max Rack <[email protected]>

* Feature create post (#3)

* made post model and almost done api

* made create/edit post page

* fixed CORS error

* fixed small error

* Feature home (#5)

* add layout components for homepage and placeholder text for the top categories

* pulled from dev

* done api for home screen and finished the homepage category sections

* Feature sprint1 final (#6)

* made post model and almost done api

* made create/edit post page

* fixed CORS error

* added sprint1 folder and markdown files

* updated styling for homepage

* added page navigation and foreign key to posts. create/edit currently cant get user id and name

* fixed problems and did sprint1 doc

* Update viewPostsByCategory.tsx

* updated RPM.md

* added system design doc

---------

Co-authored-by: Joyce Ang <[email protected]>
Co-authored-by: suhanip1 <[email protected]>

---------

Co-authored-by: suhanip1 <[email protected]>
Co-authored-by: Max Rack <[email protected]>
Co-authored-by: xamrm3 <[email protected]>
Co-authored-by: JoyceAng <[email protected]>
Co-authored-by: Joyce Ang <[email protected]>

* Merge dev to main to fix tree (#8)

* Signup/login service complete (#2)

* Signup, login, logout API endpoints. Use default user model

* Auth service and signup and login pages

* Feature view posts page (#4)

* made post model and almost done api

* Added view list of posts

* fixed ts errors, added delete post functionality

* redesigned posts, added expand-post functionality

* added css to Post.css

---------

Co-authored-by: Max Rack <[email protected]>

* Feature create post (#3)

* made post model and almost done api

* made create/edit post page

* fixed CORS error

* fixed small error

* Feature home (#5)

* add layout components for homepage and placeholder text for the top categories

* pulled from dev

* done api for home screen and finished the homepage category sections

* Feature sprint1 final (#6)

* made post model and almost done api

* made create/edit post page

* fixed CORS error

* added sprint1 folder and markdown files

* updated styling for homepage

* added page navigation and foreign key to posts. create/edit currently cant get user id and name

* fixed problems and did sprint1 doc

* Update viewPostsByCategory.tsx

* updated RPM.md

* added system design doc

---------

Co-authored-by: Joyce Ang <[email protected]>
Co-authored-by: suhanip1 <[email protected]>

---------

Co-authored-by: suhanip1 <[email protected]>
Co-authored-by: Max Rack <[email protected]>
Co-authored-by: xamrm3 <[email protected]>
Co-authored-by: JoyceAng <[email protected]>
Co-authored-by: Joyce Ang <[email protected]>

---------

Co-authored-by: Jiale Shang <[email protected]>
Co-authored-by: suhanip1 <[email protected]>
Co-authored-by: Max Rack <[email protected]>
Co-authored-by: xamrm3 <[email protected]>
Co-authored-by: JoyceAng <[email protected]>
Co-authored-by: Joyce Ang <[email protected]>

* SCRUM-5/13 Feature profiles (#11)

* SCRUM-55 Profile model and serializer

* SCRUM-56 Profile create, update, get, delete Backend API

* SCRUM-5 register profile model in admin

* Scrum-57 View and edit profile, and fix some bugs with authentication and some CSS changes

* SCRUM-57 Profile frontend location selection and fix wrong profile name

* SCRUM-57 Update readme for world cities db

* SCRUM-57 update location entry field to say City/Town, and add license for worldcities DB

* Feature ratings reviews (#13)

* Scrum-44/45 backend files created

* Scrum-44/45 did model and api for ratings

* Scrum-44/45 did model and api for reviews. added iteration 2 file

* Scrum-46 added temp button on home page to leave rating/review

* Scrum-46 added review card component and removed temp button

* Scrum-46 added viewable review in profile

* Scrum-46 added reviews to profile

* Scrum-7 added backend reviews documentation

* Scrum-7 added backend ratings documentation

* Feature filtering and searching (#14)

* SCRUM-53 updated the backend for search by need and offer

* SCRUM-54 updated the front end to display posts based on search bar for need and offer

* SCRUM-52 and SCRUM-54 worked on the frontend portion of ratings and filtering by offers

* SCRUM-53 and SCRUM-54: created the offer filtering component

* SCRUM-53 and SCRUM-54 missed files from previous commit

* SCRUM-47 and SCRUM-48 done search for users frontend and backend api, will need to link to profile page later (#10)

* SCRUM 49 & 50 finished filtering by location (#12)

* added googlemaps to requirements and minor fixes

* minor changes

* tested filtering

* Scrum-49/50/53/54 combined filter by location and filter by offer buttons

* added documentation for posts backend

* SCRUM 50 fixed getting current user location

* SCRUM-6/18/22 combined all the code together

* SCRUM 50/54 minor css fix

* Update api.md

* pulled from dev and resolved merge conflicts

* fixed merge conflicts

* Scrum-15 added option to use profile location in create post

* Scrum-6 fixed new ratings/reviews not updating on profile

---------

Co-authored-by: Joyce Ang <[email protected]>
Co-authored-by: JoyceAng <[email protected]>
Co-authored-by: Max Rack <[email protected]>

* SCRUM-15 and accounts API documentation (#15)

* Create api.md

* Create api.md

* minor changes to fix an error

* Feature accounts worldcitites api doc (#16)

* Create api.md

* Create api.md

* sprint 2 documentation

---------

Co-authored-by: Antonio Ferreras <[email protected]>

---------

Co-authored-by: Antonio Ferreras <[email protected]>
Co-authored-by: suhanip1 <[email protected]>
Co-authored-by: JoyceAng <[email protected]>
Co-authored-by: Joyce Ang <[email protected]>
Co-authored-by: Jiale Shang <[email protected]>

* fixed minor issues

* combined the api files and added this file into the docs folder

* SCRUM 63 finished backend for suggested posts

* SCRUM 63 updated requirements, readme and api.md

* SCRUM-60/61 added suggested posts to homepage

* edited api.md

* edited api.md

---------

Co-authored-by: xamrm3 <[email protected]>
Co-authored-by: Antonio Ferreras <[email protected]>
Co-authored-by: JoyceAng <[email protected]>
Co-authored-by: Joyce Ang <[email protected]>
Co-authored-by: Jiale Shang <[email protected]>

* updated api.md

* SCRUM-13 Update profile functionality (#20)

* SCRUM-65&59 Offersings field in profile and validation for saving

* SCRUM-64: Redirect to profile when trying to create post without profile

* SCRUM-64 Make homepage and search unusable until profile filled

* SCRUM-69 Profile uploading and viewing

* SCRUM-69 Prfile picture uploading buig fixes and make profile prettier

* SCRUM-69 profile photo in user search

* SCRUM-69 Set topbar profile photo using polling

* Merge fixes

* Feature chat (#26)

* Scrum-66 created initial backend files

* Scrum-66/10 mostly finished backend and started work on frontend chat with another user

* Scrum-67 users can select who to message using search. Scrum 10 mainly done but have some css problems

* added api documentation for chat

* added data params to chat api documentation

* added sprint 3 markdown docs

* added sprint 3 pdfs

* fixed minor bug from merge

* added profile pictures to chat

* Feature get offer list (#27)

* SCRUM-68 fix the filter by offerings to include the list of offerings from profile

* fixed git ignore and search algorithm

* SCRUM-61 had to fix the profile pics in the posts displayed on homepage

---------

Co-authored-by: Suhani <[email protected]>

---------

Co-authored-by: Max Rack <[email protected]>
Co-authored-by: Antonio Ferreras <[email protected]>
Co-authored-by: suhanip1 <[email protected]>
Co-authored-by: xamrm3 <[email protected]>
Co-authored-by: Jiale Shang <[email protected]>

* removed unneeded migrations files

* removed duplicate create

---------

Co-authored-by: Max Rack <[email protected]>
Co-authored-by: shang8024 <[email protected]>
Co-authored-by: Antonio Ferreras <[email protected]>
Co-authored-by: suhanip1 <[email protected]>
Co-authored-by: xamrm3 <[email protected]>

* Feature chat notification (#31)

* Scrum-9 backend logic done, code to send email not done yet

* Scrum-9 chat notification email sending

* Feature listing status (#30)

* Scrum-24/25 can now toggle active/inactive in my listings

* Scrum-24/25 updated backend to only search for active posts

* updated rating display for post.tsx

* Feature posts images (#33)

* Merge chat changes from dev (#32)

* Feature chat notification (#31)

* Scrum-9 backend logic done, code to send email not done yet

* Scrum-9 chat notification email sending

* Feature listing status (#30)

* Scrum-24/25 can now toggle active/inactive in my listings

* Scrum-24/25 updated backend to only search for active posts

* updated rating display for post.tsx

---------

Co-authored-by: xamrm3 <[email protected]>

* SCRUM-73 Photo for posts

---------

Co-authored-by: xamrm3 <[email protected]>

* Feature save posts (#35)

* Feature posts images (#33) (#34)

* Merge chat changes from dev (#32)

* Feature chat notification (#31)

* Scrum-9 backend logic done, code to send email not done yet

* Scrum-9 chat notification email sending

* Feature listing status (#30)

* Scrum-24/25 can now toggle active/inactive in my listings

* Scrum-24/25 updated backend to only search for active posts

* updated rating display for post.tsx

---------



* SCRUM-73 Photo for posts

---------

Co-authored-by: xamrm3 <[email protected]>

* SCRUM-72 saving posts

---------

Co-authored-by: xamrm3 <[email protected]>

* SCRUM-71 created a post page that displays all the information about … (#36)

* SCRUM-71 created a post page that displays all the information about a post

* SCRUM-71: fixed minor merge conflict in Post.tsx

* SCRUM-71: fixed minor merge conflict in Post.tsx

* SCRUM-71: updated the view a post to have the uploaded post picture

* SCRUM 74 finished redirection to post page (#37)

* SCRUM 74 finished redirection to post page

* SCRUM 74 minor fixes to images

* fixed checks to force new users to make a profile

* fixed minor error

* fixed filter by location front end

* sprint 4 docs added

* SCRUM 72 updated the save post button

---------

Co-authored-by: Max Rack <[email protected]>
Co-authored-by: Antonio Ferreras <[email protected]>
Co-authored-by: suhanip1 <[email protected]>
Co-authored-by: xamrm3 <[email protected]>
Co-authored-by: Jiale Shang <[email protected]>
  • Loading branch information
6 people authored Aug 2, 2024
1 parent b03ca98 commit 7004b8e
Show file tree
Hide file tree
Showing 34 changed files with 2,333 additions and 710 deletions.
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -312,3 +312,9 @@ sketch

# Ignore all files under backend/static/images
backend/static/images/*


# Django migration files
migrations/
migrations/*.py
migrations/*.pyc
2 changes: 1 addition & 1 deletion backend/accounts/migrations/0001_initial.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Generated by Django 5.0.6 on 2024-07-19 19:56
# Generated by Django 5.0.6 on 2024-07-21 16:31

import django.db.models.deletion
from django.conf import settings
Expand Down
1 change: 0 additions & 1 deletion backend/accounts/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ def post(self, request):

if serializer.is_valid():
serializer.save()

user_profile = UserProfile.objects.create(user=serializer.instance)
return Response({'message': 'User creation successful'}, status=status.HTTP_201_CREATED)

Expand Down
4 changes: 4 additions & 0 deletions backend/backend/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@
# SECURITY WARNING: keep the secret key used in production secret!
SECRET_KEY = 'django-insecure-q1g9$j0k=9_o4=ug!--#dbsl97l5%#wr-7v*lsy6f@z9&4jik4'

REACT_APP_API_URL= 'http://localhost:5173'


# SECURITY WARNING: don't run with debug turned on in production!
DEBUG = True
EMAIL_HOST = 'smtp.gmail.com'
Expand All @@ -47,6 +50,7 @@
}

ALLOWED_HOSTS = ['localhost', '127.0.0.1']

CORS_ORIGIN_ALLOW_ALL = True

# Application definition
Expand Down
Binary file modified backend/celerybeat-schedule.db
Binary file not shown.
13 changes: 13 additions & 0 deletions backend/chat/templates/new_message.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@

<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>New Message</title>
</head>
<body>
<h1>You have a new message!</h1>
<h2>{{ message.sender_profile }} has sent you the following message:</h2>
<h3>{{ message.message }}</h3>
</body>
</html>
49 changes: 48 additions & 1 deletion backend/chat/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@
from accounts.models import UserProfile
from .serializers import MessageSerializer
from django.db.models import Subquery, Q, OuterRef
from django.contrib.auth.models import User
from django.template.loader import render_to_string
from django.utils.html import strip_tags
from django.core.mail import send_mail
from django.conf import settings


# Create your views here.
class GetMessages(generics.ListAPIView):
Expand All @@ -17,10 +23,51 @@ def get_queryset(self):
sender__in=[senderId, recieverId], reciever__in=[senderId, recieverId]
)
return messages


# send an email notification
def sendEmail(message):
email = User.objects.filter(username=message.reciever).first().email
subject = 'New Message'
html_message = render_to_string('new_message.html', {'message': message})
plain_message = strip_tags(html_message)

try:
send_mail(
subject,
plain_message,
settings.EMAIL_HOST_USER,
[email],
html_message=html_message
)
print(f'Email sent to {email}')
except Exception as e:
print(f'Failed to send email to {email}: {e}')


class SendMessage(generics.CreateAPIView):
serializer_class = MessageSerializer

def perform_create(self, serializer):
message = serializer.save()
messages = Message.objects.filter(
Q(sender=message.sender, reciever=message.reciever) |
Q(sender=message.reciever, reciever=message.sender)
).exclude(id=message.id).order_by('date')

# no messages/first message being sent
if (messages.count() == 0):
sendEmail(message)

# message has been sent before
else:
recent = messages[messages.count() - 1] # negative indexing not supported???

# check if a day has past since last message
# swap to recent.date - message.date if testing needs a day, results in negative day
if "day" in str(message.date - recent.date):
sendEmail(message)


class AllMessages(generics.ListAPIView):
queryset = Message.objects.all()
serializer_class = MessageSerializer
Expand Down
23 changes: 18 additions & 5 deletions backend/posts/migrations/0001_initial.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Generated by Django 5.0.6 on 2024-07-19 19:56
# Generated by Django 5.0.6 on 2024-07-29 18:56

import django.db.models.deletion
import django.utils.timezone
Expand All @@ -19,14 +19,15 @@ class Migration(migrations.Migration):
name='Post',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('author_name', models.CharField(default='DEFAULT NAME', max_length=30)),
('need', models.CharField(max_length=30)),
('offer', models.CharField(max_length=30)),
('author_name', models.CharField(default='DEFAULT NAME', max_length=40)),
('need', models.CharField(max_length=40)),
('offer', models.CharField(max_length=40)),
('description', models.TextField()),
('location', models.CharField(max_length=30)),
('location', models.CharField(max_length=40)),
('published', models.DateTimeField(auto_now_add=True)),
('applicants', models.PositiveIntegerField()),
('active', models.BooleanField(default=True)),
('photo', models.ImageField(blank=True, null=True, upload_to='post_photos/')),
('author_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
],
),
Expand All @@ -51,4 +52,16 @@ class Migration(migrations.Migration):
'unique_together': {('user', 'post')},
},
),
migrations.CreateModel(
name='SavedPost',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('timestamp', models.DateTimeField(default=django.utils.timezone.now)),
('post', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='posts.post')),
('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
],
options={
'unique_together': {('user', 'post')},
},
),
]
17 changes: 13 additions & 4 deletions backend/posts/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,15 @@
# Create your models here.
class Post(models.Model):
author_id = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE)
author_name = models.CharField(max_length=30, default="DEFAULT NAME")
need = models.CharField(max_length=30)
offer = models.CharField(max_length=30)
author_name = models.CharField(max_length=40, default="DEFAULT NAME")
need = models.CharField(max_length=40)
offer = models.CharField(max_length=40)
description = models.TextField()
location = models.CharField(max_length=30)
location = models.CharField(max_length=40)
published = models.DateTimeField(auto_now_add=True)
applicants = models.PositiveIntegerField()
active = models.BooleanField(default=True)
photo = models.ImageField(upload_to='post_photos/', blank=True, null=True)

def __str__(self):
return self.need+" "+self.offer
Expand All @@ -39,3 +40,11 @@ class StoreSuggestedPost(models.Model):
email = models.CharField(max_length=30)
def __str__(self):
return f"{self.user.username} - {self.email}"

class SavedPost(models.Model):
user = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE)
post = models.ForeignKey(Post, on_delete=models.CASCADE)
timestamp = models.DateTimeField(default=timezone.now)

class Meta:
unique_together = [['user', 'post']]
13 changes: 10 additions & 3 deletions backend/posts/serializers.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,22 @@
from rest_framework import serializers
from .models import Post
from .models import Click
from .models import Click, SavedPost
class PostSerializer(serializers.ModelSerializer):
class Meta:
model = Post
fields = ["id", "author_id", "author_name", "need", "offer", "description",
"location", "published", "applicants", "active"]
"location", "published", "applicants", "active", "photo"]

class ClickSerializer(serializers.ModelSerializer):
user_id = serializers.ReadOnlyField(source='user.id')
post_id = serializers.ReadOnlyField(source='post.id')
class Meta:
model = Click
fields = ['user_id', 'post_id', 'times', 'timestamp']
fields = ['user_id', 'post_id', 'times', 'timestamp']

class SavedPostSerializer(serializers.ModelSerializer):
user_id = serializers.ReadOnlyField(source='user.id')
post_id = serializers.ReadOnlyField(source='post.id')
class Meta:
model = SavedPost
fields = ['user_id', 'post_id', 'timestamp']
2 changes: 1 addition & 1 deletion backend/posts/tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ def send_weekly_suggested_posts():

# Prepare the email content
subject = 'Weekly Suggested Posts'
html_message = render_to_string('weekly_suggested_posts.html', {'suggested_posts': suggested_posts})
html_message = render_to_string('weekly_suggested_posts.html', {'suggested_posts': suggested_posts, 'frontend_host': settings.REACT_APP_API_URL})
plain_message = strip_tags(html_message)

try:
Expand Down
34 changes: 29 additions & 5 deletions backend/posts/templates/weekly_suggested_posts.html
Original file line number Diff line number Diff line change
@@ -1,19 +1,43 @@

<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Weekly Suggested Posts</title>
<style>
ul {
list-style-type: none;
padding: 0;
color: black;
}
li {
margin-bottom: 20px;
}
.post-link {
display: block;
text-decoration: none;
color: inherit;
border: 1px solid #ccc;
padding: 10px;
border-radius: 5px;
transition: background-color 0.3s ease;
color: black;
}
.post-link:hover {
background-color: #f0f0f0;
}
</style>
</head>
<body>
<h1>Weekly Suggested Posts</h1>
<ul>
{% for post in suggested_posts %}
<li>
<strong>{{ post.need }}</strong> - {{ post.offer }}<br>
{{ post.description }}<br>
<em>Location: {{ post.location }}</em><br>
<em>Published: {{ post.published }}</em>
<a href="{{ frontend_host }}/login?redirectToPost=true&postId={{ post.id }}" class="post-link">
<strong>{{ post.need }}</strong> - {{ post.offer }}<br>
{{ post.description }}<br>
<em>Location: {{ post.location }}</em><br>
<em>Published: {{ post.published }}</em>
</a>
</li>
{% endfor %}
</ul>
Expand Down
3 changes: 3 additions & 0 deletions backend/posts/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,7 @@
path('filter/<str:pk>/<str:pk_list>/<str:offer_list>/<str:loc_coords>/<str:user_list>', views.FilterPosts.as_view(), name="filter"),
path('suggested-posts/', views.PostSuggestions.as_view(), name="post_list_by_suggestions"),
path('record-click/<int:post_id>', views.RecordPostClick.as_view(), name="post_clicked_by_user"),
path('post/<int:post_id>/', views.PostView.as_view(), name='post_view'),
path('save-post/<int:post_id>', views.SavedPostView.as_view(), name="save_post_post_delete"),
path('save-post/', views.SavedPostView.as_view(), name="save_post_get"),
]
Loading

0 comments on commit 7004b8e

Please sign in to comment.