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.

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

Feature/login #9

Merged
merged 65 commits into from
Oct 25, 2019
Merged

Feature/login #9

merged 65 commits into from
Oct 25, 2019

Conversation

taehwoi
Copy link
Contributor

@taehwoi taehwoi commented Oct 25, 2019 •
edited
Loading

Sorry for the huge pull request.

These are the main changes in this branch.

  • Restructure directories (Divide backend and frontend)
  • Split large files (different reducers that serves different functions)
  • Combine Map to New Question Page
  • Link backend and frontend (finally!)

Please review them.

Minji1234 and others added 30 commits October 18, 2019 20:43
@Minji1234
sample front-end
f641518
@rachelg98
Add django backend
7dd5052
@Minji1234
Merge branch 'dev' of https://github.com/swsnu/swpp2019-team15 into q…
79fc200 
…uestion
@Minji1234
tmp
bfbe708
@rachelg98
Add models and admin in backend
5c2c224
@rachelg98
add Location model
e85f5c3
@rachelg98
change location field to float
7eaba65
@taehwoi
use center instead of DefaultCenter to allow map center modifcation
eee7ba2
@taehwoi
add location listener component
fabfbc0
@taehwoi
strip down unused actions for easier merging and testing
a4746bb
@taehwoi
add LocationListener actions
728ce71
@taehwoi
add haversine package to calculate distance between two coordinates
a8264a1
@taehwoi
strip down unused actions for easier merging and testing
401264c
@taehwoi
add LocationListener as component, and change map center upon current…
6882343 
… location update
@taehwoi
only move the map when there are no markers; once a marker exists, do…
e199d59 
… not change focus
@taehwoi
split reducers and merged branches
e61a476
@taehwoi
split actions
459eb24
@taehwoi
submit location upon clicking marker
9a664e6
@taehwoi
change name
c51e95d
@taehwoi
change names to cope with split reducers
324df9c
@taehwoi
change: articles -> questions
a156592
@taehwoi
add '/' to api url
5a87584
@taehwoi
restructure directories
fd25f24
@taehwoi
expose api urls
8f755f3
@taehwoi
location is not a mandatory key for users
1b02587
@taehwoi
add Location to admins page
76f4ad6
@taehwoi
add questions api
aca880e
@taehwoi
add question with mock author and location
8efc34b
@taehwoi
fix typo
81d63a8
@taehwoi
use get_or_create to create location of question
510db20
@rachelg98
Copy link
Contributor

Great job! Thank you.
Additionally, I think the redundant 'user/' path can be removed in the backend/oga/urls.py file.
Also since we can check the current logged-in user through the request object, the url pattern for Main page can be simplified to just ' ' and replace the path to views.index.

@taehwoi
Copy link
Contributor Author

taehwoi commented Oct 25, 2019

@rachelg98 Thanks for the comments.
Should I create a new pull request? or can that be done in a new branch?

@rachelg98
Copy link
Contributor

@taehioum I think the changes mentioned above don't affect functionality in a big way so we could merge it first and branch out to apply those changes.

Minji1234
Minji1234 reviewed Oct 25, 2019
View reviewed changes
Copy link
Contributor

@Minji1234 Minji1234 left a comment

Choose a reason for hiding this comment

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

Thank you for hard working. I commented for some lines.

oga/frontend/src/App.js Outdated Show resolved Hide resolved
oga/frontend/src/containers/Login/Login.js Outdated Show resolved Hide resolved
oga/frontend/src/containers/Login/Login.js Show resolved Hide resolved
oga/frontend/src/containers/Login/Login.js Show resolved Hide resolved
oga/frontend/src/containers/Login/Login.js Show resolved Hide resolved
oga/frontend/src/containers/QuestionList/QuestionList.js Outdated Show resolved Hide resolved
oga/frontend/src/store/actions/authActions.js Outdated Show resolved Hide resolved
oga/frontend/src/store/actions/questionActions.js Outdated Show resolved Hide resolved
oga/frontend/src/store/actions/questionActions.js Outdated Show resolved Hide resolved
oga/frontend/src/store/reducers/questionReducer.js Show resolved Hide resolved
Minji1234
Minji1234 reviewed Oct 25, 2019
View reviewed changes
Copy link
Contributor

@Minji1234 Minji1234 left a comment

Choose a reason for hiding this comment

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

Added comment

oga/frontend/src/App.js Show resolved Hide resolved
@taehwoi taehwoi mentioned this pull request Oct 25, 2019
Closed
@taehwoi
Copy link
Contributor Author

taehwoi commented Oct 25, 2019

I pushed the changes. Please review it.

@taehwoi taehwoi merged commit 5d495e4 into dev Oct 25, 2019
@taehwoi taehwoi mentioned this pull request Oct 25, 2019
Merged
@taehwoi taehwoi deleted the feature/login branch October 25, 2019 09:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Minji1234 Minji1234 Minji1234 left review comments

@rachelg98 rachelg98 rachelg98 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
@taehwoi @rachelg98 @Minji1234