Skip to content

Commit 12baa82

Browse files
authored
Merge pull request #44 from mekanix/feature/provider
Export store provider
2 parents 4ddc076 + cb9e3b2 commit 12baa82

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "freenit",
3-
"version": "0.1.1",
3+
"version": "0.1.2",
44
"private": false,
55
"description": "Freenit framework",
66
"author": "Goran Mekić",

src/App.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from 'react'
2-
import { StoreProvider } from 'store-provider'
2+
import { StoreProvider, store } from 'store-provider'
33
import { BrowserRouter as Router } from 'react-router-dom'
44
import { ThemeProvider } from '@material-ui/styles'
55
import { Style } from 'radium'
@@ -14,7 +14,7 @@ const App = () => {
1414
<ThemeProvider theme={theme}>
1515
<Style rules={styles} />
1616
<Router>
17-
<StoreProvider>
17+
<StoreProvider store={store}>
1818
<Routing />
1919
</StoreProvider>
2020
</Router>

src/lib.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ export * from './components'
33
export * from './pages'
44
export * from './utils'
55
export * from './store'
6+
export * from './store-provider'
67
export * from './templates'

src/store-provider.js

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,9 @@ import {
77
Resolution,
88
Role,
99
User,
10-
} from 'pages'
11-
import {
12-
EmptyTemplate,
13-
} from 'templates'
14-
import { Store } from 'store'
10+
} from './pages'
11+
import { Store } from './store'
12+
import { EmptyTemplate } from './templates'
1513

1614

1715
export const store = {
@@ -26,9 +24,9 @@ export const store = {
2624

2725

2826
const Provider = (props) => {
29-
store.history = props.history
27+
props.store.history = props.history
3028
return (
31-
<Store.Provider value={store}>
29+
<Store.Provider value={props.store}>
3230
{props.children}
3331
</Store.Provider>
3432
)

src/store.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import React from 'react'
22
import { observer } from 'mobx-react'
33

4+
45
export const Store = React.createContext({})
56

67

0 commit comments

Comments
 (0)