diff --git a/assets/scss/globals/_colors.scss b/assets/scss/globals/_colors.scss
index 2df378a47..0d00cd572 100755
--- a/assets/scss/globals/_colors.scss
+++ b/assets/scss/globals/_colors.scss
@@ -20,7 +20,7 @@ $pure-orange: #f45c00;
// gradients
$blue-gradient: linear-gradient(135deg, #12a3ff 0%, #3d68ff 100%);
-$default-gradient: linear-gradient(135deg, #388aff 0%, #985fff 100%);
+$default-gradient: linear-gradient(91.59deg, #3d68ff 0%, #8845ff 100%);
$green-gradient: linear-gradient(0deg, #52d987 0%, #1a8c89 100%);
$pix-orange-gradient: linear-gradient(180deg, #f24645 0%, #f1a141 100%);
$pix-orga-gradient: linear-gradient(134deg, #00ddff 0%, #0095c0 100%);
@@ -76,3 +76,5 @@ $box-shadow-competence-cards: 0 3px 4px 0 rgba(12, 22, 58, 0.1),
0 1px 3px 0 rgba($grey-200, 0.1);
$box-shadow-competence-cards-hover: 0 7px 14px 0 rgba(12, 22, 58, 0.2),
0 3px 6px 0 rgba($grey-200, 0.2);
+
+$shadow-xs: 0 4px 8px rgba(7, 20, 46, 0.08);
diff --git a/components/BurgerMenuNavItems.vue b/components/BurgerMenuNavItems.vue
index fd36b8a6b..ba92b4374 100644
--- a/components/BurgerMenuNavItems.vue
+++ b/components/BurgerMenuNavItems.vue
@@ -10,9 +10,9 @@
: 'burger-menu-nav-items__link--regular-link'
"
>
-
+
{{ $prismic.asText(item.name) }}
-
+
diff --git a/components/CtaButton.vue b/components/CtaButton.vue
index b6b6a850d..921dc72c3 100644
--- a/components/CtaButton.vue
+++ b/components/CtaButton.vue
@@ -1,7 +1,7 @@
-
+
{{ name }}
-
+
+
+
diff --git a/components/MainNav.vue b/components/MainNav.vue
index 78c25b5c9..98180892c 100644
--- a/components/MainNav.vue
+++ b/components/MainNav.vue
@@ -1,6 +1,6 @@
-
{{ $prismic.asText(item.primary.title) }}
-
+
diff --git a/components/PixLink.vue b/components/PixPrismicLink.vue
similarity index 99%
rename from components/PixLink.vue
rename to components/PixPrismicLink.vue
index 1f167f933..871a72b72 100644
--- a/components/PixLink.vue
+++ b/components/PixPrismicLink.vue
@@ -9,7 +9,7 @@ import prismicDOM from 'prismic-dom'
import { getCurrentSiteHost } from '~/services/get-current-site-host'
export default {
- name: 'PixLink',
+ name: 'PixPrismicLink',
props: {
field: {
required: true,
diff --git a/components/slices/ActionsZone.vue b/components/slices/ActionsZone.vue
index 627276d8f..dca89854e 100644
--- a/components/slices/ActionsZone.vue
+++ b/components/slices/ActionsZone.vue
@@ -3,7 +3,7 @@
-
-
{{ $prismic.asText(menuItem.name) }}
-
+
diff --git a/components/slices/Article.vue b/components/slices/Article.vue
index ad9301f8d..759b25ebf 100644
--- a/components/slices/Article.vue
+++ b/components/slices/Article.vue
@@ -37,13 +37,13 @@
:link="content.article_link_url"
:name="content.article_link_name"
/>
-
{{ content.article_link_name }}
-
+
-
{{ slice.primary.latest_news_redirection_link_text }}
-
+
diff --git a/components/slices/LogosZone.vue b/components/slices/LogosZone.vue
index 28fbfd5c4..7694a80d6 100644
--- a/components/slices/LogosZone.vue
+++ b/components/slices/LogosZone.vue
@@ -5,13 +5,13 @@
:key="`logo-${index}`"
class="logos-zone__content"
>
-
+
-
+
-
+
-
+
diff --git a/components/slices/NavigationZone.vue b/components/slices/NavigationZone.vue
index d034a2ddc..2db7ca298 100644
--- a/components/slices/NavigationZone.vue
+++ b/components/slices/NavigationZone.vue
@@ -30,9 +30,13 @@
>
-
+
{{ $prismic.asText(menuItem.name) }}
-
+
diff --git a/components/slices/PageBanner.vue b/components/slices/PageBanner.vue
index 5b9c27937..0f2f6967c 100644
--- a/components/slices/PageBanner.vue
+++ b/components/slices/PageBanner.vue
@@ -15,14 +15,14 @@
-
+
{{ $prismic.asText(buttonText) }}
-
+
diff --git a/config/language/pix-site.js b/config/language/pix-site.js
index 2384f10cd..300e9fa41 100644
--- a/config/language/pix-site.js
+++ b/config/language/pix-site.js
@@ -5,21 +5,29 @@ export const availableLocales = [
code: 'fr',
file: 'fr.js',
domain: config.domain.international,
+ name: 'International Français',
+ icon: 'globe-europe.svg',
},
{
code: 'en-gb',
file: 'en-gb.js',
domain: config.domain.international,
+ name: 'International English',
+ icon: 'globe-europe.svg',
},
{
code: 'fr-be',
file: 'fr-be.js',
domain: config.domain.international,
+ name: 'FWB',
+ icon: 'flag-be.svg',
},
{
code: 'fr-fr',
file: 'fr-fr.js',
domain: config.domain.french,
+ name: 'France',
+ icon: 'flag-fr.svg',
},
]
diff --git a/layouts/home.vue b/layouts/home.vue
new file mode 100644
index 000000000..4afc11afd
--- /dev/null
+++ b/layouts/home.vue
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
+
diff --git a/nuxt.config.js b/nuxt.config.js
index 5d671a36d..c1d6867ae 100755
--- a/nuxt.config.js
+++ b/nuxt.config.js
@@ -18,6 +18,8 @@ const i18nConfigurationForInternationalDomain = {
vueI18n: {
fallbackLocale: 'fr',
},
+ rootRedirect:
+ config.isPixSite && !config.isFrenchDomain ? 'locale-choice' : undefined,
}
const nuxtConfig = {
@@ -35,7 +37,7 @@ const nuxtConfig = {
port: process.env.PORT || 5000,
},
env: {
- // Nuxt env are required to be usable client-side (e.g.: PixLink)
+ // Nuxt env are required to be usable client-side (e.g.: PixPrismicLink)
SITE: process.env.SITE,
DOMAIN_ORG: process.env.DOMAIN_ORG,
DOMAIN_FR: process.env.DOMAIN_FR,
diff --git a/pages/pix-site/locale-choice.vue b/pages/pix-site/locale-choice.vue
new file mode 100644
index 000000000..daa81f4aa
--- /dev/null
+++ b/pages/pix-site/locale-choice.vue
@@ -0,0 +1,66 @@
+
+
+
+
+
+
+
+
+
diff --git a/plugins/components.js b/plugins/components.js
index 502f6229b..d4caad354 100644
--- a/plugins/components.js
+++ b/plugins/components.js
@@ -1,6 +1,6 @@
import Vue from 'vue'
-import PixLink from '@/components/PixLink'
+import PixPrismicLink from '@/components/PixPrismicLink'
import PixImage from '@/components/PixImage'
-Vue.component('PixLink', PixLink)
+Vue.component('PixPrismicLink', PixPrismicLink)
Vue.component('PixImage', PixImage)
diff --git a/services/get-absolute-url-if-switch-website.js b/services/get-absolute-url-if-switch-website.js
index 69d03d839..f1d65f5b2 100644
--- a/services/get-absolute-url-if-switch-website.js
+++ b/services/get-absolute-url-if-switch-website.js
@@ -18,7 +18,7 @@ export function getAbsoluteUrlIfSwitchWebsite({
}
function _isOnCurrentDomain(targetUrl, currentUrl) {
- return targetUrl.hostname === currentUrl.hostname
+ return targetUrl.origin === currentUrl.origin
}
function getBaseUrl(domain, currentLocation = document.location) {
diff --git a/static/images/logo-pix-blanc.svg b/static/images/logo-pix-blanc.svg
new file mode 100644
index 000000000..d74724507
--- /dev/null
+++ b/static/images/logo-pix-blanc.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/static/images/planet.svg b/static/images/planet.svg
new file mode 100644
index 000000000..35bd71e51
--- /dev/null
+++ b/static/images/planet.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/static/images/stars.svg b/static/images/stars.svg
new file mode 100644
index 000000000..6569ab399
--- /dev/null
+++ b/static/images/stars.svg
@@ -0,0 +1 @@
+
diff --git a/tests/components/PixLink.test.js b/tests/components/PixPrismicLink.test.js
similarity index 99%
rename from tests/components/PixLink.test.js
rename to tests/components/PixPrismicLink.test.js
index 4d310457f..b4749f77f 100644
--- a/tests/components/PixLink.test.js
+++ b/tests/components/PixPrismicLink.test.js
@@ -2,10 +2,10 @@ import {
removeHostIfCurrentSite,
getPathLocale,
isCurrentLocaleURL,
-} from '~/components/PixLink'
+} from '~/components/PixPrismicLink'
import { SITES_PRISMIC_TAGS } from '~/services/available-sites'
-describe('Component: PixLink', () => {
+describe('Component: PixPrismicLink', () => {
describe('#removeHostIfCurrentSite', () => {
let locale
diff --git a/tests/components/slices/ActionsZone.test.js b/tests/components/slices/ActionsZone.test.js
index 609b05f35..dbf793576 100644
--- a/tests/components/slices/ActionsZone.test.js
+++ b/tests/components/slices/ActionsZone.test.js
@@ -9,7 +9,7 @@ describe('Slice: Actions Zone', () => {
component = shallowMount(ActionsZone, {
stubs: {
'language-switcher': true,
- 'pix-link': true,
+ 'pix-prismic-link': true,
},
propsData: {
slice: {
diff --git a/tests/components/slices/NavigationZone.test.js b/tests/components/slices/NavigationZone.test.js
index fbdd86ee1..f509f8a2f 100644
--- a/tests/components/slices/NavigationZone.test.js
+++ b/tests/components/slices/NavigationZone.test.js
@@ -29,7 +29,11 @@ describe('NavigationZone slice', () => {
beforeEach(() => {
component = shallowMount(NavigationZone, {
mocks: { $route },
- stubs: { 'pix-link': true, fa: true, 'navigation-dropdown': true },
+ stubs: {
+ 'pix-prismic-link': true,
+ fa: true,
+ 'navigation-dropdown': true,
+ },
propsData: {
navigationZoneItems: [
{