Migrated all UI to React (Not ready yet)

EXG1O · Dec 14, 2023 · 3bbb482 · 3bbb482
1 parent a6439aa
commit 3bbb482
Show file tree

Hide file tree

Showing 167 changed files with 569 additions and 6,584 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,7 @@
 # Папки
 __pycache__/
 node_modules/
-webpack_stats/
+/constructor_telegram_bots/static/frontend/
 .vscode/
 /static/
 media/
@@ -11,7 +11,7 @@ dist/
 
 # Файлы
 celerybeat-schedule
-*.webpack.stats.json
+webpack.stats.json
 .env
 *.db
 *.mo
diff --git a/constructor_telegram_bots/__init__.py b/constructor_telegram_bots/__init__.py
@@ -1,4 +1,4 @@
 from constructor_telegram_bots.celery import celery_app
 
 
-__all__ = ('celery_app',)
+__all__ = ('celery_app',)
diff --git a/constructor_telegram_bots/asgi.py b/constructor_telegram_bots/asgi.py
@@ -5,4 +5,4 @@
 
 os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'constructor_telegram_bots.settings')
 
-application = get_asgi_application()
+application = get_asgi_application()
diff --git a/constructor_telegram_bots/celery.py b/constructor_telegram_bots/celery.py
@@ -13,4 +13,4 @@
 def celery_after_setup(*args, **kwargs) -> None:
 	from telegram_bot.tasks import start_all_telegram_bots as celery_start_all_telegram_bots
 
-	celery_start_all_telegram_bots.delay()
+	celery_start_all_telegram_bots.delay()
diff --git a/constructor_telegram_bots/context_processors.py b/constructor_telegram_bots/context_processors.py
diff --git a/constructor_telegram_bots/environment.py b/constructor_telegram_bots/environment.py
@@ -72,4 +72,4 @@ def replace_text_variables_to_jinja_variables_values(telegram_bot, text: str, ji
 	}).json()['response']
 
 async def areplace_text_variables_to_jinja_variables_values(telegram_bot, text: str, jinja_variables: dict[str, Any]) -> str:
-	return await sync_to_async(replace_text_variables_to_jinja_variables_values)(telegram_bot, text, jinja_variables)
+	return await sync_to_async(replace_text_variables_to_jinja_variables_values)(telegram_bot, text, jinja_variables)
diff --git a/constructor_telegram_bots/exception_formatter.py b/constructor_telegram_bots/exception_formatter.py
@@ -19,4 +19,4 @@ def format_error_response(self, error_response: ErrorResponse) -> FormatErrorRes
 			'name': error.attr,
 			'message': error.detail,
 			'level': 'danger',
-		}
+		}
diff --git a/constructor_telegram_bots/gunicorn_config.py b/constructor_telegram_bots/gunicorn_config.py
@@ -7,4 +7,4 @@
 
 capture_output = True
 accesslog = str(BASE_DIR / 'logs/gunicorn_info.log')
-errorlog = str(BASE_DIR / 'logs/gunicorn_info.log')
+errorlog = str(BASE_DIR / 'logs/gunicorn_info.log')
diff --git a/constructor_telegram_bots/settings.py b/constructor_telegram_bots/settings.py
@@ -33,12 +33,6 @@
 
 SITE_DOMAIN = 'http://127.0.0.1:8000' if DEBUG else 'https://constructor.exg1o.org'
 ALLOWED_HOSTS = ['127.0.0.1', 'constructor.exg1o.org']
-CSRF_TRUSTED_ORIGINS = [
-	'http://*.127.0.0.1',
-	'https://*.127.0.0.1',
-	'http://constructor.exg1o.org',
-	'https://constructor.exg1o.org',
-]
 
 
 CELERY_BROKER_URL = 'redis://127.0.0.1:6379'
@@ -74,52 +68,22 @@
 	'django.contrib.messages',
 	'django.contrib.staticfiles',
 
+	'user',
 	'telegram_bot',
-	'telegram_bot.frontend',
-	'telegram_bot.api',
+	'plugin',
 
-	'user',
-	'home',
 	'team',
 	'updates',
 	'instruction',
 	'donation',
-	'personal_cabinet',
-	'plugin',
 	'privacy_policy',
 ]
 
-WEBPACK_LOADER_BASE_CONFIG = {
-	'CACHE': not DEBUG,
-	'POLL_INTERVAL': 0.1,
-}
 WEBPACK_LOADER = {
-	'DEFAULT': WEBPACK_LOADER_BASE_CONFIG | {
-		'STATS_FILE': BASE_DIR / 'webpack_stats/default.webpack.stats.json',
-	},
-	'HOME:INDEX': WEBPACK_LOADER_BASE_CONFIG | {
-		'STATS_FILE': BASE_DIR / 'webpack_stats/index.home.webpack.stats.json',
-	},
-	'TEAM:INDEX': WEBPACK_LOADER_BASE_CONFIG | {
-		'STATS_FILE': BASE_DIR / 'webpack_stats/index.team.webpack.stats.json',
-	},
-	'PERSONAL_CABINET:INDEX': WEBPACK_LOADER_BASE_CONFIG | {
-		'STATS_FILE': BASE_DIR / 'webpack_stats/index.personal-cabinet.webpack.stats.json',
-	},
-	'TELEGRAM_BOT_MENU:DEFAULT': WEBPACK_LOADER_BASE_CONFIG | {
-		'STATS_FILE': BASE_DIR / 'webpack_stats/default.telegram-bot-menu.webpack.stats.json',
-	},
-	'TELEGRAM_BOT_MENU:INDEX': WEBPACK_LOADER_BASE_CONFIG | {
-		'STATS_FILE': BASE_DIR / 'webpack_stats/index.telegram-bot-menu.webpack.stats.json',
-	},
-	'TELEGRAM_BOT_MENU:VARIABLES': WEBPACK_LOADER_BASE_CONFIG | {
-		'STATS_FILE': BASE_DIR / 'webpack_stats/variables.telegram-bot-menu.webpack.stats.json',
-	},
-	'TELEGRAM_BOT_MENU:USERS': WEBPACK_LOADER_BASE_CONFIG | {
-		'STATS_FILE': BASE_DIR / 'webpack_stats/users.telegram-bot-menu.webpack.stats.json',
-	},
-	'TELEGRAM_BOT_MENU:DATABASE': WEBPACK_LOADER_BASE_CONFIG | {
-		'STATS_FILE': BASE_DIR / 'webpack_stats/database.telegram-bot-menu.webpack.stats.json',
+	'INDEX': {
+		'CACHE': not DEBUG,
+		'POLL_INTERVAL': 0.1,
+		'STATS_FILE': BASE_DIR / 'frontend/webpack.stats.json',
 	},
 }
 
@@ -157,13 +121,11 @@
 ]
 
 REST_FRAMEWORK = {
-	'DEFAULT_AUTHENTICATION_CLASSES': [
-		'rest_framework.authentication.BasicAuthentication',
-		'rest_framework.authentication.SessionAuthentication',
-	],
 	'EXCEPTION_HANDLER': 'drf_standardized_errors.handler.exception_handler',
 }
-DRF_STANDARDIZED_ERRORS = {'EXCEPTION_FORMATTER_CLASS': 'constructor_telegram_bots.exception_formatter.CustomExceptionFormatter'}
+DRF_STANDARDIZED_ERRORS = {
+	'EXCEPTION_FORMATTER_CLASS': 'constructor_telegram_bots.exception_formatter.CustomExceptionFormatter',
+}
 
 
 TEMPLATES = [
@@ -177,8 +139,6 @@
 				'django.template.context_processors.request',
 				'django.contrib.auth.context_processors.auth',
 				'django.contrib.messages.context_processors.messages',
-
-				'constructor_telegram_bots.context_processors.constructor_telegram_bot_username',
 			],
 		},
 	},
@@ -222,7 +182,10 @@
 
 STATIC_URL = '/static/'
 STATIC_ROOT = BASE_DIR / 'static'
-STATICFILES_DIRS = [BASE_DIR / 'constructor_telegram_bots/static']
+STATICFILES_DIRS = [
+	BASE_DIR / 'constructor_telegram_bots/static',
+	BASE_DIR / 'frontend/dist',
+]
 
 MEDIA_URL = '/media/'
 MEDIA_ROOT = BASE_DIR / 'media'
@@ -299,4 +262,4 @@
 			'propagate': True,
 		},
 	},
-}
+}
diff --git a/constructor_telegram_bots/static/default/src/logout.ts b/constructor_telegram_bots/static/default/src/logout.ts
diff --git a/constructor_telegram_bots/static/default/src/main.ts b/constructor_telegram_bots/static/default/src/main.ts
diff --git a/constructor_telegram_bots/static/default/src/modals/login_via_telegram_modal.ts b/constructor_telegram_bots/static/default/src/modals/login_via_telegram_modal.ts
diff --git a/constructor_telegram_bots/static/global_modules/api.ts b/constructor_telegram_bots/static/global_modules/api.ts
diff --git a/constructor_telegram_bots/static/global_modules/jsi18n.d.ts b/constructor_telegram_bots/static/global_modules/jsi18n.d.ts
diff --git a/constructor_telegram_bots/static/global_modules/modals/ask_confirm_modal.ts b/constructor_telegram_bots/static/global_modules/modals/ask_confirm_modal.ts
diff --git a/constructor_telegram_bots/static/global_modules/monaco_editor.ts b/constructor_telegram_bots/static/global_modules/monaco_editor.ts
diff --git a/constructor_telegram_bots/static/global_modules/toast.ts b/constructor_telegram_bots/static/global_modules/toast.ts
diff --git a/constructor_telegram_bots/templates/404.html b/constructor_telegram_bots/templates/404.html
diff --git a/constructor_telegram_bots/templates/admin/base_site.html b/constructor_telegram_bots/templates/admin/base_site.html
@@ -16,7 +16,7 @@
 {% block welcome-msg %}{% endblock welcome-msg %}
 
 {% block userlinks %}
-<a href="{% url 'home:index' %}">{% trans 'Вернуться на сайт' %}</a> /
+<a href="/">{% trans 'Вернуться на сайт' %}</a> /
 <a href="{% url 'user:logout' %}">{% trans 'Выйти' %}</a> /
 <form action="{% url 'set_language' %}" method="post" style="display:inline">
 	{% csrf_token %}