Merge branch 'master' into userspage_text_to_variables

public/assets/css/responsive.css

@@ -738,8 +738,8 @@
 
   #content-14.aliceblue-shape, #content-14.whitesmoke-shape { padding-top: 80px; }
 
-  /* .content-section .img-block.left-column, .content-5-img { position: relative; left: -60%; } */
-  /* .content-section .img-block img, .content-5-img img, .content-6-img img { display: inline-block; max-width: none; width: 160%; } */
+  .content-section .img-block.left-column, .content-5-img { position: relative; left: -60%; }
+  .content-section .img-block img, .content-5-img img, .content-6-img img { display: inline-block; max-width: none; width: 160%; }
   .content-12-img { margin-right: 0; margin-bottom: -40px; }
 
   .cbox-txt { padding-left: 20px; }

public/assets/css/style.css

@@ -1331,10 +1331,6 @@ ol.digit-list p {
   display: inline-block;
 }
 
-.stores-badge + div{
-  margin-top: 1rem;
-}
-
 .store {
   display: inline-block;
   text-align: center;
@@ -2584,15 +2580,6 @@ h5.sm-title {
   padding-right: 25px;
 }
 
-.hero-8-txt > div {
-  margin-top: 5rem;
-}
-
-.hero-8-txt.fadeInRight{
-  display: flex;
-  flex-direction: column;
-}
-
 /*------------------------------------------*/
 /*  HERO APP LOGO
 /*------------------------------------------*/
@@ -2645,7 +2632,7 @@ h5.sm-title {
 }
 
 .hero-5-btns h3 {
-  margin-bottom: 6rem;
+  margin-bottom: 30px;
 }
 
 .hero-6-txt h2 {
@@ -2662,16 +2649,16 @@ h5.sm-title {
 }
 
 .hero-8-txt h2 {
-  margin-top: 3rem;
   margin-bottom: 5px;
 }
 
 .hero-8-txt h4 {
-  margin-bottom: 80px;
+  margin-bottom: 18px;
 }
 
 .hero-8-txt h5 {
   font-weight: 300;
+  margin-bottom: 50px;
 }
 
 .hero-9-txt h4 {

public/assets/js/custom.js

@@ -170,7 +170,7 @@
 					patterns: {
 						youtube: {			   
 							index: 'youtube.com',
-							src: 'https://www.youtube.com/embed/Jn22jdQ4KdQ'	// added the id of the video			
+							src: 'https://www.youtube.com/embed/7e90gBu4pas'				
 								}
 							}
 						}		  		  

src/pages/Fleet.js

@@ -1039,7 +1039,30 @@ class Fleet extends React.Component {
                     {/* Title */}
                     <h2 className="h2-md">{downloadSection.header}</h2>
                     {/* Text */}
-                    <p className="p-xl">{downloadSection.text}</p>     
+                    <p className="p-xl">{downloadSection.text}</p>
+                    {/* STORE BADGES */}
+                    <div className="stores-badge">
+                      {/* AppStore */}
+                      <a href="#" className="store">
+                        <img className="appstore" src="assets/images/appstore-white.png" alt="appstore-logo" />
+                      </a>
+                      {/* Google Play */}
+                      <a href="#" className="store">
+                        <img className="googleplay" src="assets/images/googleplay-white.png" alt="googleplay-logo" />
+                      </a>
+                    </div>	
+                    {/* Rating */}
+                    <div className="txt-block-rating">
+                      <div className="stars-rating">
+                        {downloadSection.ratingText}
+                        <span className="flaticon-star ml-5" />
+                        <span className="flaticon-star" />
+                        <span className="flaticon-star" />
+                        <span className="flaticon-star" />
+                        <span className="flaticon-star-half-empty" />	
+                        <p className="txt-rating">{downloadSection.reviewText}</p>
+                      </div>			
+                    </div>
                   </div>
                 </div>	{/* END TEXT BLOCK */}	
               </div>    {/* End row */}
@@ -1222,5 +1245,7 @@ let subscribeSection = {
 // Download Section
 let downloadSection = {
   header: 'Take your fleet to the next level',
-  text: 'Augue egestas volutpat egestas augue purus cubilia laoreet and magna suscipit luctus dolor tempus'
+  text: 'Augue egestas volutpat egestas augue purus cubilia laoreet and magna suscipit luctus dolor tempus',
+  ratingText: 'All Versions Rating',
+  reviewText: 'Based on 7.296 user reviews (App Store & Google Play)'
 }

src/pages/FloatHome.js

@@ -1,7 +1,4 @@
 import React, {Component} from 'react';
-import SaveMoney from '../pages/assests/images/save-money.png' 
-import GetReward from '../pages/assests/images/get-rewarded.png' 
-
 
 class FloatHome extends React.Component {
     render() {
@@ -75,6 +72,18 @@ class FloatHome extends React.Component {
 										<img class="microsoft" src="assets/images/microsoft.png" alt="microsoft-badge" />
 									</a> */} 
                     </div>	{/* END STORE BADGES */}
+                    {/* Rating */}
+                    <div className="txt-block-rating">
+                      <div className="stars-rating grey-color">
+                      {heroSection.badge.rating}
+                        <span className="flaticon-star ml-5" />
+                        <span className="flaticon-star" />
+                        <span className="flaticon-star" />
+                        <span className="flaticon-star" />
+                        <span className="flaticon-star-half-empty" />	
+                        <p className="txt-rating">{heroSection.badge.review}</p>
+                      </div>			
+                    </div>
                   </div>
                 </div>	{/* END HERO-5 BUTTONS */}
               </div>	  {/* End row */}
@@ -91,7 +100,7 @@ class FloatHome extends React.Component {
                   <div id="fb-1-1" className="col-md-4">
                     <div className="fbox-1 mb-40 wow fadeInUp" data-wow-delay="0.4s">
                       {/* Icon */}
-                      <div className="fbox-1-ico ico-80 stateblue-color"><img src={SaveMoney} /></div>
+                      <div className="fbox-1-ico ico-80 stateblue-color"><span className="flaticon-mobile-phone" /></div>
                       {/* Title */}
                       <h5 className="h5-sm">{message.access.heading}</h5>
                       {/* Text */}
@@ -102,7 +111,7 @@ class FloatHome extends React.Component {
                   <div id="fb-1-2" className="col-md-4">
                     <div className="fbox-1 mb-40 wow fadeInUp" data-wow-delay="0.6s">
                       {/* Icon */}
-                      <div className="fbox-1-ico ico-80 stateblue-color"><img src={SaveMoney} /></div>
+                      <div className="fbox-1-ico ico-80 stateblue-color"><span className="flaticon-chat-4" /></div>
                       {/* Title */}
                       <h5 className="h5-sm">{message.notification.heading}</h5>
                       {/* Text */}
@@ -113,7 +122,7 @@ class FloatHome extends React.Component {
                   <div id="fb-1-3" className="col-md-4">
                     <div className="fbox-1 mb-40 wow fadeInUp" data-wow-delay="0.8s">
                       {/* Icon */}
-                      <div className="fbox-1-ico ico-80 stateblue-color"><img src={GetReward} /></div>
+                      <div className="fbox-1-ico ico-80 stateblue-color"><span className="flaticon-spam" /></div>
                       {/* Title */}
                       <h5 className="h5-sm">{message.spam.heading}</h5>
                       {/* Text */}
@@ -1218,7 +1227,9 @@ class FloatHome extends React.Component {
           </section>	{/* END  DOWNLOAD-5 */}
         
         </div>	{/* END PAGE CONTENT */}
-   </div>
+   
+        
+            </div>
         )
     }
 }
@@ -1239,13 +1250,13 @@ export default FloatHome
   //SECTION TWO
   let message = {
     access: {
-      heading: `Smart Options`, description: `With Connectivity, both fleet managers and drivers will experience increased efficiencies.
+      heading: `Quick Access`, description: `Porta semper lacus a cursus, feugiat primis ultrice ligula and risus auctor ultrice and 
     ociis ligula blandit`
     },
-    notification: {heading: `Save Money`, description: `With Connectivity, both fleet managers and drivers will experience increased efficiencies.
+    notification: {heading: `Smart Notifications`, description: `Porta semper lacus a cursus, feugiat primis ultrice ligula and risus auctor ultrice and 
     ociis ligula blandit`
     },
-    spam: {heading: `Get Rewarded`, description: `With Connectivity, both fleet managers and drivers will experience increased efficiencies.
+    spam: {heading: `Spam Protection`, description: `Porta semper lacus a cursus, feugiat primis ultrice ligula and risus auctor ultrice and 
     ociis ligula blandit`
     }
   };
@@ -1281,14 +1292,14 @@ export default FloatHome
     desc: `Aliquam a augue suscipit, luctus neque purus ipsum neque at dolor primis libero
     tempus, blandit and cursus varius magna tempus a dolor`,
     accounts: {
-      title: `Multiple Accounts`, desc: `With Connectivity, both fleet managers and drivers will experience increased efficiencies.
-      Connectivity provides an array of features`
+      title: `Multiple Accounts`, desc: `Porta semper lacus a cursus, feugiat primis ultrice ligula and risus auctor ultrice and 
+      ociis ligula blandit`
     },
-    emojis: {title: `Service Options`, desc: `With Connectivity, both fleet managers and drivers will experience increased efficiencies.
-    Connectivity provides an array of features`
+    emojis: {title: `Stickers & Emojis`, desc: `Porta semper lacus a cursus, feugiat primis ultrice ligula and risus auctor ultrice and 
+    ociis ligula blandit`
     },
-    files: {title: `Connectivity`, desc: ` With Connectivity, both fleet managers and drivers will experience increased efficiencies.
-    Connectivity provides an array of features`
+    files: {title: `Share Files & Media`, desc: `Porta semper lacus a cursus, feugiat primis ultrice ligula and risus auctor ultrice and 
+    ociis ligula blandit`
     }
   }
 
@@ -1299,14 +1310,14 @@ export default FloatHome
     title: `Get rewarded with Float points for traveling smarter.`,
     desc: `Gain access to exclusive deals on local transportation, neighborhood favorites, and international brands by staying on budget, avoiding peak commute times, or carpooling with friends to reduce your carbon emissions (and to stay safe!)`,
 
-    text: {title: `Analytics`, 
+    text: {title: `float Messaging and Calls`, 
             desc: `Ligula risus auctor tempus dolor feugiat undo lacinia purus lipsum primis potenti at suscipit quaerat ultrice tellus viverra`
           },
-    stickers: {title: `Service Options`, 
+    stickers: {title: `Stickers, Emojis, Themes`, 
             desc: `Ligula risus auctor tempus dolor feugiat undo lacinia purus lipsum primis potenti at suscipit quaerat ultrice tellus viverra`
           },
-    media: {title: `Connectivity`, 
-            desc: `With Connectivity, both fleet managers and drivers will experience increased efficiencies.Connectivity provides an array of features`
+    media: {title: `Share Files & Media`, 
+            desc: `Ligula risus auctor tempus dolor feugiat undo lacinia purus lipsum primis potenti at suscipit quaerat ultrice tellus viverra`
           }
   }
 
@@ -1317,25 +1328,25 @@ export default FloatHome
     tempus, blandit and cursus varius magna tempus a dolor`,
 
     mode: {
-      title: `Monitoring`,
+      title: `Dark & Light Modes`,
       desc: `Porta semper lacus cursus risus and feugiat primis undo sodales a sapien magna 
       at vitae congue tempus`
     },
 
     groupMes: {
-      title: `Analytics`,
+      title: `Group Messaging`,
       desc: `Porta semper lacus cursus risus and feugiat primis undo sodales a sapien magna 
       at vitae congue tempus`
     },
 
     strongEncry: {
-      title: `Unlock Functionality`,
+      title: `Strong Encryption`,
       desc: `Porta semper lacus cursus risus and feugiat primis undo sodales a sapien magna 
       at vitae congue tempus`
     },
 
     voiceAsst: {
-      title: `Float Assistant`,
+      title: `float Assistant`,
       desc: `Porta semper lacus cursus risus and feugiat primis undo sodales a sapien magna 
       at vitae congue tempus`
     }

src/pages/Users.js

@@ -29,7 +29,6 @@ class Users extends React.Component {
                     <h4 className="h4-sm">{heroSection.leadTitle}®</h4>
                     <h2 className="h2-sm">{heroSection.title}</h2>
                     <h5 className="h5-xl">{heroSection.desc}</h5>
-                    <div>
                     {/* STORE BADGES */}											
                     <div className="stores-badge">
                       {/* AppStore */}
@@ -40,13 +39,35 @@ class Users extends React.Component {
                       <a href="#" className="store">
                         <img className="googleplay" src="assets/images/googleplay.png" alt="googleplay-badge" />
                       </a> 
+                      {/* Aamazon Market 
+									<a href="#" class="store">
+										<img class="amazon" src="assets/images/amazon.png" alt="amazon-badge" />
+									</a>  */}
+                      {/* Mac AppStore 
+									<a href="#" class="store">
+										<img class="mac-appstore" src="assets/images/macstore.png" alt="macstore-badge" />
+									</a> */} 
+                      {/* Microsoft Store  
+									<a href="#" class="store">
+										<img class="microsoft" src="assets/images/microsoft.png" alt="microsoft-badge" />
+									</a> */}
                     </div>	{/* END STORE BADGES */}	
-                   
+                    {/* Rating */}
+                    <div className="txt-block-rating">
+                      <div className="stars-rating dark-color">
+                      {heroSection.rating}
+                        <span className="flaticon-star ml-5" />
+                        <span className="flaticon-star" />
+                        <span className="flaticon-star" />
+                        <span className="flaticon-star" />
+                        <span className="flaticon-star-half-empty" />	
+                        <p className="txt-rating">{heroSection.review}</p>
+                      </div>			
+                    </div>
                     {/* USER PORTAL */}
                     <div>
                       <a className='btn btn-rose tra-grey-hover' href={`${process.env.REACT_APP_USERS}/`} target='_blank' >{heroSection.mainSiteLink}</a>
                     </div>
-                    </div>
                   </div>
                 </div>	{/* END HERO TEXT */}	
                 {/* HERO IMAGE */}
@@ -186,20 +207,15 @@ class Users extends React.Component {
             <div className="container">
               {/* CONTENT BOX-1 */}
               <div id="cb-1-1" className="cbox-1 pb-25">
-                <div className="row align-items-center">
+                <div className="row d-flex align-items-center">
                   {/* IMAGE BLOCK */}
-                  <div className="col-md-6 col-lg-6">
+                  <div className="col-md-5 col-lg-6">
                     <div className="img-block left-column pc-25 mb-40 wow fadeInRight" data-wow-delay="0.6s">
-                      <img className="img-fluid" src="assets/images/route-mockup2.png" alt="content-image" />
+                      <img className="img-fluid" src="assets/images/route1.png" alt="content-image" />
                     </div>
                   </div>
-                  {/* <div className="col-lg-7">
-                    <div className="content-12-img right-column wow fadeInLeft" data-wow-delay="0.6s">
-                      <img className="img-fluid" src="assets/images/info-pair.png" alt="content-image" />
-                    </div>
-                  </div> */}
                   {/* TEXT BLOCK */}	
-                  <div className="col-md-6 col-lg-6">
+                  <div className="col-md-7 col-lg-6">
                     <div className="txt-block right-column pc-30 mb-40 wow fadeInLeft" data-wow-delay="0.6s">
                       {/* Section ID */}	
                       <span className="section-id grey-color">{accessUnlimited.leadTitle}</span>
@@ -415,13 +431,15 @@ class Users extends React.Component {
                     {/* List */}	
                     <ul className="simple-list">
                       <li className="list-item">
-                        <p className="p-lg">{floatMap.desc}</p>
+                        <p className="p-lg">{floatMap.desc}
+                        </p>
                       </li>
                       <li className="list-item">
                         <p className="p-lg">{floatMap.descTwo}</p>
                       </li>
                       <li className="list-item">
-                        <p className="p-lg">{floatMap.descThree}</p>
+                        <p className="p-lg">{floatMap.descThree}
+                        </p>
                       </li>
                     </ul>
                   </div>
@@ -454,7 +472,7 @@ class Users extends React.Component {
                       </li>
                     </ul>
                     {/* Button */}	
-                    <a href="#content-1" className="btn btn-tra-grey rose-hover">{optimization.btn}</a>
+                    <a href="#content-1" className="btn btn-tra-grey rose-hover">Find Out More</a>
                   </div>	
                 </div>	{/* END TEXT BLOCK */}		
                 {/* IMAGE BLOCK */}	
@@ -855,8 +873,7 @@ class Users extends React.Component {
         )
     }
 }
-export default Users
-
+export default Users 
 
 // PAGE TEXT/CONTENT VARIABLES
 
@@ -865,6 +882,8 @@ let heroSection = {
   leadTitle: `Float`,
   title: `Your Activity Feed`,
   desc: `Stay Connected with Your Friends`,
+  rating: `All Versions Rating`,
+  review: `Based on 7.296 user reviews`,
   mainSiteLink: 'This leads to users PORTAL',
 };
 
@@ -874,19 +893,19 @@ let heroSection = {
     title: `Multiple Accounts`, desc: `Porta semper lacus cursus feugiat primis ultrice ligula risus auctor tempus feugiat 
     at impedit felis undo auctor augue mauris`
   },
-  float: {title: `Analytics`, desc: `Porta semper lacus cursus feugiat primis ultrice ligula risus auctor tempus feugiat 
+  float: {title: `Float Messaging & Calls`, desc: `Porta semper lacus cursus feugiat primis ultrice ligula risus auctor tempus feugiat 
     at impedit felis undo auctor augue mauris`
   },
-  files: {title: `Connectivity`, desc: `Porta semper lacus cursus feugiat primis ultrice ligula risus auctor tempus feugiat 
+  files: {title: `Share Files & Media`, desc: `Porta semper lacus cursus feugiat primis ultrice ligula risus auctor tempus feugiat 
     at impedit felis undo auctor augue mauris`
   },
-  notification: {title: `Monitoring`, desc: `Porta semper lacus cursus feugiat primis ultrice ligula risus auctor tempus feugiat 
+  notification: {title: `Alerts & Notifications`, desc: `Porta semper lacus cursus feugiat primis ultrice ligula risus auctor tempus feugiat 
     at impedit felis undo auctor augue mauris`
   },
   verification: {title: `Online Verification`, desc: `Porta semper lacus cursus feugiat primis ultrice ligula risus auctor tempus feugiat 
     at impedit felis undo auctor augue mauris`
   },
-  spam: {title: `Big Perks`, desc: `Porta semper lacus cursus feugiat primis ultrice ligula risus auctor tempus feugiat 
+  spam: {title: `Spam Protection`, desc: `Porta semper lacus cursus feugiat primis ultrice ligula risus auctor tempus feugiat 
     at impedit felis undo auctor augue mauris`
   }
 };
@@ -926,7 +945,7 @@ let fastMes = {
   desc: `Aliquam a augue suscipit, luctus neque purus ipsum neque at dolor primis libero
   tempus, blandit and cursus varius magna tempus a dolor`,
   mode: {
-    title: `Charging`, desc: `Porta semper lacus cursus risus and feugiat primis undo sodales a 
+    title: `Dark & Light Modes`, desc: `Porta semper lacus cursus risus and feugiat primis undo sodales a 
     sapien magna at vitae congue tempus`
   },
   autoLink: {title: `Auto-Link Opening`, desc: `Porta semper lacus cursus risus and feugiat primis undo sodales a 
@@ -944,19 +963,19 @@ let fastMes = {
 let floatForSpeed = {
   leadTitle: `Built For Speed`,
   title: `Keep Your Favorite People Close to You`,
-  desc: `Aliquam a augue suscipit, luctus neque at purus ipsum neque dolor primis libero tempus, blandit 
-  posuere orci auctor purus euismod an aliquam quaerat purus`,
+  desc: `Fringilla risus, luctus mauris orci auctor purus euismod pretium purus pretium 
+  ligula rutrum tempor sapien`,
+  descTwo: `Quaerat sodales sapien euismod purus blandit`,
+  descThree: `Nemo ipsam egestas volute turpis dolores ut aliquam quaerat sodales sapien undo 
+  pretium a purus mauris`
 }
 
 // DESIGN SECTION
 let floatMap = {
   leadTitle: `Beauty of Simplicity`,
   title: `Beautiful, award-winning design`,
-  desc: `Fringilla risus, luctus mauris orci auctor purus euismod pretium purus pretium 
-  ligula rutrum tempor sapien`,
-  descTwo: `Quaerat sodales sapien euismod purus blandit`,
-  descThree: `Nemo ipsam egestas volute turpis dolores ut aliquam quaerat sodales sapien undo 
-  pretium a purus mauris`,
+  desc: `Aliquam a augue suscipit, luctus neque at purus ipsum neque dolor primis libero tempus, blandit 
+  posuere orci auctor purus euismod an aliquam quaerat purus`
 }
 
 //  OPTIMIZATION SECTION
@@ -995,4 +1014,5 @@ let subscribeSec = {
   leadTitle: `Subscribe to Our Newsletter`,
   title: `Stay up to date with our news, ideas and updates`,
   btn: 'Subscribe Now'
-}
+}
+