Compare commits

...

12 Commits

Author SHA1 Message Date
VICTOR\anumu d946417490 populated FAQs with data from api 2023-01-12 20:53:38 +01:00
tokslaw cf9601b87f Merge branch 'myfit_contact_page_country_dropdown' of MyFit/www-myfit into master 2023-01-12 12:24:46 +00:00
VICTOR\anumu 56d961acbb Added country dropdown on contact page 2023-01-12 10:56:39 +01:00
dev-chiefworks b591f333fd constructor added 2023-01-11 21:10:36 -05:00
dev-chiefworks 3d4328e59f Error catch 2023-01-11 21:05:52 -05:00
dev-chiefworks 05111a2a25 Sample POSt added - 2023-01-11 21:00:38 -05:00
dev-chiefworks 68eeae2913 Sample frame functions 2023-01-11 20:59:06 -05:00
dev-chiefworks 003ce4196d Class skeletals 2023-01-11 20:03:14 -05:00
dev-chiefworks bc3b72ff95 Added vendors under src 2023-01-11 19:57:00 -05:00
tokslaw 44ba0ef178 Merge branch 'myFit-Terms-and-Cs' of MyFit/www-myfit into master 2023-01-11 23:38:54 +00:00
Chukwumdiebube Ojinta faf5bed72f Changed the link tag back to an anchor tag 2023-01-11 11:16:37 -08:00
Chukwumdiebube Ojinta f4cdc84043 Terms and Condition urls set to env 2023-01-11 11:04:35 -08:00
5 changed files with 151 additions and 20 deletions
+2
View File
@@ -9,3 +9,5 @@ REACT_APP_FACEBOOK="https://www.facebook.com/profile.php?id=100066498622246"
REACT_APP_TWITTER="https://twitter.com/fluxtra"
REACT_APP_APPSITE="https://myfitapp.mermsemr.com"
REACT_APP_AUX_ENDPOINT = "https://devapi.mermsemr.com/en/desktop/api/v2/myfit"
+16 -1
View File
@@ -1,11 +1,25 @@
import React, { useEffect } from "react";
import React, { useEffect, useState } from "react";
import { Link } from "react-router-dom";
import Bredcrumb from "../Bredcrumb/Main";
import BGImg from "../../assets/images/bread_crumb_bg.png";
import BGImg1 from "../../assets/images/bread_crumb_bg_one.png";
import BGImg2 from "../../assets/images/bread_crumb_bg_two.png";
import SiteService from "../../vendors/service/siteService";
const Main = ({ brdcum }) => {
let [countries, setCountries] = useState([]) // initial state for country dropdown
let countryClass = new SiteService() // instantiating the class
const allCountry = () => {
return countryClass.countryData();
}
//CALLS THE API AFTER COMPONENT LOADS
useEffect(()=>{
allCountry().then((data)=> setCountries(Object.values(data.data)))
},[])
return (
<>
{brdcum.b1 && (
@@ -86,6 +100,7 @@ const Main = ({ brdcum }) => {
<div className="form-group">
<select className="form-control">
<option value="">Country</option>
{countries.length > 0 && countries.map((country, index) => <option key={index} value={country}>{country}</option>)}
</select>
</div>
<div className="form-group">
+55 -13
View File
@@ -5,9 +5,23 @@ import BGImg from "../../../assets/images/bread_crumb_bg.png"
import BGImg1 from "../../../assets/images/bread_crumb_bg_one.png"
import BGImg2 from "../../../assets/images/bread_crumb_bg_two.png"
import SiteService from '../../../vendors/service/siteService'
const Main = ({brdcum}) => {
const[activeFaq, setActiveFaq] = useState({a : true})
const [faqs, setFaqs] = useState([]); // initial state for FAQs before API call
let faqServices = new SiteService(); // instantiating the class
const allFaqData = () => {
return faqServices.faqData();
};
useEffect(() => {
allFaqData().then((data) => setFaqs(data.data));
}, []);
return (
<>
{brdcum.b1 &&
@@ -54,7 +68,8 @@ const Main = ({brdcum}) => {
<div className="container">
<div className="faq_panel">
<div className="accordion" id="accordionExample">
<div className="card" data-aos="fade-up" >
{/* <div className="card" data-aos="fade-up" >
<div className="card-header" id="headingOne">
<h2 className="mb-0">
<button type="button" className={`btn btn-link ${activeFaq.a && "active"}`} onClick= {() => setActiveFaq(activeFaq.a ? {a : false} : {a : true})} data-toggle="collapse" data-target="#collapseOne">
@@ -69,8 +84,9 @@ const Main = ({brdcum}) => {
leap into electronic typesetting, remaining essentially unchanged.</p>
</div>
</div>
</div>
<div className="card" data-aos="fade-up" >
</div> */}
{/* <div className="card" data-aos="fade-up" >
<div className="card-header" id="headingTwo">
<h2 className="mb-0">
<button type="button" className={`btn btn-link collapsed ${activeFaq.b && "active"}`} onClick= {() => setActiveFaq(activeFaq.b ? {b : false} : {b : true})} data-toggle="collapse"
@@ -85,9 +101,9 @@ const Main = ({brdcum}) => {
leap into electronic typesetting, remaining essentially unchanged.</p>
</div>
</div>
</div>
</div> */}
<div className="card" data-aos="fade-up" >
{/* <div className="card" data-aos="fade-up" >
<div className="card-header" id="headingThree">
<h2 className="mb-0">
<button type="button" className={`btn btn-link collapsed ${activeFaq.c && "active"}`} onClick= {() => setActiveFaq(activeFaq.c ? {c : false} : {c : true})} data-toggle="collapse"
@@ -103,9 +119,9 @@ const Main = ({brdcum}) => {
leap into electronic typesetting, remaining essentially unchanged.</p>
</div>
</div>
</div>
</div> */}
<div className="card" data-aos="fade-up" >
{/* <div className="card" data-aos="fade-up" >
<div className="card-header" id="headingFour">
<h2 className="mb-0">
<button type="button" className={`btn btn-link collapsed ${activeFaq.d && "active"}`} onClick= {() => setActiveFaq(activeFaq.d ? {d : false} : {d : true})} data-toggle="collapse"
@@ -122,9 +138,9 @@ const Main = ({brdcum}) => {
leap into electronic typesetting, remaining essentially unchanged.</p>
</div>
</div>
</div>
</div> */}
<div className="card" data-aos="fade-up" >
{/* <div className="card" data-aos="fade-up" >
<div className="card-header" id="headingFive">
<h2 className="mb-0">
<button type="button" className={`btn btn-link collapsed ${activeFaq.e && "active"}`} onClick= {() => setActiveFaq(activeFaq.e ? {e : false} : {e : true})} data-toggle="collapse"
@@ -141,9 +157,9 @@ const Main = ({brdcum}) => {
leap into electronic typesetting, remaining essentially unchanged.</p>
</div>
</div>
</div>
</div> */}
<div className="card" data-aos="fade-up" >
{/* <div className="card" data-aos="fade-up" >
<div className="card-header" id="headingSix">
<h2 className="mb-0">
<button type="button" className={`btn btn-link collapsed ${activeFaq.f && "active"}`} onClick= {() => setActiveFaq(activeFaq.f ? {f : false} : {f : true})} data-toggle="collapse"
@@ -160,9 +176,9 @@ const Main = ({brdcum}) => {
leap into electronic typesetting, remaining essentially unchanged.</p>
</div>
</div>
</div>
</div> */}
<div className="card" data-aos="fade-up" >
{/* <div className="card" data-aos="fade-up" >
<div className="card-header" id="headingSeven">
<h2 className="mb-0">
<button type="button" className={`btn btn-link collapsed ${activeFaq.g && "active"}`} onClick= {() => setActiveFaq(activeFaq.g ? {g : false} : {g : true})} data-toggle="collapse"
@@ -179,7 +195,33 @@ const Main = ({brdcum}) => {
leap into electronic typesetting, remaining essentially unchanged.</p>
</div>
</div>
</div> */}
{/* displays loading ... while the page fetches the FAQs */}
{faqs.length < 1 && <h3>Loading...</h3>}
{faqs.length > 0 && faqs.map((faq, index) => {
let id = `heading${index}`; //headingSeven
let target = `collapse${index}`; //#collapseSeven
return(
<div key={index} className="card" data-aos="fade-up" >
<div className="card-header" id={id}>
<h2 className="mb-0">
<button type="button" className={`btn btn-link collapsed ${activeFaq.b && "active"}`} data-toggle="collapse"
data-target={`#${target}`}>{activeFaq.b ? <i className="icon_faq icofont-minus"></i> : <i className="icon_faq icofont-plus"></i>}{faq.title}
</button>
</h2>
</div>
<div id={target} className="collapse" aria-labelledby={id} data-parent="#accordionExample">
<div className="card-body">
<p>{faq.text}</p>
</div>
</div>
</div>
)
})}
</div>
</div>
</div>
+6 -6
View File
@@ -28,8 +28,8 @@ const Main = ({ brdcum }) => {
collection, use, purpose, and sharing of personally identifiable
information ("PII") related to the use of Merms's myFit website{" "}
<span>
<a href="https://myfit.mermsemr.com/">
https://myfit.mermsemr.com
<a href={process.env.REACT_APP_APPSITE}>
{process.env.REACT_APP_APPSITE}
</a>
</span>
, MERMS providing of services to our users ("Partners"), or from
@@ -53,8 +53,8 @@ const Main = ({ brdcum }) => {
govern. Provides its services (described below) to you through
its website located at{" "}
<span>
<a href="https://myfit.mermsemr.com/">
https://myfit.mermsemr.com
<a href={process.env.REACT_APP_APPSITE}>
{process.env.REACT_APP_APPSITE}
</a>
</span>{" "}
(the "Site") and through its mobile applications and related
@@ -1363,8 +1363,8 @@ const Main = ({ brdcum }) => {
use, purpose, and sharing of personally identifiable information
("PII") related to the use of Merms's myFit website{" "}
<span>
<a href="https://myfit.mermsemr.com/">
https://myfit.mermsemr.com
<a href={process.env.REACT_APP_APPSITE}>
{process.env.REACT_APP_APPSITE}
</a>
</span>
, MERMS providing of services to our users ("Partners"), or from
+72
View File
@@ -0,0 +1,72 @@
import React from "react";
import Axios from "axios";
class SiteService {
constructor() {
console.log("Er are here anyway");
}
blogData() {
return this.getAuxEnd("blogdata", null);
}
countryData() {
return this.getAuxEnd("/country", null);
}
faqData() {
return this.getAuxEnd("/faq", 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;
Axios.post(endPoint)
.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;