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

change nav and add tribes dropdown #6579

Merged
merged 2 commits into from
May 5, 2020
Merged

change nav and add tribes dropdown #6579

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
80f37ba
change nav and add tribes dropdown
octavioamu May 5, 2020
45f95dc
fix link size
octavioamu May 5, 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
Binary file removed app/assets/v2/images/chat/android.png
View file
Open in desktop
Binary file not shown.
Binary file removed app/assets/v2/images/chat/apple.png
View file
Open in desktop
Binary file not shown.
Binary file removed app/assets/v2/images/chat/windows.png
View file
Open in desktop
Binary file not shown.
38 changes: 21 additions & 17 deletions app/chat/templates/chat.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,38 +103,42 @@ <h2 class="font-title-xl font-weight-bold mt-4" id=joinus>
Available on all platforms. Chat anytime, anywhere!
</p>
{% endblocktrans %}
<div class="row mt-5 py-5">
<div class="col-12 col-md-12 col-lg-4">
<img class="text-center px-3 w-75 h-75" src="{% static "v2/images/chat/web.png" %}" alt="Web App" />
<div class="row py-5">
<div class="col-12 col-md-12 col-lg-4 mt-5">
<img class="text-center px-3 h-75" src="{% static "v2/images/chat/web.png" %}" alt="Web App" />
<div class="my-3">
<a class="btn btn-gc-blue btn-sm ml-2 shadow-none font-weight-bold py-3 px-4" href="/chat/web">{% trans "Open Web Chat" %}</a>
<a class="btn btn-gc-blue btn-sm ml-2 font-weight-bold py-3 px-4" target="_blank" href="https://chat.gitcoin.co/">
<i class="fab fa-chrome"></i>
{% trans "Open Web Chat" %}
</a>
</div>
</div>
<div class="col-12 col-md-12 col-lg-4">
<img class="text-center px-3 w-75 h-75" src="{% static "v2/images/chat/mobile.png" %}" alt="Mobile App" />
<div class="col-12 col-md-12 col-lg-4 mt-5">
<img class="text-center px-3 h-75" src="{% static "v2/images/chat/mobile.png" %}" alt="Mobile App" />
<div class="my-3">
<a class="btn btn-gc-blue btn-sm ml-2 shadow-none font-weight-bold py-3 px-4 comingsoon" href="#">
<img src="{% static "v2/images/chat/android.png" %}" alt="Android App" />
<a class="btn btn-gc-blue btn-sm ml-2 font-weight-bold py-3 px-4 comingsoon" href="#">
<i class="fab fa-android"></i>
{% trans "Android App" %}
</a>
<a class="btn btn-gc-blue btn-sm ml-2 shadow-none font-weight-bold py-3 px-5 comingsoon" href="#">
<img src="{% static "v2/images/chat/apple.png" %}" alt="iOS App" />
<a class="btn btn-gc-blue btn-sm ml-2 font-weight-bold py-3 px-4 comingsoon" href="#">
<i class="fab fa-apple"></i>
{% trans "iOS" %}
</a>
</div>
</div>
<div class="col-12 col-md-12 col-lg-4">
<img class="text-center px-3 w-75 h-75" src="{% static "v2/images/chat/desktop.png" %}" alt="Desktop App" />
<div class="col-12 col-md-12 col-lg-4 mt-5">
<img class="text-center px-3 h-75" src="{% static "v2/images/chat/desktop.png" %}" alt="Desktop App" />
<div class="my-3">
<a class="btn btn-gc-blue btn-sm ml-2 shadow-none font-weight-bold py-3 px-5" href="https://gitcoin-static.s3-us-west-2.amazonaws.com/desktopapps/gitcoin-darwin-x64.zip">
<img src="{% static "v2/images/chat/apple.png" %}" alt="Mac App" />
<a class="btn btn-gc-blue btn-sm ml-2 font-weight-bold py-3 px-4" href="https://gitcoin-static.s3-us-west-2.amazonaws.com/desktopapps/gitcoin-darwin-x64.zip">
<i class="fab fa-apple"></i>
{% trans "Mac" %}
</a>
<a class="btn btn-gc-blue btn-sm ml-2 shadow-none font-weight-bold py-3 px-4" href="https://gitcoin-static.s3-us-west-2.amazonaws.com/desktopapps/gitcoin-windows.zip">
<img src="{% static "v2/images/chat/windows.png" %}" alt="Windows" />
<a class="btn btn-gc-blue btn-sm ml-2 font-weight-bold py-3 px-4" href="https://gitcoin-static.s3-us-west-2.amazonaws.com/desktopapps/gitcoin-windows.zip">
<i class="fab fa-windows"></i>
{% trans "Windows" %}
</a>
<a class="btn btn-gc-blue btn-sm ml-2 shadow-none font-weight-bold py-3 px-5" href="https://gitcoin-static.s3-us-west-2.amazonaws.com/desktopapps/gitcoin-linux-x64.zip">
<a class="btn btn-gc-blue btn-sm ml-2 font-weight-bold py-3 px-4" href="https://gitcoin-static.s3-us-west-2.amazonaws.com/desktopapps/gitcoin-linux-x64.zip">
<i class="fab fa-linux"></i>
{% trans "Linux" %}
</a>
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/dashboard/templates/dashboard/users.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
{% include 'home/nav.html' %}
</div>
<div id="gc-users-directory" v-cloak>
<div class="container-fluid">
<div class="">
<nav class="search-section p-5 text-center">
<img v-if="showBanner" class="mb-5" :src="[[showBanner]]" />
<div class="d-flex flex-grow-1" id="usersFilters">
Expand Down
8 changes: 6 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,6 +1,10 @@
<div id="gc-chat" class="position-relative">
<a href="{% url 'chat' %}" class="chat_icon nav-link" role="button">
<div id="gc-chat" class="dropdown">
<a href="" class="chat_icon dropdown-toggle-no-caret nav-link" href="#" id="chatNavbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<i class="fas fa-comments fa-fw"></i>
<span id="chat-notification-dot" class="notification__dot"></span>
</a>
<div class="dropdown-menu dropdown-menu-right dropdo" aria-labelledby="chatNavbarDropdown">
<a class="dropdown-item" href="{% url 'chat' %}">Web Chat</a>
<a class="dropdown-item" href="{% url 'landing_chat' %}">Desktop & Mobile Apps</a>
</div>
</div>
44 changes: 13 additions & 31 deletions app/dashboard/templates/shared/menu.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,6 @@

<a class="nav-link {% if is_townsquare %} selected {% endif %} interior" href="/townsquare">{% trans "Town Square" %}</a>

<li class="nav-item dropdown">
<a class="nav-link {% if '/chat' in request.path %}selected{% endif %} dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Chat
</a>
<div class="dropdown-menu" aria-labelledby="navbarDropdown">
<a class="dropdown-item" href="/chat">Web Chat</a>
<a class="dropdown-item" href="/chat/landing">Desktop & Mobile Apps</a>
</div>
</li>

<div class="nav-item dropdown interior gc-megamenu-fw">
<a class="nav-link dropdown-toggle" href="#" id="dropdownProducts" role="button"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Expand Down Expand Up @@ -171,15 +161,15 @@
<div class="nav-item dropdown interior gc-megamenu-fw">
<a class="nav-link dropdown-toggle" href="#" id="dropdownCommunity" role="button"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
{% trans "Community" %}
{% trans "Tribes" %}
</a>
<div class="dropdown-menu shadow-lg" id="" aria-labelledby="dropdownCommunity">
<div class="gc-megamenu-content">
<div class="row">
<ul class="col-md-3 col-lg-2 list-unstyled offset-lg-2">
<li>
<a class="dropdown-item" href="{% url "landing_chat" %}">
{% trans "Chat" %}
{% trans "Browse Tribes" %}
</a>
</li>
<li>
Expand All @@ -188,30 +178,26 @@
</a>
</li>
<li>
<a class="dropdown-item" href="{% url "verified" %}">
{% trans "Verify Profile" %}
<a class="dropdown-item" href="{% url "users_directory" %}">
{% trans "Users Directory" %}
</a>
</li>
<li><a href="{% url 'tribes' %}" class="font-smaller-2 pl-4">Interested in Your Own Tribe?</a></li>
</ul>
<ul class="col-md-3 col-lg-2 list-unstyled">
<li>
<a class="dropdown-item" href="https://gitcoin.co/wiki/wiki-code-conduct/">
{% trans "Code of Conduct" %}
</a>
</li>
<li>
<a class="dropdown-item" href="{% url "activity" %}">
{% trans "Activity Feed" %}
</a>
</li>
<li>
<a class="dropdown-item" href="{% url "users_directory" %}">
{% trans "Users Explorer" %}
<a class="dropdown-item" href="{% url "verified" %}">
{% trans "Verify Profile" %}
</a>
</li>
<li>
<a class="dropdown-item" href="{% url "users_directory" %}?persona=tribe">
{% trans "Tribes" %}
<a class="dropdown-item" href="https://gitcoin.co/wiki/wiki-code-conduct/">
{% trans "Code of Conduct" %}
</a>
</li>
</ul>
Expand All @@ -226,8 +212,8 @@ <h5>Chat with the community</h5>
</a>
</div>
<div class="carousel-item">
<h5>Find your Tribe</h5>
<p>Follow the orgs you like more with <a href="{% url 'tribes' %}">tribes</a> and build relationships and meaningful projects.</p>
<h5>Find a Tribe</h5>
<p>Discover great web3 organizations, work on meaningful projects and build relationships with like minded people. <a href="{% url 'users_directory' %}?persona=tribe">Browse Tribes</a></p>
<a class="btn btn-gc-blue" href="{% url 'users_directory' %}?persona=tribe">
{% trans "Find a Tribe" %}
</a>
Expand All @@ -246,7 +232,7 @@ <h5>Weekly leaderboard</h5>
</div>
</div>
</div>

{% if not user.is_authenticated %}
<div class="nav-item dropdown interior gc-megamenu-fw">
<a class="nav-link dropdown-toggle" href="#" id="dropdownCompany" role="button"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Expand Down Expand Up @@ -282,11 +268,6 @@ <h5>Weekly leaderboard</h5>
{% trans "Wiki" %}
</a>
</li>
<li>
<a class="dropdown-item" href="/wiki">
{% trans "Help" %}
</a>
</li>
</ul>

<ul class="col-md-3 col-lg-2 list-unstyled">
Expand Down Expand Up @@ -328,6 +309,7 @@ <h5>Weekly leaderboard</h5>
</div>
</div>
</div>
{% endif %}
</nav>
<nav class="navbar-nav mr-3">
{% include 'shared/nav_auth.html' with source='authed' %}
Expand Down
4 changes: 4 additions & 0 deletions app/dashboard/templates/shared/nav_auth.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,10 @@
<i class="fas fa-user"></i>
{% trans "My Profile" %}
</a>
<a class="dropdown-item" href="/wiki">
<i class="fas fa-question-circle"></i>
{% trans "Wiki" %}
</a>
{% else %}
<a class="dropdown-item" data-gtm="get started" href="{% url "get_gitcoin" %}">
<i class="fas fa-bolt"></i>
Expand Down