From a9c1bf739ffd0f00f89c587e44e5fdc55f293425 Mon Sep 17 00:00:00 2001 From: TBS093A Date: Fri, 24 Jul 2020 13:17:01 +0200 Subject: [PATCH] change packages && mv all apps to portfolio package --- __pycache__/utils.cpython-36.pyc | Bin 0 -> 998 bytes migrate.sh | 3 ++- playlist/__pycache__/models.cpython-36.pyc | Bin 578 -> 0 bytes portfolio/__pycache__/settings.cpython-36.pyc | Bin 2888 -> 2938 bytes portfolio/__pycache__/urls.cpython-36.pyc | Bin 2592 -> 2632 bytes portfolio/__pycache__/utils.cpython-36.pyc | Bin 1008 -> 1008 bytes {account => portfolio/account}/__init__.py | 0 .../__pycache__/__init__.cpython-36.pyc | Bin .../account}/__pycache__/admin.cpython-36.pyc | Bin .../__pycache__/models.cpython-36.pyc | Bin 2264 -> 2258 bytes .../__pycache__/serializers.cpython-36.pyc | Bin .../account}/__pycache__/views.cpython-36.pyc | Bin {account => portfolio/account}/admin.py | 0 {account => portfolio/account}/apps.py | 0 .../account}/migrations/0001_initial.py | 0 .../account}/migrations/__init__.py | 0 .../__pycache__/0001_initial.cpython-36.pyc | Bin .../__pycache__/__init__.cpython-36.pyc | Bin {account => portfolio/account}/models.py | 0 {account => portfolio/account}/serializers.py | 0 {account => portfolio/account}/tests.py | 0 {account => portfolio/account}/views.py | 0 {album => portfolio/album}/__init__.py | 0 .../__pycache__/__init__.cpython-36.pyc | Bin .../album}/__pycache__/admin.cpython-36.pyc | Bin .../album}/__pycache__/models.cpython-36.pyc | Bin 1639 -> 1659 bytes .../__pycache__/serializers.cpython-36.pyc | Bin .../album}/__pycache__/views.cpython-36.pyc | Bin {album => portfolio/album}/admin.py | 0 {album => portfolio/album}/apps.py | 0 .../album}/migrations/0001_initial.py | 0 .../album}/migrations/__init__.py | 0 .../__pycache__/0001_initial.cpython-36.pyc | Bin .../__pycache__/__init__.cpython-36.pyc | Bin {album => portfolio/album}/models.py | 2 +- {album => portfolio/album}/serializers.py | 0 {album => portfolio/album}/tests.py | 0 {album => portfolio/album}/views.py | 0 {comment => portfolio/comment}/__init__.py | 0 .../__pycache__/__init__.cpython-36.pyc | Bin .../comment}/__pycache__/admin.cpython-36.pyc | Bin .../__pycache__/models.cpython-36.pyc | Bin 1038 -> 1058 bytes .../__pycache__/serializers.cpython-36.pyc | Bin .../comment}/__pycache__/views.cpython-36.pyc | Bin {comment => portfolio/comment}/admin.py | 0 {comment => portfolio/comment}/apps.py | 0 .../comment}/migrations/0001_initial.py | 0 .../comment}/migrations/__init__.py | 0 .../__pycache__/0001_initial.cpython-36.pyc | Bin .../__pycache__/__init__.cpython-36.pyc | Bin {comment => portfolio/comment}/models.py | 2 +- {comment => portfolio/comment}/serializers.py | 0 {comment => portfolio/comment}/tests.py | 0 {comment => portfolio/comment}/views.py | 0 {playlist => portfolio/playlist}/__init__.py | 0 .../__pycache__/__init__.cpython-36.pyc | Bin .../__pycache__/admin.cpython-36.pyc | Bin .../__pycache__/models.cpython-36.pyc | Bin 0 -> 608 bytes {playlist => portfolio/playlist}/admin.py | 0 {playlist => portfolio/playlist}/apps.py | 0 .../playlist}/migrations/0001_initial.py | 0 .../playlist}/migrations/__init__.py | 0 .../__pycache__/0001_initial.cpython-36.pyc | Bin .../__pycache__/__init__.cpython-36.pyc | Bin {playlist => portfolio/playlist}/models.py | 4 ++-- {playlist => portfolio/playlist}/tests.py | 0 {playlist => portfolio/playlist}/views.py | 0 {rating => portfolio/rating}/__init__.py | 0 .../__pycache__/__init__.cpython-36.pyc | Bin .../rating}/__pycache__/admin.cpython-36.pyc | Bin .../rating}/__pycache__/models.cpython-36.pyc | Bin 2633 -> 2673 bytes .../__pycache__/serializers.cpython-36.pyc | Bin .../rating}/__pycache__/views.cpython-36.pyc | Bin {rating => portfolio/rating}/admin.py | 0 {rating => portfolio/rating}/apps.py | 0 .../rating}/migrations/0001_initial.py | 0 .../rating}/migrations/__init__.py | 0 .../__pycache__/0001_initial.cpython-36.pyc | Bin .../__pycache__/__init__.cpython-36.pyc | Bin {rating => portfolio/rating}/models.py | 6 +++--- {rating => portfolio/rating}/serializers.py | 0 {rating => portfolio/rating}/tests.py | 0 {rating => portfolio/rating}/views.py | 0 portfolio/settings.py | 10 +++++----- portfolio/urls.py | 8 ++++---- 85 files changed, 18 insertions(+), 17 deletions(-) create mode 100644 __pycache__/utils.cpython-36.pyc delete mode 100644 playlist/__pycache__/models.cpython-36.pyc rename {account => portfolio/account}/__init__.py (100%) rename {account => portfolio/account}/__pycache__/__init__.cpython-36.pyc (100%) rename {account => portfolio/account}/__pycache__/admin.cpython-36.pyc (100%) rename {account => portfolio/account}/__pycache__/models.cpython-36.pyc (77%) mode change 100755 => 100644 rename {account => portfolio/account}/__pycache__/serializers.cpython-36.pyc (100%) rename {account => portfolio/account}/__pycache__/views.cpython-36.pyc (100%) rename {account => portfolio/account}/admin.py (100%) rename {account => portfolio/account}/apps.py (100%) rename {account => portfolio/account}/migrations/0001_initial.py (100%) rename {account => portfolio/account}/migrations/__init__.py (100%) rename {account => portfolio/account}/migrations/__pycache__/0001_initial.cpython-36.pyc (100%) rename {account => portfolio/account}/migrations/__pycache__/__init__.cpython-36.pyc (100%) rename {account => portfolio/account}/models.py (100%) rename {account => portfolio/account}/serializers.py (100%) rename {account => portfolio/account}/tests.py (100%) rename {account => portfolio/account}/views.py (100%) rename {album => portfolio/album}/__init__.py (100%) rename {album => portfolio/album}/__pycache__/__init__.cpython-36.pyc (100%) rename {album => portfolio/album}/__pycache__/admin.cpython-36.pyc (100%) rename {album => portfolio/album}/__pycache__/models.cpython-36.pyc (77%) rename {album => portfolio/album}/__pycache__/serializers.cpython-36.pyc (100%) rename {album => portfolio/album}/__pycache__/views.cpython-36.pyc (100%) rename {album => portfolio/album}/admin.py (100%) rename {album => portfolio/album}/apps.py (100%) rename {album => portfolio/album}/migrations/0001_initial.py (100%) rename {album => portfolio/album}/migrations/__init__.py (100%) rename {album => portfolio/album}/migrations/__pycache__/0001_initial.cpython-36.pyc (100%) rename {album => portfolio/album}/migrations/__pycache__/__init__.cpython-36.pyc (100%) rename {album => portfolio/album}/models.py (97%) rename {album => portfolio/album}/serializers.py (100%) rename {album => portfolio/album}/tests.py (100%) rename {album => portfolio/album}/views.py (100%) rename {comment => portfolio/comment}/__init__.py (100%) rename {comment => portfolio/comment}/__pycache__/__init__.cpython-36.pyc (100%) rename {comment => portfolio/comment}/__pycache__/admin.cpython-36.pyc (100%) rename {comment => portfolio/comment}/__pycache__/models.cpython-36.pyc (64%) rename {comment => portfolio/comment}/__pycache__/serializers.cpython-36.pyc (100%) rename {comment => portfolio/comment}/__pycache__/views.cpython-36.pyc (100%) rename {comment => portfolio/comment}/admin.py (100%) rename {comment => portfolio/comment}/apps.py (100%) rename {comment => portfolio/comment}/migrations/0001_initial.py (100%) rename {comment => portfolio/comment}/migrations/__init__.py (100%) rename {comment => portfolio/comment}/migrations/__pycache__/0001_initial.cpython-36.pyc (100%) rename {comment => portfolio/comment}/migrations/__pycache__/__init__.cpython-36.pyc (100%) rename {comment => portfolio/comment}/models.py (87%) rename {comment => portfolio/comment}/serializers.py (100%) rename {comment => portfolio/comment}/tests.py (100%) rename {comment => portfolio/comment}/views.py (100%) rename {playlist => portfolio/playlist}/__init__.py (100%) rename {playlist => portfolio/playlist}/__pycache__/__init__.cpython-36.pyc (100%) rename {playlist => portfolio/playlist}/__pycache__/admin.cpython-36.pyc (100%) create mode 100644 portfolio/playlist/__pycache__/models.cpython-36.pyc rename {playlist => portfolio/playlist}/admin.py (100%) rename {playlist => portfolio/playlist}/apps.py (100%) rename {playlist => portfolio/playlist}/migrations/0001_initial.py (100%) rename {playlist => portfolio/playlist}/migrations/__init__.py (100%) rename {playlist => portfolio/playlist}/migrations/__pycache__/0001_initial.cpython-36.pyc (100%) rename {playlist => portfolio/playlist}/migrations/__pycache__/__init__.cpython-36.pyc (100%) rename {playlist => portfolio/playlist}/models.py (69%) rename {playlist => portfolio/playlist}/tests.py (100%) rename {playlist => portfolio/playlist}/views.py (100%) rename {rating => portfolio/rating}/__init__.py (100%) rename {rating => portfolio/rating}/__pycache__/__init__.cpython-36.pyc (100%) rename {rating => portfolio/rating}/__pycache__/admin.cpython-36.pyc (100%) rename {rating => portfolio/rating}/__pycache__/models.cpython-36.pyc (80%) rename {rating => portfolio/rating}/__pycache__/serializers.cpython-36.pyc (100%) rename {rating => portfolio/rating}/__pycache__/views.cpython-36.pyc (100%) rename {rating => portfolio/rating}/admin.py (100%) rename {rating => portfolio/rating}/apps.py (100%) rename {rating => portfolio/rating}/migrations/0001_initial.py (100%) rename {rating => portfolio/rating}/migrations/__init__.py (100%) rename {rating => portfolio/rating}/migrations/__pycache__/0001_initial.cpython-36.pyc (100%) rename {rating => portfolio/rating}/migrations/__pycache__/__init__.cpython-36.pyc (100%) rename {rating => portfolio/rating}/models.py (91%) rename {rating => portfolio/rating}/serializers.py (100%) rename {rating => portfolio/rating}/tests.py (100%) rename {rating => portfolio/rating}/views.py (100%) diff --git a/__pycache__/utils.cpython-36.pyc b/__pycache__/utils.cpython-36.pyc new file mode 100644 index 0000000000000000000000000000000000000000..e4908d937a9d09f7d35ecff3ecbccd6012327021 GIT binary patch literal 998 zcmZuw&5qMB5FR@}b;It0SOF5^#4VQwu_q*iDnR1Yg2bMBiQL$QhBPU53fiiix(@@7 z!E5BoiC5snjMJZOwU%Z)vB%@@`#iZgJ&iiQAE!SVz#q6Ve2n{O_9;3AiWM+pBgWtz zD6YI~P@ZNvUwb1@`5z$;{$d`)tO;k8(uK|Fb2~f?`e^n!It?SHV8j(u{2K5$7Qoq8 zfeLXB@PdvKc!5~+QK-6DJZjF~m-@0A$nt7H0>w}KpUwqk39ssPWj zVaywmrfQniY1)K~xstWUHQ(xD()hIg3yi?C{|3qDYNnHVY@fZjkjV#A%NUR;D zCyvq@e()8~p{0cpTLXg?-_SD=W+5N>O~;-I@xydzB`Wpzv>Fo!$FFr=+6ptHQ3hgd z$pH&l!~|PDID*&a?Z6%A{SeQQ-Wyn`yMwh=-N7<*2V2{+shqJ6W2 zmco98KAL;cTV)KK!}x zB$Qxujzl2H3lc=)dHC$pNQBpD9DRZwjj;<$Eu?CI$c^Fo13+|~=en(I-d*`yKEM%J zvkguniUp#c^yh)V!h6M(0EaSq#x(9}1e6FLQUxx)QhcF`#(sW-7&0U!e_~2j_jYzU zUU4yF6)z=YE@2GnX;sH5V~;IY!-?@g=|-nBZq5p+gd?`FO1kw6UM+5P=li(n2IPXa zk;Zf-!@aJnH)J+o*SoLVY^F<@*=e)0x689DqvtZWO;&4T@3boPl1@OI@w!$;&TXNq z>RV$Q33JrUEs6`FE2ZOh3Z?n|X>e3<)R huy2K2bnnxDX4%3(n~=rD2gAS);ZGS7r(TLv{|B1-l+XYG diff --git a/portfolio/__pycache__/settings.cpython-36.pyc b/portfolio/__pycache__/settings.cpython-36.pyc index 0ff77cfe8558c49913d99bd29152d07eb3ab878d..3b1f65d9238e4092ec5c35834eb70acf4960b433 100644 GIT binary patch delta 129 zcmX>h_DhV@n3tF9!Xc@6|BamO%;8mn1^GoKY56&s`Fe@T$@!&uB~|=LLODsLxyWjg x^K)}kfog;hY6@}^D|0f7OR5AAVw<-zUuI@x-`vT5o{3F`fq|h&WpW(XD*!`oFPZ=V delta 79 zcmew*c0!EPn3tD}W1CdG>_*OZX4NS6#N_1s(!7!=*2J8o(%f6@$@#gtsX#tQK~7?2 iPG)gQ6x-(K%$J!NIX3TRKhMOb%D})-q&j&5*DC-BnHp^X diff --git a/portfolio/__pycache__/urls.cpython-36.pyc b/portfolio/__pycache__/urls.cpython-36.pyc index c92c2de908f4515b19a2caf7a80e69017e73ec54..9edb22ca61abf953f5de6d94ef0dadfd2460409f 100644 GIT binary patch delta 137 zcmZ1=azcdDn3tDp?;)x9iyJv>+4yghvOt8>n3tEUWUEyC%8i`0Z2VEI>7}W~B~h%2IZ36tQJbf-U1gN#O-xSCFU>2_ zE6YqRFD~L?U|=ZX1rdBeB8q$RTn=eDo}$E(%)E4{5+RVRFo+NVDdC;`ienC&9*D0u IxrcKP0DU?kfdBvi diff --git a/portfolio/__pycache__/utils.cpython-36.pyc b/portfolio/__pycache__/utils.cpython-36.pyc index dcdc211adb54d2c451b83ca510dcd93ace688919..51b4c40e1a915cd0770a365648e7021af626e36f 100644 GIT binary patch delta 17 Ycmeys{(+stn3tC;=b%*lMvfQE05azVm;e9( delta 17 Ycmeys{(+stn3tDJyzPJ7MvfQE05kgq>;M1& 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 51fa655490283b16fdafaee2395cc056bac066c1..1c8c30a428d02ec048e648fc1ede078719124438 GIT binary patch delta 43 zcmca1cuA1Mn3tDp+99d}=BNb#Fh>ng delta 49 zcmca4cteoGn3tF9y!yMijU2xjMbh*$@^e%5^HX#6UGlR_b5rw5DmM!w)uC&4lzQHXlF&h=V0wu5P<|%sKylIo&y!s zAq_o;Dyj)37+oO|3GxRCBJncbgftQHPc%-RARdjei)$^UYJtd&;pII*^1Uo|*VwW@ z^0q>NbFlUpL?Vg>qJa#Tk-#E&z?1;TGTC67dKv*`B7{_tORp7QtE#n6FAxkFvYP*9 zN;Y?PF&lqyDPs+p@==7-n3tEU;*eCl=|;}wOpNi9H!`_ye#5kY%}=5rzo;ZFKPNL^FEKeezcjBz oFE>9WHK(|Um4SgF3Q0OSKQ}iOAz-F)@Zt-pJ&-iFq0uBj4nOoFYK-0H-7) J&*UeZy#TQd56%Dp 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(