Changes for version 1.01 production release

jaybabak · Jun 18, 2020 · 19fb553 · 19fb553
1 parent f60c27c
commit 19fb553
Show file tree

Hide file tree

Showing 14 changed files with 10,948 additions and 10,792 deletions.
diff --git a/App/assets/images/splash_16.png b/App/assets/images/splash_16.png
diff --git a/App/ios/App.xcodeproj/project.pbxproj b/App/ios/App.xcodeproj/project.pbxproj
@@ -612,7 +612,7 @@
 			baseConfigurationReference = 3FD92F64A8AC29470403FA49 /* Pods-App.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CURRENT_PROJECT_VERSION = 22;
+				CURRENT_PROJECT_VERSION = 24;
 				DEAD_CODE_STRIPPING = NO;
 				DEVELOPMENT_TEAM = FQ8J54HD9C;
 				ENABLE_BITCODE = NO;
@@ -622,7 +622,7 @@
 				);
 				INFOPLIST_FILE = App/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 3.2;
+				MARKETING_VERSION = 3.4;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -639,7 +639,7 @@
 			baseConfigurationReference = 22113148A0E2F51415B199F1 /* Pods-App.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CURRENT_PROJECT_VERSION = 22;
+				CURRENT_PROJECT_VERSION = 24;
 				DEVELOPMENT_TEAM = FQ8J54HD9C;
 				ENABLE_BITCODE = NO;
 				HEADER_SEARCH_PATHS = (
@@ -648,7 +648,7 @@
 				);
 				INFOPLIST_FILE = App/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 3.2;
+				MARKETING_VERSION = 3.4;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

diff --git a/App/src/components/Forms/Login/Login.js b/App/src/components/Forms/Login/Login.js
@@ -64,7 +64,7 @@ class Login extends Component {
           danger
           onPress={this.props.login}
         >
-          <Text style={styles.whiteText}>LOGIN</Text>
+          <Text style={styles.whiteText}>Login</Text>
         </Button>
         <Button
           onPress={this.props.navigateToRegisterScreen}
@@ -73,7 +73,7 @@ class Login extends Component {
           // bordered
           dark
         >
-          <Text style={styles.whiteText}>SIGN-UP A FOR NEW ACCOUNT</Text>
+          <Text style={styles.whiteText}>Sign-up for a new account</Text>
         </Button>
         <Button
           onPress={() => this.props.navigateToDashboard(true)} // true is for isGuest param

diff --git a/App/src/components/MapDetails/static/markerH.png b/App/src/components/MapDetails/static/markerH.png
diff --git a/App/src/components/MapOverview/static/marker.ai b/App/src/components/MapOverview/static/marker.ai
diff --git a/App/src/components/MapOverview/static/markerH.png b/App/src/components/MapOverview/static/markerH.png
diff --git a/App/src/components/RestaurantListView/RestaurantListView.js b/App/src/components/RestaurantListView/RestaurantListView.js
@@ -49,22 +49,24 @@ class RestaurantListView extends React.PureComponent {
     return (
       <List style={{ backgroundColor: "white" }}>
         {this.state.restaurants.map((restaurant, index) => {
+          // Roud th decimal.
+          const theTotalDistance =
+            (Math.round((restaurant.dist.calculated / 1000) * 10) / 10).toFixed(
+              1
+            ) + " KM";
+          // Return the reastaurant.
           return (
             <ListItem
               avatar
               key={index}
-              onPress={() => this.props.goToDetailsPage(restaurant._id)}
+              onPress={() =>
+                this.props.goToDetailsPage(restaurant._id, theTotalDistance)
+              }
               style={{ backgroundColor: "white" }}
               style={styles.listItem}
             >
               <Left style={styles.distanceContainer}>
-                <Text style={styles.distanceField}>
-                  {(
-                    Math.round((restaurant.dist.calculated / 1000) * 10) / 10
-                  ).toFixed(1)}{" "}
-                  KM
-                </Text>
-                {/* <Text style={styles.distanceField}>KM</Text> */}
+                <Text style={styles.distanceField}>{theTotalDistance}</Text>
               </Left>
               <Body>
                 <Text>{restaurant.name}</Text>

diff --git a/App/src/components/Slider/Slider.js b/App/src/components/Slider/Slider.js
@@ -78,7 +78,7 @@ class Slider extends Component {
           height: 15,
           borderRadius: 15,
           marginHorizontal: 8,
-          backgroundColor: "black",
+          backgroundColor: "#FF1B15",
         }}
         inactiveDotStyle={
           {

diff --git a/App/src/components/Slider/styles.js b/App/src/components/Slider/styles.js
@@ -4,6 +4,7 @@ const { width: screenWidth } = Dimensions.get("window");
 const styles = StyleSheet.create({
   item: {
     width: screenWidth - 30,
+    // width: screenWidth - 30,
     height: screenWidth,
   },
   imageContainer: {

diff --git a/App/src/containers/Dashboard/Dashboard.js b/App/src/containers/Dashboard/Dashboard.js
@@ -179,6 +179,7 @@ class Dashboard extends React.Component {
   }
 
   goToDetailsPage(theRestaurantId) {
+    // console.log(this.state)
     this.props.navigation.navigate("Details", {
       rid: theRestaurantId,
       user: this.state.user,
@@ -264,7 +265,7 @@ class Dashboard extends React.Component {
 
         {this.state.loadedRestaurants ? (
           <Content>
-            {/* Ads */}
+            {/* Ads @TODO -> REFACTOR into its own component */}
             {this.state.displayAd ? (
               <View style={styles.ad}>
                 <AdMobBanner

diff --git a/App/src/containers/Details/Details.js b/App/src/containers/Details/Details.js
@@ -61,6 +61,7 @@ class Details extends React.PureComponent {
     this.getRestaurantDetails();
 
     const currentUser = this.props.navigation.getParam("user");
+    const distanceField = this.props.navigation.getParam("user");
 
     this.setState({ user: currentUser });
   }
@@ -294,7 +295,7 @@ class Details extends React.PureComponent {
               <Slider {...this.state.restaurant} />
               {/* Start Slider/Carousel */}
 
-              {/* Ads */}
+              {/* Ads @TODO -> REFACTOR into its own component*/}
               {this.state.displayAd ? (
                 <View style={styles.ad}>
                   <AdMobBanner

diff --git a/App/src/containers/Details/styles.js b/App/src/containers/Details/styles.js
@@ -86,7 +86,7 @@ const styles = StyleSheet.create({
     alignSelf: "center",
   },
   container: {
-    padding: 10,
+    padding: 15,
   },
   buttonSubmitCloseBtn: {
     marginTop: 10,
@@ -103,7 +103,7 @@ const styles = StyleSheet.create({
     height: 200,
   },
   ad: {
-    marginTop: 10,
+    marginTop: 40,
     marginBottom: 40,
     flex: 1,
     justifyContent: "center",

diff --git a/Server/data/.DS_Store b/Server/data/.DS_Store
diff --git a/splash.ai b/splash.ai