diff --git a/archilance/settings/base.py b/archilance/settings/base.py index 96d7bd5..c560f57 100644 --- a/archilance/settings/base.py +++ b/archilance/settings/base.py @@ -147,8 +147,11 @@ SOCIAL_AUTH_ODNOKLASSNIKI_OAUTH2_PUBLIC_NAME = 'CBADEFFLEBABABABA' SOCIAL_AUTH_GOOGLE_OAUTH2_KEY = '499898042244-bt7v18v4f46k8qg98n1ne8u2hjtmj0cn.apps.googleusercontent.com' SOCIAL_AUTH_GOOGLE_OAUTH2_SECRET = 's69NCyhSlwY0OuGGT8_dFI7E' -SOCIAL_AUTH_TWITTER_KEY = 'YAe05K4IYYxHhA6J1mTOdDBjq' -SOCIAL_AUTH_TWITTER_SECRET = 'iRuYqRRaoGkCD4ip74NICb8FeZMxvM6MZ8HLMbm1jX99o7pcaL' +# SOCIAL_AUTH_TWITTER_KEY = 'YAe05K4IYYxHhA6J1mTOdDBjq' +# SOCIAL_AUTH_TWITTER_SECRET = 'iRuYqRRaoGkCD4ip74NICb8FeZMxvM6MZ8HLMbm1jX99o7pcaL' + +SOCIAL_AUTH_TWITTER_KEY = 'vZvKDqyosgeGuRwnY8mKy9sHV' +SOCIAL_AUTH_TWITTER_SECRET = 'ulPAOEMWscoBh7hldpKXXQksACUuSfp25GWAOSv5PiMV1o6Sah' SOCIAL_AUTH_VK_OAUTH2_KEY = '5469025' SOCIAL_AUTH_VK_OAUTH2_SECRET = '3Wild7HqYq6YFiLz9i7l' diff --git a/archilance/settings/dev.py b/archilance/settings/dev.py index 52aa52c..9603670 100644 --- a/archilance/settings/dev.py +++ b/archilance/settings/dev.py @@ -2,7 +2,7 @@ from .base import * # AUTH_PASSWORD_VALIDATORS = [] -INSTALLED_APPS += ['debug_toolbar',] +# INSTALLED_APPS += ['debug_toolbar',] try: from .local import * diff --git a/assets/css/extra.css b/assets/css/extra.css index 4f46864..96bebd4 100644 --- a/assets/css/extra.css +++ b/assets/css/extra.css @@ -58,3 +58,9 @@ .mfp-fade.mfp-wrap.mfp-removing .mfp-content { opacity: 0; } + + +#jGrowl .jGrowl-notification { + background-color: #00bb7b; + font-size: 17px; +} diff --git a/assets/css/main.css b/assets/css/main.css index 7b45040..d113549 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -5481,4 +5481,5 @@ input[type="radio"]:checked + span { .imgProfile { margin-left: -20px; } -} \ No newline at end of file +} + diff --git a/assets/index.js b/assets/index.js index acfb8c5..f86cfa0 100644 --- a/assets/index.js +++ b/assets/index.js @@ -448,3 +448,19 @@ function humanFileSize(bytes, si) { return bytes.toFixed(1) + ' ' + units[u] } + + +function getCookie(name) { + var cookieValue = null; + if (document.cookie && document.cookie != '') { + var cookies = document.cookie.split(';'); + for (var i = 0; i < cookies.length; i++) { + var cookie = jQuery.trim(cookies[i]); + if (cookie.substring(0, name.length + 1) == (name + '=')) { + cookieValue = decodeURIComponent(cookie.substring(name.length + 1)); + break; + } + } + } + return cookieValue; +} diff --git a/assets/js/chat.js b/assets/js/chat.js index fe6129c..dd5a27e 100644 --- a/assets/js/chat.js +++ b/assets/js/chat.js @@ -2,20 +2,6 @@ * Created by mukhtar on 04.07.16. */ -function getCookie(name) { - var cookieValue = null; - if (document.cookie && document.cookie != '') { - var cookies = document.cookie.split(';'); - for (var i = 0; i < cookies.length; i++) { - var cookie = jQuery.trim(cookies[i]); - if (cookie.substring(0, name.length + 1) == (name + '=')) { - cookieValue = decodeURIComponent(cookie.substring(name.length + 1)); - break; - } - } - } - return cookieValue; -} var SocketHandler = function () { var url = 'ws://127.0.0.1:8888/chat'; @@ -29,7 +15,6 @@ var SocketHandler = function () { }; sock.onmessage = function (event) { console.log(event.data); - alert(event.data); var message = JSON.parse(event.data); var inbox = document.getElementById('message-chat-space'); inbox.innerHTML += '
' + diff --git a/chat/templates/chat_customer.html b/chat/templates/chat_customer.html index 72b2d93..c09b24f 100644 --- a/chat/templates/chat_customer.html +++ b/chat/templates/chat_customer.html @@ -196,29 +196,48 @@ {% endblock %} {% block js_block %} - + diff --git a/templates/partials/header.html b/templates/partials/header.html index 66822fb..e99071a 100644 --- a/templates/partials/header.html +++ b/templates/partials/header.html @@ -61,7 +61,9 @@ {% elif request.user.is_customer %} - profile-image + {% thumbnail request.user.avatar "75x75" crop="center" as im %} + profile-image + {% endthumbnail %} {% endif %}
diff --git a/users/pipeline.py b/users/pipeline.py index ce13c26..0870121 100644 --- a/users/pipeline.py +++ b/users/pipeline.py @@ -10,9 +10,10 @@ def test_contractor(backend, details, response, is_new=False, *args, **kwargs): @partial def add_email_for_user(backend, details, response, is_new=False, *args, **kwargs): data = backend.strategy.request_data() - if details.get('contractor') is None: - if 'contractor' in kwargs['request']: - return {'contractor': kwargs['request']['contractor']} + # import code; code.interact(local=dict(globals(), **locals())) + if not details.get('email'): + if 'email' in kwargs['request']: + return {'email': kwargs['request']['email']} else: return render_to_response('add_email_form.html') @partial diff --git a/users/serializers.py b/users/serializers.py index f7aff5d..0d9710a 100755 --- a/users/serializers.py +++ b/users/serializers.py @@ -24,7 +24,7 @@ class UserSerializer(ModelSerializer): 'last_name', 'last_time_visit', 'location', - 'nickname', + 'username', 'patronym', 'skype', 'website', diff --git a/users/templates/add_email_form.html b/users/templates/add_email_form.html index 46d51c9..364b4bd 100644 --- a/users/templates/add_email_form.html +++ b/users/templates/add_email_form.html @@ -3,7 +3,7 @@ {% block content %}

Введите свой email

- +
{% endblock %} diff --git a/users/templates/contractor_profile.html b/users/templates/contractor_profile.html index 2a418d7..779a67a 100644 --- a/users/templates/contractor_profile.html +++ b/users/templates/contractor_profile.html @@ -294,12 +294,14 @@
- {% for diplom in contractor.contractor_resume.resume_files.all %} + {% for diplom in resume_diploms %}
-
+ {% thumbnail diplom.img "210x334" crop="center" as im %} +
+ {% endthumbnail %}

@@ -325,12 +327,14 @@

- {% for cro in contractor.contractor_resume.resume_files.all %} + {% for cro in resume_cro %}
-
+ {% thumbnail cro.img "210x334" crop="center" as im %} +
+ {% endthumbnail %}

@@ -390,8 +394,26 @@ {% block js_block %}