Skip to content

Commit

Permalink
chore: update chat links (#7255)
Browse files Browse the repository at this point in the history
  • Loading branch information
thelostone-mc authored Aug 20, 2020
1 parent 808b6d3 commit 9e7ee1b
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 240 deletions.
2 changes: 0 additions & 2 deletions app/app/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -169,8 +169,6 @@
url(r'^api/v0.1/choose_persona/', dashboard.views.choose_persona, name='choose_persona'),

# chat
url(r'^chat/landing', chat.views.chat, name='landing_chat'),
url(r'^chat/landing/', chat.views.chat, name='landing_chat2'),
url(r'^chat/login/', chat.views.chat_login, name='chat_login'),
# Health check endpoint
re_path(r'^health/', include('health_check.urls')),
Expand Down
43 changes: 0 additions & 43 deletions app/assets/v2/css/chat.css

This file was deleted.

7 changes: 0 additions & 7 deletions app/assets/v2/js/pages/chat.js

This file was deleted.

157 changes: 0 additions & 157 deletions app/chat/templates/chat.html

This file was deleted.

26 changes: 1 addition & 25 deletions app/chat/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,28 +67,4 @@ def chat_presence(request):

def chat_login(request):

return TemplateResponse(request, 'chat_login.html')


def chat(request):
"""Render chat landing page response."""

try:
users_online_count = Stat.objects.filter(key='chat_active_users').order_by('pk').first()
users_total_count = Stat.objects.filter(key='chat_total_users').order_by('pk').first()

users_online_count = users_online_count.val if users_online_count is not None else 'N/A'
users_total_count = users_total_count.val if users_total_count is not None else 'N/A'

except Exception as e:
logger.info(str(e))
users_online_count = 'N/A'
users_total_count = 'N/A'
context = {
'users_online': users_online_count,
'users_count': users_total_count,
'title': "Chat",
'cards_desc': f"Gitcoin chat has {users_online_count} users online now!"
}

return TemplateResponse(request, 'chat.html', context)
return TemplateResponse(request, 'chat_login.html')
2 changes: 1 addition & 1 deletion app/dashboard/templates/shared/menu.html
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@
<div class="carousel-item active">
<h5>Chat with the community</h5>
<p>Meet fellow developers, designers, futurists and more. Collaborate and BUIDL awesome projects together.</p>
<a class="btn btn-gc-blue" href="{% url 'landing_chat' %}">
<a class="btn btn-gc-blue" href="https://chat.gitcoin.co/">
{% trans "Go to Chat" %}
</a>
</div>
Expand Down
5 changes: 3 additions & 2 deletions app/economy/management/commands/get_prices.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,22 @@
"""
import json
import logging

from django.conf import settings
from django.core.management.base import BaseCommand
from django.utils import timezone

import ccxt
import cryptocompare as cc
import requests
from dashboard.models import Bounty, Tip
from django.utils import timezone
from economy.models import ConversionRate
from grants.models import Contribution
from kudos.models import KudosTransfer
from perftools.models import JSONStore
from websocket import create_connection
import logging

logger = logging.getLogger(__name__)


Expand Down
6 changes: 3 additions & 3 deletions app/retail/templates/shared/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@
<a class="nav-link" href="{% url "reddit" %}">
<img {{prefix}}src="{% static "v2/images/social/reddit.png" %}" alt="Reddit">
</a>
<a class="nav-link" href="{% url "landing_chat" %}">
<img {{prefix}}src="{% static "v2/images/social/slack.png" %}" alt="Chat">
<a class="nav-link" target="_blank" href="https://chat.gitcoin.co">
<img {{prefix}}src="{% static "v2/images/tribes/landing/chat.svg" %}" alt="Chat">
</a>
<a class="nav-link" href="mailto:[email protected]">
<img {{prefix}}src="{% static "v2/images/social/mail.png" %}" alt="Mail">
Expand All @@ -70,7 +70,7 @@ <h5>{% trans "Business" %}</h5>
<div class="sitenav">
<h5>{% trans "Community" %}</h5>
<a href="https://gitcoin.co/wiki/wiki-code-conduct/">{% trans "Code of Conduct" %}</a>
<a class="slack{% if active == 'slack' %} selected{% endif %}" href="{% url "landing_chat" %}">
<a class="slack{% if active == 'slack' %} selected{% endif %}" target="_blank" href="https://chat.gitcoin.co">
Chat
</a>
<a href="{% url "request_money" %}">{% trans "Request Money" %}</a>
Expand Down

0 comments on commit 9e7ee1b

Please sign in to comment.