From c40308e803dcb576ca81a88f4d274e21b27103f5 Mon Sep 17 00:00:00 2001 From: Nikolai Kristiansen Date: Fri, 18 Aug 2017 12:34:45 +0200 Subject: [PATCH] Rename EventDetails to EventDetail --- .buckconfig | 4 +++- src/Dusken.js | 4 ++-- src/modules/events/{EventDetails.js => EventDetail.js} | 2 +- src/screens/{EventDetailsScreen.js => EventDetailScreen.js} | 6 +++--- src/screens/EventListScreen.js | 2 +- 5 files changed, 10 insertions(+), 8 deletions(-) rename src/modules/events/{EventDetails.js => EventDetail.js} (99%) rename src/screens/{EventDetailsScreen.js => EventDetailScreen.js} (78%) diff --git a/.buckconfig b/.buckconfig index 934256c..a133551 100644 --- a/.buckconfig +++ b/.buckconfig @@ -1,6 +1,8 @@ - [android] target = Google Inc.:Google APIs:23 [maven_repositories] central = https://repo1.maven.org/maven2 + +[httpserver] + port = 0 diff --git a/src/Dusken.js b/src/Dusken.js index 04f0d27..32d8065 100644 --- a/src/Dusken.js +++ b/src/Dusken.js @@ -4,7 +4,7 @@ import {Platform} from 'react-native'; import {TabNavigator, StackNavigator} from "react-navigation"; import AboutScreen from "./screens/AboutScreen"; -import EventDetailsScreen from "./screens/EventDetailsScreen"; +import EventDetailScreen from "./screens/EventDetailScreen"; import EventListScreen from "./screens/EventListScreen"; import LoginScreen from "./screens/LoginScreen"; import MembershipScreen from "./screens/MembershipScreen"; @@ -46,7 +46,7 @@ const tabNav = TabNavigator(tabBarRoutes, tabBarOptions); const DuskenContainer = StackNavigator({ Root: { screen: tabNav }, Login: { screen: LoginScreen }, - EventDetails: { screen: EventDetailsScreen }, + EventDetail: { screen: EventDetailScreen }, }); export default connect()(DuskenContainer); \ No newline at end of file diff --git a/src/modules/events/EventDetails.js b/src/modules/events/EventDetail.js similarity index 99% rename from src/modules/events/EventDetails.js rename to src/modules/events/EventDetail.js index 404b88a..4bcc5ed 100644 --- a/src/modules/events/EventDetails.js +++ b/src/modules/events/EventDetail.js @@ -6,7 +6,7 @@ import {Button, Icon, Text as NBText} from "native-base"; moment.locale('nb'); -export default class EventDetails extends Component { +export default class EventDetail extends Component { _formatTime(time) { return moment(time).format('HH:mm'); diff --git a/src/screens/EventDetailsScreen.js b/src/screens/EventDetailScreen.js similarity index 78% rename from src/screens/EventDetailsScreen.js rename to src/screens/EventDetailScreen.js index 8f5361b..aa0d687 100644 --- a/src/screens/EventDetailsScreen.js +++ b/src/screens/EventDetailScreen.js @@ -1,9 +1,9 @@ import React, { Component } from 'react'; -import EventDetails from "../modules/events/EventDetails"; import {StyleProvider} from "native-base"; +import EventDetail from "../modules/events/EventDetail"; import getTheme from '../../native-base-theme/components'; -export default class EventDetailsScreen extends Component { +export default class EventDetailScreen extends Component { static navigationOptions = ({navigation}) => ({ title: navigation.state.params.item.title.decoded, headerStyle: { @@ -19,7 +19,7 @@ export default class EventDetailsScreen extends Component { const { params } = this.props.navigation.state; return ( - + ); } diff --git a/src/screens/EventListScreen.js b/src/screens/EventListScreen.js index db90beb..7983c56 100644 --- a/src/screens/EventListScreen.js +++ b/src/screens/EventListScreen.js @@ -21,7 +21,7 @@ export default class EventsScreen extends Component { showEvent = (item) => { const { navigate } = this.props.navigation; - navigate('EventDetails', {item: item}) + navigate('EventDetail', {item: item}) }; render() {