Skip to content

Commit 6d6ced6

Browse files
committed
add path /api/username/ to api, delete signup_failed.html and signup_success.html
1 parent 91f3839 commit 6d6ced6

File tree

5 files changed

+28
-33
lines changed

5 files changed

+28
-33
lines changed

README.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,15 @@ Do każdego połączenia z serwerem należy dołączyć do adresu zmienną Beare
106106

107107
> curl -X POST -d '{"email": "[email protected]","password": "maslotoniehaslo"}' -H 'Content-Type: application/json' http://127.0.0.1:8000/auth/jwt/create
108108
109+
### Nazwa użytkownika
110+
### /api/username/
111+
###### Uprawnienia: Każdy
112+
| Metoda HTTP | Content-Type | Opis wejścia | Przykład wejścia | Akcja |
113+
| ----------- | ---------------- | ------------ | ---------------- | ------------------------------------------------------------------------------------------- |
114+
| GET | application/json | | | Zwraca nazwę zalogowanego użytkownika |
115+
116+
> curl -X GET http://127.0.0.1:8000/api/username/
117+
109118
### Pobierz klucze api danego użytkownika
110119
### /api/eventkeys/
111120
###### Uprawnienia: Zalogowani

backend/templates/registration/signup_failed.html

Lines changed: 0 additions & 15 deletions
This file was deleted.

backend/templates/registration/signup_success.html

Lines changed: 0 additions & 15 deletions
This file was deleted.

backend/urls.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
app_name = 'backend' # przestrzeń nazw aplikacji
77
urlpatterns = [
8+
path('username/', views.username),
89
path('events/', views.EventListAPI.as_view()),
910
path('events/<int:id>/', views.EventDetailsAPI.as_view()),
1011
path('eventkeys/', views.EventKeys.as_view()),

backend/views.py

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
from django.shortcuts import render
1414
from django.utils.datastructures import MultiValueDictKeyError
1515
from django_filters.rest_framework import DjangoFilterBackend
16+
from django.http import JsonResponse
1617
from rest_framework import status, generics, filters
1718
from rest_framework.decorators import api_view, permission_classes
1819
from rest_framework.permissions import IsAdminUser
@@ -331,7 +332,7 @@ def add_event(request):
331332
post_code = request.POST.get('post_code', None)
332333
street_address = request.POST.get('street_address', None)
333334
country = request.POST.get('country', 'Poland')
334-
event_date = request.POST.get('event_date', '')+'T'+request.POST.get('event_time','')
335+
event_date = request.POST.get('event_date', '') + 'T' + request.POST.get('event_time', '')
335336
if len(uploaded_file_url) > 0:
336337
try:
337338
Event(
@@ -379,8 +380,9 @@ def add_ticket_type(request, event_id):
379380
return e404(request)
380381
if request.POST:
381382
ticket_name = request.POST.get('ticket_name', None)
382-
start_of_selling = request.POST.get('start_of_selling_date', '')+'T'+request.POST.get('start_of_selling_time','')
383-
end_of_selling = request.POST.get('end_of_selling_date', '')+'T'+request.POST.get('end_of_selling_time','')
383+
start_of_selling = request.POST.get('start_of_selling_date', '') + 'T' + request.POST.get(
384+
'start_of_selling_time', '')
385+
end_of_selling = request.POST.get('end_of_selling_date', '') + 'T' + request.POST.get('end_of_selling_time', '')
384386
price = float(request.POST.get('price', None))
385387
available_amount = int(request.POST.get('available_amount', None))
386388
max_per_client = int(request.POST.get('max_per_client', None))
@@ -408,3 +410,16 @@ def add_ticket_type(request, event_id):
408410
else:
409411
return render(request, 'backend/add_ticket_type.html',
410412
{'event': event})
413+
414+
415+
def username(request):
416+
if request.user.is_authenticated:
417+
data = {
418+
'name': request.user.name,
419+
'username': request.user.username
420+
}
421+
else:
422+
data = {
423+
'error': 'Nie zalogowales sie'
424+
}
425+
return JsonResponse(data)

0 commit comments

Comments
 (0)