diff --git a/app/api/index.js b/app/api/index.js
index 89c035c..b31a991 100644
--- a/app/api/index.js
+++ b/app/api/index.js
@@ -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 = {}) => {
diff --git a/app/api/profile.js b/app/api/profile.js
index 639e907..3ca6990 100644
--- a/app/api/profile.js
+++ b/app/api/profile.js
@@ -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)}`);
diff --git a/app/components/AppHeader/AppHeader.js b/app/components/AppHeader/AppHeader.js
index c6218f3..dac5132 100644
--- a/app/components/AppHeader/AppHeader.js
+++ b/app/components/AppHeader/AppHeader.js
@@ -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 {
diff --git a/app/components/AppHeader/HeaderContentLeft.js b/app/components/AppHeader/HeaderContentLeft.js
index 4915467..9ad3e77 100644
--- a/app/components/AppHeader/HeaderContentLeft.js
+++ b/app/components/AppHeader/HeaderContentLeft.js
@@ -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,
};
diff --git a/app/components/AppHeader/HeaderTitle/EventTitle/EventTitle.container.js b/app/components/AppHeader/HeaderTitle/EventTitle/EventTitle.container.js
index 69ea31e..db36b07 100644
--- a/app/components/AppHeader/HeaderTitle/EventTitle/EventTitle.container.js
+++ b/app/components/AppHeader/HeaderTitle/EventTitle/EventTitle.container.js
@@ -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';
diff --git a/app/components/AppHeader/HeaderTitle/EventTitle/EventTitle.js b/app/components/AppHeader/HeaderTitle/EventTitle/EventTitle.js
index 6a0958a..0a07084 100644
--- a/app/components/AppHeader/HeaderTitle/EventTitle/EventTitle.js
+++ b/app/components/AppHeader/HeaderTitle/EventTitle/EventTitle.js
@@ -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 = () => (
{name}
- {`${date} | ${start} - ${end}`}
+ {whenString}
);
diff --git a/app/components/AppHeader/HeaderTitle/EventTitle/EventTitle.styles.js b/app/components/AppHeader/HeaderTitle/EventTitle/EventTitle.styles.js
index 16fe7ff..127a527 100644
--- a/app/components/AppHeader/HeaderTitle/EventTitle/EventTitle.styles.js
+++ b/app/components/AppHeader/HeaderTitle/EventTitle/EventTitle.styles.js
@@ -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,
},
-}));
+});
diff --git a/app/components/AppHeader/HeaderTitle/HeaderTitle.js b/app/components/AppHeader/HeaderTitle/HeaderTitle.js
index 6429c4e..cfca91e 100644
--- a/app/components/AppHeader/HeaderTitle/HeaderTitle.js
+++ b/app/components/AppHeader/HeaderTitle/HeaderTitle.js
@@ -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 (
- Profile
+ {STRINGS.PROFILE}
);
}
if (activeRoute === 'Profile') {
- return Profile;
+ return {STRINGS.PROFILE};
}
return ;
diff --git a/app/components/AppHeader/HeaderTitle/HeaderTitle.styles.js b/app/components/AppHeader/HeaderTitle/HeaderTitle.styles.js
index e4c5889..30ef859 100644
--- a/app/components/AppHeader/HeaderTitle/HeaderTitle.styles.js
+++ b/app/components/AppHeader/HeaderTitle/HeaderTitle.styles.js
@@ -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,
},
-}));
+});
diff --git a/app/components/AppHeader/IconButtons/BackIcon.js b/app/components/AppHeader/IconButtons/BackIcon.js
index c2e314d..f839cfb 100644
--- a/app/components/AppHeader/IconButtons/BackIcon.js
+++ b/app/components/AppHeader/IconButtons/BackIcon.js
@@ -7,7 +7,7 @@ import { Icon } from 'react-native-elements';
export default function BackIcon({ action }) {
return (
- ;
+
);
}
diff --git a/app/components/Auction/AuctionListItem.js b/app/components/Auction/AuctionListItem.js
index 341b85d..df3b2b9 100644
--- a/app/components/Auction/AuctionListItem.js
+++ b/app/components/Auction/AuctionListItem.js
@@ -83,28 +83,28 @@ export default class AuctionListItem extends Component {
)}
{type === ITEM_TYPES.AUCTION && }
-
+
{title}
-
+
{subtitle}
{donor && (
-
+
{donor}
)}
{type === ITEM_TYPES.AUCTION ? (
) : (
-
+
{formatPrice(startingPrice)}
)}
{this._getBidTime()}
-
+
{description}