registration implemented
This commit is contained in:
@@ -0,0 +1,3 @@
|
||||
from .celery import app as celery
|
||||
|
||||
__all__ = ('celery',)
|
||||
|
@@ -11,6 +11,6 @@ import os
|
||||
|
||||
from django.core.asgi import get_asgi_application
|
||||
|
||||
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'Sprint.settings')
|
||||
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "Sprint.settings")
|
||||
|
||||
application = get_asgi_application()
|
||||
|
17
Sprint/celery.py
Normal file
17
Sprint/celery.py
Normal file
@@ -0,0 +1,17 @@
|
||||
import os
|
||||
|
||||
from celery import Celery
|
||||
|
||||
# Set the default Django settings module for the 'celery' program.
|
||||
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'Sprint.settings')
|
||||
|
||||
app = Celery('Sprint')
|
||||
|
||||
# Using a string here means the worker doesn't have to serialize
|
||||
# the configuration object to child processes.
|
||||
# - namespace='CELERY' means all celery-related configuration keys
|
||||
# should have a `CELERY_` prefix.
|
||||
app.config_from_object('django.conf:settings', namespace='CELERY')
|
||||
|
||||
# Load task modules from all registered Django apps.
|
||||
app.autodiscover_tasks()
|
@@ -20,7 +20,7 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
||||
# See https://docs.djangoproject.com/en/3.0/howto/deployment/checklist/
|
||||
|
||||
# SECURITY WARNING: keep the secret key used in production secret!
|
||||
SECRET_KEY = '-w#*mn6*fa8a=(-c0@klx&$vl%hpiy&l(u*3%0a#2)wdt##(z2'
|
||||
SECRET_KEY = "-w#*mn6*fa8a=(-c0@klx&$vl%hpiy&l(u*3%0a#2)wdt##(z2"
|
||||
|
||||
DEPLOY = False
|
||||
|
||||
@@ -30,69 +30,65 @@ DEBUG = not DEPLOY
|
||||
SECURE_SSL_REDIRECT = DEPLOY
|
||||
|
||||
|
||||
ALLOWED_HOSTS = [
|
||||
'*'
|
||||
]
|
||||
ALLOWED_HOSTS = ["*"]
|
||||
|
||||
|
||||
# Application definition
|
||||
|
||||
INSTALLED_APPS = [
|
||||
'grappelli',
|
||||
'django.contrib.admin',
|
||||
'django.contrib.auth',
|
||||
'django.contrib.contenttypes',
|
||||
'django.contrib.sessions',
|
||||
'django.contrib.messages',
|
||||
'django.contrib.staticfiles',
|
||||
'Main.apps.MainConfig'
|
||||
"django.contrib.admin",
|
||||
"django.contrib.auth",
|
||||
"django.contrib.contenttypes",
|
||||
"django.contrib.sessions",
|
||||
"django.contrib.messages",
|
||||
"django.contrib.staticfiles",
|
||||
"Main.apps.MainConfig",
|
||||
]
|
||||
|
||||
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',
|
||||
'django.middleware.locale.LocaleMiddleware',
|
||||
"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",
|
||||
"django.middleware.locale.LocaleMiddleware",
|
||||
]
|
||||
|
||||
ROOT_URLCONF = 'Sprint.urls'
|
||||
ROOT_URLCONF = "Sprint.urls"
|
||||
|
||||
TEMPLATES = [
|
||||
{
|
||||
'BACKEND': 'django.template.backends.django.DjangoTemplates',
|
||||
'DIRS': [os.path.join(BASE_DIR, 'templates')]
|
||||
,
|
||||
'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',
|
||||
'Main.context_processors.attributes'
|
||||
"BACKEND": "django.template.backends.django.DjangoTemplates",
|
||||
"DIRS": [os.path.join(BASE_DIR, "templates")],
|
||||
"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",
|
||||
"Main.context_processors.attributes",
|
||||
],
|
||||
},
|
||||
},
|
||||
]
|
||||
|
||||
WSGI_APPLICATION = 'Sprint.wsgi.application'
|
||||
WSGI_APPLICATION = "Sprint.wsgi.application"
|
||||
|
||||
|
||||
# Database
|
||||
# https://docs.djangoproject.com/en/3.0/ref/settings/#databases
|
||||
|
||||
DATABASES = {
|
||||
'default': {
|
||||
'ENGINE': 'django.db.backends.postgresql_psycopg2',
|
||||
'NAME': os.getenv('POSTGRES_DB'),
|
||||
'USER': os.getenv('POSTGRES_USER'),
|
||||
'PASSWORD': os.getenv('POSTGRES_PASSWORD'),
|
||||
'HOST': '0.0.0.0',
|
||||
'PORT': '5432',
|
||||
"default": {
|
||||
"ENGINE": "django.db.backends.postgresql_psycopg2",
|
||||
"NAME": "postgres",
|
||||
"USER": "postgres",
|
||||
"PASSWORD": "password",
|
||||
"HOST": "0.0.0.0",
|
||||
"PORT": "5432",
|
||||
}
|
||||
}
|
||||
|
||||
@@ -102,16 +98,16 @@ DATABASES = {
|
||||
|
||||
AUTH_PASSWORD_VALIDATORS = [
|
||||
{
|
||||
'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
|
||||
"NAME": "django.contrib.auth.password_validation.UserAttributeSimilarityValidator",
|
||||
},
|
||||
{
|
||||
'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
|
||||
"NAME": "django.contrib.auth.password_validation.MinimumLengthValidator",
|
||||
},
|
||||
{
|
||||
'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
|
||||
"NAME": "django.contrib.auth.password_validation.CommonPasswordValidator",
|
||||
},
|
||||
{
|
||||
'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
|
||||
"NAME": "django.contrib.auth.password_validation.NumericPasswordValidator",
|
||||
},
|
||||
]
|
||||
|
||||
@@ -121,14 +117,11 @@ AUTH_PASSWORD_VALIDATORS = [
|
||||
|
||||
_ = lambda s: s
|
||||
|
||||
LANGUAGES = (
|
||||
('en', _('English')),
|
||||
('ru', _('Russian'))
|
||||
)
|
||||
LANGUAGES = (("en", _("English")), ("ru", _("Russian")))
|
||||
|
||||
LANGUAGE_CODE = 'en-us'
|
||||
LANGUAGE_CODE = "en-us"
|
||||
|
||||
TIME_ZONE = 'Europe/Moscow'
|
||||
TIME_ZONE = "Europe/Moscow"
|
||||
|
||||
USE_I18N = True
|
||||
|
||||
@@ -140,11 +133,13 @@ USE_TZ = True
|
||||
# Static files (CSS, JavaScript, Images)
|
||||
# https://docs.djangoproject.com/en/3.0/howto/static-files/
|
||||
|
||||
STATIC_URL = '/static/'
|
||||
STATIC_URL = "/static/"
|
||||
MEDIA_URL = "/media/"
|
||||
|
||||
STATIC_ROOT = os.path.join(BASE_DIR, "static")
|
||||
|
||||
MEDIA_ROOT = os.path.join(BASE_DIR, 'data')
|
||||
MEDIA_ROOT = os.path.join(BASE_DIR, "media")
|
||||
DATA_ROOT = os.path.join(BASE_DIR, "data")
|
||||
SOLUTIONS_ROOT = os.path.join(DATA_ROOT, "solutions")
|
||||
|
||||
STATICFILES_DIRS = [
|
||||
os.path.join(BASE_DIR, "Main/static"),
|
||||
@@ -152,6 +147,17 @@ STATICFILES_DIRS = [
|
||||
|
||||
|
||||
# Authentication backends
|
||||
AUTHENTICATION_BACKENDS = (
|
||||
'django.contrib.auth.backends.ModelBackend',
|
||||
)
|
||||
AUTHENTICATION_BACKENDS = ("django.contrib.auth.backends.ModelBackend",)
|
||||
|
||||
|
||||
# Celery Configuration Options
|
||||
CELERY_TIMEZONE = "Europe/Moscow"
|
||||
CELERY_TASK_TRACK_STARTED = True
|
||||
CELERY_BROKER_URL = 'redis://127.0.0.1:6379/0'
|
||||
|
||||
CONSTS = {
|
||||
"online_status": "Online",
|
||||
"in_queue_status": "In queue",
|
||||
"testing_status": "Testing",
|
||||
"ok_status": "OK",
|
||||
}
|
||||
|
@@ -1,39 +1,20 @@
|
||||
from django.conf.urls.static import static
|
||||
from django.contrib import admin
|
||||
from django.urls import path, re_path, include
|
||||
from Main import views
|
||||
from django.urls import path
|
||||
from Main.views import *
|
||||
from Sprint import settings
|
||||
|
||||
urlpatterns = [
|
||||
path('grappelli/', include('grappelli.urls')), # grappelli URLS
|
||||
path('main', views.main),
|
||||
path('settings', views.settings),
|
||||
path('enter', views.enter, name='enter'),
|
||||
path('register', views.register),
|
||||
path('restore', views.restore, name='restore'),
|
||||
path('reset_password', views.reset_password),
|
||||
path('exit', views.exit),
|
||||
path('block', views.block),
|
||||
path('task', views.task),
|
||||
path('solution', views.solution),
|
||||
path('rating', views.rating),
|
||||
path('messages', views.messages),
|
||||
path('admin/rating', views.rating),
|
||||
path('admin/download_rating', views.download_rating),
|
||||
path('admin/solution', views.solution),
|
||||
path('admin/retest', views.retest),
|
||||
path('admin/docs', views.docs),
|
||||
path('admin/block', views.block_settings),
|
||||
path('admin/task', views.task_settings),
|
||||
path('admin/main', views.admin),
|
||||
path('admin/solutions', views.solutions),
|
||||
path('admin/users_settings', views.users_settings),
|
||||
path('admin/download', views.download),
|
||||
path('admin/queue', views.queue),
|
||||
path('admin/cheating', views.cheating),
|
||||
path('queue_table', views.queue_table),
|
||||
path('task_test', views.task_test),
|
||||
path('solutions_table', views.solutions_table),
|
||||
path('get_result_data', views.get_result_data),
|
||||
path('get_comment_data', views.get_comment_data),
|
||||
path('admin/', admin.site.urls),
|
||||
re_path('^', views.redirect)
|
||||
]
|
||||
path("enter", EnterView.as_view()),
|
||||
path("register", RegisterView.as_view()),
|
||||
path("rating", RatingView.as_view()),
|
||||
path("tasks", TasksView.as_view()),
|
||||
path("account", AccountView.as_view()),
|
||||
path("exit", ExitView.as_view()),
|
||||
path("admin/task", TaskSettingsView.as_view()),
|
||||
path("sets", SetsView.as_view()),
|
||||
path("task", TaskView.as_view()),
|
||||
path("solutions_table", SolutionsTableView.as_view()),
|
||||
path("", MainView.as_view()),
|
||||
path("admin/", admin.site.urls),
|
||||
] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
|
||||
|
@@ -11,6 +11,6 @@ import os
|
||||
|
||||
from django.core.wsgi import get_wsgi_application
|
||||
|
||||
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'Sprint.settings')
|
||||
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "Sprint.settings")
|
||||
|
||||
application = get_wsgi_application()
|
||||
|
Reference in New Issue
Block a user