diff --git a/.env b/.env index d121a32..44cb018 100644 --- a/.env +++ b/.env @@ -8,4 +8,4 @@ REACT_APP_APIGATE='http://float-gat.dev.chiefsoft.net' REACT_APP_APPLE_LINK='https://apps.apple.com/us/app/float-mobility/id1465369130' REACT_APP_GOOGLE_PLAY_LINK='https://apps.apple.com/us/app/float-mobility/id1465369130' -REACT_APP_SITE_ENDPOINT='https://float-gat.dev.chiefsoft.net/en/floatweb/api/v1/' \ No newline at end of file +REACT_APP_AUX_ENDPOINT='https://float-gat.dev.chiefsoft.net/en/floatweb/api/v1/' diff --git a/package.json b/package.json index 6c4ff7e..fe439c9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wwww-float", - "version": "0.2.0", + "version": "0.3.0", "private": true, "dependencies": { "@reduxjs/toolkit": "^1.8.2", diff --git a/src/App.js b/src/App.js index 3618bac..48b2998 100644 --- a/src/App.js +++ b/src/App.js @@ -21,15 +21,34 @@ import FindEv from "./pages/FindEv"; import FindMobility from "./pages/FindMobility"; import { Routes, Route } from "react-router-dom"; - +import { useState, useEffect } from "react"; +import SiteService from "./svs/SiteService"; function App() { + const [blogData, setBlogData] = useState([]) // for holding + const siteApi = new SiteService(); // instantiating the API SERVICE + const getBlogData = async () => { + try { + const res = await siteApi.blogData(); + if(res.status == 200 /* && res.data.status > 0*/){ + console.log(res.data.payload); + setBlogData(res.data) + return + } + }catch(error) { + } + }; + + useEffect(() => { + getBlogData(); + }, []); + return (
- } /> + } /> } /> } /> } /> @@ -40,7 +59,7 @@ function App() { } /> } /> } /> - } /> + } /> } /> } /> } /> diff --git a/src/components/Footer.js b/src/components/Footer.js index b06196d..d9b1cf8 100644 --- a/src/components/Footer.js +++ b/src/components/Footer.js @@ -12,21 +12,22 @@ class Footer extends React.Component {
-
    - -

  • Users

    • -

  • Fleet Mangers

    • +
      +

    • Stop the Surge

      • +

    • Travel Guide

    • Find Ev Charge

    • Find Options

      • + +
-
    -

  • Our Blog

    • +
      +

    • Users

      • +

    • Fleet Mangers

    • Customer Stories

      • -

    • Help & Support

    • Resources

@@ -35,7 +36,8 @@ class Footer extends React.Component {

  • About Us

    • -

  • Press & Media

    • +

  • Our Blog

    • +

  • Press Kit (Download)

  • Privacy Policy

  • Terms & Privacy

diff --git a/src/pages/Blog_listing.js b/src/pages/Blog_listing.js index 56e25fa..15685b3 100644 --- a/src/pages/Blog_listing.js +++ b/src/pages/Blog_listing.js @@ -1,7 +1,22 @@ -import React, {Component} from 'react'; +import React, {Component,useState, useEffect} from 'react'; +import SiteService from "../svs/SiteService"; class Blog_listing extends React.Component { + + constructor(props) { + super(props); + // Don't call this.setState() here! + // this.state = { counter: 0 }; + // this.handleClick = this.handleClick.bind(this); + console.log("OLU-AMEY BLOG LISTING ",props.blogData); + } + + render() { + // const [blogData, setBlogData] = useState([]) // for holding + //const siteApi = new SiteService(); // instantiating the API SERVICE + + return(
diff --git a/src/pages/FloatHome.js b/src/pages/FloatHome.js index 4e6a96e..5603fc6 100644 --- a/src/pages/FloatHome.js +++ b/src/pages/FloatHome.js @@ -15,6 +15,15 @@ import Assistant from '../pages/assests/images/assistant (2).ico' class FloatHome extends React.Component { + + constructor(props) { + super(props); + // Don't call this.setState() here! + // this.state = { counter: 0 }; + // this.handleClick = this.handleClick.bind(this); + console.log("OLU-AMEY 22",props.blogData); + } + render() { return(
@@ -1041,6 +1050,36 @@ class FloatHome extends React.Component {
{/* BLOG POSTS */}
+ { + this.props.blogData?.blogdata?.map((x) => { +
+
+ {/* BLOG POST IMAGE */} +
+ blog-post-image +
+ {/* BLOG POST TEXT */} +
+ {/* Post Tag */} +

Float News

+ {/* Post Link */} +
+ {x.title} +
+ {/* Text */} +

Aliqum mullam blandit vitae tempor sapien a donec lipsum gravida porta velna dolor vitae auctor + congue +

+ {/* Post Meta */} +
+
author-avatar
+

12 min read

+
+
+
+
+ }) + } {/* BLOG POST #1 */}
@@ -1122,6 +1161,7 @@ class FloatHome extends React.Component {
{/* END BLOG POST TEXT */}
{/* END BLOG POST #3 */} +
{/* END BLOG POSTS */}
{/* End container */} {/* END BLOG-1 */} diff --git a/src/pages/Users.js b/src/pages/Users.js index 61833d8..b4eb9ee 100644 --- a/src/pages/Users.js +++ b/src/pages/Users.js @@ -790,8 +790,8 @@ export default Users //HERO SECTION let heroSection = { leadTitle: `Float`, - title: `Your Mobility & Star Access Feed`, - desc: `Stay Connected with Your Fleet`, + title: `Your Mobility Made Smarter`, + desc: `Stay Connected with Your World`, mainSiteLink: 'This leads to users PORTAL', }; diff --git a/src/pages/assests/utils/SiteService.js b/src/pages/assests/utils/SiteService.js index 66acdb0..120ab80 100644 --- a/src/pages/assests/utils/SiteService.js +++ b/src/pages/assests/utils/SiteService.js @@ -18,7 +18,7 @@ class SiteService { } getEndPoint(uri, req){ - const endPoint = process.env.REACT_APP_SITE_ENDPOINT + uri; + const endPoint = process.env.REACT_APP_AUX_ENDPOINT + uri; return axios.get(endPoint) .then((res) => { console.log('==> GET REQUEST <==') @@ -39,7 +39,7 @@ class SiteService { } postEndPoint(uri, req){ - const endPoint = process.env.REACT_APP_SITE_ENDPOINT + uri; + const endPoint = process.env.REACT_APP_AUX_ENDPOINT + uri; return axios.get(endPoint, req) .then((res) => { console.log(res) diff --git a/src/svs/SiteService.js b/src/svs/SiteService.js new file mode 100644 index 0000000..188d259 --- /dev/null +++ b/src/svs/SiteService.js @@ -0,0 +1,84 @@ +//https://float-gat.dev.chiefsoft.net/en/floatweb/api/v1/wp +import React from "react"; +import Axios from "axios"; + +class SiteService { + constructor() { + console.log("Site Service Entered"); + } + // Blog Data {Get} + blogData() { + return this.getAuxEnd("/blogdata", null); + } + + // Country Data {GET} + countryData() { + return this.getAuxEnd("/country", null); + } + + // Contact Data{POST} + contactData() { + return this.postAuxEnd("/contact", null) + } + + faqData() { + return this.getAuxEnd("/faq", null); + } + + priceData() { + return this.getAuxEnd("/pricing", null); + } + + //---------------------------------------- ----- + //---------------------------------------- ----- + // Unified call below + //---------------------------------------- ----- + //---------------------------------------- ----- + getAuxEnd(uri, reqData) { + const endPoint = process.env.REACT_APP_AUX_ENDPOINT + uri; + return Axios.get(endPoint) + .then((response) => { + // console.log(response); + // res = response; + // console.log("~~~~~~~ Toks2 GET ~~~~~~~~"); + return response; + }) + .catch((error) => { + if (error.response) { + //response status is an error code + console.log(error.response.status); + } else if (error.request) { + //response not received though the request was sent + console.log(error.request); + } else { + //an error occurred when setting up the request + console.log(error.message); + } + }); + } + + postAuxEnd(uri, reqData) { + const endPoint = process.env.REACT_APP_AUX_ENDPOINT + uri; + return Axios.post(endPoint, reqData) + .then((response) => { + console.log(response); + // res = response; + console.log("~~~~~~~ Toks2 POST ~~~~~~~~"); + return response; + }) + .catch((error) => { + if (error.response) { + //response status is an error code + console.log(error.response.status); + } else if (error.request) { + //response not received though the request was sent + console.log(error.request); + } else { + //an error occurred when setting up the request + console.log(error.message); + } + }); + } +} + +export default SiteService;