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:
Server Deploy 2025-12-08 14:49:13 +03:00
parent 27ac664e56
commit c947dc980a
423 changed files with 88195 additions and 14555 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
OneCprogsite/OneCprogsite/asgi.py
View File

@ -1,16 +1,16 @@
"""
ASGI config for OneCprogsite project.
It exposes the ASGI callable as a module-level variable named ``application``.
For more information on this file, see
https://docs.djangoproject.com/en/4.2/howto/deployment/asgi/
"""
import os
from django.core.asgi import get_asgi_application
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'OneCprogsite.settings')
application = get_asgi_application()
"""
ASGI config for OneCprogsite project.
It exposes the ASGI callable as a module-level variable named ``application``.
For more information on this file, see
https://docs.djangoproject.com/en/4.2/howto/deployment/asgi/
"""
import os
from django.core.asgi import get_asgi_application
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'OneCprogsite.settings')
application = get_asgi_application()

424
OneCprogsite/OneCprogsite/settings.py
View File

@ -1,212 +1,212 @@
"""
Django settings for OneCprogsite project.
Generated by 'django-admin startproject' using Django 4.2.7.
For more information on this file, see
https://docs.djangoproject.com/en/4.2/topics/settings/
For the full list of settings and their values, see
https://docs.djangoproject.com/en/4.2/ref/settings/
"""
import os.path
from pathlib import Path
# Build paths inside the project like this: BASE_DIR / 'subdir'.
BASE_DIR = Path(__file__).resolve().parent.parent
# Quick-start development settings - unsuitable for production
# See https://docs.djangoproject.com/en/4.2/howto/deployment/checklist/
# 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'
# Безопасность cookies для HTTPS
SESSION_COOKIE_SECURE = True
CSRF_COOKIE_SECURE = True
SESSION_COOKIE_HTTPONLY = True
CSRF_COOKIE_HTTPONLY = False # Django требует доступ к CSRF cookie через JS
SESSION_COOKIE_SAMESITE = 'Lax'
CSRF_COOKIE_SAMESITE = 'Lax'
# Если используете другие cookies
LANGUAGE_COOKIE_SECURE = True
LANGUAGE_COOKIE_HTTPONLY = True
LANGUAGE_COOKIE_SAMESITE = 'Lax'
# SECURITY WARNING: don't run with debug turned on in production!
DEBUG = False
X_FRAME_OPTIONS = 'SAMEORIGIN'
# Или разрешить конкретные домены (Django 4.0+)
X_FRAME_OPTIONS = 'ALLOW-FROM https://metrika.yandex.ru'
# ОБЯЗАТЕЛЬНО укажите ваши домены
ALLOWED_HOSTS = [
'nikdizell.ru',
'www.nikdizell.ru',
'localhost',
'127.0.0.1',
'192.168.31.88' # Добавьте IP сервера
]
# Важно для работы за прокси
SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')
SECURE_SSL_REDIRECT = True
# Дополнительная безопасность
SECURE_BROWSER_XSS_FILTER = True
SECURE_CONTENT_TYPE_NOSNIFF = True
SECURE_HSTS_SECONDS = 31536000
SECURE_HSTS_INCLUDE_SUBDOMAINS = True
SECURE_HSTS_PRELOAD = True
CSRF_TRUSTED_ORIGINS = [
'https://nikdizell.ru',
'https://www.nikdizell.ru',
]
# Application definition
INSTALLED_APPS = [
'django.contrib.admin',
'django.contrib.auth',
'django.contrib.contenttypes',
'django.contrib.sessions',
'django.contrib.messages',
'django.contrib.staticfiles',
'programmer.apps.ProgrammerConfig',
'django_bootstrap5',
'django_extensions',
'django.contrib.sites',
'django.contrib.sitemaps',
]
MIDDLEWARE = [
'django.middleware.security.SecurityMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware',
'django.middleware.common.CommonMiddleware',
'django.middleware.csrf.CsrfViewMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware',
'django.middleware.clickjacking.XFrameOptionsMiddleware',
'programmer.middleware.PageViewMiddleware',
]
ROOT_URLCONF = 'OneCprogsite.urls'
# Кастомный middleware для CSP
class CSPMiddleware:
def __init__(self, get_response):
self.get_response = get_response
def __call__(self, request):
response = self.get_response(request)
response['Content-Security-Policy'] = "frame-ancestors 'self' https://metrika.yandex.ru https://metrika.yandex.by https://metrica.yandex.com https://metrica.yandex.com.tr https://*.webvisor.com"
return response
TEMPLATES = [
{
'BACKEND': 'django.template.backends.django.DjangoTemplates',
'DIRS': [],
'APP_DIRS': True,
'OPTIONS': {
'context_processors': [
'django.template.context_processors.debug',
'django.template.context_processors.request',
'django.contrib.auth.context_processors.auth',
'django.contrib.messages.context_processors.messages',
'programmer.context_processors.menu_processor',
'programmer.context_processors.contact_info',
],
},
},
]
WSGI_APPLICATION = 'OneCprogsite.wsgi.application'
# Database
# https://docs.djangoproject.com/en/4.2/ref/settings/#databases
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.postgresql',
'NAME': 'App',
'USER': 'postgres',
'PASSWORD': 'NikDi94Zell',
'HOST': 'postgres',
'PORT': 5432,
}
}
# Password validation
# https://docs.djangoproject.com/en/4.2/ref/settings/#auth-password-validators
AUTH_PASSWORD_VALIDATORS = [
{
'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
},
{
'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
},
{
'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
},
{
'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
},
]
# Internationalization
# https://docs.djangoproject.com/en/4.2/topics/i18n/
LANGUAGE_CODE = 'ru'
TIME_ZONE = 'Europe/Moscow'
USE_I18N = True
USE_I18N = True
USE_TZ = True
# Static files (CSS, JavaScript, Images)
# https://docs.djangoproject.com/en/4.2/howto/static-files/
STATIC_URL = 'static/'
STATIC_ROOT = os.path.join(BASE_DIR, 'static')
STATICFILES_DIRS = []
# Default primary key field type
# https://docs.djangoproject.com/en/4.2/ref/settings/#default-auto-field
DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
MEDIA_ROOT = os.path.join(BASE_DIR, 'media')
MEDIA_URL = '/media/'
# Настройки email
EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
# EMAIL_HOST = 'smtp.yandex.ru' # или smtp.gmail.com, smtp.mail.ru
# EMAIL_PORT = 587
# EMAIL_USE_TLS = True
# EMAIL_HOST_USER = os.getenv('EMAIL_HOST_USER', 'it@yandex.ru')
# EMAIL_HOST_PASSWORD = os.getenv('EMAIL_HOST_PASSWORD', 'tifdctkrcjcqwxyc')
# DEFAULT_FROM_EMAIL = EMAIL_HOST_USER
# SERVER_EMAIL = EMAIL_HOST_USER
EMAIL_HOST = 'smtp.gmail.com' # или smtp.gmail.com, smtp.mail.ru
EMAIL_PORT = 587
EMAIL_USE_TLS = True
EMAIL_HOST_USER = os.getenv('EMAIL_HOST_USER', 'nikdizell@gmail.com')
EMAIL_HOST_PASSWORD = os.getenv('EMAIL_HOST_PASSWORD', 'qvmw yccb msqv mmpj')
DEFAULT_FROM_EMAIL = EMAIL_HOST_USER
SERVER_EMAIL = EMAIL_HOST_USER
# Email для уведомлений (можно указать несколько через запятую)
# ADMIN_EMAILS = os.getenv('ADMIN_EMAILS', 'nikdizell@gmail.com').split(',')
ADMIN_EMAILS = os.getenv('ADMIN_EMAILS', 'it@nserdyuk.ru').split(',')
"""
Django settings for OneCprogsite project.
Generated by 'django-admin startproject' using Django 4.2.7.
For more information on this file, see
https://docs.djangoproject.com/en/4.2/topics/settings/
For the full list of settings and their values, see
https://docs.djangoproject.com/en/4.2/ref/settings/
"""
import os.path
from pathlib import Path
# Build paths inside the project like this: BASE_DIR / 'subdir'.
BASE_DIR = Path(__file__).resolve().parent.parent
# Quick-start development settings - unsuitable for production
# See https://docs.djangoproject.com/en/4.2/howto/deployment/checklist/
# 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'
# Безопасность cookies для HTTPS
SESSION_COOKIE_SECURE = True
CSRF_COOKIE_SECURE = True
SESSION_COOKIE_HTTPONLY = True
CSRF_COOKIE_HTTPONLY = False # Django требует доступ к CSRF cookie через JS
SESSION_COOKIE_SAMESITE = 'Lax'
CSRF_COOKIE_SAMESITE = 'Lax'
# Если используете другие cookies
LANGUAGE_COOKIE_SECURE = True
LANGUAGE_COOKIE_HTTPONLY = True
LANGUAGE_COOKIE_SAMESITE = 'Lax'
# SECURITY WARNING: don't run with debug turned on in production!
DEBUG = False
X_FRAME_OPTIONS = 'SAMEORIGIN'
# Или разрешить конкретные домены (Django 4.0+)
X_FRAME_OPTIONS = 'ALLOW-FROM https://metrika.yandex.ru'
# ОБЯЗАТЕЛЬНО укажите ваши домены
ALLOWED_HOSTS = [
'nikdizell.ru',
'www.nikdizell.ru',
'localhost',
'127.0.0.1',
'192.168.31.88' # Добавьте IP сервера
]
# Важно для работы за прокси
SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')
SECURE_SSL_REDIRECT = True
# Дополнительная безопасность
SECURE_BROWSER_XSS_FILTER = True
SECURE_CONTENT_TYPE_NOSNIFF = True
SECURE_HSTS_SECONDS = 31536000
SECURE_HSTS_INCLUDE_SUBDOMAINS = True
SECURE_HSTS_PRELOAD = True
CSRF_TRUSTED_ORIGINS = [
'https://nikdizell.ru',
'https://www.nikdizell.ru',
]
# Application definition
INSTALLED_APPS = [
'django.contrib.admin',
'django.contrib.auth',
'django.contrib.contenttypes',
'django.contrib.sessions',
'django.contrib.messages',
'django.contrib.staticfiles',
'programmer.apps.ProgrammerConfig',
'django_bootstrap5',
'django_extensions',
'django.contrib.sites',
'django.contrib.sitemaps',
]
MIDDLEWARE = [
'django.middleware.security.SecurityMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware',
'django.middleware.common.CommonMiddleware',
'django.middleware.csrf.CsrfViewMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware',
'django.middleware.clickjacking.XFrameOptionsMiddleware',
'programmer.middleware.PageViewMiddleware',
]
ROOT_URLCONF = 'OneCprogsite.urls'
# Кастомный middleware для CSP
class CSPMiddleware:
def __init__(self, get_response):
self.get_response = get_response
def __call__(self, request):
response = self.get_response(request)
response['Content-Security-Policy'] = "frame-ancestors 'self' https://metrika.yandex.ru https://metrika.yandex.by https://metrica.yandex.com https://metrica.yandex.com.tr https://*.webvisor.com"
return response
TEMPLATES = [
{
'BACKEND': 'django.template.backends.django.DjangoTemplates',
'DIRS': [],
'APP_DIRS': True,
'OPTIONS': {
'context_processors': [
'django.template.context_processors.debug',
'django.template.context_processors.request',
'django.contrib.auth.context_processors.auth',
'django.contrib.messages.context_processors.messages',
'programmer.context_processors.menu_processor',
'programmer.context_processors.contact_info',
],
},
},
]
WSGI_APPLICATION = 'OneCprogsite.wsgi.application'
# Database
# https://docs.djangoproject.com/en/4.2/ref/settings/#databases
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.postgresql',
'NAME': 'App',
'USER': 'postgres',
'PASSWORD': 'NikDi94Zell',
'HOST': 'postgres',
'PORT': 5432,
}
}
# Password validation
# https://docs.djangoproject.com/en/4.2/ref/settings/#auth-password-validators
AUTH_PASSWORD_VALIDATORS = [
{
'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
},
{
'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
},
{
'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
},
{
'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
},
]
# Internationalization
# https://docs.djangoproject.com/en/4.2/topics/i18n/
LANGUAGE_CODE = 'ru'
TIME_ZONE = 'Europe/Moscow'
USE_I18N = True
USE_I18N = True
USE_TZ = True
# Static files (CSS, JavaScript, Images)
# https://docs.djangoproject.com/en/4.2/howto/static-files/
STATIC_URL = 'static/'
STATIC_ROOT = os.path.join(BASE_DIR, 'static')
STATICFILES_DIRS = []
# Default primary key field type
# https://docs.djangoproject.com/en/4.2/ref/settings/#default-auto-field
DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
MEDIA_ROOT = os.path.join(BASE_DIR, 'media')
MEDIA_URL = '/media/'
# Настройки email
EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
# EMAIL_HOST = 'smtp.yandex.ru' # или smtp.gmail.com, smtp.mail.ru
# EMAIL_PORT = 587
# EMAIL_USE_TLS = True
# EMAIL_HOST_USER = os.getenv('EMAIL_HOST_USER', 'it@yandex.ru')
# EMAIL_HOST_PASSWORD = os.getenv('EMAIL_HOST_PASSWORD', 'tifdctkrcjcqwxyc')
# DEFAULT_FROM_EMAIL = EMAIL_HOST_USER
# SERVER_EMAIL = EMAIL_HOST_USER
EMAIL_HOST = 'smtp.gmail.com' # или smtp.gmail.com, smtp.mail.ru
EMAIL_PORT = 587
EMAIL_USE_TLS = True
EMAIL_HOST_USER = os.getenv('EMAIL_HOST_USER', 'nikdizell@gmail.com')
EMAIL_HOST_PASSWORD = os.getenv('EMAIL_HOST_PASSWORD', 'qvmw yccb msqv mmpj')
DEFAULT_FROM_EMAIL = EMAIL_HOST_USER
SERVER_EMAIL = EMAIL_HOST_USER
# Email для уведомлений (можно указать несколько через запятую)
# ADMIN_EMAILS = os.getenv('ADMIN_EMAILS', 'nikdizell@gmail.com').split(',')
ADMIN_EMAILS = os.getenv('ADMIN_EMAILS', 'it@nserdyuk.ru').split(',')

78
OneCprogsite/OneCprogsite/urls.py
View File

@ -1,39 +1,39 @@
"""
URL configuration for OneCprogsite project.
The `urlpatterns` list routes URLs to views. For more information please see:
https://docs.djangoproject.com/en/4.2/topics/http/urls/
Examples:
Function views
1. Add an import: from my_app import views
2. Add a URL to urlpatterns: path('', views.home, name='home')
Class-based views
1. Add an import: from other_app.views import Home
2. Add a URL to urlpatterns: path('', Home.as_view(), name='home')
Including another URLconf
1. Import the include() function: from django.urls import include, path
2. Add a URL to urlpatterns: path('blog/', include('blog.urls'))
"""
from django.conf.urls.static import static
from django.contrib import admin
from django.urls import path
from OneCprogsite import settings
from programmer.views import *
from django.urls import path, include
urlpatterns = [
path('admin/', admin.site.urls),
path('', include('programmer.urls')),
# path('', index, name='home'),
# path('about/', about, name='about'),
# path('solution/', solution, name='solution'),
# path('ability/', ability, name='ability'),
# path('recall/', recall, name='recall'),
# path('post/<int:post_id>', show_post, name='post'),
]
if settings.DEBUG:
urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
handler404 = pageNotFound
"""
URL configuration for OneCprogsite project.
The `urlpatterns` list routes URLs to views. For more information please see:
https://docs.djangoproject.com/en/4.2/topics/http/urls/
Examples:
Function views
1. Add an import: from my_app import views
2. Add a URL to urlpatterns: path('', views.home, name='home')
Class-based views
1. Add an import: from other_app.views import Home
2. Add a URL to urlpatterns: path('', Home.as_view(), name='home')
Including another URLconf
1. Import the include() function: from django.urls import include, path
2. Add a URL to urlpatterns: path('blog/', include('blog.urls'))
"""
from django.conf.urls.static import static
from django.contrib import admin
from django.urls import path
from OneCprogsite import settings
from programmer.views import *
from django.urls import path, include
urlpatterns = [
path('admin/', admin.site.urls),
path('', include('programmer.urls')),
# path('', index, name='home'),
# path('about/', about, name='about'),
# path('solution/', solution, name='solution'),
# path('ability/', ability, name='ability'),
# path('recall/', recall, name='recall'),
# path('post/<int:post_id>', show_post, name='post'),
]
if settings.DEBUG:
urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
handler404 = pageNotFound

32
OneCprogsite/OneCprogsite/wsgi.py
View File

@ -1,16 +1,16 @@
"""
WSGI config for OneCprogsite project.
It exposes the WSGI callable as a module-level variable named ``application``.
For more information on this file, see
https://docs.djangoproject.com/en/4.2/howto/deployment/wsgi/
"""
import os
from django.core.wsgi import get_wsgi_application
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'OneCprogsite.settings')
application = get_wsgi_application()
"""
WSGI config for OneCprogsite project.
It exposes the WSGI callable as a module-level variable named ``application``.
For more information on this file, see
https://docs.djangoproject.com/en/4.2/howto/deployment/wsgi/
"""
import os
from django.core.wsgi import get_wsgi_application
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'OneCprogsite.settings')
application = get_wsgi_application()

BIN
OneCprogsite/__pycache__/__init__.cpython-311.pyc
View File

Binary file not shown.

BIN
OneCprogsite/__pycache__/settings.cpython-311.pyc
View File

Binary file not shown.

BIN
OneCprogsite/__pycache__/urls.cpython-311.pyc
View File

Binary file not shown.

BIN
OneCprogsite/__pycache__/wsgi.cpython-311.pyc
View File

Binary file not shown.

32
OneCprogsite/asgi.py
View File

@ -1,16 +1,16 @@
"""
ASGI config for OneCprogsite project.
It exposes the ASGI callable as a module-level variable named ``application``.
For more information on this file, see
https://docs.djangoproject.com/en/4.2/howto/deployment/asgi/
"""
import os
from django.core.asgi import get_asgi_application
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'OneCprogsite.settings')
application = get_asgi_application()
"""
ASGI config for OneCprogsite project.
It exposes the ASGI callable as a module-level variable named ``application``.
For more information on this file, see
https://docs.djangoproject.com/en/4.2/howto/deployment/asgi/
"""
import os
from django.core.asgi import get_asgi_application
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'OneCprogsite.settings')
application = get_asgi_application()

44
OneCprogsite/manage.py
View File

@ -1,22 +1,22 @@
#!/usr/bin/env python
"""Django's command-line utility for administrative tasks."""
import os
import sys
def main():
"""Run administrative tasks."""
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'OneCprogsite.settings')
try:
from django.core.management import execute_from_command_line
except ImportError as exc:
raise ImportError(
"Couldn't import Django. Are you sure it's installed and "
"available on your PYTHONPATH environment variable? Did you "
"forget to activate a virtual environment?"
) from exc
execute_from_command_line(sys.argv)
if __name__ == '__main__':
main()
#!/usr/bin/env python
"""Django's command-line utility for administrative tasks."""
import os
import sys
def main():
"""Run administrative tasks."""
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'OneCprogsite.settings')
try:
from django.core.management import execute_from_command_line
except ImportError as exc:
raise ImportError(
"Couldn't import Django. Are you sure it's installed and "
"available on your PYTHONPATH environment variable? Did you "
"forget to activate a virtual environment?"
) from exc
execute_from_command_line(sys.argv)
if __name__ == '__main__':
main()

338
OneCprogsite/programmer/admin.py
View File

@ -1,169 +1,169 @@
from django.contrib import admin
from django.utils import timezone
from django.utils.html import format_html
from django.urls import path
from django.shortcuts import render
from django.http import HttpResponseRedirect
from django.contrib import messages
from .models import *
class ProgrammerAdmin(admin.ModelAdmin):
list_display = ('id', 'title', 'time_create', 'photo', 'is_published')
list_display_links = ('id', 'title')
search_fields = ('title', 'content')
list_editable = ('is_published',)
list_filter = ('time_create', 'is_published')
class RecallAdmin(admin.ModelAdmin):
list_display = ('id', 'title', 'time_create', 'scan', 'is_published')
list_display_links = ('id', 'title')
search_fields = ('title', 'content')
list_editable = ('is_published',)
list_filter = ('time_create', 'is_published')
class SolutionAdmin(admin.ModelAdmin):
list_display = ('id', 'title', 'time_create', 'is_published')
list_display_links = ('id', 'title')
search_fields = ('title', 'description', 'implementation')
list_editable = ('is_published',)
list_filter = ('time_create', 'is_published')
class HomeAdmin(admin.ModelAdmin):
list_display = ('id', 'title', 'time_create', 'is_published')
list_display_links = ('id', 'title')
search_fields = ('title', 'content')
list_editable = ('is_published',)
list_filter = ('time_create', 'is_published')
@admin.register(CallbackRequest)
class CallbackAdmin(admin.ModelAdmin):
list_display = ('name', 'phone', 'email', 'time_create', 'is_processed', 'is_read', 'new_badge')
list_display_links = ('name', 'phone')
list_editable = ('is_processed', 'is_read')
list_filter = ('time_create', 'is_processed', 'is_read')
search_fields = ('name', 'phone', 'email')
readonly_fields = ('time_create',)
actions = ['mark_as_read', 'mark_as_unread', 'mark_as_processed']
actions = ['mark_as_read', 'mark_as_unread', 'mark_as_processed', 'resend_notification']
def resend_notification(self, request, queryset):
from .utils.email_notifications import send_callback_notification
count = 0
for callback in queryset:
success = send_callback_notification(callback)
if success:
count += 1
self.message_user(request, f'Уведомления отправлены для {count} заявок')
resend_notification.short_description = "Переотправить email уведомления"
def new_badge(self, obj):
if not obj.is_read:
return format_html('<span style="color: red; font-weight: bold;">🆕 НОВАЯ</span>')
return ""
new_badge.short_description = 'Статус'
def get_queryset(self, request):
# Показываем количество непрочитанных в заголовке
unread_count = CallbackRequest.objects.filter(is_read=False).count()
if unread_count > 0:
self.message_user(
request,
f'У вас {unread_count} непрочитанных заявок!',
messages.WARNING
)
return super().get_queryset(request)
def mark_as_read(self, request, queryset):
updated = queryset.update(is_read=True)
self.message_user(request, f'{updated} заявок отмечены как прочитанные')
mark_as_read.short_description = "Отметить как прочитанные"
def mark_as_unread(self, request, queryset):
updated = queryset.update(is_read=False)
self.message_user(request, f'{updated} заявок отмечены как непрочитанные')
mark_as_unread.short_description = "Отметить как непрочитанные"
def mark_as_processed(self, request, queryset):
updated = queryset.update(is_processed=True)
self.message_user(request, f'{updated} заявок отмечены как обработанные')
mark_as_processed.short_description = "Отметить как обработанные"
# Добавляем кастомное представление для статистики
def get_urls(self):
urls = super().get_urls()
custom_urls = [
path('callback-stats/', self.admin_site.admin_view(self.callback_stats), name='callback_stats'),
]
return custom_urls + urls
def callback_stats(self, request):
today = timezone.now().date()
week_ago = today - timezone.timedelta(days=7)
stats = {
'total': CallbackRequest.objects.count(),
'today': CallbackRequest.objects.filter(time_create__date=today).count(),
'week': CallbackRequest.objects.filter(time_create__date__gte=week_ago).count(),
'unread': CallbackRequest.objects.filter(is_read=False).count(),
'unprocessed': CallbackRequest.objects.filter(is_processed=False).count(),
}
context = {
**self.admin_site.each_context(request),
'title': 'Статистика заявок',
'stats': stats,
}
return render(request, 'admin/callback_stats.html', context)
class ProgrammerAdmin(admin.ModelAdmin):
list_display = ('id', 'title', 'time_create', 'photo', 'is_published')
list_display_links = ('id', 'title')
search_fields = ('title', 'content')
list_editable = ('is_published',)
list_filter = ('time_create', 'is_published')
class RecallAdmin(admin.ModelAdmin):
list_display = ('id', 'title', 'time_create', 'scan', 'is_published')
list_display_links = ('id', 'title')
search_fields = ('title', 'content')
list_editable = ('is_published',)
list_filter = ('time_create', 'is_published')
class SolutionAdmin(admin.ModelAdmin):
list_display = ('id', 'title', 'time_create', 'is_published')
list_display_links = ('id', 'title')
search_fields = ('title', 'description', 'implementation')
list_editable = ('is_published',)
list_filter = ('time_create', 'is_published')
class HomeAdmin(admin.ModelAdmin):
list_display = ('id', 'title', 'time_create', 'is_published')
list_display_links = ('id', 'title')
search_fields = ('title', 'content')
list_editable = ('is_published',)
list_filter = ('time_create', 'is_published')
@admin.register(PageView)
class PageViewAdmin(admin.ModelAdmin):
list_display = ['url', 'timestamp', 'ip_address']
list_filter = ['timestamp', 'url']
search_fields = ['url', 'ip_address']
date_hierarchy = 'timestamp'
def get_queryset(self, request):
return super().get_queryset(request).order_by('-timestamp')
admin.site.register(Competence, ProgrammerAdmin)
admin.site.register(Recall, RecallAdmin)
admin.site.register(Solution, SolutionAdmin)
admin.site.register(Home, HomeAdmin)
from django.contrib import admin
from django.utils import timezone
from django.utils.html import format_html
from django.urls import path
from django.shortcuts import render
from django.http import HttpResponseRedirect
from django.contrib import messages
from .models import *
class ProgrammerAdmin(admin.ModelAdmin):
list_display = ('id', 'title', 'time_create', 'photo', 'is_published')
list_display_links = ('id', 'title')
search_fields = ('title', 'content')
list_editable = ('is_published',)
list_filter = ('time_create', 'is_published')
class RecallAdmin(admin.ModelAdmin):
list_display = ('id', 'title', 'time_create', 'scan', 'is_published')
list_display_links = ('id', 'title')
search_fields = ('title', 'content')
list_editable = ('is_published',)
list_filter = ('time_create', 'is_published')
class SolutionAdmin(admin.ModelAdmin):
list_display = ('id', 'title', 'time_create', 'is_published')
list_display_links = ('id', 'title')
search_fields = ('title', 'description', 'implementation')
list_editable = ('is_published',)
list_filter = ('time_create', 'is_published')
class HomeAdmin(admin.ModelAdmin):
list_display = ('id', 'title', 'time_create', 'is_published')
list_display_links = ('id', 'title')
search_fields = ('title', 'content')
list_editable = ('is_published',)
list_filter = ('time_create', 'is_published')
@admin.register(CallbackRequest)
class CallbackAdmin(admin.ModelAdmin):
list_display = ('name', 'phone', 'email', 'time_create', 'is_processed', 'is_read', 'new_badge')
list_display_links = ('name', 'phone')
list_editable = ('is_processed', 'is_read')
list_filter = ('time_create', 'is_processed', 'is_read')
search_fields = ('name', 'phone', 'email')
readonly_fields = ('time_create',)
actions = ['mark_as_read', 'mark_as_unread', 'mark_as_processed']
actions = ['mark_as_read', 'mark_as_unread', 'mark_as_processed', 'resend_notification']
def resend_notification(self, request, queryset):
from .utils.email_notifications import send_callback_notification
count = 0
for callback in queryset:
success = send_callback_notification(callback)
if success:
count += 1
self.message_user(request, f'Уведомления отправлены для {count} заявок')
resend_notification.short_description = "Переотправить email уведомления"
def new_badge(self, obj):
if not obj.is_read:
return format_html('<span style="color: red; font-weight: bold;">🆕 НОВАЯ</span>')
return ""
new_badge.short_description = 'Статус'
def get_queryset(self, request):
# Показываем количество непрочитанных в заголовке
unread_count = CallbackRequest.objects.filter(is_read=False).count()
if unread_count > 0:
self.message_user(
request,
f'У вас {unread_count} непрочитанных заявок!',
messages.WARNING
)
return super().get_queryset(request)
def mark_as_read(self, request, queryset):
updated = queryset.update(is_read=True)
self.message_user(request, f'{updated} заявок отмечены как прочитанные')
mark_as_read.short_description = "Отметить как прочитанные"
def mark_as_unread(self, request, queryset):
updated = queryset.update(is_read=False)
self.message_user(request, f'{updated} заявок отмечены как непрочитанные')
mark_as_unread.short_description = "Отметить как непрочитанные"
def mark_as_processed(self, request, queryset):
updated = queryset.update(is_processed=True)
self.message_user(request, f'{updated} заявок отмечены как обработанные')
mark_as_processed.short_description = "Отметить как обработанные"
# Добавляем кастомное представление для статистики
def get_urls(self):
urls = super().get_urls()
custom_urls = [
path('callback-stats/', self.admin_site.admin_view(self.callback_stats), name='callback_stats'),
]
return custom_urls + urls
def callback_stats(self, request):
today = timezone.now().date()
week_ago = today - timezone.timedelta(days=7)
stats = {
'total': CallbackRequest.objects.count(),
'today': CallbackRequest.objects.filter(time_create__date=today).count(),
'week': CallbackRequest.objects.filter(time_create__date__gte=week_ago).count(),
'unread': CallbackRequest.objects.filter(is_read=False).count(),
'unprocessed': CallbackRequest.objects.filter(is_processed=False).count(),
}
context = {
**self.admin_site.each_context(request),
'title': 'Статистика заявок',
'stats': stats,
}
return render(request, 'admin/callback_stats.html', context)
class ProgrammerAdmin(admin.ModelAdmin):
list_display = ('id', 'title', 'time_create', 'photo', 'is_published')
list_display_links = ('id', 'title')
search_fields = ('title', 'content')
list_editable = ('is_published',)
list_filter = ('time_create', 'is_published')
class RecallAdmin(admin.ModelAdmin):
list_display = ('id', 'title', 'time_create', 'scan', 'is_published')
list_display_links = ('id', 'title')
search_fields = ('title', 'content')
list_editable = ('is_published',)
list_filter = ('time_create', 'is_published')
class SolutionAdmin(admin.ModelAdmin):
list_display = ('id', 'title', 'time_create', 'is_published')
list_display_links = ('id', 'title')
search_fields = ('title', 'description', 'implementation')
list_editable = ('is_published',)
list_filter = ('time_create', 'is_published')
class HomeAdmin(admin.ModelAdmin):
list_display = ('id', 'title', 'time_create', 'is_published')
list_display_links = ('id', 'title')
search_fields = ('title', 'content')
list_editable = ('is_published',)
list_filter = ('time_create', 'is_published')
@admin.register(PageView)
class PageViewAdmin(admin.ModelAdmin):
list_display = ['url', 'timestamp', 'ip_address']
list_filter = ['timestamp', 'url']
search_fields = ['url', 'ip_address']
date_hierarchy = 'timestamp'
def get_queryset(self, request):
return super().get_queryset(request).order_by('-timestamp')
admin.site.register(Competence, ProgrammerAdmin)
admin.site.register(Recall, RecallAdmin)
admin.site.register(Solution, SolutionAdmin)
admin.site.register(Home, HomeAdmin)

14
OneCprogsite/programmer/apps.py
View File

@ -1,7 +1,7 @@
from django.apps import AppConfig
class ProgrammerConfig(AppConfig):
default_auto_field = 'django.db.models.BigAutoField'
name = 'programmer'
verbose_name = 'Программисты'
from django.apps import AppConfig
class ProgrammerConfig(AppConfig):
default_auto_field = 'django.db.models.BigAutoField'
name = 'programmer'
verbose_name = 'Программисты'

22
OneCprogsite/programmer/context_processors.py
View File

@ -1,12 +1,12 @@
from .views import menu
from django.conf import settings
def menu_processor(request):
return {'menu': menu}
def contact_info(request):
return {
'CONTACT_EMAIL': getattr(settings, 'CONTACT_EMAIL', 'it@nserdyuk.ru'),
'CONTACT_PHONE': getattr(settings, 'CONTACT_PHONE', '+7 (960) 469-40-88'),
from .views import menu
from django.conf import settings
def menu_processor(request):
return {'menu': menu}
def contact_info(request):
return {
'CONTACT_EMAIL': getattr(settings, 'CONTACT_EMAIL', 'it@nserdyuk.ru'),
'CONTACT_PHONE': getattr(settings, 'CONTACT_PHONE', '+7 (960) 469-40-88'),
}

64
OneCprogsite/programmer/forms.py
View File

@ -1,33 +1,33 @@
from django import forms
from .models import CallbackRequest
class CallbackForm(forms.ModelForm):
class Meta:
model = CallbackRequest
fields = ['name', 'phone', 'email', 'question']
widgets = {
'name': forms.TextInput(attrs={
'class': 'form-input',
'placeholder': 'Ваше имя'
}),
'phone': forms.TextInput(attrs={
'class': 'form-input',
'placeholder': '+7 (___) ___-__-__'
}),
'email': forms.EmailInput(attrs={
'class': 'form-input',
'placeholder': 'your@email.com'
}),
'question': forms.Textarea(attrs={
'class': 'form-textarea',
'placeholder': 'Опишите ваш вопрос или задачу...',
'rows': 4
}),
}
labels = {
'name': 'Имя',
'phone': 'Телефон',
'email': 'Электронная почта',
'question': 'Ваш вопрос'
from django import forms
from .models import CallbackRequest
class CallbackForm(forms.ModelForm):
class Meta:
model = CallbackRequest
fields = ['name', 'phone', 'email', 'question']
widgets = {
'name': forms.TextInput(attrs={
'class': 'form-input',
'placeholder': 'Ваше имя'
}),
'phone': forms.TextInput(attrs={
'class': 'form-input',
'placeholder': '+7 (___) ___-__-__'
}),
'email': forms.EmailInput(attrs={
'class': 'form-input',
'placeholder': 'your@email.com'
}),
'question': forms.Textarea(attrs={
'class': 'form-textarea',
'placeholder': 'Опишите ваш вопрос или задачу...',
'rows': 4
}),
}
labels = {
'name': 'Имя',
'phone': 'Телефон',
'email': 'Электронная почта',
'question': 'Ваш вопрос'
}

64
OneCprogsite/programmer/management/commands/send_daily_summary.py
View File

@ -1,33 +1,33 @@
# programmer/management/commands/send_daily_summary.py
from django.core.management.base import BaseCommand
from django.utils import timezone
from programmer.utils.email_notifications import send_daily_summary
class Command(BaseCommand):
help = 'Отправляет ежедневную сводку по заявкам на email'
def add_arguments(self, parser):
parser.add_argument(
'--test',
action='store_true',
help='Тестовая отправка (не учитывает реальные данные)',
)
def handle(self, *args, **options):
if options['test']:
self.stdout.write(self.style.WARNING('Тестовая отправка ежедневной сводки...'))
# Здесь можно добавить тестовые данные
else:
self.stdout.write('Отправка ежедневной сводки...')
success = send_daily_summary()
if success:
self.stdout.write(
self.style.SUCCESS(f'Ежедневная сводка отправлена успешно! Время: {timezone.now()}')
)
else:
self.stdout.write(
self.style.WARNING('Ежедневная сводка не отправлена (нет данных или ошибка)')
# programmer/management/commands/send_daily_summary.py
from django.core.management.base import BaseCommand
from django.utils import timezone
from programmer.utils.email_notifications import send_daily_summary
class Command(BaseCommand):
help = 'Отправляет ежедневную сводку по заявкам на email'
def add_arguments(self, parser):
parser.add_argument(
'--test',
action='store_true',
help='Тестовая отправка (не учитывает реальные данные)',
)
def handle(self, *args, **options):
if options['test']:
self.stdout.write(self.style.WARNING('Тестовая отправка ежедневной сводки...'))
# Здесь можно добавить тестовые данные
else:
self.stdout.write('Отправка ежедневной сводки...')
success = send_daily_summary()
if success:
self.stdout.write(
self.style.SUCCESS(f'Ежедневная сводка отправлена успешно! Время: {timezone.now()}')
)
else:
self.stdout.write(
self.style.WARNING('Ежедневная сводка не отправлена (нет данных или ошибка)')
)

56
OneCprogsite/programmer/management/commands/test_email.py
View File

@ -1,29 +1,29 @@
# programmer/management/commands/test_email.py
from django.core.management.base import BaseCommand
from django.conf import settings
from programmer.utils.email_notifications import send_test_email
class Command(BaseCommand):
help = 'Test email configuration'
def handle(self, *args, **options):
self.stdout.write("Testing email configuration...")
# Проверяем настройки
self.stdout.write(f"EMAIL_HOST: {settings.EMAIL_HOST}")
self.stdout.write(f"EMAIL_PORT: {settings.EMAIL_PORT}")
self.stdout.write(f"EMAIL_HOST_USER: {settings.EMAIL_HOST_USER}")
self.stdout.write(f"ADMIN_EMAILS: {settings.ADMIN_EMAILS}")
# Тестируем отправку
success = send_test_email()
if success:
self.stdout.write(
self.style.SUCCESS('✅ Test email sent successfully!')
)
else:
self.stdout.write(
self.style.ERROR('❌ Failed to send test email. Check your email settings.')
# programmer/management/commands/test_email.py
from django.core.management.base import BaseCommand
from django.conf import settings
from programmer.utils.email_notifications import send_test_email
class Command(BaseCommand):
help = 'Test email configuration'
def handle(self, *args, **options):
self.stdout.write("Testing email configuration...")
# Проверяем настройки
self.stdout.write(f"EMAIL_HOST: {settings.EMAIL_HOST}")
self.stdout.write(f"EMAIL_PORT: {settings.EMAIL_PORT}")
self.stdout.write(f"EMAIL_HOST_USER: {settings.EMAIL_HOST_USER}")
self.stdout.write(f"ADMIN_EMAILS: {settings.ADMIN_EMAILS}")
# Тестируем отправку
success = send_test_email()
if success:
self.stdout.write(
self.style.SUCCESS('✅ Test email sent successfully!')
)
else:
self.stdout.write(
self.style.ERROR('❌ Failed to send test email. Check your email settings.')
)

54
OneCprogsite/programmer/management/commands/test_sitemap.py
View File

@ -1,27 +1,27 @@
from django.core.management.base import BaseCommand
from django.contrib.sitemaps import Sitemap
from django.urls import reverse
from programmer.models import Home, Solution, Competence, Recall
class Command(BaseCommand):
help = 'Test sitemap generation'
def handle(self, *args, **options):
from programmer.sitemaps import sitemaps
self.stdout.write('Testing sitemap generation...')
for name, sitemap in sitemaps.items():
self.stdout.write(f'\n{name}:')
items = sitemap().items()
self.stdout.write(f' Items found: {len(items)}')
for item in items[:3]: # Показываем первые 3 элемента
try:
url = sitemap().location(item)
self.stdout.write(f' - {url}')
except Exception as e:
self.stdout.write(f' - Error: {e}')
self.stdout.write('\nSitemap test completed!')
from django.core.management.base import BaseCommand
from django.contrib.sitemaps import Sitemap
from django.urls import reverse
from programmer.models import Home, Solution, Competence, Recall
class Command(BaseCommand):
help = 'Test sitemap generation'
def handle(self, *args, **options):
from programmer.sitemaps import sitemaps
self.stdout.write('Testing sitemap generation...')
for name, sitemap in sitemaps.items():
self.stdout.write(f'\n{name}:')
items = sitemap().items()
self.stdout.write(f' Items found: {len(items)}')
for item in items[:3]: # Показываем первые 3 элемента
try:
url = sitemap().location(item)
self.stdout.write(f' - {url}')
except Exception as e:
self.stdout.write(f' - Error: {e}')
self.stdout.write('\nSitemap test completed!')

106
OneCprogsite/programmer/middleware.py
View File

@ -1,54 +1,54 @@
from .models import PageView, Visitor
from django.utils import timezone
from django.db import transaction
class PageViewMiddleware:
def __init__(self, get_response):
self.get_response = get_response
def __call__(self, request):
# Игнорируем статические файлы и админку
if not request.path.startswith('/static/') and not request.path.startswith('/admin/'):
self.track_page_view(request)
response = self.get_response(request)
return response
def track_page_view(self, request):
try:
with transaction.atomic():
# Сохраняем просмотр страницы
PageView.objects.create(
url=request.path,
ip_address=self.get_client_ip(request),
user_agent=request.META.get('HTTP_USER_AGENT', ''),
referer=request.META.get('HTTP_REFERER', '')
)
# Обновляем статистику посетителя
ip = self.get_client_ip(request)
visitor, created = Visitor.objects.get_or_create(
ip_address=ip,
defaults={
'first_visit': timezone.now(),
'last_visit': timezone.now()
}
)
if not created:
visitor.last_visit = timezone.now()
visitor.visit_count += 1
visitor.save()
except Exception as e:
# Логируем ошибку, но не прерываем выполнение
print(f"Error tracking page view: {e}")
def get_client_ip(self, request):
x_forwarded_for = request.META.get('HTTP_X_FORWARDED_FOR')
if x_forwarded_for:
ip = x_forwarded_for.split(',')[0]
else:
ip = request.META.get('REMOTE_ADDR')
from .models import PageView, Visitor
from django.utils import timezone
from django.db import transaction
class PageViewMiddleware:
def __init__(self, get_response):
self.get_response = get_response
def __call__(self, request):
# Игнорируем статические файлы и админку
if not request.path.startswith('/static/') and not request.path.startswith('/admin/'):
self.track_page_view(request)
response = self.get_response(request)
return response
def track_page_view(self, request):
try:
with transaction.atomic():
# Сохраняем просмотр страницы
PageView.objects.create(
url=request.path,
ip_address=self.get_client_ip(request),
user_agent=request.META.get('HTTP_USER_AGENT', ''),
referer=request.META.get('HTTP_REFERER', '')
)
# Обновляем статистику посетителя
ip = self.get_client_ip(request)
visitor, created = Visitor.objects.get_or_create(
ip_address=ip,
defaults={
'first_visit': timezone.now(),
'last_visit': timezone.now()
}
)
if not created:
visitor.last_visit = timezone.now()
visitor.visit_count += 1
visitor.save()
except Exception as e:
# Логируем ошибку, но не прерываем выполнение
print(f"Error tracking page view: {e}")
def get_client_ip(self, request):
x_forwarded_for = request.META.get('HTTP_X_FORWARDED_FOR')
if x_forwarded_for:
ip = x_forwarded_for.split(',')[0]
else:
ip = request.META.get('REMOTE_ADDR')
return ip

52
OneCprogsite/programmer/migrations/0001_initial.py
View File

@ -1,26 +1,26 @@
# Generated by Django 4.2.7 on 2023-11-23 12:47
from django.db import migrations, models
class Migration(migrations.Migration):
initial = True
dependencies = [
]
operations = [
migrations.CreateModel(
name='Competence',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('title', models.CharField(max_length=255)),
('content', models.TextField(blank=True)),
('photo', models.ImageField(upload_to='photos/%Y/%m/%d/')),
('time_create', models.DateTimeField(auto_now_add=True)),
('time_update', models.DateTimeField(auto_now=True)),
('is_publiched', models.BooleanField(default=True)),
],
),
]
# Generated by Django 4.2.7 on 2023-11-23 12:47
from django.db import migrations, models
class Migration(migrations.Migration):
initial = True
dependencies = [
]
operations = [
migrations.CreateModel(
name='Competence',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('title', models.CharField(max_length=255)),
('content', models.TextField(blank=True)),
('photo', models.ImageField(upload_to='photos/%Y/%m/%d/')),
('time_create', models.DateTimeField(auto_now_add=True)),
('time_update', models.DateTimeField(auto_now=True)),
('is_publiched', models.BooleanField(default=True)),
],
),
]

94
OneCprogsite/programmer/migrations/0002_alter_competence_options_alter_competence_content_and_more.py
View File

@ -1,47 +1,47 @@
# Generated by Django 4.2.7 on 2023-11-24 08:03
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('programmer', '0001_initial'),
]
operations = [
migrations.AlterModelOptions(
name='competence',
options={'ordering': ['time_create', 'title'], 'verbose_name': 'Компитенция', 'verbose_name_plural': 'Компитенции'},
),
migrations.AlterField(
model_name='competence',
name='content',
field=models.TextField(blank=True, verbose_name='Компетенция'),
),
migrations.AlterField(
model_name='competence',
name='is_publiched',
field=models.BooleanField(default=True, verbose_name='Опубликован'),
),
migrations.AlterField(
model_name='competence',
name='photo',
field=models.ImageField(upload_to='photos/%Y/%m/%d/', verbose_name='Фото'),
),
migrations.AlterField(
model_name='competence',
name='time_create',
field=models.DateTimeField(auto_now_add=True, verbose_name='Дата создания'),
),
migrations.AlterField(
model_name='competence',
name='time_update',
field=models.DateTimeField(auto_now=True, verbose_name='Дата изменения'),
),
migrations.AlterField(
model_name='competence',
name='title',
field=models.CharField(max_length=255, verbose_name='Программист'),
),
]
# Generated by Django 4.2.7 on 2023-11-24 08:03
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('programmer', '0001_initial'),
]
operations = [
migrations.AlterModelOptions(
name='competence',
options={'ordering': ['time_create', 'title'], 'verbose_name': 'Компитенция', 'verbose_name_plural': 'Компитенции'},
),
migrations.AlterField(
model_name='competence',
name='content',
field=models.TextField(blank=True, verbose_name='Компетенция'),
),
migrations.AlterField(
model_name='competence',
name='is_publiched',
field=models.BooleanField(default=True, verbose_name='Опубликован'),
),
migrations.AlterField(
model_name='competence',
name='photo',
field=models.ImageField(upload_to='photos/%Y/%m/%d/', verbose_name='Фото'),
),
migrations.AlterField(
model_name='competence',
name='time_create',
field=models.DateTimeField(auto_now_add=True, verbose_name='Дата создания'),
),
migrations.AlterField(
model_name='competence',
name='time_update',
field=models.DateTimeField(auto_now=True, verbose_name='Дата изменения'),
),
migrations.AlterField(
model_name='competence',
name='title',
field=models.CharField(max_length=255, verbose_name='Программист'),
),
]

70
OneCprogsite/programmer/migrations/0003_recall_rename_is_publiched_competence_is_published.py
View File

@ -1,35 +1,35 @@
# Generated by Django 4.2.7 on 2023-11-24 11:54
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('programmer', '0002_alter_competence_options_alter_competence_content_and_more'),
]
operations = [
migrations.CreateModel(
name='Recall',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('title', models.CharField(max_length=255, verbose_name='Организация')),
('content', models.TextField(blank=True, verbose_name='Отзыв')),
('photo', models.ImageField(upload_to='photos/%Y/%m/%d/', verbose_name='Фото')),
('time_create', models.DateTimeField(auto_now_add=True, verbose_name='Дата создания')),
('time_update', models.DateTimeField(auto_now=True, verbose_name='Дата изменения')),
('is_published', models.BooleanField(default=True, verbose_name='Опубликован')),
],
options={
'verbose_name': 'Отзыв',
'verbose_name_plural': 'Отзывы',
'ordering': ['time_create', 'title'],
},
),
migrations.RenameField(
model_name='competence',
old_name='is_publiched',
new_name='is_published',
),
]
# Generated by Django 4.2.7 on 2023-11-24 11:54
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('programmer', '0002_alter_competence_options_alter_competence_content_and_more'),
]
operations = [
migrations.CreateModel(
name='Recall',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('title', models.CharField(max_length=255, verbose_name='Организация')),
('content', models.TextField(blank=True, verbose_name='Отзыв')),
('photo', models.ImageField(upload_to='photos/%Y/%m/%d/', verbose_name='Фото')),
('time_create', models.DateTimeField(auto_now_add=True, verbose_name='Дата создания')),
('time_update', models.DateTimeField(auto_now=True, verbose_name='Дата изменения')),
('is_published', models.BooleanField(default=True, verbose_name='Опубликован')),
],
options={
'verbose_name': 'Отзыв',
'verbose_name_plural': 'Отзывы',
'ordering': ['time_create', 'title'],
},
),
migrations.RenameField(
model_name='competence',
old_name='is_publiched',
new_name='is_published',
),
]

36
OneCprogsite/programmer/migrations/0004_rename_photo_recall_scan.py
View File

@ -1,18 +1,18 @@
# Generated by Django 4.2.7 on 2023-11-24 12:02
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('programmer', '0003_recall_rename_is_publiched_competence_is_published'),
]
operations = [
migrations.RenameField(
model_name='recall',
old_name='photo',
new_name='scan',
),
]
# Generated by Django 4.2.7 on 2023-11-24 12:02
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('programmer', '0003_recall_rename_is_publiched_competence_is_published'),
]
operations = [
migrations.RenameField(
model_name='recall',
old_name='photo',
new_name='scan',
),
]

62
OneCprogsite/programmer/migrations/0005_auto_20231124_1519.py
View File

@ -1,31 +1,31 @@
# Generated by Django 4.2.7 on 2023-11-24 12:19
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('programmer', '0004_rename_photo_recall_scan'),
]
operations = [
migrations.CreateModel(
name='Recall',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('title', models.CharField(max_length=255, verbose_name='Организация')),
('content', models.TextField(blank=True, verbose_name='Отзыв')),
('scan', models.ImageField(upload_to='photos/%Y/%m/%d/', verbose_name='Скан')),
('time_create', models.DateTimeField(auto_now_add=True, verbose_name='Дата создания')),
('time_update', models.DateTimeField(auto_now=True, verbose_name='Дата изменения')),
('is_published', models.BooleanField(default=True, verbose_name='Опубликован')),
],
options={
'verbose_name': 'Отзыв',
'verbose_name_plural': 'Отзывы',
'ordering': ['time_create', 'title'],
},
),
]
# Generated by Django 4.2.7 on 2023-11-24 12:19
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('programmer', '0004_rename_photo_recall_scan'),
]
operations = [
migrations.CreateModel(
name='Recall',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('title', models.CharField(max_length=255, verbose_name='Организация')),
('content', models.TextField(blank=True, verbose_name='Отзыв')),
('scan', models.ImageField(upload_to='photos/%Y/%m/%d/', verbose_name='Скан')),
('time_create', models.DateTimeField(auto_now_add=True, verbose_name='Дата создания')),
('time_update', models.DateTimeField(auto_now=True, verbose_name='Дата изменения')),
('is_published', models.BooleanField(default=True, verbose_name='Опубликован')),
],
options={
'verbose_name': 'Отзыв',
'verbose_name_plural': 'Отзывы',
'ordering': ['time_create', 'title'],
},
),
]

36
OneCprogsite/programmer/migrations/0006_alter_recall_scan.py
View File

@ -1,18 +1,18 @@
# Generated by Django 4.2.7 on 2023-11-25 09:18
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('programmer', '0005_auto_20231124_1519'),
]
operations = [
migrations.AlterField(
model_name='recall',
name='scan',
field=models.ImageField(upload_to='scan/%Y/%m/%d/', verbose_name='Фото'),
),
]
# Generated by Django 4.2.7 on 2023-11-25 09:18
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('programmer', '0005_auto_20231124_1519'),
]
operations = [
migrations.AlterField(
model_name='recall',
name='scan',
field=models.ImageField(upload_to='scan/%Y/%m/%d/', verbose_name='Фото'),
),
]

62
OneCprogsite/programmer/migrations/0007_solution.py
View File

@ -1,31 +1,31 @@
# Generated by Django 4.2.7 on 2023-11-25 09:51
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('programmer', '0006_alter_recall_scan'),
]
operations = [
migrations.CreateModel(
name='Solution',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('title', models.CharField(max_length=255, verbose_name='Наименование')),
('description', models.TextField(blank=True, verbose_name='Описание')),
('implementation', models.TextField(blank=True, verbose_name='Реализация')),
('closing', models.TextField(blank=True, verbose_name='Заключение')),
('time_create', models.DateTimeField(auto_now_add=True, verbose_name='Дата создания')),
('time_update', models.DateTimeField(auto_now=True, verbose_name='Дата изменения')),
('is_published', models.BooleanField(default=True, verbose_name='Опубликован')),
],
options={
'verbose_name': 'Проекты',
'verbose_name_plural': 'Проекты',
'ordering': ['time_create', 'title'],
},
),
]
# Generated by Django 4.2.7 on 2023-11-25 09:51
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('programmer', '0006_alter_recall_scan'),
]
operations = [
migrations.CreateModel(
name='Solution',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('title', models.CharField(max_length=255, verbose_name='Наименование')),
('description', models.TextField(blank=True, verbose_name='Описание')),
('implementation', models.TextField(blank=True, verbose_name='Реализация')),
('closing', models.TextField(blank=True, verbose_name='Заключение')),
('time_create', models.DateTimeField(auto_now_add=True, verbose_name='Дата создания')),
('time_update', models.DateTimeField(auto_now=True, verbose_name='Дата изменения')),
('is_published', models.BooleanField(default=True, verbose_name='Опубликован')),
],
options={
'verbose_name': 'Проекты',
'verbose_name_plural': 'Проекты',
'ordering': ['time_create', 'title'],
},
),
]

60
OneCprogsite/programmer/migrations/0008_home.py
View File

@ -1,30 +1,30 @@
# Generated by Django 4.2.7 on 2023-11-25 10:45
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('programmer', '0007_solution'),
]
operations = [
migrations.CreateModel(
name='Home',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('title', models.CharField(max_length=255, verbose_name='Наименование')),
('content', models.TextField(blank=True, verbose_name='Статья')),
('home_image', models.ImageField(upload_to='home_image/%Y/%m/%d/', verbose_name='Фото')),
('time_create', models.DateTimeField(auto_now_add=True, verbose_name='Дата создания')),
('time_update', models.DateTimeField(auto_now=True, verbose_name='Дата изменения')),
('is_published', models.BooleanField(default=True, verbose_name='Опубликован')),
],
options={
'verbose_name': 'Главная страница',
'verbose_name_plural': 'Главная страница',
'ordering': ['time_create', 'title'],
},
),
]
# Generated by Django 4.2.7 on 2023-11-25 10:45
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('programmer', '0007_solution'),
]
operations = [
migrations.CreateModel(
name='Home',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('title', models.CharField(max_length=255, verbose_name='Наименование')),
('content', models.TextField(blank=True, verbose_name='Статья')),
('home_image', models.ImageField(upload_to='home_image/%Y/%m/%d/', verbose_name='Фото')),
('time_create', models.DateTimeField(auto_now_add=True, verbose_name='Дата создания')),
('time_update', models.DateTimeField(auto_now=True, verbose_name='Дата изменения')),
('is_published', models.BooleanField(default=True, verbose_name='Опубликован')),
],
options={
'verbose_name': 'Главная страница',
'verbose_name_plural': 'Главная страница',
'ordering': ['time_create', 'title'],
},
),
]

68
OneCprogsite/programmer/migrations/0009_callbackrequest_alter_competence_options.py
View File

@ -1,34 +1,34 @@
# Generated by Django 4.2.7 on 2025-11-09 12:00
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('programmer', '0008_home'),
]
operations = [
migrations.CreateModel(
name='CallbackRequest',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=100, verbose_name='Имя')),
('phone', models.CharField(max_length=20, verbose_name='Телефон')),
('email', models.EmailField(max_length=254, verbose_name='Электронная почта')),
('question', models.TextField(verbose_name='Ваш вопрос')),
('time_create', models.DateTimeField(auto_now_add=True, verbose_name='Дата создания')),
('is_processed', models.BooleanField(default=False, verbose_name='Обработано')),
],
options={
'verbose_name': 'Заявка на звонок',
'verbose_name_plural': 'Заявки на звонок',
'ordering': ['-time_create'],
},
),
migrations.AlterModelOptions(
name='competence',
options={'ordering': ['time_create', 'title'], 'verbose_name': 'Компетенция', 'verbose_name_plural': 'Компетенции'},
),
]
# Generated by Django 4.2.7 on 2025-11-09 12:00
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('programmer', '0008_home'),
]
operations = [
migrations.CreateModel(
name='CallbackRequest',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=100, verbose_name='Имя')),
('phone', models.CharField(max_length=20, verbose_name='Телефон')),
('email', models.EmailField(max_length=254, verbose_name='Электронная почта')),
('question', models.TextField(verbose_name='Ваш вопрос')),
('time_create', models.DateTimeField(auto_now_add=True, verbose_name='Дата создания')),
('is_processed', models.BooleanField(default=False, verbose_name='Обработано')),
],
options={
'verbose_name': 'Заявка на звонок',
'verbose_name_plural': 'Заявки на звонок',
'ordering': ['-time_create'],
},
),
migrations.AlterModelOptions(
name='competence',
options={'ordering': ['time_create', 'title'], 'verbose_name': 'Компетенция', 'verbose_name_plural': 'Компетенции'},
),
]

46
OneCprogsite/programmer/migrations/0010_alter_callbackrequest_email_and_more.py
View File

@ -1,23 +1,23 @@
# Generated by Django 4.2.7 on 2025-11-09 12:09
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('programmer', '0009_callbackrequest_alter_competence_options'),
]
operations = [
migrations.AlterField(
model_name='callbackrequest',
name='email',
field=models.EmailField(blank=True, max_length=254, null=True, verbose_name='Электронная почта'),
),
migrations.AlterField(
model_name='callbackrequest',
name='question',
field=models.TextField(blank=True, verbose_name='Ваш вопрос'),
),
]
# Generated by Django 4.2.7 on 2025-11-09 12:09
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('programmer', '0009_callbackrequest_alter_competence_options'),
]
operations = [
migrations.AlterField(
model_name='callbackrequest',
name='email',
field=models.EmailField(blank=True, max_length=254, null=True, verbose_name='Электронная почта'),
),
migrations.AlterField(
model_name='callbackrequest',
name='question',
field=models.TextField(blank=True, verbose_name='Ваш вопрос'),
),
]

82
OneCprogsite/programmer/migrations/0011_visitor_pageview.py
View File

@ -1,41 +1,41 @@
# Generated by Django 4.2.7 on 2025-11-12 11:43
from django.db import migrations, models
import django.utils.timezone
class Migration(migrations.Migration):
dependencies = [
('programmer', '0010_alter_callbackrequest_email_and_more'),
]
operations = [
migrations.CreateModel(
name='Visitor',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('ip_address', models.GenericIPAddressField()),
('first_visit', models.DateTimeField(default=django.utils.timezone.now)),
('last_visit', models.DateTimeField(default=django.utils.timezone.now)),
('visit_count', models.IntegerField(default=1)),
],
options={
'indexes': [models.Index(fields=['ip_address'], name='programmer__ip_addr_2c6dca_idx')],
},
),
migrations.CreateModel(
name='PageView',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('url', models.CharField(max_length=500)),
('timestamp', models.DateTimeField(default=django.utils.timezone.now)),
('ip_address', models.GenericIPAddressField()),
('user_agent', models.TextField(blank=True)),
('referer', models.CharField(blank=True, max_length=500)),
],
options={
'indexes': [models.Index(fields=['url', 'timestamp'], name='programmer__url_9a41b2_idx'), models.Index(fields=['timestamp'], name='programmer__timesta_070072_idx')],
},
),
]
# Generated by Django 4.2.7 on 2025-11-12 11:43
from django.db import migrations, models
import django.utils.timezone
class Migration(migrations.Migration):
dependencies = [
('programmer', '0010_alter_callbackrequest_email_and_more'),
]
operations = [
migrations.CreateModel(
name='Visitor',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('ip_address', models.GenericIPAddressField()),
('first_visit', models.DateTimeField(default=django.utils.timezone.now)),
('last_visit', models.DateTimeField(default=django.utils.timezone.now)),
('visit_count', models.IntegerField(default=1)),
],
options={
'indexes': [models.Index(fields=['ip_address'], name='programmer__ip_addr_2c6dca_idx')],
},
),
migrations.CreateModel(
name='PageView',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('url', models.CharField(max_length=500)),
('timestamp', models.DateTimeField(default=django.utils.timezone.now)),
('ip_address', models.GenericIPAddressField()),
('user_agent', models.TextField(blank=True)),
('referer', models.CharField(blank=True, max_length=500)),
],
options={
'indexes': [models.Index(fields=['url', 'timestamp'], name='programmer__url_9a41b2_idx'), models.Index(fields=['timestamp'], name='programmer__timesta_070072_idx')],
},
),
]

36
OneCprogsite/programmer/migrations/0012_callbackrequest_is_read.py
View File

@ -1,18 +1,18 @@
# Generated by Django 4.2.7 on 2025-11-14 09:37
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('programmer', '0011_visitor_pageview'),
]
operations = [
migrations.AddField(
model_name='callbackrequest',
name='is_read',
field=models.BooleanField(default=False, verbose_name='Прочитано'),
),
]
# Generated by Django 4.2.7 on 2025-11-14 09:37
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('programmer', '0011_visitor_pageview'),
]
operations = [
migrations.AddField(
model_name='callbackrequest',
name='is_read',
field=models.BooleanField(default=False, verbose_name='Прочитано'),
),
]

36
OneCprogsite/programmer/migrations/0013_callbackrequest_notification_sent.py
View File

@ -1,18 +1,18 @@
# Generated by Django 4.2.7 on 2025-11-14 10:03
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('programmer', '0012_callbackrequest_is_read'),
]
operations = [
migrations.AddField(
model_name='callbackrequest',
name='notification_sent',
field=models.BooleanField(default=False, verbose_name='Уведомление отправлено'),
),
]
# Generated by Django 4.2.7 on 2025-11-14 10:03
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('programmer', '0012_callbackrequest_is_read'),
]
operations = [
migrations.AddField(
model_name='callbackrequest',
name='notification_sent',
field=models.BooleanField(default=False, verbose_name='Уведомление отправлено'),
),
]

360
OneCprogsite/programmer/models.py
View File

@ -1,180 +1,180 @@
from django.db import models
from django.urls import reverse
from django.utils import timezone
from django.db.models.signals import post_save, post_delete
from django.dispatch import receiver
from django.core.cache import cache
from .utils.email_notifications import send_callback_notification
class Recall(models.Model):
title = models.CharField(max_length=255, verbose_name='Организация')
content = models.TextField(blank=True, verbose_name='Отзыв')
scan = models.ImageField(upload_to="scan/%Y/%m/%d/", verbose_name='Фото')
time_create = models.DateTimeField(auto_now_add=True, verbose_name='Дата создания')
time_update = models.DateTimeField(auto_now=True, verbose_name='Дата изменения')
is_published = models.BooleanField(default=True, verbose_name='Опубликован')
def __str__(self):
return self.title
def get_absolute_url(self):
return reverse('post', kwargs={'post_id': self.pk})
class Meta:
verbose_name = 'Отзыв'
verbose_name_plural = 'Отзывы'
ordering = ['time_create', 'title']
def get_seo_title(self):
return f"Отзыв от {self.title} | Программист 1С"
def get_seo_description(self):
if self.content:
clean_content = self.content[:160].replace('\n', ' ').strip()
return f"Отзыв о работе программиста 1С от {self.title}. {clean_content}..."
return f"Отзыв клиента {self.title} о работе программиста 1С Николая Сердюк"
class Competence(models.Model):
title = models.CharField(max_length=255, verbose_name='Программист')
content = models.TextField(blank=True, verbose_name='Компетенция')
photo = models.ImageField(upload_to="photos/%Y/%m/%d/", verbose_name='Фото')
time_create = models.DateTimeField(auto_now_add=True, verbose_name='Дата создания')
time_update = models.DateTimeField(auto_now=True, verbose_name='Дата изменения')
is_published = models.BooleanField(default=True, verbose_name='Опубликован')
def __str__(self):
return self.title
def get_absolute_url(self):
return reverse('post', kwargs={'post_id': self.pk})
class Meta:
verbose_name = 'Компетенция'
verbose_name_plural = 'Компетенции'
ordering = ['time_create', 'title']
class Solution(models.Model):
title = models.CharField(max_length=255, verbose_name='Наименование')
description = models.TextField(blank=True, verbose_name='Описание')
implementation = models.TextField(blank=True, verbose_name='Реализация')
closing = models.TextField(blank=True, verbose_name='Заключение')
time_create = models.DateTimeField(auto_now_add=True, verbose_name='Дата создания')
time_update = models.DateTimeField(auto_now=True, verbose_name='Дата изменения')
is_published = models.BooleanField(default=True, verbose_name='Опубликован')
def __str__(self):
return self.title
def get_absolute_url(self):
return reverse('post', kwargs={'post_id': self.pk})
class Meta:
verbose_name = 'Проекты'
verbose_name_plural = 'Проекты'
ordering = ['time_create', 'title']
def get_seo_title(self):
"""Генерирует SEO-заголовок для проекта"""
return f"Проект: {self.title} | Автоматизация 1С"
def get_seo_description(self):
"""Генерирует SEO-описание для проекта"""
if self.description:
clean_desc = self.description[:160].replace('\n', ' ').strip()
return f"Проект автоматизации: {self.title}. {clean_desc}..."
return f"Реализация проекта {self.title} - программист 1С Николай Сердюк"
def get_meta_keywords(self):
"""Автоматические ключевые слова для проекта"""
base_keywords = ["проект 1С", "автоматизация 1С", "внедрение 1С"]
title_words = self.title.lower().split()
return base_keywords + title_words
class Home(models.Model):
title = models.CharField(max_length=255, verbose_name='Наименование')
content = models.TextField(blank=True, verbose_name='Статья')
home_image = models.ImageField(upload_to="home_image/%Y/%m/%d/", verbose_name='Фото')
time_create = models.DateTimeField(auto_now_add=True, verbose_name='Дата создания')
time_update = models.DateTimeField(auto_now=True, verbose_name='Дата изменения')
is_published = models.BooleanField(default=True, verbose_name='Опубликован')
def __str__(self):
return self.title
def get_absolute_url(self):
return reverse('post', kwargs={'post_id': self.pk})
class Meta:
verbose_name = 'Главная страница'
verbose_name_plural = 'Главная страница'
ordering = ['time_create', 'title']
class CallbackRequest(models.Model):
name = models.CharField(max_length=100, verbose_name='Имя')
phone = models.CharField(max_length=20, verbose_name='Телефон')
email = models.EmailField(blank=True, null=True, verbose_name='Электронная почта') # Сделать необязательным
question = models.TextField(blank=True, verbose_name='Ваш вопрос') # Сделать необязательным
time_create = models.DateTimeField(auto_now_add=True, verbose_name='Дата создания')
is_processed = models.BooleanField(default=False, verbose_name='Обработано')
is_read = models.BooleanField(default=False, verbose_name='Прочитано')
notification_sent = models.BooleanField(default=False, verbose_name='Уведомление отправлено')
def __str__(self):
return f"{self.name} - {self.phone}"
class Meta:
verbose_name = 'Заявка на звонок'
verbose_name_plural = 'Заявки на звонок'
ordering = ['-time_create']
# Сигнал для отправки уведомления при создании заявки
@receiver(post_save, sender=CallbackRequest)
def send_callback_email_notification(sender, instance, created, **kwargs):
if created and not instance.notification_sent:
# Отправляем email уведомление
success = send_callback_notification(instance)
if success:
instance.notification_sent = True
# Сохраняем без повторного вызова сигнала
sender.objects.filter(pk=instance.pk).update(notification_sent=True)
class PageView(models.Model):
url = models.CharField(max_length=500)
timestamp = models.DateTimeField(default=timezone.now)
ip_address = models.GenericIPAddressField()
user_agent = models.TextField(blank=True)
referer = models.CharField(max_length=500, blank=True)
class Meta:
indexes = [
models.Index(fields=['url', 'timestamp']),
models.Index(fields=['timestamp']),
]
class Visitor(models.Model):
ip_address = models.GenericIPAddressField()
first_visit = models.DateTimeField(default=timezone.now)
last_visit = models.DateTimeField(default=timezone.now)
visit_count = models.IntegerField(default=1)
class Meta:
indexes = [
models.Index(fields=['ip_address']),
]
@receiver([post_save, post_delete], sender=Home)
@receiver([post_save, post_delete], sender=Solution)
@receiver([post_save, post_delete], sender=Competence)
@receiver([post_save, post_delete], sender=Recall)
def clear_sitemap_cache(sender, **kwargs):
"""Очищаем кэш sitemap при изменении контента"""
cache.delete('sitemap_cache')
from django.db import models
from django.urls import reverse
from django.utils import timezone
from django.db.models.signals import post_save, post_delete
from django.dispatch import receiver
from django.core.cache import cache
from .utils.email_notifications import send_callback_notification
class Recall(models.Model):
title = models.CharField(max_length=255, verbose_name='Организация')
content = models.TextField(blank=True, verbose_name='Отзыв')
scan = models.ImageField(upload_to="scan/%Y/%m/%d/", verbose_name='Фото')
time_create = models.DateTimeField(auto_now_add=True, verbose_name='Дата создания')
time_update = models.DateTimeField(auto_now=True, verbose_name='Дата изменения')
is_published = models.BooleanField(default=True, verbose_name='Опубликован')
def __str__(self):
return self.title
def get_absolute_url(self):
return reverse('post', kwargs={'post_id': self.pk})
class Meta:
verbose_name = 'Отзыв'
verbose_name_plural = 'Отзывы'
ordering = ['time_create', 'title']
def get_seo_title(self):
return f"Отзыв от {self.title} | Программист 1С"
def get_seo_description(self):
if self.content:
clean_content = self.content[:160].replace('\n', ' ').strip()
return f"Отзыв о работе программиста 1С от {self.title}. {clean_content}..."
return f"Отзыв клиента {self.title} о работе программиста 1С Николая Сердюк"
class Competence(models.Model):
title = models.CharField(max_length=255, verbose_name='Программист')
content = models.TextField(blank=True, verbose_name='Компетенция')
photo = models.ImageField(upload_to="photos/%Y/%m/%d/", verbose_name='Фото')
time_create = models.DateTimeField(auto_now_add=True, verbose_name='Дата создания')
time_update = models.DateTimeField(auto_now=True, verbose_name='Дата изменения')
is_published = models.BooleanField(default=True, verbose_name='Опубликован')
def __str__(self):
return self.title
def get_absolute_url(self):
return reverse('post', kwargs={'post_id': self.pk})
class Meta:
verbose_name = 'Компетенция'
verbose_name_plural = 'Компетенции'
ordering = ['time_create', 'title']
class Solution(models.Model):
title = models.CharField(max_length=255, verbose_name='Наименование')
description = models.TextField(blank=True, verbose_name='Описание')
implementation = models.TextField(blank=True, verbose_name='Реализация')
closing = models.TextField(blank=True, verbose_name='Заключение')
time_create = models.DateTimeField(auto_now_add=True, verbose_name='Дата создания')
time_update = models.DateTimeField(auto_now=True, verbose_name='Дата изменения')
is_published = models.BooleanField(default=True, verbose_name='Опубликован')
def __str__(self):
return self.title
def get_absolute_url(self):
return reverse('post', kwargs={'post_id': self.pk})
class Meta:
verbose_name = 'Проекты'
verbose_name_plural = 'Проекты'
ordering = ['time_create', 'title']
def get_seo_title(self):
"""Генерирует SEO-заголовок для проекта"""
return f"Проект: {self.title} | Автоматизация 1С"
def get_seo_description(self):
"""Генерирует SEO-описание для проекта"""
if self.description:
clean_desc = self.description[:160].replace('\n', ' ').strip()
return f"Проект автоматизации: {self.title}. {clean_desc}..."
return f"Реализация проекта {self.title} - программист 1С Николай Сердюк"
def get_meta_keywords(self):
"""Автоматические ключевые слова для проекта"""
base_keywords = ["проект 1С", "автоматизация 1С", "внедрение 1С"]
title_words = self.title.lower().split()
return base_keywords + title_words
class Home(models.Model):
title = models.CharField(max_length=255, verbose_name='Наименование')
content = models.TextField(blank=True, verbose_name='Статья')
home_image = models.ImageField(upload_to="home_image/%Y/%m/%d/", verbose_name='Фото')
time_create = models.DateTimeField(auto_now_add=True, verbose_name='Дата создания')
time_update = models.DateTimeField(auto_now=True, verbose_name='Дата изменения')
is_published = models.BooleanField(default=True, verbose_name='Опубликован')
def __str__(self):
return self.title
def get_absolute_url(self):
return reverse('post', kwargs={'post_id': self.pk})
class Meta:
verbose_name = 'Главная страница'
verbose_name_plural = 'Главная страница'
ordering = ['time_create', 'title']
class CallbackRequest(models.Model):
name = models.CharField(max_length=100, verbose_name='Имя')
phone = models.CharField(max_length=20, verbose_name='Телефон')
email = models.EmailField(blank=True, null=True, verbose_name='Электронная почта') # Сделать необязательным
question = models.TextField(blank=True, verbose_name='Ваш вопрос') # Сделать необязательным
time_create = models.DateTimeField(auto_now_add=True, verbose_name='Дата создания')
is_processed = models.BooleanField(default=False, verbose_name='Обработано')
is_read = models.BooleanField(default=False, verbose_name='Прочитано')
notification_sent = models.BooleanField(default=False, verbose_name='Уведомление отправлено')
def __str__(self):
return f"{self.name} - {self.phone}"
class Meta:
verbose_name = 'Заявка на звонок'
verbose_name_plural = 'Заявки на звонок'
ordering = ['-time_create']
# Сигнал для отправки уведомления при создании заявки
@receiver(post_save, sender=CallbackRequest)
def send_callback_email_notification(sender, instance, created, **kwargs):
if created and not instance.notification_sent:
# Отправляем email уведомление
success = send_callback_notification(instance)
if success:
instance.notification_sent = True
# Сохраняем без повторного вызова сигнала
sender.objects.filter(pk=instance.pk).update(notification_sent=True)
class PageView(models.Model):
url = models.CharField(max_length=500)
timestamp = models.DateTimeField(default=timezone.now)
ip_address = models.GenericIPAddressField()
user_agent = models.TextField(blank=True)
referer = models.CharField(max_length=500, blank=True)
class Meta:
indexes = [
models.Index(fields=['url', 'timestamp']),
models.Index(fields=['timestamp']),
]
class Visitor(models.Model):
ip_address = models.GenericIPAddressField()
first_visit = models.DateTimeField(default=timezone.now)
last_visit = models.DateTimeField(default=timezone.now)
visit_count = models.IntegerField(default=1)
class Meta:
indexes = [
models.Index(fields=['ip_address']),
]
@receiver([post_save, post_delete], sender=Home)
@receiver([post_save, post_delete], sender=Solution)
@receiver([post_save, post_delete], sender=Competence)
@receiver([post_save, post_delete], sender=Recall)
def clear_sitemap_cache(sender, **kwargs):
"""Очищаем кэш sitemap при изменении контента"""
cache.delete('sitemap_cache')

126
OneCprogsite/programmer/sitemaps.py
View File

@ -1,64 +1,64 @@
from django.contrib.sitemaps import Sitemap
from django.urls import reverse
from .models import Home, Solution, Competence, Recall
class StaticViewSitemap(Sitemap):
priority = 1.0
changefreq = 'monthly'
def items(self):
return ['home', 'about', 'solution', 'ability', 'recall']
def location(self, item):
return reverse(item)
class HomeSitemap(Sitemap):
changefreq = 'weekly'
priority = 1.0
def items(self):
return Home.objects.filter(is_published=True)
def lastmod(self, obj):
return obj.time_update
# УБИРАЕМ метод location - используем default
# Django автоматически сгенерирует правильные URL
class SolutionSitemap(Sitemap):
changefreq = 'weekly'
priority = 0.9
def items(self):
return Solution.objects.filter(is_published=True)
def lastmod(self, obj):
return obj.time_update
class CompetenceSitemap(Sitemap):
changefreq = 'monthly'
priority = 0.8
def items(self):
return Competence.objects.filter(is_published=True)
def lastmod(self, obj):
return obj.time_update
class RecallSitemap(Sitemap):
changefreq = 'monthly'
priority = 0.7
def items(self):
return Recall.objects.filter(is_published=True)
def lastmod(self, obj):
return obj.time_update
# Упрощаем sitemaps - убираем HomeSitemap если он дублирует главную
sitemaps = {
'static': StaticViewSitemap,
'solutions': SolutionSitemap,
'competence': CompetenceSitemap,
'recall': RecallSitemap,
from django.contrib.sitemaps import Sitemap
from django.urls import reverse
from .models import Home, Solution, Competence, Recall
class StaticViewSitemap(Sitemap):
priority = 1.0
changefreq = 'monthly'
def items(self):
return ['home', 'about', 'solution', 'ability', 'recall']
def location(self, item):
return reverse(item)
class HomeSitemap(Sitemap):
changefreq = 'weekly'
priority = 1.0
def items(self):
return Home.objects.filter(is_published=True)
def lastmod(self, obj):
return obj.time_update
# УБИРАЕМ метод location - используем default
# Django автоматически сгенерирует правильные URL
class SolutionSitemap(Sitemap):
changefreq = 'weekly'
priority = 0.9
def items(self):
return Solution.objects.filter(is_published=True)
def lastmod(self, obj):
return obj.time_update
class CompetenceSitemap(Sitemap):
changefreq = 'monthly'
priority = 0.8
def items(self):
return Competence.objects.filter(is_published=True)
def lastmod(self, obj):
return obj.time_update
class RecallSitemap(Sitemap):
changefreq = 'monthly'
priority = 0.7
def items(self):
return Recall.objects.filter(is_published=True)
def lastmod(self, obj):
return obj.time_update
# Упрощаем sitemaps - убираем HomeSitemap если он дублирует главную
sitemaps = {
'static': StaticViewSitemap,
'solutions': SolutionSitemap,
'competence': CompetenceSitemap,
'recall': RecallSitemap,
}

596
OneCprogsite/programmer/static/programmer/css/competence.css
View File

@ -1,299 +1,299 @@
/* competence.css - Стили для страницы компетенций */
/* Основные стили для страницы компетенций */
.competence-item {
display: flex;
gap: 2rem;
align-items: flex-start;
padding: 2rem;
background: var(--bg-card);
border-radius: var(--radius-xl);
box-shadow: var(--shadow-lg);
border-left: 4px solid var(--secondary);
transition: var(--transition);
border: 1px solid var(--border-light);
}
.competence-item:hover {
transform: translateX(8px);
box-shadow: var(--shadow-xl);
border-color: var(--primary-light);
}
.competence-scan-wrapper {
flex-shrink: 0;
}
.competence-scan-container {
width: 280px;
cursor: pointer;
border-radius: var(--radius-lg);
overflow: hidden;
border: 2px solid var(--border-light);
transition: var(--transition);
position: relative;
box-shadow: var(--shadow-md);
}
.competence-scan-container:hover {
transform: translateY(-4px) scale(1.02);
box-shadow: var(--shadow-xl);
border-color: var(--primary);
}
.competence-scan {
width: 100%;
height: auto;
display: block;
transition: var(--transition);
}
.competence-content {
flex: 1;
min-width: 0;
}
.competence-title {
font-size: 1.5rem;
font-weight: 700;
color: var(--text-primary);
margin-bottom: 1rem;
background: var(--gradient-primary);
-webkit-background-clip: text;
-webkit-text-fill-color: transparent;
background-clip: text;
}
.competence-description {
line-height: 1.7;
font-size: 1.05rem;
color: var(--text-primary);
}
.competence-description p {
margin-bottom: 1rem;
}
.competence-description p:last-child {
margin-bottom: 0;
}
.scan-hint {
position: absolute;
bottom: 0;
left: 0;
right: 0;
background: linear-gradient(transparent, rgba(0,0,0,0.8));
color: white;
padding: 1rem;
text-align: center;
opacity: 0;
transition: var(--transition);
transform: translateY(10px);
}
.competence-scan-container:hover .scan-hint {
opacity: 1;
transform: translateY(0);
}
/* Стили для модального окна с изображением компетенций */
.modal.competence-modal {
background-color: rgba(15, 19, 31, 0.95);
backdrop-filter: blur(10px);
}
.modal.competence-modal .modal-content {
background: transparent;
border: none;
box-shadow: none;
max-width: 95vw;
max-height: 95vh;
margin: 2% auto;
}
.modal.competence-modal .modal-header {
background: var(--bg-card);
border-bottom: 2px solid var(--border-light);
padding: 1.5rem 2rem;
}
.modal.competence-modal .modal-header h3 {
margin: 0;
color: var(--text-primary);
font-size: 1.25rem;
font-weight: 600;
background: var(--gradient-primary);
-webkit-background-clip: text;
-webkit-text-fill-color: transparent;
background-clip: text;
}
.modal.competence-modal .modal-body {
padding: 1rem;
display: flex;
align-items: center;
justify-content: center;
background: transparent;
}
.modal-image {
max-width: 90vw;
max-height: 80vh;
width: auto;
height: auto;
display: block;
margin: 0 auto;
border-radius: var(--radius-md);
box-shadow: var(--shadow-xl);
transition: all 0.3s ease;
}
/* Анимации для модального окна */
.modal.competence-modal {
transition: opacity 0.3s ease;
opacity: 0;
}
.modal.competence-modal.active {
opacity: 1;
}
.modal.competence-modal .modal-content {
transform: scale(0.7);
transition: transform 0.3s ease;
}
.modal.competence-modal.active .modal-content {
transform: scale(1);
}
/* Улучшенные тени и границы */
.competence-scan-container {
border: 2px solid var(--border-light);
box-shadow: var(--shadow-lg);
}
.competence-scan-container:hover {
border-color: var(--primary-light);
box-shadow: var(--shadow-xl);
}
/* Адаптивность для мобильных устройств */
@media (max-width: 768px) {
.competence-item {
flex-direction: column;
padding: 1.5rem;
gap: 1.5rem;
}
.competence-scan-container {
width: 100%;
max-width: 300px;
margin: 0 auto;
}
.competence-title {
font-size: 1.375rem;
text-align: center;
}
.modal-image {
max-width: 95vw;
max-height: 70vh;
}
.modal.competence-modal .modal-content {
margin: 10% auto;
}
.modal.competence-modal .modal-header {
padding: 1rem 1.5rem;
}
}
@media (max-width: 480px) {
.competence-item {
padding: 1.25rem;
}
.competence-scan-container {
max-width: 100%;
}
.competence-title {
font-size: 1.25rem;
}
.modal.competence-modal .modal-content {
margin: 5% auto;
max-width: 98vw;
}
.modal.competence-modal .modal-body {
padding: 0.5rem;
}
.modal.competence-modal .modal-header {
padding: 1rem;
}
.modal.competence-modal .modal-header h3 {
font-size: 1.1rem;
}
}
/* Стили для светлой темы */
@media (prefers-color-scheme: light) {
.modal.competence-modal {
background-color: rgba(0, 0, 0, 0.8);
}
.modal.competence-modal .modal-header {
background: var(--bg-primary);
}
.scan-hint {
background: linear-gradient(transparent, rgba(0,0,0,0.7));
}
.competence-item {
background: var(--bg-primary);
}
.competence-description {
color: var(--text-primary);
}
}
/* Улучшенные стили для сетки компетенций */
.competence-grid {
display: grid;
gap: 2rem;
}
.competence-grid .modern-card {
padding: 0;
overflow: hidden;
}
.competence-grid .modern-card::before {
height: 4px;
background: var(--gradient-secondary);
}
/* Анимации появления */
.fade-in {
animation: fadeInUp 0.8s ease-out;
}
@keyframes fadeInUp {
from {
opacity: 0;
transform: translateY(40px);
}
to {
opacity: 1;
transform: translateY(0);
}
/* competence.css - Стили для страницы компетенций */
/* Основные стили для страницы компетенций */
.competence-item {
display: flex;
gap: 2rem;
align-items: flex-start;
padding: 2rem;
background: var(--bg-card);
border-radius: var(--radius-xl);
box-shadow: var(--shadow-lg);
border-left: 4px solid var(--secondary);
transition: var(--transition);
border: 1px solid var(--border-light);
}
.competence-item:hover {
transform: translateX(8px);
box-shadow: var(--shadow-xl);
border-color: var(--primary-light);
}
.competence-scan-wrapper {
flex-shrink: 0;
}
.competence-scan-container {
width: 280px;
cursor: pointer;
border-radius: var(--radius-lg);
overflow: hidden;
border: 2px solid var(--border-light);
transition: var(--transition);
position: relative;
box-shadow: var(--shadow-md);
}
.competence-scan-container:hover {
transform: translateY(-4px) scale(1.02);
box-shadow: var(--shadow-xl);
border-color: var(--primary);
}
.competence-scan {
width: 100%;
height: auto;
display: block;
transition: var(--transition);
}
.competence-content {
flex: 1;
min-width: 0;
}
.competence-title {
font-size: 1.5rem;
font-weight: 700;
color: var(--text-primary);
margin-bottom: 1rem;
background: var(--gradient-primary);
-webkit-background-clip: text;
-webkit-text-fill-color: transparent;
background-clip: text;
}
.competence-description {
line-height: 1.7;
font-size: 1.05rem;
color: var(--text-primary);
}
.competence-description p {
margin-bottom: 1rem;
}
.competence-description p:last-child {
margin-bottom: 0;
}
.scan-hint {
position: absolute;
bottom: 0;
left: 0;
right: 0;
background: linear-gradient(transparent, rgba(0,0,0,0.8));
color: white;
padding: 1rem;
text-align: center;
opacity: 0;
transition: var(--transition);
transform: translateY(10px);
}
.competence-scan-container:hover .scan-hint {
opacity: 1;
transform: translateY(0);
}
/* Стили для модального окна с изображением компетенций */
.modal.competence-modal {
background-color: rgba(15, 19, 31, 0.95);
backdrop-filter: blur(10px);
}
.modal.competence-modal .modal-content {
background: transparent;
border: none;
box-shadow: none;
max-width: 95vw;
max-height: 95vh;
margin: 2% auto;
}
.modal.competence-modal .modal-header {
background: var(--bg-card);
border-bottom: 2px solid var(--border-light);
padding: 1.5rem 2rem;
}
.modal.competence-modal .modal-header h3 {
margin: 0;
color: var(--text-primary);
font-size: 1.25rem;
font-weight: 600;
background: var(--gradient-primary);
-webkit-background-clip: text;
-webkit-text-fill-color: transparent;
background-clip: text;
}
.modal.competence-modal .modal-body {
padding: 1rem;
display: flex;
align-items: center;
justify-content: center;
background: transparent;
}
.modal-image {
max-width: 90vw;
max-height: 80vh;
width: auto;
height: auto;
display: block;
margin: 0 auto;
border-radius: var(--radius-md);
box-shadow: var(--shadow-xl);
transition: all 0.3s ease;
}
/* Анимации для модального окна */
.modal.competence-modal {
transition: opacity 0.3s ease;
opacity: 0;
}
.modal.competence-modal.active {
opacity: 1;
}
.modal.competence-modal .modal-content {
transform: scale(0.7);
transition: transform 0.3s ease;
}
.modal.competence-modal.active .modal-content {
transform: scale(1);
}
/* Улучшенные тени и границы */
.competence-scan-container {
border: 2px solid var(--border-light);
box-shadow: var(--shadow-lg);
}
.competence-scan-container:hover {
border-color: var(--primary-light);
box-shadow: var(--shadow-xl);
}
/* Адаптивность для мобильных устройств */
@media (max-width: 768px) {
.competence-item {
flex-direction: column;
padding: 1.5rem;
gap: 1.5rem;
}
.competence-scan-container {
width: 100%;
max-width: 300px;
margin: 0 auto;
}
.competence-title {
font-size: 1.375rem;
text-align: center;
}
.modal-image {
max-width: 95vw;
max-height: 70vh;
}
.modal.competence-modal .modal-content {
margin: 10% auto;
}
.modal.competence-modal .modal-header {
padding: 1rem 1.5rem;
}
}
@media (max-width: 480px) {
.competence-item {
padding: 1.25rem;
}
.competence-scan-container {
max-width: 100%;
}
.competence-title {
font-size: 1.25rem;
}
.modal.competence-modal .modal-content {
margin: 5% auto;
max-width: 98vw;
}
.modal.competence-modal .modal-body {
padding: 0.5rem;
}
.modal.competence-modal .modal-header {
padding: 1rem;
}
.modal.competence-modal .modal-header h3 {
font-size: 1.1rem;
}
}
/* Стили для светлой темы */
@media (prefers-color-scheme: light) {
.modal.competence-modal {
background-color: rgba(0, 0, 0, 0.8);
}
.modal.competence-modal .modal-header {
background: var(--bg-primary);
}
.scan-hint {
background: linear-gradient(transparent, rgba(0,0,0,0.7));
}
.competence-item {
background: var(--bg-primary);
}
.competence-description {
color: var(--text-primary);
}
}
/* Улучшенные стили для сетки компетенций */
.competence-grid {
display: grid;
gap: 2rem;
}
.competence-grid .modern-card {
padding: 0;
overflow: hidden;
}
.competence-grid .modern-card::before {
height: 4px;
background: var(--gradient-secondary);
}
/* Анимации появления */
.fade-in {
animation: fadeInUp 0.8s ease-out;
}
@keyframes fadeInUp {
from {
opacity: 0;
transform: translateY(40px);
}
to {
opacity: 1;
transform: translateY(0);
}
}

454
OneCprogsite/programmer/static/programmer/css/recall.css
View File

@ -1,228 +1,228 @@
/* recall.css - Стили для страницы отзывов */
/* Основные стили для страницы отзывов */
.recall-item {
display: flex;
flex-direction: column;
gap: 1.5rem;
}
.recall-content {
display: flex;
gap: 2rem;
align-items: flex-start;
}
.recall-scan-wrapper {
flex-shrink: 0;
}
.recall-scan-container {
width: 280px;
cursor: pointer;
border-radius: var(--radius-lg);
overflow: hidden;
border: 2px solid var(--border-light);
transition: var(--transition);
position: relative;
box-shadow: var(--shadow-md);
}
.recall-scan-container:hover {
transform: translateY(-4px) scale(1.02);
box-shadow: var(--shadow-xl);
border-color: var(--primary);
}
.recall-scan {
width: 100%;
height: auto;
display: block;
transition: var(--transition);
}
.recall-text {
flex: 1;
min-width: 0;
line-height: 1.7;
font-size: 1.05rem;
color: var(--text-primary);
}
.recall-text p {
margin-bottom: 1rem;
}
.recall-text p:last-child {
margin-bottom: 0;
}
.scan-hint {
position: absolute;
bottom: 0;
left: 0;
right: 0;
background: linear-gradient(transparent, rgba(0,0,0,0.8));
color: white;
padding: 1rem;
text-align: center;
opacity: 0;
transition: var(--transition);
transform: translateY(10px);
}
.recall-scan-container:hover .scan-hint {
opacity: 1;
transform: translateY(0);
}
/* Стили для модального окна с изображением */
.modal.image-modal {
background-color: rgba(15, 19, 31, 0.95);
backdrop-filter: blur(10px);
}
.modal.image-modal .modal-content {
background: transparent;
border: none;
box-shadow: none;
max-width: 95vw;
max-height: 95vh;
margin: 2% auto;
}
.modal.image-modal .modal-header {
background: var(--bg-card);
border-bottom: 2px solid var(--border-light);
padding: 1.5rem 2rem;
}
.modal.image-modal .modal-header h3 {
margin: 0;
color: var(--text-primary);
font-size: 1.25rem;
font-weight: 600;
background: var(--gradient-primary);
-webkit-background-clip: text;
-webkit-text-fill-color: transparent;
background-clip: text;
}
.modal.image-modal .modal-body {
padding: 1rem;
display: flex;
align-items: center;
justify-content: center;
background: transparent;
}
.modal-image {
max-width: 90vw;
max-height: 80vh;
width: auto;
height: auto;
display: block;
margin: 0 auto;
border-radius: var(--radius-md);
box-shadow: var(--shadow-xl);
transition: all 0.3s ease;
}
/* Анимации для модального окна */
.modal.image-modal {
transition: opacity 0.3s ease;
opacity: 0;
}
.modal.image-modal.active {
opacity: 1;
}
.modal.image-modal .modal-content {
transform: scale(0.7);
transition: transform 0.3s ease;
}
.modal.image-modal.active .modal-content {
transform: scale(1);
}
/* Улучшенные тени и границы */
.recall-scan-container {
border: 2px solid var(--border-light);
box-shadow: var(--shadow-lg);
}
.recall-scan-container:hover {
border-color: var(--primary-light);
box-shadow: var(--shadow-xl);
}
/* Адаптивность для мобильных устройств */
@media (max-width: 768px) {
.recall-content {
flex-direction: column;
gap: 1.5rem;
}
.recall-scan-container {
width: 100%;
max-width: 300px;
margin: 0 auto;
}
.recall-scan-wrapper {
order: -1;
}
.modal-image {
max-width: 95vw;
max-height: 70vh;
}
.modal.image-modal .modal-content {
margin: 10% auto;
}
.modal.image-modal .modal-header {
padding: 1rem 1.5rem;
}
}
@media (max-width: 480px) {
.recall-scan-container {
max-width: 100%;
}
.modal.image-modal .modal-content {
margin: 5% auto;
max-width: 98vw;
}
.modal.image-modal .modal-body {
padding: 0.5rem;
}
.modal.image-modal .modal-header {
padding: 1rem;
}
.modal.image-modal .modal-header h3 {
font-size: 1.1rem;
}
}
/* Стили для светлой темы */
@media (prefers-color-scheme: light) {
.modal.image-modal {
background-color: rgba(0, 0, 0, 0.8);
}
.modal.image-modal .modal-header {
background: var(--bg-primary);
}
.scan-hint {
background: linear-gradient(transparent, rgba(0,0,0,0.7));
}
/* recall.css - Стили для страницы отзывов */
/* Основные стили для страницы отзывов */
.recall-item {
display: flex;
flex-direction: column;
gap: 1.5rem;
}
.recall-content {
display: flex;
gap: 2rem;
align-items: flex-start;
}
.recall-scan-wrapper {
flex-shrink: 0;
}
.recall-scan-container {
width: 280px;
cursor: pointer;
border-radius: var(--radius-lg);
overflow: hidden;
border: 2px solid var(--border-light);
transition: var(--transition);
position: relative;
box-shadow: var(--shadow-md);
}
.recall-scan-container:hover {
transform: translateY(-4px) scale(1.02);
box-shadow: var(--shadow-xl);
border-color: var(--primary);
}
.recall-scan {
width: 100%;
height: auto;
display: block;
transition: var(--transition);
}
.recall-text {
flex: 1;
min-width: 0;
line-height: 1.7;
font-size: 1.05rem;
color: var(--text-primary);
}
.recall-text p {
margin-bottom: 1rem;
}
.recall-text p:last-child {
margin-bottom: 0;
}
.scan-hint {
position: absolute;
bottom: 0;
left: 0;
right: 0;
background: linear-gradient(transparent, rgba(0,0,0,0.8));
color: white;
padding: 1rem;
text-align: center;
opacity: 0;
transition: var(--transition);
transform: translateY(10px);
}
.recall-scan-container:hover .scan-hint {
opacity: 1;
transform: translateY(0);
}
/* Стили для модального окна с изображением */
.modal.image-modal {
background-color: rgba(15, 19, 31, 0.95);
backdrop-filter: blur(10px);
}
.modal.image-modal .modal-content {
background: transparent;
border: none;
box-shadow: none;
max-width: 95vw;
max-height: 95vh;
margin: 2% auto;
}
.modal.image-modal .modal-header {
background: var(--bg-card);
border-bottom: 2px solid var(--border-light);
padding: 1.5rem 2rem;
}
.modal.image-modal .modal-header h3 {
margin: 0;
color: var(--text-primary);
font-size: 1.25rem;
font-weight: 600;
background: var(--gradient-primary);
-webkit-background-clip: text;
-webkit-text-fill-color: transparent;
background-clip: text;
}
.modal.image-modal .modal-body {
padding: 1rem;
display: flex;
align-items: center;
justify-content: center;
background: transparent;
}
.modal-image {
max-width: 90vw;
max-height: 80vh;
width: auto;
height: auto;
display: block;
margin: 0 auto;
border-radius: var(--radius-md);
box-shadow: var(--shadow-xl);
transition: all 0.3s ease;
}
/* Анимации для модального окна */
.modal.image-modal {
transition: opacity 0.3s ease;
opacity: 0;
}
.modal.image-modal.active {
opacity: 1;
}
.modal.image-modal .modal-content {
transform: scale(0.7);
transition: transform 0.3s ease;
}
.modal.image-modal.active .modal-content {
transform: scale(1);
}
/* Улучшенные тени и границы */
.recall-scan-container {
border: 2px solid var(--border-light);
box-shadow: var(--shadow-lg);
}
.recall-scan-container:hover {
border-color: var(--primary-light);
box-shadow: var(--shadow-xl);
}
/* Адаптивность для мобильных устройств */
@media (max-width: 768px) {
.recall-content {
flex-direction: column;
gap: 1.5rem;
}
.recall-scan-container {
width: 100%;
max-width: 300px;
margin: 0 auto;
}
.recall-scan-wrapper {
order: -1;
}
.modal-image {
max-width: 95vw;
max-height: 70vh;
}
.modal.image-modal .modal-content {
margin: 10% auto;
}
.modal.image-modal .modal-header {
padding: 1rem 1.5rem;
}
}
@media (max-width: 480px) {
.recall-scan-container {
max-width: 100%;
}
.modal.image-modal .modal-content {
margin: 5% auto;
max-width: 98vw;
}
.modal.image-modal .modal-body {
padding: 0.5rem;
}
.modal.image-modal .modal-header {
padding: 1rem;
}
.modal.image-modal .modal-header h3 {
font-size: 1.1rem;
}
}
/* Стили для светлой темы */
@media (prefers-color-scheme: light) {
.modal.image-modal {
background-color: rgba(0, 0, 0, 0.8);
}
.modal.image-modal .modal-header {
background: var(--bg-primary);
}
.scan-hint {
background: linear-gradient(transparent, rgba(0,0,0,0.7));
}
}

132
OneCprogsite/programmer/static/programmer/css/solution-accordion.css
View File

@ -1,67 +1,67 @@
/* solution-accordion.css */
.solution-accordion {
margin: 2rem 0;
}
.accordion-item {
background: var(--bg-primary);
border-radius: var(--radius-lg);
margin-bottom: 1rem;
border: 2px solid var(--border-light);
overflow: hidden;
transition: var(--transition);
}
.accordion-item:hover {
border-color: var(--primary-light);
}
.accordion-header {
padding: 1.5rem;
background: var(--gradient-primary);
color: white;
font-weight: 600;
font-size: 1.125rem;
cursor: pointer;
display: flex;
justify-content: space-between;
align-items: center;
transition: var(--transition);
user-select: none;
}
.accordion-header:hover {
background: var(--primary-dark);
}
.accordion-content {
padding: 0;
background: var(--bg-card);
line-height: 1.7;
color: var(--text-secondary);
max-height: 0;
overflow: hidden;
transition: all 0.3s ease;
}
.accordion-content.active {
padding: 1.5rem;
max-height: 5000px;
}
.accordion-icon {
transition: transform 0.3s ease;
font-size: 0.8em;
}
.accordion-header.active .accordion-icon {
transform: rotate(180deg);
}
.accordion-content p {
margin-bottom: 1rem;
}
.accordion-content p:last-child {
margin-bottom: 0;
/* solution-accordion.css */
.solution-accordion {
margin: 2rem 0;
}
.accordion-item {
background: var(--bg-primary);
border-radius: var(--radius-lg);
margin-bottom: 1rem;
border: 2px solid var(--border-light);
overflow: hidden;
transition: var(--transition);
}
.accordion-item:hover {
border-color: var(--primary-light);
}
.accordion-header {
padding: 1.5rem;
background: var(--gradient-primary);
color: white;
font-weight: 600;
font-size: 1.125rem;
cursor: pointer;
display: flex;
justify-content: space-between;
align-items: center;
transition: var(--transition);
user-select: none;
}
.accordion-header:hover {
background: var(--primary-dark);
}
.accordion-content {
padding: 0;
background: var(--bg-card);
line-height: 1.7;
color: var(--text-secondary);
max-height: 0;
overflow: hidden;
transition: all 0.3s ease;
}
.accordion-content.active {
padding: 1.5rem;
max-height: 5000px;
}
.accordion-icon {
transition: transform 0.3s ease;
font-size: 0.8em;
}
.accordion-header.active .accordion-icon {
transform: rotate(180deg);
}
.accordion-content p {
margin-bottom: 1rem;
}
.accordion-content p:last-child {
margin-bottom: 0;
}

2012
OneCprogsite/programmer/static/programmer/css/styles.css
View File

File diff suppressed because it is too large Load Diff

2944
OneCprogsite/programmer/static/programmer/css/styles_dark.css
View File

File diff suppressed because it is too large Load Diff

2810
OneCprogsite/programmer/static/programmer/css/styles_w.css
View File

File diff suppressed because it is too large Load Diff

144
OneCprogsite/programmer/static/programmer/js/competence.js
View File

@ -1,73 +1,73 @@
// competence.js - Скрипты для страницы компетенций
function openCompetenceModal(imageUrl, title) {
console.log('Opening competence modal with:', imageUrl);
const modal = document.getElementById('competenceModal');
const modalImg = document.getElementById('competenceModalImage');
const modalTitle = document.getElementById('competenceModalTitle');
if (modal && modalImg) {
modal.style.display = "block";
modalImg.src = imageUrl;
if (title && modalTitle) {
modalTitle.textContent = title;
}
// Добавляем класс для анимации
setTimeout(() => {
modal.classList.add('active');
}, 10);
// Подстраиваем размер изображения
adjustCompetenceModalImageSize();
}
}
function closeCompetenceModal() {
const modal = document.getElementById('competenceModal');
if (modal) {
modal.classList.remove('active');
setTimeout(() => {
modal.style.display = "none";
}, 300);
}
}
function adjustCompetenceModalImageSize() {
const modalImg = document.getElementById('competenceModalImage');
if (modalImg) {
const maxWidth = window.innerWidth * 0.9;
const maxHeight = window.innerHeight * 0.8;
modalImg.style.maxWidth = `${maxWidth}px`;
modalImg.style.maxHeight = `${maxHeight}px`;
}
}
// Инициализация после загрузки DOM
document.addEventListener('DOMContentLoaded', function() {
// Закрытие модального окна при клике вне изображения
document.addEventListener('click', function(event) {
const modal = document.getElementById('competenceModal');
if (event.target === modal) {
closeCompetenceModal();
}
});
// Закрытие по ESC
document.addEventListener('keydown', function(event) {
if (event.key === 'Escape') {
closeCompetenceModal();
}
});
// Адаптация размера изображения при изменении размера окна
window.addEventListener('resize', function() {
const modalImg = document.getElementById('competenceModalImage');
if (modalImg && modalImg.src) {
adjustCompetenceModalImageSize();
}
});
console.log('Competence page scripts initialized');
// competence.js - Скрипты для страницы компетенций
function openCompetenceModal(imageUrl, title) {
console.log('Opening competence modal with:', imageUrl);
const modal = document.getElementById('competenceModal');
const modalImg = document.getElementById('competenceModalImage');
const modalTitle = document.getElementById('competenceModalTitle');
if (modal && modalImg) {
modal.style.display = "block";
modalImg.src = imageUrl;
if (title && modalTitle) {
modalTitle.textContent = title;
}
// Добавляем класс для анимации
setTimeout(() => {
modal.classList.add('active');
}, 10);
// Подстраиваем размер изображения
adjustCompetenceModalImageSize();
}
}
function closeCompetenceModal() {
const modal = document.getElementById('competenceModal');
if (modal) {
modal.classList.remove('active');
setTimeout(() => {
modal.style.display = "none";
}, 300);
}
}
function adjustCompetenceModalImageSize() {
const modalImg = document.getElementById('competenceModalImage');
if (modalImg) {
const maxWidth = window.innerWidth * 0.9;
const maxHeight = window.innerHeight * 0.8;
modalImg.style.maxWidth = `${maxWidth}px`;
modalImg.style.maxHeight = `${maxHeight}px`;
}
}
// Инициализация после загрузки DOM
document.addEventListener('DOMContentLoaded', function() {
// Закрытие модального окна при клике вне изображения
document.addEventListener('click', function(event) {
const modal = document.getElementById('competenceModal');
if (event.target === modal) {
closeCompetenceModal();
}
});
// Закрытие по ESC
document.addEventListener('keydown', function(event) {
if (event.key === 'Escape') {
closeCompetenceModal();
}
});
// Адаптация размера изображения при изменении размера окна
window.addEventListener('resize', function() {
const modalImg = document.getElementById('competenceModalImage');
if (modalImg && modalImg.src) {
adjustCompetenceModalImageSize();
}
});
console.log('Competence page scripts initialized');
});

186
OneCprogsite/programmer/static/programmer/js/mobile-menu.js
View File

@ -1,94 +1,94 @@
// Mobile Menu Script
document.addEventListener('DOMContentLoaded', function() {
console.log('Mobile menu script loaded'); // Для отладки
const mobileMenuBtn = document.getElementById('mobileMenuBtn');
const mobileMenuClose = document.getElementById('mobileMenuClose');
const mobileMenuOverlay = document.getElementById('mobileMenuOverlay');
const mobileMenu = document.getElementById('mobileMenu');
const mobileThemeToggle = document.getElementById('mobile-theme-toggle');
const mainThemeToggle = document.getElementById('theme-toggle');
// Проверяем, что элементы существуют
if (!mobileMenuBtn || !mobileMenu) {
console.error('Mobile menu elements not found');
return;
}
console.log('Mobile menu elements found:', {
mobileMenuBtn,
mobileMenuClose,
mobileMenuOverlay,
mobileMenu,
mobileThemeToggle,
mainThemeToggle
});
// Открытие мобильного меню
mobileMenuBtn.addEventListener('click', function() {
console.log('Opening mobile menu');
mobileMenu.classList.add('active');
mobileMenuOverlay.style.display = 'block';
document.body.style.overflow = 'hidden';
});
// Закрытие мобильного меню
function closeMobileMenu() {
console.log('Closing mobile menu');
mobileMenu.classList.remove('active');
mobileMenuOverlay.style.display = 'none';
document.body.style.overflow = '';
}
if (mobileMenuClose) {
mobileMenuClose.addEventListener('click', closeMobileMenu);
}
if (mobileMenuOverlay) {
mobileMenuOverlay.addEventListener('click', closeMobileMenu);
}
// Закрытие меню при клике на ссылку
const mobileNavLinks = document.querySelectorAll('.mobile-nav-link');
mobileNavLinks.forEach(link => {
link.addEventListener('click', closeMobileMenu);
});
// Синхронизация переключателей темы
function syncThemeToggles() {
if (mobileThemeToggle && mainThemeToggle) {
mobileThemeToggle.checked = mainThemeToggle.checked;
}
}
if (mainThemeToggle) {
mainThemeToggle.addEventListener('change', function() {
console.log('Main theme toggle changed:', this.checked);
syncThemeToggles();
});
}
if (mobileThemeToggle) {
mobileThemeToggle.addEventListener('change', function() {
console.log('Mobile theme toggle changed:', this.checked);
if (mainThemeToggle) {
mainThemeToggle.checked = this.checked;
// Триггерим событие change
const event = new Event('change');
mainThemeToggle.dispatchEvent(event);
}
});
}
// Инициализация синхронизации
syncThemeToggles();
// Закрытие меню по ESC
document.addEventListener('keydown', function(event) {
if (event.key === 'Escape') {
closeMobileMenu();
}
});
console.log('Mobile menu script initialized successfully');
// Mobile Menu Script
document.addEventListener('DOMContentLoaded', function() {
console.log('Mobile menu script loaded'); // Для отладки
const mobileMenuBtn = document.getElementById('mobileMenuBtn');
const mobileMenuClose = document.getElementById('mobileMenuClose');
const mobileMenuOverlay = document.getElementById('mobileMenuOverlay');
const mobileMenu = document.getElementById('mobileMenu');
const mobileThemeToggle = document.getElementById('mobile-theme-toggle');
const mainThemeToggle = document.getElementById('theme-toggle');
// Проверяем, что элементы существуют
if (!mobileMenuBtn || !mobileMenu) {
console.error('Mobile menu elements not found');
return;
}
console.log('Mobile menu elements found:', {
mobileMenuBtn,
mobileMenuClose,
mobileMenuOverlay,
mobileMenu,
mobileThemeToggle,
mainThemeToggle
});
// Открытие мобильного меню
mobileMenuBtn.addEventListener('click', function() {
console.log('Opening mobile menu');
mobileMenu.classList.add('active');
mobileMenuOverlay.style.display = 'block';
document.body.style.overflow = 'hidden';
});
// Закрытие мобильного меню
function closeMobileMenu() {
console.log('Closing mobile menu');
mobileMenu.classList.remove('active');
mobileMenuOverlay.style.display = 'none';
document.body.style.overflow = '';
}
if (mobileMenuClose) {
mobileMenuClose.addEventListener('click', closeMobileMenu);
}
if (mobileMenuOverlay) {
mobileMenuOverlay.addEventListener('click', closeMobileMenu);
}
// Закрытие меню при клике на ссылку
const mobileNavLinks = document.querySelectorAll('.mobile-nav-link');
mobileNavLinks.forEach(link => {
link.addEventListener('click', closeMobileMenu);
});
// Синхронизация переключателей темы
function syncThemeToggles() {
if (mobileThemeToggle && mainThemeToggle) {
mobileThemeToggle.checked = mainThemeToggle.checked;
}
}
if (mainThemeToggle) {
mainThemeToggle.addEventListener('change', function() {
console.log('Main theme toggle changed:', this.checked);
syncThemeToggles();
});
}
if (mobileThemeToggle) {
mobileThemeToggle.addEventListener('change', function() {
console.log('Mobile theme toggle changed:', this.checked);
if (mainThemeToggle) {
mainThemeToggle.checked = this.checked;
// Триггерим событие change
const event = new Event('change');
mainThemeToggle.dispatchEvent(event);
}
});
}
// Инициализация синхронизации
syncThemeToggles();
// Закрытие меню по ESC
document.addEventListener('keydown', function(event) {
if (event.key === 'Escape') {
closeMobileMenu();
}
});
console.log('Mobile menu script initialized successfully');
});

146
OneCprogsite/programmer/static/programmer/js/recall.js
View File

@ -1,74 +1,74 @@
// recall.js - Скрипты для страницы отзывов
function openModal(imageUrl, title) {
console.log('Opening modal with:', imageUrl);
const modal = document.getElementById('imageModal');
const modalImg = document.getElementById('modalImage');
const modalTitle = document.getElementById('modalTitle');
if (modal && modalImg) {
modal.style.display = "block";
modalImg.src = imageUrl;
if (title && modalTitle) {
modalTitle.textContent = title;
}
// Добавляем класс для анимации
setTimeout(() => {
modal.classList.add('active');
}, 10);
// Подстраиваем размер изображения
adjustModalImageSize();
}
}
function closeModal() {
const modal = document.getElementById('imageModal');
if (modal) {
modal.classList.remove('active');
setTimeout(() => {
modal.style.display = "none";
}, 300);
}
}
function adjustModalImageSize() {
const modalImg = document.getElementById('modalImage');
const modalContent = document.querySelector('.modal-content');
if (modalImg && modalContent) {
const maxWidth = window.innerWidth * 0.9;
const maxHeight = window.innerHeight * 0.8;
modalImg.style.maxWidth = `${maxWidth}px`;
modalImg.style.maxHeight = `${maxHeight}px`;
}
}
// Инициализация после загрузки DOM
document.addEventListener('DOMContentLoaded', function() {
// Закрытие модального окна при клике вне изображения
document.addEventListener('click', function(event) {
const modal = document.getElementById('imageModal');
if (event.target === modal) {
closeModal();
}
});
// Закрытие по ESC
document.addEventListener('keydown', function(event) {
if (event.key === 'Escape') {
closeModal();
}
});
// Адаптация размера изображения при изменении размера окна
window.addEventListener('resize', function() {
const modalImg = document.getElementById('modalImage');
if (modalImg && modalImg.src) {
adjustModalImageSize();
}
});
console.log('Recall page scripts initialized');
// recall.js - Скрипты для страницы отзывов
function openModal(imageUrl, title) {
console.log('Opening modal with:', imageUrl);
const modal = document.getElementById('imageModal');
const modalImg = document.getElementById('modalImage');
const modalTitle = document.getElementById('modalTitle');
if (modal && modalImg) {
modal.style.display = "block";
modalImg.src = imageUrl;
if (title && modalTitle) {
modalTitle.textContent = title;
}
// Добавляем класс для анимации
setTimeout(() => {
modal.classList.add('active');
}, 10);
// Подстраиваем размер изображения
adjustModalImageSize();
}
}
function closeModal() {
const modal = document.getElementById('imageModal');
if (modal) {
modal.classList.remove('active');
setTimeout(() => {
modal.style.display = "none";
}, 300);
}
}
function adjustModalImageSize() {
const modalImg = document.getElementById('modalImage');
const modalContent = document.querySelector('.modal-content');
if (modalImg && modalContent) {
const maxWidth = window.innerWidth * 0.9;
const maxHeight = window.innerHeight * 0.8;
modalImg.style.maxWidth = `${maxWidth}px`;
modalImg.style.maxHeight = `${maxHeight}px`;
}
}
// Инициализация после загрузки DOM
document.addEventListener('DOMContentLoaded', function() {
// Закрытие модального окна при клике вне изображения
document.addEventListener('click', function(event) {
const modal = document.getElementById('imageModal');
if (event.target === modal) {
closeModal();
}
});
// Закрытие по ESC
document.addEventListener('keydown', function(event) {
if (event.key === 'Escape') {
closeModal();
}
});
// Адаптация размера изображения при изменении размера окна
window.addEventListener('resize', function() {
const modalImg = document.getElementById('modalImage');
if (modalImg && modalImg.src) {
adjustModalImageSize();
}
});
console.log('Recall page scripts initialized');
});

90
OneCprogsite/programmer/static/programmer/js/solution-accordion.js
View File

@ -1,46 +1,46 @@
// solution-accordion.js
function toggleAccordion(header) {
const content = header.nextElementSibling;
const icon = header.querySelector('.accordion-icon');
// Переключаем только текущий аккордеон
header.classList.toggle('active');
content.classList.toggle('active');
icon.style.transform = header.classList.contains('active') ? 'rotate(180deg)' : 'rotate(0deg)';
}
// Функция для открытия всех аккордеонов
function expandAll() {
document.querySelectorAll('.accordion-content').forEach(content => {
content.classList.add('active');
});
document.querySelectorAll('.accordion-header').forEach(header => {
header.classList.add('active');
});
document.querySelectorAll('.accordion-icon').forEach(icon => {
icon.style.transform = 'rotate(180deg)';
});
}
// Функция для закрытия всех аккордеонов
function collapseAll() {
document.querySelectorAll('.accordion-content').forEach(content => {
content.classList.remove('active');
});
document.querySelectorAll('.accordion-header').forEach(header => {
header.classList.remove('active');
});
document.querySelectorAll('.accordion-icon').forEach(icon => {
icon.style.transform = 'rotate(0deg)';
});
}
// Автоматически открываем первый аккордеон в каждой карточке при загрузке
document.addEventListener('DOMContentLoaded', function() {
document.querySelectorAll('.content-card').forEach(card => {
const firstAccordion = card.querySelector('.accordion-header');
if (firstAccordion) {
toggleAccordion(firstAccordion);
}
});
// solution-accordion.js
function toggleAccordion(header) {
const content = header.nextElementSibling;
const icon = header.querySelector('.accordion-icon');
// Переключаем только текущий аккордеон
header.classList.toggle('active');
content.classList.toggle('active');
icon.style.transform = header.classList.contains('active') ? 'rotate(180deg)' : 'rotate(0deg)';
}
// Функция для открытия всех аккордеонов
function expandAll() {
document.querySelectorAll('.accordion-content').forEach(content => {
content.classList.add('active');
});
document.querySelectorAll('.accordion-header').forEach(header => {
header.classList.add('active');
});
document.querySelectorAll('.accordion-icon').forEach(icon => {
icon.style.transform = 'rotate(180deg)';
});
}
// Функция для закрытия всех аккордеонов
function collapseAll() {
document.querySelectorAll('.accordion-content').forEach(content => {
content.classList.remove('active');
});
document.querySelectorAll('.accordion-header').forEach(header => {
header.classList.remove('active');
});
document.querySelectorAll('.accordion-icon').forEach(icon => {
icon.style.transform = 'rotate(0deg)';
});
}
// Автоматически открываем первый аккордеон в каждой карточке при загрузке
document.addEventListener('DOMContentLoaded', function() {
document.querySelectorAll('.content-card').forEach(card => {
const firstAccordion = card.querySelector('.accordion-header');
if (firstAccordion) {
toggleAccordion(firstAccordion);
}
});
});

134
OneCprogsite/programmer/static/programmer/js/theme-switcher.js
View File

@ -1,68 +1,68 @@
// Theme Switcher Script
document.addEventListener('DOMContentLoaded', function() {
const themeToggle = document.getElementById('theme-toggle');
const mobileThemeToggle = document.getElementById('mobile-theme-toggle');
const themeCSS = document.getElementById('theme-css');
// Проверяем сохраненную тему в localStorage
const savedTheme = localStorage.getItem('theme');
// Устанавливаем светлую тему по умолчанию
if (savedTheme === 'dark') {
switchToDarkTheme();
} else {
switchToLightTheme(); // Светлая тема по умолчанию
}
// Обработчик переключения темы для десктопного переключателя
if (themeToggle) {
themeToggle.addEventListener('change', function() {
if (this.checked) {
switchToLightTheme();
} else {
switchToDarkTheme();
}
});
}
// Обработчик переключения темы для мобильного переключателя
if (mobileThemeToggle) {
mobileThemeToggle.addEventListener('change', function() {
if (this.checked) {
switchToLightTheme();
} else {
switchToDarkTheme();
}
// Синхронизируем оба переключателя
if (themeToggle) {
themeToggle.checked = this.checked;
}
});
}
function switchToLightTheme() {
themeCSS.href = themeCSS.href.replace('styles_dark.css', 'styles_w.css');
if (themeToggle) themeToggle.checked = true;
if (mobileThemeToggle) mobileThemeToggle.checked = true;
localStorage.setItem('theme', 'light');
}
function switchToDarkTheme() {
themeCSS.href = themeCSS.href.replace('styles_w.css', 'styles_dark.css');
if (themeToggle) themeToggle.checked = false;
if (mobileThemeToggle) mobileThemeToggle.checked = false;
localStorage.setItem('theme', 'dark');
}
// Синхронизация переключателей при загрузке
if (themeToggle && mobileThemeToggle) {
mobileThemeToggle.checked = themeToggle.checked;
}
// Обработка ошибок загрузки CSS
themeCSS.onerror = function() {
console.error('Ошибка загрузки CSS файла темы');
// Восстанавливаем светлую тему по умолчанию при ошибке
themeCSS.href = themeCSS.href.replace('styles_dark.css', 'styles_w.css');
};
// Theme Switcher Script
document.addEventListener('DOMContentLoaded', function() {
const themeToggle = document.getElementById('theme-toggle');
const mobileThemeToggle = document.getElementById('mobile-theme-toggle');
const themeCSS = document.getElementById('theme-css');
// Проверяем сохраненную тему в localStorage
const savedTheme = localStorage.getItem('theme');
// Устанавливаем светлую тему по умолчанию
if (savedTheme === 'dark') {
switchToDarkTheme();
} else {
switchToLightTheme(); // Светлая тема по умолчанию
}
// Обработчик переключения темы для десктопного переключателя
if (themeToggle) {
themeToggle.addEventListener('change', function() {
if (this.checked) {
switchToLightTheme();
} else {
switchToDarkTheme();
}
});
}
// Обработчик переключения темы для мобильного переключателя
if (mobileThemeToggle) {
mobileThemeToggle.addEventListener('change', function() {
if (this.checked) {
switchToLightTheme();
} else {
switchToDarkTheme();
}
// Синхронизируем оба переключателя
if (themeToggle) {
themeToggle.checked = this.checked;
}
});
}
function switchToLightTheme() {
themeCSS.href = themeCSS.href.replace('styles_dark.css', 'styles_w.css');
if (themeToggle) themeToggle.checked = true;
if (mobileThemeToggle) mobileThemeToggle.checked = true;
localStorage.setItem('theme', 'light');
}
function switchToDarkTheme() {
themeCSS.href = themeCSS.href.replace('styles_w.css', 'styles_dark.css');
if (themeToggle) themeToggle.checked = false;
if (mobileThemeToggle) mobileThemeToggle.checked = false;
localStorage.setItem('theme', 'dark');
}
// Синхронизация переключателей при загрузке
if (themeToggle && mobileThemeToggle) {
mobileThemeToggle.checked = themeToggle.checked;
}
// Обработка ошибок загрузки CSS
themeCSS.onerror = function() {
console.error('Ошибка загрузки CSS файла темы');
// Восстанавливаем светлую тему по умолчанию при ошибке
themeCSS.href = themeCSS.href.replace('styles_dark.css', 'styles_w.css');
};
});

156
OneCprogsite/programmer/templates/admin/base.html
View File

@ -1,79 +1,79 @@
<!DOCTYPE html>
<html lang="ru">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>{% block title %}Админ-панель - Статистика{% endblock %}</title>
{% load django_bootstrap5 %}
{% bootstrap_css %}
<style>
body {
background: #f8f9fa;
font-family: 'Inter', sans-serif;
}
.admin-header {
background: #343a40;
color: white;
padding: 1rem 0;
margin-bottom: 2rem;
}
.stats-grid {
display: grid;
grid-template-columns: repeat(auto-fit, minmax(250px, 1fr));
gap: 1.5rem;
margin-bottom: 2rem;
}
.stat-card {
background: white;
padding: 1.5rem;
border-radius: 8px;
box-shadow: 0 2px 4px rgba(0,0,0,0.1);
text-align: center;
}
.stat-number {
font-size: 2rem;
font-weight: bold;
color: #007bff;
margin: 0;
}
table {
width: 100%;
background: white;
border-radius: 8px;
overflow: hidden;
box-shadow: 0 2px 4px rgba(0,0,0,0.1);
}
th, td {
padding: 1rem;
text-align: left;
border-bottom: 1px solid #dee2e6;
}
th {
background: #f8f9fa;
font-weight: 600;
}
</style>
</head>
<body>
<div class="admin-header">
<div class="container">
<div class="d-flex justify-content-between align-items-center">
<h1>{% block page_title %}Админ-панель{% endblock %}</h1>
<div>
<a href="{% url 'home' %}" class="btn btn-outline-light btn-sm">На сайт</a>
<a href="{% url 'admin:index' %}" class="btn btn-outline-light btn-sm">Django Admin</a>
<a href="{% url 'admin:logout' %}" class="btn btn-outline-light btn-sm">Выйти</a>
</div>
</div>
</div>
</div>
<div class="container">
{% bootstrap_messages %}
{% block content %}
{% endblock %}
</div>
{% bootstrap_javascript %}
</body>
<!DOCTYPE html>
<html lang="ru">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>{% block title %}Админ-панель - Статистика{% endblock %}</title>
{% load django_bootstrap5 %}
{% bootstrap_css %}
<style>
body {
background: #f8f9fa;
font-family: 'Inter', sans-serif;
}
.admin-header {
background: #343a40;
color: white;
padding: 1rem 0;
margin-bottom: 2rem;
}
.stats-grid {
display: grid;
grid-template-columns: repeat(auto-fit, minmax(250px, 1fr));
gap: 1.5rem;
margin-bottom: 2rem;
}
.stat-card {
background: white;
padding: 1.5rem;
border-radius: 8px;
box-shadow: 0 2px 4px rgba(0,0,0,0.1);
text-align: center;
}
.stat-number {
font-size: 2rem;
font-weight: bold;
color: #007bff;
margin: 0;
}
table {
width: 100%;
background: white;
border-radius: 8px;
overflow: hidden;
box-shadow: 0 2px 4px rgba(0,0,0,0.1);
}
th, td {
padding: 1rem;
text-align: left;
border-bottom: 1px solid #dee2e6;
}
th {
background: #f8f9fa;
font-weight: 600;
}
</style>
</head>
<body>
<div class="admin-header">
<div class="container">
<div class="d-flex justify-content-between align-items-center">
<h1>{% block page_title %}Админ-панель{% endblock %}</h1>
<div>
<a href="{% url 'home' %}" class="btn btn-outline-light btn-sm">На сайт</a>
<a href="{% url 'admin:index' %}" class="btn btn-outline-light btn-sm">Django Admin</a>
<a href="{% url 'admin:logout' %}" class="btn btn-outline-light btn-sm">Выйти</a>
</div>
</div>
</div>
</div>
<div class="container">
{% bootstrap_messages %}
{% block content %}
{% endblock %}
</div>
{% bootstrap_javascript %}
</body>
</html>

50
OneCprogsite/programmer/templates/admin/base_site.html
View File

@ -1,26 +1,26 @@
{% extends "admin/base.html" %}
{% block title %}{{ title }} | {{ site_title|default:_('Django site admin') }}{% endblock %}
{% block branding %}
<h1 id="site-name"><a href="{% url 'admin:index' %}">{{ site_header|default:_('Django administration') }}</a></h1>
{% endblock %}
{% block nav-global %}
{% endblock %}
{% block userlinks %}
{% load programmer_tags %}
<!-- Уведомление о новых заявках -->
{% get_unread_callbacks as unread_callbacks %}
{% if unread_callbacks %}
<a href="{% url 'admin:programmer_callbackrequest_changelist' %}" style="color: #dc3545; font-weight: bold;">
🚨 {{ unread_callbacks }} новых заявок
</a> /
{% endif %}
<a href="{% url 'callback_stats' %}">📊 Статистика заявок</a> /
<a href="{% url 'statistics' %}">📈 Посещения</a> /
{{ block.super }}
{% extends "admin/base.html" %}
{% block title %}{{ title }} | {{ site_title|default:_('Django site admin') }}{% endblock %}
{% block branding %}
<h1 id="site-name"><a href="{% url 'admin:index' %}">{{ site_header|default:_('Django administration') }}</a></h1>
{% endblock %}
{% block nav-global %}
{% endblock %}
{% block userlinks %}
{% load programmer_tags %}
<!-- Уведомление о новых заявках -->
{% get_unread_callbacks as unread_callbacks %}
{% if unread_callbacks %}
<a href="{% url 'admin:programmer_callbackrequest_changelist' %}" style="color: #dc3545; font-weight: bold;">
🚨 {{ unread_callbacks }} новых заявок
</a> /
{% endif %}
<a href="{% url 'callback_stats' %}">📊 Статистика заявок</a> /
<a href="{% url 'statistics' %}">📈 Посещения</a> /
{{ block.super }}
{% endblock %}

88
OneCprogsite/programmer/templates/admin/callback_stats.html
View File

@ -1,45 +1,45 @@
{% extends "admin/base_site.html" %}
{% block title %}Статистика заявок{% endblock %}
{% block content %}
<div class="module">
<h1>📊 Статистика заявок на обратный звонок</h1>
<div class="stats-grid" style="display: grid; grid-template-columns: repeat(auto-fit, minmax(200px, 1fr)); gap: 1rem; margin: 2rem 0;">
<div class="stat-card" style="background: white; padding: 1.5rem; border-radius: 8px; box-shadow: 0 2px 4px rgba(0,0,0,0.1); text-align: center;">
<h3>📋 Всего заявок</h3>
<p style="font-size: 2rem; font-weight: bold; color: #007bff; margin: 0;">{{ stats.total }}</p>
</div>
<div class="stat-card" style="background: white; padding: 1.5rem; border-radius: 8px; box-shadow: 0 2px 4px rgba(0,0,0,0.1); text-align: center;">
<h3>📅 Сегодня</h3>
<p style="font-size: 2rem; font-weight: bold; color: #28a745; margin: 0;">{{ stats.today }}</p>
</div>
<div class="stat-card" style="background: white; padding: 1.5rem; border-radius: 8px; box-shadow: 0 2px 4px rgba(0,0,0,0.1); text-align: center;">
<h3>📈 За неделю</h3>
<p style="font-size: 2rem; font-weight: bold; color: #17a2b8; margin: 0;">{{ stats.week }}</p>
</div>
<div class="stat-card" style="background: white; padding: 1.5rem; border-radius: 8px; box-shadow: 0 2px 4px rgba(0,0,0,0.1); text-align: center;">
<h3>🆕 Непрочитанные</h3>
<p style="font-size: 2rem; font-weight: bold; color: #dc3545; margin: 0;">{{ stats.unread }}</p>
</div>
<div class="stat-card" style="background: white; padding: 1.5rem; border-radius: 8px; box-shadow: 0 2px 4px rgba(0,0,0,0.1); text-align: center;">
<h3>⏳ В обработке</h3>
<p style="font-size: 2rem; font-weight: bold; color: #ffc107; margin: 0;">{{ stats.unprocessed }}</p>
</div>
</div>
<div style="margin-top: 2rem;">
<a href="{% url 'admin:programmer_callbackrequest_changelist' %}" class="button" style="background: #007bff; color: white; padding: 10px 20px; text-decoration: none; border-radius: 4px;">
📋 Перейти к списку заявок
</a>
<a href="{% url 'admin:index' %}" class="button" style="background: #6c757d; color: white; padding: 10px 20px; text-decoration: none; border-radius: 4px; margin-left: 10px;">
🏠 На главную админки
</a>
</div>
</div>
{% extends "admin/base_site.html" %}
{% block title %}Статистика заявок{% endblock %}
{% block content %}
<div class="module">
<h1>📊 Статистика заявок на обратный звонок</h1>
<div class="stats-grid" style="display: grid; grid-template-columns: repeat(auto-fit, minmax(200px, 1fr)); gap: 1rem; margin: 2rem 0;">
<div class="stat-card" style="background: white; padding: 1.5rem; border-radius: 8px; box-shadow: 0 2px 4px rgba(0,0,0,0.1); text-align: center;">
<h3>📋 Всего заявок</h3>
<p style="font-size: 2rem; font-weight: bold; color: #007bff; margin: 0;">{{ stats.total }}</p>
</div>
<div class="stat-card" style="background: white; padding: 1.5rem; border-radius: 8px; box-shadow: 0 2px 4px rgba(0,0,0,0.1); text-align: center;">
<h3>📅 Сегодня</h3>
<p style="font-size: 2rem; font-weight: bold; color: #28a745; margin: 0;">{{ stats.today }}</p>
</div>
<div class="stat-card" style="background: white; padding: 1.5rem; border-radius: 8px; box-shadow: 0 2px 4px rgba(0,0,0,0.1); text-align: center;">
<h3>📈 За неделю</h3>
<p style="font-size: 2rem; font-weight: bold; color: #17a2b8; margin: 0;">{{ stats.week }}</p>
</div>
<div class="stat-card" style="background: white; padding: 1.5rem; border-radius: 8px; box-shadow: 0 2px 4px rgba(0,0,0,0.1); text-align: center;">
<h3>🆕 Непрочитанные</h3>
<p style="font-size: 2rem; font-weight: bold; color: #dc3545; margin: 0;">{{ stats.unread }}</p>
</div>
<div class="stat-card" style="background: white; padding: 1.5rem; border-radius: 8px; box-shadow: 0 2px 4px rgba(0,0,0,0.1); text-align: center;">
<h3>⏳ В обработке</h3>
<p style="font-size: 2rem; font-weight: bold; color: #ffc107; margin: 0;">{{ stats.unprocessed }}</p>
</div>
</div>
<div style="margin-top: 2rem;">
<a href="{% url 'admin:programmer_callbackrequest_changelist' %}" class="button" style="background: #007bff; color: white; padding: 10px 20px; text-decoration: none; border-radius: 4px;">
📋 Перейти к списку заявок
</a>
<a href="{% url 'admin:index' %}" class="button" style="background: #6c757d; color: white; padding: 10px 20px; text-decoration: none; border-radius: 4px; margin-left: 10px;">
🏠 На главную админки
</a>
</div>
</div>
{% endblock %}

260
OneCprogsite/programmer/templates/admin/statistics.html
View File

@ -1,131 +1,131 @@
{% extends 'admin/base.html' %}
{% load programmer_tags %}
{% block title %}Статистика посещений{% endblock %}
{% block page_title %}Статистика посещений{% endblock %}
{% block content %}
<!-- Уведомления о заявках -->
{% get_unread_callbacks as unread_callbacks %}
{% get_today_callbacks as today_callbacks %}
{% if unread_callbacks > 0 %}
<div class="alert alert-warning alert-dismissible fade show" role="alert">
<h4>🚨 Внимание!</h4>
<p>
У вас <strong>{{ unread_callbacks }}</strong> непрочитанных заявок на обратный звонок
{% if today_callbacks > 0 %}
({{ today_callbacks }} из них сегодня)
{% endif %}
</p>
<a href="{% url 'admin:programmer_callbackrequest_changelist' %}" class="btn btn-warning btn-sm">
📋 Перейти к заявкам
</a>
<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
</div>
{% endif %}
<div class="row mb-4">
<div class="col-12">
<div class="stats-grid">
<div class="stat-card">
<h3>📊 Просмотров сегодня</h3>
<p class="stat-number">{{ today_views }}</p>
</div>
<div class="stat-card">
<h3>📈 Просмотров за неделю</h3>
<p class="stat-number">{{ weekly_views }}</p>
</div>
<div class="stat-card">
<h3>👥 Уникальных посетителей</h3>
<p class="stat-number">{{ unique_visitors }}</p>
</div>
<div class="stat-card">
<h3>🕒 Всего просмотров</h3>
<p class="stat-number">{{ total_views }}</p>
</div>
<!-- Добавляем статистику по заявкам -->
<div class="stat-card">
<h3>📞 Заявок сегодня</h3>
<p class="stat-number">{{ today_callbacks }}</p>
</div>
<div class="stat-card">
<h3>📋 Всего заявок</h3>
<p class="stat-number">{% get_unread_callbacks %}/{{ total_callbacks }}</p>
<small>(непрочитанные/всего)</small>
</div>
</div>
</div>
</div>
<!-- Остальной код статистики остается без изменений -->
<div class="row">
<div class="col-12">
<div class="card">
<div class="card-header">
<h3>🔥 Популярные страницы (за неделю)</h3>
</div>
<div class="card-body p-0">
<table class="table table-striped mb-0">
<thead>
<tr>
<th>Страница</th>
<th>Просмотров</th>
</tr>
</thead>
<tbody>
{% for page in popular_pages %}
<tr>
<td>
<code>{{ page.url }}</code>
{% if page.url == '/' %}
<span class="badge bg-primary">Главная</span>
{% endif %}
</td>
<td><strong>{{ page.views }}</strong></td>
</tr>
{% empty %}
<tr>
<td colspan="2" class="text-center text-muted">Нет данных за выбранный период</td>
</tr>
{% endfor %}
</tbody>
</table>
</div>
</div>
</div>
</div>
<div class="row mt-4">
<div class="col-12">
<div class="card">
<div class="card-header">
<h3>📋 Последние посещения</h3>
</div>
<div class="card-body p-0">
<table class="table table-striped mb-0">
<thead>
<tr>
<th>Время</th>
<th>Страница</th>
<th>IP-адрес</th>
</tr>
</thead>
<tbody>
{% for view in recent_views %}
<tr>
<td>{{ view.timestamp|date:"d.m.Y H:i" }}</td>
<td><code>{{ view.url }}</code></td>
<td><small>{{ view.ip_address }}</small></td>
</tr>
{% empty %}
<tr>
<td colspan="3" class="text-center text-muted">Нет данных</td>
</tr>
{% endfor %}
</tbody>
</table>
</div>
</div>
</div>
</div>
{% extends 'admin/base.html' %}
{% load programmer_tags %}
{% block title %}Статистика посещений{% endblock %}
{% block page_title %}Статистика посещений{% endblock %}
{% block content %}
<!-- Уведомления о заявках -->
{% get_unread_callbacks as unread_callbacks %}
{% get_today_callbacks as today_callbacks %}
{% if unread_callbacks > 0 %}
<div class="alert alert-warning alert-dismissible fade show" role="alert">
<h4>🚨 Внимание!</h4>
<p>
У вас <strong>{{ unread_callbacks }}</strong> непрочитанных заявок на обратный звонок
{% if today_callbacks > 0 %}
({{ today_callbacks }} из них сегодня)
{% endif %}
</p>
<a href="{% url 'admin:programmer_callbackrequest_changelist' %}" class="btn btn-warning btn-sm">
📋 Перейти к заявкам
</a>
<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
</div>
{% endif %}
<div class="row mb-4">
<div class="col-12">
<div class="stats-grid">
<div class="stat-card">
<h3>📊 Просмотров сегодня</h3>
<p class="stat-number">{{ today_views }}</p>
</div>
<div class="stat-card">
<h3>📈 Просмотров за неделю</h3>
<p class="stat-number">{{ weekly_views }}</p>
</div>
<div class="stat-card">
<h3>👥 Уникальных посетителей</h3>
<p class="stat-number">{{ unique_visitors }}</p>
</div>
<div class="stat-card">
<h3>🕒 Всего просмотров</h3>
<p class="stat-number">{{ total_views }}</p>
</div>
<!-- Добавляем статистику по заявкам -->
<div class="stat-card">
<h3>📞 Заявок сегодня</h3>
<p class="stat-number">{{ today_callbacks }}</p>
</div>
<div class="stat-card">
<h3>📋 Всего заявок</h3>
<p class="stat-number">{% get_unread_callbacks %}/{{ total_callbacks }}</p>
<small>(непрочитанные/всего)</small>
</div>
</div>
</div>
</div>
<!-- Остальной код статистики остается без изменений -->
<div class="row">
<div class="col-12">
<div class="card">
<div class="card-header">
<h3>🔥 Популярные страницы (за неделю)</h3>
</div>
<div class="card-body p-0">
<table class="table table-striped mb-0">
<thead>
<tr>
<th>Страница</th>
<th>Просмотров</th>
</tr>
</thead>
<tbody>
{% for page in popular_pages %}
<tr>
<td>
<code>{{ page.url }}</code>
{% if page.url == '/' %}
<span class="badge bg-primary">Главная</span>
{% endif %}
</td>
<td><strong>{{ page.views }}</strong></td>
</tr>
{% empty %}
<tr>
<td colspan="2" class="text-center text-muted">Нет данных за выбранный период</td>
</tr>
{% endfor %}
</tbody>
</table>
</div>
</div>
</div>
</div>
<div class="row mt-4">
<div class="col-12">
<div class="card">
<div class="card-header">
<h3>📋 Последние посещения</h3>
</div>
<div class="card-body p-0">
<table class="table table-striped mb-0">
<thead>
<tr>
<th>Время</th>
<th>Страница</th>
<th>IP-адрес</th>
</tr>
</thead>
<tbody>
{% for view in recent_views %}
<tr>
<td>{{ view.timestamp|date:"d.m.Y H:i" }}</td>
<td><code>{{ view.url }}</code></td>
<td><small>{{ view.ip_address }}</small></td>
</tr>
{% empty %}
<tr>
<td colspan="3" class="text-center text-muted">Нет данных</td>
</tr>
{% endfor %}
</tbody>
</table>
</div>
</div>
</div>
</div>
{% endblock %}

112
OneCprogsite/programmer/templates/emails/callback_notification.html
View File

@ -1,57 +1,57 @@
<!-- templates/emails/callback_notification.html -->
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<style>
body { font-family: Arial, sans-serif; line-height: 1.6; color: #333; }
.container { max-width: 600px; margin: 0 auto; padding: 20px; }
.header { background: linear-gradient(135deg, #FF6B00 0%, #0055A5 100%); color: white; padding: 20px; text-align: center; border-radius: 10px 10px 0 0; }
.content { background: #f9f9f9; padding: 20px; border-radius: 0 0 10px 10px; }
.alert { background: #fff3cd; border: 1px solid #ffeaa7; padding: 15px; border-radius: 5px; margin: 15px 0; }
.info-box { background: white; padding: 15px; border-radius: 5px; margin: 10px 0; border-left: 4px solid #007bff; }
.btn { display: inline-block; background: #007bff; color: white; padding: 12px 24px; text-decoration: none; border-radius: 5px; margin: 10px 0; }
.footer { text-align: center; margin-top: 20px; padding-top: 20px; border-top: 1px solid #ddd; color: #666; font-size: 12px; }
</style>
</head>
<body>
<div class="container">
<div class="header">
<h1>🚨 Новая заявка на сайте</h1>
<p>Требуется ваше внимание!</p>
</div>
<div class="content">
<div class="alert">
<strong>⚠️ Срочно!</strong> Пользователь оставил заявку на обратный звонок.
</div>
<div class="info-box">
<h3>📋 Информация о заявке:</h3>
<p><strong>👤 Имя:</strong> {{ callback.name }}</p>
<p><strong>📞 Телефон:</strong> {{ callback.phone }}</p>
{% if callback.email %}
<p><strong>📧 Email:</strong> {{ callback.email }}</p>
{% endif %}
{% if callback.question %}
<p><strong>❓ Вопрос:</strong><br>{{ callback.question }}</p>
{% endif %}
<p><strong>🕒 Время отправки:</strong> {{ callback.time_create|date:"d.m.Y H:i" }}</p>
</div>
<div style="text-align: center; margin: 20px 0;">
<a href="http://{{ site_url }}/admin/programmer/callbackrequest/" class="btn">
📋 Перейти к заявкам в админке
</a>
</div>
<p><em>Не забудьте отметить заявку как обработанную после связи с клиентом!</em></p>
</div>
<div class="footer">
<p>Это автоматическое уведомление от системы сайта.</p>
<p>Если вы получили это письмо по ошибке, пожалуйста, свяжитесь с администратором.</p>
</div>
</div>
</body>
<!-- templates/emails/callback_notification.html -->
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<style>
body { font-family: Arial, sans-serif; line-height: 1.6; color: #333; }
.container { max-width: 600px; margin: 0 auto; padding: 20px; }
.header { background: linear-gradient(135deg, #FF6B00 0%, #0055A5 100%); color: white; padding: 20px; text-align: center; border-radius: 10px 10px 0 0; }
.content { background: #f9f9f9; padding: 20px; border-radius: 0 0 10px 10px; }
.alert { background: #fff3cd; border: 1px solid #ffeaa7; padding: 15px; border-radius: 5px; margin: 15px 0; }
.info-box { background: white; padding: 15px; border-radius: 5px; margin: 10px 0; border-left: 4px solid #007bff; }
.btn { display: inline-block; background: #007bff; color: white; padding: 12px 24px; text-decoration: none; border-radius: 5px; margin: 10px 0; }
.footer { text-align: center; margin-top: 20px; padding-top: 20px; border-top: 1px solid #ddd; color: #666; font-size: 12px; }
</style>
</head>
<body>
<div class="container">
<div class="header">
<h1>🚨 Новая заявка на сайте</h1>
<p>Требуется ваше внимание!</p>
</div>
<div class="content">
<div class="alert">
<strong>⚠️ Срочно!</strong> Пользователь оставил заявку на обратный звонок.
</div>
<div class="info-box">
<h3>📋 Информация о заявке:</h3>
<p><strong>👤 Имя:</strong> {{ callback.name }}</p>
<p><strong>📞 Телефон:</strong> {{ callback.phone }}</p>
{% if callback.email %}
<p><strong>📧 Email:</strong> {{ callback.email }}</p>
{% endif %}
{% if callback.question %}
<p><strong>❓ Вопрос:</strong><br>{{ callback.question }}</p>
{% endif %}
<p><strong>🕒 Время отправки:</strong> {{ callback.time_create|date:"d.m.Y H:i" }}</p>
</div>
<div style="text-align: center; margin: 20px 0;">
<a href="http://{{ site_url }}/admin/programmer/callbackrequest/" class="btn">
📋 Перейти к заявкам в админке
</a>
</div>
<p><em>Не забудьте отметить заявку как обработанную после связи с клиентом!</em></p>
</div>
<div class="footer">
<p>Это автоматическое уведомление от системы сайта.</p>
<p>Если вы получили это письмо по ошибке, пожалуйста, свяжитесь с администратором.</p>
</div>
</div>
</body>
</html>

118
OneCprogsite/programmer/templates/emails/daily_summary.html
View File

@ -1,60 +1,60 @@
<!-- templates/emails/daily_summary.html -->
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<style>
body { font-family: Arial, sans-serif; line-height: 1.6; color: #333; }
.container { max-width: 600px; margin: 0 auto; padding: 20px; }
.header { background: linear-gradient(135deg, #28a745 0%, #20c997 100%); color: white; padding: 20px; text-align: center; border-radius: 10px 10px 0 0; }
.content { background: #f9f9f9; padding: 20px; border-radius: 0 0 10px 10px; }
.stats-grid { display: grid; grid-template-columns: 1fr 1fr; gap: 15px; margin: 20px 0; }
.stat-card { background: white; padding: 15px; border-radius: 8px; text-align: center; box-shadow: 0 2px 4px rgba(0,0,0,0.1); }
.stat-number { font-size: 2rem; font-weight: bold; margin: 0; }
.alert { background: #fff3cd; border: 1px solid #ffeaa7; padding: 15px; border-radius: 5px; margin: 15px 0; }
.btn { display: inline-block; background: #007bff; color: white; padding: 12px 24px; text-decoration: none; border-radius: 5px; margin: 10px 0; }
.footer { text-align: center; margin-top: 20px; padding-top: 20px; border-top: 1px solid #ddd; color: #666; font-size: 12px; }
</style>
</head>
<body>
<div class="container">
<div class="header">
<h1>📊 Ежедневная сводка</h1>
<p>Статистика заявок за {{ yesterday|date:"d.m.Y" }}</p>
</div>
<div class="content">
<div class="stats-grid">
<div class="stat-card">
<h3>📅 Вчерашние заявки</h3>
<p class="stat-number" style="color: #28a745;">{{ yesterday_callbacks }}</p>
</div>
<div class="stat-card">
<h3>⏳ Ожидают обработки</h3>
<p class="stat-number" style="color: #ffc107;">{{ unprocessed_callbacks }}</p>
</div>
</div>
{% if unprocessed_callbacks > 0 %}
<div class="alert">
<strong>⚠️ Внимание!</strong> У вас есть {{ unprocessed_callbacks }} необработанных заявок.
</div>
{% endif %}
<div style="text-align: center; margin: 20px 0;">
<a href="http://{{ site_url }}/admin/programmer/callbackrequest/" class="btn">
📋 Управление заявками
</a>
</div>
<p><em>Не забудьте обработать все pending заявки!</em></p>
</div>
<div class="footer">
<p>Ежедневная автоматическая сводка от системы сайта.</p>
<p>Дата формирования: {{ today|date:"d.m.Y H:i" }}</p>
</div>
</div>
</body>
<!-- templates/emails/daily_summary.html -->
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<style>
body { font-family: Arial, sans-serif; line-height: 1.6; color: #333; }
.container { max-width: 600px; margin: 0 auto; padding: 20px; }
.header { background: linear-gradient(135deg, #28a745 0%, #20c997 100%); color: white; padding: 20px; text-align: center; border-radius: 10px 10px 0 0; }
.content { background: #f9f9f9; padding: 20px; border-radius: 0 0 10px 10px; }
.stats-grid { display: grid; grid-template-columns: 1fr 1fr; gap: 15px; margin: 20px 0; }
.stat-card { background: white; padding: 15px; border-radius: 8px; text-align: center; box-shadow: 0 2px 4px rgba(0,0,0,0.1); }
.stat-number { font-size: 2rem; font-weight: bold; margin: 0; }
.alert { background: #fff3cd; border: 1px solid #ffeaa7; padding: 15px; border-radius: 5px; margin: 15px 0; }
.btn { display: inline-block; background: #007bff; color: white; padding: 12px 24px; text-decoration: none; border-radius: 5px; margin: 10px 0; }
.footer { text-align: center; margin-top: 20px; padding-top: 20px; border-top: 1px solid #ddd; color: #666; font-size: 12px; }
</style>
</head>
<body>
<div class="container">
<div class="header">
<h1>📊 Ежедневная сводка</h1>
<p>Статистика заявок за {{ yesterday|date:"d.m.Y" }}</p>
</div>
<div class="content">
<div class="stats-grid">
<div class="stat-card">
<h3>📅 Вчерашние заявки</h3>
<p class="stat-number" style="color: #28a745;">{{ yesterday_callbacks }}</p>
</div>
<div class="stat-card">
<h3>⏳ Ожидают обработки</h3>
<p class="stat-number" style="color: #ffc107;">{{ unprocessed_callbacks }}</p>
</div>
</div>
{% if unprocessed_callbacks > 0 %}
<div class="alert">
<strong>⚠️ Внимание!</strong> У вас есть {{ unprocessed_callbacks }} необработанных заявок.
</div>
{% endif %}
<div style="text-align: center; margin: 20px 0;">
<a href="http://{{ site_url }}/admin/programmer/callbackrequest/" class="btn">
📋 Управление заявками
</a>
</div>
<p><em>Не забудьте обработать все pending заявки!</em></p>
</div>
<div class="footer">
<p>Ежедневная автоматическая сводка от системы сайта.</p>
<p>Дата формирования: {{ today|date:"d.m.Y H:i" }}</p>
</div>
</div>
</body>
</html>

306
OneCprogsite/programmer/templates/programmer/about.html
View File

@ -1,154 +1,154 @@
{% extends 'programmer/base.html' %}
{% load django_bootstrap5 %}
{% block content %}
<div class="page-header">
<h1 class="page-title">{{title}}</h1>
<p class="page-subtitle">Профессиональный программист 1С с более чем 10-летним опытом</p>
</div>
<div class="content-card">
<div class="about-header">
<h2>Николай Сердюк</h2>
<p class="subtitle">Разработчик 1С</p>
</div>
<div class="about-section">
<h3>🚀 Опыт работы</h3>
<p class="card-subtitle">Более 10 лет успешной работы в разработке и сопровождении систем на платформе 1С</p>
<div class="experience-item mt-3">
<h4>Основные направления:</h4>
<div class="skills-grid">
<div class="skill-category">
<h4>💻 Разработка</h4>
<ul>
<li>Разработка и доработка конфигураций 1С</li>
<li>Создание внешних обработок и отчетов</li>
<li>Кастомизация под бизнес-процессы</li>
</ul>
</div>
<div class="skill-category">
<h4>🔗 Интеграция</h4>
<ul>
<li>Интеграция 1С с веб-сервисами</li>
<li>Связь с сайтами и мобильными приложениями</li>
<li>API и веб-сервисы</li>
</ul>
</div>
<div class="skill-category">
<h4>⚡ Оптимизация</h4>
<ul>
<li>Оптимизация бизнес-процессов</li>
<li>Ускорение работы баз данных</li>
<li>Автоматизация рутинных операций</li>
</ul>
</div>
</div>
</div>
</div>
<div class="about-section">
<h3>🛠 Технологии и навыки</h3>
<div class="skills-grid">
<div class="skill-category">
<h4>🎯 1С Разработка</h4>
<ul>
<li>1С:Предприятие 8.3</li>
<li>Управление торговлей</li>
<li>Бухгалтерия предприятия</li>
<li>Зарплата и управление персоналом</li>
<li>Внешние обработки и отчеты</li>
</ul>
</div>
<div class="skill-category">
<h4>🔧 Дополнительные технологии</h4>
<ul>
<li>SQL и оптимизация запросов</li>
<li>Веб-сервисы и API</li>
<li>XML, JSON, REST</li>
<li>Системное администрирование</li>
</ul>
</div>
</div>
</div>
<div class="about-section">
<h3>📈 Проекты и достижения</h3>
<p class="card-subtitle">Успешно реализовал более 50 проектов различной сложности</p>
<div class="skills-grid mt-3">
<div class="skill-category">
<h4>🏆 Ключевые проекты</h4>
<ul>
<li>Автоматизация учетных систем для предприятий</li>
<li>Интеграция 1С с сайтами и мобильными приложениями</li>
<li>Разработка кастомизированных отчетов и дашбордов</li>
<li>Оптимизация производительности баз данных</li>
</ul>
</div>
</div>
</div>
<div class="about-section">
<h3>📞 Контакты</h3>
<div class="contacts">
<div class="skills-grid">
<div class="skill-category">
<h4>📧 Электронная почта</h4>
<p><strong>{{ CONTACT_EMAIL }}</strong></p>
</div>
<div class="skill-category">
<h4>📱 Телефон</h4>
<p><strong>{{ CONTACT_PHONE }}</strong></p>
</div>
<div class="skill-category">
<h4>💬 Telegram</h4>
<p><strong><a href="https://t.me/odinesina_prog" target="_blank" class="btn btn-primary" style="display: inline-flex; padding: 0.5rem 1rem;">@odinesina_prog</a></strong></p>
</div>
</div>
</div>
</div>
<div class="text-center mt-4">
<div class="card-actions">
<a href="{% url 'solution' %}" class="btn btn-primary">📂 Посмотреть мои проекты</a>
<a href="{% url 'recall' %}" class="btn btn-secondary">⭐ Отзывы клиентов</a>
</div>
</div>
</div>
<script type="application/ld+json">
{
"@context": "https://schema.org",
"@type": "Service",
"serviceType": "1С программирование",
"provider": {
"@type": "Person",
"name": "Николай Сердюк"
},
"areaServed": "Россия",
"hasOfferCatalog": {
"@type": "OfferCatalog",
"name": "Услуги программиста 1С",
"itemListElement": [
{
"@type": "Offer",
"itemOffered": {
"@type": "Service",
"name": "Разработка конфигураций 1С"
}
},
{
"@type": "Offer",
"itemOffered": {
"@type": "Service",
"name": "Интеграция 1С с веб-сервисами"
}
}
]
}
}
</script>
{% extends 'programmer/base.html' %}
{% load django_bootstrap5 %}
{% block content %}
<div class="page-header">
<h1 class="page-title">{{title}}</h1>
<p class="page-subtitle">Профессиональный программист 1С с более чем 10-летним опытом</p>
</div>
<div class="content-card">
<div class="about-header">
<h2>Николай Сердюк</h2>
<p class="subtitle">Разработчик 1С</p>
</div>
<div class="about-section">
<h3>🚀 Опыт работы</h3>
<p class="card-subtitle">Более 10 лет успешной работы в разработке и сопровождении систем на платформе 1С</p>
<div class="experience-item mt-3">
<h4>Основные направления:</h4>
<div class="skills-grid">
<div class="skill-category">
<h4>💻 Разработка</h4>
<ul>
<li>Разработка и доработка конфигураций 1С</li>
<li>Создание внешних обработок и отчетов</li>
<li>Кастомизация под бизнес-процессы</li>
</ul>
</div>
<div class="skill-category">
<h4>🔗 Интеграция</h4>
<ul>
<li>Интеграция 1С с веб-сервисами</li>
<li>Связь с сайтами и мобильными приложениями</li>
<li>API и веб-сервисы</li>
</ul>
</div>
<div class="skill-category">
<h4>⚡ Оптимизация</h4>
<ul>
<li>Оптимизация бизнес-процессов</li>
<li>Ускорение работы баз данных</li>
<li>Автоматизация рутинных операций</li>
</ul>
</div>
</div>
</div>
</div>
<div class="about-section">
<h3>🛠 Технологии и навыки</h3>
<div class="skills-grid">
<div class="skill-category">
<h4>🎯 1С Разработка</h4>
<ul>
<li>1С:Предприятие 8.3</li>
<li>Управление торговлей</li>
<li>Бухгалтерия предприятия</li>
<li>Зарплата и управление персоналом</li>
<li>Внешние обработки и отчеты</li>
</ul>
</div>
<div class="skill-category">
<h4>🔧 Дополнительные технологии</h4>
<ul>
<li>SQL и оптимизация запросов</li>
<li>Веб-сервисы и API</li>
<li>XML, JSON, REST</li>
<li>Системное администрирование</li>
</ul>
</div>
</div>
</div>
<div class="about-section">
<h3>📈 Проекты и достижения</h3>
<p class="card-subtitle">Успешно реализовал более 50 проектов различной сложности</p>
<div class="skills-grid mt-3">
<div class="skill-category">
<h4>🏆 Ключевые проекты</h4>
<ul>
<li>Автоматизация учетных систем для предприятий</li>
<li>Интеграция 1С с сайтами и мобильными приложениями</li>
<li>Разработка кастомизированных отчетов и дашбордов</li>
<li>Оптимизация производительности баз данных</li>
</ul>
</div>
</div>
</div>
<div class="about-section">
<h3>📞 Контакты</h3>
<div class="contacts">
<div class="skills-grid">
<div class="skill-category">
<h4>📧 Электронная почта</h4>
<p><strong>{{ CONTACT_EMAIL }}</strong></p>
</div>
<div class="skill-category">
<h4>📱 Телефон</h4>
<p><strong>{{ CONTACT_PHONE }}</strong></p>
</div>
<div class="skill-category">
<h4>💬 Telegram</h4>
<p><strong><a href="https://t.me/odinesina_prog" target="_blank" class="btn btn-primary" style="display: inline-flex; padding: 0.5rem 1rem;">@odinesina_prog</a></strong></p>
</div>
</div>
</div>
</div>
<div class="text-center mt-4">
<div class="card-actions">
<a href="{% url 'solution' %}" class="btn btn-primary">📂 Посмотреть мои проекты</a>
<a href="{% url 'recall' %}" class="btn btn-secondary">⭐ Отзывы клиентов</a>
</div>
</div>
</div>
<script type="application/ld+json">
{
"@context": "https://schema.org",
"@type": "Service",
"serviceType": "1С программирование",
"provider": {
"@type": "Person",
"name": "Николай Сердюк"
},
"areaServed": "Россия",
"hasOfferCatalog": {
"@type": "OfferCatalog",
"name": "Услуги программиста 1С",
"itemListElement": [
{
"@type": "Offer",
"itemOffered": {
"@type": "Service",
"name": "Разработка конфигураций 1С"
}
},
{
"@type": "Offer",
"itemOffered": {
"@type": "Service",
"name": "Интеграция 1С с веб-сервисами"
}
}
]
}
}
</script>
{% endblock %}

1154
OneCprogsite/programmer/templates/programmer/base.html
View File

File diff suppressed because it is too large Load Diff

14
OneCprogsite/programmer/templates/programmer/callback.html
View File

@ -1,8 +1,8 @@
{% extends 'programmer/base.html' %}
{% load django_bootstrap5 %}
{% block content %}
{% extends 'programmer/base.html' %}
{% load django_bootstrap5 %}
{% block content %}
{% endblock %}

142
OneCprogsite/programmer/templates/programmer/competence.html
View File

@ -1,72 +1,72 @@
{% extends 'programmer/base.html' %}
{% load django_bootstrap5 %}
{% load static %}
{% block extra_css %}
<link rel="stylesheet" href="{% static 'programmer/css/competence.css' %}">
{% endblock %}
{% block content %}
<div class="page-header">
<h1 class="page-title">Компетенции</h1>
<p class="page-subtitle">Профессиональные навыки и опыт</p>
</div>
<div class="competence-grid">
{% for p in posts %}
<div class="modern-card fade-in">
<div class="competence-item">
{% if p.photo %}
<div class="competence-scan-wrapper">
<div class="competence-scan-container">
<img src="{{ p.photo.url }}"
alt="Сертификат 1С: {{ p.title }} - {{ p.content|striptags }}"
class="competence-scan"
onclick="openCompetenceModal('{{ p.photo.url }}', '{{ p.title }}')">
<div class="scan-hint">
<span class="scan-zoom-icon">🔍</span>
<span class="scan-text">Нажмите для увеличения</span>
</div>
</div>
</div>
{% endif %}
<div class="competence-content">
<h2 class="competence-title">{{ p.title }}</h2>
<div class="competence-description">
{{ p.content|linebreaks }}
</div>
</div>
</div>
</div>
{% endfor %}
</div>
{% if not posts %}
<div class="modern-card text-center fade-in">
<h3>📚 Информация о компетенциях</h3>
<p class="card-subtitle">Раздел находится в разработке</p>
<div class="card-actions justify-center">
<a href="{% url 'solution' %}" class="btn btn-primary">Посмотреть проекты</a>
<a href="{% url 'about' %}" class="btn btn-secondary">Обо мне</a>
</div>
</div>
{% endif %}
<!-- Модальное окно для увеличенного просмотра -->
<div id="competenceModal" class="modal competence-modal">
<div class="modal-content">
<div class="modal-header">
<h3 id="competenceModalTitle">Компетенция</h3>
<button class="modal-close" onclick="closeCompetenceModal()">&times;</button>
</div>
<div class="modal-body">
<img class="modal-image" id="competenceModalImage" alt="Увеличенное изображение компетенции">
</div>
</div>
</div>
{% endblock %}
{% block extra_js %}
<script src="{% static 'programmer/js/competence.js' %}"></script>
{% extends 'programmer/base.html' %}
{% load django_bootstrap5 %}
{% load static %}
{% block extra_css %}
<link rel="stylesheet" href="{% static 'programmer/css/competence.css' %}">
{% endblock %}
{% block content %}
<div class="page-header">
<h1 class="page-title">Компетенции</h1>
<p class="page-subtitle">Профессиональные навыки и опыт</p>
</div>
<div class="competence-grid">
{% for p in posts %}
<div class="modern-card fade-in">
<div class="competence-item">
{% if p.photo %}
<div class="competence-scan-wrapper">
<div class="competence-scan-container">
<img src="{{ p.photo.url }}"
alt="Сертификат 1С: {{ p.title }} - {{ p.content|striptags }}"
class="competence-scan"
onclick="openCompetenceModal('{{ p.photo.url }}', '{{ p.title }}')">
<div class="scan-hint">
<span class="scan-zoom-icon">🔍</span>
<span class="scan-text">Нажмите для увеличения</span>
</div>
</div>
</div>
{% endif %}
<div class="competence-content">
<h2 class="competence-title">{{ p.title }}</h2>
<div class="competence-description">
{{ p.content|linebreaks }}
</div>
</div>
</div>
</div>
{% endfor %}
</div>
{% if not posts %}
<div class="modern-card text-center fade-in">
<h3>📚 Информация о компетенциях</h3>
<p class="card-subtitle">Раздел находится в разработке</p>
<div class="card-actions justify-center">
<a href="{% url 'solution' %}" class="btn btn-primary">Посмотреть проекты</a>
<a href="{% url 'about' %}" class="btn btn-secondary">Обо мне</a>
</div>
</div>
{% endif %}
<!-- Модальное окно для увеличенного просмотра -->
<div id="competenceModal" class="modal competence-modal">
<div class="modal-content">
<div class="modal-header">
<h3 id="competenceModalTitle">Компетенция</h3>
<button class="modal-close" onclick="closeCompetenceModal()">&times;</button>
</div>
<div class="modal-body">
<img class="modal-image" id="competenceModalImage" alt="Увеличенное изображение компетенции">
</div>
</div>
</div>
{% endblock %}
{% block extra_js %}
<script src="{% static 'programmer/js/competence.js' %}"></script>
{% endblock %}

24
OneCprogsite/programmer/templates/programmer/humans.txt
View File

@ -1,13 +1,13 @@
/* TEAM */
Developer: Николай Сердюк
Site: https://nikdizell.ru
Email: {{ CONTACT_EMAIL }}
/* THANKS */
Django Framework
Bootstrap
/* SITE */
Last update: 2025
Language: Russian
/* TEAM */
Developer: Николай Сердюк
Site: https://nikdizell.ru
Email: {{ CONTACT_EMAIL }}
/* THANKS */
Django Framework
Bootstrap
/* SITE */
Last update: 2025
Language: Russian
Doctype: HTML5

204
OneCprogsite/programmer/templates/programmer/index.html
View File

@ -1,103 +1,103 @@
{% extends 'programmer/base.html' %}
{% load django_bootstrap5 %}
{% block content %}
<div class="hero-section fade-in">
<h1 class="hero-title">🚀 Добро пожаловать!</h1>
<p class="hero-subtitle">Я профессиональный программист 1С с опытом создания эффективных бизнес-решений</p>
</div>
<div class="grid grid-2">
{% autoescape off %}
{% for p in posts %}
<div class="modern-card fade-in {% cycle '' 'secondary' %}">
<div class="card-header">
<h2 class="card-title">{{p.title}}</h2>
</div>
<div class="card-content">
{{p.content}}
</div>
<div class="card-actions">
<button onclick="openModal()" class="btn btn-primary">🎯 Получить консультацию</button>
</div>
</div>
{% endfor %}
{% endautoescape %}
</div>
<!-- Модальное окно формы -->
<div id="callbackModal" class="modal">
<div class="modal-content">
<div class="modal-header">
<h3>📞 Заявка на консультацию</h3>
<button class="modal-close" onclick="closeModal()">&times;</button>
</div>
<div class="modal-body">
<form method="post" action="{% url 'callback' %}" id="callbackForm">
{% csrf_token %}
<div class="form-group">
<label for="id_name">Имя *</label>
{{ form.name }}
</div>
<div class="form-group">
<label for="id_phone">Телефон *</label>
{{ form.phone }}
</div>
<div class="form-group">
<label for="id_email">Электронная почта</label>
{{ form.email }}
</div>
<div class="form-group">
<label for="id_question">Ваш вопрос</label>
{{ form.question }}
</div>
<div class="form-actions">
<button type="submit" class="btn btn-primary" style="width: 100%;">
📨 Отправить заявку
</button>
</div>
</form>
</div>
</div>
</div>
{% if not posts %}
<div class="modern-card text-center fade-in">
<h3>🚀 Контент скоро появится</h3>
<p class="card-subtitle">Мы готовим для вас интересные материалы и кейсы</p>
<div class="card-actions justify-center">
<button onclick="openModal()" class="btn btn-primary">🎯 Получить консультацию</button>
</div>
</div>
{% endif %}
<script>
function openModal() {
document.getElementById('callbackModal').style.display = 'block';
}
function closeModal() {
document.getElementById('callbackModal').style.display = 'none';
}
// Закрытие модального окна при клике вне его
window.onclick = function(event) {
const modal = document.getElementById('callbackModal');
if (event.target === modal) {
closeModal();
}
}
// Закрытие по ESC
document.addEventListener('keydown', function(event) {
if (event.key === 'Escape') {
closeModal();
}
});
</script>
{% extends 'programmer/base.html' %}
{% load django_bootstrap5 %}
{% block content %}
<div class="hero-section fade-in">
<h1 class="hero-title">🚀 Добро пожаловать!</h1>
<p class="hero-subtitle">Я профессиональный программист 1С с опытом создания эффективных бизнес-решений</p>
</div>
<div class="grid grid-2">
{% autoescape off %}
{% for p in posts %}
<div class="modern-card fade-in {% cycle '' 'secondary' %}">
<div class="card-header">
<h2 class="card-title">{{p.title}}</h2>
</div>
<div class="card-content">
{{p.content}}
</div>
<div class="card-actions">
<button onclick="openModal()" class="btn btn-primary">🎯 Получить консультацию</button>
</div>
</div>
{% endfor %}
{% endautoescape %}
</div>
<!-- Модальное окно формы -->
<div id="callbackModal" class="modal">
<div class="modal-content">
<div class="modal-header">
<h3>📞 Заявка на консультацию</h3>
<button class="modal-close" onclick="closeModal()">&times;</button>
</div>
<div class="modal-body">
<form method="post" action="{% url 'callback' %}" id="callbackForm">
{% csrf_token %}
<div class="form-group">
<label for="id_name">Имя *</label>
{{ form.name }}
</div>
<div class="form-group">
<label for="id_phone">Телефон *</label>
{{ form.phone }}
</div>
<div class="form-group">
<label for="id_email">Электронная почта</label>
{{ form.email }}
</div>
<div class="form-group">
<label for="id_question">Ваш вопрос</label>
{{ form.question }}
</div>
<div class="form-actions">
<button type="submit" class="btn btn-primary" style="width: 100%;">
📨 Отправить заявку
</button>
</div>
</form>
</div>
</div>
</div>
{% if not posts %}
<div class="modern-card text-center fade-in">
<h3>🚀 Контент скоро появится</h3>
<p class="card-subtitle">Мы готовим для вас интересные материалы и кейсы</p>
<div class="card-actions justify-center">
<button onclick="openModal()" class="btn btn-primary">🎯 Получить консультацию</button>
</div>
</div>
{% endif %}
<script>
function openModal() {
document.getElementById('callbackModal').style.display = 'block';
}
function closeModal() {
document.getElementById('callbackModal').style.display = 'none';
}
// Закрытие модального окна при клике вне его
window.onclick = function(event) {
const modal = document.getElementById('callbackModal');
if (event.target === modal) {
closeModal();
}
}
// Закрытие по ESC
document.addEventListener('keydown', function(event) {
if (event.key === 'Escape') {
closeModal();
}
});
</script>
{% endblock %}

346
OneCprogsite/programmer/templates/programmer/recall.html
View File

@ -1,174 +1,174 @@
{% extends 'programmer/base.html' %}
{% load django_bootstrap5 %}
{% load static %}
{% load seo_tags %}
{% block extra_css %}
<link rel="stylesheet" href="{% static 'programmer/css/recall.css' %}">
{% endblock %}
{% block content %}
<div class="page-header">
<h1 class="page-title">Отзывы клиентов</h1>
<p class="page-subtitle">Реальные отзывы о работе программиста 1С</p>
</div>
<div class="recall-grid">
{% for p in posts %}
<div class="modern-card fade-in">
<!-- Добавляем микроразметку для отзыва -->
<script type="application/ld+json">
{
"@context": "https://schema.org",
"@type": "Review",
"itemReviewed": {
"@type": "Service",
"name": "Услуги программиста 1С"
},
"author": {
"@type": "Organization",
"name": "{{ p.title }}"
},
"reviewRating": {
"@type": "Rating",
"ratingValue": "5",
"bestRating": "5"
},
"datePublished": "{{ p.time_create|date:'Y-m-d' }}",
"description": "{{ p.content|striptags|truncatewords:50 }}"
}
</script>
<div class="recall-item">
<div class="recall-header">
<div class="recall-info">
<h2 class="recall-title">{{ p.title }}</h2>
{% if p.time_create %}
<!-- <div class="recall-meta">-->
<!-- <span class="recall-date">{{ p.time_create|date:"d.m.Y" }}</span>-->
<!-- </div>-->
{% endif %}
</div>
</div>
<div class="recall-content">
{% if p.scan %}
<div class="recall-scan-wrapper">
<div class="recall-scan-container">
<img src="{{ p.scan.url }}"
alt="Отзыв от {{ p.title }}"
class="recall-scan"
onclick="openModal('{{ p.scan.url }}', '{{ p.title }}')">
<div class="scan-hint">
<span class="scan-zoom-icon">🔍</span>
<span class="scan-text">Нажмите для увеличения</span>
</div>
</div>
</div>
{% endif %}
<div class="recall-text">
{{ p.content|linebreaks }}
</div>
</div>
</div>
</div>
{% endfor %}
</div>
{% if not posts %}
<div class="modern-card text-center fade-in">
<h3>💬 Отзывы клиентов</h3>
<p class="card-subtitle">Здесь будут отображаться отзывы от довольных клиентов</p>
<div class="card-actions justify-center">
<a href="{% url 'solution' %}" class="btn btn-primary">Посмотреть проекты</a>
<a href="{% url 'about' %}" class="btn btn-secondary">Связаться со мной</a>
</div>
</div>
{% endif %}
<!-- Модальное окно для увеличенного просмотра -->
<div id="imageModal" class="modal">
<div class="modal-content">
<div class="modal-header">
<h3 id="modalTitle">Отзыв</h3>
<button class="modal-close" onclick="closeModal()">&times;</button>
</div>
<div class="modal-body">
<img class="modal-image" id="modalImage">
</div>
</div>
</div>
<script>
function openModal(imageUrl, title) {
console.log('Opening modal with:', imageUrl);
const modal = document.getElementById('imageModal');
const modalImg = document.getElementById('modalImage');
const modalTitle = document.getElementById('modalTitle');
if (modal && modalImg) {
modal.style.display = "block";
modalImg.src = imageUrl;
if (title && modalTitle) {
modalTitle.textContent = title;
}
// Добавляем класс для анимации
setTimeout(() => {
modal.classList.add('active');
}, 10);
}
}
function closeModal() {
const modal = document.getElementById('imageModal');
if (modal) {
modal.classList.remove('active');
setTimeout(() => {
modal.style.display = "none";
}, 300);
}
}
// Закрытие модального окна при клике вне изображения
document.addEventListener('click', function(event) {
const modal = document.getElementById('imageModal');
if (event.target === modal) {
closeModal();
}
});
// Закрытие по ESC
document.addEventListener('keydown', function(event) {
if (event.key === 'Escape') {
closeModal();
}
});
// Адаптация размера изображения в модальном окне
window.addEventListener('resize', function() {
const modalImg = document.getElementById('modalImage');
if (modalImg && modalImg.src) {
adjustModalImageSize();
}
});
function adjustModalImageSize() {
const modalImg = document.getElementById('modalImage');
const modalContent = document.querySelector('.modal-content');
if (modalImg && modalContent) {
const maxWidth = window.innerWidth * 0.9;
const maxHeight = window.innerHeight * 0.8;
modalImg.style.maxWidth = `${maxWidth}px`;
modalImg.style.maxHeight = `${maxHeight}px`;
}
}
{% endblock %}
{% block extra_js %}
<script src="{% static 'programmer/js/recall.js' %}"></script>
{% extends 'programmer/base.html' %}
{% load django_bootstrap5 %}
{% load static %}
{% load seo_tags %}
{% block extra_css %}
<link rel="stylesheet" href="{% static 'programmer/css/recall.css' %}">
{% endblock %}
{% block content %}
<div class="page-header">
<h1 class="page-title">Отзывы клиентов</h1>
<p class="page-subtitle">Реальные отзывы о работе программиста 1С</p>
</div>
<div class="recall-grid">
{% for p in posts %}
<div class="modern-card fade-in">
<!-- Добавляем микроразметку для отзыва -->
<script type="application/ld+json">
{
"@context": "https://schema.org",
"@type": "Review",
"itemReviewed": {
"@type": "Service",
"name": "Услуги программиста 1С"
},
"author": {
"@type": "Organization",
"name": "{{ p.title }}"
},
"reviewRating": {
"@type": "Rating",
"ratingValue": "5",
"bestRating": "5"
},
"datePublished": "{{ p.time_create|date:'Y-m-d' }}",
"description": "{{ p.content|striptags|truncatewords:50 }}"
}
</script>
<div class="recall-item">
<div class="recall-header">
<div class="recall-info">
<h2 class="recall-title">{{ p.title }}</h2>
{% if p.time_create %}
<!-- <div class="recall-meta">-->
<!-- <span class="recall-date">{{ p.time_create|date:"d.m.Y" }}</span>-->
<!-- </div>-->
{% endif %}
</div>
</div>
<div class="recall-content">
{% if p.scan %}
<div class="recall-scan-wrapper">
<div class="recall-scan-container">
<img src="{{ p.scan.url }}"
alt="Отзыв от {{ p.title }}"
class="recall-scan"
onclick="openModal('{{ p.scan.url }}', '{{ p.title }}')">
<div class="scan-hint">
<span class="scan-zoom-icon">🔍</span>
<span class="scan-text">Нажмите для увеличения</span>
</div>
</div>
</div>
{% endif %}
<div class="recall-text">
{{ p.content|linebreaks }}
</div>
</div>
</div>
</div>
{% endfor %}
</div>
{% if not posts %}
<div class="modern-card text-center fade-in">
<h3>💬 Отзывы клиентов</h3>
<p class="card-subtitle">Здесь будут отображаться отзывы от довольных клиентов</p>
<div class="card-actions justify-center">
<a href="{% url 'solution' %}" class="btn btn-primary">Посмотреть проекты</a>
<a href="{% url 'about' %}" class="btn btn-secondary">Связаться со мной</a>
</div>
</div>
{% endif %}
<!-- Модальное окно для увеличенного просмотра -->
<div id="imageModal" class="modal">
<div class="modal-content">
<div class="modal-header">
<h3 id="modalTitle">Отзыв</h3>
<button class="modal-close" onclick="closeModal()">&times;</button>
</div>
<div class="modal-body">
<img class="modal-image" id="modalImage">
</div>
</div>
</div>
<script>
function openModal(imageUrl, title) {
console.log('Opening modal with:', imageUrl);
const modal = document.getElementById('imageModal');
const modalImg = document.getElementById('modalImage');
const modalTitle = document.getElementById('modalTitle');
if (modal && modalImg) {
modal.style.display = "block";
modalImg.src = imageUrl;
if (title && modalTitle) {
modalTitle.textContent = title;
}
// Добавляем класс для анимации
setTimeout(() => {
modal.classList.add('active');
}, 10);
}
}
function closeModal() {
const modal = document.getElementById('imageModal');
if (modal) {
modal.classList.remove('active');
setTimeout(() => {
modal.style.display = "none";
}, 300);
}
}
// Закрытие модального окна при клике вне изображения
document.addEventListener('click', function(event) {
const modal = document.getElementById('imageModal');
if (event.target === modal) {
closeModal();
}
});
// Закрытие по ESC
document.addEventListener('keydown', function(event) {
if (event.key === 'Escape') {
closeModal();
}
});
// Адаптация размера изображения в модальном окне
window.addEventListener('resize', function() {
const modalImg = document.getElementById('modalImage');
if (modalImg && modalImg.src) {
adjustModalImageSize();
}
});
function adjustModalImageSize() {
const modalImg = document.getElementById('modalImage');
const modalContent = document.querySelector('.modal-content');
if (modalImg && modalContent) {
const maxWidth = window.innerWidth * 0.9;
const maxHeight = window.innerHeight * 0.8;
modalImg.style.maxWidth = `${maxWidth}px`;
modalImg.style.maxHeight = `${maxHeight}px`;
}
}
{% endblock %}
{% block extra_js %}
<script src="{% static 'programmer/js/recall.js' %}"></script>
{% endblock %}

36
OneCprogsite/programmer/templates/programmer/robots.txt
View File

@ -1,19 +1,19 @@
User-agent: *
Allow: /
# Основной сайт
Sitemap: {{ request.scheme }}://{{ request.get_host }}/sitemap.xml
# Запрещаем служебные разделы
Disallow: /admin/
Disallow: /media/cache/
Disallow: /static/admin/
Disallow: /callback/
Disallow: /api/
# Разрешаем индексацию статических файлов
Allow: /static/
Allow: /media/
# Указываем главное зеркало
User-agent: *
Allow: /
# Основной сайт
Sitemap: {{ request.scheme }}://{{ request.get_host }}/sitemap.xml
# Запрещаем служебные разделы
Disallow: /admin/
Disallow: /media/cache/
Disallow: /static/admin/
Disallow: /callback/
Disallow: /api/
# Разрешаем индексацию статических файлов
Allow: /static/
Allow: /media/
# Указываем главное зеркало
Host: {{ request.scheme }}://{{ request.get_host }}

22
OneCprogsite/programmer/templates/programmer/sitemap.xml
View File

@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"
xmlns:xhtml="http://www.w3.org/1999/xhtml">
{% for url in urlset %}
<url>
<loc>{{ url.location }}</loc>
{% if url.lastmod %}<lastmod>{{ url.lastmod|date:"Y-m-d" }}</lastmod>{% endif %}
{% if url.changefreq %}<changefreq>{{ url.changefreq }}</changefreq>{% endif %}
{% if url.priority %}<priority>{{ url.priority }}</priority>{% endif %}
</url>
{% endfor %}
<?xml version="1.0" encoding="UTF-8"?>
<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"
xmlns:xhtml="http://www.w3.org/1999/xhtml">
{% for url in urlset %}
<url>
<loc>{{ url.location }}</loc>
{% if url.lastmod %}<lastmod>{{ url.lastmod|date:"Y-m-d" }}</lastmod>{% endif %}
{% if url.changefreq %}<changefreq>{{ url.changefreq }}</changefreq>{% endif %}
{% if url.priority %}<priority>{{ url.priority }}</priority>{% endif %}
</url>
{% endfor %}
</urlset>

190
OneCprogsite/programmer/templates/programmer/solution.html
View File

@ -1,96 +1,96 @@
{% extends 'programmer/base.html' %}
{% load django_bootstrap5 %}
{% load static %}
{% load seo_tags %}
{% block extra_css %}
<link rel="stylesheet" href="{% static 'programmer/css/solution-accordion.css' %}">
{% endblock %}
{% block content %}
<div class="page-header">
<h1 class="page-title">Проекты автоматизации 1С</h1>
<p class="page-subtitle">Реализованные решения и кейсы по автоматизации бизнес-процессов</p>
</div>
<div class="improved-list">
{% autoescape off %}
{% for p in posts %}
<li class="modern-card fade-in">
<div class="content-card">
<h2>{{p.title}}</h2>
<!-- Добавляем микроразметку для проекта -->
<script type="application/ld+json">
{
"@context": "https://schema.org",
"@type": "CreativeWork",
"name": "{{ p.title }}",
"description": "{{ p.description|striptags|truncatewords:30 }}",
"author": {
"@type": "Person",
"name": "Николай Сердюк"
},
"datePublished": "{{ p.time_create|date:'Y-m-d' }}"
}
</script>
<div class="solution-accordion">
<div class="accordion-item">
<div class="accordion-header" onclick="toggleAccordion(this)">
<strong>📋 Описание задачи</strong>
<span class="accordion-icon">▼</span>
</div>
<div class="accordion-content">
{{p.description}}
</div>
</div>
<div class="accordion-item">
<div class="accordion-header" onclick="toggleAccordion(this)">
<strong>🔧 Описание решения</strong>
<span class="accordion-icon">▼</span>
</div>
<div class="accordion-content">
{{p.implementation}}
</div>
</div>
<div class="accordion-item">
<div class="accordion-header" onclick="toggleAccordion(this)">
<strong>✅ Результат</strong>
<span class="accordion-icon">▼</span>
</div>
<div class="accordion-content">
{{p.closing}}
</div>
</div>
</div>
<div class="article-panel">
<p class="first">Опубликовано: {{p.time_create|date:"d.m.Y"}}</p>
</div>
</div>
{% empty %}
<div class="modern-card text-center fade-in">
<h3>🚀 Проекты в разработке</h3>
<p class="card-subtitle">Скоро здесь появятся новые кейсы автоматизации</p>
</div>
</li>
{% endfor %}
{% endautoescape %}
</div>
{% if not posts %}
<div class="content-card text-center">
<h3>Примеры решений скоро появятся</h3>
<p>Мы готовим для вас интересные кейсы и решения</p>
</div>
{% endif %}
<!-- Подключаем внешний скрипт -->
<script src="{% static 'programmer/js/solution-accordion.js' %}"></script>
{% extends 'programmer/base.html' %}
{% load django_bootstrap5 %}
{% load static %}
{% load seo_tags %}
{% block extra_css %}
<link rel="stylesheet" href="{% static 'programmer/css/solution-accordion.css' %}">
{% endblock %}
{% block content %}
<div class="page-header">
<h1 class="page-title">Проекты автоматизации 1С</h1>
<p class="page-subtitle">Реализованные решения и кейсы по автоматизации бизнес-процессов</p>
</div>
<div class="improved-list">
{% autoescape off %}
{% for p in posts %}
<li class="modern-card fade-in">
<div class="content-card">
<h2>{{p.title}}</h2>
<!-- Добавляем микроразметку для проекта -->
<script type="application/ld+json">
{
"@context": "https://schema.org",
"@type": "CreativeWork",
"name": "{{ p.title }}",
"description": "{{ p.description|striptags|truncatewords:30 }}",
"author": {
"@type": "Person",
"name": "Николай Сердюк"
},
"datePublished": "{{ p.time_create|date:'Y-m-d' }}"
}
</script>
<div class="solution-accordion">
<div class="accordion-item">
<div class="accordion-header" onclick="toggleAccordion(this)">
<strong>📋 Описание задачи</strong>
<span class="accordion-icon">▼</span>
</div>
<div class="accordion-content">
{{p.description}}
</div>
</div>
<div class="accordion-item">
<div class="accordion-header" onclick="toggleAccordion(this)">
<strong>🔧 Описание решения</strong>
<span class="accordion-icon">▼</span>
</div>
<div class="accordion-content">
{{p.implementation}}
</div>
</div>
<div class="accordion-item">
<div class="accordion-header" onclick="toggleAccordion(this)">
<strong>✅ Результат</strong>
<span class="accordion-icon">▼</span>
</div>
<div class="accordion-content">
{{p.closing}}
</div>
</div>
</div>
<div class="article-panel">
<p class="first">Опубликовано: {{p.time_create|date:"d.m.Y"}}</p>
</div>
</div>
{% empty %}
<div class="modern-card text-center fade-in">
<h3>🚀 Проекты в разработке</h3>
<p class="card-subtitle">Скоро здесь появятся новые кейсы автоматизации</p>
</div>
</li>
{% endfor %}
{% endautoescape %}
</div>
{% if not posts %}
<div class="content-card text-center">
<h3>Примеры решений скоро появятся</h3>
<p>Мы готовим для вас интересные кейсы и решения</p>
</div>
{% endif %}
<!-- Подключаем внешний скрипт -->
<script src="{% static 'programmer/js/solution-accordion.js' %}"></script>
{% endblock %}

26
OneCprogsite/programmer/templatetags/programmer_tags.py
View File

@ -1,14 +1,14 @@
from django import template
from ..models import CallbackRequest
register = template.Library()
@register.simple_tag
def get_unread_callbacks():
return CallbackRequest.objects.filter(is_read=False).count()
@register.simple_tag
def get_today_callbacks():
from django.utils import timezone
today = timezone.now().date()
from django import template
from ..models import CallbackRequest
register = template.Library()
@register.simple_tag
def get_unread_callbacks():
return CallbackRequest.objects.filter(is_read=False).count()
@register.simple_tag
def get_today_callbacks():
from django.utils import timezone
today = timezone.now().date()
return CallbackRequest.objects.filter(time_create__date=today).count()

40
OneCprogsite/programmer/templatetags/seo_tags.py
View File

@ -1,21 +1,21 @@
from django import template
from django.utils.html import strip_tags
register = template.Library()
@register.simple_tag
def generate_meta_description(obj, default=""):
"""Генерирует meta description для объектов"""
if hasattr(obj, 'get_seo_description'):
return obj.get_seo_description()
elif hasattr(obj, 'content'):
clean_content = strip_tags(obj.content)[:160]
return clean_content + '...' if len(clean_content) > 160 else clean_content
return default
@register.simple_tag
def generate_meta_keywords(obj, default=""):
"""Генерирует meta keywords для объектов"""
if hasattr(obj, 'get_meta_keywords'):
return ', '.join(obj.get_meta_keywords())
from django import template
from django.utils.html import strip_tags
register = template.Library()
@register.simple_tag
def generate_meta_description(obj, default=""):
"""Генерирует meta description для объектов"""
if hasattr(obj, 'get_seo_description'):
return obj.get_seo_description()
elif hasattr(obj, 'content'):
clean_content = strip_tags(obj.content)[:160]
return clean_content + '...' if len(clean_content) > 160 else clean_content
return default
@register.simple_tag
def generate_meta_keywords(obj, default=""):
"""Генерирует meta keywords для объектов"""
if hasattr(obj, 'get_meta_keywords'):
return ', '.join(obj.get_meta_keywords())
return default

6
OneCprogsite/programmer/tests.py
View File

@ -1,3 +1,3 @@
from django.test import TestCase
# Create your tests here.
from django.test import TestCase
# Create your tests here.

52
OneCprogsite/programmer/urls.py
View File

@ -1,27 +1,27 @@
from django.contrib import admin
from django.urls import path, include
from django.conf import settings
from django.conf.urls.static import static
from .views import *
from django.contrib.sitemaps.views import sitemap
from .sitemaps import sitemaps
urlpatterns = [
path('', index, name='home'),
path('about/', about, name='about'),
path('solutions/', solution, name='solution'),
path('competence/', ability, name='ability'),
path('recall/', recall, name='recall'),
path('post/<int:post_id>/', show_post, name='post'),
path('callback/', callback_request, name='callback'),
path('admin/statistics/', statistics_view, name='statistics'),
# Sitemap
path('sitemap.xml', sitemap, {'sitemaps': sitemaps},
name='django.contrib.sitemaps.views.sitemap'),
path('robots.txt', robots_txt, name='robots'),
]
if settings.DEBUG:
from django.contrib import admin
from django.urls import path, include
from django.conf import settings
from django.conf.urls.static import static
from .views import *
from django.contrib.sitemaps.views import sitemap
from .sitemaps import sitemaps
urlpatterns = [
path('', index, name='home'),
path('about/', about, name='about'),
path('solutions/', solution, name='solution'),
path('competence/', ability, name='ability'),
path('recall/', recall, name='recall'),
path('post/<int:post_id>/', show_post, name='post'),
path('callback/', callback_request, name='callback'),
path('admin/statistics/', statistics_view, name='statistics'),
# Sitemap
path('sitemap.xml', sitemap, {'sitemaps': sitemaps},
name='django.contrib.sitemaps.views.sitemap'),
path('robots.txt', robots_txt, name='robots'),
]
if settings.DEBUG:
urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)

130
OneCprogsite/programmer/utils/email_notifications.py
View File

@ -1,65 +1,65 @@
# programmer/utils/email_notifications.py
from django.core.mail import send_mail, EmailMultiAlternatives
from django.template.loader import render_to_string
from django.conf import settings
from django.utils.html import strip_tags
import logging
logger = logging.getLogger(__name__)
def send_callback_notification(callback_request):
"""
Отправляет уведомление о новой заявке на обратный звонок
"""
try:
subject = f'🚨 Новая заявка на обратный звонок от {callback_request.name}'
# HTML версия письма
html_message = render_to_string('emails/callback_notification.html', {
'callback': callback_request,
'site_url': settings.ALLOWED_HOSTS[0] if settings.ALLOWED_HOSTS else 'localhost',
})
# Текстовая версия письма
plain_message = strip_tags(html_message)
# Проверяем настройки email
if not all([settings.EMAIL_HOST_USER, settings.EMAIL_HOST_PASSWORD]):
logger.error("Email settings are not configured properly")
return False
# Отправляем email
send_mail(
subject=subject,
message=plain_message,
from_email=settings.DEFAULT_FROM_EMAIL,
recipient_list=settings.ADMIN_EMAILS,
html_message=html_message,
fail_silently=False,
)
logger.info(f"Email notification sent successfully for callback #{callback_request.id}")
return True
except Exception as e:
logger.error(f"Error sending email notification: {e}")
return False
def send_test_email():
"""
Функция для тестирования отправки email
"""
try:
send_mail(
subject='📧 Test Email from Django',
message='This is a test email from your Django application.',
from_email=settings.DEFAULT_FROM_EMAIL,
recipient_list=settings.ADMIN_EMAILS,
fail_silently=False,
)
return True
except Exception as e:
logger.error(f"Test email failed: {e}")
return False
# programmer/utils/email_notifications.py
from django.core.mail import send_mail, EmailMultiAlternatives
from django.template.loader import render_to_string
from django.conf import settings
from django.utils.html import strip_tags
import logging
logger = logging.getLogger(__name__)
def send_callback_notification(callback_request):
"""
Отправляет уведомление о новой заявке на обратный звонок
"""
try:
subject = f'🚨 Новая заявка на обратный звонок от {callback_request.name}'
# HTML версия письма
html_message = render_to_string('emails/callback_notification.html', {
'callback': callback_request,
'site_url': settings.ALLOWED_HOSTS[0] if settings.ALLOWED_HOSTS else 'localhost',
})
# Текстовая версия письма
plain_message = strip_tags(html_message)
# Проверяем настройки email
if not all([settings.EMAIL_HOST_USER, settings.EMAIL_HOST_PASSWORD]):
logger.error("Email settings are not configured properly")
return False
# Отправляем email
send_mail(
subject=subject,
message=plain_message,
from_email=settings.DEFAULT_FROM_EMAIL,
recipient_list=settings.ADMIN_EMAILS,
html_message=html_message,
fail_silently=False,
)
logger.info(f"Email notification sent successfully for callback #{callback_request.id}")
return True
except Exception as e:
logger.error(f"Error sending email notification: {e}")
return False
def send_test_email():
"""
Функция для тестирования отправки email
"""
try:
send_mail(
subject='📧 Test Email from Django',
message='This is a test email from your Django application.',
from_email=settings.DEFAULT_FROM_EMAIL,
recipient_list=settings.ADMIN_EMAILS,
fail_silently=False,
)
return True
except Exception as e:
logger.error(f"Test email failed: {e}")
return False

518
OneCprogsite/programmer/views.py
View File

@ -1,259 +1,259 @@
from django.http import HttpResponse, HttpResponseNotFound
from .models import *
from django.shortcuts import render, redirect
from django.contrib import messages
from .models import CallbackRequest # Импортируем из models, а не forms
from .forms import CallbackForm
from django.utils import timezone
from datetime import timedelta
from .models import PageView, Visitor
from django.db.models import Count
from django.contrib.auth.decorators import login_required, user_passes_test
from django.views.decorators.http import require_GET
menu = [
{'title': "Главная", 'url_name': 'home'},
{'title': "Проекты", 'url_name': 'solution'},
{'title': "Компетенции", 'url_name': 'ability'},
{'title': "Отзывы", 'url_name': 'recall'},
{'title': "Обо мне", 'url_name': 'about'}
]
# === ДОБАВЬТЕ ЭТИ ФУНКЦИИ ЗДЕСЬ ===
def get_client_ip(request):
"""Получаем реальный IP клиента"""
x_forwarded_for = request.META.get('HTTP_X_FORWARDED_FOR')
if x_forwarded_for:
ip = x_forwarded_for.split(',')[0]
else:
ip = request.META.get('REMOTE_ADDR')
return ip
def should_track_request(request):
"""Определяем, нужно ли отслеживать запрос"""
client_ip = get_client_ip(request)
path = request.path
# Игнорируемые пути (Nextcloud специфичные)
nextcloud_paths = [
'/index.php',
'/status.php',
'/cron',
'/remote.php',
'/ocs',
'/apps/',
'/custom_apps/',
]
# Игнорируемые IP (Docker сети)
docker_ips = [
'192.168.64.1',
'192.168.65.1',
'172.17.0.1',
'172.18.0.1',
'172.19.0.1',
]
# Игнорируем статические файлы и админку
if path.startswith('/static/') or path.startswith('/admin/'):
return False
# Не отслеживаем Nextcloud и Docker запросы
if any(path.startswith(p) for p in nextcloud_paths):
return False
if client_ip in docker_ips:
return False
return True
def track_page_view(request):
"""Основная функция отслеживания просмотров"""
if not should_track_request(request):
return
try:
PageView.objects.create(
url=request.path,
ip_address=get_client_ip(request),
user_agent=request.META.get('HTTP_USER_AGENT', '')[:500],
referer=request.META.get('HTTP_REFERER', '')[:500],
)
except Exception as e:
print(f"Error tracking page: {e}")
def track_view(view_func):
"""Декоратор для отслеживания просмотров страниц"""
from functools import wraps
@wraps(view_func)
def _wrapped_view(request, *args, **kwargs):
# Отслеживаем просмотр перед выполнением view
track_page_view(request)
return view_func(request, *args, **kwargs)
return _wrapped_view
@track_view
def index(request):
posts = Home.objects.filter(is_published=True)
context = {
'posts': posts,
'menu': menu,
'title': "Программист 1С Николай Сердюк - разработка и сопровождение",
'meta_description': "Профессиональный программист 1С с более чем 10-летним опытом. Разработка, доработка, обновление и интеграция систем 1С. Сопровождение 1С.",
'meta_keywords': "программист 1С, разработка 1С, обновление 1С, сопровождение 1С, интеграция 1С, доработка 1С, 1С предприятие 8.3",
'form': CallbackForm()
}
return render(request, 'programmer/index.html', context=context)
@track_view
def about(request):
context = {
'menu': menu,
'title': "Программист 1С Николай Сердюк - 10+ лет опыта | Услуги 1С",
'meta_description': "Николай Сердюк - сертифицированный программист 1С с 10+ лет опыта. Специализация: обновление 1С, разработка под ключ, интеграция, миграция с 1С 7.7.",
'meta_keywords': "программист 1С Николай Сердюк, обновление 1С, разработка 1С под ключ, интеграция 1С, сертифицированный 1С, миграция 1С 7.7"
}
return render(request, 'programmer/about.html', context=context)
@track_view
def solution(request):
posts = Solution.objects.filter(is_published=True)
context = {
'posts': posts,
'menu': menu,
'meta_description': "Реализованные проекты по автоматизации 1С: складской учет с ТСД, интеграция с оборудованием, миграция с 1С 7.7. Примеры работ и кейсы.",
'meta_keywords': "проекты 1С, автоматизация склада 1С, интеграция ТСД 1С, миграция 1С 7.7, кейсы 1С, примеры работ 1С",
'title': "Проекты автоматизации 1С | Реализованные кейсы и решения",
}
return render(request, 'programmer/solution.html', context=context)
@track_view
def ability(request):
posts = Competence.objects.filter(is_published=True)
context = {
'posts': posts,
'menu': menu,
'title': "Сертификаты и компетенции 1С | Программист 1С Николай Сердюк",
'meta_description': "Сертификаты 1С: Профессионал по платформе 8.3 и БП 3.0. Подтвержденная квалификация программиста 1С с сертификатами фирмы 1С.",
'meta_keywords': "сертификаты 1С, 1С профессионал, компетенции 1С, квалификация программиста 1С, сертифицированный специалист 1С"
}
return render(request, 'programmer/competence.html', context=context)
@track_view
def recall(request):
posts = Recall.objects.filter(is_published=True)
context = {
'posts': posts,
'menu': menu,
'title': "Отзывы клиентов о работе программиста 1С | Реальные кейсы",
'meta_description': "Реальные отзывы клиентов о работе программиста 1С Николая Сердюка. Отзывы от ООО «РОВЕН-Регионы» и других компаний.",
'meta_keywords': "отзывы программист 1С, рекомендации 1С, отзывы клиентов 1С, реальные кейсы 1С, отзыв ООО РОВЕН"
}
return render(request, 'programmer/recall.html', context=context)
def show_post(request, post_id):
return HttpResponse(f"Отображение № {post_id}")
def pageNotFound(request, exception):
return HttpResponseNotFound('<h1>Страница не найдена</h1>')
def callback_request(request):
if request.method == 'POST':
form = CallbackForm(request.POST)
if form.is_valid():
# Сохраняем заявку через форму
form.save()
messages.success(request, '✅ Ваша заявка успешно отправлена! Я свяжусь с вами в ближайшее время.')
return redirect('home')
else:
# Если форма невалидна, показываем ошибки
for field, errors in form.errors.items():
for error in errors:
messages.error(request, f'❌ Ошибка в поле {form.fields[field].label}: {error}')
return redirect('home')
# Если GET запрос, просто показываем главную страницу
return redirect('home')
def is_admin(user):
return user.is_staff
def is_staff(user):
return user.is_staff
@login_required
@user_passes_test(is_staff)
def statistics_view(request):
today = timezone.now().date()
week_ago = today - timedelta(days=7)
# Статистика за сегодня
today_views = PageView.objects.filter(
timestamp__date=today
).count()
# Статистика за неделю
weekly_views = PageView.objects.filter(
timestamp__date__gte=week_ago
).count()
# Всего просмотров
total_views = PageView.objects.count()
# Популярные страницы за неделю
popular_pages = PageView.objects.filter(
timestamp__date__gte=week_ago
).values('url').annotate(
views=Count('id')
).order_by('-views')[:10]
# Уникальные посетители за неделю
unique_visitors = Visitor.objects.filter(
last_visit__date__gte=week_ago
).count()
# Последние посещения
recent_views = PageView.objects.select_related().order_by('-timestamp')[:20]
today = timezone.now().date()
total_callbacks = CallbackRequest.objects.count()
today_callbacks = CallbackRequest.objects.filter(time_create__date=today).count()
unread_callbacks = CallbackRequest.objects.filter(is_read=False).count()
context = {
'today_views': today_views,
'weekly_views': weekly_views,
'total_views': total_views,
'unique_visitors': unique_visitors,
'popular_pages': popular_pages,
'recent_views': recent_views,
'total_callbacks': total_callbacks,
'today_callbacks': today_callbacks,
'unread_callbacks': unread_callbacks,
}
return render(request, 'admin/statistics.html', context)
@require_GET
def robots_txt(request):
return render(request, 'robots.txt', content_type='text/plain')
from django.http import HttpResponse, HttpResponseNotFound
from .models import *
from django.shortcuts import render, redirect
from django.contrib import messages
from .models import CallbackRequest # Импортируем из models, а не forms
from .forms import CallbackForm
from django.utils import timezone
from datetime import timedelta
from .models import PageView, Visitor
from django.db.models import Count
from django.contrib.auth.decorators import login_required, user_passes_test
from django.views.decorators.http import require_GET
menu = [
{'title': "Главная", 'url_name': 'home'},
{'title': "Проекты", 'url_name': 'solution'},
{'title': "Компетенции", 'url_name': 'ability'},
{'title': "Отзывы", 'url_name': 'recall'},
{'title': "Обо мне", 'url_name': 'about'}
]
# === ДОБАВЬТЕ ЭТИ ФУНКЦИИ ЗДЕСЬ ===
def get_client_ip(request):
"""Получаем реальный IP клиента"""
x_forwarded_for = request.META.get('HTTP_X_FORWARDED_FOR')
if x_forwarded_for:
ip = x_forwarded_for.split(',')[0]
else:
ip = request.META.get('REMOTE_ADDR')
return ip
def should_track_request(request):
"""Определяем, нужно ли отслеживать запрос"""
client_ip = get_client_ip(request)
path = request.path
# Игнорируемые пути (Nextcloud специфичные)
nextcloud_paths = [
'/index.php',
'/status.php',
'/cron',
'/remote.php',
'/ocs',
'/apps/',
'/custom_apps/',
]
# Игнорируемые IP (Docker сети)
docker_ips = [
'192.168.64.1',
'192.168.65.1',
'172.17.0.1',
'172.18.0.1',
'172.19.0.1',
]
# Игнорируем статические файлы и админку
if path.startswith('/static/') or path.startswith('/admin/'):
return False
# Не отслеживаем Nextcloud и Docker запросы
if any(path.startswith(p) for p in nextcloud_paths):
return False
if client_ip in docker_ips:
return False
return True
def track_page_view(request):
"""Основная функция отслеживания просмотров"""
if not should_track_request(request):
return
try:
PageView.objects.create(
url=request.path,
ip_address=get_client_ip(request),
user_agent=request.META.get('HTTP_USER_AGENT', '')[:500],
referer=request.META.get('HTTP_REFERER', '')[:500],
)
except Exception as e:
print(f"Error tracking page: {e}")
def track_view(view_func):
"""Декоратор для отслеживания просмотров страниц"""
from functools import wraps
@wraps(view_func)
def _wrapped_view(request, *args, **kwargs):
# Отслеживаем просмотр перед выполнением view
track_page_view(request)
return view_func(request, *args, **kwargs)
return _wrapped_view
@track_view
def index(request):
posts = Home.objects.filter(is_published=True)
context = {
'posts': posts,
'menu': menu,
'title': "Программист 1С Николай Сердюк - разработка и сопровождение",
'meta_description': "Профессиональный программист 1С с более чем 10-летним опытом. Разработка, доработка, обновление и интеграция систем 1С. Сопровождение 1С.",
'meta_keywords': "программист 1С, разработка 1С, обновление 1С, сопровождение 1С, интеграция 1С, доработка 1С, 1С предприятие 8.3",
'form': CallbackForm()
}
return render(request, 'programmer/index.html', context=context)
@track_view
def about(request):
context = {
'menu': menu,
'title': "Программист 1С Николай Сердюк - 10+ лет опыта | Услуги 1С",
'meta_description': "Николай Сердюк - сертифицированный программист 1С с 10+ лет опыта. Специализация: обновление 1С, разработка под ключ, интеграция, миграция с 1С 7.7.",
'meta_keywords': "программист 1С Николай Сердюк, обновление 1С, разработка 1С под ключ, интеграция 1С, сертифицированный 1С, миграция 1С 7.7"
}
return render(request, 'programmer/about.html', context=context)
@track_view
def solution(request):
posts = Solution.objects.filter(is_published=True)
context = {
'posts': posts,
'menu': menu,
'meta_description': "Реализованные проекты по автоматизации 1С: складской учет с ТСД, интеграция с оборудованием, миграция с 1С 7.7. Примеры работ и кейсы.",
'meta_keywords': "проекты 1С, автоматизация склада 1С, интеграция ТСД 1С, миграция 1С 7.7, кейсы 1С, примеры работ 1С",
'title': "Проекты автоматизации 1С | Реализованные кейсы и решения",
}
return render(request, 'programmer/solution.html', context=context)
@track_view
def ability(request):
posts = Competence.objects.filter(is_published=True)
context = {
'posts': posts,
'menu': menu,
'title': "Сертификаты и компетенции 1С | Программист 1С Николай Сердюк",
'meta_description': "Сертификаты 1С: Профессионал по платформе 8.3 и БП 3.0. Подтвержденная квалификация программиста 1С с сертификатами фирмы 1С.",
'meta_keywords': "сертификаты 1С, 1С профессионал, компетенции 1С, квалификация программиста 1С, сертифицированный специалист 1С"
}
return render(request, 'programmer/competence.html', context=context)
@track_view
def recall(request):
posts = Recall.objects.filter(is_published=True)
context = {
'posts': posts,
'menu': menu,
'title': "Отзывы клиентов о работе программиста 1С | Реальные кейсы",
'meta_description': "Реальные отзывы клиентов о работе программиста 1С Николая Сердюка. Отзывы от ООО «РОВЕН-Регионы» и других компаний.",
'meta_keywords': "отзывы программист 1С, рекомендации 1С, отзывы клиентов 1С, реальные кейсы 1С, отзыв ООО РОВЕН"
}
return render(request, 'programmer/recall.html', context=context)
def show_post(request, post_id):
return HttpResponse(f"Отображение № {post_id}")
def pageNotFound(request, exception):
return HttpResponseNotFound('<h1>Страница не найдена</h1>')
def callback_request(request):
if request.method == 'POST':
form = CallbackForm(request.POST)
if form.is_valid():
# Сохраняем заявку через форму
form.save()
messages.success(request, '✅ Ваша заявка успешно отправлена! Я свяжусь с вами в ближайшее время.')
return redirect('home')
else:
# Если форма невалидна, показываем ошибки
for field, errors in form.errors.items():
for error in errors:
messages.error(request, f'❌ Ошибка в поле {form.fields[field].label}: {error}')
return redirect('home')
# Если GET запрос, просто показываем главную страницу
return redirect('home')
def is_admin(user):
return user.is_staff
def is_staff(user):
return user.is_staff
@login_required
@user_passes_test(is_staff)
def statistics_view(request):
today = timezone.now().date()
week_ago = today - timedelta(days=7)
# Статистика за сегодня
today_views = PageView.objects.filter(
timestamp__date=today
).count()
# Статистика за неделю
weekly_views = PageView.objects.filter(
timestamp__date__gte=week_ago
).count()
# Всего просмотров
total_views = PageView.objects.count()
# Популярные страницы за неделю
popular_pages = PageView.objects.filter(
timestamp__date__gte=week_ago
).values('url').annotate(
views=Count('id')
).order_by('-views')[:10]
# Уникальные посетители за неделю
unique_visitors = Visitor.objects.filter(
last_visit__date__gte=week_ago
).count()
# Последние посещения
recent_views = PageView.objects.select_related().order_by('-timestamp')[:20]
today = timezone.now().date()
total_callbacks = CallbackRequest.objects.count()
today_callbacks = CallbackRequest.objects.filter(time_create__date=today).count()
unread_callbacks = CallbackRequest.objects.filter(is_read=False).count()
context = {
'today_views': today_views,
'weekly_views': weekly_views,
'total_views': total_views,
'unique_visitors': unique_visitors,
'popular_pages': popular_pages,
'recent_views': recent_views,
'total_callbacks': total_callbacks,
'today_callbacks': today_callbacks,
'unread_callbacks': unread_callbacks,
}
return render(request, 'admin/statistics.html', context)
@require_GET
def robots_txt(request):
return render(request, 'robots.txt', content_type='text/plain')

424
OneCprogsite/settings.py
View File

@ -1,212 +1,212 @@
"""
Django settings for OneCprogsite project.
Generated by 'django-admin startproject' using Django 4.2.7.
For more information on this file, see
https://docs.djangoproject.com/en/4.2/topics/settings/
For the full list of settings and their values, see
https://docs.djangoproject.com/en/4.2/ref/settings/
"""
import os.path
from pathlib import Path
# Build paths inside the project like this: BASE_DIR / 'subdir'.
BASE_DIR = Path(__file__).resolve().parent.parent
# Quick-start development settings - unsuitable for production
# See https://docs.djangoproject.com/en/4.2/howto/deployment/checklist/
# 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'
# Безопасность cookies для HTTPS
SESSION_COOKIE_SECURE = True
CSRF_COOKIE_SECURE = True
SESSION_COOKIE_HTTPONLY = True
CSRF_COOKIE_HTTPONLY = False # Django требует доступ к CSRF cookie через JS
SESSION_COOKIE_SAMESITE = 'Lax'
CSRF_COOKIE_SAMESITE = 'Lax'
# Если используете другие cookies
LANGUAGE_COOKIE_SECURE = True
LANGUAGE_COOKIE_HTTPONLY = True
LANGUAGE_COOKIE_SAMESITE = 'Lax'
# SECURITY WARNING: don't run with debug turned on in production!
DEBUG = False
X_FRAME_OPTIONS = 'SAMEORIGIN'
# Или разрешить конкретные домены (Django 4.0+)
X_FRAME_OPTIONS = 'ALLOW-FROM https://metrika.yandex.ru'
# ОБЯЗАТЕЛЬНО укажите ваши домены
ALLOWED_HOSTS = [
'nikdizell.ru',
'www.nikdizell.ru',
'localhost',
'127.0.0.1',
'192.168.31.88' # Добавьте IP сервера
]
# Важно для работы за прокси
SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')
SECURE_SSL_REDIRECT = True
# Дополнительная безопасность
SECURE_BROWSER_XSS_FILTER = True
SECURE_CONTENT_TYPE_NOSNIFF = True
SECURE_HSTS_SECONDS = 31536000
SECURE_HSTS_INCLUDE_SUBDOMAINS = True
SECURE_HSTS_PRELOAD = True
CSRF_TRUSTED_ORIGINS = [
'https://nikdizell.ru',
'https://www.nikdizell.ru',
]
# Application definition
INSTALLED_APPS = [
'django.contrib.admin',
'django.contrib.auth',
'django.contrib.contenttypes',
'django.contrib.sessions',
'django.contrib.messages',
'django.contrib.staticfiles',
'programmer.apps.ProgrammerConfig',
'django_bootstrap5',
'django_extensions',
'django.contrib.sites',
'django.contrib.sitemaps',
]
MIDDLEWARE = [
'django.middleware.security.SecurityMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware',
'django.middleware.common.CommonMiddleware',
'django.middleware.csrf.CsrfViewMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware',
'django.middleware.clickjacking.XFrameOptionsMiddleware',
'programmer.middleware.PageViewMiddleware',
]
ROOT_URLCONF = 'OneCprogsite.urls'
# Кастомный middleware для CSP
class CSPMiddleware:
def __init__(self, get_response):
self.get_response = get_response
def __call__(self, request):
response = self.get_response(request)
response['Content-Security-Policy'] = "frame-ancestors 'self' https://metrika.yandex.ru https://metrika.yandex.by https://metrica.yandex.com https://metrica.yandex.com.tr https://*.webvisor.com"
return response
TEMPLATES = [
{
'BACKEND': 'django.template.backends.django.DjangoTemplates',
'DIRS': [],
'APP_DIRS': True,
'OPTIONS': {
'context_processors': [
'django.template.context_processors.debug',
'django.template.context_processors.request',
'django.contrib.auth.context_processors.auth',
'django.contrib.messages.context_processors.messages',
'programmer.context_processors.menu_processor',
'programmer.context_processors.contact_info',
],
},
},
]
WSGI_APPLICATION = 'OneCprogsite.wsgi.application'
# Database
# https://docs.djangoproject.com/en/4.2/ref/settings/#databases
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.postgresql',
'NAME': 'App',
'USER': 'postgres',
'PASSWORD': 'NikDi94Zell',
'HOST': 'postgres',
'PORT': 5432,
}
}
# Password validation
# https://docs.djangoproject.com/en/4.2/ref/settings/#auth-password-validators
AUTH_PASSWORD_VALIDATORS = [
{
'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
},
{
'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
},
{
'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
},
{
'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
},
]
# Internationalization
# https://docs.djangoproject.com/en/4.2/topics/i18n/
LANGUAGE_CODE = 'ru'
TIME_ZONE = 'Europe/Moscow'
USE_I18N = True
USE_I18N = True
USE_TZ = True
# Static files (CSS, JavaScript, Images)
# https://docs.djangoproject.com/en/4.2/howto/static-files/
STATIC_URL = 'static/'
STATIC_ROOT = os.path.join(BASE_DIR, 'static')
STATICFILES_DIRS = []
# Default primary key field type
# https://docs.djangoproject.com/en/4.2/ref/settings/#default-auto-field
DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
MEDIA_ROOT = os.path.join(BASE_DIR, 'media')
MEDIA_URL = '/media/'
# Настройки email
EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
# EMAIL_HOST = 'smtp.yandex.ru' # или smtp.gmail.com, smtp.mail.ru
# EMAIL_PORT = 587
# EMAIL_USE_TLS = True
# EMAIL_HOST_USER = os.getenv('EMAIL_HOST_USER', 'it@yandex.ru')
# EMAIL_HOST_PASSWORD = os.getenv('EMAIL_HOST_PASSWORD', 'tifdctkrcjcqwxyc')
# DEFAULT_FROM_EMAIL = EMAIL_HOST_USER
# SERVER_EMAIL = EMAIL_HOST_USER
EMAIL_HOST = 'smtp.gmail.com' # или smtp.gmail.com, smtp.mail.ru
EMAIL_PORT = 587
EMAIL_USE_TLS = True
EMAIL_HOST_USER = os.getenv('EMAIL_HOST_USER', 'nikdizell@gmail.com')
EMAIL_HOST_PASSWORD = os.getenv('EMAIL_HOST_PASSWORD', 'qvmw yccb msqv mmpj')
DEFAULT_FROM_EMAIL = EMAIL_HOST_USER
SERVER_EMAIL = EMAIL_HOST_USER
# Email для уведомлений (можно указать несколько через запятую)
# ADMIN_EMAILS = os.getenv('ADMIN_EMAILS', 'nikdizell@gmail.com').split(',')
ADMIN_EMAILS = os.getenv('ADMIN_EMAILS', 'it@nserdyuk.ru').split(',')
"""
Django settings for OneCprogsite project.
Generated by 'django-admin startproject' using Django 4.2.7.
For more information on this file, see
https://docs.djangoproject.com/en/4.2/topics/settings/
For the full list of settings and their values, see
https://docs.djangoproject.com/en/4.2/ref/settings/
"""
import os.path
from pathlib import Path
# Build paths inside the project like this: BASE_DIR / 'subdir'.
BASE_DIR = Path(__file__).resolve().parent.parent
# Quick-start development settings - unsuitable for production
# See https://docs.djangoproject.com/en/4.2/howto/deployment/checklist/
# 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'
# Безопасность cookies для HTTPS
SESSION_COOKIE_SECURE = True
CSRF_COOKIE_SECURE = True
SESSION_COOKIE_HTTPONLY = True
CSRF_COOKIE_HTTPONLY = False # Django требует доступ к CSRF cookie через JS
SESSION_COOKIE_SAMESITE = 'Lax'
CSRF_COOKIE_SAMESITE = 'Lax'
# Если используете другие cookies
LANGUAGE_COOKIE_SECURE = True
LANGUAGE_COOKIE_HTTPONLY = True
LANGUAGE_COOKIE_SAMESITE = 'Lax'
# SECURITY WARNING: don't run with debug turned on in production!
DEBUG = False
X_FRAME_OPTIONS = 'SAMEORIGIN'
# Или разрешить конкретные домены (Django 4.0+)
X_FRAME_OPTIONS = 'ALLOW-FROM https://metrika.yandex.ru'
# ОБЯЗАТЕЛЬНО укажите ваши домены
ALLOWED_HOSTS = [
'nikdizell.ru',
'www.nikdizell.ru',
'localhost',
'127.0.0.1',
'192.168.31.88' # Добавьте IP сервера
]
# Важно для работы за прокси
SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')
SECURE_SSL_REDIRECT = True
# Дополнительная безопасность
SECURE_BROWSER_XSS_FILTER = True
SECURE_CONTENT_TYPE_NOSNIFF = True
SECURE_HSTS_SECONDS = 31536000
SECURE_HSTS_INCLUDE_SUBDOMAINS = True
SECURE_HSTS_PRELOAD = True
CSRF_TRUSTED_ORIGINS = [
'https://nikdizell.ru',
'https://www.nikdizell.ru',
]
# Application definition
INSTALLED_APPS = [
'django.contrib.admin',
'django.contrib.auth',
'django.contrib.contenttypes',
'django.contrib.sessions',
'django.contrib.messages',
'django.contrib.staticfiles',
'programmer.apps.ProgrammerConfig',
'django_bootstrap5',
'django_extensions',
'django.contrib.sites',
'django.contrib.sitemaps',
]
MIDDLEWARE = [
'django.middleware.security.SecurityMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware',
'django.middleware.common.CommonMiddleware',
'django.middleware.csrf.CsrfViewMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware',
'django.middleware.clickjacking.XFrameOptionsMiddleware',
'programmer.middleware.PageViewMiddleware',
]
ROOT_URLCONF = 'OneCprogsite.urls'
# Кастомный middleware для CSP
class CSPMiddleware:
def __init__(self, get_response):
self.get_response = get_response
def __call__(self, request):
response = self.get_response(request)
response['Content-Security-Policy'] = "frame-ancestors 'self' https://metrika.yandex.ru https://metrika.yandex.by https://metrica.yandex.com https://metrica.yandex.com.tr https://*.webvisor.com"
return response
TEMPLATES = [
{
'BACKEND': 'django.template.backends.django.DjangoTemplates',
'DIRS': [],
'APP_DIRS': True,
'OPTIONS': {
'context_processors': [
'django.template.context_processors.debug',
'django.template.context_processors.request',
'django.contrib.auth.context_processors.auth',
'django.contrib.messages.context_processors.messages',
'programmer.context_processors.menu_processor',
'programmer.context_processors.contact_info',
],
},
},
]
WSGI_APPLICATION = 'OneCprogsite.wsgi.application'
# Database
# https://docs.djangoproject.com/en/4.2/ref/settings/#databases
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.postgresql',
'NAME': 'App',
'USER': 'postgres',
'PASSWORD': 'NikDi94Zell',
'HOST': 'postgres',
'PORT': 5432,
}
}
# Password validation
# https://docs.djangoproject.com/en/4.2/ref/settings/#auth-password-validators
AUTH_PASSWORD_VALIDATORS = [
{
'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
},
{
'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
},
{
'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
},
{
'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
},
]
# Internationalization
# https://docs.djangoproject.com/en/4.2/topics/i18n/
LANGUAGE_CODE = 'ru'
TIME_ZONE = 'Europe/Moscow'
USE_I18N = True
USE_I18N = True
USE_TZ = True
# Static files (CSS, JavaScript, Images)
# https://docs.djangoproject.com/en/4.2/howto/static-files/
STATIC_URL = 'static/'
STATIC_ROOT = os.path.join(BASE_DIR, 'static')
STATICFILES_DIRS = []
# Default primary key field type
# https://docs.djangoproject.com/en/4.2/ref/settings/#default-auto-field
DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
MEDIA_ROOT = os.path.join(BASE_DIR, 'media')
MEDIA_URL = '/media/'
# Настройки email
EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
# EMAIL_HOST = 'smtp.yandex.ru' # или smtp.gmail.com, smtp.mail.ru
# EMAIL_PORT = 587
# EMAIL_USE_TLS = True
# EMAIL_HOST_USER = os.getenv('EMAIL_HOST_USER', 'it@yandex.ru')
# EMAIL_HOST_PASSWORD = os.getenv('EMAIL_HOST_PASSWORD', 'tifdctkrcjcqwxyc')
# DEFAULT_FROM_EMAIL = EMAIL_HOST_USER
# SERVER_EMAIL = EMAIL_HOST_USER
EMAIL_HOST = 'smtp.gmail.com' # или smtp.gmail.com, smtp.mail.ru
EMAIL_PORT = 587
EMAIL_USE_TLS = True
EMAIL_HOST_USER = os.getenv('EMAIL_HOST_USER', 'nikdizell@gmail.com')
EMAIL_HOST_PASSWORD = os.getenv('EMAIL_HOST_PASSWORD', 'qvmw yccb msqv mmpj')
DEFAULT_FROM_EMAIL = EMAIL_HOST_USER
SERVER_EMAIL = EMAIL_HOST_USER
# Email для уведомлений (можно указать несколько через запятую)
# ADMIN_EMAILS = os.getenv('ADMIN_EMAILS', 'nikdizell@gmail.com').split(',')
ADMIN_EMAILS = os.getenv('ADMIN_EMAILS', 'it@nserdyuk.ru').split(',')

76
OneCprogsite/static/django_extensions/css/jquery.autocomplete.css
View File

@ -1,38 +1,38 @@
/**
* @fileOverview CSS for jquery-autocomplete, the jQuery Autocompleter
* @author <a href="mailto:dylan@dyve.net">Dylan Verheul</a>
* @license MIT | GPL | Apache 2.0, see LICENSE.txt
* @see https://github.com/dyve/jquery-autocomplete
*/
.acResults {
padding: 0px;
border: 1px solid WindowFrame;
background-color: Window;
overflow: hidden;
}
.acResults ul {
margin: 0px;
padding: 0px;
list-style-position: outside;
list-style: none;
}
.acResults ul li {
margin: 0px;
padding: 2px 5px;
cursor: pointer;
display: block;
font: menu;
font-size: 12px;
overflow: hidden;
}
.acLoading {
background : url('../img/indicator.gif') right center no-repeat;
}
.acSelect {
background-color: Highlight;
color: HighlightText;
}
/**
* @fileOverview CSS for jquery-autocomplete, the jQuery Autocompleter
* @author <a href="mailto:dylan@dyve.net">Dylan Verheul</a>
* @license MIT | GPL | Apache 2.0, see LICENSE.txt
* @see https://github.com/dyve/jquery-autocomplete
*/
.acResults {
padding: 0px;
border: 1px solid WindowFrame;
background-color: Window;
overflow: hidden;
}
.acResults ul {
margin: 0px;
padding: 0px;
list-style-position: outside;
list-style: none;
}
.acResults ul li {
margin: 0px;
padding: 2px 5px;
cursor: pointer;
display: block;
font: menu;
font-size: 12px;
overflow: hidden;
}
.acLoading {
background : url('../img/indicator.gif') right center no-repeat;
}
.acSelect {
background-color: Highlight;
color: HighlightText;
}

232
OneCprogsite/static/django_extensions/js/jquery.ajaxQueue.js
View File

@ -1,116 +1,116 @@
/**
* Ajax Queue Plugin
*/
/**
<script>
$(function(){
jQuery.ajaxQueue({
url: "test.php",
success: function(html){ jQuery("ul").append(html); }
});
jQuery.ajaxQueue({
url: "test.php",
success: function(html){ jQuery("ul").append(html); }
});
jQuery.ajaxSync({
url: "test.php",
success: function(html){ jQuery("ul").append("<b>"+html+"</b>"); }
});
jQuery.ajaxSync({
url: "test.php",
success: function(html){ jQuery("ul").append("<b>"+html+"</b>"); }
});
});
</script>
<ul style="position: absolute; top: 5px; right: 5px;"></ul>
*/
/*
* Queued Ajax requests.
* A new Ajax request won't be started until the previous queued
* request has finished.
*/
/*
* Synced Ajax requests.
* The Ajax request will happen as soon as you call this method, but
* the callbacks (success/error/complete) won't fire until all previous
* synced requests have been completed.
*/
(function(jQuery) {
var ajax = jQuery.ajax;
var pendingRequests = {};
var synced = [];
var syncedData = [];
jQuery.ajax = function(settings) {
// create settings for compatibility with ajaxSetup
settings = jQuery.extend(settings, jQuery.extend({}, jQuery.ajaxSettings, settings));
var port = settings.port;
switch(settings.mode) {
case "abort":
if ( pendingRequests[port] ) {
pendingRequests[port].abort();
}
return pendingRequests[port] = ajax.apply(this, arguments);
case "queue":
var _old = settings.complete;
settings.complete = function(){
if ( _old )
_old.apply( this, arguments );
jQuery([ajax]).dequeue("ajax" + port );;
};
jQuery([ ajax ]).queue("ajax" + port, function(){
ajax( settings );
});
return;
case "sync":
var pos = synced.length;
synced[ pos ] = {
error: settings.error,
success: settings.success,
complete: settings.complete,
done: false
};
syncedData[ pos ] = {
error: [],
success: [],
complete: []
};
settings.error = function(){ syncedData[ pos ].error = arguments; };
settings.success = function(){ syncedData[ pos ].success = arguments; };
settings.complete = function(){
syncedData[ pos ].complete = arguments;
synced[ pos ].done = true;
if ( pos == 0 || !synced[ pos-1 ] )
for ( var i = pos; i < synced.length && synced[i].done; i++ ) {
if ( synced[i].error ) synced[i].error.apply( jQuery, syncedData[i].error );
if ( synced[i].success ) synced[i].success.apply( jQuery, syncedData[i].success );
if ( synced[i].complete ) synced[i].complete.apply( jQuery, syncedData[i].complete );
synced[i] = null;
syncedData[i] = null;
}
};
}
return ajax.apply(this, arguments);
};
})((typeof window.jQuery == 'undefined' && typeof window.django != 'undefined')
? django.jQuery
: jQuery
);
/**
* Ajax Queue Plugin
*/
/**
<script>
$(function(){
jQuery.ajaxQueue({
url: "test.php",
success: function(html){ jQuery("ul").append(html); }
});
jQuery.ajaxQueue({
url: "test.php",
success: function(html){ jQuery("ul").append(html); }
});
jQuery.ajaxSync({
url: "test.php",
success: function(html){ jQuery("ul").append("<b>"+html+"</b>"); }
});
jQuery.ajaxSync({
url: "test.php",
success: function(html){ jQuery("ul").append("<b>"+html+"</b>"); }
});
});
</script>
<ul style="position: absolute; top: 5px; right: 5px;"></ul>
*/
/*
* Queued Ajax requests.
* A new Ajax request won't be started until the previous queued
* request has finished.
*/
/*
* Synced Ajax requests.
* The Ajax request will happen as soon as you call this method, but
* the callbacks (success/error/complete) won't fire until all previous
* synced requests have been completed.
*/
(function(jQuery) {
var ajax = jQuery.ajax;
var pendingRequests = {};
var synced = [];
var syncedData = [];
jQuery.ajax = function(settings) {
// create settings for compatibility with ajaxSetup
settings = jQuery.extend(settings, jQuery.extend({}, jQuery.ajaxSettings, settings));
var port = settings.port;
switch(settings.mode) {
case "abort":
if ( pendingRequests[port] ) {
pendingRequests[port].abort();
}
return pendingRequests[port] = ajax.apply(this, arguments);
case "queue":
var _old = settings.complete;
settings.complete = function(){
if ( _old )
_old.apply( this, arguments );
jQuery([ajax]).dequeue("ajax" + port );;
};
jQuery([ ajax ]).queue("ajax" + port, function(){
ajax( settings );
});
return;
case "sync":
var pos = synced.length;
synced[ pos ] = {
error: settings.error,
success: settings.success,
complete: settings.complete,
done: false
};
syncedData[ pos ] = {
error: [],
success: [],
complete: []
};
settings.error = function(){ syncedData[ pos ].error = arguments; };
settings.success = function(){ syncedData[ pos ].success = arguments; };
settings.complete = function(){
syncedData[ pos ].complete = arguments;
synced[ pos ].done = true;
if ( pos == 0 || !synced[ pos-1 ] )
for ( var i = pos; i < synced.length && synced[i].done; i++ ) {
if ( synced[i].error ) synced[i].error.apply( jQuery, syncedData[i].error );
if ( synced[i].success ) synced[i].success.apply( jQuery, syncedData[i].success );
if ( synced[i].complete ) synced[i].complete.apply( jQuery, syncedData[i].complete );
synced[i] = null;
syncedData[i] = null;
}
};
}
return ajax.apply(this, arguments);
};
})((typeof window.jQuery == 'undefined' && typeof window.django != 'undefined')
? django.jQuery
: jQuery
);

2304
OneCprogsite/static/django_extensions/js/jquery.autocomplete.js
View File

File diff suppressed because it is too large Load Diff

78
OneCprogsite/static/django_extensions/js/jquery.bgiframe.js
View File

@ -1,39 +1,39 @@
/*! Copyright (c) 2010 Brandon Aaron (http://brandon.aaron.sh/)
* Licensed under the MIT License (LICENSE.txt).
*
* Version 2.1.2
*/
(function($){
$.fn.bgiframe = ($.browser.msie && /msie 6\.0/i.test(navigator.userAgent) ? function(s) {
s = $.extend({
top : 'auto', // auto == .currentStyle.borderTopWidth
left : 'auto', // auto == .currentStyle.borderLeftWidth
width : 'auto', // auto == offsetWidth
height : 'auto', // auto == offsetHeight
opacity : true,
src : 'javascript:false;'
}, s);
var html = '<iframe class="bgiframe"frameborder="0"tabindex="-1"src="'+s.src+'"'+
'style="display:block;position:absolute;z-index:-1;'+
(s.opacity !== false?'filter:Alpha(Opacity=\'0\');':'')+
'top:'+(s.top=='auto'?'expression(((parseInt(this.parentNode.currentStyle.borderTopWidth)||0)*-1)+\'px\')':prop(s.top))+';'+
'left:'+(s.left=='auto'?'expression(((parseInt(this.parentNode.currentStyle.borderLeftWidth)||0)*-1)+\'px\')':prop(s.left))+';'+
'width:'+(s.width=='auto'?'expression(this.parentNode.offsetWidth+\'px\')':prop(s.width))+';'+
'height:'+(s.height=='auto'?'expression(this.parentNode.offsetHeight+\'px\')':prop(s.height))+';'+
'"/>';
return this.each(function() {
if ( $(this).children('iframe.bgiframe').length === 0 )
this.insertBefore( document.createElement(html), this.firstChild );
});
} : function() { return this; });
// old alias
$.fn.bgIframe = $.fn.bgiframe;
function prop(n) {
return n && n.constructor === Number ? n + 'px' : n;
}
})((typeof window.jQuery == 'undefined' && typeof window.django != 'undefined') ? django.jQuery : jQuery);
/*! Copyright (c) 2010 Brandon Aaron (http://brandon.aaron.sh/)
* Licensed under the MIT License (LICENSE.txt).
*
* Version 2.1.2
*/
(function($){
$.fn.bgiframe = ($.browser.msie && /msie 6\.0/i.test(navigator.userAgent) ? function(s) {
s = $.extend({
top : 'auto', // auto == .currentStyle.borderTopWidth
left : 'auto', // auto == .currentStyle.borderLeftWidth
width : 'auto', // auto == offsetWidth
height : 'auto', // auto == offsetHeight
opacity : true,
src : 'javascript:false;'
}, s);
var html = '<iframe class="bgiframe"frameborder="0"tabindex="-1"src="'+s.src+'"'+
'style="display:block;position:absolute;z-index:-1;'+
(s.opacity !== false?'filter:Alpha(Opacity=\'0\');':'')+
'top:'+(s.top=='auto'?'expression(((parseInt(this.parentNode.currentStyle.borderTopWidth)||0)*-1)+\'px\')':prop(s.top))+';'+
'left:'+(s.left=='auto'?'expression(((parseInt(this.parentNode.currentStyle.borderLeftWidth)||0)*-1)+\'px\')':prop(s.left))+';'+
'width:'+(s.width=='auto'?'expression(this.parentNode.offsetWidth+\'px\')':prop(s.width))+';'+
'height:'+(s.height=='auto'?'expression(this.parentNode.offsetHeight+\'px\')':prop(s.height))+';'+
'"/>';
return this.each(function() {
if ( $(this).children('iframe.bgiframe').length === 0 )
this.insertBefore( document.createElement(html), this.firstChild );
});
} : function() { return this; });
// old alias
$.fn.bgIframe = $.fn.bgiframe;
function prop(n) {
return n && n.constructor === Number ? n + 'px' : n;
}
})((typeof window.jQuery == 'undefined' && typeof window.django != 'undefined') ? django.jQuery : jQuery);

10
OneCprogsite/static/programmer/css/bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long

596
OneCprogsite/static/programmer/css/competence.css
View File

@ -1,299 +1,299 @@
/* competence.css - Стили для страницы компетенций */
/* Основные стили для страницы компетенций */
.competence-item {
display: flex;
gap: 2rem;
align-items: flex-start;
padding: 2rem;
background: var(--bg-card);
border-radius: var(--radius-xl);
box-shadow: var(--shadow-lg);
border-left: 4px solid var(--secondary);
transition: var(--transition);
border: 1px solid var(--border-light);
}
.competence-item:hover {
transform: translateX(8px);
box-shadow: var(--shadow-xl);
border-color: var(--primary-light);
}
.competence-scan-wrapper {
flex-shrink: 0;
}
.competence-scan-container {
width: 280px;
cursor: pointer;
border-radius: var(--radius-lg);
overflow: hidden;
border: 2px solid var(--border-light);
transition: var(--transition);
position: relative;
box-shadow: var(--shadow-md);
}
.competence-scan-container:hover {
transform: translateY(-4px) scale(1.02);
box-shadow: var(--shadow-xl);
border-color: var(--primary);
}
.competence-scan {
width: 100%;
height: auto;
display: block;
transition: var(--transition);
}
.competence-content {
flex: 1;
min-width: 0;
}
.competence-title {
font-size: 1.5rem;
font-weight: 700;
color: var(--text-primary);
margin-bottom: 1rem;
background: var(--gradient-primary);
-webkit-background-clip: text;
-webkit-text-fill-color: transparent;
background-clip: text;
}
.competence-description {
line-height: 1.7;
font-size: 1.05rem;
color: var(--text-primary);
}
.competence-description p {
margin-bottom: 1rem;
}
.competence-description p:last-child {
margin-bottom: 0;
}
.scan-hint {
position: absolute;
bottom: 0;
left: 0;
right: 0;
background: linear-gradient(transparent, rgba(0,0,0,0.8));
color: white;
padding: 1rem;
text-align: center;
opacity: 0;
transition: var(--transition);
transform: translateY(10px);
}
.competence-scan-container:hover .scan-hint {
opacity: 1;
transform: translateY(0);
}
/* Стили для модального окна с изображением компетенций */
.modal.competence-modal {
background-color: rgba(15, 19, 31, 0.95);
backdrop-filter: blur(10px);
}
.modal.competence-modal .modal-content {
background: transparent;
border: none;
box-shadow: none;
max-width: 95vw;
max-height: 95vh;
margin: 2% auto;
}
.modal.competence-modal .modal-header {
background: var(--bg-card);
border-bottom: 2px solid var(--border-light);
padding: 1.5rem 2rem;
}
.modal.competence-modal .modal-header h3 {
margin: 0;
color: var(--text-primary);
font-size: 1.25rem;
font-weight: 600;
background: var(--gradient-primary);
-webkit-background-clip: text;
-webkit-text-fill-color: transparent;
background-clip: text;
}
.modal.competence-modal .modal-body {
padding: 1rem;
display: flex;
align-items: center;
justify-content: center;
background: transparent;
}
.modal-image {
max-width: 90vw;
max-height: 80vh;
width: auto;
height: auto;
display: block;
margin: 0 auto;
border-radius: var(--radius-md);
box-shadow: var(--shadow-xl);
transition: all 0.3s ease;
}
/* Анимации для модального окна */
.modal.competence-modal {
transition: opacity 0.3s ease;
opacity: 0;
}
.modal.competence-modal.active {
opacity: 1;
}
.modal.competence-modal .modal-content {
transform: scale(0.7);
transition: transform 0.3s ease;
}
.modal.competence-modal.active .modal-content {
transform: scale(1);
}
/* Улучшенные тени и границы */
.competence-scan-container {
border: 2px solid var(--border-light);
box-shadow: var(--shadow-lg);
}
.competence-scan-container:hover {
border-color: var(--primary-light);
box-shadow: var(--shadow-xl);
}
/* Адаптивность для мобильных устройств */
@media (max-width: 768px) {
.competence-item {
flex-direction: column;
padding: 1.5rem;
gap: 1.5rem;
}
.competence-scan-container {
width: 100%;
max-width: 300px;
margin: 0 auto;
}
.competence-title {
font-size: 1.375rem;
text-align: center;
}
.modal-image {
max-width: 95vw;
max-height: 70vh;
}
.modal.competence-modal .modal-content {
margin: 10% auto;
}
.modal.competence-modal .modal-header {
padding: 1rem 1.5rem;
}
}
@media (max-width: 480px) {
.competence-item {
padding: 1.25rem;
}
.competence-scan-container {
max-width: 100%;
}
.competence-title {
font-size: 1.25rem;
}
.modal.competence-modal .modal-content {
margin: 5% auto;
max-width: 98vw;
}
.modal.competence-modal .modal-body {
padding: 0.5rem;
}
.modal.competence-modal .modal-header {
padding: 1rem;
}
.modal.competence-modal .modal-header h3 {
font-size: 1.1rem;
}
}
/* Стили для светлой темы */
@media (prefers-color-scheme: light) {
.modal.competence-modal {
background-color: rgba(0, 0, 0, 0.8);
}
.modal.competence-modal .modal-header {
background: var(--bg-primary);
}
.scan-hint {
background: linear-gradient(transparent, rgba(0,0,0,0.7));
}
.competence-item {
background: var(--bg-primary);
}
.competence-description {
color: var(--text-primary);
}
}
/* Улучшенные стили для сетки компетенций */
.competence-grid {
display: grid;
gap: 2rem;
}
.competence-grid .modern-card {
padding: 0;
overflow: hidden;
}
.competence-grid .modern-card::before {
height: 4px;
background: var(--gradient-secondary);
}
/* Анимации появления */
.fade-in {
animation: fadeInUp 0.8s ease-out;
}
@keyframes fadeInUp {
from {
opacity: 0;
transform: translateY(40px);
}
to {
opacity: 1;
transform: translateY(0);
}
/* competence.css - Стили для страницы компетенций */
/* Основные стили для страницы компетенций */
.competence-item {
display: flex;
gap: 2rem;
align-items: flex-start;
padding: 2rem;
background: var(--bg-card);
border-radius: var(--radius-xl);
box-shadow: var(--shadow-lg);
border-left: 4px solid var(--secondary);
transition: var(--transition);
border: 1px solid var(--border-light);
}
.competence-item:hover {
transform: translateX(8px);
box-shadow: var(--shadow-xl);
border-color: var(--primary-light);
}
.competence-scan-wrapper {
flex-shrink: 0;
}
.competence-scan-container {
width: 280px;
cursor: pointer;
border-radius: var(--radius-lg);
overflow: hidden;
border: 2px solid var(--border-light);
transition: var(--transition);
position: relative;
box-shadow: var(--shadow-md);
}
.competence-scan-container:hover {
transform: translateY(-4px) scale(1.02);
box-shadow: var(--shadow-xl);
border-color: var(--primary);
}
.competence-scan {
width: 100%;
height: auto;
display: block;
transition: var(--transition);
}
.competence-content {
flex: 1;
min-width: 0;
}
.competence-title {
font-size: 1.5rem;
font-weight: 700;
color: var(--text-primary);
margin-bottom: 1rem;
background: var(--gradient-primary);
-webkit-background-clip: text;
-webkit-text-fill-color: transparent;
background-clip: text;
}
.competence-description {
line-height: 1.7;
font-size: 1.05rem;
color: var(--text-primary);
}
.competence-description p {
margin-bottom: 1rem;
}
.competence-description p:last-child {
margin-bottom: 0;
}
.scan-hint {
position: absolute;
bottom: 0;
left: 0;
right: 0;
background: linear-gradient(transparent, rgba(0,0,0,0.8));
color: white;
padding: 1rem;
text-align: center;
opacity: 0;
transition: var(--transition);
transform: translateY(10px);
}
.competence-scan-container:hover .scan-hint {
opacity: 1;
transform: translateY(0);
}
/* Стили для модального окна с изображением компетенций */
.modal.competence-modal {
background-color: rgba(15, 19, 31, 0.95);
backdrop-filter: blur(10px);
}
.modal.competence-modal .modal-content {
background: transparent;
border: none;
box-shadow: none;
max-width: 95vw;
max-height: 95vh;
margin: 2% auto;
}
.modal.competence-modal .modal-header {
background: var(--bg-card);
border-bottom: 2px solid var(--border-light);
padding: 1.5rem 2rem;
}
.modal.competence-modal .modal-header h3 {
margin: 0;
color: var(--text-primary);
font-size: 1.25rem;
font-weight: 600;
background: var(--gradient-primary);
-webkit-background-clip: text;
-webkit-text-fill-color: transparent;
background-clip: text;
}
.modal.competence-modal .modal-body {
padding: 1rem;
display: flex;
align-items: center;
justify-content: center;
background: transparent;
}
.modal-image {
max-width: 90vw;
max-height: 80vh;
width: auto;
height: auto;
display: block;
margin: 0 auto;
border-radius: var(--radius-md);
box-shadow: var(--shadow-xl);
transition: all 0.3s ease;
}
/* Анимации для модального окна */
.modal.competence-modal {
transition: opacity 0.3s ease;
opacity: 0;
}
.modal.competence-modal.active {
opacity: 1;
}
.modal.competence-modal .modal-content {
transform: scale(0.7);
transition: transform 0.3s ease;
}
.modal.competence-modal.active .modal-content {
transform: scale(1);
}
/* Улучшенные тени и границы */
.competence-scan-container {
border: 2px solid var(--border-light);
box-shadow: var(--shadow-lg);
}
.competence-scan-container:hover {
border-color: var(--primary-light);
box-shadow: var(--shadow-xl);
}
/* Адаптивность для мобильных устройств */
@media (max-width: 768px) {
.competence-item {
flex-direction: column;
padding: 1.5rem;
gap: 1.5rem;
}
.competence-scan-container {
width: 100%;
max-width: 300px;
margin: 0 auto;
}
.competence-title {
font-size: 1.375rem;
text-align: center;
}
.modal-image {
max-width: 95vw;
max-height: 70vh;
}
.modal.competence-modal .modal-content {
margin: 10% auto;
}
.modal.competence-modal .modal-header {
padding: 1rem 1.5rem;
}
}
@media (max-width: 480px) {
.competence-item {
padding: 1.25rem;
}
.competence-scan-container {
max-width: 100%;
}
.competence-title {
font-size: 1.25rem;
}
.modal.competence-modal .modal-content {
margin: 5% auto;
max-width: 98vw;
}
.modal.competence-modal .modal-body {
padding: 0.5rem;
}
.modal.competence-modal .modal-header {
padding: 1rem;
}
.modal.competence-modal .modal-header h3 {
font-size: 1.1rem;
}
}
/* Стили для светлой темы */
@media (prefers-color-scheme: light) {
.modal.competence-modal {
background-color: rgba(0, 0, 0, 0.8);
}
.modal.competence-modal .modal-header {
background: var(--bg-primary);
}
.scan-hint {
background: linear-gradient(transparent, rgba(0,0,0,0.7));
}
.competence-item {
background: var(--bg-primary);
}
.competence-description {
color: var(--text-primary);
}
}
/* Улучшенные стили для сетки компетенций */
.competence-grid {
display: grid;
gap: 2rem;
}
.competence-grid .modern-card {
padding: 0;
overflow: hidden;
}
.competence-grid .modern-card::before {
height: 4px;
background: var(--gradient-secondary);
}
/* Анимации появления */
.fade-in {
animation: fadeInUp 0.8s ease-out;
}
@keyframes fadeInUp {
from {
opacity: 0;
transform: translateY(40px);
}
to {
opacity: 1;
transform: translateY(0);
}
}

454
OneCprogsite/static/programmer/css/recall.css
View File

@ -1,228 +1,228 @@
/* recall.css - Стили для страницы отзывов */
/* Основные стили для страницы отзывов */
.recall-item {
display: flex;
flex-direction: column;
gap: 1.5rem;
}
.recall-content {
display: flex;
gap: 2rem;
align-items: flex-start;
}
.recall-scan-wrapper {
flex-shrink: 0;
}
.recall-scan-container {
width: 280px;
cursor: pointer;
border-radius: var(--radius-lg);
overflow: hidden;
border: 2px solid var(--border-light);
transition: var(--transition);
position: relative;
box-shadow: var(--shadow-md);
}
.recall-scan-container:hover {
transform: translateY(-4px) scale(1.02);
box-shadow: var(--shadow-xl);
border-color: var(--primary);
}
.recall-scan {
width: 100%;
height: auto;
display: block;
transition: var(--transition);
}
.recall-text {
flex: 1;
min-width: 0;
line-height: 1.7;
font-size: 1.05rem;
color: var(--text-primary);
}
.recall-text p {
margin-bottom: 1rem;
}
.recall-text p:last-child {
margin-bottom: 0;
}
.scan-hint {
position: absolute;
bottom: 0;
left: 0;
right: 0;
background: linear-gradient(transparent, rgba(0,0,0,0.8));
color: white;
padding: 1rem;
text-align: center;
opacity: 0;
transition: var(--transition);
transform: translateY(10px);
}
.recall-scan-container:hover .scan-hint {
opacity: 1;
transform: translateY(0);
}
/* Стили для модального окна с изображением */
.modal.image-modal {
background-color: rgba(15, 19, 31, 0.95);
backdrop-filter: blur(10px);
}
.modal.image-modal .modal-content {
background: transparent;
border: none;
box-shadow: none;
max-width: 95vw;
max-height: 95vh;
margin: 2% auto;
}
.modal.image-modal .modal-header {
background: var(--bg-card);
border-bottom: 2px solid var(--border-light);
padding: 1.5rem 2rem;
}
.modal.image-modal .modal-header h3 {
margin: 0;
color: var(--text-primary);
font-size: 1.25rem;
font-weight: 600;
background: var(--gradient-primary);
-webkit-background-clip: text;
-webkit-text-fill-color: transparent;
background-clip: text;
}
.modal.image-modal .modal-body {
padding: 1rem;
display: flex;
align-items: center;
justify-content: center;
background: transparent;
}
.modal-image {
max-width: 90vw;
max-height: 80vh;
width: auto;
height: auto;
display: block;
margin: 0 auto;
border-radius: var(--radius-md);
box-shadow: var(--shadow-xl);
transition: all 0.3s ease;
}
/* Анимации для модального окна */
.modal.image-modal {
transition: opacity 0.3s ease;
opacity: 0;
}
.modal.image-modal.active {
opacity: 1;
}
.modal.image-modal .modal-content {
transform: scale(0.7);
transition: transform 0.3s ease;
}
.modal.image-modal.active .modal-content {
transform: scale(1);
}
/* Улучшенные тени и границы */
.recall-scan-container {
border: 2px solid var(--border-light);
box-shadow: var(--shadow-lg);
}
.recall-scan-container:hover {
border-color: var(--primary-light);
box-shadow: var(--shadow-xl);
}
/* Адаптивность для мобильных устройств */
@media (max-width: 768px) {
.recall-content {
flex-direction: column;
gap: 1.5rem;
}
.recall-scan-container {
width: 100%;
max-width: 300px;
margin: 0 auto;
}
.recall-scan-wrapper {
order: -1;
}
.modal-image {
max-width: 95vw;
max-height: 70vh;
}
.modal.image-modal .modal-content {
margin: 10% auto;
}
.modal.image-modal .modal-header {
padding: 1rem 1.5rem;
}
}
@media (max-width: 480px) {
.recall-scan-container {
max-width: 100%;
}
.modal.image-modal .modal-content {
margin: 5% auto;
max-width: 98vw;
}
.modal.image-modal .modal-body {
padding: 0.5rem;
}
.modal.image-modal .modal-header {
padding: 1rem;
}
.modal.image-modal .modal-header h3 {
font-size: 1.1rem;
}
}
/* Стили для светлой темы */
@media (prefers-color-scheme: light) {
.modal.image-modal {
background-color: rgba(0, 0, 0, 0.8);
}
.modal.image-modal .modal-header {
background: var(--bg-primary);
}
.scan-hint {
background: linear-gradient(transparent, rgba(0,0,0,0.7));
}
/* recall.css - Стили для страницы отзывов */
/* Основные стили для страницы отзывов */
.recall-item {
display: flex;
flex-direction: column;
gap: 1.5rem;
}
.recall-content {
display: flex;
gap: 2rem;
align-items: flex-start;
}
.recall-scan-wrapper {
flex-shrink: 0;
}
.recall-scan-container {
width: 280px;
cursor: pointer;
border-radius: var(--radius-lg);
overflow: hidden;
border: 2px solid var(--border-light);
transition: var(--transition);
position: relative;
box-shadow: var(--shadow-md);
}
.recall-scan-container:hover {
transform: translateY(-4px) scale(1.02);
box-shadow: var(--shadow-xl);
border-color: var(--primary);
}
.recall-scan {
width: 100%;
height: auto;
display: block;
transition: var(--transition);
}
.recall-text {
flex: 1;
min-width: 0;
line-height: 1.7;
font-size: 1.05rem;
color: var(--text-primary);
}
.recall-text p {
margin-bottom: 1rem;
}
.recall-text p:last-child {
margin-bottom: 0;
}
.scan-hint {
position: absolute;
bottom: 0;
left: 0;
right: 0;
background: linear-gradient(transparent, rgba(0,0,0,0.8));
color: white;
padding: 1rem;
text-align: center;
opacity: 0;
transition: var(--transition);
transform: translateY(10px);
}
.recall-scan-container:hover .scan-hint {
opacity: 1;
transform: translateY(0);
}
/* Стили для модального окна с изображением */
.modal.image-modal {
background-color: rgba(15, 19, 31, 0.95);
backdrop-filter: blur(10px);
}
.modal.image-modal .modal-content {
background: transparent;
border: none;
box-shadow: none;
max-width: 95vw;
max-height: 95vh;
margin: 2% auto;
}
.modal.image-modal .modal-header {
background: var(--bg-card);
border-bottom: 2px solid var(--border-light);
padding: 1.5rem 2rem;
}
.modal.image-modal .modal-header h3 {
margin: 0;
color: var(--text-primary);
font-size: 1.25rem;
font-weight: 600;
background: var(--gradient-primary);
-webkit-background-clip: text;
-webkit-text-fill-color: transparent;
background-clip: text;
}
.modal.image-modal .modal-body {
padding: 1rem;
display: flex;
align-items: center;
justify-content: center;
background: transparent;
}
.modal-image {
max-width: 90vw;
max-height: 80vh;
width: auto;
height: auto;
display: block;
margin: 0 auto;
border-radius: var(--radius-md);
box-shadow: var(--shadow-xl);
transition: all 0.3s ease;
}
/* Анимации для модального окна */
.modal.image-modal {
transition: opacity 0.3s ease;
opacity: 0;
}
.modal.image-modal.active {
opacity: 1;
}
.modal.image-modal .modal-content {
transform: scale(0.7);
transition: transform 0.3s ease;
}
.modal.image-modal.active .modal-content {
transform: scale(1);
}
/* Улучшенные тени и границы */
.recall-scan-container {
border: 2px solid var(--border-light);
box-shadow: var(--shadow-lg);
}
.recall-scan-container:hover {
border-color: var(--primary-light);
box-shadow: var(--shadow-xl);
}
/* Адаптивность для мобильных устройств */
@media (max-width: 768px) {
.recall-content {
flex-direction: column;
gap: 1.5rem;
}
.recall-scan-container {
width: 100%;
max-width: 300px;
margin: 0 auto;
}
.recall-scan-wrapper {
order: -1;
}
.modal-image {
max-width: 95vw;
max-height: 70vh;
}
.modal.image-modal .modal-content {
margin: 10% auto;
}
.modal.image-modal .modal-header {
padding: 1rem 1.5rem;
}
}
@media (max-width: 480px) {
.recall-scan-container {
max-width: 100%;
}
.modal.image-modal .modal-content {
margin: 5% auto;
max-width: 98vw;
}
.modal.image-modal .modal-body {
padding: 0.5rem;
}
.modal.image-modal .modal-header {
padding: 1rem;
}
.modal.image-modal .modal-header h3 {
font-size: 1.1rem;
}
}
/* Стили для светлой темы */
@media (prefers-color-scheme: light) {
.modal.image-modal {
background-color: rgba(0, 0, 0, 0.8);
}
.modal.image-modal .modal-header {
background: var(--bg-primary);
}
.scan-hint {
background: linear-gradient(transparent, rgba(0,0,0,0.7));
}
}

132
OneCprogsite/static/programmer/css/solution-accordion.css
View File

@ -1,67 +1,67 @@
/* solution-accordion.css */
.solution-accordion {
margin: 2rem 0;
}
.accordion-item {
background: var(--bg-primary);
border-radius: var(--radius-lg);
margin-bottom: 1rem;
border: 2px solid var(--border-light);
overflow: hidden;
transition: var(--transition);
}
.accordion-item:hover {
border-color: var(--primary-light);
}
.accordion-header {
padding: 1.5rem;
background: var(--gradient-primary);
color: white;
font-weight: 600;
font-size: 1.125rem;
cursor: pointer;
display: flex;
justify-content: space-between;
align-items: center;
transition: var(--transition);
user-select: none;
}
.accordion-header:hover {
background: var(--primary-dark);
}
.accordion-content {
padding: 0;
background: var(--bg-card);
line-height: 1.7;
color: var(--text-secondary);
max-height: 0;
overflow: hidden;
transition: all 0.3s ease;
}
.accordion-content.active {
padding: 1.5rem;
max-height: 5000px;
}
.accordion-icon {
transition: transform 0.3s ease;
font-size: 0.8em;
}
.accordion-header.active .accordion-icon {
transform: rotate(180deg);
}
.accordion-content p {
margin-bottom: 1rem;
}
.accordion-content p:last-child {
margin-bottom: 0;
/* solution-accordion.css */
.solution-accordion {
margin: 2rem 0;
}
.accordion-item {
background: var(--bg-primary);
border-radius: var(--radius-lg);
margin-bottom: 1rem;
border: 2px solid var(--border-light);
overflow: hidden;
transition: var(--transition);
}
.accordion-item:hover {
border-color: var(--primary-light);
}
.accordion-header {
padding: 1.5rem;
background: var(--gradient-primary);
color: white;
font-weight: 600;
font-size: 1.125rem;
cursor: pointer;
display: flex;
justify-content: space-between;
align-items: center;
transition: var(--transition);
user-select: none;
}
.accordion-header:hover {
background: var(--primary-dark);
}
.accordion-content {
padding: 0;
background: var(--bg-card);
line-height: 1.7;
color: var(--text-secondary);
max-height: 0;
overflow: hidden;
transition: all 0.3s ease;
}
.accordion-content.active {
padding: 1.5rem;
max-height: 5000px;
}
.accordion-icon {
transition: transform 0.3s ease;
font-size: 0.8em;
}
.accordion-header.active .accordion-icon {
transform: rotate(180deg);
}
.accordion-content p {
margin-bottom: 1rem;
}
.accordion-content p:last-child {
margin-bottom: 0;
}

2012
OneCprogsite/static/programmer/css/styles.css
View File

File diff suppressed because it is too large Load Diff

2944
OneCprogsite/static/programmer/css/styles_dark.css
View File

File diff suppressed because it is too large Load Diff

2810
OneCprogsite/static/programmer/css/styles_w.css
View File

File diff suppressed because it is too large Load Diff

144
OneCprogsite/static/programmer/js/competence.js
View File

@ -1,73 +1,73 @@
// competence.js - Скрипты для страницы компетенций
function openCompetenceModal(imageUrl, title) {
console.log('Opening competence modal with:', imageUrl);
const modal = document.getElementById('competenceModal');
const modalImg = document.getElementById('competenceModalImage');
const modalTitle = document.getElementById('competenceModalTitle');
if (modal && modalImg) {
modal.style.display = "block";
modalImg.src = imageUrl;
if (title && modalTitle) {
modalTitle.textContent = title;
}
// Добавляем класс для анимации
setTimeout(() => {
modal.classList.add('active');
}, 10);
// Подстраиваем размер изображения
adjustCompetenceModalImageSize();
}
}
function closeCompetenceModal() {
const modal = document.getElementById('competenceModal');
if (modal) {
modal.classList.remove('active');
setTimeout(() => {
modal.style.display = "none";
}, 300);
}
}
function adjustCompetenceModalImageSize() {
const modalImg = document.getElementById('competenceModalImage');
if (modalImg) {
const maxWidth = window.innerWidth * 0.9;
const maxHeight = window.innerHeight * 0.8;
modalImg.style.maxWidth = `${maxWidth}px`;
modalImg.style.maxHeight = `${maxHeight}px`;
}
}
// Инициализация после загрузки DOM
document.addEventListener('DOMContentLoaded', function() {
// Закрытие модального окна при клике вне изображения
document.addEventListener('click', function(event) {
const modal = document.getElementById('competenceModal');
if (event.target === modal) {
closeCompetenceModal();
}
});
// Закрытие по ESC
document.addEventListener('keydown', function(event) {
if (event.key === 'Escape') {
closeCompetenceModal();
}
});
// Адаптация размера изображения при изменении размера окна
window.addEventListener('resize', function() {
const modalImg = document.getElementById('competenceModalImage');
if (modalImg && modalImg.src) {
adjustCompetenceModalImageSize();
}
});
console.log('Competence page scripts initialized');
// competence.js - Скрипты для страницы компетенций
function openCompetenceModal(imageUrl, title) {
console.log('Opening competence modal with:', imageUrl);
const modal = document.getElementById('competenceModal');
const modalImg = document.getElementById('competenceModalImage');
const modalTitle = document.getElementById('competenceModalTitle');
if (modal && modalImg) {
modal.style.display = "block";
modalImg.src = imageUrl;
if (title && modalTitle) {
modalTitle.textContent = title;
}
// Добавляем класс для анимации
setTimeout(() => {
modal.classList.add('active');
}, 10);
// Подстраиваем размер изображения
adjustCompetenceModalImageSize();
}
}
function closeCompetenceModal() {
const modal = document.getElementById('competenceModal');
if (modal) {
modal.classList.remove('active');
setTimeout(() => {
modal.style.display = "none";
}, 300);
}
}
function adjustCompetenceModalImageSize() {
const modalImg = document.getElementById('competenceModalImage');
if (modalImg) {
const maxWidth = window.innerWidth * 0.9;
const maxHeight = window.innerHeight * 0.8;
modalImg.style.maxWidth = `${maxWidth}px`;
modalImg.style.maxHeight = `${maxHeight}px`;
}
}
// Инициализация после загрузки DOM
document.addEventListener('DOMContentLoaded', function() {
// Закрытие модального окна при клике вне изображения
document.addEventListener('click', function(event) {
const modal = document.getElementById('competenceModal');
if (event.target === modal) {
closeCompetenceModal();
}
});
// Закрытие по ESC
document.addEventListener('keydown', function(event) {
if (event.key === 'Escape') {
closeCompetenceModal();
}
});
// Адаптация размера изображения при изменении размера окна
window.addEventListener('resize', function() {
const modalImg = document.getElementById('competenceModalImage');
if (modalImg && modalImg.src) {
adjustCompetenceModalImageSize();
}
});
console.log('Competence page scripts initialized');
});

186
OneCprogsite/static/programmer/js/mobile-menu.js
View File

@ -1,94 +1,94 @@
// Mobile Menu Script
document.addEventListener('DOMContentLoaded', function() {
console.log('Mobile menu script loaded'); // Для отладки
const mobileMenuBtn = document.getElementById('mobileMenuBtn');
const mobileMenuClose = document.getElementById('mobileMenuClose');
const mobileMenuOverlay = document.getElementById('mobileMenuOverlay');
const mobileMenu = document.getElementById('mobileMenu');
const mobileThemeToggle = document.getElementById('mobile-theme-toggle');
const mainThemeToggle = document.getElementById('theme-toggle');
// Проверяем, что элементы существуют
if (!mobileMenuBtn || !mobileMenu) {
console.error('Mobile menu elements not found');
return;
}
console.log('Mobile menu elements found:', {
mobileMenuBtn,
mobileMenuClose,
mobileMenuOverlay,
mobileMenu,
mobileThemeToggle,
mainThemeToggle
});
// Открытие мобильного меню
mobileMenuBtn.addEventListener('click', function() {
console.log('Opening mobile menu');
mobileMenu.classList.add('active');
mobileMenuOverlay.style.display = 'block';
document.body.style.overflow = 'hidden';
});
// Закрытие мобильного меню
function closeMobileMenu() {
console.log('Closing mobile menu');
mobileMenu.classList.remove('active');
mobileMenuOverlay.style.display = 'none';
document.body.style.overflow = '';
}
if (mobileMenuClose) {
mobileMenuClose.addEventListener('click', closeMobileMenu);
}
if (mobileMenuOverlay) {
mobileMenuOverlay.addEventListener('click', closeMobileMenu);
}
// Закрытие меню при клике на ссылку
const mobileNavLinks = document.querySelectorAll('.mobile-nav-link');
mobileNavLinks.forEach(link => {
link.addEventListener('click', closeMobileMenu);
});
// Синхронизация переключателей темы
function syncThemeToggles() {
if (mobileThemeToggle && mainThemeToggle) {
mobileThemeToggle.checked = mainThemeToggle.checked;
}
}
if (mainThemeToggle) {
mainThemeToggle.addEventListener('change', function() {
console.log('Main theme toggle changed:', this.checked);
syncThemeToggles();
});
}
if (mobileThemeToggle) {
mobileThemeToggle.addEventListener('change', function() {
console.log('Mobile theme toggle changed:', this.checked);
if (mainThemeToggle) {
mainThemeToggle.checked = this.checked;
// Триггерим событие change
const event = new Event('change');
mainThemeToggle.dispatchEvent(event);
}
});
}
// Инициализация синхронизации
syncThemeToggles();
// Закрытие меню по ESC
document.addEventListener('keydown', function(event) {
if (event.key === 'Escape') {
closeMobileMenu();
}
});
console.log('Mobile menu script initialized successfully');
// Mobile Menu Script
document.addEventListener('DOMContentLoaded', function() {
console.log('Mobile menu script loaded'); // Для отладки
const mobileMenuBtn = document.getElementById('mobileMenuBtn');
const mobileMenuClose = document.getElementById('mobileMenuClose');
const mobileMenuOverlay = document.getElementById('mobileMenuOverlay');
const mobileMenu = document.getElementById('mobileMenu');
const mobileThemeToggle = document.getElementById('mobile-theme-toggle');
const mainThemeToggle = document.getElementById('theme-toggle');
// Проверяем, что элементы существуют
if (!mobileMenuBtn || !mobileMenu) {
console.error('Mobile menu elements not found');
return;
}
console.log('Mobile menu elements found:', {
mobileMenuBtn,
mobileMenuClose,
mobileMenuOverlay,
mobileMenu,
mobileThemeToggle,
mainThemeToggle
});
// Открытие мобильного меню
mobileMenuBtn.addEventListener('click', function() {
console.log('Opening mobile menu');
mobileMenu.classList.add('active');
mobileMenuOverlay.style.display = 'block';
document.body.style.overflow = 'hidden';
});
// Закрытие мобильного меню
function closeMobileMenu() {
console.log('Closing mobile menu');
mobileMenu.classList.remove('active');
mobileMenuOverlay.style.display = 'none';
document.body.style.overflow = '';
}
if (mobileMenuClose) {
mobileMenuClose.addEventListener('click', closeMobileMenu);
}
if (mobileMenuOverlay) {
mobileMenuOverlay.addEventListener('click', closeMobileMenu);
}
// Закрытие меню при клике на ссылку
const mobileNavLinks = document.querySelectorAll('.mobile-nav-link');
mobileNavLinks.forEach(link => {
link.addEventListener('click', closeMobileMenu);
});
// Синхронизация переключателей темы
function syncThemeToggles() {
if (mobileThemeToggle && mainThemeToggle) {
mobileThemeToggle.checked = mainThemeToggle.checked;
}
}
if (mainThemeToggle) {
mainThemeToggle.addEventListener('change', function() {
console.log('Main theme toggle changed:', this.checked);
syncThemeToggles();
});
}
if (mobileThemeToggle) {
mobileThemeToggle.addEventListener('change', function() {
console.log('Mobile theme toggle changed:', this.checked);
if (mainThemeToggle) {
mainThemeToggle.checked = this.checked;
// Триггерим событие change
const event = new Event('change');
mainThemeToggle.dispatchEvent(event);
}
});
}
// Инициализация синхронизации
syncThemeToggles();
// Закрытие меню по ESC
document.addEventListener('keydown', function(event) {
if (event.key === 'Escape') {
closeMobileMenu();
}
});
console.log('Mobile menu script initialized successfully');
});

146
OneCprogsite/static/programmer/js/recall.js
View File

@ -1,74 +1,74 @@
// recall.js - Скрипты для страницы отзывов
function openModal(imageUrl, title) {
console.log('Opening modal with:', imageUrl);
const modal = document.getElementById('imageModal');
const modalImg = document.getElementById('modalImage');
const modalTitle = document.getElementById('modalTitle');
if (modal && modalImg) {
modal.style.display = "block";
modalImg.src = imageUrl;
if (title && modalTitle) {
modalTitle.textContent = title;
}
// Добавляем класс для анимации
setTimeout(() => {
modal.classList.add('active');
}, 10);
// Подстраиваем размер изображения
adjustModalImageSize();
}
}
function closeModal() {
const modal = document.getElementById('imageModal');
if (modal) {
modal.classList.remove('active');
setTimeout(() => {
modal.style.display = "none";
}, 300);
}
}
function adjustModalImageSize() {
const modalImg = document.getElementById('modalImage');
const modalContent = document.querySelector('.modal-content');
if (modalImg && modalContent) {
const maxWidth = window.innerWidth * 0.9;
const maxHeight = window.innerHeight * 0.8;
modalImg.style.maxWidth = `${maxWidth}px`;
modalImg.style.maxHeight = `${maxHeight}px`;
}
}
// Инициализация после загрузки DOM
document.addEventListener('DOMContentLoaded', function() {
// Закрытие модального окна при клике вне изображения
document.addEventListener('click', function(event) {
const modal = document.getElementById('imageModal');
if (event.target === modal) {
closeModal();
}
});
// Закрытие по ESC
document.addEventListener('keydown', function(event) {
if (event.key === 'Escape') {
closeModal();
}
});
// Адаптация размера изображения при изменении размера окна
window.addEventListener('resize', function() {
const modalImg = document.getElementById('modalImage');
if (modalImg && modalImg.src) {
adjustModalImageSize();
}
});
console.log('Recall page scripts initialized');
// recall.js - Скрипты для страницы отзывов
function openModal(imageUrl, title) {
console.log('Opening modal with:', imageUrl);
const modal = document.getElementById('imageModal');
const modalImg = document.getElementById('modalImage');
const modalTitle = document.getElementById('modalTitle');
if (modal && modalImg) {
modal.style.display = "block";
modalImg.src = imageUrl;
if (title && modalTitle) {
modalTitle.textContent = title;
}
// Добавляем класс для анимации
setTimeout(() => {
modal.classList.add('active');
}, 10);
// Подстраиваем размер изображения
adjustModalImageSize();
}
}
function closeModal() {
const modal = document.getElementById('imageModal');
if (modal) {
modal.classList.remove('active');
setTimeout(() => {
modal.style.display = "none";
}, 300);
}
}
function adjustModalImageSize() {
const modalImg = document.getElementById('modalImage');
const modalContent = document.querySelector('.modal-content');
if (modalImg && modalContent) {
const maxWidth = window.innerWidth * 0.9;
const maxHeight = window.innerHeight * 0.8;
modalImg.style.maxWidth = `${maxWidth}px`;
modalImg.style.maxHeight = `${maxHeight}px`;
}
}
// Инициализация после загрузки DOM
document.addEventListener('DOMContentLoaded', function() {
// Закрытие модального окна при клике вне изображения
document.addEventListener('click', function(event) {
const modal = document.getElementById('imageModal');
if (event.target === modal) {
closeModal();
}
});
// Закрытие по ESC
document.addEventListener('keydown', function(event) {
if (event.key === 'Escape') {
closeModal();
}
});
// Адаптация размера изображения при изменении размера окна
window.addEventListener('resize', function() {
const modalImg = document.getElementById('modalImage');
if (modalImg && modalImg.src) {
adjustModalImageSize();
}
});
console.log('Recall page scripts initialized');
});

90
OneCprogsite/static/programmer/js/solution-accordion.js
View File

@ -1,46 +1,46 @@
// solution-accordion.js
function toggleAccordion(header) {
const content = header.nextElementSibling;
const icon = header.querySelector('.accordion-icon');
// Переключаем только текущий аккордеон
header.classList.toggle('active');
content.classList.toggle('active');
icon.style.transform = header.classList.contains('active') ? 'rotate(180deg)' : 'rotate(0deg)';
}
// Функция для открытия всех аккордеонов
function expandAll() {
document.querySelectorAll('.accordion-content').forEach(content => {
content.classList.add('active');
});
document.querySelectorAll('.accordion-header').forEach(header => {
header.classList.add('active');
});
document.querySelectorAll('.accordion-icon').forEach(icon => {
icon.style.transform = 'rotate(180deg)';
});
}
// Функция для закрытия всех аккордеонов
function collapseAll() {
document.querySelectorAll('.accordion-content').forEach(content => {
content.classList.remove('active');
});
document.querySelectorAll('.accordion-header').forEach(header => {
header.classList.remove('active');
});
document.querySelectorAll('.accordion-icon').forEach(icon => {
icon.style.transform = 'rotate(0deg)';
});
}
// Автоматически открываем первый аккордеон в каждой карточке при загрузке
document.addEventListener('DOMContentLoaded', function() {
document.querySelectorAll('.content-card').forEach(card => {
const firstAccordion = card.querySelector('.accordion-header');
if (firstAccordion) {
toggleAccordion(firstAccordion);
}
});
// solution-accordion.js
function toggleAccordion(header) {
const content = header.nextElementSibling;
const icon = header.querySelector('.accordion-icon');
// Переключаем только текущий аккордеон
header.classList.toggle('active');
content.classList.toggle('active');
icon.style.transform = header.classList.contains('active') ? 'rotate(180deg)' : 'rotate(0deg)';
}
// Функция для открытия всех аккордеонов
function expandAll() {
document.querySelectorAll('.accordion-content').forEach(content => {
content.classList.add('active');
});
document.querySelectorAll('.accordion-header').forEach(header => {
header.classList.add('active');
});
document.querySelectorAll('.accordion-icon').forEach(icon => {
icon.style.transform = 'rotate(180deg)';
});
}
// Функция для закрытия всех аккордеонов
function collapseAll() {
document.querySelectorAll('.accordion-content').forEach(content => {
content.classList.remove('active');
});
document.querySelectorAll('.accordion-header').forEach(header => {
header.classList.remove('active');
});
document.querySelectorAll('.accordion-icon').forEach(icon => {
icon.style.transform = 'rotate(0deg)';
});
}
// Автоматически открываем первый аккордеон в каждой карточке при загрузке
document.addEventListener('DOMContentLoaded', function() {
document.querySelectorAll('.content-card').forEach(card => {
const firstAccordion = card.querySelector('.accordion-header');
if (firstAccordion) {
toggleAccordion(firstAccordion);
}
});
});

134
OneCprogsite/static/programmer/js/theme-switcher.js
View File

@ -1,68 +1,68 @@
// Theme Switcher Script
document.addEventListener('DOMContentLoaded', function() {
const themeToggle = document.getElementById('theme-toggle');
const mobileThemeToggle = document.getElementById('mobile-theme-toggle');
const themeCSS = document.getElementById('theme-css');
// Проверяем сохраненную тему в localStorage
const savedTheme = localStorage.getItem('theme');
// Устанавливаем светлую тему по умолчанию
if (savedTheme === 'dark') {
switchToDarkTheme();
} else {
switchToLightTheme(); // Светлая тема по умолчанию
}
// Обработчик переключения темы для десктопного переключателя
if (themeToggle) {
themeToggle.addEventListener('change', function() {
if (this.checked) {
switchToLightTheme();
} else {
switchToDarkTheme();
}
});
}
// Обработчик переключения темы для мобильного переключателя
if (mobileThemeToggle) {
mobileThemeToggle.addEventListener('change', function() {
if (this.checked) {
switchToLightTheme();
} else {
switchToDarkTheme();
}
// Синхронизируем оба переключателя
if (themeToggle) {
themeToggle.checked = this.checked;
}
});
}
function switchToLightTheme() {
themeCSS.href = themeCSS.href.replace('styles_dark.css', 'styles_w.css');
if (themeToggle) themeToggle.checked = true;
if (mobileThemeToggle) mobileThemeToggle.checked = true;
localStorage.setItem('theme', 'light');
}
function switchToDarkTheme() {
themeCSS.href = themeCSS.href.replace('styles_w.css', 'styles_dark.css');
if (themeToggle) themeToggle.checked = false;
if (mobileThemeToggle) mobileThemeToggle.checked = false;
localStorage.setItem('theme', 'dark');
}
// Синхронизация переключателей при загрузке
if (themeToggle && mobileThemeToggle) {
mobileThemeToggle.checked = themeToggle.checked;
}
// Обработка ошибок загрузки CSS
themeCSS.onerror = function() {
console.error('Ошибка загрузки CSS файла темы');
// Восстанавливаем светлую тему по умолчанию при ошибке
themeCSS.href = themeCSS.href.replace('styles_dark.css', 'styles_w.css');
};
// Theme Switcher Script
document.addEventListener('DOMContentLoaded', function() {
const themeToggle = document.getElementById('theme-toggle');
const mobileThemeToggle = document.getElementById('mobile-theme-toggle');
const themeCSS = document.getElementById('theme-css');
// Проверяем сохраненную тему в localStorage
const savedTheme = localStorage.getItem('theme');
// Устанавливаем светлую тему по умолчанию
if (savedTheme === 'dark') {
switchToDarkTheme();
} else {
switchToLightTheme(); // Светлая тема по умолчанию
}
// Обработчик переключения темы для десктопного переключателя
if (themeToggle) {
themeToggle.addEventListener('change', function() {
if (this.checked) {
switchToLightTheme();
} else {
switchToDarkTheme();
}
});
}
// Обработчик переключения темы для мобильного переключателя
if (mobileThemeToggle) {
mobileThemeToggle.addEventListener('change', function() {
if (this.checked) {
switchToLightTheme();
} else {
switchToDarkTheme();
}
// Синхронизируем оба переключателя
if (themeToggle) {
themeToggle.checked = this.checked;
}
});
}
function switchToLightTheme() {
themeCSS.href = themeCSS.href.replace('styles_dark.css', 'styles_w.css');
if (themeToggle) themeToggle.checked = true;
if (mobileThemeToggle) mobileThemeToggle.checked = true;
localStorage.setItem('theme', 'light');
}
function switchToDarkTheme() {
themeCSS.href = themeCSS.href.replace('styles_w.css', 'styles_dark.css');
if (themeToggle) themeToggle.checked = false;
if (mobileThemeToggle) mobileThemeToggle.checked = false;
localStorage.setItem('theme', 'dark');
}
// Синхронизация переключателей при загрузке
if (themeToggle && mobileThemeToggle) {
mobileThemeToggle.checked = themeToggle.checked;
}
// Обработка ошибок загрузки CSS
themeCSS.onerror = function() {
console.error('Ошибка загрузки CSS файла темы');
// Восстанавливаем светлую тему по умолчанию при ошибке
themeCSS.href = themeCSS.href.replace('styles_dark.css', 'styles_w.css');
};
});

78
OneCprogsite/urls.py
View File

@ -1,39 +1,39 @@
"""
URL configuration for OneCprogsite project.
The `urlpatterns` list routes URLs to views. For more information please see:
https://docs.djangoproject.com/en/4.2/topics/http/urls/
Examples:
Function views
1. Add an import: from my_app import views
2. Add a URL to urlpatterns: path('', views.home, name='home')
Class-based views
1. Add an import: from other_app.views import Home
2. Add a URL to urlpatterns: path('', Home.as_view(), name='home')
Including another URLconf
1. Import the include() function: from django.urls import include, path
2. Add a URL to urlpatterns: path('blog/', include('blog.urls'))
"""
from django.conf.urls.static import static
from django.contrib import admin
from django.urls import path
from OneCprogsite import settings
from programmer.views import *
from django.urls import path, include
urlpatterns = [
path('admin/', admin.site.urls),
path('', include('programmer.urls')),
# path('', index, name='home'),
# path('about/', about, name='about'),
# path('solution/', solution, name='solution'),
# path('ability/', ability, name='ability'),
# path('recall/', recall, name='recall'),
# path('post/<int:post_id>', show_post, name='post'),
]
if settings.DEBUG:
urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
handler404 = pageNotFound
"""
URL configuration for OneCprogsite project.
The `urlpatterns` list routes URLs to views. For more information please see:
https://docs.djangoproject.com/en/4.2/topics/http/urls/
Examples:
Function views
1. Add an import: from my_app import views
2. Add a URL to urlpatterns: path('', views.home, name='home')
Class-based views
1. Add an import: from other_app.views import Home
2. Add a URL to urlpatterns: path('', Home.as_view(), name='home')
Including another URLconf
1. Import the include() function: from django.urls import include, path
2. Add a URL to urlpatterns: path('blog/', include('blog.urls'))
"""
from django.conf.urls.static import static
from django.contrib import admin
from django.urls import path
from OneCprogsite import settings
from programmer.views import *
from django.urls import path, include
urlpatterns = [
path('admin/', admin.site.urls),
path('', include('programmer.urls')),
# path('', index, name='home'),
# path('about/', about, name='about'),
# path('solution/', solution, name='solution'),
# path('ability/', ability, name='ability'),
# path('recall/', recall, name='recall'),
# path('post/<int:post_id>', show_post, name='post'),
]
if settings.DEBUG:
urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
handler404 = pageNotFound

32
OneCprogsite/wsgi.py
View File

@ -1,16 +1,16 @@
"""
WSGI config for OneCprogsite project.
It exposes the WSGI callable as a module-level variable named ``application``.
For more information on this file, see
https://docs.djangoproject.com/en/4.2/howto/deployment/wsgi/
"""
import os
from django.core.wsgi import get_wsgi_application
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'OneCprogsite.settings')
application = get_wsgi_application()
"""
WSGI config for OneCprogsite project.
It exposes the WSGI callable as a module-level variable named ``application``.
For more information on this file, see
https://docs.djangoproject.com/en/4.2/howto/deployment/wsgi/
"""
import os
from django.core.wsgi import get_wsgi_application
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'OneCprogsite.settings')
application = get_wsgi_application()

0
programmer/__init__.py Normal file
View File

169
programmer/admin.py Normal file
View File

@ -0,0 +1,169 @@
from django.contrib import admin
from django.utils import timezone
from django.utils.html import format_html
from django.urls import path
from django.shortcuts import render
from django.http import HttpResponseRedirect
from django.contrib import messages
from .models import *
class ProgrammerAdmin(admin.ModelAdmin):
list_display = ('id', 'title', 'time_create', 'photo', 'is_published')
list_display_links = ('id', 'title')
search_fields = ('title', 'content')
list_editable = ('is_published',)
list_filter = ('time_create', 'is_published')
class RecallAdmin(admin.ModelAdmin):
list_display = ('id', 'title', 'time_create', 'scan', 'is_published')
list_display_links = ('id', 'title')
search_fields = ('title', 'content')
list_editable = ('is_published',)
list_filter = ('time_create', 'is_published')
class SolutionAdmin(admin.ModelAdmin):
list_display = ('id', 'title', 'time_create', 'is_published')
list_display_links = ('id', 'title')
search_fields = ('title', 'description', 'implementation')
list_editable = ('is_published',)
list_filter = ('time_create', 'is_published')
class HomeAdmin(admin.ModelAdmin):
list_display = ('id', 'title', 'time_create', 'is_published')
list_display_links = ('id', 'title')
search_fields = ('title', 'content')
list_editable = ('is_published',)
list_filter = ('time_create', 'is_published')
@admin.register(CallbackRequest)
class CallbackAdmin(admin.ModelAdmin):
list_display = ('name', 'phone', 'email', 'time_create', 'is_processed', 'is_read', 'new_badge')
list_display_links = ('name', 'phone')
list_editable = ('is_processed', 'is_read')
list_filter = ('time_create', 'is_processed', 'is_read')
search_fields = ('name', 'phone', 'email')
readonly_fields = ('time_create',)
actions = ['mark_as_read', 'mark_as_unread', 'mark_as_processed']
actions = ['mark_as_read', 'mark_as_unread', 'mark_as_processed', 'resend_notification']
def resend_notification(self, request, queryset):
from .utils.email_notifications import send_callback_notification
count = 0
for callback in queryset:
success = send_callback_notification(callback)
if success:
count += 1
self.message_user(request, f'Уведомления отправлены для {count} заявок')
resend_notification.short_description = "Переотправить email уведомления"
def new_badge(self, obj):
if not obj.is_read:
return format_html('<span style="color: red; font-weight: bold;">🆕 НОВАЯ</span>')
return ""
new_badge.short_description = 'Статус'
def get_queryset(self, request):
# Показываем количество непрочитанных в заголовке
unread_count = CallbackRequest.objects.filter(is_read=False).count()
if unread_count > 0:
self.message_user(
request,
f'У вас {unread_count} непрочитанных заявок!',
messages.WARNING
)
return super().get_queryset(request)
def mark_as_read(self, request, queryset):
updated = queryset.update(is_read=True)
self.message_user(request, f'{updated} заявок отмечены как прочитанные')
mark_as_read.short_description = "Отметить как прочитанные"
def mark_as_unread(self, request, queryset):
updated = queryset.update(is_read=False)
self.message_user(request, f'{updated} заявок отмечены как непрочитанные')
mark_as_unread.short_description = "Отметить как непрочитанные"
def mark_as_processed(self, request, queryset):
updated = queryset.update(is_processed=True)
self.message_user(request, f'{updated} заявок отмечены как обработанные')
mark_as_processed.short_description = "Отметить как обработанные"
# Добавляем кастомное представление для статистики
def get_urls(self):
urls = super().get_urls()
custom_urls = [
path('callback-stats/', self.admin_site.admin_view(self.callback_stats), name='callback_stats'),
]
return custom_urls + urls
def callback_stats(self, request):
today = timezone.now().date()
week_ago = today - timezone.timedelta(days=7)
stats = {
'total': CallbackRequest.objects.count(),
'today': CallbackRequest.objects.filter(time_create__date=today).count(),
'week': CallbackRequest.objects.filter(time_create__date__gte=week_ago).count(),
'unread': CallbackRequest.objects.filter(is_read=False).count(),
'unprocessed': CallbackRequest.objects.filter(is_processed=False).count(),
}
context = {
**self.admin_site.each_context(request),
'title': 'Статистика заявок',
'stats': stats,
}
return render(request, 'admin/callback_stats.html', context)
class ProgrammerAdmin(admin.ModelAdmin):
list_display = ('id', 'title', 'time_create', 'photo', 'is_published')
list_display_links = ('id', 'title')
search_fields = ('title', 'content')
list_editable = ('is_published',)
list_filter = ('time_create', 'is_published')
class RecallAdmin(admin.ModelAdmin):
list_display = ('id', 'title', 'time_create', 'scan', 'is_published')
list_display_links = ('id', 'title')
search_fields = ('title', 'content')
list_editable = ('is_published',)
list_filter = ('time_create', 'is_published')
class SolutionAdmin(admin.ModelAdmin):
list_display = ('id', 'title', 'time_create', 'is_published')
list_display_links = ('id', 'title')
search_fields = ('title', 'description', 'implementation')
list_editable = ('is_published',)
list_filter = ('time_create', 'is_published')
class HomeAdmin(admin.ModelAdmin):
list_display = ('id', 'title', 'time_create', 'is_published')
list_display_links = ('id', 'title')
search_fields = ('title', 'content')
list_editable = ('is_published',)
list_filter = ('time_create', 'is_published')
@admin.register(PageView)
class PageViewAdmin(admin.ModelAdmin):
list_display = ['url', 'timestamp', 'ip_address']
list_filter = ['timestamp', 'url']
search_fields = ['url', 'ip_address']
date_hierarchy = 'timestamp'
def get_queryset(self, request):
return super().get_queryset(request).order_by('-timestamp')
admin.site.register(Competence, ProgrammerAdmin)
admin.site.register(Recall, RecallAdmin)
admin.site.register(Solution, SolutionAdmin)
admin.site.register(Home, HomeAdmin)

7
programmer/apps.py Normal file
View File

@ -0,0 +1,7 @@
from django.apps import AppConfig
class ProgrammerConfig(AppConfig):
default_auto_field = 'django.db.models.BigAutoField'
name = 'programmer'
verbose_name = 'Программисты'

12
programmer/context_processors.py Normal file
View File

@ -0,0 +1,12 @@
from .views import menu
from django.conf import settings
def menu_processor(request):
return {'menu': menu}
def contact_info(request):
return {
'CONTACT_EMAIL': getattr(settings, 'CONTACT_EMAIL', 'it@nserdyuk.ru'),
'CONTACT_PHONE': getattr(settings, 'CONTACT_PHONE', '+7 (960) 469-40-88'),
}

33
programmer/forms.py Normal file
View File

@ -0,0 +1,33 @@
from django import forms
from .models import CallbackRequest
class CallbackForm(forms.ModelForm):
class Meta:
model = CallbackRequest
fields = ['name', 'phone', 'email', 'question']
widgets = {
'name': forms.TextInput(attrs={
'class': 'form-input',
'placeholder': 'Ваше имя'
}),
'phone': forms.TextInput(attrs={
'class': 'form-input',
'placeholder': '+7 (___) ___-__-__'
}),
'email': forms.EmailInput(attrs={
'class': 'form-input',
'placeholder': 'your@email.com'
}),
'question': forms.Textarea(attrs={
'class': 'form-textarea',
'placeholder': 'Опишите ваш вопрос или задачу...',
'rows': 4
}),
}
labels = {
'name': 'Имя',
'phone': 'Телефон',
'email': 'Электронная почта',
'question': 'Ваш вопрос'
}

0
programmer/management/__init__.py Normal file
View File

0
programmer/management/commands/__init__.py Normal file
View File

33
programmer/management/commands/send_daily_summary.py Normal file
View File

@ -0,0 +1,33 @@
# programmer/management/commands/send_daily_summary.py
from django.core.management.base import BaseCommand
from django.utils import timezone
from programmer.utils.email_notifications import send_daily_summary
class Command(BaseCommand):
help = 'Отправляет ежедневную сводку по заявкам на email'
def add_arguments(self, parser):
parser.add_argument(
'--test',
action='store_true',
help='Тестовая отправка (не учитывает реальные данные)',
)
def handle(self, *args, **options):
if options['test']:
self.stdout.write(self.style.WARNING('Тестовая отправка ежедневной сводки...'))
# Здесь можно добавить тестовые данные
else:
self.stdout.write('Отправка ежедневной сводки...')
success = send_daily_summary()
if success:
self.stdout.write(
self.style.SUCCESS(f'Ежедневная сводка отправлена успешно! Время: {timezone.now()}')
)
else:
self.stdout.write(
self.style.WARNING('Ежедневная сводка не отправлена (нет данных или ошибка)')
)

29
programmer/management/commands/test_email.py Normal file
View File

@ -0,0 +1,29 @@
# programmer/management/commands/test_email.py
from django.core.management.base import BaseCommand
from django.conf import settings
from programmer.utils.email_notifications import send_test_email
class Command(BaseCommand):
help = 'Test email configuration'
def handle(self, *args, **options):
self.stdout.write("Testing email configuration...")
# Проверяем настройки
self.stdout.write(f"EMAIL_HOST: {settings.EMAIL_HOST}")
self.stdout.write(f"EMAIL_PORT: {settings.EMAIL_PORT}")
self.stdout.write(f"EMAIL_HOST_USER: {settings.EMAIL_HOST_USER}")
self.stdout.write(f"ADMIN_EMAILS: {settings.ADMIN_EMAILS}")
# Тестируем отправку
success = send_test_email()
if success:
self.stdout.write(
self.style.SUCCESS('✅ Test email sent successfully!')
)
else:
self.stdout.write(
self.style.ERROR('❌ Failed to send test email. Check your email settings.')
)

27
programmer/management/commands/test_sitemap.py Normal file
View File

@ -0,0 +1,27 @@
from django.core.management.base import BaseCommand
from django.contrib.sitemaps import Sitemap
from django.urls import reverse
from programmer.models import Home, Solution, Competence, Recall
class Command(BaseCommand):
help = 'Test sitemap generation'
def handle(self, *args, **options):
from programmer.sitemaps import sitemaps
self.stdout.write('Testing sitemap generation...')
for name, sitemap in sitemaps.items():
self.stdout.write(f'\n{name}:')
items = sitemap().items()
self.stdout.write(f' Items found: {len(items)}')
for item in items[:3]: # Показываем первые 3 элемента
try:
url = sitemap().location(item)
self.stdout.write(f' - {url}')
except Exception as e:
self.stdout.write(f' - Error: {e}')
self.stdout.write('\nSitemap test completed!')

54
programmer/middleware.py Normal file
View File

@ -0,0 +1,54 @@
from .models import PageView, Visitor
from django.utils import timezone
from django.db import transaction
class PageViewMiddleware:
def __init__(self, get_response):
self.get_response = get_response
def __call__(self, request):
# Игнорируем статические файлы и админку
if not request.path.startswith('/static/') and not request.path.startswith('/admin/'):
self.track_page_view(request)
response = self.get_response(request)
return response
def track_page_view(self, request):
try:
with transaction.atomic():
# Сохраняем просмотр страницы
PageView.objects.create(
url=request.path,
ip_address=self.get_client_ip(request),
user_agent=request.META.get('HTTP_USER_AGENT', ''),
referer=request.META.get('HTTP_REFERER', '')
)
# Обновляем статистику посетителя
ip = self.get_client_ip(request)
visitor, created = Visitor.objects.get_or_create(
ip_address=ip,
defaults={
'first_visit': timezone.now(),
'last_visit': timezone.now()
}
)
if not created:
visitor.last_visit = timezone.now()
visitor.visit_count += 1
visitor.save()
except Exception as e:
# Логируем ошибку, но не прерываем выполнение
print(f"Error tracking page view: {e}")
def get_client_ip(self, request):
x_forwarded_for = request.META.get('HTTP_X_FORWARDED_FOR')
if x_forwarded_for:
ip = x_forwarded_for.split(',')[0]
else:
ip = request.META.get('REMOTE_ADDR')
return ip

26
programmer/migrations/0001_initial.py Normal file
View File

@ -0,0 +1,26 @@
# Generated by Django 4.2.7 on 2023-11-23 12:47
from django.db import migrations, models
class Migration(migrations.Migration):
initial = True
dependencies = [
]
operations = [
migrations.CreateModel(
name='Competence',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('title', models.CharField(max_length=255)),
('content', models.TextField(blank=True)),
('photo', models.ImageField(upload_to='photos/%Y/%m/%d/')),
('time_create', models.DateTimeField(auto_now_add=True)),
('time_update', models.DateTimeField(auto_now=True)),
('is_publiched', models.BooleanField(default=True)),
],
),
]

47
programmer/migrations/0002_alter_competence_options_alter_competence_content_and_more.py Normal file
View File

@ -0,0 +1,47 @@
# Generated by Django 4.2.7 on 2023-11-24 08:03
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('programmer', '0001_initial'),
]
operations = [
migrations.AlterModelOptions(
name='competence',
options={'ordering': ['time_create', 'title'], 'verbose_name': 'Компитенция', 'verbose_name_plural': 'Компитенции'},
),
migrations.AlterField(
model_name='competence',
name='content',
field=models.TextField(blank=True, verbose_name='Компетенция'),
),
migrations.AlterField(
model_name='competence',
name='is_publiched',
field=models.BooleanField(default=True, verbose_name='Опубликован'),
),
migrations.AlterField(
model_name='competence',
name='photo',
field=models.ImageField(upload_to='photos/%Y/%m/%d/', verbose_name='Фото'),
),
migrations.AlterField(
model_name='competence',
name='time_create',
field=models.DateTimeField(auto_now_add=True, verbose_name='Дата создания'),
),
migrations.AlterField(
model_name='competence',
name='time_update',
field=models.DateTimeField(auto_now=True, verbose_name='Дата изменения'),
),
migrations.AlterField(
model_name='competence',
name='title',
field=models.CharField(max_length=255, verbose_name='Программист'),
),
]

35
programmer/migrations/0003_recall_rename_is_publiched_competence_is_published.py Normal file
View File

@ -0,0 +1,35 @@
# Generated by Django 4.2.7 on 2023-11-24 11:54
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('programmer', '0002_alter_competence_options_alter_competence_content_and_more'),
]
operations = [
migrations.CreateModel(
name='Recall',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('title', models.CharField(max_length=255, verbose_name='Организация')),
('content', models.TextField(blank=True, verbose_name='Отзыв')),
('photo', models.ImageField(upload_to='photos/%Y/%m/%d/', verbose_name='Фото')),
('time_create', models.DateTimeField(auto_now_add=True, verbose_name='Дата создания')),
('time_update', models.DateTimeField(auto_now=True, verbose_name='Дата изменения')),
('is_published', models.BooleanField(default=True, verbose_name='Опубликован')),
],
options={
'verbose_name': 'Отзыв',
'verbose_name_plural': 'Отзывы',
'ordering': ['time_create', 'title'],
},
),
migrations.RenameField(
model_name='competence',
old_name='is_publiched',
new_name='is_published',
),
]

18
programmer/migrations/0004_rename_photo_recall_scan.py Normal file
View File

@ -0,0 +1,18 @@
# Generated by Django 4.2.7 on 2023-11-24 12:02
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('programmer', '0003_recall_rename_is_publiched_competence_is_published'),
]
operations = [
migrations.RenameField(
model_name='recall',
old_name='photo',
new_name='scan',
),
]

Some files were not shown because too many files have changed in this diff Show More