Compare commits

..

5 Commits

Author SHA1 Message Date
victorAnumudu a52479e11f added socket context 2024-03-14 10:42:57 +01:00
tokslaw df80cf8aae Merge branch 'mission-text' of WrenchBoard/WrenchBoardNigeriaMainSite into master 2024-02-22 19:05:49 +00:00
victorAnumudu f33b6635e5 changed home to Home 2024-02-22 19:29:28 +01:00
victorAnumudu 86a2118816 update wrong mission text 2024-02-22 19:12:38 +01:00
ameye aba3369459 Merge branch 'dev-link-change' of WrenchBoard/WrenchBoardNigeriaMainSite into master 2024-02-17 14:10:20 +00:00
10 changed files with 199 additions and 107 deletions
+3
View File
@@ -20,3 +20,6 @@ REACT_APP_SUPPORT_NG_ADDRESS='Saka Tinubu Street, Victoria Island Lagos, Nigeria
#AGENT LINK #AGENT LINK
REACT_APP_AGENT_LINK='https://dev-agents.wrenchboard.com' REACT_APP_AGENT_LINK='https://dev-agents.wrenchboard.com'
#SOCKETS ENDS
REACT_APP_PRIMARY_SOCKET="https://socket-dev.wrenchboard.com"
+4 -1
View File
@@ -19,4 +19,7 @@ REACT_APP_SUPPORT_US_ADDRESS='Cumberland Pkwy, Atlanta GA 30339'
REACT_APP_SUPPORT_NG_ADDRESS='Saka Tinubu Street, Victoria Island Lagos, Nigeria' REACT_APP_SUPPORT_NG_ADDRESS='Saka Tinubu Street, Victoria Island Lagos, Nigeria'
#AGENT LINK #AGENT LINK
REACT_APP_AGENT_LINK='https://dev-agents.wrenchboard.com' REACT_APP_AGENT_LINK='https://dev-agents.wrenchboard.com'
#SOCKETS ENDS
REACT_APP_PRIMARY_SOCKET="https://socket-dev.wrenchboard.com"
+4 -1
View File
@@ -19,4 +19,7 @@ REACT_APP_SUPPORT_US_ADDRESS='Cumberland Pkwy, Atlanta GA 30339'
REACT_APP_SUPPORT_NG_ADDRESS='Saka Tinubu Street, Victoria Island Lagos, Nigeria' REACT_APP_SUPPORT_NG_ADDRESS='Saka Tinubu Street, Victoria Island Lagos, Nigeria'
#AGENT LINK #AGENT LINK
REACT_APP_AGENT_LINK='https://agents.wrenchboard.com' REACT_APP_AGENT_LINK='https://agents.wrenchboard.com'
#SOCKETS ENDS
REACT_APP_PRIMARY_SOCKET="https://socket.wrenchboard.com"
+1
View File
@@ -16,6 +16,7 @@
"react-slick": "^0.28.1", "react-slick": "^0.28.1",
"simple-react-lightbox": "^3.6.9-0", "simple-react-lightbox": "^3.6.9-0",
"slick-carousel": "^1.8.1", "slick-carousel": "^1.8.1",
"socket.io-client": "^4.4.1",
"web-vitals": "^1.0.1" "web-vitals": "^1.0.1"
}, },
"scripts": { "scripts": {
+10
View File
@@ -1,9 +1,19 @@
import { useEffect } from 'react';
import Routes from './Routes'; import Routes from './Routes';
import { Redirect, useLocation } from 'react-router-dom'; import { Redirect, useLocation } from 'react-router-dom';
import { SocketValues } from './Contexts/SocketIOContext';
function App() { function App() {
let { joinRoom } = SocketValues() // function to join market room, to be able to receive market job post update
const {pathname} = useLocation() const {pathname} = useLocation()
useEffect(()=>{ // sends an event to the socket to enable user join a room to be able to receive update when jobs enters the market
joinRoom('full-markets-jobs')
console.log('market room joined')
},[])
return ( return (
<> <>
{pathname.startsWith('/@') ? {pathname.startsWith('/@') ?
+49
View File
@@ -0,0 +1,49 @@
import React, { createContext, useContext, useEffect, useState } from "react";
import io from "socket.io-client";
let SocketIOContext = createContext({})
export default function SocketIOContextProvider({children}) {
const socket = io.connect(process.env.REACT_APP_PRIMARY_SOCKET);
// //Room State
// const [room, setRoom] = useState("");
// // Messages States
// const [message, setMessage] = useState("");
const [socketMsgReceived, setSocketMsgReceived] = useState({type:'', msg:''});
const joinRoom = (room) => {
if (room !== "") {
socket.emit("join_room", room);
}
};
useEffect(() => {
socket.on("received_refreshmarket_jobs", (data) => {
setSocketMsgReceived({type: 'market', msg: data?.message});
console.log('YES ssss')
});
}, [socket]);
let values = {
socket,
joinRoom,
setSocketMsgReceived,
socketMsgReceived,
}
return (
<SocketIOContext.Provider value={values}>
{children}
</SocketIOContext.Provider>
)
}
export const SocketValues = () => {
return useContext(SocketIOContext)
}
+122 -102
View File
@@ -1,29 +1,39 @@
import React, { Component } from 'react'; import React, { useState, useEffect } from 'react';
import blogOne from '../../assets/images/blog-1.jpg'; import blogOne from '../../assets/images/blog-1.jpg';
import blogTwo from '../../assets/images/blog-2.jpg'; import blogTwo from '../../assets/images/blog-2.jpg';
import blogThree from '../../assets/images/blog-3.jpg'; import blogThree from '../../assets/images/blog-3.jpg';
import JobsData from '../../Services/JobsData'; import JobsData from '../../Services/JobsData';
import getConfig from './../../Config/config' import getConfig from './../../Config/config'
import CountDownTimer from '../Helper/CountDownTimer'; import CountDownTimer from '../Helper/CountDownTimer';
import { SocketValues } from '../../Contexts/SocketIOContext';
class CurrentJobsHero extends Component { let CurrentJobsHero = () => {
constructor() { let {socketMsgReceived} = SocketValues() // destructure FROM SOCKET
// debugger;
super();
this.state = { jobsDataResults: [] };
}
async componentDidMount(){
// debugger;
JobsData().then(res => {
this.setState({jobsDataResults:res.data.result_list});
}).catch(err => {
console.log('startjoblist error', err)
})
}
titleLen(title){ var site = getConfig()[0];
var dashUrl = process.env.REACT_APP_DASH_URL;
let [jobs, setJobs] = useState([])
// constructor() {
// // debugger;
// super();
// this.state = { jobsDataResults: [] };
// }
// async componentDidMount(){
// // debugger;
// JobsData().then(res => {
// this.setState({jobsDataResults:res.data.result_list});
// }).catch(err => {
// console.log('startjoblist error', err)
// })
// }
function titleLen(title){
let maxl = 45; let maxl = 45;
title.replace('/', ' '); title.replace('/', ' ');
title.replace('www.', ''); title.replace('www.', '');
@@ -32,107 +42,117 @@ class CurrentJobsHero extends Component {
return (title.length > maxl)? title.substring(0,maxl-2)+'...': title; return (title.length > maxl)? title.substring(0,maxl-2)+'...': title;
} }
// if (jobsDataResults ()== null){
// return null; useEffect(()=>{
// } if(socketMsgReceived.type == '' || socketMsgReceived.type == 'market'){
render() { JobsData().then(res => {
var site = getConfig()[0]; setJobs(res.data.result_list);
if ( this.state.jobsDataResults== undefined ){ }).catch(err => {
return null; console.log('startjoblist error', err)
})
} }
var dashUrl = process.env.REACT_APP_DASH_URL; },[socketMsgReceived.type])
if (this.state.jobsDataResults.length == 0){
return <></>;
}
return (
<>
<section className="appie-blog-area">
<div className="container">
<div className="row">
<p className='pl-15'>Recent jobs.</p>
{
this.state.jobsDataResults.map((i, index) => {
var options = { weekday: 'long', year: 'numeric', month: 'long', day: 'numeric' };
var postDt = new Date(i.expire).toLocaleDateString("en-US", options);
let hourRemaining = Math.floor(Math.abs(new Date() - new Date(i.expire)) / (1000*60*60))
if(index < 5){ // if ( this.state.jobsDataResults== undefined ){
return ( // return null;
<div className="col-12"> // }
<div
className="container-fluid mb-10 wow animated fadeInUp boxBorder d-flex align-items-center rounded" // if (this.state.jobsDataResults.length == 0){
data-wow-duration="3000ms" // return <></>;
data-wow-delay="200ms" // }
> return (
<div className="content d-flex flex-column justify-content-between" style={{height: '50px', width: '100%'}}> <>
<div className="titleBox"> {jobs.length < 1 ?
<h3 className="title_hero"> null
<a href={dashUrl}> :
<span className='font_black_hero'>{this.titleLen(i.title)} </span> <section className="appie-blog-area">
</a> <div className="container">
</h3> <div className="row">
</div> <p className='pl-15'>Recent jobs.</p>
<div className='p-0 container-fluid'>
{/*<div><hr /></div>*/} {
{/*<div className="blog-meta">*/} jobs.map((i, index) => {
{/* <ul>*/} var options = { weekday: 'long', year: 'numeric', month: 'long', day: 'numeric' };
{/* <li className="expire">*/} var postDt = new Date(i.expire).toLocaleDateString("en-US", options);
{/* <a href={dashUrl} className='d-block'>*/} let hourRemaining = Math.floor(Math.abs(new Date() - new Date(i.expire)) / (1000*60*60))
{/* <div className='font_red d-flex align-items-start'>*/}
{/* <div className='pr-2'>Expires :</div>*/} if(index < 5){
{/* <CountDownTimer targetDate={postDt}/>*/} return (
{/* </div>*/} <div className="col-12">
{/* </a>*/} <div
{/* </li>*/} className="container-fluid mb-10 wow animated fadeInUp boxBorder d-flex align-items-center rounded"
{/* </ul>*/} data-wow-duration="3000ms"
{/*</div>*/} data-wow-delay="200ms"
<div className='lmoreTxt d-flex justify-content-between align-items-center'> >
<p className='text-danger' style={{fontSize: '12px'}}>{hourRemaining > 24 ? `available in the next ${hourRemaining%24} ${hourRemaining%24 > 1 ? 'days':'day'}` : `available in the next 12hrs 30mins`}</p> <div className="content d-flex flex-column justify-content-between" style={{height: '50px', width: '100%'}}>
<a href={dashUrl} className=''> <div className="titleBox">
Learn More <i className="fal fa-arrow-right" /> <h3 className="title_hero">
</a> <a href={dashUrl}>
</div> <span className='font_black_hero'>{titleLen(i.title)} </span>
</div> </a>
</h3>
</div>
<div className='p-0 container-fluid'>
{/*<div><hr /></div>*/}
{/*<div className="blog-meta">*/}
{/* <ul>*/}
{/* <li className="expire">*/}
{/* <a href={dashUrl} className='d-block'>*/}
{/* <div className='font_red d-flex align-items-start'>*/}
{/* <div className='pr-2'>Expires :</div>*/}
{/* <CountDownTimer targetDate={postDt}/>*/}
{/* </div>*/}
{/* </a>*/}
{/* </li>*/}
{/* </ul>*/}
{/*</div>*/}
<div className='lmoreTxt d-flex justify-content-between align-items-center'>
<p className='text-danger' style={{fontSize: '12px'}}>{hourRemaining > 24 ? `available in the next ${hourRemaining%24} ${hourRemaining%24 > 1 ? 'days':'day'}` : `available in the next 12hrs 30mins`}</p>
<a href={dashUrl} className=''>
Learn More <i className="fal fa-arrow-right" />
</a>
</div> </div>
</div> </div>
</div> </div>
) </div>
} </div>
)
})
} }
<div className="col-md-6 col-xl-12"> })
<div }
className="appie-blog-item mt-15 wow animated fadeInUp"
data-wow-duration="3000ms"
data-wow-delay="600ms"
>
<div className="pt-10 d-flex flex-column gap-2">
<h3 className="title"> <div className="col-md-6 col-xl-12">
<a href={dashUrl}> <div
Find more opportunities at our marketplace. className="appie-blog-item mt-15 wow animated fadeInUp"
</a> data-wow-duration="3000ms"
</h3> data-wow-delay="600ms"
<a className='align-self-end' href="https://users.wrenchboard.com/login"> >
Login now <i className="fal fa-arrow-right" />
</a> <div className="pt-10 d-flex flex-column gap-2">
</div>
</div> <h3 className="title">
<a href={dashUrl}>
Find more opportunities at our marketplace.
</a>
</h3>
<a className='align-self-end' href="https://users.wrenchboard.com/login">
Login now <i className="fal fa-arrow-right" />
</a>
</div> </div>
</div> </div>
</div> </div>
</section>
</> </div>
); </div>
} </section>
}
</>
);
} }
export default CurrentJobsHero; export default CurrentJobsHero;
+1 -1
View File
@@ -29,7 +29,7 @@ function MissionStatement() {
}, },
{ {
id: 4, id: 4,
title: "Get you work done", title: "Get your work done",
content: "For other tasks you need to get done, we will be there for smooth engagement", content: "For other tasks you need to get done, we will be there for smooth engagement",
} }
]; ];
+1 -1
View File
@@ -25,7 +25,7 @@ function Service() {
<HeroNews <HeroNews
title="Services" title="Services"
breadcrumb={[ breadcrumb={[
{ link: '/', title: 'home' }, { link: '/', title: 'Home' },
{ link: '/service', title: 'Service' }, { link: '/service', title: 'Service' },
]} ]}
/> />
+4 -1
View File
@@ -1,6 +1,7 @@
import React from 'react'; import React from 'react';
import ReactDOM from 'react-dom'; import ReactDOM from 'react-dom';
import { BrowserRouter as Router } from 'react-router-dom'; import { BrowserRouter as Router } from 'react-router-dom';
import SocketIOContextProvider from './Contexts/SocketIOContext';
import App from './App'; import App from './App';
import './assets/css/bootstrap.min.css'; import './assets/css/bootstrap.min.css';
@@ -15,7 +16,9 @@ import './assets/css/style.css';
ReactDOM.render( ReactDOM.render(
<React.StrictMode> <React.StrictMode>
<Router> <Router>
<App /> <SocketIOContextProvider>
<App />
</SocketIOContextProvider>
</Router> </Router>
</React.StrictMode>, </React.StrictMode>,
document.getElementById('root') document.getElementById('root')