From cf2bddf130246f15e7c5492dc6115c9a1bc5e808 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Moritz=20Kr=C3=B6ger?= <write@morkro.de>
Date: Thu, 9 May 2019 15:52:03 +0100
Subject: [PATCH] :bug: Fixes import issue with async methods

---
 src/app/app.vue           | 6 ++++--
 src/app/euromat/routes.js | 2 +-
 src/i18n/helper.js        | 8 ++------
 src/router/index.js       | 4 ++--
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/app/app.vue b/src/app/app.vue
index 280f06c..7595d61 100644
--- a/src/app/app.vue
+++ b/src/app/app.vue
@@ -30,10 +30,11 @@
 
 <script>
   import '@/assets/icons/european-stars'
+  import { IPDATA_URL } from '@/config/api'
   import { GA_COOKIE_NAME } from '@/config/analytics'
   import { SUPPORTED_LOCALES } from '@/config'
   import { setCookie, getCookie } from '@/helper/cookies'
-  import { getCountryByIP, getUserLanguage, getTranslatedUrl } from '@/i18n/helper'
+  import { getUserLanguage, getTranslatedUrl } from '@/i18n/helper'
 
   export default {
     name: 'App',
@@ -120,7 +121,8 @@
     },
 
     async created () {
-      const ipData = await getCountryByIP()
+      const ipResponse = await fetch(IPDATA_URL)
+      const ipData = ipResponse.json()
       this.userCountry = ipData.country_code
     },
 
diff --git a/src/app/euromat/routes.js b/src/app/euromat/routes.js
index 6339e5a..ed0171d 100644
--- a/src/app/euromat/routes.js
+++ b/src/app/euromat/routes.js
@@ -2,7 +2,7 @@ import { DEFAULT_LOCALE } from '@/config'
 import i18n from '@/i18n'
 import localI18n from './i18n'
 import { storageAvailable } from '@/helper/storage'
-import { getTranslatedAliases, getTranslatedTitles } from '@/i18n/helper'
+import { getTranslatedTitles, getTranslatedAliases } from '@/i18n/helper'
 
 function hasAnswers (to, from, next) {
   if (storageAvailable('sessionStorage') && !sessionStorage.getItem('euromat-answers')) {
diff --git a/src/i18n/helper.js b/src/i18n/helper.js
index e06cefb..0ef5c8b 100644
--- a/src/i18n/helper.js
+++ b/src/i18n/helper.js
@@ -1,12 +1,6 @@
 import { DEFAULT_LOCALE, SUPPORTED_LOCALES } from '@/config'
-import { IPDATA_URL } from '@/config/api'
 import i18n from './index'
 
-export const getCountryByIP = async () => {
-  const response = await fetch(IPDATA_URL)
-  return response.json()
-}
-
 export const isLangSupported = lang =>
   SUPPORTED_LOCALES.some(([locale]) => locale === lang)
 
@@ -61,6 +55,8 @@ export function getTranslatedAliases (data, section) {
   )]
 }
 
+console.log('getTranslatedAliases inside', getTranslatedAliases)
+
 export function getTranslatedUrl (section, prefixUrl, omitLocale = false) {
   const messages = i18n.messages[getCurrentLocale()][section]
   const url = messages.url
diff --git a/src/router/index.js b/src/router/index.js
index 72c4b56..ed14674 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1,7 +1,7 @@
 import Vue from 'vue'
 import Router from 'vue-router'
 
-import * as i18n from '@/i18n/helper'
+import { getUserSupportedLanguage } from '@/i18n/helper'
 import BaseLocaleRouter from '@/components/base-locale-router'
 import { getPageTitle, beforeEnter } from '@/router/helper'
 
@@ -41,7 +41,7 @@ const router = new Router({
     {
       path: '*',
       redirect (to) {
-        return i18n.getUserSupportedLanguage()
+        return getUserSupportedLanguage()
       }
     }
   ]