From 366dd652597319bbd0ee127cfebf7a05d4af1f1a Mon Sep 17 00:00:00 2001 From: dev-chiefworks Date: Sun, 16 Jan 2022 15:50:25 -0500 Subject: [PATCH 1/3] Config update --- src/Config/config.js | 6 +++--- src/components/Service/DetailsService.js | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/Config/config.js b/src/Config/config.js index 176e313..76f0a00 100644 --- a/src/Config/config.js +++ b/src/Config/config.js @@ -5,15 +5,15 @@ function getConfig() { { "dash_url": 'https://dashboard.wrenchboard.com', - "dash_url_login": "https://www.wrenchboard.com/login", - "dash_url_signup": "https://www.wrenchboard.com/signup", + "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/', "support_email": 'support@wrenchboard.com', "support_phone": '404 855-7966', - "support_us_address":'Atlanta,GA 30339', + "support_us_address": 'Atlanta,GA 30339', "dummy": "2018-06-25T18:54:22.000Z", } ]; diff --git a/src/components/Service/DetailsService.js b/src/components/Service/DetailsService.js index a4792e7..d1c2b5c 100644 --- a/src/components/Service/DetailsService.js +++ b/src/components/Service/DetailsService.js @@ -1,8 +1,11 @@ import React from 'react'; import thumb from '../../assets/images/service-page.jpg'; import ServiceSideMenu from './ServiceSideMenu'; +import getConfig from './../../Config/config' function DetailsService() { + var site = getConfig()[0]; + return ( <>
@@ -35,7 +38,7 @@ function DetailsService() { finance & accounting, website & app development, creative & design, customer support and operations.
- Learn more at < a href = "https://dashboard.wrenchboard.com" >WrenchBoard + Learn more at < a href ={site.dash_url_login} >WrenchBoard

From 79e81f1bf5654745f04d60a1f7a2015b807f9536 Mon Sep 17 00:00:00 2001 From: dev-chiefworks Date: Sun, 16 Jan 2022 15:58:36 -0500 Subject: [PATCH 2/3] use case config applied --- src/Config/config.js | 1 + src/components/UseCases/HeaderNews.js | 9 +++-- src/components/UseCases/UseCase.js | 55 ++++++++++++++------------- 3 files changed, 36 insertions(+), 29 deletions(-) diff --git a/src/Config/config.js b/src/Config/config.js index 76f0a00..7ae4b6b 100644 --- a/src/Config/config.js +++ b/src/Config/config.js @@ -4,6 +4,7 @@ function getConfig() { return [ { + "site_name" : 'WrenchBoard', "dash_url": 'https://dashboard.wrenchboard.com', "dash_url_login": "https://dashboard.wrenchboard.com/login", "dash_url_signup": "https://dashboard.wrenchboard.com/signup", diff --git a/src/components/UseCases/HeaderNews.js b/src/components/UseCases/HeaderNews.js index 64d8214..9c093e1 100644 --- a/src/components/UseCases/HeaderNews.js +++ b/src/components/UseCases/HeaderNews.js @@ -2,8 +2,11 @@ import React, { useEffect } from 'react'; import logo from '../../assets/images/wrenchboard.png'; import StickyMenu from '../../lib/StickyMenu'; import Navigation from '../Navigation'; +import getConfig from './../../Config/config' + function HeaderNews({ action }) { + var site = getConfig()[0]; useEffect(() => { StickyMenu(); }); @@ -16,7 +19,7 @@ function HeaderNews({ action }) {
- + {site.site_name}
@@ -27,10 +30,10 @@ function HeaderNews({ action }) {
- + Login - + Get Started
{ - UseCaseDataResult.map(i=>{ - var blgImg = i.meta_value!=null?"../../assets/images/"+ i.meta_value : blogImg1; + UseCaseDataResult.map(i => { + var blgImg = i.meta_value != null ? "../../assets/images/" + i.meta_value : blogImg1; - console.log("AA",blgImg); - blgImg=blogImg1; - console.log("BB",blgImg); + console.log("AA", blgImg); + blgImg = blogImg1; + console.log("BB", blgImg); - return ( -
-
- - {{i.title}} - {/* */} -
- -

- - {i.title} - -

- - Learn more - + return ( +
+
+ + {{i.title}} + {/* */} + + +
- -
-
- ) + ) - }) + }) }
+ {/*
@@ -58,6 +59,8 @@ function UseCase() {
+ */} + ); } From e5268522d6186e8e8b9d27fca2bee3b3e2b6abd2 Mon Sep 17 00:00:00 2001 From: dev-chiefworks Date: Sun, 16 Jan 2022 16:39:00 -0500 Subject: [PATCH 3/3] fix config --- src/components/UseCases/UseCase.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/components/UseCases/UseCase.js b/src/components/UseCases/UseCase.js index a008ca6..18a4eae 100644 --- a/src/components/UseCases/UseCase.js +++ b/src/components/UseCases/UseCase.js @@ -1,11 +1,13 @@ import React from 'react'; import blogImg1 from '../../assets/images/blog/1.jpg'; import UseCaseData from '../../Services/UseCaseData'; +import getConfig from './../../Config/config' + function UseCase() { + var site = getConfig()[0]; var UseCaseDataResult = UseCaseData(); - var dashboardUrl = "https://dashboard.wrenchboard.com/"; //C:\WORKS\WrenchBoardMainSite\src\assets\images\wrechboard-sample.jpg @@ -29,11 +31,11 @@ function UseCase() {