Skip to content
This repository was archived by the owner on Apr 2, 2020. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions flow-typed/npm/flow-bin_v0.x.x.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// flow-typed signature: 819f4c19e7a4e832350a60a094454b81
// flow-typed version: /flow-bin_v0.x.x/flow_>=v0.25.x
// flow-typed signature: 6a5610678d4b01e13bbfbbc62bdaf583
// flow-typed version: 3817bc6980/flow-bin_v0.x.x/flow_>=v0.25.x

declare module "flow-bin" {
declare module.exports: string;
Expand Down
4 changes: 2 additions & 2 deletions flow-typed/npm/jest_v18.x.x.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// flow-typed signature: 056cdbb5be6e4bf527394e630b3f2133
// flow-typed version: /jest_v18.x.x/flow_>=v0.33.x
// flow-typed signature: e49570b0f5e396c7206dda452bd6f004
// flow-typed version: 1590d813f4/jest_v18.x.x/flow_>=v0.33.x

type JestMockFn = {
(...args: Array<any>): any,
Expand Down
4 changes: 2 additions & 2 deletions flow-typed/npm/react-addons-test-utils_v15.x.x.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// flow-typed signature: c351ab53c99d962dc5c0a3de10b3a1ca
// flow-typed version: /react-addons-test-utils_v15.x.x/flow_>=v0.23.x
// flow-typed signature: 323fcc1a3353d5f7a36c5f1edcd963ef
// flow-typed version: 41f45a7d8c/react-addons-test-utils_v15.x.x/flow_>=v0.23.x

declare type ReactAddonTest$FunctionOrComponentClass = React$Component<any, any, any> | Function;
declare module 'react-addons-test-utils' {
Expand Down
4 changes: 2 additions & 2 deletions flow-typed/npm/react-redux_v5.x.x.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// flow-typed signature: 1f898dcc0066d36209c80f823f960263
// flow-typed version: /react-redux_v5.x.x/flow_>=v0.30.x
// flow-typed signature: 0ed284c5a2e97a9e3c0e87af3dedc09d
// flow-typed version: bdf1e66252/react-redux_v5.x.x/flow_>=v0.30.x

import type { Dispatch, Store } from 'redux'

Expand Down
4 changes: 2 additions & 2 deletions flow-typed/npm/redux_v3.x.x.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// flow-typed signature: 16c00f089e1856fd9988a45242bb927f
// flow-typed version: /redux_v3.x.x/flow_>=v0.33.x
// flow-typed signature: ba132c96664f1a05288f3eb2272a3c35
// flow-typed version: c4bbd91cfc/redux_v3.x.x/flow_>=v0.33.x

declare module 'redux' {

Expand Down
4 changes: 2 additions & 2 deletions flow-typed/npm/uuid_v3.x.x.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// flow-typed signature: 4739159d5b286c2926b99fd2ea86abcb
// flow-typed version: /uuid_v3.x.x/flow_>=v0.33.x
// flow-typed signature: c07f382c8238bb78e545b60dd4f097a6
// flow-typed version: 27f92307d3/uuid_v3.x.x/flow_>=v0.33.x

declare module 'uuid' {
declare function v1(options?: {|
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
"react-apollo": "^0.7.2",
"react-native": "0.42.0-rc.3",
"react-native-vector-icons": "^4.0.0",
"react-navigation": "^1.0.0-beta.5",
"react-redux": "^5.0.2",
"redux": "^3.6.0",
"redux-observable": "^0.12.2",
Expand Down
4 changes: 2 additions & 2 deletions src/app/Root.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { Provider as ReduxProvider } from 'react-redux'
import { ApolloProvider } from 'react-apollo'

// Routing Container
import RootContainer from '../ui/RootContainer'
import RootComponent from '../ui/Root'

// Permissions
// import Permissions from 'react-native-permissions'
Expand All @@ -22,7 +22,7 @@ export default class Root extends Component {
return (
<ApolloProvider store={store} client={client}>
<ReduxProvider store={store}>
<RootContainer />
<RootComponent />
</ReduxProvider>
</ApolloProvider>
)
Expand Down
2 changes: 1 addition & 1 deletion src/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ const persistConfig = {
keyPrefix: `${APP_REDUX_KEY}`,
storage: AsyncStorage
}
persistStore(store, persistConfig).purge()
persistStore(store, persistConfig)

const AppPlayground = (): React$Element<any> => (
<Root store={store} client={client} />
Expand Down
67 changes: 0 additions & 67 deletions src/redux/ducks/nav.js

This file was deleted.

6 changes: 2 additions & 4 deletions src/redux/initialState.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,8 @@

import config from './ducks/config'
import device from './ducks/device'
import nav from './ducks/nav'

export default {
config: config(),
device: device(),
nav: nav()
config,
device
}
4 changes: 1 addition & 3 deletions src/redux/makeReducer.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@ import { combineReducers } from 'redux'

import config from './ducks/config'
import device from './ducks/device'
import nav from './ducks/nav'

const appReducers = {
config,
device,
nav
device
}

export default (newReducers) => {
Expand Down
26 changes: 26 additions & 0 deletions src/ui/Root.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
/* @flow */

import React from 'react' // eslint-disable-line no-unused-vars
import { Platform } from 'react-native'

import { StackNavigator } from 'react-navigation'

import MainNavigator from './nav/navigators/MainNavigator'
import ModalNavigator from './nav/navigators/ModalNavigator'

export default StackNavigator(
{
Main: {
screen: MainNavigator,
path: ''
},
Modal: {
screen: ModalNavigator
}
},
{
initialRouteName: 'Main',
mode: 'modal',
headerMode: 'none'
}
)
115 changes: 0 additions & 115 deletions src/ui/RootContainer.js

This file was deleted.

32 changes: 32 additions & 0 deletions src/ui/nav/navigators/MainNavigator.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
/* @flow */

import React from 'react' // eslint-disable-line no-unused-vars
import { Platform } from 'react-native'

import { StackNavigator } from 'react-navigation'

import Home from '../../scenes/Home'
import Left from '../../scenes/Left'
import Right from '../../scenes/Right'

export default StackNavigator(
{
Home: {
screen: Home,
path: ''
},
Left: {
screen: Left,
path: 'left'
},
Right: {
screen: Right,
path: 'right'
}
},
{
initialRouteName: 'Home',
mode: 'card',
headerMode: Platform.OS === 'ios' ? 'float' : 'screen'
}
)
22 changes: 22 additions & 0 deletions src/ui/nav/navigators/ModalNavigator.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
/* @flow */

import React from 'react' // eslint-disable-line no-unused-vars
import { Platform } from 'react-native'

import { StackNavigator } from 'react-navigation'

import Modal from '../../scenes/Modal'

export default StackNavigator(
{
Modal: {
screen: Modal,
path: 'modal'
}
},
{
initialRouteName: 'Modal',
mode: 'card',
headerMode: 'none'
}
)
Loading