diff --git a/eshop_project/settings/base.py b/eshop_project/settings/base.py index a1bceb7..3f9c805 100644 --- a/eshop_project/settings/base.py +++ b/eshop_project/settings/base.py @@ -48,6 +48,7 @@ INSTALLED_APPS = [ 'referral', 'products', 'cart', + 'blog_ext', 'accounts_ext', 'index', 'contact_us', @@ -60,6 +61,8 @@ INSTALLED_APPS = [ 'snowpenguin.django.recaptcha2', 'crispy_forms', 'mptt', + 'pinax.blog', + 'pinax.images', 'import_export', 'django_feedparser', 'jet.dashboard', @@ -76,7 +79,6 @@ INSTALLED_APPS = [ 'django.contrib.flatpages', 'django.contrib.admin', - ] MIDDLEWARE = [ @@ -88,6 +90,7 @@ MIDDLEWARE = [ 'django.contrib.messages.middleware.MessageMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware', 'django.contrib.flatpages.middleware.FlatpageFallbackMiddleware', + 'cart.middleware.CartMonkeyPatchingMiddleware', 'referral.middleware.ReferralMiddleware', ] @@ -107,7 +110,7 @@ TEMPLATES = [ 'django.template.context_processors.request', 'django.contrib.auth.context_processors.auth', 'django.contrib.messages.context_processors.messages', - 'core.context_processors.breadcrumbs', + # 'pinax.blog.context_processors.scoped', 'contact_us.context_processors.contact_us_form', 'products.context_processors.product_search_form', 'products.context_processors.product_fitler_formset', @@ -132,7 +135,7 @@ MPTT_ADMIN_LEVEL_INDENT = 20 DATABASES = { 'extra': { 'ENGINE': 'django.db.backends.sqlite3', - 'NAME': os.path.join(BASE_DIR,'eshop.sqlite.db') + 'NAME': os.path.join(BASE_DIR, 'eshop.sqlite.db') }, 'default': { 'ENGINE': env.str('DB_ENGINE'), @@ -150,9 +153,9 @@ RECAPTCHA_PRIVATE_KEY = env.str("RECAPTCHA_PRIVATE_KEY") RECAPTCHA_PUBLIC_KEY = env.str("RECAPTCHA_PUBLIC_KEY") # DJANGO REGISTRATION PACKAGE SETTINGS -ACCOUNT_ACTIVATION_DAYS = env.int('ACCOUNT_ACTIVATION_DAYS',default=3) +ACCOUNT_ACTIVATION_DAYS = env.int('ACCOUNT_ACTIVATION_DAYS', default=3) ACTIVATION_EMAIL_HTML = 'emails/html/activation_email.html' -REGISTRATION_AUTO_LOGIN = env.int('REGISTRATION_AUTO_LOGIN',default=False) +REGISTRATION_AUTO_LOGIN = env.int('REGISTRATION_AUTO_LOGIN', default=False) REGISTRATION_OPEN = env.bool('REGISTRATION_OPEN', default=True) REGISTRATION_EMAIL_HTML = env.bool("REGISTRATION_EMAIL_HTML", True) REGISTRATION_FORM = 'accounts_ext.forms.RegistrationForm' @@ -166,7 +169,7 @@ LOGIN_REDIRECT_URL = reverse_lazy('index:index') # Email settings EMAIL_BACKEND = 'djcelery_email.backends.CeleryEmailBackend' -EMAIL_USE_TLS = env.bool('EMAIL_USE_TLS',True) +EMAIL_USE_TLS = env.bool('EMAIL_USE_TLS', True) EMAIL_USE_SSL = env.bool("EMAIL_USE_SSL", False) EMAIL_HOST = env.str('EMAIL_HOST') EMAIL_PORT = env.str('EMAIL_PORT') @@ -179,7 +182,6 @@ DISPOSABLE_EMAIL_DOMAINS = os.path.join(TEMPLATE_DIR, 'emails/disposable_email_d # Substituting auth user model AUTH_USER_MODEL = 'accounts_ext.User' - # Password validation # https://docs.djangoproject.com/en/1.10/ref/settings/#auth-password-validators @@ -198,6 +200,11 @@ AUTH_PASSWORD_VALIDATORS = [ }, ] +#PINAX BLOG +# PINAX_BLOG_SCOPING_URL_VAR = "username" +# PINAX_BLOG_SCOPING_MODEL = AUTH_USER_MODEL +# PINAX_BLOG_HOOKSET = "multiblog.hooks.HookSet" # where `multiblog` is the package name of our project + # Logging LOGGING = { 'version': 1, @@ -212,8 +219,8 @@ LOGGING = { }, 'formatters': { 'main_formatter': { - 'format' : '%(levelname)s:%(name)s: %(message)s:' - '(%(asctime)s; %(filename)s:%(lineno)d)', + 'format': '%(levelname)s:%(name)s: %(message)s:' + '(%(asctime)s; %(filename)s:%(lineno)d)', 'datefmt': '%Y-%m-%d %H:%M:%S' }, }, @@ -227,7 +234,7 @@ LOGGING = { 'level': 'ERROR', 'class': 'logging.handlers.RotatingFileHandler', 'filename': 'logs/eshop_main_prod.log', - 'maxBytes': 1024*1024*5, + 'maxBytes': 1024 * 1024 * 5, 'backupCount': 7, 'formatter': 'main_formatter', 'filters': ['require_debug_false'] @@ -236,7 +243,7 @@ LOGGING = { 'level': 'DEBUG', 'class': 'logging.handlers.RotatingFileHandler', 'filename': 'logs/eshop_main_dev.log', - 'maxBytes': 1024*1024*5, + 'maxBytes': 1024 * 1024 * 5, 'backupCount': 7, 'formatter': 'main_formatter', 'filters': ['require_debug_true'] @@ -299,24 +306,18 @@ CKEDITOR_CONFIGS = { }, } - - -#CART SESSION KEY +# CART SESSION KEY CART_SESSION_ID = 'cart' # for import-export excel data IMPORT_EXPORT_USE_TRANSACTIONS = True # PAGINATION SETTINGS -DEFAULT_PAGE_AMOUNT = 1 +DEFAULT_PAGE_AMOUNT = 10 # DEFAULT REFERRAL POINTS DEFAULT_REFERRAL_POINTS = 120 -# CASHBACK RATIO IN PERCENTAGE -CASHBACK_RATIO = 4 - - # REQUISITES SUPPLIER_INFO = '''ООО "Русские Программы", ИНН 7713409230, КПП 771301001, 127411, Москва г, Дмитровское ш., дом № 157, корпус 7, тел.: +74957258950''' diff --git a/eshop_project/urls.py b/eshop_project/urls.py index 6ab5426..46a1542 100644 --- a/eshop_project/urls.py +++ b/eshop_project/urls.py @@ -18,6 +18,8 @@ from django.contrib import admin from django.conf import settings from django.conf.urls.static import static +from core import views + admin.autodiscover() urlpatterns = [ @@ -41,10 +43,8 @@ urlpatterns = [ re_path(r'^cart/', include(('cart.urls', 'cart'), namespace='cart')), - # re_path(r'^order/', include('orders.urls', namespace='orders')), - # re_path(r'^discount/', include('discount.urls', namespace='discount')), - # re_path(r'^landing/', include('landing.urls')), - # re_path(r'^', include('orders.urls',namespace='orders')), + re_path(r'^news/', include(('pinax.blog.urls','pinax'), namespace='news')), + ] + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT) \ + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) @@ -54,5 +54,7 @@ if settings.DEBUG: re_path(r'^__debug__/', include(debug_toolbar.urls)) ] + urlpatterns -handler404 = 'core.views.Handler404View' -handler500 = 'core.views.Handler500View' +handler404 = views.Handler404View.as_view() +handler500 = views.Handler500View.as_view() +handler403 = views.Handler403View.as_view() +handler400 = views.Handler400View.as_view()