diff --git a/.env b/.env index 6e5e0b5..d149d13 100644 --- a/.env +++ b/.env @@ -13,4 +13,4 @@ REACT_APP_TWITTER_LINK='https://twitter.com/tryfloat/' REACT_APP_LINKEDIN_LINK="https://www.linkedin.com/company/float-mobility/" REACT_APP_INSTAGRAM_LINK="https://www.instagram.com/company/float-mobility/" -REACT_APP_AUX_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/src/App.js b/src/App.js index 6120c69..62f40f0 100644 --- a/src/App.js +++ b/src/App.js @@ -39,11 +39,12 @@ function App() { try { const res = await siteApi.blogData(); if(res.status == 200 /* && res.data.status > 0*/){ - console.log(res.data.payload); + console.log(res.data.payload, res.data); setBlogData(res.data) return } }catch(error) { + setBlogData({payload: {blogdata: []}}) } }; @@ -69,10 +70,10 @@ function App() { } /> } /> } /> - } /> + } /> } /> } /> - } /> + } /> } /> } /> diff --git a/src/components/BlogItems.js b/src/components/BlogItems.js new file mode 100644 index 0000000..4699e3c --- /dev/null +++ b/src/components/BlogItems.js @@ -0,0 +1,109 @@ +import React from 'react' +import { useLocation } from 'react-router-dom' +// import SiteService from '../svs/SiteService'; + +const BlogItems = ({blogData}) => { + + let location = useLocation().pathname + // const [blogData, setBlogData] = useState({}) // for holding blogs + // console.log(blogData.payload) + // const blogApi = new SiteService(); // instantiating the API SERVICE + // const getBlogData = async () => { + // try { + // const res = await blogApi.blogData(); + // if(res.status == 200 /* && res.data.status > 0*/){ + // console.log('blogitem',res.data.payload, res.data); + // setBlogData(res.data) + // return + // } + // }catch(error) { + // } + // }; + + // useEffect(() => { + // getBlogData(); + // }, []); + + return ( +
+ { + blogData?.payload == undefined ? // API CALL IN PROGRESS +
Loading...
+ : + // API CALL FINISHED + ( + blogData?.payload?.blogdata.length < 1 ? +
No Blog Currently Found!
+ : + blogData?.payload?.blogdata.map((blog, index) => { + if(location == '/blogs'){ + return( +
+
+ {/* BLOG POST IMAGE */} +
+ blog-post-image + {/* blog-post-image */} +
+ {/* BLOG POST TEXT */} +
+ {/* Post Tag */} +

Float News

+ {/* Post Link */} +
+ {blog.post_title.substring(0,40)+' . . .'} +
+ {/* Text */} +
+ {/*

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

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

12 min read

+
+
+
+
+ ) + }else if (location != 'blogs' && index <= 5) { + return ( +
+
+ {/* BLOG POST IMAGE */} +
+ blog-post-image +
+ {/* BLOG POST TEXT */} +
+ {/* Post Tag */} +

Float News

+ {/* Post Link */} +
+ {blog.post_title.substring(0,40)+' . . .'} +
+ {/* Text */} +
+ {/*

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

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

12 min read

+
+
+
+
+ ) + } + }) + ) + + } +
+ ) +} + +export default BlogItems \ No newline at end of file diff --git a/src/pages/Blog_listing.js b/src/pages/Blog_listing.js index 15685b3..3d84133 100644 --- a/src/pages/Blog_listing.js +++ b/src/pages/Blog_listing.js @@ -1,4 +1,5 @@ import React, {Component,useState, useEffect} from 'react'; +import BlogItems from '../components/BlogItems'; import SiteService from "../svs/SiteService"; class Blog_listing extends React.Component { @@ -89,172 +90,8 @@ class Blog_listing extends React.Component {
Latest Articles
-
- {/* BLOG POST #1 */} -
-
- {/* BLOG POST IMAGE */} -
- blog-post-image -
- {/* BLOG POST TEXT */} -
- {/* Post Tag */} -

NordEx News

- {/* Post Link */} -
- Tempor sapien donec gravida ipsum a porta justo vitae -
- {/* Text */} -

Aliqum mullam blandit vitae and tempor sapien and donec lipsum gravida - porta undo velna dolor -

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

12 min read

-
-
-
-
{/* END BLOG POST #1 */} - {/* BLOG POST #2 */} -
-
- {/* BLOG POST IMAGE */} -
- blog-post-image -
- {/* BLOG POST TEXT */} -
- {/* Post Tag */} -

Inspiration

- {/* Post Link */} -
- Aliquam augue impedit luctus neque purus an ipsum neque and dolor libero risus -
- {/* Text */} -

The aliqum mullam vitae tempor sapien and donec lipsum gravida porta velna - dolor vitae auctor -

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

8 min read

-
-
{/* END BLOG POST TEXT */} -
-
{/* END BLOG POST #2 */} - {/* BLOG POST #3 */} -
-
- {/* BLOG POST IMAGE */} -
- blog-post-image -
- {/* BLOG POST TEXT */} -
- {/* Post Tag */} -

Tutorials

- {/* Post Link */} -
- Tempor sapien donec gravida ipsum and porta justo -
- {/* Text */} -

The aliqum mullam vitae tempor sapien and donec lipsum gravida porta velna - dolor vitae auctor -

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

22 min read

-
-
{/* END BLOG POST TEXT */} -
-
{/* END BLOG POST #3 */} - {/* BLOG POST #4 */} -
-
- {/* BLOG POST IMAGE */} -
- blog-post-image -
- {/* BLOG POST TEXT */} -
- {/* Post Tag */} -

Extensions

- {/* Post Link */} -
- Neque purus an ipsum neque and dolor libero risus mullam blandit at tempor sapien -
- {/* Text */} -

The aliqum mullam vitae tempor sapien and donec lipsum gravida porta velna - dolor vitae auctor -

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

1 day read

-
-
-
-
{/* END BLOG POST #4 */} - {/* BLOG POST #5 */} -
-
- {/* BLOG POST IMAGE */} -
- blog-post-image -
- {/* BLOG POST TEXT */} -
- {/* Post Tag */} -

Community

- {/* Post Link */} -
- Tempor sapien donec gravida ipsum a porta justo vitae -
- {/* Text */} -

The aliqum mullam vitae tempor sapien and donec lipsum gravida porta velna - dolor vitae auctor -

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

54 min read

-
-
{/* END BLOG POST TEXT */} -
-
{/* END BLOG POST #5 */} - {/* BLOG POST #6 */} -
-
- {/* BLOG POST IMAGE */} -
- blog-post-image -
- {/* BLOG POST TEXT */} -
- {/* Post Tag */} -

Extensions

- {/* Post Link */} -
- Lipsum gravida porta velna NordEx, donec gravida ipsum a - porta justo tempor - -
- {/* Text */} -

The aliqum mullam vitae tempor sapien and donec lipsum gravida porta velna - dolor vitae auctor -

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

4 hours read

-
-
{/* END BLOG POST TEXT */} -
-
{/* END BLOG POST #6 */} -
{/* End row */} + + {/* End row */} {/* END POSTS WRAPPER */} {/* End container */} {/* GEOMETRIC OVERLAY */} diff --git a/src/pages/FloatHome.js b/src/pages/FloatHome.js index 5603fc6..20684c0 100644 --- a/src/pages/FloatHome.js +++ b/src/pages/FloatHome.js @@ -13,6 +13,8 @@ import Analysis from '../pages/assests/images/analytics.ico' import Monitoring from '../pages/assests/images/monitoring.ico' import Assistant from '../pages/assests/images/assistant (2).ico' +import BlogItems from '../components/BlogItems'; + class FloatHome extends React.Component { @@ -21,7 +23,7 @@ class FloatHome extends React.Component { // Don't call this.setState() here! // this.state = { counter: 0 }; // this.handleClick = this.handleClick.bind(this); - console.log("OLU-AMEY 22",props.blogData); + // console.log("OLU-AMEY 22",props.blogData); } render() { @@ -1049,120 +1051,8 @@ 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 */} -
-
- {/* BLOG POST IMAGE */} -
- blog-post-image -
- {/* BLOG POST TEXT */} -
- {/* Post Tag */} -

Float News

- {/* Post Link */} -
- Tempor sapien donec gravida ipsum a porta justo vitae -
- {/* Text */} -

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

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

12 min read

-
-
-
-
{/* END BLOG POST #1 */} - {/* BLOG POST #2 */} -
-
- {/* BLOG POST IMAGE */} -
- blog-post-image -
- {/* BLOG POST TEXT */} -
- {/* Post Tag */} -

Inspiration

- {/* Post Link */} -
- Aliquam augue impedit luctus neque purus an ipsum neque and dolor libero risus -
- {/* Text */} -

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

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

8 min read

-
-
{/* END BLOG POST TEXT */} -
-
{/* END BLOG POST #2 */} - {/* BLOG POST #3 */} -
-
- {/* BLOG POST IMAGE */} -
- blog-post-image -
- {/* BLOG POST TEXT */} -
- {/* Post Tag */} -

Tutorials

- {/* Post Link */} -
- Tempor sapien Float, donec gravida ipsum a porta justo -
- {/* Text */} -

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

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

22 min read

-
-
{/* END BLOG POST TEXT */} -
-
{/* END BLOG POST #3 */} - -
{/* END BLOG POSTS */} + + {/* END BLOG POSTS */} {/* End container */} {/* END BLOG-1 */} {/* DOWNLOAD-5 diff --git a/src/pages/GetStarted.js b/src/pages/GetStarted.js index f788a2c..989b7af 100644 --- a/src/pages/GetStarted.js +++ b/src/pages/GetStarted.js @@ -4,8 +4,17 @@ import FleetMgr from '../pages/assests/images/multiple-accounts.ico' import ChargeFinder from '../pages/assests/images/charger-location.ico' import Options from '../pages/assests/images/options1.ico' +import BlogItems from '../components/BlogItems'; + class GetStarted 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(
@@ -41,7 +50,7 @@ class GetStarted extends React.Component {
{/* FEATURE BOX #1 */}
-
+
{/* Icon */}
{/* Title */} @@ -52,7 +61,7 @@ class GetStarted extends React.Component {
{/* FEATURE BOX #2 */}
- {/* BLOG POSTS */} -
- {/* BLOG POST #1 */} -
-
- {/* BLOG POST IMAGE */} -
- blog-post-image -
- {/* BLOG POST TEXT */} -
- {/* Post Tag */} -

Float News

- {/* Post Link */} -
- Tempor sapien donec gravida ipsum a porta justo vitae -
- {/* Text */} -

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

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

12 min read

-
-
-
-
{/* END BLOG POST #1 */} - {/* BLOG POST #2 */} -
-
- {/* BLOG POST IMAGE */} -
- blog-post-image -
- {/* BLOG POST TEXT */} -
- {/* Post Tag */} -

Inspiration

- {/* Post Link */} -
- Aliquam augue impedit luctus neque purus an ipsum neque and dolor libero risus -
- {/* Text */} -

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

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

8 min read

-
-
{/* END BLOG POST TEXT */} -
-
{/* END BLOG POST #2 */} - {/* BLOG POST #3 */} -
-
- {/* BLOG POST IMAGE */} -
- blog-post-image -
- {/* BLOG POST TEXT */} -
- {/* Post Tag */} -

Tutorials

- {/* Post Link */} -
- Tempor sapien Float, donec gravida ipsum a porta justo -
- {/* Text */} -

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

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

22 min read

-
-
{/* END BLOG POST TEXT */} -
-
{/* END BLOG POST #3 */} -
{/* END BLOG POSTS */} + + {/* END BLOG POSTS */}
{/* End container */} {/* END BLOG-1 */} {/* NEWSLETTER-1 diff --git a/src/pages/Users.js b/src/pages/Users.js index b4eb9ee..0b95ec7 100644 --- a/src/pages/Users.js +++ b/src/pages/Users.js @@ -10,7 +10,16 @@ import Perks from '../pages/assests/images/perks.ico' import Charging from '../pages/assests/images/charging-station.ico' import Fleet from '../pages/assests/images/fleet-signal.ico' +import BlogItems from '../components/BlogItems'; + class Users 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(
@@ -656,89 +665,8 @@ class Users extends React.Component {
{/* BLOG POSTS */} -
- {/* BLOG POST #1 */} -
-
- {/* BLOG POST IMAGE */} -
- blog-post-image -
- {/* BLOG POST TEXT */} -
- {/* Post Tag */} -

Float News

- {/* Post Link */} -
- Tempor sapien donec gravida ipsum a porta justo vitae -
- {/* Text */} -

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

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

12 min read

-
-
-
-
{/* END BLOG POST #1 */} - {/* BLOG POST #2 */} -
-
- {/* BLOG POST IMAGE */} -
- blog-post-image -
- {/* BLOG POST TEXT */} -
- {/* Post Tag */} -

Inspiration

- {/* Post Link */} -
- Aliquam augue impedit luctus neque purus an ipsum neque and dolor libero risus -
- {/* Text */} -

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

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

8 min read

-
-
{/* END BLOG POST TEXT */} -
-
{/* END BLOG POST #2 */} - {/* BLOG POST #3 */} -
-
- {/* BLOG POST IMAGE */} -
- blog-post-image -
- {/* BLOG POST TEXT */} -
- {/* Post Tag */} -

Tutorials

- {/* Post Link */} -
- Tempor sapien Float, donec gravida ipsum a porta justo -
- {/* Text */} -

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

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

22 min read

-
-
{/* END BLOG POST TEXT */} -
-
{/* END BLOG POST #3 */} -
{/* END BLOG POSTS */} + + {/* END BLOG POSTS */}
{/* End container */} {/* END BLOG-1 */} {/* NEWSLETTER-1 diff --git a/src/svs/SiteService.js b/src/svs/SiteService.js index 188d259..96888a1 100644 --- a/src/svs/SiteService.js +++ b/src/svs/SiteService.js @@ -8,7 +8,7 @@ class SiteService { } // Blog Data {Get} blogData() { - return this.getAuxEnd("/blogdata", null); + return this.getAuxEnd("/blogdata/10", null); } // Country Data {GET}