fixes

assets/js/chat.js

@@ -1,6 +1,6 @@
 var SocketHandler = function () {
     domain = domain.replace(':' + port, '');
-    var url = 'ws://' + domain + ':8888/chat/' + userId + '/';
+    var url = 'ws://' + domain + '/chat/' + userId + '/';
     var sock = new WebSocket(url);
     var intervalId;
     sock.onopen = function () {

templates/partials/header.html

@@ -107,12 +107,12 @@
                                     <a href="{% url 'wallets:score-detail' pk=request.user.pk %}">Счет<span></span></a>
                                 </li>
                                 <li class="icon_mm5">
-                                    <a href="#">Настройки<span></span></a>
+                                    <a href="{% url 'users:user-profile-edit' pk=request.user.pk %}">Настройки<span></span></a>
                                 </li>
 
-                                <li class="icon_mm6">
-                                    <a href="#">FAQ<span></span></a>
-                                </li>
+{#                                <li class="icon_mm6">#}
+{#                                    <a href="#">FAQ<span></span></a>#}
+{#                                </li>#}
 
                                 <li class="icon_mm6">
                                     <a href="{% url 'auth_logout' %}">Выйти<span></span></a>

update.sh

@@ -4,8 +4,9 @@ source ../env/bin/activate &&
 pip install -r requirements/base.txt &&
 git reset --hard &&
 git pull &&
-chmod +x update.sh &&
 ./manage.py migrate --noinput &&
 ./manage.py collectstatic --noinput &&
 supervisorctl restart arch &&
-./manage.py recalculation_spec
+./manage.py recalculation_spec &&
+chown -R www-data:www-data ./ && chmod -R 775 ./ &&
+chmod +x update.sh

users/templates/contractor_filter.html

@@ -178,7 +178,7 @@
                                     <img src="img/profile.jpg" alt="execitor-image">
                                 </div></a>
                                 <p class="nameExecutor">
-                                    <a href="#">{{ team.name }}</a>
+                                    <a href="">{{ team.name }}</a>  {#  TODO #}
                                 </p>
                                 <p class="navv2">На сайте 8 лет и 3 месяца</p>
                                 <div class="statusUser">Свободен</div>

users/templates/contractor_profile.html

@@ -252,8 +252,7 @@
                                         </div>
                                     </div>
                                     <div class="insetCol2 box-sizing disTab">
-                                        <p>{{ ws }}</p>
-                                        
+                                        <a href="{% url 'work_sell:detail' ws.pk %}">{{ ws }}</a>
                                         {% if request.user.pk == contractor.pk %}
                                             <div class="buttonsImg" disTab>
                                                 <div class="insetBI insetBI1">

work_sell/templates/worksells_list.html

@@ -140,7 +140,7 @@
                 {% for work in work_sells %}
                     <div class="col-lg-3">
                         <div class="insetCol box-sizing disTab">
-                            <a href="{% url 'work_sell:detail' work.pk %}">
+                              <a href="{% url 'work_sell:detail' work.pk %}">
                                 {% thumbnail work.get_cover "265x265" crop="center" as im %}
                                     <div class="imgGal" style="background: url('{{ im.url }}') no-repeat center;">
                                         <div class="imgFigure"></div>
@@ -154,8 +154,7 @@
                             </div>
                         </div>
                         <div class="insetCol2 box-sizing disTab">
-                            <p>{{ work }}</p>
-
+                            <a href="{% url 'work_sell:detail' work.pk %}">{{ work }}</a>
                             {% if request.user.pk == work.contractor.pk %}
                             <div class="buttonsImg" disTab>
                                 <a href="{% url 'work_sell:edit' work.pk %}">