diff --git a/docker/Dockerfile b/docker/Dockerfile index a724685..ee8b221 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -13,9 +13,10 @@ COPY package.json ./ RUN npm install --silent RUN npm install react-scripts@3.4.1 -g --silent +RUN npm install react-router-dom --save + # add app COPY . ./ # start app CMD ["npm","run", "start"] - diff --git a/package.json b/package.json index 7b858a8..b627804 100644 --- a/package.json +++ b/package.json @@ -1,21 +1,28 @@ { - "name": "floatweb", + "name": "float-ev-www", "version": "0.1.0", "private": true, "dependencies": { - "@testing-library/jest-dom": "^5.16.5", - "@testing-library/react": "^13.4.0", - "@testing-library/user-event": "^13.5.0", - "react": "^18.2.0", - "react-dom": "^18.2.0", - "react-scripts": "5.0.1", - "web-vitals": "^2.1.4" + "@testing-library/jest-dom": "^5.11.4", + "@testing-library/react": "^11.1.0", + "@testing-library/user-event": "^12.1.10", + "axios": "^0.24.0", + "react": "^17.0.2", + "react-countup": "^6.0.0", + "react-dom": "^17.0.2", + "react-router-dom": "^5.3.0", + "react-scripts": "5.0.0", + "react-slick": "^0.28.1", + "simple-react-lightbox": "^3.6.9-0", + "slick-carousel": "^1.8.1", + "web-vitals": "^1.0.1" }, "scripts": { "start": "react-scripts start", "build": "react-scripts build", "test": "react-scripts test", - "eject": "react-scripts eject" + "eject": "react-scripts eject", + "lint": "yarn add -D prettier && yarn add -D babel-eslint && npx install-peerdeps --dev eslint-config-airbnb && yarn add -D eslint-config-prettier eslint-plugin-prettier" }, "eslintConfig": { "extends": [ @@ -34,5 +41,17 @@ "last 1 firefox version", "last 1 safari version" ] + }, + "devDependencies": { + "babel-eslint": "^10.1.0", + "eslint": "^7.11.0", + "eslint-config-airbnb": "18.2.1", + "eslint-config-prettier": "^8.3.0", + "eslint-plugin-import": "2.22.1", + "eslint-plugin-jsx-a11y": "6.4.1", + "eslint-plugin-prettier": "^4.0.0", + "eslint-plugin-react": "7.21.5", + "eslint-plugin-react-hooks": "1.7.0", + "prettier": "^2.4.1" } } diff --git a/src/Config/config.js b/src/Config/config.js index 6bb14e1..31f0b88 100644 --- a/src/Config/config.js +++ b/src/Config/config.js @@ -4,20 +4,18 @@ function getConfig() { return [ { - "site_name" : 'WrenchBoard', + "site_name" : 'Floatev', "dash_url": 'https://dashboard.wrenchboard.com', "dash_url_login": "https://dashboard.wrenchboard.com/login", "dash_url_signup": "https://dashboard.wrenchboard.com/signup", "android_app": 'https://play.google.com/store/apps/details?id=com.wrenchboard.users', "apple_app": 'https://itunes.apple.com/us/app/wrenchboard/id1435718367?ls=1&mt=8', - "facebook_link": 'https://www.facebook.com/wrenchboard', - "twitter_link": 'https://twitter.com/wrenchboard/', - "linked_link": "https://www.linkedin.com/company/wrenchboard/", - "support_email": 'support@wrenchboard.com', + "facebook_link": 'https://www.facebook.com/tryfloat', + "twitter_link": 'https://twitter.com/tryfloat/', + "linked_link": "https://www.linkedin.com/company/float-mobility/", + "support_email": 'support@float.sg', "support_phone": '404 855-7966', - "support_phone_ng": '(+420) 336 476 328', - "support_us_address": 'Cumberland Pkwy, Atlanta GA 30339', - "support_ng_address": 'Saka Tinubu Street, Victoria Island Lagos, Nigeria', + "support_us_address": '1070 Cresta Way Unit 2, San Rafael CA 94903', "dummy": "2018-06-25T18:54:22.000Z", "user_service_endpoint": "https://dashboard.wrenchboard.com/svs/user", } diff --git a/src/assets/css/style.css b/src/assets/css/style.css index 46049c9..cd0d3a3 100644 --- a/src/assets/css/style.css +++ b/src/assets/css/style.css @@ -122,3 +122,6 @@ left: 15px; } } +.fleet-title{ + color: aqua; +} diff --git a/src/components/HomeOne/BlogHomeOne.js b/src/components/HomeOne/BlogHomeOne.js index 791b9b2..6691d13 100644 --- a/src/components/HomeOne/BlogHomeOne.js +++ b/src/components/HomeOne/BlogHomeOne.js @@ -10,8 +10,8 @@ function BlogHomeOne() { return ( <> - Resources - {/*
+ {/* Resources +
@@ -22,11 +22,11 @@ function BlogHomeOne() {
-
*/} +
- + */} ); } diff --git a/src/components/HomeOne/FeaturesHomeOne.js b/src/components/HomeOne/FeaturesHomeOne.js index 85a17c0..61d8743 100644 --- a/src/components/HomeOne/FeaturesHomeOne.js +++ b/src/components/HomeOne/FeaturesHomeOne.js @@ -21,46 +21,46 @@ function FeaturesHomeOne({ className }) {
- -
-
-
-

Float analytical, recommendation/rewards framework

-

-
    -

  • Our platform analyzes current fleet behavior and display areas for improvement on our custom customer dashboard.

    • -

    -

  • We provide immediate and longer term changes to improve fleet performance.

    • -

    -

  • Our software takes you through the daily process of transitioning your fleet to Float.

    • -

    -

  • We guide you step by step to convert to Electronic vehicles.

    • - -
- -
-
- -
+
+
- - -
+ className="appie-features-content wow animated fadeInLeft " + className="appie-title" + className="appie-features-tabs-btn" + className="nav flex-column nav-pills" id="v-pills-tab" role="tablist" aria-orientation="vertical" + > +

Float analytical, recommendation/rewards framework

+

+ +
    +

  • Our platform analyzes current fleet behavior and display areas for improvement on our custom customer dashboard.

    • +

    +

  • We provide immediate and longer term changes to improve fleet performance.

    • +

    +

  • Our software takes you through the daily process of transitioning your fleet to Float.

    • +

    +

  • We guide you step by step to convert to Electronic vehicles.

    • + +
+
-
+
+ +
+
+ + +
+
+
- + ); } diff --git a/src/components/HomeOne/FooterHomeOne.js b/src/components/HomeOne/FooterHomeOne.js index 05c3482..f7e7980 100644 --- a/src/components/HomeOne/FooterHomeOne.js +++ b/src/components/HomeOne/FooterHomeOne.js @@ -19,7 +19,7 @@ function FooterHomeOne({ className }) {

- {`It is simple. You can do something that somebody is ready to pay you for. WrenchBoard is the platform to connect you with earning opportunities. `} + {`Float saves their customers money from day one by analyzing their current fleet data on cost, emissions,time and resources and then makes recommendations on prioritization of vehicle replacements and infrastructure investments.`}

Read More @@ -98,7 +98,7 @@ function FooterHomeOne({ className }) {
  • - San Anselmo,CA 9690 + 1070 Cresta Way Unit 2, San Rafael CA 94903
    • diff --git a/src/components/HomeOne/HeroHomeOne.js b/src/components/HomeOne/HeroHomeOne.js index f5faff0..c086908 100644 --- a/src/components/HomeOne/HeroHomeOne.js +++ b/src/components/HomeOne/HeroHomeOne.js @@ -1,19 +1,17 @@ import React from 'react'; -import heroThumbOne from '../../assets/images/app-thumb-1.png'; -import heroThumbTwo from '../../assets/images/app-pic.png'; -import shapeTwo from '../../assets/images/shape/shape-2.png'; -import shapeThree from '../../assets/images/shape/shape-3.png'; -import shapeFour from '../../assets/images/shape/shape-4.png'; import getConfig from './../../Config/config' - +import HomeBanner from '../../assets/float-ev/images/home-banner.jpg'; function HeroHomeOne() { var site = getConfig()[0]; return ( <>
    - Float - {/*

    +
    + Float +
    + + {/*

    ELECTRIC FLEET CONVERSION PLATFORM

    */}
    diff --git a/src/components/HomeOne/ServicesHomeOne.js b/src/components/HomeOne/ServicesHomeOne.js index b1cebf3..9bb1379 100644 --- a/src/components/HomeOne/ServicesHomeOne.js +++ b/src/components/HomeOne/ServicesHomeOne.js @@ -13,7 +13,7 @@ function ServicesHomeOne({ className }) { return (
    -
    + {/*

    @@ -21,7 +21,7 @@ function ServicesHomeOne({ className }) {

    -
    +
    */}