Skip to content

Commit

Permalink
jetzt aber
Browse files Browse the repository at this point in the history
  • Loading branch information
station committed Jul 25, 2016
1 parent a75809d commit 178c8de
Show file tree
Hide file tree
Showing 25 changed files with 19 additions and 7 deletions.
15 changes: 12 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
db.sqlite3
*.pyc
*/*migrations
# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]

# C extensions
*.so

#django sqlite
*.sqlite
*.db
*.sqlite3
*.db3
Binary file removed db.sqlite3
Binary file not shown.
Binary file removed frontend/__init__.pyc
Binary file not shown.
Binary file removed frontend/admin.pyc
Binary file not shown.
Binary file removed frontend/migrations/0001_initial.pyc
Binary file not shown.
Binary file removed frontend/migrations/0002_connection_port.pyc
Binary file not shown.
Binary file removed frontend/migrations/0003_auto_20160723_2157.pyc
Binary file not shown.
Binary file removed frontend/migrations/0004_auto_20160723_2212.pyc
Binary file not shown.
Binary file removed frontend/migrations/0005_auto_20160723_2311.pyc
Binary file not shown.
Binary file removed frontend/migrations/0006_auto_20160723_2314.pyc
Binary file not shown.
Binary file removed frontend/migrations/0007_auto_20160723_2316.pyc
Binary file not shown.
Binary file removed frontend/migrations/0008_auto_20160723_2318.pyc
Binary file not shown.
Binary file removed frontend/migrations/0009_auto_20160723_2322.pyc
Binary file not shown.
Binary file removed frontend/migrations/0010_auto_20160723_2330.pyc
Binary file not shown.
Binary file removed frontend/migrations/0011_auto_20160724_0043.pyc
Binary file not shown.
Binary file removed frontend/migrations/0012_profile_loc_longitude.pyc
Binary file not shown.
Binary file removed frontend/migrations/__init__.pyc
Binary file not shown.
Binary file removed frontend/models.pyc
Binary file not shown.
8 changes: 5 additions & 3 deletions frontend/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
from django.shortcuts import redirect

from django.http import HttpResponseRedirect, Http404


from django.utils.decorators import method_decorator
from django.views.decorators.csrf import csrf_exempt
# Models
from .models import Profile, InventoryItem, Pokemon, PokeData, ItemData, Statistics, Connection

Expand All @@ -30,11 +30,13 @@ def get(self, request, *args, **kwargs):

return render(request, 'overview.html', {'profile_list': profile_list})

@method_decorator(csrf_exempt, name='dispatch')
class SendConfig(View):

def post(self, request, *args, **kwargs):
# get auth toiken from post

if not token in request.POST:
if not 'token' in request.POST:
data = {'status': 2}
return HttpResponse(json.dumps(data))
token = request.POST.get('token')
Expand Down
Binary file removed frontend/views.pyc
Binary file not shown.
Binary file removed pokefront/__init__.pyc
Binary file not shown.
Binary file removed pokefront/settings.pyc
Binary file not shown.
3 changes: 2 additions & 1 deletion pokefront/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"""
from django.conf.urls import url
from django.contrib import admin
from frontend.views import PokeList, Sync, Filldata, ReleasePoke, EvolvePoke, Overview
from frontend.views import PokeList, Sync, Filldata, ReleasePoke, EvolvePoke, Overview, SendConfig



Expand All @@ -27,4 +27,5 @@
url(r'release/(?:(?P<account_id>\d+)/(?:(?P<poke_id>\d+)/))?$', ReleasePoke.as_view(), name='release'),
url(r'evolve/(?:(?P<account_id>\d+)/(?:(?P<poke_id>\d+)/))?$', EvolvePoke.as_view(), name='evolve'),
url(r'fill/$', Filldata.as_view(), name='fill'),
url(r'get_config/$', SendConfig.as_view(), name='send_config'),
]
Binary file removed pokefront/urls.pyc
Binary file not shown.
Binary file removed pokefront/wsgi.pyc
Binary file not shown.

0 comments on commit 178c8de

Please sign in to comment.