diff --git a/__pycache__/utils.cpython-36.pyc b/__pycache__/utils.cpython-36.pyc new file mode 100644 index 0000000..e4908d9 Binary files /dev/null and b/__pycache__/utils.cpython-36.pyc differ diff --git a/migrate.sh b/migrate.sh index fef8589..ac9e46e 100755 --- a/migrate.sh +++ b/migrate.sh @@ -1,3 +1,4 @@ python manage.py makemigrations python manage.py migrate -python manage.py graph_models -a -g -o class_diagram.png \ No newline at end of file +python manage.py graph_models -a -g -o class_diagram_by_apps.png +python manage.py graph_models -a -o class_diagram.png diff --git a/playlist/__pycache__/models.cpython-36.pyc b/playlist/__pycache__/models.cpython-36.pyc deleted file mode 100644 index 4a9e102..0000000 Binary files a/playlist/__pycache__/models.cpython-36.pyc and /dev/null differ diff --git a/portfolio/__pycache__/settings.cpython-36.pyc b/portfolio/__pycache__/settings.cpython-36.pyc index 0ff77cf..3b1f65d 100644 Binary files a/portfolio/__pycache__/settings.cpython-36.pyc and b/portfolio/__pycache__/settings.cpython-36.pyc differ diff --git a/portfolio/__pycache__/urls.cpython-36.pyc b/portfolio/__pycache__/urls.cpython-36.pyc index c92c2de..9edb22c 100644 Binary files a/portfolio/__pycache__/urls.cpython-36.pyc and b/portfolio/__pycache__/urls.cpython-36.pyc differ diff --git a/portfolio/__pycache__/utils.cpython-36.pyc b/portfolio/__pycache__/utils.cpython-36.pyc index dcdc211..51b4c40 100644 Binary files a/portfolio/__pycache__/utils.cpython-36.pyc and b/portfolio/__pycache__/utils.cpython-36.pyc differ diff --git a/account/__init__.py b/portfolio/account/__init__.py similarity index 100% rename from account/__init__.py rename to portfolio/account/__init__.py diff --git a/account/__pycache__/__init__.cpython-36.pyc b/portfolio/account/__pycache__/__init__.cpython-36.pyc similarity index 100% rename from account/__pycache__/__init__.cpython-36.pyc rename to portfolio/account/__pycache__/__init__.cpython-36.pyc diff --git a/account/__pycache__/admin.cpython-36.pyc b/portfolio/account/__pycache__/admin.cpython-36.pyc similarity index 100% rename from account/__pycache__/admin.cpython-36.pyc rename to portfolio/account/__pycache__/admin.cpython-36.pyc diff --git a/account/__pycache__/models.cpython-36.pyc b/portfolio/account/__pycache__/models.cpython-36.pyc old mode 100755 new mode 100644 similarity index 77% rename from account/__pycache__/models.cpython-36.pyc rename to portfolio/account/__pycache__/models.cpython-36.pyc index 51fa655..1c8c30a Binary files a/account/__pycache__/models.cpython-36.pyc and b/portfolio/account/__pycache__/models.cpython-36.pyc differ diff --git a/account/__pycache__/serializers.cpython-36.pyc b/portfolio/account/__pycache__/serializers.cpython-36.pyc similarity index 100% rename from account/__pycache__/serializers.cpython-36.pyc rename to portfolio/account/__pycache__/serializers.cpython-36.pyc diff --git a/account/__pycache__/views.cpython-36.pyc b/portfolio/account/__pycache__/views.cpython-36.pyc similarity index 100% rename from account/__pycache__/views.cpython-36.pyc rename to portfolio/account/__pycache__/views.cpython-36.pyc diff --git a/account/admin.py b/portfolio/account/admin.py similarity index 100% rename from account/admin.py rename to portfolio/account/admin.py diff --git a/account/apps.py b/portfolio/account/apps.py similarity index 100% rename from account/apps.py rename to portfolio/account/apps.py diff --git a/account/migrations/0001_initial.py b/portfolio/account/migrations/0001_initial.py similarity index 100% rename from account/migrations/0001_initial.py rename to portfolio/account/migrations/0001_initial.py diff --git a/account/migrations/__init__.py b/portfolio/account/migrations/__init__.py similarity index 100% rename from account/migrations/__init__.py rename to portfolio/account/migrations/__init__.py diff --git a/account/migrations/__pycache__/0001_initial.cpython-36.pyc b/portfolio/account/migrations/__pycache__/0001_initial.cpython-36.pyc similarity index 100% rename from account/migrations/__pycache__/0001_initial.cpython-36.pyc rename to portfolio/account/migrations/__pycache__/0001_initial.cpython-36.pyc diff --git a/account/migrations/__pycache__/__init__.cpython-36.pyc b/portfolio/account/migrations/__pycache__/__init__.cpython-36.pyc similarity index 100% rename from account/migrations/__pycache__/__init__.cpython-36.pyc rename to portfolio/account/migrations/__pycache__/__init__.cpython-36.pyc diff --git a/account/models.py b/portfolio/account/models.py similarity index 100% rename from account/models.py rename to portfolio/account/models.py diff --git a/account/serializers.py b/portfolio/account/serializers.py similarity index 100% rename from account/serializers.py rename to portfolio/account/serializers.py diff --git a/account/tests.py b/portfolio/account/tests.py similarity index 100% rename from account/tests.py rename to portfolio/account/tests.py diff --git a/account/views.py b/portfolio/account/views.py similarity index 100% rename from account/views.py rename to portfolio/account/views.py diff --git a/album/__init__.py b/portfolio/album/__init__.py similarity index 100% rename from album/__init__.py rename to portfolio/album/__init__.py diff --git a/album/__pycache__/__init__.cpython-36.pyc b/portfolio/album/__pycache__/__init__.cpython-36.pyc similarity index 100% rename from album/__pycache__/__init__.cpython-36.pyc rename to portfolio/album/__pycache__/__init__.cpython-36.pyc diff --git a/album/__pycache__/admin.cpython-36.pyc b/portfolio/album/__pycache__/admin.cpython-36.pyc similarity index 100% rename from album/__pycache__/admin.cpython-36.pyc rename to portfolio/album/__pycache__/admin.cpython-36.pyc diff --git a/album/__pycache__/models.cpython-36.pyc b/portfolio/album/__pycache__/models.cpython-36.pyc similarity index 77% rename from album/__pycache__/models.cpython-36.pyc rename to portfolio/album/__pycache__/models.cpython-36.pyc index bc6b342..19d0f9f 100644 Binary files a/album/__pycache__/models.cpython-36.pyc and b/portfolio/album/__pycache__/models.cpython-36.pyc differ diff --git a/album/__pycache__/serializers.cpython-36.pyc b/portfolio/album/__pycache__/serializers.cpython-36.pyc similarity index 100% rename from album/__pycache__/serializers.cpython-36.pyc rename to portfolio/album/__pycache__/serializers.cpython-36.pyc diff --git a/album/__pycache__/views.cpython-36.pyc b/portfolio/album/__pycache__/views.cpython-36.pyc similarity index 100% rename from album/__pycache__/views.cpython-36.pyc rename to portfolio/album/__pycache__/views.cpython-36.pyc diff --git a/album/admin.py b/portfolio/album/admin.py similarity index 100% rename from album/admin.py rename to portfolio/album/admin.py diff --git a/album/apps.py b/portfolio/album/apps.py similarity index 100% rename from album/apps.py rename to portfolio/album/apps.py diff --git a/album/migrations/0001_initial.py b/portfolio/album/migrations/0001_initial.py similarity index 100% rename from album/migrations/0001_initial.py rename to portfolio/album/migrations/0001_initial.py diff --git a/album/migrations/__init__.py b/portfolio/album/migrations/__init__.py similarity index 100% rename from album/migrations/__init__.py rename to portfolio/album/migrations/__init__.py diff --git a/album/migrations/__pycache__/0001_initial.cpython-36.pyc b/portfolio/album/migrations/__pycache__/0001_initial.cpython-36.pyc similarity index 100% rename from album/migrations/__pycache__/0001_initial.cpython-36.pyc rename to portfolio/album/migrations/__pycache__/0001_initial.cpython-36.pyc diff --git a/album/migrations/__pycache__/__init__.cpython-36.pyc b/portfolio/album/migrations/__pycache__/__init__.cpython-36.pyc similarity index 100% rename from album/migrations/__pycache__/__init__.cpython-36.pyc rename to portfolio/album/migrations/__pycache__/__init__.cpython-36.pyc diff --git a/album/models.py b/portfolio/album/models.py similarity index 97% rename from album/models.py rename to portfolio/album/models.py index 76ee1b4..365b608 100755 --- a/album/models.py +++ b/portfolio/album/models.py @@ -1,6 +1,6 @@ from django.db import models -from account.models import Account +from portfolio.account.models import Account from portfolio.utils import OneToManyModel class Album(OneToManyModel): diff --git a/album/serializers.py b/portfolio/album/serializers.py similarity index 100% rename from album/serializers.py rename to portfolio/album/serializers.py diff --git a/album/tests.py b/portfolio/album/tests.py similarity index 100% rename from album/tests.py rename to portfolio/album/tests.py diff --git a/album/views.py b/portfolio/album/views.py similarity index 100% rename from album/views.py rename to portfolio/album/views.py diff --git a/comment/__init__.py b/portfolio/comment/__init__.py similarity index 100% rename from comment/__init__.py rename to portfolio/comment/__init__.py diff --git a/comment/__pycache__/__init__.cpython-36.pyc b/portfolio/comment/__pycache__/__init__.cpython-36.pyc similarity index 100% rename from comment/__pycache__/__init__.cpython-36.pyc rename to portfolio/comment/__pycache__/__init__.cpython-36.pyc diff --git a/comment/__pycache__/admin.cpython-36.pyc b/portfolio/comment/__pycache__/admin.cpython-36.pyc similarity index 100% rename from comment/__pycache__/admin.cpython-36.pyc rename to portfolio/comment/__pycache__/admin.cpython-36.pyc diff --git a/comment/__pycache__/models.cpython-36.pyc b/portfolio/comment/__pycache__/models.cpython-36.pyc similarity index 64% rename from comment/__pycache__/models.cpython-36.pyc rename to portfolio/comment/__pycache__/models.cpython-36.pyc index b31764b..ca02b8a 100644 Binary files a/comment/__pycache__/models.cpython-36.pyc and b/portfolio/comment/__pycache__/models.cpython-36.pyc differ diff --git a/comment/__pycache__/serializers.cpython-36.pyc b/portfolio/comment/__pycache__/serializers.cpython-36.pyc similarity index 100% rename from comment/__pycache__/serializers.cpython-36.pyc rename to portfolio/comment/__pycache__/serializers.cpython-36.pyc diff --git a/comment/__pycache__/views.cpython-36.pyc b/portfolio/comment/__pycache__/views.cpython-36.pyc similarity index 100% rename from comment/__pycache__/views.cpython-36.pyc rename to portfolio/comment/__pycache__/views.cpython-36.pyc diff --git a/comment/admin.py b/portfolio/comment/admin.py similarity index 100% rename from comment/admin.py rename to portfolio/comment/admin.py diff --git a/comment/apps.py b/portfolio/comment/apps.py similarity index 100% rename from comment/apps.py rename to portfolio/comment/apps.py diff --git a/comment/migrations/0001_initial.py b/portfolio/comment/migrations/0001_initial.py similarity index 100% rename from comment/migrations/0001_initial.py rename to portfolio/comment/migrations/0001_initial.py diff --git a/comment/migrations/__init__.py b/portfolio/comment/migrations/__init__.py similarity index 100% rename from comment/migrations/__init__.py rename to portfolio/comment/migrations/__init__.py diff --git a/comment/migrations/__pycache__/0001_initial.cpython-36.pyc b/portfolio/comment/migrations/__pycache__/0001_initial.cpython-36.pyc similarity index 100% rename from comment/migrations/__pycache__/0001_initial.cpython-36.pyc rename to portfolio/comment/migrations/__pycache__/0001_initial.cpython-36.pyc diff --git a/comment/migrations/__pycache__/__init__.cpython-36.pyc b/portfolio/comment/migrations/__pycache__/__init__.cpython-36.pyc similarity index 100% rename from comment/migrations/__pycache__/__init__.cpython-36.pyc rename to portfolio/comment/migrations/__pycache__/__init__.cpython-36.pyc diff --git a/comment/models.py b/portfolio/comment/models.py similarity index 87% rename from comment/models.py rename to portfolio/comment/models.py index d925391..01d9424 100755 --- a/comment/models.py +++ b/portfolio/comment/models.py @@ -1,6 +1,6 @@ from django.db import models -from account.models import Account, Guest +from portfolio.account.models import Account, Guest class AbstractComment(models.Model): diff --git a/comment/serializers.py b/portfolio/comment/serializers.py similarity index 100% rename from comment/serializers.py rename to portfolio/comment/serializers.py diff --git a/comment/tests.py b/portfolio/comment/tests.py similarity index 100% rename from comment/tests.py rename to portfolio/comment/tests.py diff --git a/comment/views.py b/portfolio/comment/views.py similarity index 100% rename from comment/views.py rename to portfolio/comment/views.py diff --git a/playlist/__init__.py b/portfolio/playlist/__init__.py similarity index 100% rename from playlist/__init__.py rename to portfolio/playlist/__init__.py diff --git a/playlist/__pycache__/__init__.cpython-36.pyc b/portfolio/playlist/__pycache__/__init__.cpython-36.pyc similarity index 100% rename from playlist/__pycache__/__init__.cpython-36.pyc rename to portfolio/playlist/__pycache__/__init__.cpython-36.pyc diff --git a/playlist/__pycache__/admin.cpython-36.pyc b/portfolio/playlist/__pycache__/admin.cpython-36.pyc similarity index 100% rename from playlist/__pycache__/admin.cpython-36.pyc rename to portfolio/playlist/__pycache__/admin.cpython-36.pyc diff --git a/portfolio/playlist/__pycache__/models.cpython-36.pyc b/portfolio/playlist/__pycache__/models.cpython-36.pyc new file mode 100644 index 0000000..7a3fb67 Binary files /dev/null and b/portfolio/playlist/__pycache__/models.cpython-36.pyc differ diff --git a/playlist/admin.py b/portfolio/playlist/admin.py similarity index 100% rename from playlist/admin.py rename to portfolio/playlist/admin.py diff --git a/playlist/apps.py b/portfolio/playlist/apps.py similarity index 100% rename from playlist/apps.py rename to portfolio/playlist/apps.py diff --git a/playlist/migrations/0001_initial.py b/portfolio/playlist/migrations/0001_initial.py similarity index 100% rename from playlist/migrations/0001_initial.py rename to portfolio/playlist/migrations/0001_initial.py diff --git a/playlist/migrations/__init__.py b/portfolio/playlist/migrations/__init__.py similarity index 100% rename from playlist/migrations/__init__.py rename to portfolio/playlist/migrations/__init__.py diff --git a/playlist/migrations/__pycache__/0001_initial.cpython-36.pyc b/portfolio/playlist/migrations/__pycache__/0001_initial.cpython-36.pyc similarity index 100% rename from playlist/migrations/__pycache__/0001_initial.cpython-36.pyc rename to portfolio/playlist/migrations/__pycache__/0001_initial.cpython-36.pyc diff --git a/playlist/migrations/__pycache__/__init__.cpython-36.pyc b/portfolio/playlist/migrations/__pycache__/__init__.cpython-36.pyc similarity index 100% rename from playlist/migrations/__pycache__/__init__.cpython-36.pyc rename to portfolio/playlist/migrations/__pycache__/__init__.cpython-36.pyc diff --git a/playlist/models.py b/portfolio/playlist/models.py similarity index 69% rename from playlist/models.py rename to portfolio/playlist/models.py index 9d2ce2b..5a7ef45 100755 --- a/playlist/models.py +++ b/portfolio/playlist/models.py @@ -1,7 +1,7 @@ from django.db import models -from album.models import Track -from account.models import Account +from portfolio.album.models import Track +from portfolio.account.models import Account class Playlist(models.Model): diff --git a/playlist/tests.py b/portfolio/playlist/tests.py similarity index 100% rename from playlist/tests.py rename to portfolio/playlist/tests.py diff --git a/playlist/views.py b/portfolio/playlist/views.py similarity index 100% rename from playlist/views.py rename to portfolio/playlist/views.py diff --git a/rating/__init__.py b/portfolio/rating/__init__.py similarity index 100% rename from rating/__init__.py rename to portfolio/rating/__init__.py diff --git a/rating/__pycache__/__init__.cpython-36.pyc b/portfolio/rating/__pycache__/__init__.cpython-36.pyc similarity index 100% rename from rating/__pycache__/__init__.cpython-36.pyc rename to portfolio/rating/__pycache__/__init__.cpython-36.pyc diff --git a/rating/__pycache__/admin.cpython-36.pyc b/portfolio/rating/__pycache__/admin.cpython-36.pyc similarity index 100% rename from rating/__pycache__/admin.cpython-36.pyc rename to portfolio/rating/__pycache__/admin.cpython-36.pyc diff --git a/rating/__pycache__/models.cpython-36.pyc b/portfolio/rating/__pycache__/models.cpython-36.pyc similarity index 80% rename from rating/__pycache__/models.cpython-36.pyc rename to portfolio/rating/__pycache__/models.cpython-36.pyc index 2c2a585..5c39326 100644 Binary files a/rating/__pycache__/models.cpython-36.pyc and b/portfolio/rating/__pycache__/models.cpython-36.pyc differ diff --git a/rating/__pycache__/serializers.cpython-36.pyc b/portfolio/rating/__pycache__/serializers.cpython-36.pyc similarity index 100% rename from rating/__pycache__/serializers.cpython-36.pyc rename to portfolio/rating/__pycache__/serializers.cpython-36.pyc diff --git a/rating/__pycache__/views.cpython-36.pyc b/portfolio/rating/__pycache__/views.cpython-36.pyc similarity index 100% rename from rating/__pycache__/views.cpython-36.pyc rename to portfolio/rating/__pycache__/views.cpython-36.pyc diff --git a/rating/admin.py b/portfolio/rating/admin.py similarity index 100% rename from rating/admin.py rename to portfolio/rating/admin.py diff --git a/rating/apps.py b/portfolio/rating/apps.py similarity index 100% rename from rating/apps.py rename to portfolio/rating/apps.py diff --git a/rating/migrations/0001_initial.py b/portfolio/rating/migrations/0001_initial.py similarity index 100% rename from rating/migrations/0001_initial.py rename to portfolio/rating/migrations/0001_initial.py diff --git a/rating/migrations/__init__.py b/portfolio/rating/migrations/__init__.py similarity index 100% rename from rating/migrations/__init__.py rename to portfolio/rating/migrations/__init__.py diff --git a/rating/migrations/__pycache__/0001_initial.cpython-36.pyc b/portfolio/rating/migrations/__pycache__/0001_initial.cpython-36.pyc similarity index 100% rename from rating/migrations/__pycache__/0001_initial.cpython-36.pyc rename to portfolio/rating/migrations/__pycache__/0001_initial.cpython-36.pyc diff --git a/rating/migrations/__pycache__/__init__.cpython-36.pyc b/portfolio/rating/migrations/__pycache__/__init__.cpython-36.pyc similarity index 100% rename from rating/migrations/__pycache__/__init__.cpython-36.pyc rename to portfolio/rating/migrations/__pycache__/__init__.cpython-36.pyc diff --git a/rating/models.py b/portfolio/rating/models.py similarity index 91% rename from rating/models.py rename to portfolio/rating/models.py index 3440428..5d132c6 100755 --- a/rating/models.py +++ b/portfolio/rating/models.py @@ -3,9 +3,9 @@ from django.utils.translation import ugettext_lazy from rest_enumfield import EnumField import enum -from account.models import Account -from comment.models import UserComment, GuestComment -from album.models import Album, Track +from portfolio.account.models import Account +from portfolio.comment.models import UserComment, GuestComment +from portfolio.album.models import Album, Track from portfolio.utils import OneToManyModel diff --git a/rating/serializers.py b/portfolio/rating/serializers.py similarity index 100% rename from rating/serializers.py rename to portfolio/rating/serializers.py diff --git a/rating/tests.py b/portfolio/rating/tests.py similarity index 100% rename from rating/tests.py rename to portfolio/rating/tests.py diff --git a/rating/views.py b/portfolio/rating/views.py similarity index 100% rename from rating/views.py rename to portfolio/rating/views.py diff --git a/portfolio/settings.py b/portfolio/settings.py index 2280cf5..b1a4dde 100755 --- a/portfolio/settings.py +++ b/portfolio/settings.py @@ -42,11 +42,11 @@ INSTALLED_APPS = [ 'drf_yasg', 'rest_framework.authtoken', 'portfolio', - 'account', - 'album', - 'comment', - 'playlist', - 'rating' + 'portfolio.account', + 'portfolio.album', + 'portfolio.comment', + 'portfolio.playlist', + 'portfolio.rating' ] MIDDLEWARE = [ diff --git a/portfolio/urls.py b/portfolio/urls.py index 33041d8..e46efd3 100755 --- a/portfolio/urls.py +++ b/portfolio/urls.py @@ -22,10 +22,10 @@ from rest_framework import routers, permissions from rest_framework.authtoken import views as authViews from portfolio import settings -from account.views import GuestViewSet, AccountViewSet, AccountAuth -from album.views import AlbumViewSet, TrackViewSet, TrackRowViewSet -from rating.views import TrackRatingViewSet, AlbumRatingViewSet, CommentRatingViewSet -from comment.views import UserCommentViewSet, GuestCommentViewSet +from portfolio.account.views import GuestViewSet, AccountViewSet, AccountAuth +from portfolio.album.views import AlbumViewSet, TrackViewSet, TrackRowViewSet +from portfolio.rating.views import TrackRatingViewSet, AlbumRatingViewSet, CommentRatingViewSet +from portfolio.comment.views import UserCommentViewSet, GuestCommentViewSet schema_view = get_schema_view( openapi.Info(