auth view

Author: breitning

source/action/user.js

@@ -9,10 +9,23 @@ export const login = createAction(
   }, 
   ({username, resolved, rejected})=> {
     return {
-      pending: true,
       username,
       resolved,
       rejected
     }
   }
+);
+
+export const refreshToken = createAction(
+  types.REFRESH_TOKEN, 
+  async({token})=> {
+    return await userService.refreshToken(token);
+  }, 
+  ({token, resolved, rejected})=> {
+    return {
+      token,
+      resolved,
+      rejected
+    }
+  }
 );

source/component/codeLogo.js

@@ -18,7 +18,7 @@ class CodeLogo extends Component {
 
 	render() {
 	    return (
-	    	<View style={ CommonStyles.codeLogoContainer }>
+	    	<View style={ [CommonStyles.codeLogoContainer, this.props.style] }>
 				<Text style={ CommonStyles.codeLogoText }>
 					{ logoText }
 				</Text>

source/component/drawerPanel.js

@@ -53,16 +53,22 @@ class DrawerPanel extends Component {
 					style={ DrawerPanelStyles.headerBg }
 					resizeMode="stretch"
 					source={ {uri:backgroundImageSource} }>
+					<View style={ CommonStyles.headerBackgroundMask }/>
 					<View style={ DrawerPanelStyles.headerContent }>
 						<Image
 							style={ DrawerPanelStyles.headerAvatar } 
 							source={{uri:"http://123.56.135.166/cnblog/public/img/common/author.jpg"}}/>
 						<View style={ DrawerPanelStyles.headerText}>
-							<Text style={ DrawerPanelStyles.headerName}>愤怒的晃晃</Text>
-							<Text style={ DrawerPanelStyles.headerDate}>2016-09-06 12:23:45</Text>
+							<Text style={ DrawerPanelStyles.headerName}>
+								愤怒的晃晃
+							</Text>
+							<Text style={ DrawerPanelStyles.headerDate}>
+								个人中心
+							</Text>
 						</View>
 					</View>
 				</Image>
+				
 			</View>
 		)
 	}
@@ -79,20 +85,19 @@ class DrawerPanel extends Component {
 					underlayColor ={ StyleConfig.touchablePressColor }
 					key={ index } 
 					onPress={ ()=> onDrawerHide(item) }>
-		            <View style={ [ CommonStyles.listItem, { backgroundColor: StyleConfig.secondaryColor } ] }>
+		            <View style={ [ CommonStyles.listItem ] }>
 		              	<View style={ CommonStyles.listItemIcon }>
 		              		<Icon 
-		              			name={ item.icon } size={ 22 }
-			                	style={ { color: activeForeColor } } />
+		              			name={ item.icon } size={ 22 } style={[{color: StyleConfig.secondaryColor }]}/>
 		             	</View>
-		              	<Text style={ [ CommonStyles.listItemText, { color: activeForeColor } ] }>
+		              	<Text style={ [CommonStyles.listItemText, {color: StyleConfig.secondaryColor }] }>
 		                	{ item.text }
 		              	</Text>
 		              	<Text style={ CommonStyles.listItemTail }>
 		                	<Icon
-			                	name={ "ios-return-right" }
+			                	name={ "ios-arrow-round-forward" }
 			                	size={22}
-			                	style={ [{ color: activeForeColor }] } />
+								style={[{color: StyleConfig.secondaryColor }]} />
 		              	</Text>
 		            </View>
 		        </TouchableHighlight>
@@ -106,7 +111,7 @@ class DrawerPanel extends Component {
 				onPress={ ()=> this.onItemPress(item) }>
 	            <View style={ CommonStyles.listItem }>
 	            	<View style={ CommonStyles.listItemIcon }>
-	              		<Icon name={ item.icon } size={ 22 }/>
+	              		<Icon name={ item.icon } size={ 22 } />
 	                </View>
 	              	<Text style={ CommonStyles.listItemText }>
 	                	{ item.text }

source/component/navigation.js

@@ -14,8 +14,8 @@ import Authorization from './authorization';
 import { CommonStyles, StyleConfig } from '../style';
 
 const defaultRoute = {
-	name: 'home',
-	component: Page.Home
+	name: 'auth',
+	component: Page.Auth
 };
 
 class Navigation extends Component {

source/config/api.js

@@ -43,7 +43,7 @@ export default  {
 	},
 	user: {
 		info: "api/Users",
-		login: "token",
+		auth: "token",
 		blogs:"api/blogs/<%=blogger%>/posts?pageIndex=<%=pageIndex%>",
 		blogInfo: "api/blogs/<%=blogger%>",
 		blinks: "api/statuses/@<%=type%>?pageIndex=<%=pageIndex%>&pageSize=<%=pageSize%>&tag=<%=tag%>",

source/config/drawer.js

@@ -18,17 +18,17 @@ export default [{
 	flag: postCategory.news
 },{
 	text: "闪存",
-	icon: "ios-download-outline",
-	action: "toOffline",
-	flag:"offline"
+	icon: "ios-color-filter-outline",
+	action: "toBlink",
+	flag: postCategory.blink
 },{
 	text: "博问",
-	icon: "ios-cog",
-	action: "toSetting",
-	flag:"setting"
+	icon: "ios-help-circle-outline",
+	action: "toQuestion",
+	flag: postCategory.ques
 },{
 	text: "离线",
-	icon: "ios-redo-outline",
-	action: "toAbout",
-	flag:"about"
+	icon: "ios-download-outline",
+	action: "toOffline",
+	flag:"offline"
 }];

source/constant/actiontype.js

@@ -19,6 +19,7 @@ export const SHOW_MESSAGE = 'SHOW_MESSAGE';
 
 //user
 export const LOGIN = 'LOGIN';
+export const REFRESH_TOKEN = 'REFRESH_TOKEN';
 
 //config
 export const UPDATE_CONFIG = 'UPDATE_CONFIG';

source/image/modal-header.jpg

@@ -18,12 +18,26 @@ function filterData(data) {
 
 export function login(username, password){
 
-	let fetchApi = dataApi.user.login;
+	let fetchApi = dataApi.user.auth;
 
     let data =  `grant_type=password&username=${username}&password=${password}`.replace(/\+/g, "%2B");
     let headers = {
-        'Authorization': "Basic " + Base64.btoa(`${authData.clientId}:${authData.clientSecret}`),
+        'Authorization': "Basic " + Base64.btoa(`${authData.clientId}:${authData.clientSecret}`)
     };
 
     return requestService.post(fetchApi, data, headers).then(filterData);
+}
+
+export function refreshToken(token){
+    let fetchApi = dataApi.user.auth;
+    let data =  `grant_type=refresh_token&refresh_token=${token}`;
+    let headers = {
+        'Authorization': "Basic " + Base64.btoa(`${authData.clientId}:${authData.clientSecret}`)
+    };
+
+    return requestService.post(fetchApi, data, headers).then(filterData);
+}
+
+export function getToken(){
+
 }

source/service/userService.js

@@ -499,32 +499,37 @@ export const DrawerPanelStyles = StyleSheet.create({
 		flex:1,
 		height: 200,
 		width: width - 80,
-	    justifyContent: 'center',
+	    justifyContent: 'flex-end',
 	    flexDirection:'column',
-		paddingLeft: StyleConfig.contentPadding
+		paddingVertical:StyleConfig.contentPadding,
+		paddingHorizontal:StyleConfig.contentPadding
 	},
 	headerContent:{
-		flexDirection:'row',
-		alignItems:'center'
+		flexDirection:'column',
+		alignItems:'flex-start'
 	},
 	headerAvatar:{
 		width: 60,
 		height: 60,
 		borderRadius: 30,
-		marginRight: 10
+		marginBottom: 10
 	},
 	headerText:{
-		flexDirection:'column',
+		flexDirection:'row',
+		alignItems:'center',
 		justifyContent:'space-between'
 	},
 	headerName:{
-		fontSize: 20,
+		fontSize: 18,
 		color:'#f2f2f2',
-		marginBottom: 5
+		marginBottom: 5,
+		flex:1
 	},
 	headerDate:{
-		fontSize: 12,
-		color: '#aaa'
+		flex:1,
+		textAlign:'right',
+		fontSize: 14,
+		color: '#fff'
 	},
 	list:{
 		paddingTop: 10
@@ -677,7 +682,8 @@ export const CommonStyles = StyleSheet.create({
         backgroundColor:'rgba(255,255,255, 0.8)',
         alignItems:'center',
         justifyContent:'center',
-        marginBottom: 10
+        marginBottom: 10,
+		overflow:'hidden'
     },
 
     codeLogoText:{
@@ -732,6 +738,7 @@ export const CommonStyles = StyleSheet.create({
 	headerBackgroundMask:{
 	    position: 'absolute',
 	    top: 0,
+		left: 0,
 	    width: width,
 	    backgroundColor: 'rgba( 0, 0, 0, 0.2)',
 	    height: StyleConfig.parallaxHeaderHeight