From b72db8f18fa1be12e9c4a05cdd23253f19f37b1a Mon Sep 17 00:00:00 2001 From: blackPeanut Date: Tue, 28 Jun 2016 14:06:48 +0200 Subject: [PATCH 1/6] added es6 syntax to index.ios --- index.ios.js | 43 ++++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/index.ios.js b/index.ios.js index 95465c5..dfc8d28 100644 --- a/index.ios.js +++ b/index.ios.js @@ -3,28 +3,31 @@ * Github url: https://github.com/catalinmiron/react-native-dribbble-app */ "use strict"; - -var React = require("react-native"); -var { +import React, { + Component, AppRegistry, NavigatorIOS, StyleSheet, TabBarIOS, View, Text -} = React; +} from 'react-native'; -var ShotList = require("./app/ShotList"), - Icon = require("react-native-vector-icons/FontAwesome"); +const ShotList = require("./app/ShotList"), + Icon = require("react-native-vector-icons/FontAwesome"); -var DribbbleApp = React.createClass({ - getInitialState: function() { - return { - selectedTab: "default" - }; - }, +export default class DribbbleApp extends Component { + constructor(props) { + super(props); - _renderContent: function(category: string, title: ?string) { + this.state = { + selectedTab: "default" + } + }//constructor + + //_renderContent(category: string, title: ?string) { + _renderContent(category, title) { + console.log(arguments); return ( ); - }, + }; - render: function() { + render() { return ( - ); - } -}); + ) //return + } //render +}//class -var styles = StyleSheet.create({ +const styles = StyleSheet.create({ tabContent: { flex: 1, alignItems: "center", @@ -107,5 +110,3 @@ var styles = StyleSheet.create({ }); AppRegistry.registerComponent("DribbbleApp", () => DribbbleApp); - -module.exports = DribbbleApp; From 794137dc5a5f0bff4535e7d9f61b4e96a9017f70 Mon Sep 17 00:00:00 2001 From: blackPeanut Date: Tue, 28 Jun 2016 16:33:46 +0200 Subject: [PATCH 2/6] added es6 syntax to CommentItem --- app/CommentItem.js | 77 +++++++++++++++++++++++----------------------- 1 file changed, 38 insertions(+), 39 deletions(-) diff --git a/app/CommentItem.js b/app/CommentItem.js index c9e1657..ae11918 100644 --- a/app/CommentItem.js +++ b/app/CommentItem.js @@ -1,54 +1,55 @@ "use strict"; - -var React = require("react-native"); -var { +import React, { + Component, Image, StyleSheet, PixelRatio, Text, TouchableHighlight, View, - Component, Dimensions -} = React; +} from 'react-native'; -var Icon = require("react-native-vector-icons/FontAwesome"), - getImage = require("./helpers/getImage"), - HTML = require("react-native-htmlview"), - screen = Dimensions.get('window'); +const Icon = require("react-native-vector-icons/FontAwesome"), + getImage = require("./helpers/getImage"), + HTML = require("react-native-htmlview"), + screen = Dimensions.get('window'); -var CommentItem = React.createClass({ - getDefaultProps: function() { - return { - comments: [] - } - }, +export default class CommentItem extends Component { + constructor(props) { + super(props); + }//constructor - render: function() { - return - - - - - - - {this.props.comment.user.name} - - - - + render() { + return ( + + + + + + + + {this.props.comment.user.name} + + + + + + - - - - ; - } -}); + + + )//return + }//render +}//class +CommentItem.propTypes = {comments: React.PropTypes.array.isRequired}; +CommentItem.defaultProps = {comments: []}; -var styles = StyleSheet.create({ +const styles = StyleSheet.create({ commentContent: { padding: 10, flex: 1, @@ -80,5 +81,3 @@ var styles = StyleSheet.create({ marginRight: 10 } }); - -module.exports = CommentItem; From 33df5f87d7dbce2830854367fd53598a28348685 Mon Sep 17 00:00:00 2001 From: blackPeanut Date: Wed, 29 Jun 2016 21:14:49 +0200 Subject: [PATCH 3/6] added es6 syntax to ShotCell --- app/ShotCell.js | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/app/ShotCell.js b/app/ShotCell.js index e797a13..891951e 100644 --- a/app/ShotCell.js +++ b/app/ShotCell.js @@ -1,7 +1,7 @@ "use strict"; -var React = require("react-native"); -var { +import React, { + Component, Image, PixelRatio, StyleSheet, @@ -9,13 +9,16 @@ var { TouchableHighlight, View, Dimensions -} = React; +} from 'react-native'; -var getImage = require("./helpers/getImage"), +const getImage = require("./helpers/getImage"), screen = Dimensions.get('window'); -var ShotCell = React.createClass({ - render: function() { +export default class ShotCell extends Component { + constructor(props) { + super(props); + } + render() { return ( @@ -29,11 +32,11 @@ var ShotCell = React.createClass({ - ); - } -}); + )//return + }//render +};//class -var styles = StyleSheet.create({ +const styles = StyleSheet.create({ textContainer: { flex: 1, }, @@ -54,5 +57,3 @@ var styles = StyleSheet.create({ marginLeft: 4, }, }); - -module.exports = ShotCell; From e2552e99912b0a603553320bbd18b226bdbf5a2b Mon Sep 17 00:00:00 2001 From: blackPeanut Date: Wed, 29 Jun 2016 21:14:49 +0200 Subject: [PATCH 4/6] added es6 syntax to ShotCell --- app/CommentItem.js | 8 ++++---- app/ShotCell.js | 4 ++-- app/helpers/getImage.js | 25 ++++++++++++------------- 3 files changed, 18 insertions(+), 19 deletions(-) diff --git a/app/CommentItem.js b/app/CommentItem.js index ae11918..fe19089 100644 --- a/app/CommentItem.js +++ b/app/CommentItem.js @@ -10,10 +10,10 @@ import React, { Dimensions } from 'react-native'; -const Icon = require("react-native-vector-icons/FontAwesome"), - getImage = require("./helpers/getImage"), - HTML = require("react-native-htmlview"), - screen = Dimensions.get('window'); +import * as getImage from './helpers/getImage'; +import { Icon } from 'react-native-vector-icons/FontAwesome'; +import HTML from 'react-native-htmlview'; +const screen = Dimensions.get('window'); export default class CommentItem extends Component { constructor(props) { diff --git a/app/ShotCell.js b/app/ShotCell.js index 891951e..d0fc4ed 100644 --- a/app/ShotCell.js +++ b/app/ShotCell.js @@ -11,8 +11,8 @@ import React, { Dimensions } from 'react-native'; -const getImage = require("./helpers/getImage"), - screen = Dimensions.get('window'); +import * as getImage from "./helpers/getImage"; +const screen = Dimensions.get('window'); export default class ShotCell extends Component { constructor(props) { diff --git a/app/helpers/getImage.js b/app/helpers/getImage.js index eb20676..dd90222 100644 --- a/app/helpers/getImage.js +++ b/app/helpers/getImage.js @@ -1,18 +1,17 @@ 'use strict'; -module.exports = { - shotImage: function(shot: Object): {uri: ?string} { - var uri = shot.images.normal ? shot.images.normal : shot.images.teaser; +export function shotImage(shot: Object): {uri: ?string} { + var uri = shot.images.normal ? shot.images.normal : shot.images.teaser; + return {uri}; +} + +export function authorAvatar(player: Object): {uri: ?string} { + var uri; + if (player) { + uri = player.avatar_url; return {uri}; - }, - authorAvatar: function(player: Object): {uri: ?string} { - var uri; - if (player) { - uri = player.avatar_url; - return {uri}; - } else { - uri = require('../../img/AuthorAvatar.png'); - return uri; - } + } else { + uri = require('../../img/AuthorAvatar.png'); + return uri; } } From c9f52d48e36a618240b0e563262339341ccb372c Mon Sep 17 00:00:00 2001 From: blackPeanut Date: Wed, 29 Jun 2016 23:14:12 +0200 Subject: [PATCH 5/6] added import to index/ios (fix require es5 syntax) --- index.ios.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/index.ios.js b/index.ios.js index dfc8d28..5e74779 100644 --- a/index.ios.js +++ b/index.ios.js @@ -13,8 +13,8 @@ import React, { Text } from 'react-native'; -const ShotList = require("./app/ShotList"), - Icon = require("react-native-vector-icons/FontAwesome"); +import ShotList from "./app/ShotList"; +const Icon = require("react-native-vector-icons/FontAwesome"); export default class DribbbleApp extends Component { constructor(props) { @@ -27,7 +27,6 @@ export default class DribbbleApp extends Component { //_renderContent(category: string, title: ?string) { _renderContent(category, title) { - console.log(arguments); return ( Date: Wed, 29 Jun 2016 23:19:41 +0200 Subject: [PATCH 6/6] added es6 to api --- app/helpers/api.js | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/app/helpers/api.js b/app/helpers/api.js index 2a480e9..106f603 100644 --- a/app/helpers/api.js +++ b/app/helpers/api.js @@ -1,6 +1,6 @@ "use strict"; -var API_URL = "https://api.dribbble.com/v1/", +const API_URL = "https://api.dribbble.com/v1/", ACCESS_TOKEN = "7a22f910dcdff63bd3ebbe48d022f05e8268c67249709b5489d923f97bcf96ec"; function fetchData(URL) { @@ -11,16 +11,15 @@ function fetchData(URL) { }).then((response) => response.json()) } -module.exports = { - getShotsByType: function(type: string, pageNumber: ?number): ?Object { - var URL = API_URL + "shots/?list=" + type; - if (pageNumber) { - URL += "&per_page=10&page=" + pageNumber; - } - - return fetchData(URL); - }, - getResources: function(url: ?string): ?Object { - return fetchData(url); +export function getShotsByType(type: string, pageNumber: ?number): ?Object { + var URL = API_URL + "shots/?list=" + type; + if (pageNumber) { + URL += "&per_page=10&page=" + pageNumber; } -}; + + return fetchData(URL); +} + +export function getResources(url: ?string): ?Object { + return fetchData(url); +}