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

Feature/wn 138 #162

Merged
merged 2 commits into from
Feb 22, 2025
+80 −39
Merged

Feature/wn 138 #162

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
8bc351a
footer
falezekiel Feb 22, 2025
1531915
Merge branch 'develop' into feature/WN-138
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
102 changes: 65 additions & 37 deletions resources/assets/js/components/App.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,43 +7,51 @@
<component v-if="layout" :is="layout"></component>
</transition>

<footer v-if="layout" class="site-footer bg-white container-fluid pt-5 pb-5">
<div class="container">
<b-row align-h="between">
<b-col>
<div class="mb-3">
<img class="site-footer__logo" :src="src('footerImage')" :srcSet="srcSet('footerImage')" :alt="$t('landing.footer.gdpc_logo')" />
<img class="site-footer__logo" src="../../img/landing_page/footer-logo-ifrc.svg" :alt="$t('landing.footer.ifrc_logo')" />
</div>

<ul class="list-unstyled">
<li>
<router-link :to="{ name: 'terms-service' }">
{{ $t('terms_service') }}
</router-link>
</li>
<li>
<b-link href="https://www.preparecenter.org/content/privacy-policy" target="_blank" rel="noreferrer noopener" @click="$fireGTEvent($gtagEvents.PrivacyLink)">{{ $t('landing.footer.privacy') }}</b-link>
</li>
</ul>
</b-col>

<b-col class="text-right">
<ul class="list-unstyled d-flex flex-wrap justify-content-around">
<li>
<router-link class="site-footer__heading u-text-normal m-1" :to="{name: 'get_started'}">{{ $t('landing.footer.getting_started') }}</router-link>
</li>
<li>
<router-link class="site-footer__heading u-text-normal m-1" :to="{name: 'docs'}">{{ $t('landing.footer.docs') }}</router-link>
</li>
<li>
<a class="site-footer__heading u-text-normal m-1" href="https://docs.google.com/forms/d/1ZgPYoInWaKbMrbhKBb2daPAbxXPq1NrHVNy7O3MAceU/" target="_blank" rel="noreferrer nofollow" @click="$fireGTEvent($gtagEvents.FeedbackLink)">
{{ $t('landing.footer.give_feedback') }}
</a>
</li>
</ul>
</b-col>
</b-row>
<footer v-if="layout" class="site-footer">
<div class="new-footer">
<div>
<h2>
{{ $t('landing.footer.subtitle_1') }}
</h2>
<p>
{{ $t('landing.footer.text_1') }}
</p>
<p>
{{ $t('landing.footer.text_2') }}
</p>
<p>
{{ $t('landing.footer.text_3') }}
</p>
</div>
<div>
<h2>
{{ $t('landing.footer.subtitle_2') }}
</h2>
<b-link :href="`mailto:${$t('landing.footer.email_ifrc')}?Subject=GDPC%20Admin%20Portal`">
{{ $t('landing.footer.email_ifrc') }}
</b-link>
<br>
<a class="footer-link" href="https://ifrc.org" target="_blank" rel="noopener noreferrer">
{{ $t('landing.footer.web_ifrc') }}
</a>
</div>
<div>
<h2>
{{ $t('landing.footer.subtitle_3') }}
</h2>
<router-link class="footer-link" :to="{ name: 'terms-service' }">
{{ $t('landing.footer.terms') }}
</router-link>
</div>
<div>
<h2>
{{ $t('landing.footer.subtitle_4') }}
</h2>
<router-link class="mb-2" :to="{name: 'docs'}">{{ $t('landing.footer.api_doc') }}</router-link>
<p>
{{ $t('landing.footer.faq') }}
</p>
</div>
</div>
</footer>
</div>
Expand Down Expand Up @@ -132,4 +140,24 @@ export default {

<style>
@import 'vue-select/dist/vue-select.css';

.new-footer {
width: 100%;
background: #323232;
padding-top: 2rem;
color: white;
display: flex;
justify-content: space-around;
h2 {
font-size: 1.5rem;
margin-bottom: 2rem;
}
p {
font-size: 1rem;
line-height: 1;
}
a {
font-size: 1rem;
}
}
</style>
3 changes: 2 additions & 1 deletion resources/assets/sass/components/_footer.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
}

a {
color: $black;
color: white;
text-decoration: none;
}


Expand Down
14 changes: 13 additions & 1 deletion resources/lang/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -715,7 +715,19 @@
"docs": "Documentation",
"give_feedback": "Give Feedback",
"gdpc_logo": "Logo for the Global Disaster Preparedness Center",
"ifrc_logo": "Logo for the International Red Cross and Red Crescent Movement"
"ifrc_logo": "Logo for the International Red Cross and Red Crescent Movement",
"subtitle_1": "About IFRC Key Safety Database",
"text_1": "The IFRC Key Safety Database provides access to",
"text_2": "Red Cross Red Crescent messages on how people",
"text_3": "can safely act in the face of hazards",
"subtitle_2": "Find Out More",
"email_ifrc": "[email protected]",
"web_ifrc": "ifrc.org",
"subtitle_3": "Policies",
"terms": "Terms and Conditions",
"subtitle_4": "Helpful Links",
"api_doc": "API Documentation",
"faq": "FAQ (link to be provided)"
}
},
"register_form": {
Expand Down
Loading