Skip to content

Commit

Permalink
Dev (#41)
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

* Deploy (#40)

* made docker files but not working

* updated docker files and settings

* edited the Dockerfile in frontend

* updated save post button for deploy

* made some changes to docker files for deployment

* made CICD folder

---------

Co-authored-by: Joyce Ang <[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]>
  • Loading branch information
6 people authored Aug 7, 2024
1 parent 8860fbb commit 6dd5dd1
Show file tree
Hide file tree
Showing 9 changed files with 145 additions and 92 deletions.
Binary file added CICD/Docker Hub.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added CICD/System Design.pdf
Binary file not shown.
Binary file added CICD/Workflow.pdf
Binary file not shown.
18 changes: 18 additions & 0 deletions backend/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
FROM python:3.9

ENV PYTHONDONTWRITEBYTECODE 1
ENV PYTHONUNBUFFERED 1

WORKDIR /app

RUN apt-get update && apt-get install -y gcc

COPY requirements.txt /app/
RUN pip install --upgrade pip
RUN pip install -r requirements.txt

COPY . /app/

EXPOSE 8000

CMD ["sh", "-c", "python manage.py migrate && python manage.py populate_worldcities && python manage.py runserver 0.0.0.0:8000"]
6 changes: 3 additions & 3 deletions backend/backend/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
EMAIL_PORT = 587
EMAIL_USE_TLS = True
EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
CELERY_BROKER_URL = 'redis://localhost:6379/0'
CELERY_RESULT_BACKEND = 'redis://localhost:6379/0'
CELERY_BROKER_URL = 'redis://redis:6379/0'
CELERY_RESULT_BACKEND = 'redis://redis:6379/0'
CELERY_ACCEPT_CONTENT = ['json']
CELERY_TASK_SERIALIZER = 'json'
CELERY_RESULT_SERIALIZER = 'json'
Expand All @@ -49,7 +49,7 @@
},
}

ALLOWED_HOSTS = ['localhost', '127.0.0.1']
ALLOWED_HOSTS = ['localhost', '127.0.0.1', 'talenttrade-backend.onrender.com']

CORS_ORIGIN_ALLOW_ALL = True

Expand Down
23 changes: 23 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
services:
frontend:
build:
context: ./frontend
container_name: frontend
ports:
- '5173:5173'
depends_on:
- backend

backend:
build:
context: ./backend
container_name: backend
ports:
- '8000:8000'

# redis:
# container_name: redis
# image: redis:latest
# restart: always
# ports:
# - '6379:6379'
12 changes: 12 additions & 0 deletions frontend/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
FROM node:latest

WORKDIR /app

COPY package.json .
RUN npm install

COPY . .

EXPOSE 5173

CMD ["npm", "run", "dev", "--", "--host"]
Loading

0 comments on commit 6dd5dd1

Please sign in to comment.