Merge pull request #2 from Horhik/dev

Dev
2020-03-19 17:16:30 -03:00 · 2020-03-19 17:16:30 -03:00 · ae3056461a
parent 5322ff1b08 ad4bbdeedf
commit ae3056461a
15 changed files with 182 additions and 411 deletions
--- a/src/actions/anki-get-actions.js
+++ b/src/actions/anki-get-actions.js
@ -34,7 +34,6 @@ export const checkAnkiAccess = async (
  ankiApiProvider = AnkiDroid.isApiAvailable,
 ) => {
  const [err, res] = await ankiApiProvider();
-  console.log(res, 'result');
  return err ? {type: ERROR, err} : {type: CHECK_ANKI_ACCESS, payload: res};
 };

@ -109,7 +108,6 @@ export const checkAnkiLanModelForExisting = (
  try {
    for (let model of modelList) {
      if (model.name === name) {
-        console.log('founded');
        await dispatch(setExistingOfAnkiLanModel(true));
        return true;
      }
--- a/src/actions/api/dictionary.js
+++ b/src/actions/api/dictionary.js
@ -1,32 +1,16 @@
 import {search} from 'urban-dictionary-client';
-import {SET_AVAILABLE_API} from '../../constants/api-constants';
+import {
+  SET_AVAILABLE_API,
+  URBAN_DICTIONARY_API,
+  WORDS_API,
+} from '../../constants/api-constants';
 const fetch = require('node-fetch');
-
-async function getResFromWordsAPI(word) {
-  const req = await fetch(`https://wordsapiv1.p.rapidapi.com/words/${word}`, {
-    method: 'GET',
-    headers: {
-      'x-rapidapi-host': 'wordsapiv1.p.rapidapi.com',
-      'x-rapidapi-key': 'e08b0f617cmsh74abbf9a3b01eb0p164f22jsnabea29750b15',
-    },
-  });
-  const json = await req.json();
-  const res = {...json, source: 'wordsAPI'};
-  if (res.success === false) {
-    // throw new Error(res.message);
-    return false;
-  }
-  return Promise.resolve(res);
-}
-
-async function getResFromUrbanDictionary(word) {
-  const res = await search(word);
-  if (res.list.length === 0) {
-    // throw new Error('nothing was found');
-    return false;
-  }
-  return Promise.resolve({...res, word, source: 'urbanDictionary'});
-}
+import {getResFromWordsAPI, parseWordsApi} from './words-api';
+import {
+  getResFromUrbanDictionary,
+  parseUrbanDictionaryApi,
+} from './urban-dictionary';
+import {createDictionary} from '../dictionary/create-dictionary';

 const getAvailableApi = (apiArray = []) => {
  for (const api of apiArray) {
@ -41,16 +25,22 @@ const setAvailableApi = api => ({
  type: SET_AVAILABLE_API,
  payload: api,
 });
+
 export const wordInfo = word => async dispatch => {
  try {
    const api1 = await getResFromWordsAPI(word);
-    const api2 = await getResFromUrbanDictionary(word);
-    const availableApi = getAvailableApi([api1, api2]);
-    console.log(availableApi);
-    if (availableApi === false) {
-      throw new Error('word not found');
-    }
-    await dispatch(setAvailableApi(availableApi));
+    //TODO add Urban Dictionary
+
+    // const api2 = await getResFromUrbanDictionary(word);
+    // const availableApi = getAvailableApi([api1, api2]);
+    // if (availableApi === false) {
+    //   throw new Error('word not found');
+    // }
+
+    //function which return universal template for more simple interaction with api
+    //TODO available dictionary instead api1
+    await dispatch(setAvailableApi(api1));
+    await createDictionary(api1);
  } catch (e) {
    console.log(e);
  }
--- a/src/actions/api/parse-actions.js
+++ b/src/actions/api/parse-actions.js
--- a/src/actions/api/urban-dictionary.js
+++ b/src/actions/api/urban-dictionary.js
@ -0,0 +1,13 @@
+import {search} from "urban-dictionary-client";
+import {URBAN_DICTIONARY_API} from "../../constants/api-constants";
+
+export async function getResFromUrbanDictionary(word) {
+    const res = await search(word);
+    if (res.list.length === 0) {
+        // throw new Error('nothing was found');
+        return false;
+    }
+    return Promise.resolve({...res, word, source: URBAN_DICTIONARY_API});
+}
+
+export const parseUrbanDictionaryApi = api => {}
--- a/src/actions/api/word-sound.js
+++ b/src/actions/api/word-sound.js
@ -1,5 +1,5 @@
-const getAudio = async url => {
-  const site = await fetch(url, {
+const getAudio = async word => {
+  const site = await fetch(word, {
    method: 'GET',
    headers: {'Content-Type': 'text/html'},
  });
--- a/src/actions/api/words-api.js
+++ b/src/actions/api/words-api.js
@ -0,0 +1,51 @@
+import {WORDS_API} from '../../constants/api-constants';
+
+export async function getResFromWordsAPI(word) {
+  const req = await fetch(`https://wordsapiv1.p.rapidapi.com/words/${word}`, {
+    method: 'GET',
+    headers: {
+      'x-rapidapi-host': 'wordsapiv1.p.rapidapi.com',
+      'x-rapidapi-key': 'e08b0f617cmsh74abbf9a3b01eb0p164f22jsnabea29750b15',
+    },
+  });
+  const json = await req.json();
+  const res = {...json, source: WORDS_API};
+  if (res.success === false) {
+    // throw new Error(res.message);
+    return false;
+  }
+  return Promise.resolve(res);
+}
+
+const parsePOS = wordArray => {
+  let posSet = new Set();
+  let posArray = [];
+  wordArray.forEach((result, id) => {
+    const pos = result.partOfSpeech;
+    if (!posSet.has(pos)) {
+      posSet.add(pos);
+      posArray.push({pos, id});
+    }
+  });
+  return posArray;
+};
+//get all what anki template need for template
+const getDefinitionList = wordsArray => {
+  const partOfSpeeches = parsePOS(wordsArray);
+  let definitionList = [];
+  partOfSpeeches.forEach(pos => {
+    const currentWord = wordsArray[pos.id];
+    definitionList.push({
+      definition: currentWord.definition,
+      example: currentWord.examples ? currentWord.examples[0] : undefined,
+      id: pos.id,
+      pos: pos.pos,
+    });
+  });
+  return definitionList;
+};
+
+export const parseWordsApi = api => ({
+  pronunciation: api.pronunciation.all,
+  words: api.results ? getDefinitionList(api.results) : [],
+});
--- a/src/actions/api/yandex-dictionary.js
+++ b/src/actions/api/yandex-dictionary.js
@ -2,21 +2,21 @@ import fetch from 'node-fetch';
 import {SET_YANDEX_DICTIONARY_RESPONSE} from '../../constants/api-constants';
 const yKey =
  'dict.1.1.20200313T141325Z.a8dfc0a8b66fb54c.f84fd712f759aa3abd7a7ecac35ac608181e2865';
-const yDictionary = (
+const yDictionary = async (
  word = String,
  languages = 'en-ru',
  apiKey = yKey,
-) => async dispatch => {
+) => {
  try {
    const res = await fetch(
      `https://dictionary.yandex.net/api/v1/dicservice.json/lookup?key=${apiKey}&lang=${languages}&text=${word}`,
      {method: 'GET'},
    );
    const json = await res.json();
-    await dispatch(findPartofSpeech(json.def));
-    return json.def;
+    // console.log(word, json.def);
+    return findPartofSpeech(json.def);
  } catch (e) {
-    console.warn('err in yandex-dictionary.js: ', e);
+    console.log('err in yandex-dictionary.js: ', e);
  }
 };

@ -26,14 +26,15 @@ const translateTemplate = (pos, tr) => ({
 });

 export const findPartofSpeech = dictionary => {
-  return {
-    type: SET_YANDEX_DICTIONARY_RESPONSE,
-    payload: [
+  if (dictionary.length > 1) {
+    return [
      // TODO create flexible field selector, by poses count
      translateTemplate(dictionary[0].pos, dictionary[0].tr[0].text),
      translateTemplate(dictionary[1].pos, dictionary[1].tr[0].text),
-    ],
-  };
+    ];
+  } else {
+    return [translateTemplate(dictionary[0].pos, dictionary[0].tr[0].text)];
+  }
 };

 export default yDictionary;
--- a/src/actions/dictionary/create-dictionary.js
+++ b/src/actions/dictionary/create-dictionary.js
@ -0,0 +1,10 @@
+import {parseDictionary} from './parsing-dictionary';
+import getAudio from '../api/word-sound';
+import {compoundWithYDictionary} from './get-translate';
+
+export const createDictionary = async apiRes => {
+  const word = apiRes.word;
+  const parsedDictionary = parseDictionary(apiRes);
+  // const audio = await getAudio(word);
+  await compoundWithYDictionary(parsedDictionary, word);
+};
--- a/src/actions/dictionary/get-translate.js
+++ b/src/actions/dictionary/get-translate.js
@ -0,0 +1,40 @@
+import yDictionary from '../api/yandex-dictionary';
+export const compoundWithYDictionary = async (definitionList, word) => {
+  try {
+    const translations = await yDictionary(word);
+    let compounded = [];
+    // console.log('YANDEX ', translations);
+    // console.log('WORDS', definitionList);
+
+    translations.forEach(translate => {
+      definitionList.words.forEach(definition => {
+        if (definition.pos === translate.pos) {
+          const compound = {...definition, ...translate};
+          compounded.push(compound);
+        }
+      });
+      if (definitionList.words.length === 0) {
+        compounded.push(translate);
+      }
+    });
+    console.log(`RESPONSE FOR: ${word}`, compounded);
+  } catch (e) {
+    console.log('erris HERE', e);
+  }
+};
+
+/*
+import yDictionary from '../api/yandex-dictionary';
+let smallStore = {};
+
+export const compoundWithYDictionary = async (definitionList, word) => {
+  let properDefinitions = [];
+  const translations = (() => {
+    yDictionary(word).then(res => {
+      smallStore.res = res;
+    });
+  })();
+  const yDictionaryRes = smallStore.res.payload;
+  alert('foo');
+  console.log(yDictionaryRes, definitionList);
+};*/
--- a/src/actions/dictionary/parsing-dictionary.js
+++ b/src/actions/dictionary/parsing-dictionary.js
@ -0,0 +1,16 @@
+//middleware between two api response parsers
+import {URBAN_DICTIONARY_API, WORDS_API} from '../../constants/api-constants';
+import {parseWordsApi} from '../api/words-api';
+import {parseUrbanDictionaryApi} from '../api/urban-dictionary';
+
+export const parseDictionary = api => {
+  switch (api.source) {
+    case WORDS_API:
+      return parseWordsApi(api);
+    case URBAN_DICTIONARY_API:
+      alert('Not available yet');
+      return parseUrbanDictionaryApi(api);
+    default:
+      throw new Error('wrong api');
+  }
+};
--- a/src/components/anki-form.jsx
+++ b/src/components/anki-form.jsx
@ -2,17 +2,21 @@ import React, {useEffect} from 'react';
 import {connect} from 'react-redux';
 import DeckPicker from './view/deck-picker';
 import {Form, Container, Item} from 'native-base';
-import AnkiTemplate from './view/add-main-template';
 import {checkAnkiLanModelForExisting} from '../actions/anki-get-actions';
 import InputWord from './view/translatable-word';
 import SubmitButton from './view/submit-button';
-import yDictionary from '../actions/api/yandex-dictionary';
 import {wordInfo} from "../actions/api/dictionary";

 const AnkiForm = props => {
  useEffect(() => {
-    props.yDictionary('wealth');
-    props.wordInfo('suck')
+    props.wordInfo('Urge');
+      props.wordInfo('Maze');
+      props.wordInfo('Ramification');
+      props.wordInfo('Dare');
+      props.wordInfo('Entrepreneurship');
+      props.wordInfo('meagre');
+      props.wordInfo('meager');
+
  }, []);
  return (
    <Container style={{padding: 20}}>
@ -34,7 +38,6 @@ export default connect(
  }),
  {
    checkAnkiLanModelForExisting,
-    yDictionary,
      wordInfo

  },
--- a/src/constants/api-constants.js
+++ b/src/constants/api-constants.js
@ -1,3 +1,8 @@
-// export const c = 'c'
+// export const ct = 'ct'
 export const SET_YANDEX_DICTIONARY_RESPONSE = 'SET_YANDEX_DICTIONARY_RESPONSE';
 export const SET_AVAILABLE_API = 'SET_AVAILABLE_API';
+export const WORDS_API = 'WORDS_API'
+export const URBAN_DICTIONARY_API = 'URBAN_DICTIONARY_API'
+
+
+export const SET_PARSED_DICTIONARY = 'SET_PARSED_DICTIONARY'
--- a/src/reducers/anki-reducer.js
+++ b/src/reducers/anki-reducer.js
@ -28,7 +28,6 @@ const initialState = {
 const ankiReducer = (state = initialState, action) => {
  switch (action.type) {
    case REQUEST_PERMISSIONS:
-      console.log(action.payload);
      return {...state, appHasAccess: action.payload};
    case GET_DECK_LIST:
      return {...state, deckList: action.payload};
--- a/src/reducers/api-reducer.js
+++ b/src/reducers/api-reducer.js
@ -10,6 +10,7 @@ const initialState = {
  availableApi: {},
  availableApiName: '',
  yandexDictionaryInfo: [],
+  parsedDictionary: {},
 };

 const apiReducer = (state = initialState, action) => {
--- a/yarn.lock
+++ b/yarn.lock
@ -1213,68 +1213,27 @@ acorn-globals@^4.3.2:
    acorn "^6.0.1"
    acorn-walk "^6.0.1"

-<<<<<<< HEAD
-acorn-jsx@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-3.0.1.tgz#afdf9488fb1ecefc8348f6fb22f464e32a58b36b"
-  integrity sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=
-  dependencies:
-    acorn "^3.0.4"
-=======
 acorn-jsx@^5.2.0:
  version "5.2.0"
  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.2.0.tgz#4c66069173d6fdd68ed85239fc256226182b2ebe"
  integrity sha512-HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ==
->>>>>>> master

 acorn-walk@^6.0.1:
  version "6.2.0"
  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-6.2.0.tgz#123cb8f3b84c2171f1f7fb252615b1c78a6b1a8c"
  integrity sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA==

-<<<<<<< HEAD
-acorn@^3.0.4:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
-  integrity sha1-ReN/s56No/JbruP/U2niu18iAXo=
-
-acorn@^5.5.0, acorn@^5.5.3:
-  version "5.7.4"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.4.tgz#3e8d8a9947d0599a1796d10225d7432f4a4acf5e"
-  integrity sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==
-
-=======
->>>>>>> master
 acorn@^6.0.1:
  version "6.4.1"
  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.1.tgz#531e58ba3f51b9dacb9a6646ca4debf5b14ca474"
  integrity sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==

-<<<<<<< HEAD
-ajv-keywords@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.1.tgz#617997fc5f60576894c435f940d819e135b80762"
-  integrity sha1-YXmX/F9gV2iUxDX5QNgZ4TW4B2I=
-
-ajv@^5.2.3, ajv@^5.3.0:
-  version "5.5.2"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
-  integrity sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=
-  dependencies:
-    co "^4.6.0"
-    fast-deep-equal "^1.0.0"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.3.0"
-
-ajv@^6.5.5:
-=======
 acorn@^7.1.0, acorn@^7.1.1:
  version "7.1.1"
  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.1.1.tgz#e35668de0b402f359de515c5482a1ab9f89a69bf"
  integrity sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg==

 ajv@^6.10.0, ajv@^6.10.2, ajv@^6.5.5:
->>>>>>> master
  version "6.12.0"
  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.0.tgz#06d60b96d87b8454a5adaba86e7854da629db4b7"
  integrity sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==
@ -1391,8 +1350,6 @@ anymatch@^2.0.0:
    micromatch "^3.1.4"
    normalize-path "^2.1.1"

-<<<<<<< HEAD
-=======
 anymatch@^3.0.3:
  version "3.1.1"
  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz#c55ecf02185e2469259399310c173ce31233b142"
@ -1401,7 +1358,6 @@ anymatch@^3.0.3:
    normalize-path "^3.0.0"
    picomatch "^2.0.4"

->>>>>>> master
 argparse@^1.0.7:
  version "1.0.10"
  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
@ -1557,9 +1513,6 @@ aws4@^1.8.0:
  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.9.1.tgz#7e33d8f7d449b3f673cd72deb9abdc552dbe528e"
  integrity sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug==

-<<<<<<< HEAD
-babel-code-frame@^6.22.0:
-=======
 axios@^0.19.2:
  version "0.19.2"
  resolved "https://registry.yarnpkg.com/axios/-/axios-0.19.2.tgz#3ea36c5d8818d0d5f8a8a97a6d36b86cdc00cb27"
@ -1568,7 +1521,6 @@ axios@^0.19.2:
    follow-redirects "1.5.10"

 babel-code-frame@^6.26.0:
->>>>>>> master
  version "6.26.0"
  resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
  integrity sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=
@ -1577,17 +1529,10 @@ babel-code-frame@^6.26.0:
    esutils "^2.0.2"
    js-tokens "^3.0.2"

-<<<<<<< HEAD
-babel-eslint@10.0.1:
-  version "10.0.1"
-  resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.0.1.tgz#919681dc099614cd7d31d45c8908695092a1faed"
-  integrity sha512-z7OT1iNV+TjOwHNLLyJk+HN+YVWX+CLE6fPD2SymJZOZQBs+QIexFjhm4keGTm8MW9xr4EC9Q0PbaLB24V5GoQ==
-=======
 babel-eslint@10.0.3:
  version "10.0.3"
  resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.0.3.tgz#81a2c669be0f205e19462fed2482d33e4687a88a"
  integrity sha512-z3U7eMY6r/3f3/JB9mTsLjyxrv0Yb1zb8PCWCLpguxfCzBIZUwy23R1t/XKewP+8mEN2Ck8Dtr4q20z6ce6SoA==
->>>>>>> master
  dependencies:
    "@babel/code-frame" "^7.0.0"
    "@babel/parser" "^7.0.0"
@ -2313,13 +2258,6 @@ caller-callsite@^2.0.0:
  dependencies:
    callsites "^2.0.0"

-caller-path@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-0.1.0.tgz#94085ef63581ecd3daa92444a8fe94e82577751f"
-  integrity sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=
-  dependencies:
-    callsites "^0.2.0"
-
 caller-path@^2.0.0:
  version "2.0.0"
  resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-2.0.0.tgz#468f83044e369ab2010fac5f06ceee15bb2cb1f4"
@ -2327,11 +2265,6 @@ caller-path@^2.0.0:
  dependencies:
    caller-callsite "^2.0.0"

-callsites@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/callsites/-/callsites-0.2.0.tgz#afab96262910a7f33c19a5775825c69f34e350ca"
-  integrity sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo=
-
 callsites@^2.0.0:
  version "2.0.0"
  resolved "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50"
@ -2408,24 +2341,16 @@ chardet@^0.4.0:
  resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz#b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2"
  integrity sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I=

-<<<<<<< HEAD
-=======
 chardet@^0.7.0:
  version "0.7.0"
  resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
  integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==

->>>>>>> master
 ci-info@^2.0.0:
  version "2.0.0"
  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46"
  integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==

-circular-json@^0.3.1:
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.3.3.tgz#815c99ea84f6809529d2f45791bdf82711352d66"
-  integrity sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==
-
 clamp@^1.0.1:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/clamp/-/clamp-1.0.1.tgz#66a0e64011816e37196828fdc8c8c147312c8634"
@ -2823,28 +2748,17 @@ dayjs@^1.8.15:
  resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.8.22.tgz#5e835d776b373e216678be8d12c336da71a25a9c"
  integrity sha512-N8IXfxBD62Y9cKTuuuSoOlCXRnnzaTj1vu91r855iq6FbY5cZqOZnW/95nUn6kJiR+W9PHHrLykEoQOe6fUKxQ==

-<<<<<<< HEAD
-debug@2.6.9, debug@^2.2.0, debug@^2.3.3:
-=======
 debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8:
->>>>>>> master
  version "2.6.9"
  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
  dependencies:
    ms "2.0.0"

-<<<<<<< HEAD
-debug@^3.1.0:
-  version "3.2.6"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
-  integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
-=======
 debug@=3.1.0:
  version "3.1.0"
  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
  integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
->>>>>>> master
  dependencies:
    ms "2.0.0"

@ -2936,34 +2850,20 @@ destroy@~1.0.4:
  resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
  integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=

-<<<<<<< HEAD
-detect-newline@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2"
-  integrity sha1-9B8cEL5LAOh7XxPaaAdZ8sW/0+I=
-=======
 detect-newline@^3.0.0:
  version "3.1.0"
  resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651"
  integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==
->>>>>>> master

 didyoumean@^1.2.1:
  version "1.2.1"
  resolved "https://registry.yarnpkg.com/didyoumean/-/didyoumean-1.2.1.tgz#e92edfdada6537d484d73c0172fd1eba0c4976ff"
  integrity sha1-6S7f2tplN9SE1zwBcv0eugxJdv8=

-<<<<<<< HEAD
-diff-sequences@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-24.9.0.tgz#5715d6244e2aa65f48bba0bc972db0b0b11e95b5"
-  integrity sha512-Dj6Wk3tWyTE+Fo1rW8v0Xhwk80um6yFYKbuAxc9c3EZxIHFDYwbi34Uk42u1CdnIiVorvt4RmlSDjIPyzGC2ew==
-=======
 diff-sequences@^25.1.0:
  version "25.1.0"
  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-25.1.0.tgz#fd29a46f1c913fd66c22645dc75bffbe43051f32"
  integrity sha512-nFIfVk5B/NStCsJ+zaPO4vYuLjlzQ6uFvPxzYyHlejNZ/UGa7G/n7peOXVrVNvRuyfstt+mZQYGpjxg9Z6N8Kw==
->>>>>>> master

 doctrine@^2.1.0:
  version "2.1.0"
@ -3180,14 +3080,6 @@ eslint-plugin-react@7.16.0:
    prop-types "^15.7.2"
    resolve "^1.12.0"

-eslint-scope@^3.7.1:
-  version "3.7.3"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-3.7.3.tgz#bb507200d3d17f60247636160b4826284b108535"
-  integrity sha512-W+B0SvF4gamyCTmUc+uITPY0989iXVfKvhwtmJocTaYoc/3khEHmEmvfY/Gn9HA9VV75jrQECsHizkNw1b68FA==
-  dependencies:
-    esrecurse "^4.1.0"
-    estraverse "^4.1.1"
-
 eslint-scope@^4.0.0:
  version "4.0.3"
  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.3.tgz#ca03833310f6889a3264781aa82e63eb9cfe7848"
@ -3216,58 +3108,6 @@ eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0:
  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2"
  integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==

-<<<<<<< HEAD
-eslint@^4.18.2:
-  version "4.18.2"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.18.2.tgz#0f81267ad1012e7d2051e186a9004cc2267b8d45"
-  integrity sha512-qy4i3wODqKMYfz9LUI8N2qYDkHkoieTbiHpMrYUI/WbjhXJQr7lI4VngixTgaG+yHX+NBCv7nW4hA0ShbvaNKw==
-  dependencies:
-    ajv "^5.3.0"
-    babel-code-frame "^6.22.0"
-    chalk "^2.1.0"
-    concat-stream "^1.6.0"
-    cross-spawn "^5.1.0"
-    debug "^3.1.0"
-    doctrine "^2.1.0"
-    eslint-scope "^3.7.1"
-    eslint-visitor-keys "^1.0.0"
-    espree "^3.5.2"
-    esquery "^1.0.0"
-    esutils "^2.0.2"
-    file-entry-cache "^2.0.0"
-    functional-red-black-tree "^1.0.1"
-    glob "^7.1.2"
-    globals "^11.0.1"
-    ignore "^3.3.3"
-    imurmurhash "^0.1.4"
-    inquirer "^3.0.6"
-    is-resolvable "^1.0.0"
-    js-yaml "^3.9.1"
-    json-stable-stringify-without-jsonify "^1.0.1"
-    levn "^0.3.0"
-    lodash "^4.17.4"
-    minimatch "^3.0.2"
-    mkdirp "^0.5.1"
-    natural-compare "^1.4.0"
-    optionator "^0.8.2"
-    path-is-inside "^1.0.2"
-    pluralize "^7.0.0"
-    progress "^2.0.0"
-    require-uncached "^1.0.3"
-    semver "^5.3.0"
-    strip-ansi "^4.0.0"
-    strip-json-comments "~2.0.1"
-    table "4.0.2"
-    text-table "~0.2.0"
-
-espree@^3.5.2:
-  version "3.5.4"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-3.5.4.tgz#b0f447187c8a8bed944b815a660bddf5deb5d1a7"
-  integrity sha512-yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A==
-  dependencies:
-    acorn "^5.5.0"
-    acorn-jsx "^3.0.0"
-=======
 eslint@^6.8.0:
  version "6.8.0"
  resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.8.0.tgz#62262d6729739f9275723824302fb227c8c93ffb"
@ -3319,18 +3159,13 @@ espree@^6.1.2:
    acorn "^7.1.1"
    acorn-jsx "^5.2.0"
    eslint-visitor-keys "^1.1.0"
->>>>>>> master

 esprima@^4.0.0, esprima@^4.0.1:
  version "4.0.1"
  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==

-<<<<<<< HEAD
-esquery@^1.0.0:
-=======
 esquery@^1.0.1:
->>>>>>> master
  version "1.1.0"
  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.1.0.tgz#c5c0b66f383e7656404f86b31334d72524eddb48"
  integrity sha512-MxYW9xKmROWF672KqjO75sszsA8Mxhw06YFeS5VHlB98KDHbOSurm3ArsjO60Eaf3QmGMCP1yn+0JQkNLo/97Q==
@ -3580,11 +3415,6 @@ fancy-log@^1.3.2:
    parse-node-version "^1.0.0"
    time-stamp "^1.0.0"

-fast-deep-equal@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614"
-  integrity sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=
-
 fast-deep-equal@^3.1.1:
  version "3.1.1"
  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz#545145077c501491e33b15ec408c294376e94ae4"
@ -3675,15 +3505,6 @@ figures@^2.0.0:
  dependencies:
    escape-string-regexp "^1.0.5"

-<<<<<<< HEAD
-file-entry-cache@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-2.0.0.tgz#c392990c3e684783d838b8c84a45d8a048458361"
-  integrity sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=
-  dependencies:
-    flat-cache "^1.2.1"
-    object-assign "^4.0.1"
-=======
 figures@^3.0.0:
  version "3.2.0"
  resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af"
@ -3697,7 +3518,6 @@ file-entry-cache@^5.0.1:
  integrity sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==
  dependencies:
    flat-cache "^2.0.1"
->>>>>>> master

 file-uri-to-path@1.0.0:
  version "1.0.0"
@ -3765,17 +3585,6 @@ find-up@^4.0.0, find-up@^4.1.0:
    locate-path "^5.0.0"
    path-exists "^4.0.0"

-<<<<<<< HEAD
-flat-cache@^1.2.1:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-1.3.4.tgz#2c2ef77525cc2929007dfffa1dd314aa9c9dee6f"
-  integrity sha512-VwyB3Lkgacfik2vhqR4uv2rvebqmDvFu4jlN/C1RzWoJEo8I7z4Q404oiqYCkq41mni8EzQnm95emU9seckwtg==
-  dependencies:
-    circular-json "^0.3.1"
-    graceful-fs "^4.1.2"
-    rimraf "~2.6.2"
-    write "^0.2.1"
-=======
 flat-cache@^2.0.1:
  version "2.0.1"
  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz#5d296d6f04bda44a4630a301413bdbc2ec085ec0"
@ -3789,7 +3598,6 @@ flatted@^2.0.0:
  version "2.0.1"
  resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.1.tgz#69e57caa8f0eacbc281d2e2cb458d46fdb449e08"
  integrity sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg==
->>>>>>> master

 fleximap@~0.9.10:
  version "0.9.10"
@ -3990,9 +3798,6 @@ glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4:
    once "^1.3.0"
    path-is-absolute "^1.0.0"

-<<<<<<< HEAD
-globals@^11.0.1, globals@^11.1.0:
-=======
 global@^4.3.0:
  version "4.4.0"
  resolved "https://registry.yarnpkg.com/global/-/global-4.4.0.tgz#3e7b105179006a323ed71aafca3e9c57a5cc6406"
@ -4002,14 +3807,10 @@ global@^4.3.0:
    process "^0.11.10"

 globals@^11.1.0:
->>>>>>> master
  version "11.12.0"
  resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
  integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==

-<<<<<<< HEAD
-graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.6, graceful-fs@^4.1.9:
-=======
 globals@^12.1.0:
  version "12.4.0"
  resolved "https://registry.yarnpkg.com/globals/-/globals-12.4.0.tgz#a18813576a41b00a24a97e7f815918c2e19925f8"
@ -4023,7 +3824,6 @@ globals@^9.18.0:
  integrity sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==

 graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.3:
->>>>>>> master
  version "4.2.3"
  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423"
  integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==
@ -4176,16 +3976,12 @@ http-signature@~1.2.0:
    jsprim "^1.2.2"
    sshpk "^1.7.0"

-<<<<<<< HEAD
-iconv-lite@0.4.24, iconv-lite@^0.4.17, iconv-lite@~0.4.13:
-=======
 human-signals@^1.1.1:
  version "1.1.1"
  resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"
  integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==

 iconv-lite@0.4.24, iconv-lite@^0.4.17, iconv-lite@^0.4.24, iconv-lite@~0.4.13:
->>>>>>> master
  version "0.4.24"
  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
  integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
@ -4197,17 +3993,10 @@ ieee754@^1.1.4:
  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84"
  integrity sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==

-<<<<<<< HEAD
-ignore@^3.3.3:
-  version "3.3.10"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043"
-  integrity sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==
-=======
 ignore@^4.0.6:
  version "4.0.6"
  resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
  integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
->>>>>>> master

 ignore@^5.0.5:
  version "5.1.4"
@ -4512,11 +4301,6 @@ is-regex@^1.0.5:
  dependencies:
    has "^1.0.3"

-is-resolvable@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88"
-  integrity sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==
-
 is-stream@^1.0.1, is-stream@^1.1.0:
  version "1.1.0"
  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
@ -4554,14 +4338,11 @@ is-wsl@^1.1.0:
  resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
  integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=

-<<<<<<< HEAD
-=======
 is-wsl@^2.1.1:
  version "2.1.1"
  resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.1.1.tgz#4a1c152d429df3d441669498e2486d3596ebaf1d"
  integrity sha512-umZHcSrwlDHo2TGMXv0DZ8dIUGunZ2Iv68YZnrmCiBPkZ4aaOhtv7pXJKeki9k3qJ3RJr0cDyitcl5wEH3AYog==

->>>>>>> master
 isarray@1.0.0, isarray@~1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
@ -5122,11 +4903,7 @@ js-tokens@^3.0.2:
  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
  integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls=

-<<<<<<< HEAD
-js-yaml@^3.13.1, js-yaml@^3.9.1:
-=======
 js-yaml@^3.13.1:
->>>>>>> master
  version "3.13.1"
  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
  integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
@ -5196,11 +4973,6 @@ json-parse-better-errors@^1.0.1:
  resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
  integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==

-json-schema-traverse@^0.3.0:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
-  integrity sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=
-
 json-schema-traverse@^0.4.1:
  version "0.4.1"
  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
@ -5420,11 +5192,7 @@ lodash.unescape@4.0.1:
  resolved "https://registry.yarnpkg.com/lodash.unescape/-/lodash.unescape-4.0.1.tgz#bf2249886ce514cda112fae9218cdc065211fc9c"
  integrity sha1-vyJJiGzlFM2hEvrpIYzcBlIR/Jw=

-<<<<<<< HEAD
-lodash@^4.0.0, lodash@^4.15.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.0, lodash@^4.3.0, lodash@^4.8.0:
-=======
 lodash@^4.0.0, lodash@^4.15.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.0, lodash@^4.3.0, lodash@^4.6.1, lodash@^4.8.0:
->>>>>>> master
  version "4.17.15"
  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
  integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
@ -5893,9 +5661,6 @@ mimic-fn@^2.0.0, mimic-fn@^2.1.0:
  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
  integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==

-<<<<<<< HEAD
-minimatch@^3.0.2, minimatch@^3.0.4:
-=======
 min-document@^2.19.0:
  version "2.19.0"
  resolved "https://registry.yarnpkg.com/min-document/-/min-document-2.19.0.tgz#7bd282e3f5842ed295bb748cdd9f1ffa2c824685"
@ -5904,7 +5669,6 @@ min-document@^2.19.0:
    dom-walk "^0.1.0"

 minimatch@^3.0.4:
->>>>>>> master
  version "3.0.4"
  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
@ -5922,15 +5686,9 @@ minimist@1.1.0:
  integrity sha1-zfIl6ImPhAolje1E/JF3Z3Cv3JM=

 minimist@^1.1.1, minimist@^1.2.0:
-<<<<<<< HEAD
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
-  integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
-=======
  version "1.2.5"
  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
  integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
->>>>>>> master

 mixin-deep@^1.2.0:
  version "1.3.2"
@ -6110,8 +5868,6 @@ node-notifier@^5.2.1:
    shellwords "^0.1.1"
    which "^1.3.0"

-<<<<<<< HEAD
-=======
 node-notifier@^6.0.0:
  version "6.0.0"
  resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-6.0.0.tgz#cea319e06baa16deec8ce5cd7f133c4a46b68e12"
@ -6123,7 +5879,6 @@ node-notifier@^6.0.0:
    shellwords "^0.1.1"
    which "^1.3.1"

->>>>>>> master
 normalize-package-data@^2.3.2:
  version "2.5.0"
  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
@ -6141,14 +5896,11 @@ normalize-path@^2.1.1:
  dependencies:
    remove-trailing-separator "^1.0.1"

-<<<<<<< HEAD
-=======
 normalize-path@^3.0.0:
  version "3.0.0"
  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
  integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==

->>>>>>> master
 npm-run-path@^2.0.0:
  version "2.0.2"
  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
@ -6156,8 +5908,6 @@ npm-run-path@^2.0.0:
  dependencies:
    path-key "^2.0.0"

-<<<<<<< HEAD
-=======
 npm-run-path@^4.0.0:
  version "4.0.1"
  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"
@ -6165,7 +5915,6 @@ npm-run-path@^4.0.0:
  dependencies:
    path-key "^3.0.0"

->>>>>>> master
 nullthrows@^1.1.0:
  version "1.1.1"
  resolved "https://registry.yarnpkg.com/nullthrows/-/nullthrows-1.1.1.tgz#7818258843856ae971eae4208ad7d7eb19a431b1"
@ -6327,11 +6076,7 @@ opencollective-postinstall@^2.0.2:
  resolved "https://registry.yarnpkg.com/opencollective-postinstall/-/opencollective-postinstall-2.0.2.tgz#5657f1bede69b6e33a45939b061eb53d3c6c3a89"
  integrity sha512-pVOEP16TrAO2/fjej1IdOyupJY8KDUM1CvsaScRbw6oddvpQoOfGk4ywha0HKKVAD6RkW4x6Q+tNBwhf3Bgpuw==

-<<<<<<< HEAD
-optionator@^0.8.1, optionator@^0.8.2:
-=======
 optionator@^0.8.1, optionator@^0.8.3:
->>>>>>> master
  version "0.8.3"
  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
  integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==
@ -6515,11 +6260,6 @@ path-is-absolute@^1.0.0:
  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=

-path-is-inside@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
-  integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=
-
 path-key@^2.0.0, path-key@^2.0.1:
  version "2.0.1"
  resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
@ -6620,11 +6360,6 @@ plugin-error@^0.1.2:
    arr-union "^2.0.1"
    extend-shallow "^1.1.2"

-pluralize@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777"
-  integrity sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==
-
 pn@^1.1.0:
  version "1.1.0"
  resolved "https://registry.yarnpkg.com/pn/-/pn-1.1.0.tgz#e2f4cef0e219f463c179ab37463e4e1ecdccbafb"
@ -6682,14 +6417,11 @@ process-nextick-args@~2.0.0:
  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
  integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==

-<<<<<<< HEAD
-=======
 process@^0.11.10:
  version "0.11.10"
  resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
  integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI=

->>>>>>> master
 progress@^2.0.0:
  version "2.0.3"
  resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
@ -6787,14 +6519,11 @@ raw-body@2.4.0:
    iconv-lite "0.4.24"
    unpipe "1.0.0"

-<<<<<<< HEAD
-=======
 react-deep-force-update@^1.0.0:
  version "1.1.2"
  resolved "https://registry.yarnpkg.com/react-deep-force-update/-/react-deep-force-update-1.1.2.tgz#3d2ae45c2c9040cbb1772be52f8ea1ade6ca2ee1"
  integrity sha512-WUSQJ4P/wWcusaH+zZmbECOk7H5N2pOIl0vzheeornkIMhu+qrNdGFm0bDZLCb0hSF0jf/kH1SgkNGfBdTc4wA==

->>>>>>> master
 react-devtools-core@^3.6.3:
  version "3.6.3"
  resolved "https://registry.yarnpkg.com/react-devtools-core/-/react-devtools-core-3.6.3.tgz#977d95b684c6ad28205f0c62e1e12c5f16675814"
@ -6973,18 +6702,6 @@ read-pkg@^2.0.0:
    normalize-package-data "^2.3.2"
    path-type "^2.0.0"

-<<<<<<< HEAD
-read-pkg@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389"
-  integrity sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=
-  dependencies:
-    load-json-file "^4.0.0"
-    normalize-package-data "^2.3.2"
-    path-type "^3.0.0"
-
-=======
->>>>>>> master
 readable-stream@^2.0.1, readable-stream@^2.2.2, readable-stream@~2.3.6:
  version "2.3.7"
  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
@ -7239,33 +6956,13 @@ require-main-filename@^2.0.0:
  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
  integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==

-<<<<<<< HEAD
-require-uncached@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/require-uncached/-/require-uncached-1.0.3.tgz#4e0d56d6c9662fd31e43011c4b95aa49955421d3"
-  integrity sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=
-  dependencies:
-    caller-path "^0.1.0"
-    resolve-from "^1.0.0"
-
-resolve-cwd@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
-  integrity sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=
-=======
 resolve-cwd@^3.0.0:
  version "3.0.0"
  resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d"
  integrity sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==
->>>>>>> master
  dependencies:
    resolve-from "^5.0.0"

-resolve-from@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"
-  integrity sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY=
-
 resolve-from@^3.0.0:
  version "3.0.0"
  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
@ -7327,9 +7024,6 @@ ret@~0.1.10:
  resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
  integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==

-<<<<<<< HEAD
-rimraf@^2.5.4, rimraf@^2.6.3:
-=======
 rimraf@2.6.3:
  version "2.6.3"
  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
@ -7338,7 +7032,6 @@ rimraf@2.6.3:
    glob "^7.1.3"

 rimraf@^2.5.4:
->>>>>>> master
  version "2.7.1"
  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
  integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
@ -7357,13 +7050,6 @@ rimraf@~2.2.6:
  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.2.8.tgz#e439be2aaee327321952730f99a8929e4fc50582"
  integrity sha1-5Dm+Kq7jJzIZUnMPmaiSnk/FBYI=

-rimraf@~2.6.2:
-  version "2.6.3"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
-  integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==
-  dependencies:
-    glob "^7.1.3"
-
 rn-host-detect@^1.1.5:
  version "1.2.0"
  resolved "https://registry.yarnpkg.com/rn-host-detect/-/rn-host-detect-1.2.0.tgz#8b0396fc05631ec60c1cb8789e5070cdb04d0da0"
@ -7723,18 +7409,7 @@ slash@^3.0.0:
  resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
  integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==

-<<<<<<< HEAD
-slice-ansi@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-1.0.0.tgz#044f1a49d8842ff307aad6b505ed178bd950134d"
-  integrity sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==
-  dependencies:
-    is-fullwidth-code-point "^2.0.0"
-
-slice-ansi@^2.0.0:
-=======
 slice-ansi@^2.0.0, slice-ansi@^2.1.0:
->>>>>>> master
  version "2.1.0"
  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636"
  integrity sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==
@ -8072,12 +7747,6 @@ strip-eof@^1.0.0:
  resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
  integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=

-<<<<<<< HEAD
-strip-json-comments@~2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
-  integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
-=======
 strip-final-newline@^2.0.0:
  version "2.0.0"
  resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
@ -8087,7 +7756,6 @@ strip-json-comments@^3.0.1:
  version "3.0.1"
  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.0.1.tgz#85713975a91fb87bf1b305cca77395e40d2a64a7"
  integrity sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw==
->>>>>>> master

 sudo-prompt@^9.0.0:
  version "9.1.1"
@ -8143,19 +7811,6 @@ symbol-tree@^3.2.2:
  resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
  integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==

-<<<<<<< HEAD
-table@4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/table/-/table-4.0.2.tgz#a33447375391e766ad34d3486e6e2aedc84d2e36"
-  integrity sha512-UUkEAPdSGxtRpiV9ozJ5cMTtYiqz7Ni1OGqLXRCynrvzdtR1p+cfOWe2RJLwvUG8hNanaSRjecIqwOjqeatDsA==
-  dependencies:
-    ajv "^5.2.3"
-    ajv-keywords "^2.1.0"
-    chalk "^2.1.0"
-    lodash "^4.17.4"
-    slice-ansi "1.0.0"
-    string-width "^2.1.1"
-=======
 table@^5.2.3:
  version "5.4.6"
  resolved "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz#1292d19500ce3f86053b05f0e8e7e4a3bb21079e"
@ -8165,7 +7820,6 @@ table@^5.2.3:
    lodash "^4.17.14"
    slice-ansi "^2.1.0"
    string-width "^3.0.0"
->>>>>>> master

 temp@0.8.3:
  version "0.8.3"
@ -8669,8 +8323,6 @@ which@^1.2.9, which@^1.3.0, which@^1.3.1:
  dependencies:
    isexe "^2.0.0"

-<<<<<<< HEAD
-=======
 which@^2.0.1:
  version "2.0.2"
  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
@ -8678,7 +8330,6 @@ which@^2.0.1:
  dependencies:
    isexe "^2.0.0"

->>>>>>> master
 word-wrap@~1.2.3:
  version "1.2.3"
  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
@ -8729,12 +8380,6 @@ write-file-atomic@^1.2.0:
    imurmurhash "^0.1.4"
    slide "^1.1.5"

-<<<<<<< HEAD
-write@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/write/-/write-0.2.1.tgz#5fc03828e264cea3fe91455476f7a3c566cb0757"
-  integrity sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=
-=======
 write-file-atomic@^3.0.0:
  version "3.0.3"
  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8"
@ -8749,7 +8394,6 @@ write@1.0.3:
  version "1.0.3"
  resolved "https://registry.yarnpkg.com/write/-/write-1.0.3.tgz#0800e14523b923a387e415123c865616aae0f5c3"
  integrity sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==
->>>>>>> master
  dependencies:
    mkdirp "^0.5.1"