-
Notifications
You must be signed in to change notification settings - Fork 16
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Password reset email url #159
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
esparr
approved these changes
Oct 14, 2023
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Look good.
GitLukeW
added a commit
that referenced
this pull request
Oct 14, 2023
* Deploy 09182023 (#143) (#144) * updated cors with staging (#136) (#138) (#139) * Sessionserializer (#141) * updated cors with staging (#136) (#138) * added mentor to session serializer --------- * fix(availability): fix overlapping error (#142) --------- Co-authored-by: Laura Andrews <[email protected]> Co-authored-by: Laura-D-Andrews <[email protected]> * Forgot password (#148) * Hotfix build celery code * Updated settings file to enable djoser password reset * chore(precommit): setup precommit (#149) * chore(precommit): setup precommit * chore(precommit): setup precommit * chore(precommit): setup precommit * chore(precommit): update readme * Create SECURITY.md * feat(mentor): add team number to mentor model (#153) * Bump urllib3 from 1.26.16 to 1.26.17 (#151) Bumps [urllib3](https://github.com/urllib3/urllib3) from 1.26.16 to 1.26.17. - [Release notes](https://github.com/urllib3/urllib3/releases) - [Changelog](https://github.com/urllib3/urllib3/blob/main/CHANGES.rst) - [Commits](urllib3/urllib3@1.26.16...1.26.17) --- updated-dependencies: - dependency-name: urllib3 dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: GitLukeW <[email protected]> * Documentation update (#157) * Deploy 10/02/2023 (#150) * Deploy 09182023 (#143) (#144) * updated cors with staging (#136) (#138) (#139) * Sessionserializer (#141) * updated cors with staging (#136) (#138) * added mentor to session serializer --------- * fix(availability): fix overlapping error (#142) --------- Co-authored-by: Laura Andrews <[email protected]> Co-authored-by: Laura-D-Andrews <[email protected]> * Forgot password (#148) * Hotfix build celery code * Updated settings file to enable djoser password reset * chore(precommit): setup precommit (#149) * chore(precommit): setup precommit * chore(precommit): setup precommit * chore(precommit): setup precommit * chore(precommit): update readme * Create SECURITY.md --------- Co-authored-by: Laura Andrews <[email protected]> Co-authored-by: Laura-D-Andrews <[email protected]> Co-authored-by: Nathan Zeager <[email protected]> * corrected markdown error with Sessions endpoint; added note to Create User endpoint about username being saved as lowercase; formatted JSON code blocks to have proper syntax highlighting * forgot about Logout correction --------- Co-authored-by: GitLukeW <[email protected]> Co-authored-by: Laura Andrews <[email protected]> Co-authored-by: Laura-D-Andrews <[email protected]> Co-authored-by: Nathan Zeager <[email protected]> * Dockerizing (#158) * Deploy 10/02/2023 (#150) * Deploy 09182023 (#143) (#144) * updated cors with staging (#136) (#138) (#139) * Sessionserializer (#141) * updated cors with staging (#136) (#138) * added mentor to session serializer --------- * fix(availability): fix overlapping error (#142) --------- Co-authored-by: Laura Andrews <[email protected]> Co-authored-by: Laura-D-Andrews <[email protected]> * Forgot password (#148) * Hotfix build celery code * Updated settings file to enable djoser password reset * chore(precommit): setup precommit (#149) * chore(precommit): setup precommit * chore(precommit): setup precommit * chore(precommit): setup precommit * chore(precommit): update readme * Create SECURITY.md --------- Co-authored-by: Laura Andrews <[email protected]> Co-authored-by: Laura-D-Andrews <[email protected]> Co-authored-by: Nathan Zeager <[email protected]> * added drf-spectacular to pipfile and generated schema.yml * nitpicking styling * adjusted schema example in models.py * updated SessionSerialiazer example and added AvailabilitySerializer examples * added more serializer examples * updated Pipfile.lock * added requirements.txt from Pipfile * tried dockerizing backend; error while installing cffi * requirements are installed correctly when image is built; build now fails on useradd command * updated pipfile and requirements.txt * changed Dockerfile * added docker-compose file and compose dir to hold Dockerfile and start scripts; build fails during celery worker * docker-compose now builds * removed unecessary script checking that db is set up * django container now runs with docker compose and connects to db container * updated README to match changes made to database connection in settings.py * docker compose yaml now makes api container accessible on 8000 port * celery containers now run properly * added documentation for running project locally with docker containers * added hyperlink to documentation * added more documentation on how to connect to database; updated host port for db container * removed unused package * removed createsuperuser command --------- Co-authored-by: GitLukeW <[email protected]> Co-authored-by: Laura Andrews <[email protected]> Co-authored-by: Laura-D-Andrews <[email protected]> Co-authored-by: Nathan Zeager <[email protected]> * Password reset email url (#159) * Hotfix build celery code * Added DOMAIN and SITE_NAME to settings to get correct url for reset password email * Django container creates superuser if none exists and doesn't exit if… (#161) * Django container creates superuser if none exists and doesn't exit if an error is thrown * added documentation note about accessing admin UI --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Laura Andrews <[email protected]> Co-authored-by: Laura-D-Andrews <[email protected]> Co-authored-by: Nathan Zeager <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: James Andrews <[email protected]>
GitLukeW
added a commit
that referenced
this pull request
Oct 14, 2023
* Deploy 10/02/2023 (#150) * Deploy 09182023 (#143) (#144) * updated cors with staging (#136) (#138) (#139) * Sessionserializer (#141) * updated cors with staging (#136) (#138) * added mentor to session serializer --------- * fix(availability): fix overlapping error (#142) --------- Co-authored-by: Laura Andrews <[email protected]> Co-authored-by: Laura-D-Andrews <[email protected]> * Forgot password (#148) * Hotfix build celery code * Updated settings file to enable djoser password reset * chore(precommit): setup precommit (#149) * chore(precommit): setup precommit * chore(precommit): setup precommit * chore(precommit): setup precommit * chore(precommit): update readme * Create SECURITY.md --------- Co-authored-by: Laura Andrews <[email protected]> Co-authored-by: Laura-D-Andrews <[email protected]> Co-authored-by: Nathan Zeager <[email protected]> * Deploy 10142023 (#162) * Deploy 09182023 (#143) (#144) * updated cors with staging (#136) (#138) (#139) * Sessionserializer (#141) * updated cors with staging (#136) (#138) * added mentor to session serializer --------- * fix(availability): fix overlapping error (#142) --------- Co-authored-by: Laura Andrews <[email protected]> Co-authored-by: Laura-D-Andrews <[email protected]> * Forgot password (#148) * Hotfix build celery code * Updated settings file to enable djoser password reset * chore(precommit): setup precommit (#149) * chore(precommit): setup precommit * chore(precommit): setup precommit * chore(precommit): setup precommit * chore(precommit): update readme * Create SECURITY.md * feat(mentor): add team number to mentor model (#153) * Bump urllib3 from 1.26.16 to 1.26.17 (#151) Bumps [urllib3](https://github.com/urllib3/urllib3) from 1.26.16 to 1.26.17. - [Release notes](https://github.com/urllib3/urllib3/releases) - [Changelog](https://github.com/urllib3/urllib3/blob/main/CHANGES.rst) - [Commits](urllib3/urllib3@1.26.16...1.26.17) --- updated-dependencies: - dependency-name: urllib3 dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: GitLukeW <[email protected]> * Documentation update (#157) * Deploy 10/02/2023 (#150) * Deploy 09182023 (#143) (#144) * updated cors with staging (#136) (#138) (#139) * Sessionserializer (#141) * updated cors with staging (#136) (#138) * added mentor to session serializer --------- * fix(availability): fix overlapping error (#142) --------- Co-authored-by: Laura Andrews <[email protected]> Co-authored-by: Laura-D-Andrews <[email protected]> * Forgot password (#148) * Hotfix build celery code * Updated settings file to enable djoser password reset * chore(precommit): setup precommit (#149) * chore(precommit): setup precommit * chore(precommit): setup precommit * chore(precommit): setup precommit * chore(precommit): update readme * Create SECURITY.md --------- Co-authored-by: Laura Andrews <[email protected]> Co-authored-by: Laura-D-Andrews <[email protected]> Co-authored-by: Nathan Zeager <[email protected]> * corrected markdown error with Sessions endpoint; added note to Create User endpoint about username being saved as lowercase; formatted JSON code blocks to have proper syntax highlighting * forgot about Logout correction --------- Co-authored-by: GitLukeW <[email protected]> Co-authored-by: Laura Andrews <[email protected]> Co-authored-by: Laura-D-Andrews <[email protected]> Co-authored-by: Nathan Zeager <[email protected]> * Dockerizing (#158) * Deploy 10/02/2023 (#150) * Deploy 09182023 (#143) (#144) * updated cors with staging (#136) (#138) (#139) * Sessionserializer (#141) * updated cors with staging (#136) (#138) * added mentor to session serializer --------- * fix(availability): fix overlapping error (#142) --------- Co-authored-by: Laura Andrews <[email protected]> Co-authored-by: Laura-D-Andrews <[email protected]> * Forgot password (#148) * Hotfix build celery code * Updated settings file to enable djoser password reset * chore(precommit): setup precommit (#149) * chore(precommit): setup precommit * chore(precommit): setup precommit * chore(precommit): setup precommit * chore(precommit): update readme * Create SECURITY.md --------- Co-authored-by: Laura Andrews <[email protected]> Co-authored-by: Laura-D-Andrews <[email protected]> Co-authored-by: Nathan Zeager <[email protected]> * added drf-spectacular to pipfile and generated schema.yml * nitpicking styling * adjusted schema example in models.py * updated SessionSerialiazer example and added AvailabilitySerializer examples * added more serializer examples * updated Pipfile.lock * added requirements.txt from Pipfile * tried dockerizing backend; error while installing cffi * requirements are installed correctly when image is built; build now fails on useradd command * updated pipfile and requirements.txt * changed Dockerfile * added docker-compose file and compose dir to hold Dockerfile and start scripts; build fails during celery worker * docker-compose now builds * removed unecessary script checking that db is set up * django container now runs with docker compose and connects to db container * updated README to match changes made to database connection in settings.py * docker compose yaml now makes api container accessible on 8000 port * celery containers now run properly * added documentation for running project locally with docker containers * added hyperlink to documentation * added more documentation on how to connect to database; updated host port for db container * removed unused package * removed createsuperuser command --------- Co-authored-by: GitLukeW <[email protected]> Co-authored-by: Laura Andrews <[email protected]> Co-authored-by: Laura-D-Andrews <[email protected]> Co-authored-by: Nathan Zeager <[email protected]> * Password reset email url (#159) * Hotfix build celery code * Added DOMAIN and SITE_NAME to settings to get correct url for reset password email * Django container creates superuser if none exists and doesn't exit if… (#161) * Django container creates superuser if none exists and doesn't exit if an error is thrown * added documentation note about accessing admin UI --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Laura Andrews <[email protected]> Co-authored-by: Laura-D-Andrews <[email protected]> Co-authored-by: Nathan Zeager <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: James Andrews <[email protected]> --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Laura Andrews <[email protected]> Co-authored-by: Laura-D-Andrews <[email protected]> Co-authored-by: Nathan Zeager <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: James Andrews <[email protected]>
GitLukeW
added a commit
that referenced
this pull request
Oct 14, 2023
* Update staging (#163) * Deploy 10/02/2023 (#150) * Deploy 09182023 (#143) (#144) * updated cors with staging (#136) (#138) (#139) * Sessionserializer (#141) * updated cors with staging (#136) (#138) * added mentor to session serializer --------- * fix(availability): fix overlapping error (#142) --------- Co-authored-by: Laura Andrews <[email protected]> Co-authored-by: Laura-D-Andrews <[email protected]> * Forgot password (#148) * Hotfix build celery code * Updated settings file to enable djoser password reset * chore(precommit): setup precommit (#149) * chore(precommit): setup precommit * chore(precommit): setup precommit * chore(precommit): setup precommit * chore(precommit): update readme * Create SECURITY.md --------- Co-authored-by: Laura Andrews <[email protected]> Co-authored-by: Laura-D-Andrews <[email protected]> Co-authored-by: Nathan Zeager <[email protected]> * Deploy 10142023 (#162) * Deploy 09182023 (#143) (#144) * updated cors with staging (#136) (#138) (#139) * Sessionserializer (#141) * updated cors with staging (#136) (#138) * added mentor to session serializer --------- * fix(availability): fix overlapping error (#142) --------- Co-authored-by: Laura Andrews <[email protected]> Co-authored-by: Laura-D-Andrews <[email protected]> * Forgot password (#148) * Hotfix build celery code * Updated settings file to enable djoser password reset * chore(precommit): setup precommit (#149) * chore(precommit): setup precommit * chore(precommit): setup precommit * chore(precommit): setup precommit * chore(precommit): update readme * Create SECURITY.md * feat(mentor): add team number to mentor model (#153) * Bump urllib3 from 1.26.16 to 1.26.17 (#151) Bumps [urllib3](https://github.com/urllib3/urllib3) from 1.26.16 to 1.26.17. - [Release notes](https://github.com/urllib3/urllib3/releases) - [Changelog](https://github.com/urllib3/urllib3/blob/main/CHANGES.rst) - [Commits](urllib3/urllib3@1.26.16...1.26.17) --- updated-dependencies: - dependency-name: urllib3 dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: GitLukeW <[email protected]> * Documentation update (#157) * Deploy 10/02/2023 (#150) * Deploy 09182023 (#143) (#144) * updated cors with staging (#136) (#138) (#139) * Sessionserializer (#141) * updated cors with staging (#136) (#138) * added mentor to session serializer --------- * fix(availability): fix overlapping error (#142) --------- Co-authored-by: Laura Andrews <[email protected]> Co-authored-by: Laura-D-Andrews <[email protected]> * Forgot password (#148) * Hotfix build celery code * Updated settings file to enable djoser password reset * chore(precommit): setup precommit (#149) * chore(precommit): setup precommit * chore(precommit): setup precommit * chore(precommit): setup precommit * chore(precommit): update readme * Create SECURITY.md --------- Co-authored-by: Laura Andrews <[email protected]> Co-authored-by: Laura-D-Andrews <[email protected]> Co-authored-by: Nathan Zeager <[email protected]> * corrected markdown error with Sessions endpoint; added note to Create User endpoint about username being saved as lowercase; formatted JSON code blocks to have proper syntax highlighting * forgot about Logout correction --------- Co-authored-by: GitLukeW <[email protected]> Co-authored-by: Laura Andrews <[email protected]> Co-authored-by: Laura-D-Andrews <[email protected]> Co-authored-by: Nathan Zeager <[email protected]> * Dockerizing (#158) * Deploy 10/02/2023 (#150) * Deploy 09182023 (#143) (#144) * updated cors with staging (#136) (#138) (#139) * Sessionserializer (#141) * updated cors with staging (#136) (#138) * added mentor to session serializer --------- * fix(availability): fix overlapping error (#142) --------- Co-authored-by: Laura Andrews <[email protected]> Co-authored-by: Laura-D-Andrews <[email protected]> * Forgot password (#148) * Hotfix build celery code * Updated settings file to enable djoser password reset * chore(precommit): setup precommit (#149) * chore(precommit): setup precommit * chore(precommit): setup precommit * chore(precommit): setup precommit * chore(precommit): update readme * Create SECURITY.md --------- Co-authored-by: Laura Andrews <[email protected]> Co-authored-by: Laura-D-Andrews <[email protected]> Co-authored-by: Nathan Zeager <[email protected]> * added drf-spectacular to pipfile and generated schema.yml * nitpicking styling * adjusted schema example in models.py * updated SessionSerialiazer example and added AvailabilitySerializer examples * added more serializer examples * updated Pipfile.lock * added requirements.txt from Pipfile * tried dockerizing backend; error while installing cffi * requirements are installed correctly when image is built; build now fails on useradd command * updated pipfile and requirements.txt * changed Dockerfile * added docker-compose file and compose dir to hold Dockerfile and start scripts; build fails during celery worker * docker-compose now builds * removed unecessary script checking that db is set up * django container now runs with docker compose and connects to db container * updated README to match changes made to database connection in settings.py * docker compose yaml now makes api container accessible on 8000 port * celery containers now run properly * added documentation for running project locally with docker containers * added hyperlink to documentation * added more documentation on how to connect to database; updated host port for db container * removed unused package * removed createsuperuser command --------- Co-authored-by: GitLukeW <[email protected]> Co-authored-by: Laura Andrews <[email protected]> Co-authored-by: Laura-D-Andrews <[email protected]> Co-authored-by: Nathan Zeager <[email protected]> * Password reset email url (#159) * Hotfix build celery code * Added DOMAIN and SITE_NAME to settings to get correct url for reset password email * Django container creates superuser if none exists and doesn't exit if… (#161) * Django container creates superuser if none exists and doesn't exit if an error is thrown * added documentation note about accessing admin UI --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Laura Andrews <[email protected]> Co-authored-by: Laura-D-Andrews <[email protected]> Co-authored-by: Nathan Zeager <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: James Andrews <[email protected]> --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Laura Andrews <[email protected]> Co-authored-by: Laura-D-Andrews <[email protected]> Co-authored-by: Nathan Zeager <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: James Andrews <[email protected]> * fix(deploy): fixing deploy (#165) * Chore/issue 1/deploy (#166) * fix(deploy): fixing deploy * fix(deploy): fixing deploy --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Laura Andrews <[email protected]> Co-authored-by: Laura-D-Andrews <[email protected]> Co-authored-by: Nathan Zeager <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: James Andrews <[email protected]>
GitLukeW
added a commit
that referenced
this pull request
Oct 31, 2023
* Update staging (#163) * Deploy 10/02/2023 (#150) * Deploy 09182023 (#143) (#144) * updated cors with staging (#136) (#138) (#139) * Sessionserializer (#141) * updated cors with staging (#136) (#138) * added mentor to session serializer --------- * fix(availability): fix overlapping error (#142) --------- Co-authored-by: Laura Andrews <[email protected]> Co-authored-by: Laura-D-Andrews <[email protected]> * Forgot password (#148) * Hotfix build celery code * Updated settings file to enable djoser password reset * chore(precommit): setup precommit (#149) * chore(precommit): setup precommit * chore(precommit): setup precommit * chore(precommit): setup precommit * chore(precommit): update readme * Create SECURITY.md --------- Co-authored-by: Laura Andrews <[email protected]> Co-authored-by: Laura-D-Andrews <[email protected]> Co-authored-by: Nathan Zeager <[email protected]> * Deploy 10142023 (#162) * Deploy 09182023 (#143) (#144) * updated cors with staging (#136) (#138) (#139) * Sessionserializer (#141) * updated cors with staging (#136) (#138) * added mentor to session serializer --------- * fix(availability): fix overlapping error (#142) --------- Co-authored-by: Laura Andrews <[email protected]> Co-authored-by: Laura-D-Andrews <[email protected]> * Forgot password (#148) * Hotfix build celery code * Updated settings file to enable djoser password reset * chore(precommit): setup precommit (#149) * chore(precommit): setup precommit * chore(precommit): setup precommit * chore(precommit): setup precommit * chore(precommit): update readme * Create SECURITY.md * feat(mentor): add team number to mentor model (#153) * Bump urllib3 from 1.26.16 to 1.26.17 (#151) Bumps [urllib3](https://github.com/urllib3/urllib3) from 1.26.16 to 1.26.17. - [Release notes](https://github.com/urllib3/urllib3/releases) - [Changelog](https://github.com/urllib3/urllib3/blob/main/CHANGES.rst) - [Commits](urllib3/urllib3@1.26.16...1.26.17) --- updated-dependencies: - dependency-name: urllib3 dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: GitLukeW <[email protected]> * Documentation update (#157) * Deploy 10/02/2023 (#150) * Deploy 09182023 (#143) (#144) * updated cors with staging (#136) (#138) (#139) * Sessionserializer (#141) * updated cors with staging (#136) (#138) * added mentor to session serializer --------- * fix(availability): fix overlapping error (#142) --------- Co-authored-by: Laura Andrews <[email protected]> Co-authored-by: Laura-D-Andrews <[email protected]> * Forgot password (#148) * Hotfix build celery code * Updated settings file to enable djoser password reset * chore(precommit): setup precommit (#149) * chore(precommit): setup precommit * chore(precommit): setup precommit * chore(precommit): setup precommit * chore(precommit): update readme * Create SECURITY.md --------- Co-authored-by: Laura Andrews <[email protected]> Co-authored-by: Laura-D-Andrews <[email protected]> Co-authored-by: Nathan Zeager <[email protected]> * corrected markdown error with Sessions endpoint; added note to Create User endpoint about username being saved as lowercase; formatted JSON code blocks to have proper syntax highlighting * forgot about Logout correction --------- Co-authored-by: GitLukeW <[email protected]> Co-authored-by: Laura Andrews <[email protected]> Co-authored-by: Laura-D-Andrews <[email protected]> Co-authored-by: Nathan Zeager <[email protected]> * Dockerizing (#158) * Deploy 10/02/2023 (#150) * Deploy 09182023 (#143) (#144) * updated cors with staging (#136) (#138) (#139) * Sessionserializer (#141) * updated cors with staging (#136) (#138) * added mentor to session serializer --------- * fix(availability): fix overlapping error (#142) --------- Co-authored-by: Laura Andrews <[email protected]> Co-authored-by: Laura-D-Andrews <[email protected]> * Forgot password (#148) * Hotfix build celery code * Updated settings file to enable djoser password reset * chore(precommit): setup precommit (#149) * chore(precommit): setup precommit * chore(precommit): setup precommit * chore(precommit): setup precommit * chore(precommit): update readme * Create SECURITY.md --------- Co-authored-by: Laura Andrews <[email protected]> Co-authored-by: Laura-D-Andrews <[email protected]> Co-authored-by: Nathan Zeager <[email protected]> * added drf-spectacular to pipfile and generated schema.yml * nitpicking styling * adjusted schema example in models.py * updated SessionSerialiazer example and added AvailabilitySerializer examples * added more serializer examples * updated Pipfile.lock * added requirements.txt from Pipfile * tried dockerizing backend; error while installing cffi * requirements are installed correctly when image is built; build now fails on useradd command * updated pipfile and requirements.txt * changed Dockerfile * added docker-compose file and compose dir to hold Dockerfile and start scripts; build fails during celery worker * docker-compose now builds * removed unecessary script checking that db is set up * django container now runs with docker compose and connects to db container * updated README to match changes made to database connection in settings.py * docker compose yaml now makes api container accessible on 8000 port * celery containers now run properly * added documentation for running project locally with docker containers * added hyperlink to documentation * added more documentation on how to connect to database; updated host port for db container * removed unused package * removed createsuperuser command --------- Co-authored-by: GitLukeW <[email protected]> Co-authored-by: Laura Andrews <[email protected]> Co-authored-by: Laura-D-Andrews <[email protected]> Co-authored-by: Nathan Zeager <[email protected]> * Password reset email url (#159) * Hotfix build celery code * Added DOMAIN and SITE_NAME to settings to get correct url for reset password email * Django container creates superuser if none exists and doesn't exit if… (#161) * Django container creates superuser if none exists and doesn't exit if an error is thrown * added documentation note about accessing admin UI --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Laura Andrews <[email protected]> Co-authored-by: Laura-D-Andrews <[email protected]> Co-authored-by: Nathan Zeager <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: James Andrews <[email protected]> --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Laura Andrews <[email protected]> Co-authored-by: Laura-D-Andrews <[email protected]> Co-authored-by: Nathan Zeager <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: James Andrews <[email protected]> * fix(deploy): fixing deploy (#165) * Chore/issue 1/deploy (#166) * fix(deploy): fixing deploy * fix(deploy): fixing deploy * Docker containers now use DATABASE_URL env variable (#168) * updating Mentor info docs updated; added new note about changing files in Docker docs (#164) Co-authored-by: GitLukeW <[email protected]> * docs(linting): adds instructions for flake8 (#170) * docs(linting): adds instructions for flake8 * docs(linting): wrap flake8 in bash * feat(availability): saves in 30 min chunks (#152) * Deploy 10/02/2023 (#150) * Deploy 09182023 (#143) (#144) * updated cors with staging (#136) (#138) (#139) * Sessionserializer (#141) * updated cors with staging (#136) (#138) * added mentor to session serializer --------- * fix(availability): fix overlapping error (#142) --------- Co-authored-by: Laura Andrews <[email protected]> Co-authored-by: Laura-D-Andrews <[email protected]> * Forgot password (#148) * Hotfix build celery code * Updated settings file to enable djoser password reset * chore(precommit): setup precommit (#149) * chore(precommit): setup precommit * chore(precommit): setup precommit * chore(precommit): setup precommit * chore(precommit): update readme * Create SECURITY.md --------- Co-authored-by: Laura Andrews <[email protected]> Co-authored-by: Laura-D-Andrews <[email protected]> Co-authored-by: Nathan Zeager <[email protected]> * feat(availability): adds status field to model * feat(availability): unique constraint error message clearer * refactor(availability): breaks up 30 mins chunks in serializer * refactor(availability): restores original serializer renames new serializer * refactor(availability): restores original endpoint * chore(urls): updates availability-v2 url for clarity * test(serializer): coverage for availability v2 * test(view): coverage for availability v2 * test(view): coverage for availability delete * chore(linting): clean ups errors * chore(model): availability status updated to confirmed * test(serializer): availability test clean up * chore(urls): clean up spacing * chore(migrations): updating migrations with merge * docs(availability): add new create availability endpoint * docs(availability): updates response to current functionality * docs(user login): update with lowercase username instructions * chore(availability): add note to update to namespace * feat(models): adds modified_at and created_at fields to availability and sessions * chore: add new serializer and view to inits * feat(admin): adds readonly fields of created_at and modified_at * refactor(availability): rework serializer to bulk_create * refactor(availabilities): rework views to create 30 min chunks * chore(linting): cleans up code * chore: remove comment * feat: adds helper functions file * feat: availabilities validating and saving correctly * chore: realign urls * tests: update tests * test(availabilitiy): adds test coverage for serializers. * chore: cleans up linting * refractor(availability): uses header versioning best practices * docs(availability): updates for v2 * chore: cleans up comments * chore: removes v1 versioning comment * test(availability): rework tests to pass * refactor(availabilities): changes from code review * chore: removes parentheses * chore: adds todo * chore(availabilities): remove else statement * feat(availabilities): only returns 30 min chunks in time range * test(helpers): adds coverage to 100% * fix(availability): updates error handling to return consistent error messaging * test(errors): updates tests with new error handling --------- Co-authored-by: GitLukeW <[email protected]> Co-authored-by: Laura Andrews <[email protected]> Co-authored-by: Laura-D-Andrews <[email protected]> Co-authored-by: Nathan Zeager <[email protected]> * feat(media): media files upload locally when debug is true (#173) Co-authored-by: GitLukeW <[email protected]> * fix(gitignore): removes requirements.txt file from project (#174) * fix(requirements): cleans up ignored files * docs(requirements): clarifies instructional language --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Laura Andrews <[email protected]> Co-authored-by: Laura-D-Andrews <[email protected]> Co-authored-by: Nathan Zeager <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: James Andrews <[email protected]> Co-authored-by: Peri Sparr <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Pull Request Template
1. Targeted Issue
The password reset email was using the back end https://team-production-system.onrender.com base url instead of the front end one.
Ticket #143
2. Overview of Solution
I added DOMAIN and SITE_NAME values in settings.py.
3. Tools Used
n/a
4. Testing Strategy
I used insomnia to trigger an email and make sure it was using the correct url.
5. Future Implications
The email I'm using gives a url with http instead of https, so I want to check whether it uses https on production.
The password reset email will always work for production, so if someone wants to reset their local/staging password they will have to modify the url to point there.
6. Screenshots
7. Code Reviewers
n/a