mifi/Eventment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- conlicts inboud...

Browse Source
This commit is contained in:
Mike Fitzpatrick
2019-08-08 20:55:19 -04:00
parent dfc4daf696
commit 2643fe5d4a
11 changed files with 27 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/api/index.js
View File

@@ -45,11 +45,11 @@ const cacheBuster = () => {
};
export const getEndpointUrl = (endpoint) => {
if (!endpoints[endpoint]) {
if (!API_ENDPOINTS[endpoint]) {
throw new Error('Invalid API endpoint specified');
}
return `${API_URL}${endpoints[endpoint]}`; //`${cacheBuster()}`;
return `${API_URL}${API_ENDPOINTS[endpoint]}`; //`${cacheBuster()}`;
};
export const requestGet = (path, queryParams = [], requestOptions = {}) => {

2
app/api/profile.js
View File

@@ -1,4 +1,4 @@
import { API_ENDPOINTS, requestGet } from './index.js';
import { API_ENDPOINTS, requestGet, requestPost } from './index.js';
export const getEmailAvailability = (email) =>
requestGet(`${API_ENDPOINTS.VALIDATE_SIGNUP_EMAIL}/&{encodeURI(email)}`);

2
app/components/AppHeader/AppHeader.js
View File

@@ -7,8 +7,6 @@ import HeaderTitle from './HeaderTitle/HeaderTitle.container.js';
import HeaderContentLeft from './HeaderContentLeft.container.js';
import HeaderContentRight from './HeaderContentRight.container.js';
import styles from './AppHeader.styles.js';
export default class AppHeader extends Component {
static get propTypes() {
return {

6
app/components/AppHeader/HeaderContentLeft.js
View File

@@ -1,8 +1,6 @@
import React from 'react';
import PropTypes from 'prop-types';
import { Text, TouchableOpacity, View } from 'react-native';
import BackIcon from './IconButtons/BackIcon.js';
import EventsIcon from './IconButtons/EventsIcon.js';
@@ -34,10 +32,10 @@ export default function HeaderContentLeft({ activeRoute, hasMultipleEvents, navi
HeaderContentLeft.propTypes = {
activeRoute: PropTypes.string.isRequired,
hasActiveEvent: PropTypes.bool,
hasMultipleEvents: PropTypes.bool,
navigation: PropTypes.func.isRequired,
};
HeaderContentLeft.defaultProps = {
hasActiveEvent: false,
hasMultipleEvents: false,
};

1
app/components/AppHeader/HeaderTitle/EventTitle/EventTitle.container.js
View File

@@ -1,5 +1,6 @@
import { connect } from 'react-redux';
import { hasActiveEvent } from '../../../../selectors/activeEvent.js';
import { getActiveEvent, getDefaultEvent } from '../../../../selectors/events.js';
import EventTitle from './EventTitle.js';

5
app/components/AppHeader/HeaderTitle/EventTitle/EventTitle.js
View File

@@ -6,10 +6,13 @@ import { Text, TouchableOpacity, View } from 'react-native';
import styles from './EventTitle.styles.js';
export default function EventTitle({ action, date, end, name, start }) {
const whenString = `${date} | ${start} - ${end}`;
const _generateEventTitle = () => (
<View style={styles.eventInfo}>
<Text style={styles.eventName}>{name}</Text>
<Text style={styles.eventDate}>{`${date} | ${start} - ${end}`}</Text>
<Text style={styles.eventDate}>{whenString}</Text>
</View>
);

4
app/components/AppHeader/HeaderTitle/EventTitle/EventTitle.styles.js
View File

@@ -1,6 +1,6 @@
import { StyleSheet } from 'react-native';
export default (styles = StyleSheet.create({
export default StyleSheet.create({
eventInfo: {
flexDirection: 'row',
},
@@ -11,4 +11,4 @@ export default (styles = StyleSheet.create({
eventDate: {
flex: 1,
},
}));
});

10
app/components/AppHeader/HeaderTitle/HeaderTitle.js
View File

@@ -1,12 +1,16 @@
import React from 'react';
import PropTypes from 'prop-types';
import { Text, TouchableOpacity, View } from 'react-native';
import { Text, TouchableOpacity } from 'react-native';
import EventTitle from './EventTitle/EventTitle.container.js';
import styles from './HeaderTitle.styles.js';
const STRINGS = {
PROFILE: 'Profile',
};
export default function HeaderTitle({
activeRoute,
hasActiveEvent,
@@ -30,13 +34,13 @@ export default function HeaderTitle({
if (activeRoute === 'Events') {
return (
<TouchableOpacity onPress={_goBack}>
<Text style={styles.screenHeader}>Profile</Text>
<Text style={styles.screenHeader}>{STRINGS.PROFILE}</Text>
</TouchableOpacity>
);
}
if (activeRoute === 'Profile') {
return <Text style={styles.screenHeader}>Profile</Text>;
return <Text style={styles.screenHeader}>{STRINGS.PROFILE}</Text>;
}
return <EventTitle action={hasMultipleEvents ? _showEvents : null} />;

4
app/components/AppHeader/HeaderTitle/HeaderTitle.styles.js
View File

@@ -1,6 +1,6 @@
import { StyleSheet } from 'react-native';
export default (styles = StyleSheet.create({
export default StyleSheet.create({
filterBar: {
backgroundColor: '#0F0',
flexDirection: 'row',
@@ -11,4 +11,4 @@ export default (styles = StyleSheet.create({
view: {
flex: 2,
},
}));
});

2
app/components/AppHeader/IconButtons/BackIcon.js
View File

@@ -7,7 +7,7 @@ import { Icon } from 'react-native-elements';
export default function BackIcon({ action }) {
return (
<TouchableOpacity onPress={action}>
<Icon name="ei-chevron-left" type="evilicons" size={28} />;
<Icon name="ei-chevron-left" type="evilicons" size={28} />
</TouchableOpacity>
);
}

10
app/components/Auction/AuctionListItem.js
View File

@@ -83,28 +83,28 @@ export default class AuctionListItem extends Component {
)}
<View style={styles.rowText}>
{type === ITEM_TYPES.AUCTION && <BidStatus itemId={id} />}
<Text style={styles.title} numberOfLines={2} ellipsizeMode={'tail'}>
<Text style={styles.title} numberOfLines={2} ellipsizeMode="tail">
{title}
</Text>
<Text style={styles.subtitle} numberOfLines={1} ellipsizeMode={'tail'}>
<Text style={styles.subtitle} numberOfLines={1} ellipsizeMode="tail">
{subtitle}
</Text>
{donor && (
<Text style={styles.donor} numberOfLines={1} ellipsizeMode={'tail'}>
<Text style={styles.donor} numberOfLines={1} ellipsizeMode="tail">
{donor}
</Text>
)}
{type === ITEM_TYPES.AUCTION ? (
<AuctionPriceAndBidCount itemId={id} />
) : (
<Text style={styles.price} numberOfLines={1} ellipsizeMode={'tail'}>
<Text style={styles.price} numberOfLines={1} ellipsizeMode="tail">
{formatPrice(startingPrice)}
</Text>
)}
<Text style={styles.timeline} numberOfLines={1}>
{this._getBidTime()}
</Text>
<Text style={styles.description} numberOfLines={3} ellipsizeMode={'tail'}>
<Text style={styles.description} numberOfLines={3} ellipsizeMode="tail">
{description}
</Text>
</View>