-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into kw-feature-backbutton
- Loading branch information
Showing
29 changed files
with
423 additions
and
79 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
import React from 'react'; | ||
import {View, TouchableOpacity, Image, Text} from 'react-native'; | ||
//import AddToCalendar from '../CalendarButton'; | ||
import styles from './styles'; | ||
import moment from 'moment'; | ||
import {withNavigation} from 'react-navigation'; | ||
const ListEvent = ({event, navigation}) => { | ||
const startDay = moment(event.startDate).format('MMM Do, YYYY'); | ||
const endDay = moment(event.endDate).format('MMM Do, YYYY'); | ||
const startTime = moment(event.startDate).format('h:mma'); | ||
const endTime = moment(event.endDate).format('h:mma'); | ||
|
||
return ( | ||
<TouchableOpacity | ||
style={styles.container} | ||
onPress={() => navigation.navigate('Event', {event: event})}> | ||
<Image style={styles.image} source={{uri: event.image}} /> | ||
<View style={styles.textContainer}> | ||
<Text style={styles.title}>{event.title}</Text> | ||
<Text style={styles.text}>{event.location}</Text> | ||
<View style={styles.borderBottom}></View> | ||
{startDay === endDay ? ( | ||
<> | ||
<Text style={styles.text}> | ||
{startTime} to {endTime} | ||
</Text> | ||
<Text style={styles.text}>{startDay}</Text> | ||
</> | ||
) : ( | ||
<Text style={styles.text}> | ||
{startTime}, {startDay} to {endTime} {endDay} | ||
</Text> | ||
)} | ||
{/* <AddToCalendar event={event} /> */} | ||
</View> | ||
</TouchableOpacity> | ||
); | ||
}; | ||
|
||
export default withNavigation(ListEvent); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
import ListEvent from './ListEvent'; | ||
export default ListEvent; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,46 @@ | ||
import {StyleSheet} from 'react-native'; | ||
import {THEME} from '../../config'; | ||
const { | ||
colors: {black}, | ||
formatting: {baseSpacing, containerWidth}, | ||
typography: {headerFont, subHeaderText, smallText}, | ||
} = THEME; | ||
|
||
const styles = StyleSheet.create({ | ||
container: { | ||
display: 'flex', | ||
flexDirection: 'row', | ||
justifyContent: 'center', | ||
width: containerWidth, | ||
paddingVertical: baseSpacing, | ||
}, | ||
textContainer: { | ||
flexShrink: 1, | ||
}, | ||
image: { | ||
width: '45%', | ||
height: 'auto', | ||
marginRight: '10%', | ||
}, | ||
borderBottom: { | ||
borderWidth: 1, | ||
borderColor: black, | ||
width: '100%', | ||
}, | ||
title: { | ||
fontFamily: headerFont, | ||
fontSize: subHeaderText, | ||
width: '100%', | ||
flexShrink: 1, | ||
}, | ||
location: { | ||
fontFamily: headerFont, | ||
fontSize: smallText, | ||
}, | ||
text: { | ||
fontFamily: headerFont, | ||
paddingVertical: baseSpacing / 4, | ||
}, | ||
}); | ||
|
||
export default styles; |
2 changes: 0 additions & 2 deletions
2
client/js/components/MainAddCalendarButton/MainAddCalendarButton.js
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,3 @@ | ||
export const APOLLO_AUTH_ADDRESS = 'http://157.245.224.214:8000/'; | ||
export const APOLLO_SERVER_ADDRESS = | ||
'https://us1.prisma.sh/public-flintwanderer-148/server/dev'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.