Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/deploy fixes #5757

Merged
merged 5 commits into from
Jan 9, 2020
Merged

Fix/deploy fixes #5757

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9ec277f
fix linking
octavioamu Jan 9, 2020
04672ec
change link into network
octavioamu Jan 9, 2020
c31e152
fix hackathon list link
octavioamu Jan 9, 2020
cac03cd
remove discord from texts
octavioamu Jan 9, 2020
361d251
undo change
octavioamu Jan 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions app/app/urls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,9 +143,9 @@
url(r'^api/v0.1/choose_persona/', dashboard.views.choose_persona, name='choose_persona'),

# chat
url(r'^chat/web', chat.views.embed, name='web_chat'),
url(r'^chat/web/', chat.views.embed, name='web_chat2'),
re_path(r'^chat/?', chat.views.chat, name='chat'),
url(r'^chat/landing', chat.views.chat, name='landing_chat'),
url(r'^chat/landing/', chat.views.chat, name='landing_chat2'),
re_path(r'^chat/?', chat.views.embed, name='chat'),
# Health check endpoint
re_path(r'^health/', include('health_check.urls')),
re_path(r'^lbcheck/?', healthcheck.views.lbcheck, name='lbcheck'),
Expand Down
Binary file modified app/assets/v2/images/how-it-works/hackathon/pic2.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion app/chat/templates/chat.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ <h2 class="mt-4 sub-headline">
{% endblocktrans %}
</h2>
<div class="buttons mt-5">
<a class="btn btn-sm btn-gc-blue mr-2 shadow-none font-weight-bold py-3 px-5" href="/chat/web">{% trans "Open Web Chat" %}</a>
<a class="btn btn-sm btn-gc-blue mr-2 shadow-none font-weight-bold py-3 px-5" href="{% url "chat" %}">{% trans "Open Web Chat" %}</a>
<a class="btn btn-sm text-white ml-2 shadow-none font-weight-bold py-3 px-5 d-none" href="#joinus">{% trans "Download Apps" %}</a>
</div>
<div class="online mt-4">
Expand Down
2 changes: 1 addition & 1 deletion app/dashboard/templates/addinterest.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ <h5 class="font-subheader">{% trans "Non-Disclosure Agreement" %}</h5>
{% trans "Discord Username" %}
</label>
<input type="text" id="discord_username" name="discord_username" class="form__input font-body" placeholder="vivek#9746" value="{{gitcoin_discord_username}}" required/>
<span class="font-caption"><a target="_blank" href="https://discord.gg/TxRKTn8">Join Discord</a> to get updates from our sponsors prizes and find help</span>
<span class="font-caption"><a target="_blank" href="https://chat.gitcoin.co/hackathons">Join Chat</a> to get updates from our sponsors prizes and find help</span>
</div>
</div>
{% endif %}
Expand Down
4 changes: 2 additions & 2 deletions app/dashboard/templates/dashboard/hackathon/onboard.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,10 +140,10 @@ <h4 class="text-uppercase font-weight-bolder text-left">How does the Hackathon w
<img src="{% static "v2/images/how-it-works/hackathon/pic2.jpg" %}" class="mw-100" alt="express interest" />
</div>
<div class="col-12 col-md-6 d-flex flex-column justify-content-center pt-4 pt-md-0">
<b class="counter">{% trans "Join Discord" %}</b>
<b class="counter">{% trans " Join the Hackathons Chat Workspace" %}</b>
{% blocktrans %}
<p class="">
Chat with other hackers, ask sponsors and the Gitcoin team questions, find or create a team, and communicate real-time on the <a target="_blank" href="https://discord.gg/TxRKTn8">Gitcoin Events Discord</a>.
Chat with other hackers, ask sponsors and the Gitcoin team questions, find or create a team, and communicate real-time. <a target="_blank" href="https://chat.gitcoin.co/hackathons">Click here to join the party!</a>.
</p>
{% endblocktrans %}
</div>
Expand Down
4 changes: 2 additions & 2 deletions app/dashboard/templates/shared/chat_nav.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div id="gc-chat" class="nav-item order-md-last">
<a href="/chat/" class="chat_icon nav-link" role="button">
<div id="gc-chat" class="position-relative">
<a href="{% url 'landing_chat' %}" class="chat_icon nav-link" role="button">
<i class="fas fa-comments fa-fw"></i>
<span id="chat-notification-dot" class="notification__dot"></span>
</a>
Expand Down
4 changes: 4 additions & 0 deletions app/retail/templates/home/nav.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
<span class="navbar-toggler-icon"></span>
</button>
{% if user.is_authenticated %}
{% include 'shared/chat_nav.html' %}
{% include 'shared/notifications.html' %}
{% endif %}
</div>
Expand Down Expand Up @@ -86,6 +87,9 @@
<a class="dropdown-item" href="{% url "activity" %}">
{% trans "Activity Feed" %}
</a>
<a class="dropdown-item" href="{% url "landing_chat" %}">
{% trans "Chat" %}
</a>
</div>
</div>

Expand Down
4 changes: 2 additions & 2 deletions app/retail/templates/shared/top_nav.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@

<div class="top-nav g-font-muli {{class}}">
<a class="link d-md-block d-none" href="{% url 'products' %}">Grow Open Source</a>
<a class="{% if request.path|matches:'^\/((hackathons.*))$' %}selected{% endif %}" href="https://hackathons.gitcoin.co">
<a class="{% if request.path|matches:'^\/((hackathon.*))$' %}selected{% endif %}" href="{% url 'get_hackathons' %}">
<img src="{% static "v2/images/top-bar/hackathons-logo.svg" %}" height="23" width="125" alt="" class="d-md-block d-none" style="margin-top: 0px; margin-left: -10px;">
<img src="{% static "v2/images/top-bar/hackathons-symbol.svg" %}" height="22" alt="" class="d-md-none" style="height: 55px; width: 55px; margin-top: -7px; margin-left: -15px;">
</a>
<a class="{% if request.path == '/' %}selected{% endif %}" href="{% url 'funder_bounties' %}">
<a class="{% if request.path == '/' %}selected{% endif %}" href="">
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hmmmm the main landing page isnt the bounties landing page.. its the main gitcoin site lander. did you mean to do this?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good catch that was a mistake didn't mean to change nothing in that line

<img src="{% static "v2/images/top-bar/bounties_desktop.svg" %}" height="22" alt="" class="d-md-block d-none" style="margin-bottom: 5px;">
<img src="{% static "v2/images/top-bar/bounties_mobile.svg" %}" height="22" alt="" class="d-md-none">
</a>
Expand Down