SNA_Tecnology/Site
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases 1 Wiki Activity

Добавил пременные для данных и исправил админку

Browse Source
This commit is contained in:
NikDizell 2026-02-24 00:12:27 +03:00
parent cf5fa86590
commit 1f2c74e20c
2 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
OneCprogsite/settings.py
View File

@ -12,8 +12,11 @@ https://docs.djangoproject.com/en/4.2/ref/settings/
import os.path import os.path
import sys import sys
from pathlib import Path from pathlib import Path
from dotenv import load_dotenv
load_dotenv()
SITE_ID = 1 SITE_ID = 1
# Build paths inside the project like this: BASE_DIR / 'subdir'. # Build paths inside the project like this: BASE_DIR / 'subdir'.
@ -26,7 +29,7 @@ sys.path.insert(0, str(BASE_DIR / "OneCprogsite")) # Добавляем пап
# See https://docs.djangoproject.com/en/4.2/howto/deployment/checklist/ # See https://docs.djangoproject.com/en/4.2/howto/deployment/checklist/
# SECURITY WARNING: keep the secret key used in production secret! # SECURITY WARNING: keep the secret key used in production secret!
SECRET_KEY = 'django-insecure-5rs2a1*8cxjkv*%6k1-88biv&1#nep%@i+%1^dk=5j$s&e&hwm' SECRET_KEY = os.getenv('DJANGO_SECRET_KEY')
# Безопасность cookies для HTTPS # Безопасность cookies для HTTPS
# SESSION_COOKIE_SECURE = True # SESSION_COOKIE_SECURE = True
@ -47,20 +50,13 @@ CSRF_COOKIE_SECURE = False
SECURE_SSL_REDIRECT = False SECURE_SSL_REDIRECT = False
# SECURITY WARNING: don't run with debug turned on in production! # SECURITY WARNING: don't run with debug turned on in production!
DEBUG = True DEBUG = os.getenv('DJANGO_DEBUG', 'True').lower() == 'true'
# Или разрешить конкретные домены (Django 4.0+) # Или разрешить конкретные домены (Django 4.0+)
X_FRAME_OPTIONS = 'ALLOW-FROM https://metrika.yandex.ru' X_FRAME_OPTIONS = 'ALLOW-FROM https://metrika.yandex.ru'
# ОБЯЗАТЕЛЬНО укажите ваши домены # ОБЯЗАТЕЛЬНО укажите ваши домены
ALLOWED_HOSTS = [ ALLOWED_HOSTS = os.getenv('DJANGO_ALLOWED_HOSTS', 'localhost,127.0.0.1').split(',')
'nikdizell.ru',
'www.nikdizell.ru',
'localhost',
'127.0.0.1',
'192.168.31.88', # Добавьте IP сервера
'192.168.31.221',
]
# Важно для работы за прокси # Важно для работы за прокси
# SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https') # SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')
@ -145,11 +141,11 @@ WSGI_APPLICATION = 'OneCprogsite.wsgi.application'
DATABASES = { DATABASES = {
'default': { 'default': {
'ENGINE': 'django.db.backends.postgresql', 'ENGINE': 'django.db.backends.postgresql',
'NAME': 'App', 'NAME': os.getenv('DB_NAME'),
'USER': 'postgres', 'USER': os.getenv('DB_USER'),
'PASSWORD': 'NikDi94Zell', 'PASSWORD': os.getenv('DB_PASSWORD'),
'HOST': 'localhost', 'HOST': os.getenv('DB_HOST'),
'PORT': 5432, 'PORT': os.getenv('DB_PORT'),
} }
} }
@ -211,16 +207,17 @@ EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
# DEFAULT_FROM_EMAIL = EMAIL_HOST_USER # DEFAULT_FROM_EMAIL = EMAIL_HOST_USER
# SERVER_EMAIL = EMAIL_HOST_USER # SERVER_EMAIL = EMAIL_HOST_USER
EMAIL_HOST = 'smtp.gmail.com' # или smtp.gmail.com, smtp.mail.ru EMAIL_HOST = os.getenv('EMAIL_HOST') # или smtp.gmail.com, smtp.mail.ru
EMAIL_PORT = 587 EMAIL_PORT = int(os.getenv('EMAIL_PORT', 465))
EMAIL_USE_TLS = True EMAIL_USE_SSL = os.getenv('EMAIL_USE_SSL', 'False').lower() == 'False'
EMAIL_HOST_USER = os.getenv('EMAIL_HOST_USER', 'nikdizell@gmail.com') EMAIL_USE_TLS = os.getenv('EMAIL_USE_TLS', 'False').lower() == 'False'
EMAIL_HOST_PASSWORD = os.getenv('EMAIL_HOST_PASSWORD', 'qvmw yccb msqv mmpj') EMAIL_HOST_USER = os.getenv('EMAIL_HOST_USER')
EMAIL_HOST_PASSWORD = os.getenv('EMAIL_HOST_PASSWORD')
DEFAULT_FROM_EMAIL = EMAIL_HOST_USER DEFAULT_FROM_EMAIL = EMAIL_HOST_USER
SERVER_EMAIL = EMAIL_HOST_USER SERVER_EMAIL = EMAIL_HOST_USER
# Email для уведомлений (можно указать несколько через запятую) # Email для уведомлений (можно указать несколько через запятую)
# ADMIN_EMAILS = os.getenv('ADMIN_EMAILS', 'nikdizell@gmail.com').split(',') # ADMIN_EMAILS = os.getenv('ADMIN_EMAILS', 'nikdizell@gmail.com').split(',')
ADMIN_EMAILS = os.getenv('ADMIN_EMAILS', 'it@nserdyuk.ru').split(',') ADMIN_EMAILS = os.getenv('ADMIN_EMAILS').split(',')

2
programmer/admin.py
View File

@ -48,7 +48,7 @@ class CallbackAdmin(admin.ModelAdmin):
list_filter = ('time_create', 'is_processed', 'is_read') list_filter = ('time_create', 'is_processed', 'is_read')
search_fields = ('name', 'phone', 'email') search_fields = ('name', 'phone', 'email')
readonly_fields = ('time_create',) readonly_fields = ('time_create',)
actions = ['mark_as_read', 'mark_as_unread', 'mark_as_processed'] # actions = ['mark_as_read', 'mark_as_unread', 'mark_as_processed']
actions = ['mark_as_read', 'mark_as_unread', 'mark_as_processed', 'resend_notification'] actions = ['mark_as_read', 'mark_as_unread', 'mark_as_processed', 'resend_notification']
def resend_notification(self, request, queryset): def resend_notification(self, request, queryset):