Compare commits

..

4 Commits

Author SHA1 Message Date
ChineseChikki bef973023b broken navBar fixed 2023-01-21 08:10:34 +01:00
tokslaw 0a22ac7ade Merge branch 'task-29-review-env-variable' of MyFit/www-myfit into master 2023-01-20 14:19:45 +00:00
tokslaw 18b18aba96 Merge branch 'task-34-FAQ-broken-links' of MyFit/www-myfit into master 2023-01-20 14:12:07 +00:00
ChineseChikki 099c0ce0a4 FAQ broken link fixed 2023-01-20 15:02:02 +01:00
5 changed files with 8 additions and 10 deletions
-1
View File
@@ -16,4 +16,3 @@ REACT_APP_AUX_ENDPOINT = "https://devapi.mermsemr.com/en/desktop/api/v2/myfit"
REACT_APP_FORM_TIMEOUT = 10000
REACT_APP_MAX_MESSAGE_LENGHT =300
REACT_APP_BLOGSITE="https://blog.mermsemr.com/"
+5 -5
View File
@@ -100,7 +100,7 @@ const Main = ({ footer }) => {
<Link to="/faq">FAQs</Link>
</li>
<li>
<Link to="/how_it_work">How it works</Link>
<a href="#how_it_work">How it works</a>
</li>
<li>
<Link to="/terms">Terms & conditions</Link>
@@ -237,7 +237,7 @@ const Main = ({ footer }) => {
<Link to="/faq">FAQs</Link>
</li>
<li>
<Link to="/how_it_work">How it works</Link>
<a href="/how_it_work">How it works</a>
</li>
<li>
<Link to="/terms">Terms & conditions</Link>
@@ -367,7 +367,7 @@ const Main = ({ footer }) => {
<Link to="#">Support</Link>
</li>
<li>
<Link to="/how_it_work">How it works</Link>
<a href="/how_it_work">How it works</a>
</li>
<li>
<Link to="/terms">Terms & conditions</Link>
@@ -492,7 +492,7 @@ const Main = ({ footer }) => {
<Link to="#">Support</Link>
</li>
<li>
<Link to="/how_it_work">How it works</Link>
<a href="/how_it_work">How it works</a>
</li>
<li>
<Link to="/terms">Terms & conditions</Link>
@@ -624,7 +624,7 @@ const Main = ({ footer }) => {
<Link to="#">Support</Link>
</li>
<li>
<Link to="/how_it_work">How it works</Link>
<a href="/how_it_work">How it works</a>
</li>
<li>
<Link to="/terms">Terms & conditions</Link>
+1 -1
View File
@@ -134,7 +134,7 @@ const Main = ({navbar}) => {
<Link smooth to="/#features" className="nav-link">Features</Link>
</li>
<li className="nav-item">
<Link smooth to="#how_it_work" className="nav-link">How it works</Link>
<Link smooth to="/#how_it_work" className="nav-link">How it works</Link>
</li>
<li className="nav-item" >
<Link to="/blog" className="nav-link">Blog</Link>
+2 -1
View File
@@ -1,5 +1,7 @@
import React , { useState , useEffect} from 'react'
import { Link } from 'react-router-dom'
import blueapp from "../../../assets/images/appstore_blue.png"
import blue from "../../../assets/images/googleplay_blue.png"
import Bredcrumb from '../../Bredcrumb/Main'
import BGImg from "../../../assets/images/bread_crumb_bg.png"
import BGImg1 from "../../../assets/images/bread_crumb_bg_one.png"
@@ -64,7 +66,6 @@ const Main = ({brdcum}) => {
tag="Faq"
bgimg={BGImg2}/>}
{/* <section className="row_am faq_section">
<div className="container">
<div className="faq_panel">
-2
View File
@@ -3,7 +3,6 @@ import { Route, Routes, useLocation } from "react-router-dom";
import Navbar from "../component/Navbar/Main";
import Footer from "../component/Footer/Main";
import Home from "../component/Home/Main";
import Work from "../component/HomeMain/Work/Main"
import AboutUs from "../component/AboutUs/Main";
import Review from "../component/Pages/Review/Main";
import Contact from "../component/Contact/Main";
@@ -89,7 +88,6 @@ const Routing = () => {
<Route path="/blog-single/:id" element={<BlogSingle brdcum={brdcum} />} />
<Route path="/terms" element={<Terms brdcum={brdcum} />} />
<Route path="/privacy" element={<Privacy brdcum={brdcum} />} />
<Route path="/how_it_work" element={<Work brdcum={brdcum} />} />
</Routes>
{footerpage && <Footer footer={footer} />}