Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
TDT4242 Spring 2021 – T17
tdt4242-T17
Commits
3d07781e
Commit
3d07781e
authored
Apr 15, 2021
by
Erlend Ydse
Browse files
Move top level urls to secfit app
parent
3ca5494e
Changes
4
Hide whitespace changes
Inline
Side-by-side
backend/secfit/secfit/urls.py
View file @
3d07781e
...
...
@@ -17,10 +17,18 @@ from django.conf import settings
from
django.conf.urls.static
import
static
from
django.contrib
import
admin
from
django.urls
import
include
,
path
from
rest_framework_simplejwt.views
import
TokenObtainPairView
,
TokenRefreshView
from
secfit
import
views
urlpatterns
=
[
path
(
"admin/"
,
admin
.
site
.
urls
),
path
(
""
,
include
(
"workouts.urls"
))
path
(
""
,
views
.
api_root
),
path
(
""
,
include
(
"workouts.urls"
)),
path
(
""
,
include
(
"users.urls"
)),
path
(
""
,
include
(
"comments.urls"
)),
path
(
"api/auth/"
,
include
(
"rest_framework.urls"
)),
path
(
"api/token/"
,
TokenObtainPairView
.
as_view
(),
name
=
"token_obtain_pair"
),
path
(
"api/token/refresh/"
,
TokenRefreshView
.
as_view
(),
name
=
"token_refresh"
),
]
urlpatterns
+=
static
(
settings
.
STATIC_URL
,
document_root
=
settings
.
STATIC_ROOT
)
...
...
backend/secfit/secfit/views.py
View file @
3d07781e
from
rest_framework.decorators
import
api_view
from
rest_framework.response
import
Response
from
rest_framework.reverse
import
reverse
@
api_view
([
"GET"
])
def
api_root
(
request
,
format
=
None
):
return
Response
(
{
"users"
:
reverse
(
"user-list"
,
request
=
request
,
format
=
format
),
"workouts"
:
reverse
(
"workout-list"
,
request
=
request
,
format
=
format
),
"exercises"
:
reverse
(
"exercise-list"
,
request
=
request
,
format
=
format
),
"exercise-instances"
:
reverse
(
"exercise-instance-list"
,
request
=
request
,
format
=
format
),
"workout-files"
:
reverse
(
"workout-file-list"
,
request
=
request
,
format
=
format
),
"comments"
:
reverse
(
"comment-list"
,
request
=
request
,
format
=
format
),
"likes"
:
reverse
(
"like-list"
,
request
=
request
,
format
=
format
),
}
)
backend/secfit/workouts/urls.py
View file @
3d07781e
...
...
@@ -7,7 +7,6 @@ from workouts import views
urlpatterns
=
format_suffix_patterns
(
[
path
(
""
,
views
.
api_root
),
path
(
"api/workouts/"
,
views
.
WorkoutList
.
as_view
(),
name
=
"workout-list"
),
path
(
"api/workouts/<int:pk>/"
,
...
...
@@ -40,10 +39,5 @@ urlpatterns = format_suffix_patterns(
views
.
WorkoutFileDetail
.
as_view
(),
name
=
"workoutfile-detail"
,
),
path
(
""
,
include
(
"users.urls"
)),
path
(
""
,
include
(
"comments.urls"
)),
path
(
"api/auth/"
,
include
(
"rest_framework.urls"
)),
path
(
"api/token/"
,
TokenObtainPairView
.
as_view
(),
name
=
"token_obtain_pair"
),
path
(
"api/token/refresh/"
,
TokenRefreshView
.
as_view
(),
name
=
"token_refresh"
),
]
)
backend/secfit/workouts/views.py
View file @
3d07781e
...
...
@@ -2,10 +2,7 @@
"""
from
django.db.models
import
Q
from
rest_framework
import
filters
,
generics
,
mixins
,
permissions
from
rest_framework.decorators
import
api_view
from
rest_framework.parsers
import
JSONParser
from
rest_framework.response
import
Response
from
rest_framework.reverse
import
reverse
from
workouts.mixins
import
CreateListModelMixin
from
workouts.models
import
Exercise
,
ExerciseInstance
,
Workout
,
WorkoutFile
...
...
@@ -19,25 +16,6 @@ from workouts.serializers import (ExerciseInstanceSerializer,
WorkoutSerializer
)
@
api_view
([
"GET"
])
def
api_root
(
request
,
format
=
None
):
return
Response
(
{
"users"
:
reverse
(
"user-list"
,
request
=
request
,
format
=
format
),
"workouts"
:
reverse
(
"workout-list"
,
request
=
request
,
format
=
format
),
"exercises"
:
reverse
(
"exercise-list"
,
request
=
request
,
format
=
format
),
"exercise-instances"
:
reverse
(
"exercise-instance-list"
,
request
=
request
,
format
=
format
),
"workout-files"
:
reverse
(
"workout-file-list"
,
request
=
request
,
format
=
format
),
"comments"
:
reverse
(
"comment-list"
,
request
=
request
,
format
=
format
),
"likes"
:
reverse
(
"like-list"
,
request
=
request
,
format
=
format
),
}
)
class
WorkoutList
(
mixins
.
ListModelMixin
,
mixins
.
CreateModelMixin
,
generics
.
GenericAPIView
):
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment