Merge branch 'master' of http://gitlab.chiefsoft.net/WrenchBoard/WrenchBoardMainSite into Performing-task-Text-and-Image

public/assets/images/apps/family.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" data-name="Layer 1" viewBox="0 0 32 32" id="Family"><path d="M26.305 22.723a4.972 4.972 0 0 0-3.176-8.71 9.917 9.917 0 0 0-3.438-2.292 6 6 0 1 0-7.382 0 9.917 9.917 0 0 0-3.438 2.292 4.972 4.972 0 0 0-3.171 8.71A8.005 8.005 0 0 0 1 30a1 1 0 0 0 2 0 6 6 0 0 1 12 0 1 1 0 0 0 2 0 6 6 0 0 1 12 0 1 1 0 0 0 2 0 8.005 8.005 0 0 0-4.695-7.277ZM26 19a3 3 0 1 1-3-3 3 3 0 0 1 3 3ZM12 7a4 4 0 1 1 4 4 4 4 0 0 1-4-4ZM6 19a3 3 0 1 1 3 3 3 3 0 0 1-3-3Zm10 7.136a8.04 8.04 0 0 0-3.695-3.413 4.949 4.949 0 0 0-1.05-8.16 7.984 7.984 0 0 1 9.49 0 4.949 4.949 0 0 0-1.05 8.16A8.04 8.04 0 0 0 16 26.136Z" fill="#4687ba" class="color000000 svgShape"></path></svg>

public/index.html

@@ -25,6 +25,10 @@
       work correctly both with client-side routing and a non-root public URL.
       Learn how to configure a non-root public URL by running `npm run build`.
     -->
+
+    <!-- link to font awesome -->
+    <link rel="stylesheet" href="//use.fontawesome.com/releases/v6.4.2/css/all.css">
+    
     <title>WrenchBoard</title>
     <meta property="og:image" content="%PUBLIC_URL%/favicon-32x32.png" />
     <meta property="business:contact_data:street_address" content="Cumberland Pkwy">

src/assets/css/font-awesome.min.css

@@ -5632,6 +5632,9 @@ readers do not read off random characters that represent icons */
 .fa-twitter:before {
   content: "\f099"; }
 
+.fa-x-twitter:before {
+  content: "\e61b"; }
+
 .fa-twitter-square:before {
   content: "\f081"; }
 

src/assets/images/icon/twitter_icon.svg

@@ -0,0 +1,3 @@
+<svg width="1200" height="1227" viewBox="0 0 1200 1227" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M714.163 519.284L1160.89 0H1055.03L667.137 450.887L357.328 0H0L468.492 681.821L0 1226.37H105.866L515.491 750.218L842.672 1226.37H1200L714.137 519.284H714.163ZM569.165 687.828L521.697 619.934L144.011 79.6944H306.615L611.412 515.685L658.88 583.579L1055.08 1150.3H892.476L569.165 687.854V687.828Z" fill="white"/>
+</svg>

src/components/Contact/Forms.js

@@ -82,7 +82,8 @@ function Forms() {
                                         <i className="fab fa-facebook-f"></i>
                                     </a>
                                     <a className="twi" href={process.env.REACT_APP_TWITTER_LINK}>
-                                        <i className="fab fa-twitter"></i>
+                                        {/* <i className="fab fa-twitter"></i> */}
+                                        <i className="fab fa-x-twitter" />
                                     </a>
                                     <a className="you" href="#">
                                         <i className="fab fa-youtube"></i>

src/components/HomeOne/BlogHomeOne.js

@@ -8,7 +8,7 @@ import Blogs from '../News/Blogs';
 function BlogHomeOne() {
     return (
         <>
-            <section className="appie-blog-area pt-90 pb-95">
+            <section className="appie-blog-area pt-45 pb-95">
                 <div className="container">
                     <div className="row">
                         <div className="col-lg-12">

src/components/HomeOne/FooterHomeOne.js

@@ -34,7 +34,8 @@ function FooterHomeOne({ className }) {
                                         </li>
                                         <li>
                                             <a href={process.env.REACT_APP_TWITTER_LINK}>
-                                                <i className="fab fa-twitter" />
+                                                {/* <i className="fab fa-twitter" /> */}
+                                                <i className="fab fa-x-twitter" />
                                             </a>
                                         </li>
                                     </ul>

src/components/HomeOne/HeroHomeOne.js

@@ -1,11 +1,14 @@
-import React from "react";
+import React from 'react';
-import heroThumbOne from "../../assets/images/app-thumb-1.png";
+import heroThumbOne from '../../assets/images/app-thumb-1.png';
-import heroThumbTwo from "../../assets/images/app-pic.png";
+import heroThumbOne1 from '../../assets/images/app-thumb-2.png';
-import shapeTwo from "../../assets/images/shape/shape-2.png";
+
-import shapeThree from "../../assets/images/shape/shape-3.png";
+import heroThumbTwo from '../../assets/images/app-pic.png';
-import shapeFour from "../../assets/images/shape/shape-4.png";
+import shapeTwo from '../../assets/images/shape/shape-2.png';
-import getConfig from "./../../Config/config";
+import shapeThree from '../../assets/images/shape/shape-3.png';
-import CustomSlider from "../customSlider/CustomSlider";
+import shapeFour from '../../assets/images/shape/shape-4.png';
+import getConfig from './../../Config/config'
+import CustomSlider from '../customSlider/CustomSlider';
+
 
 function HeroHomeOne() {
   var site = getConfig()[0];
@@ -18,31 +21,20 @@ function HeroHomeOne() {
               <div className="appie-hero-content">
                 {/*<span>Welcome To WrenchBoard..</span>*/}
                 <h1 className="appie-title">
-                  Turn Chores into Exciting Challenges and Earn{" "}
+                  Turn Chores into Exciting Challenges and Earn <span className='earn-rewards px-2'>Rewards!</span>
-                  <span className="earn-rewards px-2">Rewards!</span>
                 </h1>
                 <p>
-                  Your place to set family goals and reward achievements. Find
+                  Your place to set family goals and reward achievements. Find tasks to earn from, or build a tasks portfolio and find others to perform tasks for you.                                </p>
-                  tasks to earn from, or build a tasks portfolio and find others
-                  to perform tasks for you.{" "}
-                </p>
                 <ul>
                   <li>
-                    <a
+                    <a href={process.env.REACT_APP_APPLE_APP} className="dark" target="_blank">
-                      href={process.env.REACT_APP_APPLE_APP}
-                      className="dark"
-                      target="_blank"
-                    >
                       <i className="fab fa-apple" /> Download for iOS
                     </a>
                   </li>
                   <li>
-                    <a
+                    <a className="item-2 light" href={process.env.REACT_APP_ANDROID_APP} target="_blank">
-                      className="item-2 light"
+                      <i className="fab fa-google-play" /> Download for
-                      href={process.env.REACT_APP_ANDROID_APP}
+                      Android
-                      target="_blank"
-                    >
-                      <i className="fab fa-google-play" /> Download for Android
                     </a>
                   </li>
                 </ul>
@@ -56,11 +48,11 @@ function HeroHomeOne() {
                   data-wow-delay="200ms"
                 >
                   {/* <img src={heroThumbOne} alt="WrenchBoard" /> */}
-                  <div style={{ width: "350px", margin: "auto" }}>
+                  <div style={{ width: '350px', margin: 'auto' }}>
                     <CustomSlider
-                      images={[heroThumbOne, heroThumbOne, heroThumbOne]}
+                      images={[heroThumbOne, heroThumbOne1, heroThumbOne]}
-                      speed="5"
+                      speed='5'
-                      indicatorColor="#0D1133"
+                      indicatorColor='#333'
                     />
                   </div>
                 </div>
@@ -75,6 +67,13 @@ function HeroHomeOne() {
             </div>
           </div>
         </div>
+        <div
+          className="thumb-2 wow animated fadeInRight"
+          data-wow-duration="2000ms"
+          data-wow-delay="600ms"
+        >
+          <img src={heroThumbTwo} alt="" />
+        </div>
       </section>
     </>
   );

src/components/HomeOne/ServicesHomeOne.js

@@ -1,8 +1,8 @@
-import React from "react";
+import React from 'react';
-import IconOne from "../../assets/images/icon/usericon.png";
+import IconOne from '../../assets/images/icon/play.png';
-import IconTwo from "../../assets/images/icon/Findtaskicon.png";
+import IconTwo from '../../assets/images/icon/task.png';
-import IconThree from "../../assets/images/icon/taskicon.png";
+import IconThree from '../../assets/images/icon/target.png';
-import IconFour from "../../assets/images/icon/walleticon.png";
+import IconFour from '../../assets/images/icon/reward.png';
 
 function ServiceItem({ icon, title, description, index }) {
   return (
@@ -26,25 +26,23 @@ function ServicesHomeOne({ className }) {
   const serviceItems = [
     {
       icon: IconOne,
-      title: "Free Account",
+      title: 'Free Account',
-      description: "Join WrenchBoard. Create an account for Income.",
+      description: 'Join WrenchBoard. Get your free account.',
     },
     {
       icon: IconTwo,
-      title: "Find Task",
+      title: 'Set Goals',
-      description: "Build a Self-Portfolio with sole purpose to Cash-Out.",
+      description: 'Suggest or find what you want to get rewarded for.',
     },
     {
       icon: IconThree,
-      title: "Complete",
+      title: 'Complete',
-      description:
+      description: 'Complete task, and notify assigner with ease.',
-        "Organize and Manage your teams efficiently. Manage your workgroup.",
     },
     {
       icon: IconFour,
-      title: "Get Paid",
+      title: 'Reward',
-      description:
+      description: 'Task completed. Find your reward.',
-        "Start Boosting your Income by earning Cash for your Time and Skills.",
     },
   ];
 

src/components/HomeOne/TrafficHomeTwo.js

@@ -6,7 +6,7 @@ import getConfig from './../../Config/config'
 function TrafficHomeOne() {
   var site = getConfig()[0];
   return (
-    <section className="wrench-on-area pt-140 pb-180">
+    <section className="wrench-on-area pt-90 pb-45">
       <div className="container">
         <div className="row">
           <div className="col-lg-7">