Merge master into wallet-log-removal

.env

@@ -1,4 +1,5 @@
 SKIP_PREFLIGHT_CHECK=true 
+REACT_APP_NODE_ENV="development"
 
 REACT_APP_FACEBOOK="https://www.facebook.com/profile.php?id=100066498622246"
 REACT_APP_TWITTER="https://twitter.com/fluxtra"

.env.development

@@ -1,4 +1,5 @@
 SKIP_PREFLIGHT_CHECK=true 
+REACT_APP_NODE_ENV="development"
 
 REACT_APP_FACEBOOK="https://www.facebook.com/profile.php?id=100066498622246"
 REACT_APP_TWITTER="https://twitter.com/fluxtra"
@@ -9,15 +10,15 @@ REACT_APP_APPSITE="https://myfitapp.mermsemr.com"
 
 # REACT_APP_AUX_ENDPOINT="http://10.20.30.32:9083/svs/user"
 # REACT_APP_USERS_ENDPOINT="http://10.20.30.32:9083/svs/user"
-#REACT_APP_AUX_ENDPOINT="https://apigate.orion.g1.wrenchboard.com/svs/user"
+# REACT_APP_AUX_ENDPOINT="https://apigate.lotus.g1.wrenchboard.com/svs/user"
-#REACT_APP_USERS_ENDPOINT="https://apigate.orion.g1.wrenchboard.com/svs/user"
+# REACT_APP_USERS_ENDPOINT="https://apigate.lotus.g1.wrenchboard.com/svs/user"
 
-REACT_APP_AUX_ENDPOINT="https://apigate.orion.g1.wrenchboard.com/en/wrench/api/v1"
+REACT_APP_AUX_ENDPOINT="https://apigate.lotus.g1.wrenchboard.com/en/wrench/api/v1"
-REACT_APP_USERS_ENDPOINT="https://apigate.orion.g1.wrenchboard.com/en/wrench/api/v1"
+REACT_APP_USERS_ENDPOINT="https://apigate.lotus.g1.wrenchboard.com/en/wrench/api/v1"
 REACT_APP_ENDPOINT_KEY="WRENCH-BOARD-2024"
 
 #SOCKETS ENDS
-REACT_APP_PRIMARY_SOCKET="https://socket.wrenchboard.com"
+REACT_APP_PRIMARY_SOCKET="https://socket-dev.wrenchboard.com"
 
 #"https://devapi.mermsemr.com/en/desktop/api/v2/myfituser"
 
@@ -35,20 +36,13 @@ REACT_APP_RESET_START_ERROR_TIMEOUT=3000
 #NUMBER OF ITEMS PER PAGE
 REACT_APP_ITEM_PER_PAGE=5
 
-#apigate.orion.g1.wrenchboard.com:76.209.103.227
+#apigate.lotus.g1.wrenchboard.com:76.209.103.227
 #apigate.orion.g1.wrenchboard.com:76.209.103.227
 
 REACT_APP_GOOGLE_CLIENT_ID=817021856543-ad9nsjgdpsu2s2jrl63j3ihrv7lbf6ma.apps.googleusercontent.com
 REACT_APP_GOOGLE_CLIENT_SECRET=aozK_2G8UjaCmLgPPkv9abIm
 REACT_APP_GOOGLE_CLIENT_SCOPE="https://www.googleapis.com/auth/plus.login https://www.googleapis.com/auth/userinfo.email https://www.googleapis.com/auth/userinfo.profile"
-REACT_APP_GOOGLE_REDIRECT_URL=https://users.wrenchboard.com/login/auth/
+REACT_APP_GOOGLE_REDIRECT_URL=http://localhost:9082/login/auth/
-
-REACT_APP_FACEBOOK_CLIENT_ID2=390204307987009
-REACT_APP_FACEBOOK_CLIENT_SECRET2=19f778e312f2ab96d147bacb612910c2
-REACT_APP_FACEBOOK_CLIENT_SCOPE="email,public_profile"
-REACT_APP_FACEBOOK_REDIRECT_URL="https://users.wrenchboard.com/login/auth/flogin"
-
-DISABLE_ESLINT_PLUGIN=true
 
 #File Handling
 REACT_APP_MAX_FILE_SIZE=1048576
@@ -56,6 +50,7 @@ REACT_APP_MAX_VIDEO_FILE_SIZE=31457280
 REACT_APP_TOTAL_NUM_FILE=4
 
 REACT_APP_LOGOUT_TEXT="Sign Out"
+
 REACT_APP_APPLE_SOCIAL_LOGIN=0
 REACT_APP_LINKEDIN_SOCIAL_LOGIN=0
 
@@ -94,7 +89,7 @@ REACT_APP_SHOW_ACCOUNT_DASH=1
 REACT_APP_SHOW_SLIDER_BANNERS=0
 
 # FOR MEDIA LINK
-REACT_APP_MEDIA_LINK='https://media.wrenchboard.com'
+REACT_APP_MEDIA_LINK='https://dev-media.wrenchboard.com'
 
 # FOR FAMILY GAME LINK
 REACT_APP_FAM_GAME_LINK='https://games.wrenchboard.com'
@@ -103,4 +98,4 @@ REACT_APP_FAM_GAME_LINK='https://games.wrenchboard.com'
 REACT_APP_CUSTOMTIMER=90
 
 #SHOW OR HIDE MY PAGE LINK ROUTE
-REACT_APP_SHOW_USER_PAGE=0
+REACT_APP_SHOW_USER_PAGE=1

.env.production

@@ -1,4 +1,5 @@
 SKIP_PREFLIGHT_CHECK=true 
+REACT_APP_NODE_ENV="production"
 
 REACT_APP_FACEBOOK="https://www.facebook.com/profile.php?id=100066498622246"
 REACT_APP_TWITTER="https://twitter.com/fluxtra"

Dockerfile

@@ -1,5 +1,8 @@
 # pull the base image
-FROM node:alpine
+#FROM node:alpine
+FROM node:20.11.0-alpine
+
+
 
 # Build args
 ARG NODE_ENV
@@ -26,7 +29,7 @@ COPY nginx.conf ./
 
 COPY run.sh ./
 
-RUN npm install --legacy-peer-deps
+# RUN npm install --legacy-peer-deps
 
 # add app
 COPY . ./

package.json

@@ -3,6 +3,7 @@
   "version": "0.2.0",
   "private": true,
   "dependencies": {
+    "@fvilers/disable-react-devtools": "^1.3.0",
     "@react-oauth/google": "^0.11.0",
     "@reduxjs/toolkit": "^1.8.2",
     "@tailwindcss/line-clamp": "^0.3.1",
@@ -36,7 +37,7 @@
     "yup": "^1.1.1"
   },
   "scripts": {
-    "start": "react-scripts start -e .env.production",
+    "start": "react-scripts start -e .env.development",
     "build": "react-scripts build -e .env.production",
     "test": "react-scripts test",
     "eject": "react-scripts eject"

public/manifest.json

@@ -1,6 +1,6 @@
 {
-  "short_name": "React App",
+  "short_name": "WrenchBoard App",
-  "name": "Create React App Sample",
+  "name": "WrenchBoard User Web",
   "icons": [],
   "start_url": ".",
   "display": "standalone",

run.sh

@@ -13,8 +13,9 @@ else
   # build the app and serve it via nginx
   echo "Production build"
   npm install --legacy-peer-deps
-  #npm run build
+  npm run build
-  npm start
+  # Testing sometimes
+  # npm run start
   nginx -g 'daemon off;' -c /usr/src/app/nginx.conf
   nginx -c /usr/src/app/nginx.conf
 fi

src/App.jsx

@@ -4,6 +4,11 @@ import Toaster from "./components/Helpers/Toaster";
 import Default from "./components/Partials/Default";
 import SocketIOContextProvider from "./components/Contexts/SocketIOContext";
 
+import { disableReactDevTools } from '@fvilers/disable-react-devtools';
+
+if (process.env.REACT_APP_NODE_ENV === 'production') {
+    disableReactDevTools();
+}
 function App() {
   const { pathname } = useLocation();
   return (

src/Routers.jsx

@@ -1,83 +1,85 @@
 import { Route, Routes } from "react-router-dom";
-import FourZeroFour from "./components/FourZeroFour";
+import { lazy } from "react";
-import ScrollToTop from "./components/Helpers/ScrollToTop";
+
-import StartJob from "./components/MyJobs/StartJob";
-import Notification from "./components/Notification";
-import AuthRoute from "./middleware/AuthRoute";
-import AppDownloadPage from "./views/AppDownloadPage";
-import AppleRedirectPage from "./views/AppleRedirectPage";
-import AuthProfilePage from "./views/AuthProfilePage";
-import AuthRedirect from "./views/AuthRedirect";
-import BlogPage from "./views/BlogPage";
-import CalendarPage from "./views/CalendarPage";
-import CollectionItemPage from "./views/CollectionItemPage";
-import FacebookRedirect from "./views/FacebookRedirect";
-import FamilyAccPage from "./views/FamilyAccPage";
-import FamilyManagePage from "./views/FamilyManagePage";
-import FamilyMarketPage from "./views/FamilyMarketPage";
-import FamilySettingsPage from "./views/FamilySettingsPage";
-import ForgotPasswordPages from "./views/ForgotPasswordPages";
-import ForgotPasswordPagesTwo from "./views/ForgotPasswordPagesTwo";
-import HistoryPage from "./views/HistoryPage";
-import HomePages from "./views/HomePages";
-import JobGroupsPage from "./views/JobGroupsPage";
-import LndPage from "./views/LndPage";
-import LoginPage from "./views/LoginPage";
-import LoginPageTwo from "./views/LoginPageTwo";
 import LoginLandingPage from './views/LoginLandingPage'
-import ManageActiveJobs from "./views/ManageActiveJobs";
+import LoginPage from "./views/LoginPage";
-import ManageInterestOfferPage from "./views/ManageInterestOfferPage";
+import HomePages from "./views/HomePages";
-import MarketPlacePage from "./views/MarketPlacePage";
+
-import MyActiveJobsPage from "./views/MyActiveJobsPage";
+
-import MyCouponPage from "./views/MyCouponPage";
+const FourZeroFour = lazy(() => import("./components/FourZeroFour"));
-import MyJobsPage from "./views/MyJobsPage";
+const ScrollToTop = lazy(() => import("./components/Helpers/ScrollToTop"));
-import MyOffersPage from "./views/MyOffersPage";
+const StartJob = lazy(() => import("./components/MyJobs/StartJob"));
-import MyPastDueJobsPage from "./views/MyPastDueJobsPage";
+const Notification = lazy(() => import("./components/Notification"));
-import MyReviewDueJobsPage from "./views/MyReviewDueJobsPage";
+const AuthRoute = lazy(() => import("./middleware/AuthRoute"));
-import MyTaskPage from "./views/MyTaskPage";
+const AppDownloadPage = lazy(() => import("./views/AppDownloadPage"));
-import MyWaitingJobsPage from "./views/MyWaitingJobsPage";
+const AppleRedirectPage = lazy(() => import("./views/AppleRedirectPage"));
-import MyWalletPage from "./views/MyWalletPage";
+const AuthProfilePage = lazy(() => import("./views/AuthProfilePage"));
-import OffersInterestPage from "./views/OffersInterestPage";
+const AuthRedirect = lazy(() => import("./views/AuthRedirect"));
-import ReferralPage from "./views/ReferralPage";
+const BlogPage = lazy(() => import("./views/BlogPage"));
-import RemindersPage from "./views/RemindersPage";
+const CalendarPage = lazy(() => import("./views/CalendarPage"));
-import ResourcePage from "./views/ResourcePage";
+const CollectionItemPage = lazy(() => import("./views/CollectionItemPage"));
-import SavedPage from "./views/SavedPage";
+const FacebookRedirect = lazy(() => import("./views/FacebookRedirect"));
-import SellPage from "./views/SellPage";
+const FamilyManagePage = lazy(() => import("./views/FamilyManagePage"));
-import SettingsPage from "./views/SettingsPage";
+const FamilyMarketPage = lazy(() => import("./views/FamilyMarketPage"));
-import SignupPage from "./views/SignupPage";
+
-import SignupPageTwo from "./views/SignupPageTwo";
+const ForgotPasswordPages = lazy(()=> import("./views/ForgotPasswordPages"));
-import TrackingPage from "./views/TrackingPage";
+const ForgotPasswordPagesTwo = lazy(()=> import("./views/ForgotPasswordPagesTwo"));
-import UpdatePasswordPages from "./views/UpdatePasswordPages";
+const HistoryPage = lazy(()=> import("./views/HistoryPage"));
-import UpdatePasswordPagesTwo from "./views/UpdatePasswordPagesTwo";
+const JobGroupsPage = lazy(()=> import("./views/JobGroupsPage"));
-import UploadProductPage from "./views/UploadProductPage";
+const LndPage = lazy(()=> import("./views/LndPage"));
-import UserProfilePage from "./views/UserProfilePage";
+const LoginPageTwo = lazy(()=> import("./views/LoginPageTwo"));
-import VerifyLinkPages from "./views/VerifyLinkPages";
+const ManageActiveJobs = lazy(()=> import("./views/ManageActiveJobs"));
-import VerifyLinkPagesTwo from "./views/VerifyLinkPagesTwo";
+const ManageInterestOfferPage = lazy(()=> import("./views/ManageInterestOfferPage"));
-import VerifyPasswordPages from "./views/VerifyPasswordPages";
+const MarketPlacePage = lazy(()=> import("./views/MarketPlacePage"));
-import VerifyPasswordPagesTwo from "./views/VerifyPasswordPagesTwo";
+const MyActiveJobsPage = lazy(()=> import("./views/MyActiveJobsPage"));
-import VerifyYouPages from "./views/VerifyYouPages";
+const MyCouponPage = lazy(()=> import("./views/MyCouponPage"));
-import VerifyYouPagesTwo from "./views/VerifyYouPagesTwo";
+const MyJobsPage = lazy(()=> import("./views/MyJobsPage"));
-import YourPages from "./views/YourPage_";
+const MyOffersPage = lazy(()=> import("./views/MyOffersPage"));
-import ParentWaitingPage from "./views/ParentWaitingPage";
+const MyPastDueJobsPage = lazy(()=> import("./views/MyPastDueJobsPage"));
-import FamilyPendingOfferPage from "./views/FamilyPendingOfferPage";
+const MyReviewDueJobsPage = lazy(()=> import("./views/MyReviewDueJobsPage"));
-import FamBlogPage from "./views/FamBlogPage"
+const MyTaskPage = lazy(()=> import("./views/MyTaskPage"));
-import FamAIQuestionPage from "./views/FamAIQuestionPage"
+const MyWaitingJobsPage = lazy(()=> import("./views/MyWaitingJobsPage"));
-import FamMyFilesPage from "./views/FamMyFilesPage"
+const MyWalletPage = lazy(()=> import("./views/MyWalletPage"));
-import FamWorkInProgressPage from "./views/FamWorkInProgressPage";
+const OffersInterestPage = lazy(()=> import("./views/OffersInterestPage"));
-import MyPastDueTasksPage from "./views/MyPastDueTasksPage";
+const ReferralPage = lazy(()=> import("./views/ReferralPage"));
-import FamilyWalletPage from "./views/FamilyWalletPage";
+const RemindersPage = lazy(()=> import("./views/RemindersPage"));
-import FamilyActivitiesPage from "./views/FamilyActivitiesPage";
+const ResourcePage = lazy(()=> import("./views/ResourcePage"));
-import FamGamesPage from "./views/FamGamesPage";
+const SavedPage = lazy(()=> import("./views/SavedPage"));
-import FamilyRoutesPage from "./views/FamilyRoutesPage";
+const SellPage = lazy(()=> import("./views/SellPage"));
-import PromoPage from "./views/PromoPage";
+const SettingsPage = lazy(()=> import("./views/SettingsPage"));
-import LearnMorePage from "./views/LearnMorePage";
+const SignupPage = lazy(()=> import("./views/SignupPage"));
+const SignupPageTwo = lazy(()=> import("./views/SignupPageTwo"));
+const TrackingPage = lazy(()=> import("./views/TrackingPage"));
+const UpdatePasswordPages = lazy(()=> import("./views/UpdatePasswordPages"));
+const UpdatePasswordPagesTwo = lazy(()=> import("./views/UpdatePasswordPagesTwo"));
+const UploadProductPage = lazy(()=> import("./views/UploadProductPage"));
+const UserProfilePage = lazy(()=> import("./views/UserProfilePage"));
+const VerifyLinkPages = lazy(()=> import("./views/VerifyLinkPages"));
+const VerifyLinkPagesTwo = lazy(()=> import("./views/VerifyLinkPagesTwo"));
+const VerifyPasswordPages = lazy(()=> import("./views/VerifyPasswordPages"));
+const VerifyPasswordPagesTwo = lazy(()=> import("./views/VerifyPasswordPagesTwo"));
+const VerifyYouPages = lazy(()=> import("./views/VerifyYouPages"));
+const VerifyYouPagesTwo = lazy(()=> import("./views/VerifyYouPagesTwo"));
+const YourPages = lazy(()=> import("./views/YourPage_"));
+const ParentWaitingPage = lazy(()=> import("./views/ParentWaitingPage"));
+const FamilyPendingOfferPage = lazy(()=> import("./views/FamilyPendingOfferPage"));
+const FamBlogPage = lazy(()=> import("./views/FamBlogPage"));
+const FamAIQuestionPage = lazy(()=> import("./views/FamAIQuestionPage"));
+const FamMyFilesPage = lazy(()=> import("./views/FamMyFilesPage"));
+const FamWorkInProgressPage = lazy(()=> import("./views/FamWorkInProgressPage"));
+const MyPastDueTasksPage = lazy(()=> import("./views/MyPastDueTasksPage"));
+const FamilyWalletPage = lazy(()=> import("./views/FamilyWalletPage"));
+const LearnMorePage = lazy(()=> import("./views/LearnMorePage"));
+const FamGamesPage = lazy(()=> import("./views/FamGamesPage"));
+const FamilyRoutesPage = lazy(()=> import("./views/FamilyRoutesPage"));
+const PromoPage = lazy(()=> import("./views/PromoPage"));
 
 export default function Routers() {
   return (
     <ScrollToTop>
       <Routes>
         {/* guest routes */}
-        {process.env.REACT_APP_NEW_LOGIN_LAYOUT == 1 ? (
+        {Number(process.env.REACT_APP_NEW_LOGIN_LAYOUT) === 1 ? (
           <>
             <Route exact path="/login" element={<LoginLandingPage />} />
             <Route exact path="/login/:type" element={<LoginPageTwo />} />

src/index.js

@@ -1,4 +1,4 @@
-import React from "react";
+import React ,{Suspense} from "react";
 import ReactDOM from "react-dom/client";
 import { Provider } from "react-redux";
 import { BrowserRouter } from "react-router-dom";
@@ -13,7 +13,9 @@ ReactDOM.createRoot(root).render(
   <BrowserRouter>
     <Provider store={store}>
       <GoogleOAuthProvider clientId={process.env.REACT_APP_GOOGLE_CLIENT_ID}>
-        <App />
+          <Suspense>
+              <App />
+          </Suspense>
       </GoogleOAuthProvider>
     </Provider>
   </BrowserRouter>

src/views/MyWalletPage.jsx

@@ -9,7 +9,7 @@ export default function MyWalletPage() {
 
   useEffect(()=>{
     let walletExist = wallet_available_status || localStorage.getItem('wallet_available_status')
-    console.log(walletExist)
+    // console.log(walletExist)
     if(account_type == 'FULL' && walletExist != 'WALLET_AVAILABLE'){
       navigate('/', {replace: true})
     }