PR-14 Модификация шапки аккаунт Исполнителя, иконку в личку

Разделение настроект чата на local и base
remotes/origin/PR-46
booblegum 9 years ago
parent e556d365b5
commit 547d3ccc99
  1. 1
      .gitignore
  2. 3
      assets/js/chat.js
  3. 2
      chat/chat.py
  4. 16
      chat/settings/base.py
  5. 6
      chat/settings/dev.py

1
.gitignore vendored

@ -4,6 +4,7 @@ env/
.ar/
ar/
archilance/settings/local.py
chat/settings/local.py
media/*
static/*

@ -28,7 +28,8 @@ window.confirm = function (message, callback, caption) {
};
var SocketHandler = function () {
domain = domain.replace(':' + port, '');
//TODO: получать порт с файла настроек
domain = domain.replace(':' + port, ':8888');
if (window.location.protocol == 'https:') {
var ws = "wss://";
} else {

@ -1,7 +1,7 @@
import html
import momoko
from settings import settings, PORT, DATABASE_DSN
from chat.settings.dev import settings, PORT, DATABASE_DSN
from tornado import gen, web, websocket, escape
from tornado.httpserver import HTTPServer
from tornado.ioloop import IOLoop

@ -0,0 +1,16 @@
import os
PORT = 8888
settings = {
'cookie_secret': '__TODO:_GENERATE_YOUR_OWN_RANDOM_VALUE_HERE__',
'template_path': os.path.join(os.path.dirname(__file__), 'templates'),
'static_path': os.path.join(os.path.dirname(__file__), 'static'),
'login_url': '/login',
'xsrf_cookies': True,
'debug': True,
'autoreload': True,
'server_traceback': True,
}
DATABASE_DSN = 'dbname=archilance user=postgres password=postgres host=localhost'

@ -0,0 +1,6 @@
from .base import *
try:
from .local import *
except ImportError:
pass
Loading…
Cancel
Save