Skip to content

Commit e01015c

Browse files
committed
Fix Navigation
1 parent 6629827 commit e01015c

File tree

3 files changed

+15
-13
lines changed

3 files changed

+15
-13
lines changed

‎client/frontend/components/ActivityForm.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ class ActivityForm extends React.Component{
6464
}
6565

6666
navigateBack(){
67-
this.props.navigator.push({
67+
this.props.navigator.replace({
6868
name: 'Welcome',
6969
});
7070
}

‎client/frontend/components/common/SwipeableCard.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ export class SwipeableCard extends React.Component {
99
onPanResponderMove: Animated.event([null, {dx: this.translateX}]),
1010
onPanResponderRelease: (e, {vx, dx}) => {
1111
const screenWidth = Dimensions.get("window").width;
12-
if (vx >= 0.003 ) {
12+
if (vx >= 0.003 && Math.abs(dx) >= 0.5 * screenWidth) {
1313
console.log(vx);
1414
this.props.swipeBack();
15-
} else {
15+
} else if (Math.abs(dx) >= 0.5 * screenWidth) {
1616
this.props.onSwipe();
1717
console.log(vx);
1818
}

‎server/app/controllers/places_api.rb‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,19 @@
33

44
class PlacesUtils
55

6+
ENDPOINT = "https://maps.googleapis.com/maps/api/place"
7+
68
api_keys = [
7-
"AIzaSyB6aCRNMXBNIlT4dUXI_c47Dgd8UeZ3mDQ",
8-
"AIzaSyCnFz8z-DNPsSYQ3oaEhwe8ykzmePykpAE",
9-
"AIzaSyAYqO0CjsXnVRlSYMx1mzIlbodfKbl-_Og",
10-
"AIzaSyCAYxLd1mMSwPMaL-KIw-__oj64IlufcnA",
11-
"AIzaSyDZ25jrrjL_b5-sCsc2gRK9zDkUd-R6OAo",
12-
"AIzaSyBY_oLHUmf8-C9b7hkRtYC34ThjuNyliDw",
13-
"AIzaSyB6aCRNMXBNIlT4dUXI_c47Dgd8UeZ3mDQ",
14-
"AIzaSyCEbuWklDLV0973ygPglKadB6sGnY4gFC4",
15-
"AIzaSyD8i-bcDlTzDJXaj-mNo1l7CCvts845_w8"
16-
]
9+
"AIzaSyB6aCRNMXBNIlT4dUXI_c47Dgd8UeZ3mDQ",
10+
"AIzaSyCnFz8z-DNPsSYQ3oaEhwe8ykzmePykpAE",
11+
"AIzaSyAYqO0CjsXnVRlSYMx1mzIlbodfKbl-_Og",
12+
"AIzaSyCAYxLd1mMSwPMaL-KIw-__oj64IlufcnA",
13+
"AIzaSyDZ25jrrjL_b5-sCsc2gRK9zDkUd-R6OAo",
14+
"AIzaSyBY_oLHUmf8-C9b7hkRtYC34ThjuNyliDw",
15+
"AIzaSyB6aCRNMXBNIlT4dUXI_c47Dgd8UeZ3mDQ",
16+
"AIzaSyCEbuWklDLV0973ygPglKadB6sGnY4gFC4",
17+
"AIzaSyD8i-bcDlTzDJXaj-mNo1l7CCvts845_w8"
18+
]
1719
API_KEY = api_keys.sample
1820

1921
def self.get_places(places_count, lat, lon, date, type, place_properties, keyword = "", radius = 1000)

0 commit comments

Comments
 (0)