diff --git a/.gitignore b/.gitignore index 539a427..9c61bc7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,50 +1,55 @@ +#Specific +frontend/treeview/db.sqlite3 +frontend/treeview/treeview_app/migrations/ +frontend/treeview/treeview/static/ + .vscode debug nohup* *swp # Binaries for programs and plugins *.exe *.dll *.so *.dylib # Test binary, build with `go test -c` *.test # Output of the go coverage tool, specifically when used with LiteIDE *.out # Project-local glide cache, RE: https://github.com/Masterminds/glide/issues/736 .glide/ node_modules/ public/api *.idea/* *.idea* ../.idea/ *.vscode *.log .travis.yml *.bak .tern-project public/build *.tmpl.js public/coverage *.swp frontend/public/assets/* #django *.egg-info *.pot *.py[co] .tox/ __pycache__ MANIFEST dist/ docs/_build/ docs/locale/ node_modules/ tests/coverage_html/ tests/.coverage build/ tests/report/ diff --git a/frontend/treeview/db.sqlite3 b/frontend/treeview/db.sqlite3 index a28e03c..ab519a8 100644 Binary files a/frontend/treeview/db.sqlite3 and b/frontend/treeview/db.sqlite3 differ diff --git a/frontend/treeview/treeview/settings.py b/frontend/treeview/treeview/settings.py index 6c25ce4..a37b13e 100644 --- a/frontend/treeview/treeview/settings.py +++ b/frontend/treeview/treeview/settings.py @@ -1,126 +1,128 @@ """ Django settings for treeview project. Generated by 'django-admin startproject' using Django 1.11.3. For more information on this file, see https://docs.djangoproject.com/en/1.11/topics/settings/ For the full list of settings and their values, see https://docs.djangoproject.com/en/1.11/ref/settings/ """ import os # Build paths inside the project like this: os.path.join(BASE_DIR, ...) BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) # Quick-start development settings - unsuitable for production # See https://docs.djangoproject.com/en/1.11/howto/deployment/checklist/ # SECURITY WARNING: keep the secret key used in production secret! SECRET_KEY = 'h!khjr!+%c_7v5-^w)*x2*sy5e#0g^3dmzyt1@y0wtr6^x)uiq' # SECURITY WARNING: don't run with debug turned on in production! DEBUG = True ALLOWED_HOSTS = [ '.akapustin.me', # Allow domain and subdomains 'localhost', '127.0.0.1' ] # Application definition INSTALLED_APPS = [ 'django.contrib.admin', 'django.contrib.auth', 'django.contrib.contenttypes', 'django.contrib.sessions', 'django.contrib.messages', 'django.contrib.staticfiles', 'treeview_app', 'graphos', 'django_tables2' ] 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', ] ROOT_URLCONF = 'treeview.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', ], }, }, ] WSGI_APPLICATION = 'treeview.wsgi.application' # Database # https://docs.djangoproject.com/en/1.11/ref/settings/#databases DATABASES = { 'default': { 'ENGINE': 'django.db.backends.sqlite3', 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'), } } # Password validation # https://docs.djangoproject.com/en/1.11/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/1.11/topics/i18n/ LANGUAGE_CODE = 'en-us' TIME_ZONE = 'Europe/Moscow' USE_I18N = True USE_L10N = True USE_TZ = True # Static files (CSS, JavaScript, Images) # https://docs.djangoproject.com/en/1.11/howto/static-files/ STATIC_URL = '/static/' +PROJECT_DIR = os.path.dirname(os.path.abspath(__file__)) +STATIC_ROOT = os.path.join(PROJECT_DIR, 'static') diff --git a/frontend/treeview/treeview_app/static/treeview_app/css/jsontree.css b/frontend/treeview/treeview_app/static/treeview_app/css/jsontree.css index 0e8345c..27b4e25 100644 --- a/frontend/treeview/treeview_app/static/treeview_app/css/jsontree.css +++ b/frontend/treeview/treeview_app/static/treeview_app/css/jsontree.css @@ -1,45 +1,45 @@ .jstValue { white-space: pre-wrap; font-size: 20px; font-weight: 400; font-family: "Lucida Console", Monaco, monospace; } .jstComma { white-space: pre-wrap; } .jstProperty { - color: #666; + color: #F9EFEF; word-wrap: break-word; } .jstBracket { white-space: pre-wrap;; } .jstBool { color: #2525CC; } .jstNum { color: #D036D0; } .jstNull { color: gray; } .jstStr { color: #2DB669; } .jstFold:after { content: ' -'; cursor: pointer; } .jstExpand { white-space: normal; } .jstExpand:after { content: ' +'; cursor: pointer; } .jstFolded { white-space: normal !important; } .jstHiddenBlock { display: none; } diff --git a/frontend/treeview/treeview_app/tables.py b/frontend/treeview/treeview_app/tables.py index 03e7f85..f930f12 100644 --- a/frontend/treeview/treeview_app/tables.py +++ b/frontend/treeview/treeview_app/tables.py @@ -1,24 +1,24 @@ import django_tables2 as tables from .models import Tools from .models import ToolsActivate from .models import Actions class ToolsTable(tables.Table): class Meta: model = Tools # add class="paleblue" to