Skip to content

Commit

Permalink
Refactor/api/generic (#13)
Browse files Browse the repository at this point in the history
* chore:added dependencies

* modified: app.tsx and main.tsx

* added: driver type data (#1)

Co-authored-by: Sagar Adhikari <sagarjungadhikari19@gmail.com>

* Master (#2)

* added: driver type data

* feat: added client side pages and components

---------

Co-authored-by: Sagar Adhikari <sagarjungadhikari19@gmail.com>

* Master (#3)

* added: driver type data

* feat: added client side pages and components

* admin-dashboard-updated

---------

Co-authored-by: Sagar Adhikari <sagarjungadhikari19@gmail.com>

* feat:user registration with custom json for testing

* fixed: user registration

* feat: added a custom json for testing

---------

Co-authored-by: Rahul Mijar <rahul.mijar@trunary.com>

* fixed:registration and added a login feature

* Feat/admin/passenger (#6)

* added: driver type data

* feat: added client side pages and components

* admin-dashboard-updated

* jsondb_updated

* map_integrated

* fixed:registration and added a login feature

* table created

* driver_api_created

* fixed : driver_table _fixed

* added some changes in admin side UI

---------

Co-authored-by: Sagar Adhikari <sagarjungadhikari19@gmail.com>
Co-authored-by: Rahul Mijar <rahul.mijar@trunary.com>

* feat: added client side pages and components

* admin-dashboard-updated

* jsondb_updated

* table created

* added some changes in admin side UI

* feat:added a repository context to access all repos objects

* feat:managed driver info

* some changes added

* added a map feature from sagar

* refactor: removed passenger info

* fixed:bug in dashboard_map

* fixed:bugs at passenger info

* refactor:added a generic api and repositories

* refactor: deleted other repo and apis

* refactor: completed

* fixed: comments

* chore: added pagination logic

* feat: pagination added in driver and passenger table

* feat: added ride history

* feat: added rideInfo page

* feat: added pagination on ride table

* refactor:moved static data to json files in utils

---------

Co-authored-by: Rahul Mijar <rahul.mijar@trunary.com>
Co-authored-by: Sagar Adhikari <sagarjungadhikari19@gmail.com>
  • Loading branch information
3 people committed Feb 27, 2024
1 parent 3a6d4da commit 5d582d7
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 15 deletions.
16 changes: 9 additions & 7 deletions src/admin/components/driver/Drivertable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,25 @@ import { useEffect, useState } from "react";
import { AllDriver, Driver, TableProp } from "@/types/data";
import { explore, leftArrow } from "../shared/Icons";
import _ from "lodash";
import { InitialStateData } from "@/utils/utilities";

function Drivertable({ filterValue }: TableProp) {
console.log(filterValue);

const { repo } = useRepository();
const [drivers, setDrivers] = useState<AllDriver>(InitialStateData);
const [currentPage, setCurrentPage] = useState(
drivers.meta.currentPageNumber
drivers.pagination.currentPageNumber
);

const handleNextPage = () => {
setCurrentPage((prevPage) =>
drivers.meta.nextPageNumber ? prevPage + 1 : prevPage
drivers.pagination.nextPageNumber ? prevPage + 1 : prevPage
);
};

const handlePrevPage = () => {
setCurrentPage((prevPage) =>
drivers.meta.previousPageNumber ? prevPage - 1 : prevPage
drivers.pagination.previousPageNumber ? prevPage - 1 : prevPage
);
};
useEffect(() => {
Expand Down Expand Up @@ -85,19 +87,19 @@ function Drivertable({ filterValue }: TableProp) {
<button
title="Previous page"
onClick={handlePrevPage}
disabled={!drivers.meta.previousPageNumber}
disabled={!drivers.pagination.previousPageNumber}
className="bg-transparent border-1 rounded-md py-1 px-1 font-normal text-green-600 disabled:text-gray-800 disabled:cursor-not-allowed cursor-pointer text-xl"
>
<span className="mr-8">{leftArrow}</span>
</button>
<span>
Page {currentPage} of {drivers.meta.totalPage}
Page {currentPage} of {drivers.pagination.totalPage}
</span>
<button
title="Next page"
className="bg-transparent border-1 rounded-md py-1 px-1 font-normal text-green-600 disabled:text-gray-800 disabled:cursor-not-allowed cursor-pointer text-xl"
onClick={handleNextPage}
disabled={!drivers.meta.nextPageNumber}
disabled={!drivers.pagination.nextPageNumber}
>
<span className="ml-8">{explore}</span>
</button>
Expand Down
14 changes: 7 additions & 7 deletions src/admin/components/passenger/PassengerTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,25 +11,25 @@ export default function PassengerTable({ filterValue }: TableProp) {
const { repo } = useRepository();
const [passengers, setPassengers] = useState<AllPassenger>(InitialStateData);
const [currentPage, setCurrentPage] = useState(
passengers.meta.currentPageNumber
passengers.pagination.currentPageNumber
);

const handleNextPage = () => {
setCurrentPage((prevPage) =>
passengers.meta.nextPageNumber ? prevPage + 1 : prevPage
passengers.pagination.nextPageNumber ? prevPage + 1 : prevPage
);
};

const handlePrevPage = () => {
setCurrentPage((prevPage) =>
passengers.meta.previousPageNumber ? prevPage - 1 : prevPage
passengers.pagination.previousPageNumber ? prevPage - 1 : prevPage
);
};
useEffect(() => {
const fetchData = async () => {
try {
const data = await repo.getAllPassengers();
if (data && "list" in data && "meta" in data) {
if (data && "list" in data && "pagination" in data) {
setPassengers(data);
} else {
console.error("Data is not in the expected format:", data);
Expand Down Expand Up @@ -90,19 +90,19 @@ export default function PassengerTable({ filterValue }: TableProp) {
<button
title="Previous page"
onClick={handlePrevPage}
disabled={!passengers.meta.previousPageNumber}
disabled={!passengers.pagination.previousPageNumber}
className="bg-transparent border-1 rounded-md py-1 px-1 font-normal text-green-600 disabled:text-gray-800 disabled:cursor-not-allowed cursor-pointer text-xl"
>
<span className="mr-8">{leftArrow}</span>
</button>
<span>
Page {currentPage} of {passengers.meta.totalPage}
Page {currentPage} of {passengers.pagination.totalPage}
</span>
<button
title="Next page"
className="bg-transparent border-1 rounded-md py-1 px-1 font-normal text-green-600 disabled:text-gray-800 disabled:cursor-not-allowed cursor-pointer text-xl"
onClick={handleNextPage}
disabled={!passengers.meta.nextPageNumber}
disabled={!passengers.pagination.nextPageNumber}
>
<span className="ml-8">{explore}</span>
</button>
Expand Down
2 changes: 1 addition & 1 deletion src/utils/utilities.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ export function capitalize(word: string) {
}
export const InitialStateData = {
list: [],
meta: {
pagination: {
totalPage: 0,
totalItem: 0,
previousPageNumber: null,
Expand Down

0 comments on commit 5d582d7

Please sign in to comment.