Skip to content

Commit

Permalink
Merge branch '27-adjust_footer' into 'main'
Browse files Browse the repository at this point in the history 
Resolve "Volgorde footer wijzigen"

Closes MinBZK#27

See merge request ictu/devops/algoritmeregister/algoritmeregister!9
  • Loading branch information
@tcrapts-ictu
tcrapts-ictu committed Dec 6, 2022
2 parents a79102f + f9f1dc6 commit 61f1b47
Show file tree
Hide file tree
Showing 7 changed files with 153 additions and 147 deletions.
3 changes: 2 additions & 1 deletion deployment/helm/algreg-frontend/templates/service.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@ spec:
ports:
- port: {{ .Values.fePort }}
targetPort: {{ .Values.fePort }}
protocol: TCP
protocol: TCP
name: 'http-port'
76 changes: 38 additions & 38 deletions frontend/assets/styles/_koop_main.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1448,9 +1448,9 @@ button.subselection__trigger.is-filled:hover {
.link--logout {
background-image: url(@/assets/images/icons/icon-logout.svg);
}
.icon--fullscreen {
// .icon--fullscreen {
// background-image: url(../images/kpm/FullScreen.svg);
}
// }
.icon--shareBlue,
.link--share {
background-image: url(@/assets/images/icons/icon-share-blue.svg);
Expand Down Expand Up @@ -1562,9 +1562,9 @@ button.subselection__trigger.is-filled:hover {
.icon-bg--logout {
background-image: url(@/assets/images/icons/icon-logout.svg) !important;
}
.icon-bg--fullscreen {
// .icon-bg--fullscreen {
// background-image: url(../images/kpm/FullScreen.svg) !important;
}
// }
.icon-bg--shareBlue {
background-image: url(@/assets/images/icons/icon-share-blue.svg) !important;
}
Expand Down Expand Up @@ -6255,121 +6255,121 @@ img {
background-color: rgba(74, 30, 234, 0.1);
color: #4a1eea;
}
.themeblock__link--governance::before {
// .themeblock__link--governance::before {
// background-image: url(../images/theme-icons/governance.svg);
}
// }
.themeblock__link--culture:hover {
background-color: rgba(66, 20, 95, 0.1);
color: #42145f;
}
.themeblock__link--culture::before {
// .themeblock__link--culture::before {
// background-image: url(../images/theme-icons/culture.svg);
}
// }
.themeblock__link--economy:hover {
background-color: rgba(169, 0, 97, 0.1);
color: #a90061;
}
.themeblock__link--economy::before {
// .themeblock__link--economy::before {
// background-image: url(../images/theme-icons/economy.svg);
}
// }
.themeblock__link--finance:hover {
background-color: rgba(213, 43, 30, 0.1);
color: #d52b1e;
}
.themeblock__link--finance::before {
// .themeblock__link--finance::before {
// background-image: url(../images/theme-icons/finance.svg);
}
// }
.themeblock__link--housing:hover {
background-color: rgba(148, 113, 10, 0.1);
color: #94710a;
}
.themeblock__link--housing::before {
// .themeblock__link--housing::before {
// background-image: url(../images/theme-icons/housing.svg);
}
// }
.themeblock__link--international:hover {
background-color: rgba(119, 124, 0, 0.1);
color: #777c00;
}
.themeblock__link--international::before {
// .themeblock__link--international::before {
// background-image: url(../images/theme-icons/international.svg);
}
// }
.themeblock__link--agriculture:hover {
background-color: rgba(191, 54, 12, 0.1);
color: #bf360c;
}
.themeblock__link--agriculture::before {
// .themeblock__link--agriculture::before {
// background-image: url(../images/theme-icons/agriculture.svg);
}
// }
.themeblock__link--migration:hover {
background-color: rgba(103, 51, 39, 0.1);
color: #673327;
}
.themeblock__link--migration::before {
// .themeblock__link--migration::before {
// background-image: url(../images/theme-icons/migration.svg);
}
// }
.themeblock__link--nature:hover {
background-color: rgba(57, 135, 12, 0.1);
color: #39870c;
}
.themeblock__link--nature::before {
// .themeblock__link--nature::before {
// background-image: url(../images/theme-icons/nature.svg);
}
// }
.themeblock__link--education:hover {
background-color: rgba(66, 20, 95, 0.1);
color: #42145f;
}
.themeblock__link--education::before {
// .themeblock__link--education::before {
// background-image: url(../images/theme-icons/education.svg);
}
// }
.themeblock__link--security:hover {
background-color: rgba(39, 89, 55, 0.1);
color: #275937;
}
.themeblock__link--security::before {
// .themeblock__link--security::before {
// background-image: url(../images/theme-icons/security.svg);
}
// }
.themeblock__link--law:hover {
background-color: rgba(202, 0, 93, 0.1);
color: #ca005d;
}
.themeblock__link--law::before {
// .themeblock__link--law::before {
// background-image: url(../images/theme-icons/law.svg);
}
// }
.themeblock__link--infrastructure:hover {
background-color: rgba(0, 123, 199, 0.1);
color: #007bc7;
}
.themeblock__link--infrastructure::before {
// .themeblock__link--infrastructure::before {
// background-image: url(../images/theme-icons/infrastructure.svg);
}
// }
.themeblock__link--social:hover {
background-color: rgba(103, 51, 39, 0.1);
color: #673327;
}
.themeblock__link--social::before {
// .themeblock__link--social::before {
// background-image: url(../images/theme-icons/social.svg);
}
// }
.themeblock__link--traffic:hover {
background-color: rgba(191, 54, 12, 0.1);
color: #bf360c;
}
.themeblock__link--traffic::before {
// .themeblock__link--traffic::before {
// background-image: url(../images/theme-icons/traffic.svg);
}
// }
.themeblock__link--jobs:hover {
background-color: rgba(169, 0, 97, 0.1);
color: #a90061;
}
.themeblock__link--jobs::before {
// .themeblock__link--jobs::before {
// background-image: url(../images/theme-icons/jobs.svg);
}
// }
.themeblock__link--healthcare:hover {
background-color: rgba(213, 43, 30, 0.1);
color: #d52b1e;
}
.themeblock__link--healthcare::before {
// .themeblock__link--healthcare::before {
// background-image: url(../images/theme-icons/healthcare.svg);
}
// }
.banner {
background: #f3f3f3;
border: 2px solid #ccc;
Expand Down
67 changes: 32 additions & 35 deletions frontend/components/views/AppFooter.vue
View file
Original file line number Diff line number Diff line change
@@ -1,37 +1,34 @@
<template>
<!-- <v-spacer></v-spacer>
<v-footer class="site-footer">
<div class="wrapper">
<div
class="column"
v-for="column in footerTranslated"
:key="column.title"
>
<h2>{{ column.title }}</h2>
<ul>
<li v-for="page in column.pages" :key="page.label">
<NuxtLink :to="`/footer${page.path}`">
{{ page.label }}
</NuxtLink>
</li>
</ul>
</div>
</div>
</v-footer> -->
<div class="footer row--footer" role="contentinfo">
<div class="container columns">
<div v-for="column in footerTranslated" :key="column.title">
<div>
{{ t('footer.text') }} {{ t('footer.textAskApply') }} '<NuxtLink
:to="'footer/over'"
>{{ t('footer.paths.over') }}</NuxtLink
>'.
</div>
<div></div>
<div v-for="footerKey in footerKeys" :key="footerKey">
<div class="">
<ul class="list list--linked">
<li
class="list__item"
v-for="page in column.pages"
v-for="page in footer[footerKey]"
:key="page.label"
>
<NuxtLink :to="`/footer${page.path}`">
{{ page.label }}
<NuxtLink
:to="`/footer${page.path}`"
v-if="footerKey != 'external'"
>
{{ t(`footer.paths.${page.key}`) }}
</NuxtLink>
<a
v-if="footerKey == 'external'"
:href="page.path"
target="_blank"
class="is-external"
>{{ t(`footer.paths.${page.key}`) }}</a
>
</li>
</ul>
</div>
Expand All @@ -42,18 +39,18 @@

<script setup lang="ts">
import footer from '@/config/footer'
import { computed } from 'vue'
// import { computed } from 'vue'
import { useI18n } from 'vue-i18n'
const { t } = useI18n()
const footerTranslated = computed(() => {
return footer.map((column) => {
column.title = t(`footerColumns.${column.key}`)
column.pages.map((page) => {
page.label = t(`paths.${page.path}`)
return page
})
return column
})
})
const footerKeys = Object.keys(footer)
// const footerTranslated = computed(() => {
// return footerKeys.map((footerKey) => {
// footer[footerKey as keyof typeof footer].map((page) => {
// page.label = t(`paths.${page.path}`)
// return page
// })
// })
// })
</script>
83 changes: 42 additions & 41 deletions frontend/config/footer.ts
View file
Original file line number Diff line number Diff line change
@@ -1,45 +1,46 @@
import type { FooterColumn } from '~~/types/footer'

const footer: FooterColumn[] = [
// {
// key: 'service',
// title: '',
// pages: [],
// },
{
key: 'over',
title: '',
pages: [
{
label: '',
path: '/privacyverklaring',
},
{
label: '',
path: '/toegankelijkheid',
},
{
label: '',
path: '/over',
},
{
label: '',
path: '/vragen',
},
{
label: '',
path: '/contact',
},
// {
// label: '',
// path: '/cookies',
// },
// {
// label: ' melden',
// path: '/kwetsbaarheid',
// },
],
},
]
const footer: FooterColumn = {
internal: [
{
key: 'over',
path: '/over',
},
{
key: 'contact',
path: '/contact',
},
{
key: 'vragen',
path: '/vragen',
},
{
key: 'privacyverklaring',
path: '/privacyverklaring',
},
{
key: 'toegankelijkheid',
path: '/toegankelijkheid',
},
],
external: [
{
key: 'ext_overheid_nl',
path: 'https://overheid.nl',
},
{
key: 'ext_rijksoverheid_nl',
path: 'https://rijksoverheid.nl',
},
{
key: 'ext_digitaleoverheid_nl',
path: 'https://digitaleoverheid.nl',
},
{
key: 'ext_data_overheid_nl',
path: 'https://data.overheid.nl',
},
],
}

export default footer
Loading

0 comments on commit 61f1b47

Please sign in to comment.