master
Jay 5 years ago
parent 9f9f8affe0
commit f03870e882
  1. 40
      index.ios.js
  2. 10
      ios/BuyWhat/Images.xcassets/AppIcon.appiconset/Contents.json
  3. 20
      src/actions/index.js
  4. 54
      src/components/Dialog.js
  5. 136
      src/components/ItemsPage/index.js
  6. 3
      src/components/StoreList/Item.js
  7. 6
      src/components/StoreList/index.js
  8. 17
      src/containers/Dialog.js
  9. 9
      src/containers/ItemsPage.js
  10. 3
      src/containers/StoreList.js
  11. 11
      src/index.js
  12. 3
      src/reducers/sys.js

@ -6,48 +6,16 @@
import React, { Component } from 'react';
import {
AppRegistry,
StyleSheet,
Text,
View
AppRegistry
} from 'react-native';
import MainApp from './src'
export default class BuyWhat extends Component {
render() {
return (
<View style={styles.container}>
<Text style={styles.welcome}>
Welcome to React Native!
</Text>
<Text style={styles.instructions}>
To get started, edit index.ios.js
</Text>
<Text style={styles.instructions}>
Press Cmd+R to reload,{'\n'}
Cmd+D or shake for dev menu
</Text>
</View>
<MainApp dev='android' />
);
}
}
}
const styles = StyleSheet.create({
container: {
flex: 1,
justifyContent: 'center',
alignItems: 'center',
backgroundColor: '#F5FCFF',
},
welcome: {
fontSize: 20,
textAlign: 'center',
margin: 10,
},
instructions: {
textAlign: 'center',
color: '#333333',
marginBottom: 5,
},
});
AppRegistry.registerComponent('BuyWhat', () => BuyWhat);

@ -1,5 +1,15 @@
{
"images" : [
{
"idiom" : "iphone",
"size" : "20x20",
"scale" : "2x"
},
{
"idiom" : "iphone",
"size" : "20x20",
"scale" : "3x"
},
{
"idiom" : "iphone",
"size" : "29x29",

@ -36,7 +36,13 @@ export const removeDialog = () => ({
export const getStoreList = () => dispatch => {
dispatch(toggleLoading(1))
fetch(`${apiUrl}/store`, genRequest())
.then(response => response.json())
.then(response => {
if(response.status == 404) return {
status: 0,
message: 'api not found'
}
return response.json()
})
.then(json => {
dispatch(toggleLoading(0))
if (json.status != 1) return dispatch(addDialog(json.message))
@ -50,7 +56,13 @@ export const getStoreList = () => dispatch => {
export const getItems = (id) => dispatch => {
dispatch(toggleLoading(1))
fetch(`${apiUrl}/item/${id}`, genRequest())
.then(response => response.json())
.then(response => {
if(response.status == 404) return {
status: 0,
message: 'api not found'
}
return response.json()
})
.then(json => {
dispatch(toggleLoading(0))
if(json.status != 1) return dispatch(addDialog(json.message))
@ -67,6 +79,10 @@ export const clearStore = () => ({
export const clearItems = () => ({
type: 'clear_items'
})
export const setStore = (id) => ({
type: 'set_store',
id
})
export const toPage = (page = 0) => ({
type: 'page',

@ -0,0 +1,54 @@
import React from 'react';
import { View, Text, Button, TouchableOpacity, Dimensions } from 'react-native';
const width = Dimensions.get('window').width;
const height = Dimensions.get('window').height;
const Dialog = ({ show, obj, onButtonPress }) => {
if (!show) return null;
return (
<View style={{
position: 'absolute',
top: 0,
left: 0,
width,
height,
justifyContent: 'center',
alignItems: 'center',
zIndex: 500,
backgroundColor: 'rgba(0,0,0,0.4)'
}}>
<View style={{
width: width * 0.7,
backgroundColor: '#fff',
minHeight: 100,
borderRadius: 10
}}>
<View style={{
alignItems: 'center',
paddingTop: 10,
flex: 1
}}>
<Text>{obj}</Text>
</View>
<View style={{
borderTopColor: '#000',
borderTopWidth: 1,
borderStyle: 'solid'
}}>
<TouchableOpacity style={{
alignItems: 'center',
justifyContent: 'center',
paddingTop: 5,
paddingBottom: 5,
paddingLeft: 10,
paddingRight: 10
}} onPress={() => onButtonPress()}>
<Text>OK</Text>
</TouchableOpacity>
</View>
</View>
</View>
)
}
export default Dialog;

@ -7,31 +7,115 @@ const ds = new ListView.DataSource({
}
})
export default ItemsPage = ({ dev, show, list, refresh, getList, backPage }) => {
if (!show) return null
console.log('Items')
return (
<View style={{ flex: 1 }}>
<View style={{
height: 25,
marginTop: 5,
marginLeft: 10,
marginRight: 10,
marginBottom: 5
}}>
<TouchableOpacity onPress={() => backPage()}>
<Text style={{fontSize: 20}}>&lt;&lt;Back</Text>
</TouchableOpacity>
const defState = () => ({
show: false,
list: [],
id: '',
result: null
})
const shuffle = (array) => {
var currentIndex = array.length, temporaryValue, randomIndex;
// While there remain elements to shuffle...
while (0 !== currentIndex) {
// Pick a remaining element...
randomIndex = Math.floor(Math.random() * currentIndex);
currentIndex -= 1;
// And swap it with the current element.
temporaryValue = array[currentIndex];
array[currentIndex] = array[randomIndex];
array[randomIndex] = temporaryValue;
}
return array;
}
export default class ItemsPage extends React.Component {
constructor(props) {
super(props)
this.state = defState()
this.refreshList = this.refreshList.bind(this)
this.randomItem = this.randomItem.bind(this)
}
refreshList() {
let { getList } = this.props
getList(this.state.id)
}
randomItem() {
let ls = shuffle([...this.state.list])
this.setState({
result: ls[0] || null
})
}
componentWillReceiveProps(nextProps) {
if (this.state.show !== nextProps.show) {
this.setState({
show: nextProps.show,
result: null
})
}
if (this.state.id !== nextProps.sid) {
this.setState({ id: nextProps.sid }, () => {
this.refreshList()
})
}
this.setState({
list: nextProps.list
})
}
render() {
let { dev, list, refresh, getList, backPage } = this.props
if (!this.state.show) return null
console.log('Items')
return (
<View style={{ flex: 1 }}>
<View style={{
height: 25,
marginTop: 5,
marginLeft: 10,
marginRight: 10,
marginBottom: 5
}}>
<TouchableOpacity onPress={() => backPage()}>
<Text style={{ fontSize: 20 }}>&lt;&lt;Back</Text>
</TouchableOpacity>
</View>
<View style={{
height: 30,
margin: 10,
alignContent: 'center',
alignItems: 'center'
}}>
<TouchableOpacity onPress={() => this.randomItem()}>
<Text style={{ fontSize: 25 }}>Random!!</Text>
</TouchableOpacity>
</View>
<View style={{
height: 25,
padding: 5,
alignItems: 'center'
}}>
{this.state.result != null ? <Text>結果: {this.state.result.name} / {this.state.result.price}</Text> : null}
</View>
<ListView
refreshControl={<RefreshControl refreshing={refresh} onRefresh={this.refreshList} />}
enableEmptySections={true}
dataSource={ds.cloneWithRows(list)}
renderRow={data => {
return (
<Text>{data.name} / {data.price}</Text>
)
}} />
</View>
<ListView
refreshControl={<RefreshControl refreshing={refresh} onRefresh={getList} />}
enableEmptySections={true}
dataSource={ds.cloneWithRows(list)}
renderRow={data => {
return (
<Text>{data.name} / {data.price}</Text>
)
}} />
</View>
)
)
}
}

@ -16,7 +16,8 @@ const Item = ({ name, onClick }) => {
flexDirection: 'column'
}}>
<Text style={{
fontSize: 20
fontSize: 30,
backgroundColor: '#eee'
}}>{name}</Text>
</View>
</TouchableOpacity>

@ -14,6 +14,12 @@ export default StoreList = ({dev, show, list, refresh, getList, loadItems}) => {
console.log('Store', list)
return (
<View style={{flex: 1}}>
<View style={{height: 30}}>
<Text style={{
fontSize: 25,
alignSelf: 'center'
}}>請選擇店家</Text>
</View>
<ListView
refreshControl={<RefreshControl refreshing={refresh} onRefresh={getList} />}
enableEmptySections={true}

@ -0,0 +1,17 @@
import React from 'react';
import { connect } from 'react-redux';
import Dialog from '../components/Dialog';
import { removeDialog } from '../actions';
const mapStateToProps = (state) => ({
obj: state.ui.dialog[0] || null,
show: state.ui.dialog.length > 0
});
const mapDispatchToProps = (dispatch, ownProps) => ({
onButtonPress: () => {
dispatch(removeDialog());
}
});
export default connect(mapStateToProps, mapDispatchToProps)(Dialog);

@ -1,17 +1,18 @@
import {connect} from 'react-redux'
import ItemsPage from '../components/ItemsPage'
import {toPage, getStoreList, clearItems} from '../actions'
import {toPage, getStoreList, clearItems, getItems} from '../actions'
const mapStateToProps = (state) => ({
dev: state.sys.dev,
show: state.ui.page == 1,
refresh: state.ui.loading,
list: state.sys.items || []
list: state.sys.items || [],
sid: state.sys.sid
})
const mapDispatchToProps = (dispatch, ownProps) => ({
getList: () => {
dispatch(getItems())
getList: (id) => {
dispatch(getItems(id))
},
backPage: () => {
dispatch(clearItems())

@ -1,6 +1,6 @@
import {connect} from 'react-redux'
import StoreList from '../components/StoreList'
import {getStoreList, getItems, toPage, clearStore} from '../actions'
import {getStoreList, getItems, toPage, clearStore, setStore} from '../actions'
const mapStateToProps = (state) => ({
dev: state.sys.dev,
@ -15,6 +15,7 @@ const mapDispatchToProps = (dispatch, ownProps) => ({
},
loadItems: (id) => {
dispatch(clearStore())
dispatch(setStore(id))
dispatch(toPage(1))
dispatch(getItems(id))
}

@ -3,12 +3,13 @@ import {createStore, applyMiddleware} from 'redux'
import reducers from './reducers'
import {Provider, connect} from 'react-redux'
import thunk from 'redux-thunk'
import {View, Text} from 'react-native'
import {View, Text, Platform} from 'react-native'
import {SetDev, getStoreList} from './actions'
// import pages
import StoreList from './containers/StoreList'
import ItemsPage from './containers/ItemsPage'
import Dialog from './containers/Dialog'
const middleware = [thunk]
@ -21,7 +22,10 @@ store.subscribe(() => {
const VV = (props) => {
console.log(props)
return (
<View style={{flex: 1}}>
<View style={{
flex: 1,
paddingTop: Platform.OS === 'ios' ? 20 : 0
}}>
{
props.children
}
@ -34,8 +38,6 @@ const CView = connect()(VV)
class Main extends React.Component {
componentDidMount(){
let {dev} = this.props
store.dispatch(SetDev(dev))
store.dispatch(getStoreList())
}
@ -45,6 +47,7 @@ class Main extends React.Component {
<CView>
<StoreList />
<ItemsPage />
<Dialog />
</CView>
</Provider>
)

@ -1,6 +1,7 @@
const stateDefault = () => ({
dev: '',
store: [],
sid: '',
items: []
})
@ -16,6 +17,8 @@ export default sysReducer = (state = stateDefault(), action) => {
return { ...state, items: [] }
case 'items':
return { ...state, items: action.list }
case 'set_store':
return { ...state, sid: action.id }
default:
return state
}

Loading…
Cancel
Save