Skip to content

Issues 30 31 file reorg part 2 #89

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 8 commits into from
Feb 26, 2020
Merged

Issues 30 31 file reorg part 2 #89

merged 8 commits into from
Feb 26, 2020

Conversation

brylie
Copy link
Member

@brylie brylie commented Feb 24, 2020 •
edited
Loading

Here are a few additions to the PR by @lpatmo

Note: this pull request is based on @lpatmo's branch, so changes in this PR will go into that branch :-)

@brylie brylie requested review from billglover and lpatmo February 24, 2020 09:39
@brylie brylie mentioned this pull request Feb 24, 2020
Closed
@lpatmo
Copy link
Member

lpatmo commented Feb 24, 2020

@brylie Thank you!!

Another issue, unfortunately:

1/ I checked out this branch

2/ When I run docker-compose up --build, I see this error:

image

3/ I opened up my project files and saw that there seems to be an extra cbv3_django_prototype folder next to the projects folder you created:

image

billglover
billglover reviewed Feb 25, 2020
View reviewed changes
docker-compose.yaml Outdated
command: >
sh -c "python /opt/cbv3_django_prototype/manage.py migrate &&
uwsgi --ini /opt/cbv3_django_prototype/uwsgi.ini"
sh -c "python /opt/project/manage.py migrate &&
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks like it should reference /opt/codebuddies/....

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch, thanks!

@brylie
Copy link
Member Author

brylie commented Feb 25, 2020

I opened up my project files and saw that there seems to be an extra cbv3_django_prototype folder next to the projects folder you created

@lpatmo try opening my branch in a clean clone of the repo. There may be some files remaining when switching branches.

@lpatmo
Copy link
Member

lpatmo commented Feb 25, 2020

Will do!

Update: I deleted backend, did a git clone of the repo again, and then checked out the issues-30-31-file-reorg-part-2 branch.

Ran docker-compose up --build and saw the following:

image

This is confusing because I know ./project/manage.py exists!

Lindas-MacBook-Pro-2:backend lpnotes$ find . -name "manage.py"
./project/manage.py

This is what I see in docker-compose.yaml when I have the codebase open:

image

Sorry for the back and forth; not sure what is wrong. :/

@brylie
Copy link
Member Author

brylie commented Feb 25, 2020

The command should be located in /opt/codebuddies/manage.py. I think I updated the Dockerfile, but may have overlooked some places where it is using /opt/project instead of /opt/codebuddies. Make sure you are using the latest commits from this branch as well.

@lpatmo
Copy link
Member

lpatmo commented Feb 26, 2020

IT WORKS!!!

Scarily, the first time I tried -- I git pulled and docker-compose down and docker-compose rm and docker compose up --build -- was still seeing the errors.

So I blew away the folder and re-cloned the repo, but then checking out this branch and docker-compose up --build was fine.

Only issue seems to be these missing static files, but they can be added easily:

image

Going to merge this and run this on the other branch, and hope a git pull will suffice vs. having to delete and re-clone the repo 🤞

@lpatmo
Copy link
Member

lpatmo commented Feb 26, 2020

Thanks again for helping with this!

@lpatmo lpatmo merged commit 4fb5c79 into issues-30-31-file-reorg Feb 26, 2020
@billglover billglover deleted the issues-30-31-file-reorg-part-2 branch February 26, 2020 08:23
lpatmo added a commit that referenced this pull request Mar 7, 2020
@lpatmo @brylie
Folder restructuring - #30 and #31 (#99)
c6dd158 
* Move project files like LICENSE into repository root and delete extraneous files

* Remove docs folder

* Move django apps to repository root

* Moved django apps to project root

* Issues 30 31 file reorg part 2 (#89)

* Rename project folder

* Change cbv3_django_prototype references to project

* Rename 'core' directory

* Change references to users app

* Change references to 'core' directory

* Change project name to "Codebuddies"

* Change path to /opt/codebuddies

* Fix project path

Co-authored-by: Linda Peng <lpnotes@Lindas-MacBook-Pro-2.local>
Co-authored-by: Brylie Christopher Oxley <brylie@amble.fi>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@billglover billglover billglover left review comments

@lpatmo lpatmo lpatmo approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@brylie @lpatmo @billglover