Main

ework/settings.py

@@ -1,38 +1,34 @@
 
 import os
 from pathlib import Path
+from dotenv import load_dotenv
 
-BASE_DIR = Path(__file__).resolve().parent.parent
-
-
-SECRET_KEY = "dd"
+load_dotenv()
 
+BASE_DIR = Path(__file__).resolve().parent.parent
+SECRET_KEY = os.getenv('SECRET_KEY')
 DEBUG = True
-
 ALLOWED_HOSTS = [
     'localhost',
+    '46.254.107.43',
+    'helpwork.com.ua',
     '127.0.0.1',
-    '*',  # Для разработки - в продакшене нужно указать конкретные домены
 ]
-
-CSRF_COOKIE_DOMAIN = None  # Убираем ограничение домена
-CSRF_COOKIE_SECURE = True  # Для HTTPS
-CSRF_COOKIE_HTTPONLY = False  # Важно! Позволяет JS доступ к cookie
-CSRF_COOKIE_SAMESITE = None  # Убираем SameSite ограничения
-CSRF_USE_SESSIONS = True  # Используем сессии вместо cookie
+CSRF_COOKIE_DOMAIN = None  
+CSRF_COOKIE_SECURE = True  
+CSRF_COOKIE_HTTPONLY = False  
+CSRF_COOKIE_SAMESITE = None  
+CSRF_USE_SESSIONS = True  
 CSRF_COOKIE_AGE = None
-
 CSRF_TRUSTED_ORIGINS = [
-    'https://*.ngrok-free.app',  # Для ngrok в разработке
+    'https://helpwork.com.ua',
 ]
-
-# Настройки сессий для Telegram Mini App
 SESSION_COOKIE_SECURE = True
 SESSION_COOKIE_HTTPONLY = False
 SESSION_COOKIE_SAMESITE = None
 SESSION_SAVE_EVERY_REQUEST = True
-
 INSTALLED_APPS = [
+    'jazzmin',
     'django.contrib.admin',
     'django.contrib.auth',
     'django.contrib.contenttypes',
@@ -43,6 +39,7 @@
     'django_htmx',  
     'widget_tweaks',  
     'polymorphic',  
+    'django_q',  # Django-Q для фоновых задач
     'ework_bot_tg', #бот ТГ и его фунционнал
     'ework_user_tg', # модель пользователя и авторизация
     'ework_job', # объявления о работе 
@@ -55,8 +52,8 @@
     'ework_currency', # валюты
     'ework_core', # ядро
     'ework_config', # конфигурация
+    'ework_stats', # статистика
 ]
-
 MIDDLEWARE = [
     'django.middleware.security.SecurityMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
@@ -69,9 +66,7 @@
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
     'django_htmx.middleware.HtmxMiddleware',
 ]
-
 ROOT_URLCONF = 'ework.urls'
-
 TEMPLATES = [
     {
         'BACKEND': 'django.template.backends.django.DjangoTemplates',
@@ -90,16 +85,13 @@
         },
     },
 ]
-
 WSGI_APPLICATION = 'ework.wsgi.application'
-
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.sqlite3',
         'NAME': BASE_DIR / 'db.sqlite3',
     }
 }
-
 AUTH_PASSWORD_VALIDATORS = [
     {
         'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
@@ -114,43 +106,179 @@
         'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
     },
 ]
-
 LANGUAGE_CODE = 'ru'
-
 TIME_ZONE = 'UTC'
-
 USE_I18N = True
-
 USE_TZ = True
-
 STATIC_URL = 'static/'
-
+STATIC_ROOT = os.path.join(BASE_DIR, 'staticfiles')
 DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
-
 AUTH_USER_MODEL = 'ework_user_tg.TelegramUser'
-
 USE_L10N = True 
-
 LANGUAGES = [
     ('ru', 'Russian'),
     ('uk', 'Ukrainian'),
 ]
-
-
 LOCALE_PATHS = [
     BASE_DIR / 'locale',
 ]
-
 BASE_DIR = os.path.dirname(os.path.dirname(__file__))
-
-
 ROSETTA_MESSAGES_PER_PAGE = 50
 ROSETTA_ENABLE_TRANSLATION_SUGGESTIONS = True
 ROSETTA_STORAGE_CLASS = 'rosetta.storage.CacheRosettaStorage'
 ROSETTA_UWSGI_AUTO_RELOAD = True
-
-
+STATIC_URL = '/static/'
+STATIC_ROOT = '/home/HelpWork/Ework/staticfiles'
 STATICFILES_DIRS = [
-    os.path.join(BASE_DIR, 'static'),
-    os.path.join(BASE_DIR, 'ework_core', 'static'),
-]
+    '/home/HelpWork/Ework/static',
+]
+MEDIA_URL = '/media/'
+MEDIA_ROOT = '/home/HelpWork/Ework/media'
+Q_CLUSTER = {
+    'name': 'ework_cluster',
+    'workers': 2,
+    'timeout': 30,
+    'retry': 60,
+    'queue_limit': 50,
+    'bulk': 10,
+    'orm': 'default',
+    'catch_up': True,
+    'save_limit': 250,
+    'ack_failures': True,
+    'max_attempts': 1,
+    'attempt_count': 1,
+    'cached': 60,
+    'sync': False,
+    'compress': True,
+    'cpu_affinity': 1,
+    'daemonize_workers': False,
+    'log_level': 'INFO',
+    'label': 'Django-Q',
+    'redis': None,
+    'schedule': {
+        'collect_daily_stats': {
+            'func': 'ework_stats.tasks.collect_daily_stats',
+            'schedule_type': 'D',  
+            'hour': 1,  
+            'minute': 0
+        },
+    }
+}  
+
+LOGGING = {
+    'version': 1,
+    'disable_existing_loggers': False,
+    'formatters': {
+        'verbose': {
+            'format': '{levelname} {asctime} {module} {process:d} {thread:d} {message}',
+            'style': '{',
+        },
+        'simple': {
+            'format': '{levelname} {message}',
+            'style': '{',
+        },
+    },
+    'handlers': {
+        'file': {
+            'level': 'INFO',
+            'class': 'logging.handlers.RotatingFileHandler',
+            'filename': os.path.join(BASE_DIR, 'logs', 'django_q.log'),
+            'maxBytes': 1024 * 1024 * 10,  
+            'backupCount': 5,
+            'formatter': 'verbose',
+        },
+        'console': {
+            'level': 'INFO',
+            'class': 'logging.StreamHandler',
+            'formatter': 'simple',
+        },
+    },
+    'loggers': {
+        'django_q': {
+            'handlers': ['file', 'console'],
+            'level': 'INFO',
+            'propagate': True,
+        },
+        'ework_core.tasks': {
+            'handlers': ['file', 'console'],
+            'level': 'INFO',
+            'propagate': True,
+        },
+    },
+}
+JAZZMIN_SETTINGS = {
+    "site_title": "Help Work Admin",
+    "site_header": "Help Work",
+    "site_brand": "Help Work",
+    "site_url": "/",
+    "copyright": "Help Work © 2025",
+    "user_avatar": None,
+    "topmenu_links": [
+        {"name": "Главная", "url": "admin:index", "permissions": ["auth.view_user"]},
+        {"name": "Перейти на сайт", "url": "/", "new_window": True},
+        {"app": "ework_post"},
+    ],
+    "show_sidebar": True,
+    "navigation_expanded": True,
+    "icons": {
+        "auth": "fas fa-users-cog",
+        "auth.user": "fas fa-user",
+        "auth.Group": "fas fa-users",
+        "ework_post.abspost": "fas fa-newspaper",
+        "ework_post.postjob": "fas fa-briefcase",
+        "ework_post.postservices": "fas fa-tools",
+        "ework_config.siteconfig": "fas fa-cogs",
+        "ework_config.subrubric": "fas fa-list",
+        "ework_config.superrubric": "fas fa-folder",
+        "ework_config.city": "fas fa-city",
+        "ework_config.currency": "fas fa-money-bill",
+        "ework_premium.package": "fas fa-box",
+        "ework_premium.payment": "fas fa-credit-card",
+        "ework_user_tg.telegramuser": "fab fa-telegram",
+    },
+    "order_with_respect_to": [
+        "auth",
+        "ework_user_tg",
+        "ework_post",
+        "ework_job",
+        "ework_services",
+        "ework_premium",
+        "ework_config",
+    ],
+    "related_modal_active": True,
+    "custom_css": None,
+    "custom_js": None,
+    "use_google_fonts_cdn": True,
+    "show_ui_builder": True,
+}
+JAZZMIN_UI_TWEAKS = {
+    "navbar_small_text": False,
+    "footer_small_text": False,
+    "body_small_text": False,
+    "brand_small_text": False,
+    "brand_colour": "navbar-primary",
+    "accent": "accent-primary",
+    "navbar": "navbar-dark",
+    "no_navbar_border": False,
+    "navbar_fixed": True,
+    "layout_boxed": False,
+    "footer_fixed": False,
+    "sidebar_fixed": True,
+    "sidebar": "sidebar-dark-primary",
+    "sidebar_nav_small_text": False,
+    "sidebar_disable_expand": False,
+    "sidebar_nav_child_indent": True,
+    "sidebar_nav_compact_style": False,
+    "sidebar_nav_legacy_style": False,
+    "sidebar_nav_flat_style": False,
+    "theme": "default",
+    "dark_mode_theme": None,
+    "button_classes": {
+        "primary": "btn-primary",
+        "secondary": "btn-secondary",
+        "info": "btn-info",
+        "warning": "btn-warning",
+        "danger": "btn-danger",
+        "success": "btn-success"
+    }
+}

ework/urls.py

@@ -7,6 +7,7 @@
 urlpatterns = [
     path('i18n/', include('django.conf.urls.i18n')),
     path('rosetta/', include('rosetta.urls')),
+    path('admin/stats/', include('ework_stats.urls')), 
     path('admin/', admin.site.urls),
     path('users/', include('ework_user_tg.urls', namespace='users')),
     path('jobs/', include('ework_job.urls', namespace='jobs')),