Merge branch 'master' of github.com:openedx/frontend-app-learning int…

…o Ali-Abbas/react-router-upgrade

.env.development

@@ -46,3 +46,5 @@ TWITTER_HASHTAG='myedxjourney'
 TWITTER_URL='https://twitter.com/edXOnline'
 USER_INFO_COOKIE_NAME='edx-user-info'
 SESSION_COOKIE_DOMAIN='localhost'
+CHAT_RESPONSE_URL='http://localhost:18000/api/learning_assistant/v1/course_id'
+PRIVACY_POLICY_URL='http://localhost:18000/privacy'

.env.test

@@ -45,3 +45,4 @@ TERMS_OF_SERVICE_URL='https://www.edx.org/edx-terms-service'
 TWITTER_HASHTAG='myedxjourney'
 TWITTER_URL='https://twitter.com/edXOnline'
 USER_INFO_COOKIE_NAME='edx-user-info'
+PRIVACY_POLICY_URL='http://localhost:18000/privacy'

.gitignore

@@ -1,6 +1,8 @@
 .DS_Store
 .eslintcache
 .idea
+*.swp
+*.swo
 node_modules
 npm-debug.log
 coverage

Makefile

@@ -54,11 +54,12 @@ pull_translations:
 	mkdir src/i18n/messages
 	cd src/i18n/messages \
       && atlas pull --filter=$(transifex_langs) \
+               translations/paragon/src/i18n/messages:paragon \
                translations/frontend-component-header/src/i18n/messages:frontend-component-header \
                translations/frontend-component-footer/src/i18n/messages:frontend-component-footer \
                translations/frontend-app-learning/src/i18n/messages:frontend-app-learning
 
-	$(intl_imports) frontend-component-header frontend-component-footer frontend-app-learning
+	$(intl_imports) paragon frontend-component-header frontend-component-footer frontend-app-learning
 endif
 
 # This target is used by Travis.

jest.config.js

@@ -9,6 +9,12 @@ module.exports = createConfig('jest', {
     'src/i18n',
     'src/.*\\.exp\\..*',
   ],
+  // see https://github.com/axios/axios/issues/5026
+  moduleNameMapper: {
+    "^axios$": "axios/dist/axios.js",
+    // See https://stackoverflow.com/questions/72382316/jest-encountered-an-unexpected-token-react-markdown
+    'react-markdown': '<rootDir>/node_modules/react-markdown/react-markdown.min.js',
+  },
   testTimeout: 30000,
   testEnvironment: 'jsdom'
 });