+
+
+ );
+}
+
+export default App;
\ No newline at end of file
diff --git a/src/components/EndOfList.js b/src/components/EndOfList.js
new file mode 100644
index 00000000..13d74b64
--- /dev/null
+++ b/src/components/EndOfList.js
@@ -0,0 +1,11 @@
+import React from "react"
+
+function EndOfList() {
+ return (
+
+ {items.map((item) => {
+ return
+ + End of List +
+ ) +} + +export default EndOfList \ No newline at end of file From 092ce325d79a12616ff96a23acd8e79a3b173747 Mon Sep 17 00:00:00 2001 From: AbdulGhaffar7 <2016n6497@gmail.com> Date: Thu, 12 Oct 2023 12:08:40 +0500 Subject: [PATCH 23/80] new changes --- src/views/Start/Start.js | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/views/Start/Start.js b/src/views/Start/Start.js index 9a29af0c..739c645c 100644 --- a/src/views/Start/Start.js +++ b/src/views/Start/Start.js @@ -66,7 +66,7 @@ function Start({ const navigate = useNavigate(); const [showMobileMenu, setShowMobileMenu] = React.useState(false); - console.log( "entry point : noToursAvailable :",noToursAvailable); + console.log("entry point : noToursAvailable :", noToursAvailable); const { t, i18n } = useTranslation(); const abortController = new AbortController(); @@ -189,7 +189,7 @@ function Start({ console.log(" L203 inside the true option/ totalTours :", totalTours); return (
- hello
;
+
+ // if (totalTours === 0) {
+ // console.log("L93: inside Header.js, totalTours === 0");
+ // return (
+ //
+ // hello
;
+ return {totalTours === 0 ? "0 Tours" : "More Tours"}
;
// if (totalTours === 0) {
// console.log("L93: inside Header.js, totalTours === 0");
From 37798907cf9c13f8e7ce6b23f48b887f7adf6a8a Mon Sep 17 00:00:00 2001
From: AbdulGhaffar7 <2016n6497@gmail.com>
Date: Thu, 12 Oct 2023 13:05:06 +0500
Subject: [PATCH 47/80] new changes
---
src/actions/tourActions.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/actions/tourActions.js b/src/actions/tourActions.js
index dba698aa..b62fa268 100644
--- a/src/actions/tourActions.js
+++ b/src/actions/tourActions.js
@@ -111,7 +111,7 @@ export function loadTour(id, city) {
export function loadTotalTours() {
// console.log("tourActions, loadTotalTours L48 , no data here")
return (dispatch, getState) => {
- return loadOneReturnAll(
+ return loadOne(
dispatch,
getState,
LOAD_TOTAL_TOURS,
From 13269c3bb3eebfc584826914b5ae31d0fe4fa4f0 Mon Sep 17 00:00:00 2001
From: AbdulGhaffar7 <2016n6497@gmail.com>
Date: Thu, 12 Oct 2023 13:14:15 +0500
Subject: [PATCH 48/80] new changes
---
src/actions/tourActions.js | 2 +-
src/reducers/tours.js | 356 ++++++++++++++++++-------------------
2 files changed, 179 insertions(+), 179 deletions(-)
diff --git a/src/actions/tourActions.js b/src/actions/tourActions.js
index b62fa268..dba698aa 100644
--- a/src/actions/tourActions.js
+++ b/src/actions/tourActions.js
@@ -111,7 +111,7 @@ export function loadTour(id, city) {
export function loadTotalTours() {
// console.log("tourActions, loadTotalTours L48 , no data here")
return (dispatch, getState) => {
- return loadOne(
+ return loadOneReturnAll(
dispatch,
getState,
LOAD_TOTAL_TOURS,
diff --git a/src/reducers/tours.js b/src/reducers/tours.js
index 99a5f9ae..9f7d207c 100644
--- a/src/reducers/tours.js
+++ b/src/reducers/tours.js
@@ -1,189 +1,189 @@
import {
- CLEAR_TOURS,
- LOAD_FAVOURITE_TOURS,
- LOAD_FAVOURITE_TOURS_DONE,
- LOAD_TOTAL_TOURS,
- LOAD_TOTAL_TOURS_DONE,
- LOAD_TOUR,
- LOAD_TOUR_DONE,
- LOAD_TOUR_FILTER,
- LOAD_TOUR_FILTER_DONE,
- LOAD_TOUR_GPX,
- LOAD_TOUR_GPX_DONE,
- LOAD_TOUR_PDF,
- LOAD_TOUR_PDF_DONE,
- LOAD_TOURS,
- LOAD_TOURS_DONE,
- SET_SELECTED_DATE,
- LOAD_MAP_FILTERS,
- NO_DATA_AVAILABLE,
- LOAD_DATA_ERROR,
- NO_TOURS_AVAILABLE
-} from '../actions/types';
+ CLEAR_TOURS,
+ LOAD_FAVOURITE_TOURS,
+ LOAD_FAVOURITE_TOURS_DONE,
+ LOAD_TOTAL_TOURS,
+ LOAD_TOTAL_TOURS_DONE,
+ LOAD_TOUR,
+ LOAD_TOUR_DONE,
+ LOAD_TOUR_FILTER,
+ LOAD_TOUR_FILTER_DONE,
+ LOAD_TOUR_GPX,
+ LOAD_TOUR_GPX_DONE,
+ LOAD_TOUR_PDF,
+ LOAD_TOUR_PDF_DONE,
+ LOAD_TOURS,
+ LOAD_TOURS_DONE,
+ SET_SELECTED_DATE,
+ LOAD_MAP_FILTERS,
+ NO_DATA_AVAILABLE,
+ LOAD_DATA_ERROR,
+ NO_TOURS_AVAILABLE,
+} from "../actions/types";
const initialState = {
- loading: false,
- saving: false,
- page: 1,
- pageSize: 10,
- total: '',
- orderId: "created_at",
- orderDesc: true,
- tours: [],
- favouriteTours: [],
- filter: null,
- selectedDate: null,
- isPdfLoading: false,
- total_tours: 0,
- favouriteRanges: [],
- isLoadingFilter: false,
- total_provider: 222,
- // total_provider: ' ',
- total_cities: 222,
- total_ranges: 222,
- total_connections: 222,
- visibleToursGPX: [],
- noToursAvailable: null,
-}
+ loading: false,
+ saving: false,
+ page: 1,
+ pageSize: 10,
+ total: "",
+ orderId: "created_at",
+ orderDesc: true,
+ tours: [],
+ favouriteTours: [],
+ filter: null,
+ selectedDate: null,
+ isPdfLoading: false,
+ total_tours: 0,
+ favouriteRanges: [],
+ isLoadingFilter: false,
+ total_provider: 222,
+ // total_provider: ' ',
+ total_cities: 222,
+ total_ranges: 222,
+ total_connections: 222,
+ visibleToursGPX: [],
+ noToursAvailable: null,
+};
export default (state = initialState, action = {}) => {
- switch(action.type) {
- case LOAD_TOURS:
- return {
- ...state,
- ...action,
- loading: true
- };
- case LOAD_TOURS_DONE:
- let tours = [...state.tours];
- if(!!action.page && action.page > 1){
- tours.push(...action.tours);
- } else {
- tours = [...action.tours];
- }
+ switch (action.type) {
+ case LOAD_TOURS:
+ return {
+ ...state,
+ ...action,
+ loading: true,
+ };
+ case LOAD_TOURS_DONE:
+ let tours = [...state.tours];
+ if (!!action.page && action.page > 1) {
+ tours.push(...action.tours);
+ } else {
+ tours = [...action.tours];
+ }
- let toPush = {
- ...state,
- tours: tours,
- total: action.total,
- loading: false,
- page: action.page,
- }
+ let toPush = {
+ ...state,
+ tours: tours,
+ total: action.total,
+ loading: false,
+ page: action.page,
+ };
- /*if(!!action.filter){
+ /*if(!!action.filter){
toPush.filter = action.filter;
}*/
- return {
- ...toPush
- };
- case LOAD_TOUR:
- return {
- ...state,
- //loading: true,
- tour: null
- };
+ return {
+ ...toPush,
+ };
+ case LOAD_TOUR:
+ return {
+ ...state,
+ //loading: true,
+ tour: null,
+ };
- case LOAD_TOUR_DONE:
- return {
- ...state,
- //loading: false,
- tour: action.tour,
- };
- case LOAD_FAVOURITE_TOURS:
- return {
- ...state,
- ...action,
- loading: true
- };
- case LOAD_FAVOURITE_TOURS_DONE:
- return {
- ...state,
- favouriteTours: action.tours,
- favouriteRanges: action.ranges,
- loading: false,
- };
- case SET_SELECTED_DATE:
- return {
- ...state,
- selectedDate: action.date
- }
- case LOAD_TOUR_PDF:
- return {
- ...state,
- isPdfLoading: true
- }
- case LOAD_TOUR_PDF_DONE:
- return {
- ...state,
- isPdfLoading: false
- }
- case LOAD_TOTAL_TOURS:
- return {
- ...state,
- }
- case LOAD_TOTAL_TOURS_DONE:
- return {
- ...state,
- total_tours: action.total_tours,
- total_connections: action.total_connections,
- total_ranges: action.total_ranges,
- total_cities: action.total_cities,
- total_provider: action.total_provider,
- noToursAvailable: action.total_tours === 0 ? true : false
- }
- case LOAD_TOUR_GPX:
- return {
- ...state,
- isGpxLoading: true
- }
- case LOAD_TOUR_GPX_DONE:
- return {
- ...state,
- isGpxLoading: false
- }
- case LOAD_TOUR_FILTER:
- return {
- ...state,
- isLoadingFilter: true
- }
- case LOAD_TOUR_FILTER_DONE:
- return {
- ...state,
- filter: action.filter,
- isLoadingFilter: false
- }
- case CLEAR_TOURS:
- return {
- ...state,
- tours: [],
- total: 0
- }
- case LOAD_MAP_FILTERS:
- return {
- ...state,
- visibleToursGPX: action.visibleToursGPX
- }
- default: return state;
- // cases when NO DATA AVAILABLE or LOAD DATA ERROR
- case NO_DATA_AVAILABLE:
- return {
- ...state,
- noDataAvailable: true, // set a flag to indicate no data
- };
-
- // cases when NO TOURS AVAILABLE or LOAD DATA ERROR
- case NO_TOURS_AVAILABLE:
- return {
- ...state,
- noToursAvailable: true, // set a flag to indicate no data
- };
-
- case LOAD_DATA_ERROR:
- return {
- ...state,
- error: action.error, // Store the error message for display
- };
-
- }
-}
\ No newline at end of file
+ case LOAD_TOUR_DONE:
+ return {
+ ...state,
+ //loading: false,
+ tour: action.tour,
+ };
+ case LOAD_FAVOURITE_TOURS:
+ return {
+ ...state,
+ ...action,
+ loading: true,
+ };
+ case LOAD_FAVOURITE_TOURS_DONE:
+ return {
+ ...state,
+ favouriteTours: action.tours,
+ favouriteRanges: action.ranges,
+ loading: false,
+ };
+ case SET_SELECTED_DATE:
+ return {
+ ...state,
+ selectedDate: action.date,
+ };
+ case LOAD_TOUR_PDF:
+ return {
+ ...state,
+ isPdfLoading: true,
+ };
+ case LOAD_TOUR_PDF_DONE:
+ return {
+ ...state,
+ isPdfLoading: false,
+ };
+ case LOAD_TOTAL_TOURS:
+ return {
+ ...state,
+ };
+ case LOAD_TOTAL_TOURS_DONE:
+ return {
+ ...state,
+ // total_tours: action.total_tours,
+ // total_connections: action.total_connections,
+ // total_ranges: action.total_ranges,
+ // total_cities: action.total_cities,
+ // total_provider: action.total_provider,
+ noToursAvailable: action.total_tours === 0 ? true : false,
+ };
+ case LOAD_TOUR_GPX:
+ return {
+ ...state,
+ isGpxLoading: true,
+ };
+ case LOAD_TOUR_GPX_DONE:
+ return {
+ ...state,
+ isGpxLoading: false,
+ };
+ case LOAD_TOUR_FILTER:
+ return {
+ ...state,
+ isLoadingFilter: true,
+ };
+ case LOAD_TOUR_FILTER_DONE:
+ return {
+ ...state,
+ filter: action.filter,
+ isLoadingFilter: false,
+ };
+ case CLEAR_TOURS:
+ return {
+ ...state,
+ tours: [],
+ total: 0,
+ };
+ case LOAD_MAP_FILTERS:
+ return {
+ ...state,
+ visibleToursGPX: action.visibleToursGPX,
+ };
+ default:
+ return state;
+ // cases when NO DATA AVAILABLE or LOAD DATA ERROR
+ case NO_DATA_AVAILABLE:
+ return {
+ ...state,
+ noDataAvailable: true, // set a flag to indicate no data
+ };
+
+ // cases when NO TOURS AVAILABLE or LOAD DATA ERROR
+ case NO_TOURS_AVAILABLE:
+ return {
+ ...state,
+ noToursAvailable: true, // set a flag to indicate no data
+ };
+
+ case LOAD_DATA_ERROR:
+ return {
+ ...state,
+ error: action.error, // Store the error message for display
+ };
+ }
+};
From 5b357b2c32e2495c512f9f7541aa165075b47305 Mon Sep 17 00:00:00 2001
From: AbdulGhaffar7 <2016n6497@gmail.com>
Date: Thu, 12 Oct 2023 13:16:33 +0500
Subject: [PATCH 49/80] new changes
---
src/reducers/tours.js | 10 +++++-----
src/views/Start/Start.js | 12 ++++++------
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/reducers/tours.js b/src/reducers/tours.js
index 9f7d207c..36b6426f 100644
--- a/src/reducers/tours.js
+++ b/src/reducers/tours.js
@@ -125,11 +125,11 @@ export default (state = initialState, action = {}) => {
case LOAD_TOTAL_TOURS_DONE:
return {
...state,
- // total_tours: action.total_tours,
- // total_connections: action.total_connections,
- // total_ranges: action.total_ranges,
- // total_cities: action.total_cities,
- // total_provider: action.total_provider,
+ total_tours: action.total_tours,
+ total_connections: action.total_connections,
+ total_ranges: action.total_ranges,
+ total_cities: action.total_cities,
+ total_provider: action.total_provider,
noToursAvailable: action.total_tours === 0 ? true : false,
};
case LOAD_TOUR_GPX:
diff --git a/src/views/Start/Start.js b/src/views/Start/Start.js
index 10509db7..8877457a 100644
--- a/src/views/Start/Start.js
+++ b/src/views/Start/Start.js
@@ -214,7 +214,7 @@ function Start({
/>
)}
- {!showMobileMenu && (
+ {/* {!showMobileMenu && (
{totalTours === 0 ? "0 Tours" : "More Tours"}
;
-
- // if (totalTours === 0) {
- // console.log("L93: inside Header.js, totalTours === 0");
- // return (
- //
- //
+