Skip to content

Commit 1ea5882

Browse files
committed
fixed runtime error when user doesn't define the group chat icon
added heroku config
1 parent 041edee commit 1ea5882

File tree

8 files changed

+27
-6
lines changed

8 files changed

+27
-6
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
*.py[cod]
22
__pycache__/
33
db.sqlite3
4+
env

Procfile

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
web: gunicorn django_channel_tutorial.wsgi

chat/static/chat/default_group.png

2.48 KB
Loading

chat/templates/chat/room.html

+6-2
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,11 @@
5858
{% for grp in groups_participated %}
5959
<div class="room-sidebar-groups" onclick="redirect('{{grp.get_absolute_url}}')">
6060
<div class="room-sidebar-groups-g-img">
61-
<img src="{{ grp.icon.url }}" alt="Default Profile">
61+
{% if grp.icon %}
62+
<img src="{{ grp.icon.url }}" >
63+
{% else %}
64+
<img src="{% static 'chat/default_group.png' %}" alt="Default Profile">
65+
{% endif %}
6266
</div>
6367
<div class="room-sidebar-groups-g-msg">
6468
<span class="room-sidebar-groups-g-msg1">{{grp.name|title}}</span>
@@ -299,4 +303,4 @@
299303
loadMessage()
300304

301305
</script>
302-
{% endblock content %}
306+
{% endblock content %}

chat/templates/chat/room_message.html

+9-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,14 @@
1+
{% load static %}
12
<div class="room-container__msg">
23
<!-- msg chat header -->
34
<div class="msg-header mat-elevation-z6">
4-
<div class="h-avatar"><img src="{{chatgroup.icon.url}}"></div>
5+
<div class="h-avatar">
6+
{% if chatgroup.icon %}
7+
<img src="{{chatgroup.icon.url}}">
8+
{% else %}
9+
<img src="{% static 'chat/default_group.png' %}" alt="Default Profile">
10+
{% endif %}
11+
</div>
512
<div class="h-users">
613
<div class="h-user-group">{{chatgroup.name|title}}</div>
714
<div class="h-user-member">{{participants}}</div>
@@ -32,4 +39,4 @@
3239
</div>
3340
<!-- msg input -->
3441

35-
</div>
42+
</div>

chat/templates/chat/room_preview_image.html

+9-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,14 @@
1+
{% load static %}
12
<div class="room-container__preview-img" >
23
<!-- msg chat header -->
34
<div class="msg-header mat-elevation-z6">
4-
<div class="h-avatar"><img src="{{chatgroup.icon.url}}"></div>
5+
<div class="h-avatar">
6+
{% if chatgroup.icon %}
7+
<img src="{{chatgroup.icon.url}}">
8+
{% else %}
9+
<img src="{% static 'chat/default_group.png' %}" alt="Default Profile">
10+
{% endif %}
11+
</div>
512
<div class="h-users">
613
<div class="h-user-group">{{chatgroup.name|title}}</div>
714
<div class="h-user-member">{{participants}}</div>
@@ -50,4 +57,4 @@
5057
</div>
5158
</div>
5259

53-
</div>
60+
</div>
File renamed without changes.

runtime.txt

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
python-3.7.12

0 commit comments

Comments
 (0)