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

1588 frontend ribbon app titles branding #2193

Merged
merged 10 commits into from
Nov 8, 2023
Merged

1588 frontend ribbon app titles branding #2193

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
496f3ee
fix: update tool name
adele-usdr Nov 2, 2023
d56d9f2
fix: update to white nav bar with standard logo
adele-usdr Nov 2, 2023
2ed9546
fix: put navbar changes behind profile feature flag
adele-usdr Nov 8, 2023
0b52a14
fix: update tool name
adele-usdr Nov 2, 2023
a1b56c3
fix: update to white nav bar with standard logo
adele-usdr Nov 2, 2023
0f6d897
fix: put navbar changes behind profile feature flag
adele-usdr Nov 8, 2023
ce52679
Merge branch '1588-frontend-ribbon-app-titles-branding' of https://gi…
adele-usdr Nov 8, 2023
58f419e
fix: put the Login tool name change behind the profile feature flag too
adele-usdr Nov 8, 2023
f20959b
fix: remove text changes
adele-usdr Nov 8, 2023
5b4adcf
Merge branch '_staging' into 1588-frontend-ribbon-app-titles-branding
as1729 Nov 8, 2023
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
19 changes: 13 additions & 6 deletions packages/client/src/components/Layout.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
<template>
<div>
<b-navbar type="dark" variant="dark">
<b-navbar :type="navBarType" :variant="navBarVariant">
<b-navbar-brand href="/#/grants" class="d-flex align-items-center">
<b-img :src="require('../assets/usdr_logo_white_wide.svg')" style="height: 1.625rem;" class="" alt="United States Digital Response logo in white" />
<b-img v-if="myProfileEnabled" :src="require('../assets/usdr_logo_standard_wide.svg')" style="height: 1.625rem;" class="" alt="United States Digital Response logo" />
<b-img v-else :src="require('../assets/usdr_logo_white_wide.svg')" style="height: 1.625rem;" class="" alt="United States Digital Response logo in white" />
<h3 class="ml-3 mb-0">Grants Identification Tool</h3>
</b-navbar-brand>
<!-- <b-navbar-brand href="/#/grants">
Grants Identification Tool</b-navbar-brand> -->

<b-collapse id="nav-collapse" is-nav>

<!-- Right aligned nav items -->
Expand Down Expand Up @@ -57,7 +55,7 @@

<script>
import { mapGetters } from 'vuex';
import { useNewGrantsTable } from '@/helpers/featureFlags';
import { myProfileEnabled, useNewGrantsTable } from '@/helpers/featureFlags';
import ProfileSettingsModal from '@/components/Modals/ProfileSettings.vue';
import AlertBox from '../arpa_reporter/components/AlertBox.vue';

Expand All @@ -84,12 +82,21 @@ export default {
canSeeTenantsTab() {
return this.loggedInUser && this.loggedInUser.isUSDRSuperAdmin;
},
myProfileEnabled() {
return myProfileEnabled();
},
useNewGrantsTable() {
return useNewGrantsTable();
},
showTabs() {
return !(this.$route.meta.hideLayoutTabs === true);
},
navBarType() {
return myProfileEnabled() ? 'light' : 'dark';
},
navBarVariant() {
return myProfileEnabled() ? 'white' : 'dark';
},
},
methods: {
logout(e) {
Expand Down
Loading