Project for the UPV to develop an app like BlaBlaCar but only for UPV people.
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

minor changes on ui

+9 -4
+2 -1
upvcarshare/static/src/js/messenger/messenger.component.js
··· 8 8 bindings: { 9 9 journey: '@', 10 10 firstName: '@', 11 - lastName: '@' 11 + lastName: '@', 12 + userId: '@' 12 13 } 13 14 }; 14 15
+1
upvcarshare/static/src/js/messenger/messenger.controller.js
··· 52 52 journey: this.journey, 53 53 content: "", 54 54 user: { 55 + id: this.userId, 55 56 first_name: this.firstName, 56 57 last_name: this.lastName 57 58 },
+2 -2
upvcarshare/templates/header.html
··· 41 41 <li class="nav-item {% add_active_class "journeys:recommended" %}"> 42 42 <a class="nav-link" href="{% url "journeys:recommended" %}">{% trans "Recomendaciones" %}</a> 43 43 </li> 44 - <li class="nav-item {% add_active_class "journeys:user-list,journeys:passenger,journeys:residences" %} dropdown"> 44 + <li class="nav-item {% add_active_class "journeys:user-list,journeys:passenger,journeys:residences,journeys:transports,journeys:create" %} dropdown"> 45 45 <a class="nav-link dropdown-toggle" 46 46 data-toggle="dropdown" 47 47 href="#" ··· 55 55 <a class="dropdown-item" href="{% url "journeys:passenger" %}">{% trans "Trayectos en los que viajo" %}</a> 56 56 <div class="dropdown-divider"></div> 57 57 <a class="dropdown-item" href="{% url "journeys:residences" %}">{% trans "Mis lugares" %}</a> 58 - <a class="dropdown-item" href="{% url "journeys:transports" %}">{% trans "Mis medios de transporte" %}</a> 58 + <a class="dropdown-item" href="{% url "journeys:transports" %}">{% trans "Mis transportes" %}</a> 59 59 </div> 60 60 </li> 61 61 <li class="nav-item {% add_active_class "users:edit" %} dropdown">
+4 -1
upvcarshare/templates/journeys/details.html
··· 28 28 {% if show_messenger %} 29 29 <h3>{% trans "Tablón de mensajes" %}</h3> 30 30 <p class="text-muted">{% trans "Habla con los otros pasajeros del viaje para concretar los detalles del viaje. La lista de mensajes <strong>no se actualiza automáticamente</strong>." %}</p> 31 - <messenger journey="{{ journey.pk }}" first-name="{{ request.user.first_name }}" last-name="{{ request.user.last_name }}"></messenger> 31 + <messenger journey="{{ journey.pk }}" 32 + first-name="{{ request.user.first_name }}" 33 + last-name="{{ request.user.last_name }}" 34 + user-id="{{ request.user.id }}"></messenger> 32 35 {% endif %} 33 36 </div> 34 37