Skip to content
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

Chore/issue 1/deploy 10142023 #167

Merged
merged 4 commits into from
Oct 14, 2023
Merged

Chore/issue 1/deploy 10142023 #167

merged 4 commits into from
Oct 14, 2023

Conversation

GitLukeW
Copy link
Contributor

Pull Request Template

1. Targeted Issue

(The first step to a good solution is knowing the problem. Please link the issue here.)

Issue #... or
Ticket #...

2. Overview of Solution

(You've put in the hard work, now's your chance to tell us about it. What's your solution in a nutshell?)

3. Tools Used

(Share the tools, libraries, or techniques you've used in your solution.)

4. Testing Strategy

(No code is complete without tests. Outline what you've tested and how.)

5. Future Implications

(Let's anticipate potential effects of your changes. Are there any potential issues down the line?)

6. Screenshots

(A picture is worth a thousand words. Include screenshots of your changes if relevant.)

7. Code Reviewers

(Who else is in the loop? Mention your team or other contributors here.)


Before you go...

  • I have linked the relevant issue
  • I have provided an overview of my solution
  • I have shared the tools I've used
  • I have outlined my testing strategy
  • I have considered future implications of my changes
  • I have included relevant screenshots
  • I have kept my team in the loop

Big high-fives for your incredible pull request! We're thrilled to have you as a contributor! Our team will dig into your proposed changes and give you some feedback or merge them if they're good to go. Your contributions mean the world to us!

GitLukeW and others added 4 commits October 14, 2023 12:46
* 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

* fix(deploy): fixing deploy
@GitLukeW GitLukeW merged commit 0804faf into main Oct 14, 2023
@GitLukeW GitLukeW deleted the chore/issue-1/deploy-10142023 branch October 14, 2023 21:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant