From 2156f9c33bbe71ecbe115f7e3c03c3538db25259 Mon Sep 17 00:00:00 2001
From: Yann Bertrand <5855339+yannbertrand@users.noreply.github.com>
Date: Tue, 3 Jan 2023 18:36:24 +0100
Subject: [PATCH] feat: do not pass through /locale-choice page

---
 layouts/empty.vue                |  9 ++++
 layouts/home.vue                 | 29 ----------
 pages/pix-site/index.vue         | 93 ++++++++++++++++++++++++++++++--
 pages/pix-site/locale-choice.vue | 70 ------------------------
 4 files changed, 97 insertions(+), 104 deletions(-)
 create mode 100644 layouts/empty.vue
 delete mode 100644 layouts/home.vue
 delete mode 100644 pages/pix-site/locale-choice.vue

diff --git a/layouts/empty.vue b/layouts/empty.vue
new file mode 100644
index 000000000..eedfeaf9e
--- /dev/null
+++ b/layouts/empty.vue
@@ -0,0 +1,9 @@
+<template>
+  <nuxt />
+</template>
+
+<script>
+export default {
+  name: 'Empty',
+}
+</script>
diff --git a/layouts/home.vue b/layouts/home.vue
deleted file mode 100644
index 4afc11afd..000000000
--- a/layouts/home.vue
+++ /dev/null
@@ -1,29 +0,0 @@
-<template>
-  <main class="home">
-    <nuxt />
-  </main>
-</template>
-
-<script>
-export default {
-  name: 'Home',
-}
-</script>
-
-<style lang="scss">
-.home {
-  width: 100%;
-  min-width: 0;
-  min-height: 100vh;
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  align-items: center;
-  padding: 5rem 1rem 0;
-  background: url('/images/stars.svg') repeat, $default-gradient;
-
-  @include device-is('large-mobile') {
-    padding: 0;
-  }
-}
-</style>
diff --git a/pages/pix-site/index.vue b/pages/pix-site/index.vue
index 62d8343d6..d3b1b358d 100644
--- a/pages/pix-site/index.vue
+++ b/pages/pix-site/index.vue
@@ -1,14 +1,43 @@
-<template><div></div></template>
+<template>
+  <client-only v-if="shouldDisplayLocaleChoice">
+    <main class="home">
+      <div class="locale-choice">
+        <h1>
+          <pix-image
+            class="logo-pix"
+            :field="{ url: '/images/logo-pix-blanc.svg', alt: 'Pix' }"
+          />
+        </h1>
+        <LocaleLink
+          v-for="locale in locales"
+          :key="locale.code"
+          class="locale-choice__link"
+          :locale="locale"
+        />
+        <pix-image class="planet" :field="{ url: '/images/planet.svg' }" />
+      </div>
+    </main>
+  </client-only>
+</template>
 
 <script>
+import { language } from '~/config/language'
 export default {
+  layout: 'empty',
   nuxtI18n: false,
-  layout: 'simple',
+  data() {
+    return {
+      locales: language.locales,
+      shouldDisplayLocaleChoice: false,
+    }
+  },
   mounted() {
     const preferredLocale = this.getLocaleFromCookie()
-    document.location = preferredLocale
-      ? `/${preferredLocale}/`
-      : '/locale-choice'
+    if (preferredLocale) {
+      document.location = preferredLocale
+    } else {
+      this.shouldDisplayLocaleChoice = true
+    }
   },
   methods: {
     getLocaleFromCookie() {
@@ -21,3 +50,57 @@ export default {
   },
 }
 </script>
+
+<style lang="scss" scoped>
+.home {
+  width: 100%;
+  min-width: 0;
+  min-height: 100vh;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  padding: 5rem 1rem 0;
+  background: url('/images/stars.svg') repeat, $default-gradient;
+
+  @include device-is('large-mobile') {
+    padding: 0;
+  }
+}
+
+.locale-choice {
+  padding: 3rem 0;
+}
+
+.logo-pix {
+  margin: 0 auto 5vh;
+  display: block;
+  width: 11rem;
+  max-width: 100%;
+}
+
+.locale-choice__link + .locale-choice__link {
+  margin-top: 1rem;
+}
+
+.planet {
+  margin: 5vh auto 0;
+  display: block;
+  width: max(16vw, 90%);
+}
+
+@include device-is('large-mobile') {
+  .locale-choice {
+    position: relative;
+  }
+
+  .planet {
+    position: absolute;
+    top: 50%;
+    right: calc(100% + 4vw);
+    max-width: unset;
+    margin: 0;
+    transform: translateY(-50%);
+  }
+}
+</style>
diff --git a/pages/pix-site/locale-choice.vue b/pages/pix-site/locale-choice.vue
deleted file mode 100644
index f294ffec4..000000000
--- a/pages/pix-site/locale-choice.vue
+++ /dev/null
@@ -1,70 +0,0 @@
-<template>
-  <client-only>
-    <div class="locale-choice">
-      <h1>
-        <pix-image
-          class="logo-pix"
-          :field="{ url: '/images/logo-pix-blanc.svg', alt: 'Pix' }"
-        />
-      </h1>
-      <LocaleLink
-        v-for="locale in locales"
-        :key="locale.code"
-        class="locale-choice__link"
-        :locale="locale"
-      />
-      <pix-image class="planet" :field="{ url: '/images/planet.svg' }" />
-    </div>
-  </client-only>
-</template>
-
-<script>
-import { language } from '~/config/language'
-export default {
-  layout: 'home',
-  nuxtI18n: false,
-  data() {
-    return {
-      locales: language.locales,
-    }
-  },
-}
-</script>
-
-<style lang="scss" scoped>
-.locale-choice {
-  padding: 3rem 0;
-}
-
-.logo-pix {
-  margin: 0 auto 5vh;
-  display: block;
-  width: 11rem;
-  max-width: 100%;
-}
-
-.locale-choice__link + .locale-choice__link {
-  margin-top: 1rem;
-}
-
-.planet {
-  margin: 5vh auto 0;
-  display: block;
-  width: max(16vw, 90%);
-}
-
-@include device-is('large-mobile') {
-  .locale-choice {
-    position: relative;
-  }
-
-  .planet {
-    position: absolute;
-    top: 50%;
-    right: calc(100% + 4vw);
-    max-width: unset;
-    margin: 0;
-    transform: translateY(-50%);
-  }
-}
-</style>