Skip to content

Improve the navigation experience #357

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

Open
leoj3n wants to merge 2 commits into
base: staging
Choose a base branch
from
Open

Improve the navigation experience #357

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
91e226a
Improve the navigation experience
leoj3n Jul 9, 2018
f15814d
Add route-helpers to page-home
leoj3n Jul 10, 2018
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
12 changes: 6 additions & 6 deletions public/components/main-nav/main-nav.stache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,26 +11,26 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a href="{{ routeUrl }}" class="navbar-brand">
<a href="{{# if(session) }}{{ routeUrl(page='dashboard') }}{{ else }}{{ routeUrl(page='home') }}{{/ if }}" class="navbar-brand">
<img src="/img/bitcentive-logo-brand.png" alt="" class="logo">
</a>
</div>

<div id="navbar" class="navbar-collapse collapse in" aria-expanded="true">
<ul class="nav navbar-nav">
{{# if(session) }}
<li {{# routeCurrent(page="dashboard") }}class="active"{{/ routeCurrent }}><a href="{{ routeUrl page='dashboard' }}" class="">Dashboard</a></li>
<li {{# routeCurrent(page='dashboard') }}class="active"{{/ routeCurrent }}><a href="{{ routeUrl(page='dashboard') }}" class="">Dashboard</a></li>
{{# if(isAdmin()) }}
<li {{# routeCurrent(page="contributors") }}class="active"{{/ routeCurrent }}><a href="{{ routeUrl page="contributors" }}">Contributors</a></li>
<li {{# routeCurrent(page="users") }}class="active"{{/ routeCurrent }}><a href="{{ routeUrl page="users" }}">Users</a></li>
<li {{# routeCurrent(page='contributors') }}class="active"{{/ routeCurrent }}><a href="{{ routeUrl(page='contributors') }}">Contributors</a></li>
<li {{# routeCurrent(page='users') }}class="active"{{/ routeCurrent }}><a href="{{ routeUrl(page='users') }}">Users</a></li>
{{/ if }}
{{ else }}
<li {{# routeCurrent(page="home") }}class="active"{{/ routeCurrent }}><a href="{{ routeUrl }}">Home Page</a></li>
<li {{# routeCurrent(page='home') }}class="active"{{/ routeCurrent }}><a href="{{ routeUrl(page='home') }}">Home Page</a></li>
{{/ if }}
</ul>
<ul class="nav navbar-nav navbar-right">
{{# if(session) }}
<li><a href="javascript://" on:click="session.destroy()">Logout</a></li>
<li><a href="{{ routeUrl(page='home') }}" on:click="session.destroy()">Logout</a></li>
{{/ if }}
</ul>
</div><!--/.nav-collapse -->
Expand Down
2 changes: 1 addition & 1 deletion public/components/page-home/page-home.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ page-home {
justify-content: center;
align-items: center;
}
a:hover {
a:hover, a:visited, a:link, a:active {
text-decoration: none;
}
span {
Expand Down
3 changes: 2 additions & 1 deletion public/components/page-home/page-home.stache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<can-import from="can-stache-route-helpers" />
<can-import from="./page-home.less" />

<div class="auth">
Expand All @@ -9,7 +10,7 @@

<ul class="sso-providers one">
<li class="sso-github one" title="Login with GitHub">
<a href="javascript://" on:click="openLoginPopup('/auth/github')">
<a href="{{ routeUrl(page='dashboard') }}" on:click="openLoginPopup('/auth/github')">
<img src="/img/github.svg" alt="GitHub logo">
<span>Login with GitHub</span>
</a>
Expand Down