From ab0376671e255300524cebd77359ef6cab6f3732 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 19 Jun 2024 15:12:56 +0300 Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=BD=D0=BE=D1=81=20?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=BF=D1=80=D0=BE=D0=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/proj/api/migrations/0001_initial.py | 26 ------------ .../0002_remove_nowplayingsong_duration.py | 17 -------- .../0003_rename_art_url_nowplayingsong_art.py | 18 --------- .../migrations/0004_delete_nowplayingsong.py | 16 -------- .../conf/__pycache__/__init__.cpython-310.pyc | Bin 165 -> 138 bytes .../conf/__pycache__/urls.cpython-310.pyc | Bin 1518 -> 1491 bytes .../conf/__pycache__/wsgi.cpython-310.pyc | Bin 572 -> 545 bytes server/proj/conf/settings/__init__.py | 2 +- .../__pycache__/__init__.cpython-310.pyc | Bin 202 -> 174 bytes .../settings/__pycache__/base.cpython-310.pyc | Bin 3759 -> 3360 bytes .../__pycache__/development.cpython-310.pyc | Bin 668 -> 704 bytes server/proj/conf/settings/base.py | 37 ++---------------- server/proj/conf/settings/development.py | 8 +--- server/proj/conf/settings/production.py | 13 +++--- .../__pycache__/__init__.cpython-310.pyc | Bin 169 -> 142 bytes .../__pycache__/admin.cpython-310.pyc | Bin 210 -> 183 bytes .../loginApi/__pycache__/apps.cpython-310.pyc | Bin 452 -> 425 bytes .../__pycache__/models.cpython-310.pyc | Bin 207 -> 180 bytes .../__pycache__/__init__.cpython-310.pyc | Bin 180 -> 153 bytes .../news/__pycache__/__init__.cpython-310.pyc | Bin 165 -> 138 bytes .../news/__pycache__/admin.cpython-310.pyc | Bin 162 -> 135 bytes .../news/__pycache__/apps.cpython-310.pyc | Bin 440 -> 413 bytes .../news/__pycache__/models.cpython-310.pyc | Bin 771 -> 744 bytes server/proj/news/migrations/0001_initial.py | 13 +++--- .../0002_alter_news_author_alter_news_date.py | 23 ----------- .../__pycache__/0001_initial.cpython-310.pyc | Bin 727 -> 876 bytes ...ews_author_alter_news_date.cpython-310.pyc | Bin 685 -> 658 bytes .../__pycache__/__init__.cpython-310.pyc | Bin 176 -> 149 bytes .../__pycache__/__init__.cpython-310.pyc | Bin 169 -> 142 bytes .../__pycache__/admin.cpython-310.pyc | Bin 496 -> 469 bytes .../rubricks/__pycache__/apps.cpython-310.pyc | Bin 452 -> 425 bytes .../__pycache__/models.cpython-310.pyc | Bin 1085 -> 1058 bytes .../proj/rubricks/migrations/0001_initial.py | 15 ++++--- .../migrations/0002_alter_rubric_time.py | 18 --------- .../migrations/0003_remove_rubric_time.py | 17 -------- .../__pycache__/0001_initial.cpython-310.pyc | Bin 709 -> 1065 bytes .../0002_alter_rubric_time.cpython-310.pyc | Bin 603 -> 576 bytes .../0003_remove_rubric_time.cpython-310.pyc | Bin 549 -> 522 bytes .../__pycache__/__init__.cpython-310.pyc | Bin 180 -> 153 bytes .../__pycache__/__init__.cpython-310.pyc | Bin 172 -> 145 bytes .../__pycache__/admin.cpython-310.pyc | Bin 608 -> 581 bytes .../__pycache__/apps.cpython-310.pyc | Bin 461 -> 434 bytes .../__pycache__/models.cpython-310.pyc | Bin 1190 -> 1163 bytes .../__pycache__/serializers.cpython-310.pyc | Bin 763 -> 736 bytes .../__pycache__/views.cpython-310.pyc | Bin 1399 -> 1372 bytes .../userProfile/migrations/0001_initial.py | 17 ++++---- .../0002_alter_profile_likedsongs.py | 18 --------- .../__pycache__/0001_initial.cpython-310.pyc | Bin 924 -> 1031 bytes ...2_alter_profile_likedsongs.cpython-310.pyc | Bin 627 -> 600 bytes .../__pycache__/__init__.cpython-310.pyc | Bin 183 -> 156 bytes 50 files changed, 38 insertions(+), 220 deletions(-) delete mode 100644 server/proj/api/migrations/0001_initial.py delete mode 100644 server/proj/api/migrations/0002_remove_nowplayingsong_duration.py delete mode 100644 server/proj/api/migrations/0003_rename_art_url_nowplayingsong_art.py delete mode 100644 server/proj/api/migrations/0004_delete_nowplayingsong.py delete mode 100644 server/proj/news/migrations/0002_alter_news_author_alter_news_date.py delete mode 100644 server/proj/rubricks/migrations/0002_alter_rubric_time.py delete mode 100644 server/proj/rubricks/migrations/0003_remove_rubric_time.py delete mode 100644 server/proj/userProfile/migrations/0002_alter_profile_likedsongs.py diff --git a/server/proj/api/migrations/0001_initial.py b/server/proj/api/migrations/0001_initial.py deleted file mode 100644 index 352843c..0000000 --- a/server/proj/api/migrations/0001_initial.py +++ /dev/null @@ -1,26 +0,0 @@ -# Generated by Django 5.0.4 on 2024-04-21 17:43 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ] - - operations = [ - migrations.CreateModel( - name='NowPlayingSong', - fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('title', models.CharField(max_length=255)), - ('artist', models.CharField(max_length=255)), - ('album', models.CharField(blank=True, max_length=255, null=True)), - ('genre', models.CharField(blank=True, max_length=100, null=True)), - ('art_url', models.URLField(blank=True, null=True)), - ('duration', models.IntegerField()), - ], - ), - ] diff --git a/server/proj/api/migrations/0002_remove_nowplayingsong_duration.py b/server/proj/api/migrations/0002_remove_nowplayingsong_duration.py deleted file mode 100644 index 4c45f25..0000000 --- a/server/proj/api/migrations/0002_remove_nowplayingsong_duration.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 5.0.4 on 2024-04-21 18:13 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('api', '0001_initial'), - ] - - operations = [ - migrations.RemoveField( - model_name='nowplayingsong', - name='duration', - ), - ] diff --git a/server/proj/api/migrations/0003_rename_art_url_nowplayingsong_art.py b/server/proj/api/migrations/0003_rename_art_url_nowplayingsong_art.py deleted file mode 100644 index 9482299..0000000 --- a/server/proj/api/migrations/0003_rename_art_url_nowplayingsong_art.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 5.0.4 on 2024-04-21 18:51 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('api', '0002_remove_nowplayingsong_duration'), - ] - - operations = [ - migrations.RenameField( - model_name='nowplayingsong', - old_name='art_url', - new_name='art', - ), - ] diff --git a/server/proj/api/migrations/0004_delete_nowplayingsong.py b/server/proj/api/migrations/0004_delete_nowplayingsong.py deleted file mode 100644 index 9a81636..0000000 --- a/server/proj/api/migrations/0004_delete_nowplayingsong.py +++ /dev/null @@ -1,16 +0,0 @@ -# Generated by Django 5.0.4 on 2024-04-24 14:17 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('api', '0003_rename_art_url_nowplayingsong_art'), - ] - - operations = [ - migrations.DeleteModel( - name='NowPlayingSong', - ), - ] diff --git a/server/proj/conf/__pycache__/__init__.cpython-310.pyc b/server/proj/conf/__pycache__/__init__.cpython-310.pyc index d53f354f8e5eba5db094e55a162e88f2ed6ba4d6..dd307ba920340ee1fd35c33793f37f3300baf96a 100644 GIT binary patch delta 59 zcmZ3=*u}`5&&$ij00i}Fg%i20RetH}mn9bImzS68dxiuhrex;p7pE4Lr55QI6y;~> NC+Fv-=}&A`008cc61e~X delta 86 zcmeBTT*}Cu&&$ij00a}FBPViO+kbThvYoABLW@(2ieoO!y0GuU{tFu}HeKw#*dF5< k5|o&dnIDs$SyBXM02P&`7R3}4BGvJ&&s^YxPR^Gb>`lZu#t2H%?e zgxM0PK#m2Z*q23)OA07j1hVwjL5V=M`o*b5WvNB_1x5K;`al<@ K=}(@;8Ug@&`cZKJ delta 272 zcmcc2{f?VApO=@50SF3qWTk!G$lJiA9K~9anwVRx$#{z+DX};;FEKYYioK{bsVFnM z_!diXeqMUiq@q&O1`GNF7v5T84- zG$k`1D#8!ee2t~XLlwv>0uf&wfrPVFOlWaxQE|+LSr_(Q*neTe#ionh7u#bzLxK{4 gx?|EaONzh@prW$WqL_lB{Hz$DW7A?L*RzHI0P%`hTmS$7 diff --git a/server/proj/conf/__pycache__/wsgi.cpython-310.pyc b/server/proj/conf/__pycache__/wsgi.cpython-310.pyc index c38fff53675a58a94e1f9c52fc3d769949763045..db8885968656a664b4f00f2188880acff077cf93 100644 GIT binary patch delta 63 zcmdnPvXF&0pO=@50SM~V3e&nb@}6N-`K75}mRO`;US6*684{G3l9{hxoLW?tTBKi4 Rl%J)aoS&DbKUsoF1pr_p6e|D# delta 90 zcmZ3;vWJB?pO=@50SH7&BhzMYej=3=F!oCapFKoEjbg}zl odyHpDP-04EeoT61NfDRxGpO=@50SNR?6{RUoyeg=_lvsr2z#>N;31(i}fe2QUCxd!XA+T delta 122 zcmZ3-c#4rXpO=@50SH7&Bh$1d^4cUuai^q~rRL-pqnsW70EAiogt@qO#PYn1Z7GteE8dytJ6& P)RL0Sy!7IjiG2zHj1DaZ diff --git a/server/proj/conf/settings/__pycache__/base.cpython-310.pyc b/server/proj/conf/settings/__pycache__/base.cpython-310.pyc index b012966af4121a0bcb75091781941eaca5600b3d..d21da598b49274f2c7b65ad7aa7046ee348ef9f5 100644 GIT binary patch delta 622 zcmYjNzi-n(6t>U#;U+Oul}H5=AuW&+T5u^8#D;OMt&1B+wxdWMuuRSgrcE53okk#L zHYPK6=*oZ)>feCGijXSwRu84bGI5r{isKNu>b0E*+tr!5-xf*l{S-k1a-2p&u1 zy>2%g4`VoZBYe-~uCRe%T$AK2+3&b;uI8mAsu*ee6T+?!_Psbf!CC_ zZo5j`-oQ;;Qx#h?ny#uVmW3@yz7<*vbsjRrdl~(zFy%Ue3yP{@%W`ew32wT&wuWtO z3q#@*TT39ChGDx6&4gmhG&Zq%Mnv6McheLrXgAMJ$zc)CLbib)x7R^ZblvFShPz={ zHfy|G`Z5FOO~Y1f?52+`&0#$X(oG(cRjKMNvd=)l(zaSUb~igVlvTsD+*27>HE|;y zN71eK9POlzq}$&WdDo-zWHOO8+w_=&GV_!7fK6!wmHH|w8JlqQ8z8bW}yZm4N#X&Qb~9A^U#CTn>&LK<0GO*~^~leO2H z*#!~_Me3zOhzes+ijaW5b=oS-YUllb?|V=4 z!=9htANTtE(+N1Yep_x#4kZ##Vq^QsfN>gr@#D?$UD7%|%u@8@_YySEM%aFOq^r{L zp6`=4e4lm^J=&D$XLOW)-c8bD+w?g0MOVS2bOO9z(n)%}o5Tm`33{@L@IjiOr`$uW zF+3(E*chFnUtO0#o~DKC5*?cEBK!f(;t%PGrUc2zOyr8;x63F+v#^IDCjEC$PqYMefvB1lC-y>9h+S2WJAoc!hfn z$7NU{0d+i_BoOE$^|}|deSCW=`AAmZhRyK7aIZG99w{^W^un37g8%|3&HNH+Qy1Fg ztDaAM@XP|(*)8YVK+vJYXZDgKe2=f@p@{DSu$&qxF1yIwNU6I-h)9bmw1Iwfc(YTK-JZjTp=TtQ=4Xvu zGSdE|%=g6ZREK*V(gd1(UrbGj`Yysej@QP!sUygu%WQTT27uY@;dtzLsp-O9Q3%^q| zs;1q8v5QrGMxVDzg|himg6ojlyZ)L3t$4h)053??Hon{VedEr?FPmR)UfcYpR_D}m>=&`)E0>tWcki&q@8SeG;rCJ1i<26cr|;ef(DSJ yN~rhAFHmZ`CI2lC#u53Yto|!ssE^Sx^cp3RtUgCsh`q`xT2hnLSF(bT_WB>nfAyTT=6{ukdAWVfs286f|Vq$Fao&{xX zegU$&F|O%(!QK>2%pk?Af`vBbHl`1K9rMh<2WNztj7&4PfQ4&=zf5N&kH{yAJD)+k zLW0F0JG1)M%A-Oxy&6xmb;&`Q%7a zKOXQQ`jMpLfW7x)CS*28_l}Zo9>0;cV4|CY1{R@UaM1+ z`gzOiO1<6cbdwCc0GT+@D@dD#3!g{fjD>L}mwbe0Ihn1wUH6Ua)jgTq!SlAXM^QLF z6w1O^yr|y8cNKjl{7E{ev^{keL+&h>OQ+H8q_;YP@de|~oJUh9&8tNm`{6`5$)&cp eUsfqfDCn9AnxVlz=v)0awI6FcK(!puUw;5nS#;e1 delta 470 zcmYjLO-mb56n*z~X7VO8X_SJ{ibX+?RG5uB31T!sA{fv_3d2B&-j_J}n2GO=0o_FE zqKo1}W+yJ{(p`T+Tlx!?3g73CT074O z`I(xh(3DwMBhRmv=SC($12bGhHcQaFp+2}eX1Re@k?;&B9d-d|cXd%rHIkR)lZm-o zkZVZrc`w_yT&r)pHW18n8>iHj#qA4F9_s(6Fnym^sNI9&0wnOJAyhY#tY?t7nkT*J z>=kyJK|6Htz&U6hc6or(k;gqh;wxuawfv_GG%+f*t!k~3XtmN#CEkW5aAN^)^RC5% zp)bOq&x5Fti+{kvjLSAk^~$?)buTf?rA8@rbvM@O;>fiQ!=U9z6&9z0sW!q?bVtOC zRHyW?t7vo8+m~EOZ+t!eGX6ULJb6F)IQigJ8+%RkL$B>e;;&GlAs602gdHz^?MWU* ze$bX4@*(eqgS3}3I89iwA7Xq-&Bb~3pAiNcHGpc=qF{jbTl>Q@ujv#pY6JWA2q?CG AHUIzs diff --git a/server/proj/conf/settings/base.py b/server/proj/conf/settings/base.py index e8e6cfe..79d2cd7 100644 --- a/server/proj/conf/settings/base.py +++ b/server/proj/conf/settings/base.py @@ -33,12 +33,12 @@ INSTALLED_APPS = [ 'django.contrib.sessions', 'django.contrib.messages', 'django.contrib.staticfiles', - + 'rest_framework', 'corsheaders', 'rest_framework_simplejwt', 'rest_framework.authtoken', - + 'news', 'rubricks', 'loginApi', @@ -47,7 +47,7 @@ INSTALLED_APPS = [ 'api', 'account', 'config_site' - + ] MIDDLEWARE = [ @@ -132,38 +132,7 @@ LOGGING = { 'style': '{', }, }, - 'handlers': { - 'update_history': { - 'level': 'DEBUG', - 'class': 'logging.handlers.RotatingFileHandler', - 'filename': LOG_ROOT / 'update_history.log', - 'formatter': 'extended', - 'maxBytes': ROTATE_LOG_SIZE, - 'backupCount': ROTATE_LOG_COUNT, - }, - 'upload_media': { - 'level': 'DEBUG', - 'class': 'logging.handlers.RotatingFileHandler', - 'filename': LOG_ROOT / 'upload_media.log', - 'formatter': 'extended', - 'maxBytes': ROTATE_LOG_SIZE, - 'backupCount': ROTATE_LOG_COUNT, - }, - }, - 'loggers': { - 'update_history': { - 'handlers': ['update_history', ], - 'level': 'INFO', - 'propagate': False, - }, - 'upload_media': { - 'handlers': ['upload_media', ], - 'level': 'INFO', - 'propagate': False, - }, - }, } - REST_FRAMEWORK = { 'DEFAULT_PERMISSION_CLASSES': [ 'rest_framework.permissions.DjangoModelPermissionsOrAnonReadOnly' diff --git a/server/proj/conf/settings/development.py b/server/proj/conf/settings/development.py index 9dc9cf2..9088409 100644 --- a/server/proj/conf/settings/development.py +++ b/server/proj/conf/settings/development.py @@ -6,7 +6,7 @@ ALLOWED_HOSTS = ['*'] # Database # https://docs.djangoproject.com/en/3.2/ref/settings/#databases -""" DATABASES = { +DATABASES = { 'default': { 'ENGINE': 'django.db.backends.postgresql_psycopg2', 'NAME': 'it_radio', @@ -15,12 +15,6 @@ ALLOWED_HOSTS = ['*'] 'HOST': 'localhost', 'PORT': '5433', }, -} """ -DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.sqlite3', - 'NAME': BASE_DIR / 'db.sqlite3', - } } REST_FRAMEWORK['DEFAULT_PERMISSION_CLASSES'] = ('rest_framework.permissions.AllowAny',) diff --git a/server/proj/conf/settings/production.py b/server/proj/conf/settings/production.py index e7c3dd3..a17a09c 100644 --- a/server/proj/conf/settings/production.py +++ b/server/proj/conf/settings/production.py @@ -2,19 +2,20 @@ import sys from .base import * DEBUG = False -ALLOWED_HOSTS = ['*'] +ALLOWED_HOSTS = ['82.97.242.49'] # Database # https://docs.djangoproject.com/en/3.2/ref/settings/#databases -""" DATABASES = { +DATABASES = { 'default': { 'ENGINE': 'django.db.backends.postgresql_psycopg2', - 'NAME': 'ldirect', - 'USER': 'flexites', - 'PASSWORD': 'flexites', + 'NAME': 'itradio', + 'USER': 'postgres', + 'PASSWORD': '55667788Vxod', 'HOST': 'localhost', + 'PORT': '5432', }, -} """ +} if len(sys.argv) >= 2 and sys.argv[1] != 'runserver': from conf.sentry import sentry_start, SENTRY_CONFIG diff --git a/server/proj/loginApi/__pycache__/__init__.cpython-310.pyc b/server/proj/loginApi/__pycache__/__init__.cpython-310.pyc index 3d3080751980fc3e251b0cb6fe62a8d67eda4179..5da63d08a818236480cce0386ed648472d829636 100644 GIT binary patch delta 63 zcmZ3<*vH77&&$ij00i}Fg%i20HGUcDmn9bImzS68dxiuhrex;p7pE4Lr55QI6y;~> R=j5kn<~bH*>QC%c002Q?6j}fP delta 90 zcmeBUT*=6t&&$ij00a}FBPViOJAd^AvYoABLW@(2ieoO!y0GuU{tFu}HeKw#*dF5< o5|o&dnIDs$SyBXM02P&`7R3}4-Y&yb+Rl+65?^vseXFaxNlEVU@6peR2p RCMQ2VGtaRgGiKr}Spc>sEW-c* diff --git a/server/proj/loginApi/__pycache__/apps.cpython-310.pyc b/server/proj/loginApi/__pycache__/apps.cpython-310.pyc index d47564df3c6e1ddaa13ebbb065544f324698eec9..052a14119b7d3e247a109c57d225233807375005 100644 GIT binary patch delta 67 zcmX@YypowWpO=@50SM~V3e%=+ej=3=F!oCapFKoEjbg}zl sdyHpDP-04EeoT61NfDRJH>NTg8MHrxq2*T$puX--Z1bHe77F*nP1* q#xo=+F(orUCOxyH2+RN~DoZVjDJaU%ipj}O&&+cy$c&jdO%4DgB_yx_ diff --git a/server/proj/loginApi/migrations/__pycache__/__init__.cpython-310.pyc b/server/proj/loginApi/migrations/__pycache__/__init__.cpython-310.pyc index 6dae44d640b4cdec5d7942cc33eae904ba97bb0e..d72607b42c763ae3d2993479fffc40c76a2cd86f 100644 GIT binary patch delta 74 zcmdnOIFpe(pO=@50SM~V3MX<~8~?J=FH0=aFE20G_Y4V2Ov%jGFHS8gOD)nbD9X>$ c&&f~E%yTTr)X&XKFG?)Q%+D*j04gd=Es7~9%Fl|)$xqMBb1cY=$<0hJN-W9D&nu3ZSg8O2dMGGF diff --git a/server/proj/news/__pycache__/__init__.cpython-310.pyc b/server/proj/news/__pycache__/__init__.cpython-310.pyc index 2df7509e88a1d054f90e10547d6772cb10093be0..c158afdaf0912bd8f268f78c53cea9b5703202c2 100644 GIT binary patch delta 59 zcmZ3=*u}`5&&$ij00i}Fg%i20RetH}mn9bImzS68dxiuhrex;p7pE4Lr55QI6y;~> N=cSex>rZS|008e563_qu delta 86 zcmeBTT*}Cu&&$ij00a}FBPViO+kbThvYoABLW@(2ieoO!y0GuU{tFu}HeKw#*dF5< k5|o&dnIDs$SyBXM02P&`7R3}4Hq)$ diff --git a/server/proj/news/__pycache__/admin.cpython-310.pyc b/server/proj/news/__pycache__/admin.cpython-310.pyc index b50d26567f633792dc9346414b0032ba52ac39da..68134d629e5731f2759e3ae17f497f8d6e8cba47 100644 GIT binary patch delta 85 zcmZ3)*v`nE&&$ij00i}Fg%i209e-)*mn9bImzS68dxiuhrex;p7pE4Lr55QI6y;~> k=cSex>nEn)8_ k2}(@K%#TUWEGYsrfQrgei((3j^0Q*{Qp<~DCT7V302w$TegFUf diff --git a/server/proj/news/__pycache__/apps.cpython-310.pyc b/server/proj/news/__pycache__/apps.cpython-310.pyc index b5a95af59e7fa1542877c161e2f58e6b5b021615..f3907b479266a996afe479995513ba1367c6babf 100644 GIT binary patch delta 63 zcmdnNJeQd_pO=@50SM~V3e$Qv^0G6k{L<7fODxhaFE7{k3<*k1$;{U;PAw`+Ez&P2 R%FoizOD!+fpB&7X3IIM}6Yl^3 delta 90 zcmbQsyn~rHpO=@50SG2UN2X2M$ji=X|J4!5b+(ELElw>ej=3=F!oCapFKoEjbg}zl odyHpDP-04EeoT61NfDRd%?<^&&$ij00i}Fg=wi9d1o`K{LHV%6t~Y8$4Q*F0~8jd3Z_UXF3c4wv?_FH2k7L*xOo@%j6cHJZb&D-HWaZS zv9Ys-0ja7)*_oX6R;K<7NPIkBQnli&dw%ckef-|d4=zSV#-BdonK+#2Xlv`*~|W3=54k;q3F;jksi z_GX7l+b{Ce>j~!P3}kB{c4Wl{{Fk9)$U3mTUqrd2NfAXV4pUKu%ItF%LAHyXTb=^yd9vww_!>pT zP`5qrdErNuGg@_?@EqHdHn0IpfF(W7GJzwa$<~JAW2bsYVN@sf10LK*rnagYvaxaC zi@CaqsAsAPp`Qe)tQ9$rGHK;JW=Cnlq>-dU*-Qs)J|UkqaTAj&@oUXF^o27V4xQ~i z^*RpHj&wT%k%msfhM99QTh8k0>K$*6ygL|)YI^Iqvt<;PMhSkD=vT;+eqATO=^yK_ z^68lJ>I`02q3fQ56E`qWHs*J*uLw{*tGElGGwoL8ZLQ5Xy{A`|&8jliTQ>dy5jYX} delta 510 zcmYjMze^lJ6rP!#+uPf7537KIG#0`Zk+TiKMq@~kE0VQvT`+6j+&ahpIA+$UO#}_3 z2nRVNjg^*m{ssCk+*QK-2ZCi%1)^{72s)2>eBbbW-(G0# zw15N%(3E5}q!|ktC2t8Zu)Yzn1npVJR%ikLNc`GuoTxKz1M&` zI0K5TA?j!DIYHziYEDq|sUoSt%zz~{oB9!QqUdWJNZqs z!$9npYt@VKR#6?uOiZa;^u=_(z94E2t&{dAK(z8ITGvA9XmmQd8eNYr$4BEIop`yMjdQpx$MA`qPbkuIQm$nXNE=w7wi~R$|G1I*FAxpO=@50SIaq6s3u7ej=3=F!oCapFKoEjbg}zl zdyHpDP-04EeoT61NfDR6XOB^c&{l8 diff --git a/server/proj/news/migrations/__pycache__/__init__.cpython-310.pyc b/server/proj/news/migrations/__pycache__/__init__.cpython-310.pyc index 4f346bbd23ce468d696da26a5ef4b436c03fd061..e63e6f9f613b75ed91ec1a2b4f9a82037733465b 100644 GIT binary patch delta 70 zcmdnMIF*q*pO=@50SM~V3MX<~>;JOQFH0=aFE20G_Y4V2Ov%jGFHS8gOD)nbD9X>$ Y&r2;Y*3ZpMFG?)Q%+D*j04gd=Es7~9%Fl|)OD!*s$<0hJN-W9D&nu3ZSgHU3*qbK0 diff --git a/server/proj/rubricks/__pycache__/__init__.cpython-310.pyc b/server/proj/rubricks/__pycache__/__init__.cpython-310.pyc index 7af52fdf5a4d5764831ba7f3b2784a0ca532f0ee..07dccd469eb24be594bfa11842a792fbfda12deb 100644 GIT binary patch delta 63 zcmZ3<*vH77&&$ij00i}Fg%i20HGUcDmn9bImzS68dxiuhrex;p7pE4Lr55QI6y;~> R7nLRzWhQ4A>rd=d002Vc6pR1> delta 90 zcmeBUT*=6t&&$ij00a}FBPViOJAd^AvYoABLW@(2ieoO!y0GuU{tFu}HeKw#*dF5< o5|o&dnIDs$SyBXM02P&`7R3}4`mRO`;US6*684{G3l9{hxoLW?tTBKi4 bl%J(vRGL(jnVem$KRJm}iSgFtR>o`qNTwKR delta 100 zcmcc0{DGM_pO=@50SH#zjZ53MkynV(`Kud{>uePhTAW%`9CKmTg?$(HU)XT5>0vIlDM!vOA*^W7Om<#%utZTqlqK diff --git a/server/proj/rubricks/__pycache__/apps.cpython-310.pyc b/server/proj/rubricks/__pycache__/apps.cpython-310.pyc index ed74ba4bd456e47f2c9c753bc0aefec62b8e5e74..26f32e50123e80bce08152374da832f664210b21 100644 GIT binary patch delta 67 zcmX@YypowWpO=@50SM~V3e%=+ej=3=F!oCapFKoEjbg}zl sdyHpDP-04EeoT61NfDRo?+nO(FHWtj82|-qFfjlC delta 255 zcmZ3)v6q84pO=@50SH#zjZ4ej$m__+7&Y0Sv4)Xt@)^cJcV3{(S9c)cY!wq)oLW>I zb79tneHZp$*l@AwV)w=N7|)QP#FWhZnDoq&A}|A}s4TT8rl2T4E2gM4sVFl!yEtaD zC({`lkXc0tf)B{O#p0V yF`G#7g9JcIkjw&`$~Sonvx^qO0*D|`;VllE-29Z%oK!nTAg`DONboR-F#`Yr7(Iyq diff --git a/server/proj/rubricks/migrations/0001_initial.py b/server/proj/rubricks/migrations/0001_initial.py index 591699c..fce9c1f 100644 --- a/server/proj/rubricks/migrations/0001_initial.py +++ b/server/proj/rubricks/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 5.0.4 on 2024-04-16 15:16 +# Generated by Django 5.0.6 on 2024-06-19 12:09 from django.db import migrations, models @@ -14,10 +14,15 @@ class Migration(migrations.Migration): migrations.CreateModel( name='Rubric', fields=[ - ('id', models.BigAutoField(primary_key=True, serialize=False)), - ('name', models.CharField(max_length=255)), - ('description', models.TextField()), - ('time', models.DateTimeField()), + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=255, verbose_name='Название рубрики')), + ('title', models.TextField(default='Null', max_length=1000, null=True, verbose_name='Заголовок рубрики')), + ('description', models.TextField(max_length=1000, verbose_name='Описание рубрики')), + ('img', models.ImageField(blank=True, null=True, upload_to='images/', verbose_name='Изображение рубрики')), ], + options={ + 'verbose_name': 'Рубрики', + 'verbose_name_plural': 'Рубрики', + }, ), ] diff --git a/server/proj/rubricks/migrations/0002_alter_rubric_time.py b/server/proj/rubricks/migrations/0002_alter_rubric_time.py deleted file mode 100644 index 9be64ae..0000000 --- a/server/proj/rubricks/migrations/0002_alter_rubric_time.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 5.0.4 on 2024-04-16 16:10 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('rubricks', '0001_initial'), - ] - - operations = [ - migrations.AlterField( - model_name='rubric', - name='time', - field=models.DateTimeField(blank=True), - ), - ] diff --git a/server/proj/rubricks/migrations/0003_remove_rubric_time.py b/server/proj/rubricks/migrations/0003_remove_rubric_time.py deleted file mode 100644 index be34255..0000000 --- a/server/proj/rubricks/migrations/0003_remove_rubric_time.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 5.0.4 on 2024-05-06 19:19 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('rubricks', '0002_alter_rubric_time'), - ] - - operations = [ - migrations.RemoveField( - model_name='rubric', - name='time', - ), - ] diff --git a/server/proj/rubricks/migrations/__pycache__/0001_initial.cpython-310.pyc b/server/proj/rubricks/migrations/__pycache__/0001_initial.cpython-310.pyc index f35ca2776d93821920303a40b3d034d755180d49..86535ce990d41781aea4925a402fc4cca088d62c 100644 GIT binary patch literal 1065 zcmZ`&J8#rL5MHl+Z(j&W2#7a?UP1 zBa9!8WL((W5V=QSIznBmqEjAKmm%|#v+9ho>ia>6{v1g z^lRu>!GtOqwf9G{cxV zf!kryQ2O`;^GvUz%3fr<+52n{^~dZW+aK$0cDJ%O-A!~3vxB^T?waGXz)O}y4gZjZ zgeN`%&85E2zv>8dO#$s7#M|sB`+%~Ca`-otAxpp(-PBLSfWk2X1n5E5fWsjiJ%ku4B(e7yKB6Z^+9o2sUG+|{f delta 392 zcmX|+Jx{|h5QY=i{YcV;j;L%%2xTiP69`m^fu$70hovgiZgAUt$O(wTP>F>BDp6%) zg0W2e0+?7)y80jR1K1F7Z3RBrdd~Oi?!8grEo%j)sVi{qjt*MuXlTWH0kSo?(cbWO zv5#qXfLe&=SiY^%JS_}V$TXIJ&>s~b9mtrFi>Wa{u6kIc#T~^qrMAso;lw=f>oQk6 zJr=wv5vNrfNh1{8b40JvVLhouOmL^mFPOx>C zq@Bbu_n3`@211!@an_~DJG$(fn@-H?P^(V9q#lH9W*{0Vq735c^SKYSu}XGfZbZ`i z^d)^wpT}3@oAEW-s@ELK1LE>nOaVk^Ops6nZ6c;ibRy#YZ5EMArLxlCK99MRJY}r% hJTxyT7(rm9mXM|D5a@`^W&jnHr542$6y;~d6qP0wWhQ4A$K+$ cFDgwc%1q8K*3ZpMFG?)Q%+D*j04gd=Es7~9%Fl`^DorZNOwKNj$<0hJN-W9D&nu3ZSg8O2ebFd( diff --git a/server/proj/userProfile/__pycache__/__init__.cpython-310.pyc b/server/proj/userProfile/__pycache__/__init__.cpython-310.pyc index 115d566aed93ab6dc1fe86baeeef4ca747f42ba8..7914c4dfdc9b0fd2ad5fc9278b5ab90c85e08380 100644 GIT binary patch delta 66 zcmZ3(IFXS%pO=@50SM~V3MX<~YyUFQFH0=aFE20G_Y4V2Ov%jGFHS8gOD)nbD9X>$ TF9mV}it^Jkb5ivu_9y@Vg~Jub delta 93 zcmbQpxQ3BCpO=@50SG2UM^5CncKhlBWIJ2Mgche36~|ndbz$Fy{TDV|Y`WNeu|38! qBq%W@Ge0Ihv!n>j04gd=Es7~9%Fl`^1#$w4^3yVNQe!3-DgXdF79`*R diff --git a/server/proj/userProfile/__pycache__/admin.cpython-310.pyc b/server/proj/userProfile/__pycache__/admin.cpython-310.pyc index 5c71264d86a3e8dff58d1296be49fd21ebbfa2c4..01a5a71fbb6c3a02dd778d8a194ec9f0e8345ff7 100644 GIT binary patch delta 97 zcmaFBa+HNPpO=@50SM~V3e#jZ^13r>|1#7sODxhaFE7{k3<*k1$;{U;PAw`+Ez&P2 x%Fog-1#$w4^3yVNQuQa#VpI~l#g~$mn3tZfmzampO=@50SNS-$E9g*xlr0P%3U`z!7?6wyx delta 97 zcmdnQe3qFvpO=@50SG2UN2V><$Sca|_SFN(b+(ELElw>ej=3=F!oCapFKoEjbg}zl udyHpDP-04EeoT61NfDRrh eY)j88I?OP2S0T2>=?* BDTM$4 diff --git a/server/proj/userProfile/__pycache__/serializers.cpython-310.pyc b/server/proj/userProfile/__pycache__/serializers.cpython-310.pyc index 5776f84cf6c497e1d52635fde8516bc7105a6ff9..a222c8e2ef5448ce17346d108b9c65f3079ebc25 100644 GIT binary patch delta 70 zcmey(`hb-;pO=@50SM~V3e&_l@~&dk{$;LTmRO`;US6*684{G3l9{hxoLW?tTBKi4 Xl%J(v3giS7<)>xlr0P%p%lHof3^o|j delta 97 zcmaFB`kR$EpO=@50SIiK$EBHUej=3=F!oCapFKoEjbg}zl udyHpDP-04EeoT61NfDRLpO=@50SM~V3e#LR@;+kH{$;3NmRO`;US6*684{G3l9{hxoLW?tTBKi4 zl%J(v3giS7<)>xlr0P#LW$t9WHF-a?50KuePhTAW%`9CKmTg?$(HU)XT5>0qql+<~ diff --git a/server/proj/userProfile/migrations/0001_initial.py b/server/proj/userProfile/migrations/0001_initial.py index 9237e7f..de79f13 100644 --- a/server/proj/userProfile/migrations/0001_initial.py +++ b/server/proj/userProfile/migrations/0001_initial.py @@ -1,7 +1,5 @@ -# Generated by Django 5.0.4 on 2024-04-25 14:58 +# Generated by Django 5.0.6 on 2024-06-19 12:09 -import django.db.models.deletion -from django.conf import settings from django.db import migrations, models @@ -10,16 +8,21 @@ class Migration(migrations.Migration): initial = True dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), ] operations = [ migrations.CreateModel( - name='Profile', + name='Team', fields=[ ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('likedSongs', models.JSONField(default=list)), - ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), + ('name', models.CharField(max_length=50, verbose_name='Имя участника')), + ('last_name', models.CharField(max_length=50, verbose_name='Фамилия участника')), + ('position', models.CharField(max_length=50, verbose_name='Должность участинка')), + ('img_person', models.ImageField(blank=True, null=True, upload_to='team_images/', verbose_name='Изображение участника')), ], + options={ + 'verbose_name': 'Команда', + 'verbose_name_plural': 'Команда', + }, ), ] diff --git a/server/proj/userProfile/migrations/0002_alter_profile_likedsongs.py b/server/proj/userProfile/migrations/0002_alter_profile_likedsongs.py deleted file mode 100644 index dad5ae5..0000000 --- a/server/proj/userProfile/migrations/0002_alter_profile_likedsongs.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 5.0.4 on 2024-05-06 19:19 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('userProfile', '0001_initial'), - ] - - operations = [ - migrations.AlterField( - model_name='profile', - name='likedSongs', - field=models.JSONField(blank=True, null=True), - ), - ] diff --git a/server/proj/userProfile/migrations/__pycache__/0001_initial.cpython-310.pyc b/server/proj/userProfile/migrations/__pycache__/0001_initial.cpython-310.pyc index 2da3b864d9dcad1e94c1c91f53cf145f2ea16da6..0a6ca171a74f6133f0b11381a365e902c065a0b3 100644 GIT binary patch literal 1031 zcmZuw&rcLF6z+6pcV~8I5d|^cP=m={81!rmiotMz80EB=rqJ#%OXr839S}|`Bwi$5 zOf<%$7jKvd5(WMMPqWuvJ@FTqXrjK(E@2P0=}W)P>-XOG`X;W|s|d!M@3J*vA@oCo z!2xGz8diE83`5KiC^VWzh@03z_YuR)+(yjgM%&ynnDM7B98SIs~t@ZDzomzI#l=NVB7;ZhPbL4gg!~QOyg+N?SNte zs(hY$S)-Tl7hw6+eG0Mn^SvV7y+NMS{4G^l5;R%`#hDPw$r2G$Mmlk!B^%OY?||wM zh>r5lT5(V1$Y8xlA~H!u!;~&uP~}#@1xr;WPKsVyXt>HIMM(%zRYIV(GQnZ*67o2s zLRTA5C5WI7R4AA6ghz}=%K=X%)||DO;sNJ%Q%X~xxOW5p4m|Cw4yK%$6)Jn%>YOe` ze;-4UdL8`{$*XX$Fu!KJH7dRJ^>uG<@gZeF>_IDlBrlP1+sgnvkZ~&z+&lXvys4?F z8>FA(WU?XkzgC8oj)Sq0g<)FQ7{$Yeo}&i-jcsgLf2^PO-@GgKkfK}PIdd0eJ=s-H+Fdj4i0fv@cSO5S3 literal 924 zcmYjP&2G~`5caPB9fuaE5OCoFhg_m^tq^KRTPUI}YSII)CClkfqIDf_SUaF_1SAe9 z5@$|uh&ssa4nVp%P@0%6%x~Jj#boiog>6-SdG%ha#jdk4l z8VaT{l4=3LKTYXS4|G!c^wb!dfjP7Si)fEEW-#-;#!N61`<))xjC8by^&9iG-3C!k z4n@JULEfOs8}fmS3of!;Swq1f&5z2s%gaS$9e19ffa>;uG7{)ud@;dF?5|`%0tbx5 zWt8dQB{fFy!!DRLHTsm<=<}h@oGC%eMe7PICCiDITurW(6__`reLB!tZA!7$b>?Ho zb>;4yb=M8-=Th`}3W{>JrRerX!%%)aE<|)BAufQa+DP(YEGN-1Oq830zrEFOaLQhp4qBTD>4*$n#eI4zVh#snn96(- z?zC7EX9J-q>nW##g_BlxyVYs8Ha3+fMzEOvH%;Ef`jz-|h+2CsJU~kFaQ1ojWA=0Q z{p9V*$CD4?c6UE!T!aH&$V$N=Bsd&Nk%T3Qi#dfCFDqPKUA-SIC~1x+(!}}>?)+w@ z7}V2^Q^TZWgM#X@(i>XT)1L;nx!N)N^W diff --git a/server/proj/userProfile/migrations/__pycache__/0002_alter_profile_likedsongs.cpython-310.pyc b/server/proj/userProfile/migrations/__pycache__/0002_alter_profile_likedsongs.cpython-310.pyc index 4ba943feca60b160d3a54251df69d1bb4fb1f52b..6bb9b3e1835edf2ea5eae53ecbd8126b73c997a1 100644 GIT binary patch delta 146 zcmey&a)X68pO=@50SM~V3e!3!^4{XQ#a>X9pO%@EdTZjx+4iD9sUi^ZD@4C6u}HtX zyj$ eF9mV}it^Jkb5iwlGt-L_OEUBGiuET>R{#K;{2FNh delta 104 zcmbQkxSf$ZpO=@50SG2UM^5Cn4*VJpWIJ2Mgche36~|ndbz$Fy{TDV|Y`WNeu|38! zBq%W@Ge0Ihv!n>j04gd=Es7~9%Fl`^1#$w4^3yVNQe$#6(~A;IGV}9_V