Use @hurumap-ui packages (#63)

* use @hurumap-ui * Cleanup * Bump * update lock * Bump hurumap
TakwimuAfrica · Mar 10, 2020 · 5813fd3 · 5813fd3
1 parent f034d50
commit 5813fd3
Show file tree

Hide file tree

Showing 17 changed files with 133 additions and 62 deletions.
diff --git a/package.json b/package.json
@@ -8,8 +8,5 @@
     "build": "yarn build:hurumap",
     "deploy:dev": "bash scripts/deploy.sh",
     "deploy:prod": "ENV=production bash scripts/deploy.sh"
-  },
-  "dependencies": {
-    "@codeforafrica/hurumap-ui": "^0.2.9"
   }
 }
diff --git a/wp-content/plugins/hurumap/package.json b/wp-content/plugins/hurumap/package.json
@@ -41,7 +41,8 @@
   },
   "dependencies": {
     "@apollo/react-hooks": "^3.1.3",
-    "@codeforafrica/hurumap-ui": "^0.2.10",
+    "@hurumap-ui/content": "^0.3.1",
+    "@hurumap-ui/core": "^0.3.1",
     "@material-ui/core": "^4.5.1",
     "@material-ui/icons": "^4.5.1",
     "@mikecousins/react-pdf": "^5.5.0",

diff --git a/wp-content/plugins/hurumap/src/CardBlock/Edit.js b/wp-content/plugins/hurumap/src/CardBlock/Edit.js
@@ -4,7 +4,7 @@ import { Fragment } from '@wordpress/element';
 import { PanelBody, SelectControl, TextControl } from '@wordpress/components';
 import { InspectorControls } from '@wordpress/editor';
 
-import Card from '@codeforafrica/hurumap-ui/components/Card';
+import Card from '@hurumap-ui/core/Card';
 import { InputLabel } from '@material-ui/core';
 
 import { select } from '@wordpress/data';

diff --git a/wp-content/plugins/hurumap/src/CardBlock/Save.js b/wp-content/plugins/hurumap/src/CardBlock/Save.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import { dataProps, TYPES } from '@codeforafrica/hurumap-ui/cms';
+import { dataProps, TYPES } from '@hurumap-ui/content';
 import propTypes from '../propTypes';
 
 function Save({ attributes }) {

diff --git a/wp-content/plugins/hurumap/src/CardBlock/index.js b/wp-content/plugins/hurumap/src/CardBlock/index.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import { registerBlockType } from '@wordpress/blocks';
-import { TYPES, deprecatedProps } from '@codeforafrica/hurumap-ui/cms';
+import { TYPES, deprecatedProps } from '@hurumap-ui/content';
 import Edit from './Edit';
 import Save from './Save';
 

diff --git a/wp-content/plugins/hurumap/src/ChartDefinition/FlourishChart.js b/wp-content/plugins/hurumap/src/ChartDefinition/FlourishChart.js
@@ -7,7 +7,7 @@ import Typography from '@material-ui/core/Typography';
 import Paper from '@material-ui/core/Paper';
 import InputLabel from '@material-ui/core/InputLabel';
 
-import { FlourishChart } from '@codeforafrica/hurumap-ui/components';
+import { FlourishChart } from '@hurumap-ui/core';
 
 import Select from 'react-select';
 import FileUploadIcon from '@material-ui/icons/CloudUpload';

diff --git a/wp-content/plugins/hurumap/src/ChartDefinition/HurumapChart.js b/wp-content/plugins/hurumap/src/ChartDefinition/HurumapChart.js
@@ -9,7 +9,7 @@ import Paper from '@material-ui/core/Paper';
 import InputLabel from '@material-ui/core/InputLabel';
 import Switch from '@material-ui/core/Switch';
 
-import { HURUmapChart } from '@codeforafrica/hurumap-ui/components';
+import { HURUmapChart } from '@hurumap-ui/core';
 
 import propTypes from '../propTypes';
 import GeoSelect from '../GeoSelect';

diff --git a/wp-content/plugins/hurumap/src/FlourishBlock/Edit.js b/wp-content/plugins/hurumap/src/FlourishBlock/Edit.js
@@ -18,7 +18,7 @@ import {
   TextareaControl
 } from '@wordpress/components';
 
-import { FlourishChart } from '@codeforafrica/hurumap-ui/components';
+import { FlourishChart } from '@hurumap-ui/core';
 import { InspectorControls, BlockControls } from '@wordpress/editor';
 
 import Select from 'react-select';

diff --git a/wp-content/plugins/hurumap/src/FlourishBlock/Save.js b/wp-content/plugins/hurumap/src/FlourishBlock/Save.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import { dataProps, TYPES } from '@codeforafrica/hurumap-ui/cms';
+import { dataProps, TYPES } from '@hurumap-ui/content';
 import propTypes from '../propTypes';
 
 function Save({ attributes }) {

diff --git a/wp-content/plugins/hurumap/src/FlourishBlock/index.js b/wp-content/plugins/hurumap/src/FlourishBlock/index.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import { registerBlockType } from '@wordpress/blocks';
-import { deprecatedProps, TYPES } from '@codeforafrica/hurumap-ui/cms';
+import { deprecatedProps, TYPES } from '@hurumap-ui/content';
 import Edit from './Edit';
 import Save from './Save';
 

diff --git a/wp-content/plugins/hurumap/src/HURUmapBlock/EditChart.js b/wp-content/plugins/hurumap/src/HURUmapBlock/EditChart.js
@@ -18,7 +18,7 @@ import Select from 'react-select';
 import { useApolloClient } from '@apollo/react-hooks';
 import { Grid, InputLabel } from '@material-ui/core';
 
-import { HURUmapChart } from '@codeforafrica/hurumap-ui/components';
+import { HURUmapChart } from '@hurumap-ui/core';
 
 import useGeos from '../hooks/useGeos';
 import { buildDataCountQueryWithGeos } from '../data/queries';

diff --git a/wp-content/plugins/hurumap/src/HURUmapBlock/SaveChart.js b/wp-content/plugins/hurumap/src/HURUmapBlock/SaveChart.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import { dataProps, TYPES } from '@codeforafrica/hurumap-ui/cms';
+import { dataProps, TYPES } from '@hurumap-ui/content';
 import propTypes from '../propTypes';
 
 function SaveChart({ attributes }) {

diff --git a/wp-content/plugins/hurumap/src/HURUmapBlock/index.js b/wp-content/plugins/hurumap/src/HURUmapBlock/index.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import { registerBlockType } from '@wordpress/blocks';
-import { deprecatedProps, TYPES } from '@codeforafrica/hurumap-ui/cms';
+import { deprecatedProps, TYPES } from '@hurumap-ui/content';
 import EditChart from './EditChart';
 import SaveChart from './SaveChart';
 

diff --git a/wp-content/plugins/hurumap/src/IndicatorBlock/Edit.js b/wp-content/plugins/hurumap/src/IndicatorBlock/Edit.js
@@ -1,7 +1,7 @@
 import React, { useEffect } from 'react';
 import { __ } from '@wordpress/i18n';
 import { Fragment } from '@wordpress/element';
-import InsightContainer from '@codeforafrica/hurumap-ui/core/InsightContainer';
+import InsightContainer from '@hurumap-ui/core/InsightContainer';
 
 import {
   PanelBody,
@@ -13,7 +13,7 @@ import {
 
 import { InspectorControls, MediaPlaceholder } from '@wordpress/block-editor';
 import shortid from 'shortid';
-import PDFDataContainer from '@codeforafrica/hurumap-ui/core/PDFDataContainer';
+import PDFDataContainer from '@hurumap-ui/core/PDFDataContainer';
 import propTypes from '../propTypes';
 
 function Edit({

diff --git a/wp-content/plugins/hurumap/src/IndicatorBlock/Save.js b/wp-content/plugins/hurumap/src/IndicatorBlock/Save.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import { dataProps, TYPES } from '@codeforafrica/hurumap-ui/cms';
+import { dataProps, TYPES } from '@hurumap-ui/content';
 import { RawHTML } from '@wordpress/element';
 import propTypes from '../propTypes';
 

diff --git a/wp-content/plugins/hurumap/src/Theme.js b/wp-content/plugins/hurumap/src/Theme.js
@@ -1,4 +1,4 @@
-import createTheme from '@codeforafrica/hurumap-ui/core/styles/createTheme';
+import { createTheme } from '@hurumap-ui/core';
 
 const FONT_FAMILY_TEXT = '"Muli", sans-serif';
 const COLOR_BREWER_DIVERGING = [