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

Implemented basic stuff #1

Merged
merged 20 commits into from
May 31, 2020
Merged

Implemented basic stuff #1

merged 20 commits into from
May 31, 2020

Conversation

95ych
Copy link

@95ych 95ych commented May 22, 2020

built basic backend

@fireballpoint1
Copy link
Collaborator

@95ych you will need to update the PR to the develop branch and inside the src/ directory

@95ych 95ych changed the base branch from master to develop May 26, 2020 14:39
@95ych
Copy link
Author

95ych commented May 26, 2020

should i keep the bin/ and lib/ (virtual env stuff) outside the src/ or keep everything related inside src/
@fireballpoint1

@fireballpoint1
Copy link
Collaborator

@95ych everything for django should be inside src folder

@fireballpoint1
Copy link
Collaborator

Also, you need to pull develop and resolve all conflicts.

@fireballpoint1 fireballpoint1 requested review from jiviteshjain and a user May 28, 2020 08:43
@fireballpoint1
Copy link
Collaborator

@95ych i don't see the virtual env files or a make file here

@95ych
Copy link
Author

95ych commented May 28, 2020

@fireballpoint1
Missing parts added

@fireballpoint1
Copy link
Collaborator

@95ych Your instructions to run the django server are imcomplete. Please write them in a way that even a first time user of django can run the project .

@fireballpoint1 fireballpoint1 self-requested a review May 31, 2020 12:58
@fireballpoint1
Copy link
Collaborator

@95ych Approved. resolve conflicts and rebase and merge

@fireballpoint1 fireballpoint1 merged commit ce86679 into OSDG-IIITH:develop May 31, 2020
@fireballpoint1 fireballpoint1 linked an issue May 31, 2020 that may be closed by this pull request
fireballpoint1 added a commit that referenced this pull request Jun 26, 2020
* added fork instructions and started defining directory structure

* Implemented basic stuff (#1)

* move essentials into src

* update missing parts

* updated readme and makefile (#10)

* updated readme and makefile

* added .pyc files in gitignore

* initialising django rest framework

* predeciding whether to make react as another django app or as a stand alone SPA

* frontend and baackend running
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.

Setup basic django framework
2 participants