From fbd62622ee27667e626c3e2ca3bef45d9452985c Mon Sep 17 00:00:00 2001 From: TBS093A Date: Fri, 24 Jul 2020 12:24:33 +0200 Subject: [PATCH] mv all apps to default directory --- {portfolio/account => account}/__init__.py | 0 .../__pycache__/__init__.cpython-36.pyc | Bin .../__pycache__/admin.cpython-36.pyc | Bin .../__pycache__/models.cpython-36.pyc | Bin .../__pycache__/serializers.cpython-36.pyc | Bin .../__pycache__/views.cpython-36.pyc | Bin {portfolio/account => account}/admin.py | 0 {portfolio/account => account}/apps.py | 0 account/migrations/0001_initial.py | 48 +++++++++++++ .../migrations/__init__.py | 0 .../__pycache__/0001_initial.cpython-36.pyc | Bin 0 -> 1363 bytes .../__pycache__/__init__.cpython-36.pyc | Bin 0 -> 182 bytes {portfolio/account => account}/models.py | 0 {portfolio/account => account}/serializers.py | 0 {portfolio/account => account}/tests.py | 0 {portfolio/account => account}/views.py | 0 {portfolio/album => album}/__init__.py | 0 .../__pycache__/__init__.cpython-36.pyc | Bin .../__pycache__/admin.cpython-36.pyc | Bin .../__pycache__/models.cpython-36.pyc | Bin 1659 -> 1639 bytes .../__pycache__/serializers.cpython-36.pyc | Bin .../__pycache__/views.cpython-36.pyc | Bin {portfolio/album => album}/admin.py | 0 {portfolio/album => album}/apps.py | 0 album/migrations/0001_initial.py | 64 +++++++++++++++++ .../album => album}/migrations/__init__.py | 0 .../__pycache__/0001_initial.cpython-36.pyc | Bin 0 -> 1475 bytes .../__pycache__/__init__.cpython-36.pyc | Bin 0 -> 180 bytes {portfolio/album => album}/models.py | 2 +- {portfolio/album => album}/serializers.py | 0 {portfolio/album => album}/tests.py | 0 {portfolio/album => album}/views.py | 0 {portfolio/comment => comment}/__init__.py | 0 .../__pycache__/__init__.cpython-36.pyc | Bin .../__pycache__/admin.cpython-36.pyc | Bin .../__pycache__/models.cpython-36.pyc | Bin 1058 -> 1038 bytes .../__pycache__/serializers.cpython-36.pyc | Bin .../__pycache__/views.cpython-36.pyc | Bin {portfolio/comment => comment}/admin.py | 0 {portfolio/comment => comment}/apps.py | 0 comment/migrations/0001_initial.py | 38 ++++++++++ .../migrations/__init__.py | 0 .../__pycache__/0001_initial.cpython-36.pyc | Bin 0 -> 1008 bytes .../__pycache__/__init__.cpython-36.pyc | Bin 0 -> 182 bytes {portfolio/comment => comment}/models.py | 2 +- {portfolio/comment => comment}/serializers.py | 0 {portfolio/comment => comment}/tests.py | 0 {portfolio/comment => comment}/views.py | 0 .../migrations => migrations}/0001_initial.py | 0 .../0002_auto_20200724_1012.py | 0 .../migrations => migrations}/__init__.py | 0 .../__pycache__/0001_initial.cpython-36.pyc | Bin .../0002_album_track_trackrow.cpython-36.pyc | Bin ...ent_trackrating_usercomment.cpython-36.pyc | Bin .../0002_auto_20200724_1012.cpython-36.pyc | Bin .../0003_auto_20200620_1850.cpython-36.pyc | Bin .../0004_auto_20200620_1956.cpython-36.pyc | Bin .../0005_auto_20200620_2006.cpython-36.pyc | Bin .../__pycache__/__init__.cpython-36.pyc | Bin {portfolio/playlist => playlist}/__init__.py | 0 .../__pycache__/__init__.cpython-36.pyc | Bin .../__pycache__/admin.cpython-36.pyc | Bin playlist/__pycache__/models.cpython-36.pyc | Bin 0 -> 578 bytes {portfolio/playlist => playlist}/admin.py | 0 {portfolio/playlist => playlist}/apps.py | 0 playlist/migrations/0001_initial.py | 25 +++++++ .../migrations/__init__.py | 0 .../__pycache__/0001_initial.cpython-36.pyc | Bin 0 -> 826 bytes .../__pycache__/__init__.cpython-36.pyc | Bin 0 -> 183 bytes {portfolio/playlist => playlist}/models.py | 4 +- {portfolio/playlist => playlist}/tests.py | 0 {portfolio/playlist => playlist}/views.py | 0 portfolio/__pycache__/settings.cpython-36.pyc | Bin 2825 -> 2888 bytes portfolio/__pycache__/urls.cpython-36.pyc | Bin 2597 -> 2592 bytes .../__pycache__/models.cpython-36.pyc | Bin 581 -> 0 bytes portfolio/settings.py | 5 ++ portfolio/urls.py | 8 +-- {portfolio/rating => rating}/__init__.py | 0 .../__pycache__/__init__.cpython-36.pyc | Bin .../__pycache__/admin.cpython-36.pyc | Bin .../__pycache__/models.cpython-36.pyc | Bin 2673 -> 2633 bytes .../__pycache__/serializers.cpython-36.pyc | Bin .../__pycache__/views.cpython-36.pyc | Bin {portfolio/rating => rating}/admin.py | 0 {portfolio/rating => rating}/apps.py | 0 rating/migrations/0001_initial.py | 66 ++++++++++++++++++ .../rating => rating}/migrations/__init__.py | 0 .../__pycache__/0001_initial.cpython-36.pyc | Bin 0 -> 1636 bytes .../__pycache__/__init__.cpython-36.pyc | Bin 0 -> 181 bytes {portfolio/rating => rating}/models.py | 6 +- {portfolio/rating => rating}/serializers.py | 0 {portfolio/rating => rating}/tests.py | 0 {portfolio/rating => rating}/views.py | 0 93 files changed, 257 insertions(+), 11 deletions(-) rename {portfolio/account => account}/__init__.py (100%) rename {portfolio/account => account}/__pycache__/__init__.cpython-36.pyc (100%) rename {portfolio/account => account}/__pycache__/admin.cpython-36.pyc (100%) rename {portfolio/account => account}/__pycache__/models.cpython-36.pyc (100%) rename {portfolio/account => account}/__pycache__/serializers.cpython-36.pyc (100%) rename {portfolio/account => account}/__pycache__/views.cpython-36.pyc (100%) rename {portfolio/account => account}/admin.py (100%) rename {portfolio/account => account}/apps.py (100%) create mode 100644 account/migrations/0001_initial.py rename {portfolio/account => account}/migrations/__init__.py (100%) create mode 100644 account/migrations/__pycache__/0001_initial.cpython-36.pyc create mode 100644 account/migrations/__pycache__/__init__.cpython-36.pyc rename {portfolio/account => account}/models.py (100%) rename {portfolio/account => account}/serializers.py (100%) rename {portfolio/account => account}/tests.py (100%) rename {portfolio/account => account}/views.py (100%) rename {portfolio/album => album}/__init__.py (100%) rename {portfolio/album => album}/__pycache__/__init__.cpython-36.pyc (100%) rename {portfolio/album => album}/__pycache__/admin.cpython-36.pyc (100%) rename {portfolio/album => album}/__pycache__/models.cpython-36.pyc (77%) rename {portfolio/album => album}/__pycache__/serializers.cpython-36.pyc (100%) rename {portfolio/album => album}/__pycache__/views.cpython-36.pyc (100%) rename {portfolio/album => album}/admin.py (100%) rename {portfolio/album => album}/apps.py (100%) create mode 100644 album/migrations/0001_initial.py rename {portfolio/album => album}/migrations/__init__.py (100%) create mode 100644 album/migrations/__pycache__/0001_initial.cpython-36.pyc create mode 100644 album/migrations/__pycache__/__init__.cpython-36.pyc rename {portfolio/album => album}/models.py (97%) rename {portfolio/album => album}/serializers.py (100%) rename {portfolio/album => album}/tests.py (100%) rename {portfolio/album => album}/views.py (100%) rename {portfolio/comment => comment}/__init__.py (100%) rename {portfolio/comment => comment}/__pycache__/__init__.cpython-36.pyc (100%) rename {portfolio/comment => comment}/__pycache__/admin.cpython-36.pyc (100%) rename {portfolio/comment => comment}/__pycache__/models.cpython-36.pyc (58%) rename {portfolio/comment => comment}/__pycache__/serializers.cpython-36.pyc (100%) rename {portfolio/comment => comment}/__pycache__/views.cpython-36.pyc (100%) rename {portfolio/comment => comment}/admin.py (100%) rename {portfolio/comment => comment}/apps.py (100%) create mode 100644 comment/migrations/0001_initial.py rename {portfolio/comment => comment}/migrations/__init__.py (100%) create mode 100644 comment/migrations/__pycache__/0001_initial.cpython-36.pyc create mode 100644 comment/migrations/__pycache__/__init__.cpython-36.pyc rename {portfolio/comment => comment}/models.py (87%) rename {portfolio/comment => comment}/serializers.py (100%) rename {portfolio/comment => comment}/tests.py (100%) rename {portfolio/comment => comment}/views.py (100%) rename {portfolio/migrations => migrations}/0001_initial.py (100%) rename {portfolio/migrations => migrations}/0002_auto_20200724_1012.py (100%) rename {portfolio/migrations => migrations}/__init__.py (100%) rename {portfolio/migrations => migrations}/__pycache__/0001_initial.cpython-36.pyc (100%) rename {portfolio/migrations => migrations}/__pycache__/0002_album_track_trackrow.cpython-36.pyc (100%) rename {portfolio/migrations => migrations}/__pycache__/0002_albumrating_commentrating_guestcomment_trackrating_usercomment.cpython-36.pyc (100%) rename {portfolio/migrations => migrations}/__pycache__/0002_auto_20200724_1012.cpython-36.pyc (100%) rename {portfolio/migrations => migrations}/__pycache__/0003_auto_20200620_1850.cpython-36.pyc (100%) rename {portfolio/migrations => migrations}/__pycache__/0004_auto_20200620_1956.cpython-36.pyc (100%) rename {portfolio/migrations => migrations}/__pycache__/0005_auto_20200620_2006.cpython-36.pyc (100%) rename {portfolio/migrations => migrations}/__pycache__/__init__.cpython-36.pyc (100%) rename {portfolio/playlist => playlist}/__init__.py (100%) rename {portfolio/playlist => playlist}/__pycache__/__init__.cpython-36.pyc (100%) rename {portfolio/playlist => playlist}/__pycache__/admin.cpython-36.pyc (100%) create mode 100644 playlist/__pycache__/models.cpython-36.pyc rename {portfolio/playlist => playlist}/admin.py (100%) rename {portfolio/playlist => playlist}/apps.py (100%) create mode 100644 playlist/migrations/0001_initial.py rename {portfolio/playlist => playlist}/migrations/__init__.py (100%) create mode 100644 playlist/migrations/__pycache__/0001_initial.cpython-36.pyc create mode 100644 playlist/migrations/__pycache__/__init__.cpython-36.pyc rename {portfolio/playlist => playlist}/models.py (71%) rename {portfolio/playlist => playlist}/tests.py (100%) rename {portfolio/playlist => playlist}/views.py (100%) delete mode 100755 portfolio/playlist/__pycache__/models.cpython-36.pyc rename {portfolio/rating => rating}/__init__.py (100%) rename {portfolio/rating => rating}/__pycache__/__init__.cpython-36.pyc (100%) rename {portfolio/rating => rating}/__pycache__/admin.cpython-36.pyc (100%) rename {portfolio/rating => rating}/__pycache__/models.cpython-36.pyc (80%) rename {portfolio/rating => rating}/__pycache__/serializers.cpython-36.pyc (100%) rename {portfolio/rating => rating}/__pycache__/views.cpython-36.pyc (100%) rename {portfolio/rating => rating}/admin.py (100%) rename {portfolio/rating => rating}/apps.py (100%) create mode 100644 rating/migrations/0001_initial.py rename {portfolio/rating => rating}/migrations/__init__.py (100%) create mode 100644 rating/migrations/__pycache__/0001_initial.cpython-36.pyc create mode 100644 rating/migrations/__pycache__/__init__.cpython-36.pyc rename {portfolio/rating => rating}/models.py (91%) rename {portfolio/rating => rating}/serializers.py (100%) rename {portfolio/rating => rating}/tests.py (100%) rename {portfolio/rating => rating}/views.py (100%) diff --git a/portfolio/account/__init__.py b/account/__init__.py similarity index 100% rename from portfolio/account/__init__.py rename to account/__init__.py diff --git a/portfolio/account/__pycache__/__init__.cpython-36.pyc b/account/__pycache__/__init__.cpython-36.pyc similarity index 100% rename from portfolio/account/__pycache__/__init__.cpython-36.pyc rename to account/__pycache__/__init__.cpython-36.pyc diff --git a/portfolio/account/__pycache__/admin.cpython-36.pyc b/account/__pycache__/admin.cpython-36.pyc similarity index 100% rename from portfolio/account/__pycache__/admin.cpython-36.pyc rename to account/__pycache__/admin.cpython-36.pyc diff --git a/portfolio/account/__pycache__/models.cpython-36.pyc b/account/__pycache__/models.cpython-36.pyc similarity index 100% rename from portfolio/account/__pycache__/models.cpython-36.pyc rename to account/__pycache__/models.cpython-36.pyc diff --git a/portfolio/account/__pycache__/serializers.cpython-36.pyc b/account/__pycache__/serializers.cpython-36.pyc similarity index 100% rename from portfolio/account/__pycache__/serializers.cpython-36.pyc rename to account/__pycache__/serializers.cpython-36.pyc diff --git a/portfolio/account/__pycache__/views.cpython-36.pyc b/account/__pycache__/views.cpython-36.pyc similarity index 100% rename from portfolio/account/__pycache__/views.cpython-36.pyc rename to account/__pycache__/views.cpython-36.pyc diff --git a/portfolio/account/admin.py b/account/admin.py similarity index 100% rename from portfolio/account/admin.py rename to account/admin.py diff --git a/portfolio/account/apps.py b/account/apps.py similarity index 100% rename from portfolio/account/apps.py rename to account/apps.py diff --git a/account/migrations/0001_initial.py b/account/migrations/0001_initial.py new file mode 100644 index 0000000..7603c0c --- /dev/null +++ b/account/migrations/0001_initial.py @@ -0,0 +1,48 @@ +# Generated by Django 3.0.8 on 2020-07-24 10:21 + +from django.conf import settings +import django.contrib.auth.models +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ('auth', '0011_update_proxy_permissions'), + ] + + operations = [ + migrations.CreateModel( + name='Account', + fields=[ + ('user_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to=settings.AUTH_USER_MODEL)), + ('city', models.CharField(max_length=255, verbose_name='City')), + ('country', models.CharField(max_length=255, verbose_name='Country')), + ('ip', models.CharField(max_length=15, verbose_name='IP')), + ], + options={ + 'verbose_name': 'user', + 'verbose_name_plural': 'users', + 'abstract': False, + }, + bases=('auth.user', models.Model), + managers=[ + ('objects', django.contrib.auth.models.UserManager()), + ], + ), + migrations.CreateModel( + name='Guest', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('city', models.CharField(max_length=255, verbose_name='City')), + ('country', models.CharField(max_length=255, verbose_name='Country')), + ('ip', models.CharField(max_length=15, verbose_name='IP')), + ], + options={ + 'abstract': False, + }, + ), + ] diff --git a/portfolio/account/migrations/__init__.py b/account/migrations/__init__.py similarity index 100% rename from portfolio/account/migrations/__init__.py rename to account/migrations/__init__.py diff --git a/account/migrations/__pycache__/0001_initial.cpython-36.pyc b/account/migrations/__pycache__/0001_initial.cpython-36.pyc new file mode 100644 index 0000000000000000000000000000000000000000..8eda0a3ebf9567d50eda2bca416c59e240a9ee64 GIT binary patch literal 1363 zcmbVMJ9FDc5C#r!J|tO^l~{>lCsojp@~Cpg<1tOiPG+Lm6G;u4n>weY?k#;jnk|`yu_qHH<%vPaYfP=eXnx z1TetNjlzsfQ_CbLk%hljZWm7E6mI0M_r1t^Wq=LN2Ll}LWd3_A@_}3!p?iyQjL=lR zt$Zn&jw)P>+)f?1>VY?6Y$Yu8v^J-e??Fqto7kq-)i-3*y;4dhI_CJF6@1@ zU?0EjpwE4be=pm`414d5IY~@7Sm`sm@ELrLHv3&xcmRhh`+w#90^HPuFIQGVqWf@! ztUXl0`5i--%4Un^S{)r9KYmOXHL!-$T2ybBwC18nrEF>RCUIOX%0~GM$px(&@iKJP z09`8@3yw~pf~us*HE+1;*G%xTp?O-~pd!+Oi6y<^OBJAd%JTFbSEQ+w9jDFm_8;tn zvZpAv-D7WQ&dUU=8vM$|tdg9Ttl-LPOAt%tO?53OkhH$t*3RUIH_FzfDMzCWEwQin z_dX3k>wF(TLcnSsYWb0duMu!c1>OxqcnINv@@acQN>z_i zoY+OqQ65nG%Yx;)8q~bBOdF(54S?6Y1YX7|m%_pbsy}UeaIR-v=u4)CuS(jFzRWQ9~qVsp!(7FT2 zdpc{2SN$ub`n+R91rwZw&bU|M=ydn*H$yzZ*e(2>jIXPLkDHl1esaRbZ$#BHKCUa# z%&R=DHqr|g-;7yZ=V{yq+I$(aZW70vOFllv;iYSOM)guSm@>d6zeVtgZMn8>67r3? zgYT|IOk%pkCkK|^-CysvUSXj69aSSd>bxW7aI>QiKWc}j`(F_w%%Fm`0nFNVbRBr` l-{z>Z9o_NXX4>%5N#E%}{!=u?=0DS2l|I72^szqQ`WM-(jM)GH literal 0 HcmV?d00001 diff --git a/account/migrations/__pycache__/__init__.cpython-36.pyc b/account/migrations/__pycache__/__init__.cpython-36.pyc new file mode 100644 index 0000000000000000000000000000000000000000..861c9db3e9e1e7e724de226f05efdedfe3c55d75 GIT binary patch literal 182 zcmXr!<>j(%d>zLC1dl-k3@`#24nSPY0whuxf*CX!{Z=v*frJsnuVnp<{M=OilB8k- zOXEcSfTH}Y)Z~(4{et|WlC=Ds%zOmPDKR-)Ke3=7Co?&*Br`t`A)}v|oSa{pSE8Sr lnO+2zE7p&X&&1}T`nc#KspCsClj%gU>(tYU(`kItg+p;68Zt$&Albye zrdR)v{DB_(L-yKB^A~z)7oeV<9!dM!}!D4cpQ?S(JcG4 zfB|M^%+0Ymx5k#KbStyR&I641MM+-7KU@4%DCbpFVUL| zU|D&dDBtqgC*c{*@^{lPm@ziN7+YYDZTK=Z#}0F69ys8#*31W!h6gS1Z=I%tcc#x^je_V_M5qN;y|!OLa2FR&FSiKz1mJHz4d>xk#P z;&F!VD4W!Cv^boib#~HouoKsnh!V--iUGC@$>*`Wj;`1>1|^fUiQh2n{KDi!lq|~Q zIYYPNRmML2O`X#-smtQGQO5GLy2LiHGLgJcJ%=uZN*VgK%%X(451pDK-s~-)^+ydv zYScjF5p^f47+RG;Kc1A8jFYNoqoYssrkrI^VoT`ICAt^nzv6$|hJjAS-d5ATDn(tOm$4W~buyk`ol`z7VAHtHD5An}wG5?W z^epL8*3wg{AD|y;LZS%6D54*%&KSv^DEhgMGX$C~$- z>erN%ih;q1%5kca#o+idmJ9KMGHk@~R7l3t{0AzK2eUX&1zIpcU-PGE4^Li2=dUil zKRbVct>e+_&T}Cs?R*hZ6l`%#yf@@GDnGUS#RivR&IZ+_96mXU z2R}+NV@XvG3L&eh$hcTb&xxo(Tof5k^nJ7T40Is|>zin>*^vF>TB@tAMYBAm#kU;W za~#vM4$NH|Ahi~d>zLC1dl-k3@`#24nSPY0whuxf*CX!{Z=v*frJsnuSETf{M=OilB8k- zOXEcSfTH}Y)Z~(4{et|WlC=Ds%zOmPDKR-)Ke3=7Co?&*Br`t`A)}v|lT@0kpPQLp j1ePh*kB`sH%PfhH*DI*J#bJ}1pHiBWY6r5q7>F4F@Y^yd literal 0 HcmV?d00001 diff --git a/portfolio/album/models.py b/album/models.py similarity index 97% rename from portfolio/album/models.py rename to album/models.py index 365b608..76ee1b4 100755 --- a/portfolio/album/models.py +++ b/album/models.py @@ -1,6 +1,6 @@ from django.db import models -from portfolio.account.models import Account +from account.models import Account from portfolio.utils import OneToManyModel class Album(OneToManyModel): diff --git a/portfolio/album/serializers.py b/album/serializers.py similarity index 100% rename from portfolio/album/serializers.py rename to album/serializers.py diff --git a/portfolio/album/tests.py b/album/tests.py similarity index 100% rename from portfolio/album/tests.py rename to album/tests.py diff --git a/portfolio/album/views.py b/album/views.py similarity index 100% rename from portfolio/album/views.py rename to album/views.py diff --git a/portfolio/comment/__init__.py b/comment/__init__.py similarity index 100% rename from portfolio/comment/__init__.py rename to comment/__init__.py diff --git a/portfolio/comment/__pycache__/__init__.cpython-36.pyc b/comment/__pycache__/__init__.cpython-36.pyc similarity index 100% rename from portfolio/comment/__pycache__/__init__.cpython-36.pyc rename to comment/__pycache__/__init__.cpython-36.pyc diff --git a/portfolio/comment/__pycache__/admin.cpython-36.pyc b/comment/__pycache__/admin.cpython-36.pyc similarity index 100% rename from portfolio/comment/__pycache__/admin.cpython-36.pyc rename to comment/__pycache__/admin.cpython-36.pyc diff --git a/portfolio/comment/__pycache__/models.cpython-36.pyc b/comment/__pycache__/models.cpython-36.pyc similarity index 58% rename from portfolio/comment/__pycache__/models.cpython-36.pyc rename to comment/__pycache__/models.cpython-36.pyc index 9a2d5ba18aed7c07d8754fa37b95654913e4ddce..b31764bf09459f285bb5b7835e7cd8809174def6 100644 GIT binary patch delta 42 ycmZ3)(Z|7Q%*)Fqv`s30%0|vgM#iwo&5W*_FEK7*WQ>|z&g{e##W(pVb1VS+Ukp?L delta 52 zcmeC0VyIW8nZC=pViabx*B8^@0AHS0Z;q=oi= z2rUII|6^OK`~?~q+c_?R23xzD+3`HTc{95^8o9gQcB1cwrv1=vJ?LwDxSBC;paChg zl7ytBAtkL(3q3RrHPFHMtbxHuKKP`E1E43GKe)ym&8NyOvsA<~<5i=~k^?K6Yvgw}Iemf(7={IHlm=nFB5imjpczJ(mr0 zFSqhhz5yfHSkhCP>aYoBMqq2HcUX7+1MBWzSoi+LN@=(W+gRxXP%`)1C?Tz~NPd!ZXPf zm0a2JypbYKq^~QZgEUVwRzRaHUiY2y4i~JEE5d`c^{z%M>sVWoh*WH8LTOtCTAWb7glG;+!dKHa(e5_g^WO*X(BYzG&h}OSav9rokC6 zSs>@lm5fd>zLC1dl-k3@`#24nSPY0whuxf*CX!{Z=v*frJsnuVnp<{M=OilB8k- zOXEcSfTH}Y)Z~(4{et|WlC=Ds%zOmPDKR-)Ke3=7Co?&*Br`t`A)}w1pPQSSSE8Sr lnO+2zE7p&X&&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 literal 0 HcmV?d00001 diff --git a/portfolio/playlist/admin.py b/playlist/admin.py similarity index 100% rename from portfolio/playlist/admin.py rename to playlist/admin.py diff --git a/portfolio/playlist/apps.py b/playlist/apps.py similarity index 100% rename from portfolio/playlist/apps.py rename to playlist/apps.py diff --git a/playlist/migrations/0001_initial.py b/playlist/migrations/0001_initial.py new file mode 100644 index 0000000..c6b0cad --- /dev/null +++ b/playlist/migrations/0001_initial.py @@ -0,0 +1,25 @@ +# Generated by Django 3.0.8 on 2020-07-24 10:21 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ('album', '0001_initial'), + ('account', '0001_initial'), + ] + + operations = [ + migrations.CreateModel( + name='Playlist', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('title', models.CharField(max_length=255)), + ('track', models.ManyToManyField(to='album.Track')), + ('user', models.ManyToManyField(to='account.Account')), + ], + ), + ] diff --git a/portfolio/playlist/migrations/__init__.py b/playlist/migrations/__init__.py similarity index 100% rename from portfolio/playlist/migrations/__init__.py rename to playlist/migrations/__init__.py diff --git a/playlist/migrations/__pycache__/0001_initial.cpython-36.pyc b/playlist/migrations/__pycache__/0001_initial.cpython-36.pyc new file mode 100644 index 0000000000000000000000000000000000000000..8571e9e69766f651fb454c0cbca04242177935fa GIT binary patch literal 826 zcmYjP&2AGh5VpOWpG~$+DTMSIW8OR;tRlcBw!VCikKH6`^y2$IQ?O zl2RZk1Bx_9@MO-?P_&k9XhBi&;avoMh;J#PJw!d&he3l58uVy` z<{=#3vN=ur@EDVO>Y~YgR#&dYi|ML#@pwFbmB~t4$qU!vd9GHKb=}K?uM26cV-n6C z`}lqsx|px5%5p8Z72x`{mL=Eg>{_f{WQ0Znc_Uo>Md+zABCB{QT+2#Zh`Ya7=8&Q+ z{A*T-YHk-8(LBGt={I?dt~|gO%qkbIknLu$&1H1D$q7{r8_M=fiUQ2Vkm(lE>bB=* zy7S+UT{mlf&obA`GL(N+2=wDD`@G_XCqdM?FFFQMiwZ=QOJOvQ0df7arpSqJoDTd= zbc(f~`;T38w%~f>4ko->Uny@l7d=&rZQp+o{oJSI&7VcGP^C!h)Qn#r^W;*irO2&G zYNhQ=6;kcIcPK={>$;G6GeEmYQg54*?4~Pu*uPP|)_!cgBIXcHmxTeN?J%T_9npQ< oP5c6z8NrfQb2Wl#Q*u*f6WnFJ@m?U0>%Q5j_|}VIyhaDXKUCE0?*IS* literal 0 HcmV?d00001 diff --git a/playlist/migrations/__pycache__/__init__.cpython-36.pyc b/playlist/migrations/__pycache__/__init__.cpython-36.pyc new file mode 100644 index 0000000000000000000000000000000000000000..8bdc27b43df5e5e7317b0558f989f3753fbfb777 GIT binary patch literal 183 zcmXr!<>m5gd>zLC1dl-k3@`#24nSPY0whuxf*CX!{Z=v*frJsnuN3`^{M=OilB8k- zOXEcSfTH}Y)Z~(4{et|WlC=Ds%zOmPDKR-)Ke3=7Co?&*Br`t`A){ZAlUSLPSzMx@ mo0(n&mMqqfkI&4@EQycTE2zB1VUwGmQks)$2eQ2wh#3H*yEBvk literal 0 HcmV?d00001 diff --git a/portfolio/playlist/models.py b/playlist/models.py similarity index 71% rename from portfolio/playlist/models.py rename to playlist/models.py index 0902c78..9d2ce2b 100755 --- a/portfolio/playlist/models.py +++ b/playlist/models.py @@ -1,11 +1,11 @@ from django.db import models -from song.models import Song +from album.models import Track from account.models import Account class Playlist(models.Model): title = models.CharField(max_length=255) user = models.ManyToManyField(Account) - song = models.ManyToManyField(Song) + track = models.ManyToManyField(Track) diff --git a/portfolio/playlist/tests.py b/playlist/tests.py similarity index 100% rename from portfolio/playlist/tests.py rename to playlist/tests.py diff --git a/portfolio/playlist/views.py b/playlist/views.py similarity index 100% rename from portfolio/playlist/views.py rename to playlist/views.py diff --git a/portfolio/__pycache__/settings.cpython-36.pyc b/portfolio/__pycache__/settings.cpython-36.pyc index 622a8bf01406d55f96e50b52b0649c2005417183..0ff77cfe8558c49913d99bd29152d07eb3ab878d 100644 GIT binary patch delta 338 zcmYk2%Syvg5QcM3V^X5k^p;+<-eT2StJQkfg-b!Y5=3Srv41(FG_Cdm>c&Mua4Ffi z$V*6}&)~)vaO;bBa3KzSKl8)z&oD36hh!(mGDhZHeJ?=rg2+h)+wfJ%*)HAJy$CJssIDSV+JI^4P-k2aWTh4W#9UA?kKJlffT_Mp%md1krdGs zv2^w*?iBHK#uSMZ$#kX^sX0thJSoyqyeTs23@I!rvMF*Y@+k@_is>wwj44WUSkf7z z_)?Uk_)}C;R8twVn6d;?*;3S+nNrl}Fl91E38rYIXaZGgq-cRjZ7`{m$(YU(C6wZ* z8zr2g7bTLy5+w@6Vn8gOq8}vzH^`uwDM}J(tzn8$igAibis>9?paEt;M@gkH1v6-x rZ?<9#W7@o%`7ARd`{qve^Gs|iK+hGaOpfEqW6Ya;mP>i^FD^d-R70``@P~bhH7*CKwfHD$pXk4IdfQEuP zqGJtgfE}<3JW&c)G*|cBqZy6nU3pWa6IsrzKh4XJSLt~}K=Lb0p$b!}$~3AG0SILL zD$}XX3~Dfwn)@y5*I1p_nMEyTQ+vPV{04KV!(8eT0W+BPnjk|StMLkk^f$GC$obPt?_9*W-38wDaJp^vHPiKBo-bOeL#H>sZf z<5Ba*fv`V0#IAP?qv(&vp%{qsB%Q$ITo_DuZShy!RZ_Q!i<}?`E15?=3YwkyR}XCZ zxWK3TRe{e%9wqK_tJ!+7oF8PF?-d>jm-6);W4K%&tjdM9{Yk$ZO?jPe7t+@sXjFd} delta 536 zcmaKmJ5B;o7=`B!U>snO$2^$fA;?1zfx-n?xdIE5n;3(hU*k9z6GSaZoW^Df!v<_D zt!!O`rF+m-IG0dNWpi@A^X1b$<%bbnhkctbRKlPQ#@O>YM|Y#|r57V;>BENX2O zQ3@H1Fa?uzuXD*@g$drJ?84g(6yBqr*N06eY?Q-9^p#|X3^*}%sSG#96>?CCag|)u zVqB*xwqx9&8k#ZQp*oIQv7t>3bYk44CU)1HM2}Q&&l?0PCDEr;bmAaj5p7^^`NizR ze>_>`;#7~?EGJ_t3Z9wx z=l5dta7~YQv%H)OGK$h=XOsE$^lB|jayMj{QtB7CLeO-+ww4t3@_X}nV=U`<3GMR_ DxP^b? diff --git a/portfolio/playlist/__pycache__/models.cpython-36.pyc b/portfolio/playlist/__pycache__/models.cpython-36.pyc deleted file mode 100755 index a31e78fa0beb92d6a80028199c3f8d6a20f4fbed..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 581 zcmYL`%}(4f5XbF&ZwM_s#!A)ZzzrcpKLjTb5Mkf+6U8ySke1 zxq{M;DM6_#DTQ`M>A9lx*U02_Vj{?Nv#%>=&RZe5OKoeVa33#OxB0HU4{_t?JsWZ(*1;Sz_~)x2;szGmH0FZj=(hwS<07E^9$mwaH; h?6<)nC%yDf6mHq+nCK9SxZ-3Q+9}@Ft)dE7@hc-tm-+wz diff --git a/portfolio/settings.py b/portfolio/settings.py index 1ec5195..2280cf5 100755 --- a/portfolio/settings.py +++ b/portfolio/settings.py @@ -42,6 +42,11 @@ INSTALLED_APPS = [ 'drf_yasg', 'rest_framework.authtoken', 'portfolio', + 'account', + 'album', + 'comment', + 'playlist', + 'rating' ] MIDDLEWARE = [ diff --git a/portfolio/urls.py b/portfolio/urls.py index a72d08c..33041d8 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 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 schema_view = get_schema_view( openapi.Info( diff --git a/portfolio/rating/__init__.py b/rating/__init__.py similarity index 100% rename from portfolio/rating/__init__.py rename to rating/__init__.py diff --git a/portfolio/rating/__pycache__/__init__.cpython-36.pyc b/rating/__pycache__/__init__.cpython-36.pyc similarity index 100% rename from portfolio/rating/__pycache__/__init__.cpython-36.pyc rename to rating/__pycache__/__init__.cpython-36.pyc diff --git a/portfolio/rating/__pycache__/admin.cpython-36.pyc b/rating/__pycache__/admin.cpython-36.pyc similarity index 100% rename from portfolio/rating/__pycache__/admin.cpython-36.pyc rename to rating/__pycache__/admin.cpython-36.pyc diff --git a/portfolio/rating/__pycache__/models.cpython-36.pyc b/rating/__pycache__/models.cpython-36.pyc similarity index 80% rename from portfolio/rating/__pycache__/models.cpython-36.pyc rename to rating/__pycache__/models.cpython-36.pyc index 78f9c7d48959223d96d4ffc9cc49d5b67e7d78c1..2c2a58502989914180cf2ec592e9083fd15ece8e 100644 GIT binary patch delta 54 zcmew;a#DoXn3tC;YO7SdI6DKwz-F)@Zt-pJ&-iFq0uBj4nOoFYK-0H-7) J&*UeZy#TQd56%Dp delta 112 zcmX>p@==7-n3tEUe6v)%=|;}wOpNi9H!`_ye#5kY%}=5rzo;ZFKPNL^FEKeezcjBz oFE>9WHK(|Um4SgF3Q0OSKQ}iOAsz5E5L>&g{-NKObj%VWGYK&xZS`t7-pfwZ}kt z2fw_J3ur)MEg>V4&=DnSPh)*#9B80}@kRrKk*M)nA2ooUXm;Z*-qCC-+esJ*uLyaX z%VxrX#rcu1Z1ZOUg&q9ze~G3sZA3sDQ6M87dhjhg3=o4gq9!!KWM*Um!PkNov@eYb zg%0Xk@Ev>~P*{THONu%Jb#2y(x{(o+`Zd?M1D1HIoiQdTR!N(&7#%K|~!R~L#){A-D zPi4c4$J0c12ZO<5H%!AK^kQlHJV{tuNYnFuK1E^qWzNKIrTqgLlLnH8urKN1Gux0| zZ(4BI7tAXd$WA80#1j|p8M}}zyoWBs8I#>}CdNExZt5jWHqO0x%HATcG-)0GesXwv z_~)LewnuvhL$#f4onBp$?zTI%PTgrA4kBOj%xhP_^0GJgB-&c8018m8-drQgvig(ZFOx6Bm@tnrzkN zWhJjvXH*TvY9)Uj{gSlYvTLp@+pdd~Vj44)yRQ4!)QeSlaA(fx(*>5X6j{XrKi|J$IG%f^h-zA7N;Vhb3HJf`XAHJE`*xMsy+D*E*3R(N+@X>2BCC~tdYB9 zLvQOJyDPofP1&k)?!&mOV^zBK|CRk}X!qyU5H@0$cdrXjNe&vM^;^}tC#nOv3V4ZF F`g;tvw50$5 literal 0 HcmV?d00001 diff --git a/rating/migrations/__pycache__/__init__.cpython-36.pyc b/rating/migrations/__pycache__/__init__.cpython-36.pyc new file mode 100644 index 0000000000000000000000000000000000000000..ece99f3706b5e166f118bdeed8bf8c01fa7a285b GIT binary patch literal 181 zcmXr!<>d-$d>zLC1dl-k3@`#24nSPY0whuxf*CX!{Z=v*frJsnuO$79{M=OilB8k- zOXEcSfTH}Y)Z~(4{et|WlC=Ds%zOmPDKR-)Ke3=7Co?&*Br`t`A){Xe6v#{0&&^B+ kvGVhZ_2c6+^D;}~@~ literal 0 HcmV?d00001 diff --git a/portfolio/rating/models.py b/rating/models.py similarity index 91% rename from portfolio/rating/models.py rename to rating/models.py index 5d132c6..3440428 100755 --- a/portfolio/rating/models.py +++ b/rating/models.py @@ -3,9 +3,9 @@ from django.utils.translation import ugettext_lazy from rest_enumfield import EnumField import enum -from portfolio.account.models import Account -from portfolio.comment.models import UserComment, GuestComment -from portfolio.album.models import Album, Track +from account.models import Account +from comment.models import UserComment, GuestComment +from album.models import Album, Track from portfolio.utils import OneToManyModel diff --git a/portfolio/rating/serializers.py b/rating/serializers.py similarity index 100% rename from portfolio/rating/serializers.py rename to rating/serializers.py diff --git a/portfolio/rating/tests.py b/rating/tests.py similarity index 100% rename from portfolio/rating/tests.py rename to rating/tests.py diff --git a/portfolio/rating/views.py b/rating/views.py similarity index 100% rename from portfolio/rating/views.py rename to rating/views.py