From 96dadfe75d94ef77bd75d3881fe9dd57ab3eb881 Mon Sep 17 00:00:00 2001 From: Viktor Varland Date: Thu, 12 Dec 2019 15:48:33 +0100 Subject: [PATCH] fix: update headerbar to the latest and greatest --- package.json | 7 ++++-- src/App.js | 42 ++++++++++++++++++++++------------ src/index.js | 2 +- yarn.lock | 64 ++++++++++++++++++++++++++++++++++++++-------------- 4 files changed, 80 insertions(+), 35 deletions(-) diff --git a/package.json b/package.json index b27258fe2..149c8866d 100644 --- a/package.json +++ b/package.json @@ -17,9 +17,11 @@ "documentation": "rimraf build && jsdoc -c jsdoc.json" }, "dependencies": { + "@dhis2/app-runtime": "^2.0.4", "@dhis2/d2-i18n": "^1.0.6", "@dhis2/d2-ui-sharing-dialog": "^5.3.0", - "@dhis2/ui": "^1.0.0-beta.14", + "@dhis2/ui-core": "^4.1.2", + "@dhis2/ui-widgets": "^2.0.5", "d2": "31.0.1", "d2-ui": "29.0.25", "d2-utilizr": "^0.2.15", @@ -48,8 +50,9 @@ "redux-form": "^7.4.2", "redux-thunk": "^2.2.0", "rxjs": "^5.5.6", + "styled-jsx": "^3.2.4", "trashable": "^1.0.6", - "typeface-roboto": "^0.0.54" + "typeface-roboto": "^0.0.75" }, "devDependencies": { "@dhis2/cli-style": "^3.2.2", diff --git a/src/App.js b/src/App.js index 0660c31c2..f985843b3 100644 --- a/src/App.js +++ b/src/App.js @@ -11,7 +11,10 @@ import SnackbarContainer from './components/SnackbarContainer' import DialogContainer from './components/DialogContainer' import SharingDialogContainer from './components/SharingDialogContainer' -import HeaderBar from '@dhis2/ui/widgets/HeaderBar' +import { Provider as RuntimeProvider } from '@dhis2/app-runtime' +import { HeaderBar } from '@dhis2/ui-widgets' +import { CssReset } from '@dhis2/ui-core' + import i18n from '@dhis2/d2-i18n' import 'typeface-roboto' @@ -22,22 +25,31 @@ import 'material-design-icons-iconfont/dist/material-design-icons.css' * Router, SectionLoader, and various popups * @param {Object} props * @param {Object} props.d2 - The d2 instance to pass to the Headerbar and AppWithD2ContextAndTheme + * @param {Object} props.baseUrl - The baseUrl for the server * @class */ -const App = ({ d2 }) => ( - - -
- - - - - - - -
- - +const App = ({ d2, baseUrl }) => ( + + + +
+ + + + + + + + +
+ + + ) App.propTypes = { diff --git a/src/index.js b/src/index.js index 622561ee5..526c99d55 100644 --- a/src/index.js +++ b/src/index.js @@ -60,7 +60,7 @@ const configI18n = userSettings => { */ const renderAppInDOM = d2 => { const rootEl = document.getElementById('root') - render(, rootEl) + render(, rootEl) } setupD2().then(renderAppInDOM) diff --git a/yarn.lock b/yarn.lock index 3b093a97c..5aae9da71 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1031,6 +1031,11 @@ resolved "https://registry.yarnpkg.com/@csstools/normalize.css/-/normalize.css-9.0.1.tgz#c27b391d8457d1e893f1eddeaf5e5412d12ffbb5" integrity sha512-6It2EVfGskxZCQhuykrfnALg7oVeiI6KclWSmGDqB0AiInVrTGB9Jp9i4/Ad21u9Jde/voVQz6eFX/eSg/UsPA== +"@dhis2/app-runtime@^2.0.4": + version "2.0.4" + resolved "https://registry.yarnpkg.com/@dhis2/app-runtime/-/app-runtime-2.0.4.tgz#9ae202fef3313094aef33a3e38d2c6c5d799c808" + integrity sha512-w5+C/fHSsuF0am5Tpvz53+tigEZzfz9ahkjXH3BiWxGVxwZGtdHjWfso1T5bJRiKhDTgf76TxIsQiC11W20WyA== + "@dhis2/cli-helpers-engine@1.2.0": version "1.2.0" resolved "https://registry.yarnpkg.com/@dhis2/cli-helpers-engine/-/cli-helpers-engine-1.2.0.tgz#ffec930cf57668aa29c91de3d871d7898ac915b7" @@ -1081,7 +1086,7 @@ moment "^2.22.1" rimraf "^2.6.2" -"@dhis2/d2-i18n@^1.0.6": +"@dhis2/d2-i18n@1.0.6", "@dhis2/d2-i18n@^1.0.6": version "1.0.6" resolved "https://registry.yarnpkg.com/@dhis2/d2-i18n/-/d2-i18n-1.0.6.tgz#2914be8acf296f3a6bf7b51c76c46da6a120b0ff" integrity sha512-7YdA4ppFosjuyf7ZMm47BrdsA5TWLM9lmS0lUPgjcCVeeWfUgagqzf4W5JGB9XQ3w1vzK+yy5zH2Ij8IgRAGhA== @@ -1113,13 +1118,31 @@ recompose "^0.26.0" rxjs "^5.5.7" -"@dhis2/ui@^1.0.0-beta.14": - version "1.0.0-beta.15" - resolved "https://registry.yarnpkg.com/@dhis2/ui/-/ui-1.0.0-beta.15.tgz#3dc7484174f1db686dd6f10cbad8271d84f3a0b9" - integrity sha512-VT+XbhFiVpVjLlX1/MkLsb0fWAdVOu0GcHCKa+s6olh5TnhZKdU8zwIZXiPaYng0oqFfufYIqBsJi9139l1zyQ== +"@dhis2/prop-types@^1.5.0": + version "1.5.0" + resolved "https://registry.yarnpkg.com/@dhis2/prop-types/-/prop-types-1.5.0.tgz#7e69919f66698be373dd21940a8a770234ded6a1" + integrity sha512-dueFkkAMOIMbXiU7Mhr3Y+DBRyOd/rHA+5/IDiYWN1xttlUTSuGZLQ5AnJ7osBicEhx+qElaGbTdRYQj3SMBtA== + dependencies: + prop-types "^15" + +"@dhis2/ui-core@^4.1.2": + version "4.1.2" + resolved "https://registry.yarnpkg.com/@dhis2/ui-core/-/ui-core-4.1.2.tgz#4ba3194fc5db3db6eea67ccdb1751eb189ca6ca0" + integrity sha512-mUWB8qNMa41ZDCkACfWljvGjOrXQxAcw7H0QchIEoixxnBjLZ2aGQbJUEjoeeKCKcrM3SaoC24a+OmoWQhIk4Q== + dependencies: + "@dhis2/prop-types" "^1.5.0" + classnames "^2.2.6" + styled-jsx "^3.2.4" + +"@dhis2/ui-widgets@^2.0.5": + version "2.0.5" + resolved "https://registry.yarnpkg.com/@dhis2/ui-widgets/-/ui-widgets-2.0.5.tgz#78cc6300d57b633e796bff7856c27445ea315767" + integrity sha512-0VVFvX279g2fo0hUBUlJ/Oi8C+5b6VeRXwuGm28uO1auNOMz2rzSO0qXnz3H/VyNqSgJXkqyA+kkFtkNGCk2BQ== dependencies: + "@dhis2/d2-i18n" "1.0.6" + "@dhis2/prop-types" "^1.5.0" classnames "^2.2.6" - styled-jsx "^3.2.1" + styled-jsx "^3.2.4" "@hapi/address@2.x.x": version "2.0.0" @@ -3364,7 +3387,14 @@ conventional-commits-parser@^2.1.0: through2 "^2.0.0" trim-off-newlines "^1.0.0" -convert-source-map@1.6.0, convert-source-map@^1.1.0, convert-source-map@^1.4.0, convert-source-map@^1.5.0: +convert-source-map@1.7.0: + version "1.7.0" + resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442" + integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA== + dependencies: + safe-buffer "~5.1.1" + +convert-source-map@^1.1.0, convert-source-map@^1.4.0, convert-source-map@^1.5.0: version "1.6.0" resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.6.0.tgz#51b537a8c43e0f04dec1993bffcdd504e758ac20" integrity sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A== @@ -9639,7 +9669,7 @@ prompts@^2.0.1: kleur "^3.0.2" sisteransi "^1.0.0" -prop-types@^15.5.10, prop-types@^15.5.6, prop-types@^15.5.7, prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2: +prop-types@^15, prop-types@^15.5.10, prop-types@^15.5.6, prop-types@^15.5.7, prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2: version "15.7.2" resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5" integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ== @@ -11295,14 +11325,14 @@ style-loader@0.23.1: loader-utils "^1.1.0" schema-utils "^1.0.0" -styled-jsx@^3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/styled-jsx/-/styled-jsx-3.2.1.tgz#452051fe50df5e9c7c7f3dd20fa46c3060ac65b0" - integrity sha512-gM/WOrWYRpWReivzQqetEGohUc/TJSvUoZ5T/UJxJZIsVIPlRQLnp7R8Oue4q49sI08EBRQjQl2oBL3sfdrw2g== +styled-jsx@^3.2.4: + version "3.2.4" + resolved "https://registry.yarnpkg.com/styled-jsx/-/styled-jsx-3.2.4.tgz#cbcdedcfb81d717fd355c4a0d8443f8e74527b60" + integrity sha512-UMclQzI1lss38RhyjTf7SmtXJEMbB6Q9slDz8adGtzHjirYb1PPgeWLSP8SlZc8c9f3LF6axmtv+6K/553ANdg== dependencies: babel-plugin-syntax-jsx "6.18.0" babel-types "6.26.0" - convert-source-map "1.6.0" + convert-source-map "1.7.0" loader-utils "1.2.3" source-map "0.7.3" string-hash "1.1.3" @@ -11720,10 +11750,10 @@ typedarray@^0.0.6: resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= -typeface-roboto@^0.0.54: - version "0.0.54" - resolved "https://registry.yarnpkg.com/typeface-roboto/-/typeface-roboto-0.0.54.tgz#8f02c9a18d1cfa7f49381a6ff0d21ff061f38ad2" - integrity sha512-sOFA1FXgP0gOgBYlS6irwq6hHYA370KE3dPlgYEJHL3PJd5X8gQE0RmL79ONif6fL5JZuGDj+rtOrFeOqz5IZQ== +typeface-roboto@^0.0.75: + version "0.0.75" + resolved "https://registry.yarnpkg.com/typeface-roboto/-/typeface-roboto-0.0.75.tgz#98d5ba35ec234bbc7172374c8297277099cc712b" + integrity sha512-VrR/IiH00Z1tFP4vDGfwZ1esNqTiDMchBEXYY9kilT6wRGgFoCAlgkEUMHb1E3mB0FsfZhv756IF0+R+SFPfdg== ua-parser-js@^0.7.18: version "0.7.19"