Skip to content

Commit 293a52c

Browse files
varlvarl
authored
fix: update headerbar to latest and greatest (#31)
1 parent 08a941e commit 293a52c

File tree

5 files changed

+83
-36
lines changed

5 files changed

+83
-36
lines changed

‎package.json

+6-3
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,16 @@
4444
},
4545
"dependencies": {
4646
"@babel/polyfill": "^7.2.5",
47+
"@dhis2/app-runtime": "^2.0.4",
4748
"@dhis2/d2-i18n": "^1.0.6",
48-
"@dhis2/ui": "^1.0.0-beta.14",
49+
"@dhis2/ui-core": "^4.1.3",
50+
"@dhis2/ui-widgets": "^2.0.6",
4951
"d2": "^28.3.0",
5052
"history": "^4.7.2",
5153
"i18next": "^10.3.0",
5254
"material-design-icons-iconfont": "^4.0.5",
5355
"material-ui": "^0.20.0",
54-
"moment": "^2.20.1",
56+
"moment": "^2.24.0",
5557
"prop-types": "^15.7.1",
5658
"react": "^16.8.1",
5759
"react-dom": "^16.8.1",
@@ -63,7 +65,8 @@
6365
"redux-observable": "^1.0.0",
6466
"rxjs": "^6.4.0",
6567
"style-loader": "^0.20.1",
66-
"typeface-roboto": "^0.0.54",
68+
"styled-jsx": "^3.2.4",
69+
"typeface-roboto": "^0.0.75",
6770
"whatwg-fetch": "^2.0.3"
6871
},
6972
"jest": {

‎src/components/App.jsx

+21-11
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,35 @@
11
import 'typeface-roboto';
22
import 'material-design-icons-iconfont/dist/material-design-icons.css';
3+
34
import React from 'react';
45
import { Provider } from 'react-redux';
5-
import HeaderBar from '@dhis2/ui/widgets/HeaderBar';
66
import i18n from '@dhis2/d2-i18n';
77
import '../styles/override.css';
88
import store from '../store';
99
import MessagePanel from './MessagePanel';
1010
import ContentLoader from './ContentLoader';
1111
import AddD2Context from './AddD2Context';
1212

13-
const App = ({ d2 }) => (
14-
<Provider store={store}>
15-
<AddD2Context d2={d2}>
16-
<div>
17-
<HeaderBar appName={i18n.t('Scheduler')} />
18-
<MessagePanel />
19-
<ContentLoader d2={d2} />
20-
</div>
21-
</AddD2Context>
22-
</Provider>
13+
import { HeaderBar } from '@dhis2/ui-widgets';
14+
import { CssReset } from '@dhis2/ui-core';
15+
import { Provider as RuntimeProvider } from '@dhis2/app-runtime';
16+
17+
const App = ({ d2, baseUrl, apiVersion }) => (
18+
<RuntimeProvider config={{
19+
baseUrl,
20+
apiVersion,
21+
}}>
22+
<Provider store={store}>
23+
<AddD2Context d2={d2}>
24+
<div>
25+
<CssReset />
26+
<HeaderBar appName={i18n.t('Scheduler')} />
27+
<MessagePanel />
28+
<ContentLoader d2={d2} />
29+
</div>
30+
</AddD2Context>
31+
</Provider>
32+
</RuntimeProvider>
2333
);
2434

2535
export default App;

‎src/index.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@ import App from './components/App';
77

88
let dhisConfig;
99
let d2Instance;
10+
let baseUrl;
1011

11-
const dhisVersion = 32;
12+
const dhisVersion = 33;
1213
const schemas = [];
1314

1415
getManifest('./manifest.webapp')
@@ -20,6 +21,7 @@ getManifest('./manifest.webapp')
2021

2122
// Initialize d2 with url, authorization and schema settings.
2223
.then(url => {
24+
baseUrl = url;
2325
dhisConfig = {
2426
baseUrl: `${url}/api/${dhisVersion}`,
2527
headers: PRODUCTION ? null : DHIS_CONFIG.authorization,
@@ -41,5 +43,5 @@ getManifest('./manifest.webapp')
4143

4244
// Render the App.
4345
.then(() => {
44-
render(<App d2={d2Instance} />, document.getElementById('root'));
46+
render(<App d2={d2Instance} baseUrl={baseUrl} apiVersion={dhisVersion} />, document.getElementById('root'));
4547
});

‎webpack.dev.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ try {
1717
// Failed to load config file – use default config
1818
console.warn('\nFailed to load DHIS config:', e.message);
1919
dhisConfig = {
20-
baseUrl: 'http://localhost:8080/dhis',
20+
baseUrl: 'http://localhost:8080',
2121
authorization: 'Basic c3lzdGVtOlN5c3RlbTEyMw==',
2222
};
2323
console.info('Using default config:', dhisConfig);

‎yarn.lock

+51-19
Original file line numberDiff line numberDiff line change
@@ -829,6 +829,11 @@
829829
lodash "^4.17.10"
830830
to-fast-properties "^2.0.0"
831831

832+
"@dhis2/app-runtime@^2.0.4":
833+
version "2.0.4"
834+
resolved "https://registry.yarnpkg.com/@dhis2/app-runtime/-/app-runtime-2.0.4.tgz#9ae202fef3313094aef33a3e38d2c6c5d799c808"
835+
integrity sha512-w5+C/fHSsuF0am5Tpvz53+tigEZzfz9ahkjXH3BiWxGVxwZGtdHjWfso1T5bJRiKhDTgf76TxIsQiC11W20WyA==
836+
832837
"@dhis2/d2-i18n-extract@^1.0.8":
833838
version "1.0.8"
834839
resolved "https://registry.yarnpkg.com/@dhis2/d2-i18n-extract/-/d2-i18n-extract-1.0.8.tgz#9d98690d522a51895c8ef3fe7136f026b0f8dacd"
@@ -857,13 +862,28 @@
857862
i18next "^10.3"
858863
moment "^2.24.0"
859864

860-
"@dhis2/ui@^1.0.0-beta.14":
861-
version "1.0.0-beta.14"
862-
resolved "https://registry.yarnpkg.com/@dhis2/ui/-/ui-1.0.0-beta.14.tgz#79e987975644029eb4937c3be34bd27e6cfd169e"
863-
integrity sha512-5MoD5Eiha0iRuqfIJBEbXBJKNot/WdhoEMb6fcmZ5b29JZ4iTmtzaf8C7T06DJmIaBdHSeAF/4hIohO/VUojNQ==
865+
"@dhis2/prop-types@^1.5", "@dhis2/prop-types@^1.5.0":
866+
version "1.5.0"
867+
resolved "https://registry.yarnpkg.com/@dhis2/prop-types/-/prop-types-1.5.0.tgz#7e69919f66698be373dd21940a8a770234ded6a1"
868+
integrity sha512-dueFkkAMOIMbXiU7Mhr3Y+DBRyOd/rHA+5/IDiYWN1xttlUTSuGZLQ5AnJ7osBicEhx+qElaGbTdRYQj3SMBtA==
869+
dependencies:
870+
prop-types "^15"
871+
872+
"@dhis2/ui-core@^4.1.3":
873+
version "4.1.3"
874+
resolved "https://registry.yarnpkg.com/@dhis2/ui-core/-/ui-core-4.1.3.tgz#540ab7f5e23967c206083aff8a9aef25dbe74e76"
875+
integrity sha512-v4uhCs9xJO+Hj0XCIO/U6gV5KGUulwCiLFlHkFiaxLmi1iO/gtPseR+sUHgx9i06vRryszD8VTKpZFytz6/RPg==
864876
dependencies:
877+
"@dhis2/prop-types" "^1.5.0"
878+
classnames "^2.2.6"
879+
880+
"@dhis2/ui-widgets@^2.0.6":
881+
version "2.0.6"
882+
resolved "https://registry.yarnpkg.com/@dhis2/ui-widgets/-/ui-widgets-2.0.6.tgz#95247dbdfad0ec7d6836f3ccbe8ae85adf5f631d"
883+
integrity sha512-4ZyR36UWk+BS8eAEBx9A6ze2lqowPjfUCqjvaAc3O2+XpWd7UL9kLHV1GQWaC2S6X8UQIdgghq8iKp86u4Ub0A==
884+
dependencies:
885+
"@dhis2/prop-types" "^1.5"
865886
classnames "^2.2.6"
866-
styled-jsx "^3.2.1"
867887

868888
"@webassemblyjs/ast@1.7.11":
869889
version "1.7.11"
@@ -2372,7 +2392,14 @@ content-type@~1.0.4:
23722392
version "1.0.4"
23732393
resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
23742394

2375-
convert-source-map@1.6.0, convert-source-map@^1.1.0:
2395+
convert-source-map@1.7.0:
2396+
version "1.7.0"
2397+
resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442"
2398+
integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==
2399+
dependencies:
2400+
safe-buffer "~5.1.1"
2401+
2402+
convert-source-map@^1.1.0:
23762403
version "1.6.0"
23772404
resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.6.0.tgz#51b537a8c43e0f04dec1993bffcdd504e758ac20"
23782405
integrity sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==
@@ -5894,10 +5921,6 @@ mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkd
58945921
dependencies:
58955922
minimist "0.0.8"
58965923

5897-
moment@^2.20.1:
5898-
version "2.20.1"
5899-
resolved "https://registry.yarnpkg.com/moment/-/moment-2.20.1.tgz#d6eb1a46cbcc14a2b2f9434112c1ff8907f313fd"
5900-
59015924
moment@^2.22.1:
59025925
version "2.22.1"
59035926
resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.1.tgz#529a2e9bf973f259c9643d237fda84de3a26e8ad"
@@ -6736,6 +6759,15 @@ promise@^7.1.1:
67366759
dependencies:
67376760
asap "~2.0.3"
67386761

6762+
prop-types@^15:
6763+
version "15.7.2"
6764+
resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"
6765+
integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==
6766+
dependencies:
6767+
loose-envify "^1.4.0"
6768+
object-assign "^4.1.1"
6769+
react-is "^16.8.1"
6770+
67396771
prop-types@^15.5.4, prop-types@^15.5.6, prop-types@^15.5.7, prop-types@^15.6.0:
67406772
version "15.6.0"
67416773
resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.0.tgz#ceaf083022fc46b4a35f69e13ef75aed0d639856"
@@ -8083,14 +8115,14 @@ style-loader@^0.20.1:
80838115
loader-utils "^1.1.0"
80848116
schema-utils "^0.4.3"
80858117

8086-
styled-jsx@^3.2.1:
8087-
version "3.2.1"
8088-
resolved "https://registry.yarnpkg.com/styled-jsx/-/styled-jsx-3.2.1.tgz#452051fe50df5e9c7c7f3dd20fa46c3060ac65b0"
8089-
integrity sha512-gM/WOrWYRpWReivzQqetEGohUc/TJSvUoZ5T/UJxJZIsVIPlRQLnp7R8Oue4q49sI08EBRQjQl2oBL3sfdrw2g==
8118+
styled-jsx@^3.2.4:
8119+
version "3.2.4"
8120+
resolved "https://registry.yarnpkg.com/styled-jsx/-/styled-jsx-3.2.4.tgz#cbcdedcfb81d717fd355c4a0d8443f8e74527b60"
8121+
integrity sha512-UMclQzI1lss38RhyjTf7SmtXJEMbB6Q9slDz8adGtzHjirYb1PPgeWLSP8SlZc8c9f3LF6axmtv+6K/553ANdg==
80908122
dependencies:
80918123
babel-plugin-syntax-jsx "6.18.0"
80928124
babel-types "6.26.0"
8093-
convert-source-map "1.6.0"
8125+
convert-source-map "1.7.0"
80948126
loader-utils "1.2.3"
80958127
source-map "0.7.3"
80968128
string-hash "1.1.3"
@@ -8404,10 +8436,10 @@ typedarray@^0.0.6:
84048436
version "0.0.6"
84058437
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
84068438

8407-
typeface-roboto@^0.0.54:
8408-
version "0.0.54"
8409-
resolved "https://registry.yarnpkg.com/typeface-roboto/-/typeface-roboto-0.0.54.tgz#8f02c9a18d1cfa7f49381a6ff0d21ff061f38ad2"
8410-
integrity sha512-sOFA1FXgP0gOgBYlS6irwq6hHYA370KE3dPlgYEJHL3PJd5X8gQE0RmL79ONif6fL5JZuGDj+rtOrFeOqz5IZQ==
8439+
typeface-roboto@^0.0.75:
8440+
version "0.0.75"
8441+
resolved "https://registry.yarnpkg.com/typeface-roboto/-/typeface-roboto-0.0.75.tgz#98d5ba35ec234bbc7172374c8297277099cc712b"
8442+
integrity sha512-VrR/IiH00Z1tFP4vDGfwZ1esNqTiDMchBEXYY9kilT6wRGgFoCAlgkEUMHb1E3mB0FsfZhv756IF0+R+SFPfdg==
84118443

84128444
ua-parser-js@^0.7.9:
84138445
version "0.7.17"

0 commit comments

Comments
 (0)