diff --git a/.eslintcache b/.eslintcache index faa547d..21797d0 100644 --- a/.eslintcache +++ b/.eslintcache @@ -1 +1 @@ -[{"/Users/adamas/dev/anthony-dumas.fr/src/index.js":"1","/Users/adamas/dev/anthony-dumas.fr/src/reportWebVitals.js":"2","/Users/adamas/dev/anthony-dumas.fr/src/App.js":"3","/Users/adamas/dev/anthony-dumas.fr/src/components/MainCard/MainCard.js":"4","/Users/adamas/dev/anthony-dumas.fr/src/components/MenuComponent/index.js":"5","/Users/adamas/dev/anthony-dumas.fr/src/components/ProjectsCard/index.js":"6","/Users/adamas/dev/anthony-dumas.fr/src/components/ContactCard/index.js":"7","/Users/adamas/dev/anthony-dumas.fr/src/components/FooterCard/index.js":"8","/Users/adamas/dev/anthony-dumas.fr/src/components/MenuComponent/MenuComponent.js":"9","/Users/adamas/dev/anthony-dumas.fr/src/components/ButtonIcon/index.js":"10","/Users/adamas/dev/anthony-dumas.fr/src/components/ExperienceCard/index.js":"11","/Users/adamas/dev/anthony-dumas.fr/src/components/ContactCard/ContactCard.js":"12","/Users/adamas/dev/anthony-dumas.fr/src/components/ProjectsCard/ProjectsCard.js":"13","/Users/adamas/dev/anthony-dumas.fr/src/components/FooterCard/FooterCard.js":"14","/Users/adamas/dev/anthony-dumas.fr/src/components/ButtonIcon/ButtonIcon.js":"15","/Users/adamas/dev/anthony-dumas.fr/src/components/ExperienceCard/ExperienceCard.js":"16","/Users/adamas/dev/anthony-dumas.fr/src/components/ContactButton/index.js":"17","/Users/adamas/dev/anthony-dumas.fr/src/components/ProjectCard/index.js":"18","/Users/adamas/dev/anthony-dumas.fr/src/components/ProjectCard/ProjectCard.js":"19","/Users/adamas/dev/anthony-dumas.fr/src/components/ContactButton/ContactButton.js":"20","/Users/adamas/dev/anthony-dumas.fr/src/messages/index.js":"21"},{"size":1404,"mtime":1655245604112,"results":"22","hashOfConfig":"23"},{"size":362,"mtime":1636324040663,"results":"24","hashOfConfig":"23"},{"size":521,"mtime":1655244839421,"results":"25","hashOfConfig":"23"},{"size":4207,"mtime":1655244839424,"results":"26","hashOfConfig":"23"},{"size":74,"mtime":1635286273694,"results":"27","hashOfConfig":"23"},{"size":71,"mtime":1655244839425,"results":"28","hashOfConfig":"23"},{"size":68,"mtime":1655244839423,"results":"29","hashOfConfig":"23"},{"size":65,"mtime":1655244839424,"results":"30","hashOfConfig":"23"},{"size":2350,"mtime":1655244839424,"results":"31","hashOfConfig":"23"},{"size":65,"mtime":1655244839422,"results":"32","hashOfConfig":"23"},{"size":77,"mtime":1655244839423,"results":"33","hashOfConfig":"23"},{"size":1213,"mtime":1655244839423,"results":"34","hashOfConfig":"23"},{"size":800,"mtime":1655244839425,"results":"35","hashOfConfig":"23"},{"size":5228,"mtime":1655244839424,"results":"36","hashOfConfig":"23"},{"size":531,"mtime":1655244839422,"results":"37","hashOfConfig":"23"},{"size":1642,"mtime":1655244839423,"results":"38","hashOfConfig":"23"},{"size":74,"mtime":1655244839423,"results":"39","hashOfConfig":"23"},{"size":68,"mtime":1655244839425,"results":"40","hashOfConfig":"23"},{"size":941,"mtime":1655244839425,"results":"41","hashOfConfig":"23"},{"size":1061,"mtime":1655244839423,"results":"42","hashOfConfig":"23"},{"size":243,"mtime":1655245392633,"results":"43","hashOfConfig":"23"},{"filePath":"44","messages":"45","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"1x0ydlv",{"filePath":"46","messages":"47","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"48"},{"filePath":"49","messages":"50","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"48"},{"filePath":"51","messages":"52","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"48"},{"filePath":"53","messages":"54","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"48"},{"filePath":"55","messages":"56","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"48"},{"filePath":"57","messages":"58","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"48"},{"filePath":"59","messages":"60","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"48"},{"filePath":"61","messages":"62","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"48"},{"filePath":"63","messages":"64","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"48"},{"filePath":"65","messages":"66","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"48"},{"filePath":"67","messages":"68","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"48"},{"filePath":"69","messages":"70","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"48"},{"filePath":"71","messages":"72","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"48"},{"filePath":"73","messages":"74","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"48"},{"filePath":"75","messages":"76","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"48"},{"filePath":"77","messages":"78","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"48"},{"filePath":"79","messages":"80","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"48"},{"filePath":"81","messages":"82","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"48"},{"filePath":"83","messages":"84","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"48"},{"filePath":"85","messages":"86","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"/Users/adamas/dev/anthony-dumas.fr/src/index.js",[],"/Users/adamas/dev/anthony-dumas.fr/src/reportWebVitals.js",[],["87","88"],"/Users/adamas/dev/anthony-dumas.fr/src/App.js",[],"/Users/adamas/dev/anthony-dumas.fr/src/components/MainCard/MainCard.js",[],"/Users/adamas/dev/anthony-dumas.fr/src/components/MenuComponent/index.js",[],"/Users/adamas/dev/anthony-dumas.fr/src/components/ProjectsCard/index.js",[],"/Users/adamas/dev/anthony-dumas.fr/src/components/ContactCard/index.js",[],"/Users/adamas/dev/anthony-dumas.fr/src/components/FooterCard/index.js",[],"/Users/adamas/dev/anthony-dumas.fr/src/components/MenuComponent/MenuComponent.js",[],"/Users/adamas/dev/anthony-dumas.fr/src/components/ButtonIcon/index.js",[],"/Users/adamas/dev/anthony-dumas.fr/src/components/ExperienceCard/index.js",[],"/Users/adamas/dev/anthony-dumas.fr/src/components/ContactCard/ContactCard.js",[],"/Users/adamas/dev/anthony-dumas.fr/src/components/ProjectsCard/ProjectsCard.js",[],"/Users/adamas/dev/anthony-dumas.fr/src/components/FooterCard/FooterCard.js",[],"/Users/adamas/dev/anthony-dumas.fr/src/components/ButtonIcon/ButtonIcon.js",[],"/Users/adamas/dev/anthony-dumas.fr/src/components/ExperienceCard/ExperienceCard.js",[],"/Users/adamas/dev/anthony-dumas.fr/src/components/ContactButton/index.js",[],"/Users/adamas/dev/anthony-dumas.fr/src/components/ProjectCard/index.js",[],"/Users/adamas/dev/anthony-dumas.fr/src/components/ProjectCard/ProjectCard.js",[],"/Users/adamas/dev/anthony-dumas.fr/src/components/ContactButton/ContactButton.js",[],"/Users/adamas/dev/anthony-dumas.fr/src/messages/index.js",[],{"ruleId":"89","replacedBy":"90"},{"ruleId":"91","replacedBy":"92"},"no-native-reassign",["93"],"no-negated-in-lhs",["94"],"no-global-assign","no-unsafe-negation"] \ No newline at end of file +[{"/Users/adamas/dev/anthony-dumas.fr/src/index.js":"1","/Users/adamas/dev/anthony-dumas.fr/src/reportWebVitals.js":"2","/Users/adamas/dev/anthony-dumas.fr/src/App.js":"3","/Users/adamas/dev/anthony-dumas.fr/src/components/MainCard/MainCard.js":"4","/Users/adamas/dev/anthony-dumas.fr/src/components/MenuComponent/index.js":"5","/Users/adamas/dev/anthony-dumas.fr/src/components/ProjectsCard/index.js":"6","/Users/adamas/dev/anthony-dumas.fr/src/components/ContactCard/index.js":"7","/Users/adamas/dev/anthony-dumas.fr/src/components/FooterCard/index.js":"8","/Users/adamas/dev/anthony-dumas.fr/src/components/MenuComponent/MenuComponent.js":"9","/Users/adamas/dev/anthony-dumas.fr/src/components/ButtonIcon/index.js":"10","/Users/adamas/dev/anthony-dumas.fr/src/components/ExperienceCard/index.js":"11","/Users/adamas/dev/anthony-dumas.fr/src/components/ContactCard/ContactCard.js":"12","/Users/adamas/dev/anthony-dumas.fr/src/components/ProjectsCard/ProjectsCard.js":"13","/Users/adamas/dev/anthony-dumas.fr/src/components/FooterCard/FooterCard.js":"14","/Users/adamas/dev/anthony-dumas.fr/src/components/ButtonIcon/ButtonIcon.js":"15","/Users/adamas/dev/anthony-dumas.fr/src/components/ExperienceCard/ExperienceCard.js":"16","/Users/adamas/dev/anthony-dumas.fr/src/components/ContactButton/index.js":"17","/Users/adamas/dev/anthony-dumas.fr/src/components/ProjectCard/index.js":"18","/Users/adamas/dev/anthony-dumas.fr/src/components/ProjectCard/ProjectCard.js":"19","/Users/adamas/dev/anthony-dumas.fr/src/components/ContactButton/ContactButton.js":"20","/Users/adamas/dev/anthony-dumas.fr/src/messages/index.js":"21","/Users/adamas/dev/anthony-dumas.fr/src/services/message.service.js":"22"},{"size":768,"mtime":1655246344087,"results":"23","hashOfConfig":"24"},{"size":362,"mtime":1636324040663,"results":"25","hashOfConfig":"24"},{"size":521,"mtime":1655244839421,"results":"26","hashOfConfig":"24"},{"size":4207,"mtime":1655244839424,"results":"27","hashOfConfig":"24"},{"size":74,"mtime":1635286273694,"results":"28","hashOfConfig":"24"},{"size":71,"mtime":1655244839425,"results":"29","hashOfConfig":"24"},{"size":68,"mtime":1655244839423,"results":"30","hashOfConfig":"24"},{"size":65,"mtime":1655244839424,"results":"31","hashOfConfig":"24"},{"size":2350,"mtime":1655244839424,"results":"32","hashOfConfig":"24"},{"size":65,"mtime":1655244839422,"results":"33","hashOfConfig":"24"},{"size":77,"mtime":1655244839423,"results":"34","hashOfConfig":"24"},{"size":1213,"mtime":1655244839423,"results":"35","hashOfConfig":"24"},{"size":800,"mtime":1655244839425,"results":"36","hashOfConfig":"24"},{"size":5228,"mtime":1655244839424,"results":"37","hashOfConfig":"24"},{"size":531,"mtime":1655244839422,"results":"38","hashOfConfig":"24"},{"size":1642,"mtime":1655244839423,"results":"39","hashOfConfig":"24"},{"size":74,"mtime":1655244839423,"results":"40","hashOfConfig":"24"},{"size":68,"mtime":1655244839425,"results":"41","hashOfConfig":"24"},{"size":941,"mtime":1655244839425,"results":"42","hashOfConfig":"24"},{"size":1061,"mtime":1655244839423,"results":"43","hashOfConfig":"24"},{"size":243,"mtime":1655245392633,"results":"44","hashOfConfig":"24"},{"size":737,"mtime":1655246270835,"results":"45","hashOfConfig":"24"},{"filePath":"46","messages":"47","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"1x0ydlv",{"filePath":"48","messages":"49","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"50"},{"filePath":"51","messages":"52","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"50"},{"filePath":"53","messages":"54","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"50"},{"filePath":"55","messages":"56","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"50"},{"filePath":"57","messages":"58","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"50"},{"filePath":"59","messages":"60","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"50"},{"filePath":"61","messages":"62","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"50"},{"filePath":"63","messages":"64","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"50"},{"filePath":"65","messages":"66","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"50"},{"filePath":"67","messages":"68","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"50"},{"filePath":"69","messages":"70","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"50"},{"filePath":"71","messages":"72","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"50"},{"filePath":"73","messages":"74","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"50"},{"filePath":"75","messages":"76","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"50"},{"filePath":"77","messages":"78","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"50"},{"filePath":"79","messages":"80","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"50"},{"filePath":"81","messages":"82","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"50"},{"filePath":"83","messages":"84","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"50"},{"filePath":"85","messages":"86","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"50"},{"filePath":"87","messages":"88","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"50"},{"filePath":"89","messages":"90","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"/Users/adamas/dev/anthony-dumas.fr/src/index.js",[],"/Users/adamas/dev/anthony-dumas.fr/src/reportWebVitals.js",[],["91","92"],"/Users/adamas/dev/anthony-dumas.fr/src/App.js",[],"/Users/adamas/dev/anthony-dumas.fr/src/components/MainCard/MainCard.js",[],"/Users/adamas/dev/anthony-dumas.fr/src/components/MenuComponent/index.js",[],"/Users/adamas/dev/anthony-dumas.fr/src/components/ProjectsCard/index.js",[],"/Users/adamas/dev/anthony-dumas.fr/src/components/ContactCard/index.js",[],"/Users/adamas/dev/anthony-dumas.fr/src/components/FooterCard/index.js",[],"/Users/adamas/dev/anthony-dumas.fr/src/components/MenuComponent/MenuComponent.js",[],"/Users/adamas/dev/anthony-dumas.fr/src/components/ButtonIcon/index.js",[],"/Users/adamas/dev/anthony-dumas.fr/src/components/ExperienceCard/index.js",[],"/Users/adamas/dev/anthony-dumas.fr/src/components/ContactCard/ContactCard.js",[],"/Users/adamas/dev/anthony-dumas.fr/src/components/ProjectsCard/ProjectsCard.js",[],"/Users/adamas/dev/anthony-dumas.fr/src/components/FooterCard/FooterCard.js",[],"/Users/adamas/dev/anthony-dumas.fr/src/components/ButtonIcon/ButtonIcon.js",[],"/Users/adamas/dev/anthony-dumas.fr/src/components/ExperienceCard/ExperienceCard.js",[],"/Users/adamas/dev/anthony-dumas.fr/src/components/ContactButton/index.js",[],"/Users/adamas/dev/anthony-dumas.fr/src/components/ProjectCard/index.js",[],"/Users/adamas/dev/anthony-dumas.fr/src/components/ProjectCard/ProjectCard.js",[],"/Users/adamas/dev/anthony-dumas.fr/src/components/ContactButton/ContactButton.js",[],"/Users/adamas/dev/anthony-dumas.fr/src/messages/index.js",[],"/Users/adamas/dev/anthony-dumas.fr/src/services/message.service.js",[],{"ruleId":"93","replacedBy":"94"},{"ruleId":"95","replacedBy":"96"},"no-native-reassign",["97"],"no-negated-in-lhs",["98"],"no-global-assign","no-unsafe-negation"] \ No newline at end of file diff --git a/src/index.js b/src/index.js index 5f1784c..857508d 100644 --- a/src/index.js +++ b/src/index.js @@ -5,38 +5,10 @@ import ReactDOM from 'react-dom'; import { IntlProvider } from 'react-intl'; import App from './App'; -import messages from './messages'; import reportWebVitals from './reportWebVitals'; +import { i18nConfig, langJson, language } from './services/message.service'; -const GLOBAL_MESSAGE_KEY = "global"; -const i18nConfig = { - defaultLocale: 'fr', - messages, -}; - -const language = function () { - const queryString = window.location.search; - const urlParams = new URLSearchParams(queryString); - let lang = urlParams.get("lang"); - if (messages[lang] === undefined) { - lang = navigator.language.split(/[-_]/)[0]; - } - return lang; -} - -const langJson = function () { - const messageLocalized = i18nConfig.messages[language()]; - const messageGlobal = i18nConfig.messages[GLOBAL_MESSAGE_KEY]; - const messageMerged = { - ...messageLocalized, - ...messageGlobal - }; - - console.log(JSON.stringify(messageMerged)) - return messageMerged; -} - ReactDOM.render(