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

nav bar #165

Merged
merged 2 commits into from
Feb 24, 2025
Merged

nav bar #165

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
6cb2bfa
nav bar
falezekiel Feb 22, 2025
877ca72
nav bar
falezekiel Feb 22, 2025
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 added resources/assets/img/landing_page/ifrc-logo.png
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.
40 changes: 29 additions & 11 deletions resources/assets/js/components/Navbar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
<header class="bg-white header pt-2 pb-2">
<b-navbar toggleable="lg" sticky class="navbar styled-navbar navbar-expand-lg navbar-light">
<router-link :to="{ name: 'welcome' }" class="header__logo has-no-underline navbar-brand d-inline-flex mr-auto">
<img class="site-footer__logo d-block" :src="src('headerLogo')" :srcSet="srcSet('headerLogo')">

<img class="site-footer__logo d-block ml-4" :src="src('ifrcLogo')">
<h1 class="visually-hidden">
{{ $t('what_now') }} {{ $t('message_portal') }}
</h1>
Expand All @@ -12,40 +11,46 @@
<b-navbar-toggle target="nav-collapse"></b-navbar-toggle>

<b-collapse id="nav-collapse" is-nav>
<b-navbar-nav class="mt-2 mt-lg-0 header-main-links rtl-mr-auto" v-bind:class="{'ml-auto': !user, 'mr-auto': user, 'is-logged-in': user}">
<b-navbar-nav class="mt-2 mt-lg-0 header-main-links rtl-mr-auto" v-bind:class="{'ml-auto': true, 'is-logged-in': user}">
<li>
<LocaleDropdown />
</li>
<div class="div-bar"></div>
<li v-if="user && cannot(user, permissions.VIEW_BACKEND)" class="nav-item">
<router-link :to="{ name: 'applications.dash', params: { } }" class="nav-link text-uppercase">
{{ $t('my_apps') }}
<router-link :to="{ name: 'applications.dash', params: { } }" class="nav-link">
{{ $t('create_key') }}
</router-link>
</li>
<div v-if="user && cannot(user, permissions.VIEW_BACKEND)" class="div-bar"></div>
<li v-if="user" class="nav-item right-aligned">
<router-link :to="{ name: 'view-whatnow' }" class="nav-link text-uppercase">
<router-link :to="{ name: 'view-whatnow' }" class="nav-link">
{{ $t('whatnow_content') }}
</router-link>
</li>
<div v-if="user" class="div-bar"></div>
<li v-if="user && can(user, permissions.VIEW_BACKEND)" class="nav-item">
<router-link :to="{ name: 'home' }" class="nav-link text-uppercase">
<router-link :to="{ name: 'home' }" class="nav-link">
{{ $t('dashboard') }}
</router-link>
</li>
<li v-if="!user" class="nav-item">
<router-link :to="{ name: 'register' }" class="nav-link text-uppercase">
<router-link :to="{ name: 'register' }" class="nav-link">
{{ $t('sign_up') }}
</router-link>
</li>
<div v-if="!user" class="div-bar"></div>
<li v-if="!user" class="nav-item">
<router-link :to="{ name: 'login' }" class="nav-link text-uppercase">
<router-link :to="{ name: 'login' }" class="nav-link">
{{ $t('login') }}
</router-link>
</li>

<LocaleDropdown />

<li class="nav-item d-lg-none" v-if="user">
<router-link :to="{ name: 'settings.profile', params: { id: user.data.id, profile: true } }" class="nav-link text-uppercase">
{{ $t('common.my_profile') }}
</router-link>
</li>
<div v-if="user" class="div-bar"></div>
<li class="nav-item d-lg-none" v-if="user">
<a href="#" @click.prevent="logout" class="nav-link text-uppercase">
{{ $t('logout') }}
Expand Down Expand Up @@ -136,5 +141,18 @@ export default {

.header-main-links {
display: flex;
align-items: center;
}

.div-bar {
padding: 0;
margin: 0;
height: 1.5rem;
width: 2px;
background: #BDBEC0;
}

.nav-icon {
font-size: 1.5rem;
}
</style>
3 changes: 3 additions & 0 deletions resources/assets/js/methods/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ const icons = {
x2: require('../../img/landing_page/[email protected]'),
x3: require('../../img/landing_page/[email protected]')
},
'ifrcLogo': {
x1: require('../../img/landing_page/ifrc-logo.png')
},
'logoLarge': {
x1: require('../../img/logo-large.png'),
x2: require('../../img/[email protected]'),
Expand Down
5 changes: 2 additions & 3 deletions resources/assets/sass/components/_header.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,11 @@
}

a.nav-link {
color: $light-text;
color: $black;
border-bottom: 2px solid transparent;
transition: border-color 0.3s ease-in-out;
font-size:em(16);
font-weight: 600;
font-weight: 400;
letter-spacing: 0.8px;
margin:0 0.75rem;

Expand All @@ -71,7 +71,6 @@
}

&.dropdown-toggle {
border-bottom: 2px solid black;
font-size: 10px;
letter-spacing: 0.7px;
color: #000000;
Expand Down
Loading