Django Channels + React along with API translation#46
Merged
AvaisP merged 39 commits intodjango-reactfrom Jul 6, 2017
Merged
Conversation
…igami into socket-translate-api
deshraj
requested changes
Jul 3, 2017
| let socket = this.socket; | ||
| socket.send( | ||
| JSON.stringify({ | ||
| event: "fetchcurrentport" |
Member
There was a problem hiding this comment.
Can we change fetchcurrentport to fetchCurrentPort? Basically please follow the camel casing.
README.md
Outdated
| @@ -0,0 +1,52 @@ | |||
| # Origami Webapp | |||
Member
There was a problem hiding this comment.
Let's change it to Origami only.
README.md
Outdated
| [](https://github.com/prettier/prettier) | ||
|
|
||
|
|
||
| ## Development Setup instructions |
Member
There was a problem hiding this comment.
Replace with ## Development setup instructions
README.md
Outdated
|
|
||
| **This application requires node v5+ and Python 2.7/3.4+** | ||
|
|
||
| ### Create a Virtual Environment: |
Member
There was a problem hiding this comment.
Replace with ### Create a Virtual Environment
api/consumers.py
Outdated
|
|
||
|
|
||
| def ws_disconnect(message): | ||
| print (message.content) |
Member
There was a problem hiding this comment.
Can you please remove the debug statement here?
| demo = Demo.objects.get(id=demo_id) | ||
| base_comp_id = body["baseComponentId"] | ||
| props = [] | ||
| for prop in body["props"]: |
Member
There was a problem hiding this comment.
Use serializers to serialize the data.
api/views.py
Outdated
| try: | ||
| component = model.objects.get(userid=userid, demo=demo) | ||
| except Exception as e: | ||
| return JsonResponse({}) |
Member
There was a problem hiding this comment.
Please send a json to frontend instead of blank dict.
api/views.py
Outdated
| coverImage=coverImage, terminal=terminal, timestamp=timestamp, | ||
| token=token, status=status) | ||
| serialize = DemoSerializer(demo) | ||
| return JsonResponse(serialize.data) |
api/views.py
Outdated
| demo.footerMessage = body["footerMessage"] | ||
| demo.coverImage = body["coverImage"] | ||
| demo.terminal = body["terminal"] | ||
| #demo.timestamp = body["timestamp"] |
api/views.py
Outdated
| return HttpResponse("Invalid URL") | ||
|
|
||
|
|
||
| def getpermalink(request, shorturl): |
deshraj
requested changes
Jul 5, 2017
| tmp.save() | ||
| acc.user = tmp | ||
| acc.save() | ||
| return HttpResponseRedirect('/login?status=passed&token=' + token.token + '&username=' + tmp.username + '&user_id=' + str(tmp.id)) |
Member
There was a problem hiding this comment.
Instead of hardcoding the URL like /login, can we use the name of the URL here using reverse()?
django_server/routing.py
Outdated
| channel_routing = [ | ||
| route("websocket.connect", ws_connect), | ||
| route("websocket.receive", ws_message), | ||
| ] No newline at end of file |
deshraj
approved these changes
Jul 6, 2017
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
No description provided.