diff --git a/apps/client/src/pages/reports/index.tsx b/apps/client/src/pages/reports/index.tsx
new file mode 100644
index 00000000..7940b67b
--- /dev/null
+++ b/apps/client/src/pages/reports/index.tsx
@@ -0,0 +1,167 @@
+import { useFetchSupplierOrders } from "@sahil/lib/hooks/suppliers";
+import { useState } from "react";
+import { useGetUserById } from "@sahil/lib/hooks/users";
+import { useSession } from "next-auth/react";
+import { useUserSuppliers } from "@sahil/lib/hooks/useUserOrganizations";
+
+import * as React from "react"
+
+import { CollectionControls } from "@sahil/features/Shared/CollectionControls";
+import { TopClientsByRevenue } from "@sahil/features/Reports/TopClientsByRevenue";
+import { RevenueByProduct } from "@sahil/features/Reports/RevenueByProduct";
+import { OrderStatusDistribution } from "@sahil/features/Reports/OrderStatusDistribution";
+
+
+const orders = [
+ {
+ "business": {
+ "id": "e87924e8-69e4-4171-bd89-0c8963e03d08",
+ "name": "Radisson Blu",
+ "contactName": "Emmanuel Gatwech",
+ "business_type": {
+ "type": "hotel"
+ },
+ "type": "hotel"
+ },
+ "id": "d634372a-6a81-402e-9fa5-231bf7c0444c",
+ "fulfillment_type": null,
+ "order_items": [
+ {
+ "price": 15,
+ "product": {
+ "name": "Routers",
+ "price": 10000,
+ "quantity": 20,
+ "discount": 0
+ }
+ },
+ {
+ "price": 15,
+ "product": {
+ "name": "Laptops",
+ "price": 1000000,
+ "quantity": 6,
+ "discount": 15
+ }
+ },
+ {
+ "price": 15,
+ "product": {
+ "name": "iPhone 11 Pro Max",
+ "price": 10000000,
+ "quantity": 3,
+ "discount": 1
+ }
+ }
+ ],
+ "status": "PENDING",
+ "origin": "Souq Munuki",
+ "created_at": "2024-09-14T13:42:07.748051+00:00",
+ "destination": "Souq Custom"
+ },
+ {
+ "business": {
+ "id": "e87924e8-69e4-4171-bd89-0c8963e03d08",
+ "name": "Radisson Blu",
+ "contactName": "Emmanuel Gatwech",
+ "business_type": {
+ "type": "hotel"
+ },
+ "type": "hotel"
+ },
+ "id": "c3ce2967-53fc-4fc6-922b-350adf4c773c",
+ "fulfillment_type": null,
+ "order_items": [
+ {
+ "price": 15,
+ "product": {
+ "name": "1kg Sugar",
+ "price": 2500,
+ "quantity": 250,
+ "discount": null
+ }
+ },
+ {
+ "price": 15,
+ "product": {
+ "name": "1kg Brazillian Chicken",
+ "price": 300,
+ "quantity": 25,
+ "discount": null
+ }
+ },
+ {
+ "price": 15,
+ "product": {
+ "name": "1kg Powder Milk",
+ "price": 2500,
+ "quantity": 10,
+ "discount": null
+ }
+ }
+ ],
+ "status": "PENDING",
+ "origin": "Souq Munuki",
+ "created_at": "2024-09-16T18:21:09.961872+00:00",
+ "destination": "Souq Custom"
+ },
+ {
+ "business": {
+ "id": "e87924e8-69e4-4171-bd89-0c8963e03d08",
+ "name": "Radisson Blu",
+ "contactName": "Emmanuel Gatwech",
+ "business_type": {
+ "type": "hotel"
+ },
+ "type": "hotel"
+ },
+ "id": "99738f85-6c6a-4c79-896d-bea5220108ef",
+ "fulfillment_type": null,
+ "order_items": [
+ {
+ "price": 15,
+ "product": {
+ "name": "Solar Batteries",
+ "price": 350000,
+ "quantity": 10,
+ "discount": null
+ }
+ },
+ {
+ "price": 15,
+ "product": {
+ "name": "250w Solar Panel",
+ "price": 300000,
+ "quantity": 20,
+ "discount": null
+ }
+ }
+ ],
+ "status": "PENDING",
+ "origin": "Souq Munuki",
+ "created_at": "2024-09-17T14:41:35.21956+00:00",
+ "destination": "Souq Custom"
+ }
+];
+
+
+
+
+export default function Reports() {
+ const { data: sessionData } = useSession();
+ const { data: currentUser, loading: userLoading } = useGetUserById(sessionData?.user?.id);
+
+ const supplierOrders = useFetchSupplierOrders();
+ console.log(supplierOrders);
+
+ return (
+
+ );
+}
diff --git a/apps/client/src/pages/settings/billing.tsx b/apps/client/src/pages/settings/billing.tsx
new file mode 100644
index 00000000..0e721625
--- /dev/null
+++ b/apps/client/src/pages/settings/billing.tsx
@@ -0,0 +1,27 @@
+import { ReactNode } from "react";
+import {
+ SettingsSection,
+ Sidebar,
+ settingslinks,
+ SettingsContainer
+} from "ui";
+import { BillingCard } from "@sahil/features/Settings/BillingCard";
+
+type SidebarProps = {
+ children: ReactNode;
+};
+
+export default function BillingSettings({ children, ...props }: SidebarProps) {
+ return (
+
+
+
+
+
+
+
+
+ );
+}
diff --git a/apps/client/src/pages/settings/general.tsx b/apps/client/src/pages/settings/general.tsx
new file mode 100644
index 00000000..a485c198
--- /dev/null
+++ b/apps/client/src/pages/settings/general.tsx
@@ -0,0 +1,27 @@
+import { ReactNode } from "react";
+import {
+ SettingsSection,
+ Sidebar,
+ settingslinks,
+ SettingsContainer
+} from "ui";
+import { GeneralCard } from "@sahil/features/Settings/GeneralCard";
+
+type SidebarProps = {
+ children: ReactNode;
+};
+
+export default function GeneralSettings({ children, ...props }: SidebarProps) {
+ return (
+
+
+
+
+
+
+
+
+ );
+}
diff --git a/apps/client/src/pages/settings/notifications.tsx b/apps/client/src/pages/settings/notifications.tsx
new file mode 100644
index 00000000..df7de6c4
--- /dev/null
+++ b/apps/client/src/pages/settings/notifications.tsx
@@ -0,0 +1,27 @@
+import { ReactNode } from "react";
+import {
+ SettingsSection,
+ Sidebar,
+ settingslinks,
+ SettingsContainer
+} from "ui";
+import { NotificationsCard } from "@sahil/features/Settings/NotificationsCard";
+
+type SidebarProps = {
+ children: ReactNode;
+};
+
+export default function NotificationsSettings({ children, ...props }: SidebarProps) {
+ return (
+
+
+
+
+
+
+
+
+ );
+}
diff --git a/apps/client/src/pages/settings/profile.tsx b/apps/client/src/pages/settings/profile.tsx
new file mode 100644
index 00000000..cf5724eb
--- /dev/null
+++ b/apps/client/src/pages/settings/profile.tsx
@@ -0,0 +1,33 @@
+import { ReactNode } from "react";
+import {
+ SettingsSection,
+ Sidebar,
+ settingslinks,
+ SettingsContainer
+} from "ui";
+import { ProfileCard } from "@sahil/features/Settings/ProfileCard";
+import { DeleteAccountCard } from "@sahil/features/Settings/DeleteAccountCard";
+
+type SidebarProps = {
+ children: ReactNode;
+};
+
+export default function ProfileSettings({ children, ...props }: SidebarProps) {
+
+ return (
+
+
+
+
+ );
+}
diff --git a/apps/client/src/pages/settings/security.tsx b/apps/client/src/pages/settings/security.tsx
new file mode 100644
index 00000000..51e41c79
--- /dev/null
+++ b/apps/client/src/pages/settings/security.tsx
@@ -0,0 +1,27 @@
+import { ReactNode } from "react";
+import {
+ SettingsSection,
+ Sidebar,
+ settingslinks,
+ SettingsContainer
+} from "ui";
+import { SecurityCard } from "@sahil/features/Settings/SecurityCard";
+
+type SidebarProps = {
+ children: ReactNode;
+};
+
+export default function SecuritySettings({ children, ...props }: SidebarProps) {
+ return (
+
+
+
+
+
+
+
+
+ );
+}
diff --git a/apps/client/src/pages/suppliers/[supplierId].tsx b/apps/client/src/pages/suppliers/[supplierId].tsx
new file mode 100644
index 00000000..f8f18c88
--- /dev/null
+++ b/apps/client/src/pages/suppliers/[supplierId].tsx
@@ -0,0 +1,34 @@
+import { useRouter } from "next/router";
+import { useFetchSupplierByPK } from "@sahil/lib/hooks/suppliers";
+import {
+ SupplierOrderHistory,
+ SupplierProducts,
+ ServiceZones,
+ SupplierProfileOverview,
+} from "@sahil/features/Suppliers";
+import { Suppliers } from "@sahil/lib/graphql/__generated__/graphql";
+
+export default function SupplierPage() {
+ const router = useRouter();
+ const { supplierId } = router.query;
+ const { data: supplier, error, loading } = useFetchSupplierByPK();
+ if (error) {
+ return
Failed
;
+ }
+ return (
+
+ );
+}
diff --git a/apps/client/src/pages/suppliers/index.tsx b/apps/client/src/pages/suppliers/index.tsx
new file mode 100644
index 00000000..2fdb1910
--- /dev/null
+++ b/apps/client/src/pages/suppliers/index.tsx
@@ -0,0 +1,24 @@
+import { ListSuppliers } from "@sahil/features/Suppliers";
+import FilterSuppliersModal from "@sahil/features/Suppliers/FilterSuppliersModal";
+import { HiPlus } from "react-icons/hi2";
+import { SectionHeader } from "ui";
+import { CollectionControls } from "@sahil/features/Shared/CollectionControls";
+import { useUser } from "@sahil/features/auth/UserContext";
+const actions = [
+ {
+ label: "Register Supplier",
+ icon:
,
+ href: "/suppliers/register/business_info",
+ primary: true,
+ },
+];
+
+export default function Suppliers() {
+ const { currentUser } = useUser();
+ return (
+
+
+
+
+ );
+}
diff --git a/apps/client/src/pages/suppliers/products/index.tsx b/apps/client/src/pages/suppliers/products/index.tsx
new file mode 100644
index 00000000..5af43bb0
--- /dev/null
+++ b/apps/client/src/pages/suppliers/products/index.tsx
@@ -0,0 +1,20 @@
+import { ProductsCatalogue } from "@sahil/features/Products/ProductsCatalogue";
+
+export default function SupplierProductsPage() {
+ return (
+
+
+
+
+
Supplier Page
+
+ Users can register through agents, an app, or USSD codes and set
+ delivery preferences.
+
+
+
+
+
+ );
+}
diff --git a/apps/courier/package.json b/apps/courier/package.json
index 36b533f8..76d0f89e 100644
--- a/apps/courier/package.json
+++ b/apps/courier/package.json
@@ -12,7 +12,7 @@
"@apollo/react-hooks": "^4.0.0",
"@formkit/auto-animate": "^0.7.0",
"@hookform/resolvers": "^3.3.0",
- "@react-google-maps/api": "^2.19.2",
+ "@react-google-maps/api": "^2.20.3",
"@sahil/configs": "*",
"@sahil/features": "*",
"@sahil/lib": "*",
diff --git a/apps/courier/src/Layout/layout.tsx b/apps/courier/src/Layout/layout.tsx
index d1c155fa..9aa7fda8 100644
--- a/apps/courier/src/Layout/layout.tsx
+++ b/apps/courier/src/Layout/layout.tsx
@@ -1,12 +1,28 @@
-import React, { ReactNode } from "react";
+import React, { ReactNode, useEffect } from "react";
import logo from "../../public/logo-alt.svg";
import { useRouter } from "next/router";
import { signOut, useSession } from "next-auth/react";
-import { Navbar } from "ui";
+import { ContentLayout, Navbar } from "ui";
+import NProgress from "nprogress";
+import "nprogress/nprogress.css";
+import { UserProvider } from '@sahil/features/auth/UserContext';
+import { useGetUserById } from "@sahil/lib/hooks/users";
+import { SplashScreen } from "ui";
+
+import {
+ HiOutlineTruck,
+ HiOutlineQueueList,
+ HiOutlineUser,
+ HiOutlineBell,
+ HiOutlineMapPin,
+ HiOutlineHome
+} from "react-icons/hi2";
+
+import { Button } from "ui";
+
type LayoutProps = {
children: ReactNode;
};
-import { HiOutlineQueueList, HiOutlineTruck } from "react-icons/hi2";
const links = [
{
@@ -21,26 +37,99 @@ const links = [
},
];
+const bottomLinks = [
+ {
+ icon: HiOutlineHome,
+ name: 'Home',
+ href: '/'
+ },
+ {
+ icon: HiOutlineMapPin,
+ name: 'Deliveries',
+ href: '/deliveries'
+ },
+ {
+ href: "/requests",
+ name: "Requests",
+ icon: HiOutlineBell,
+ },
+ {
+ icon: HiOutlineUser,
+ name: 'Profile',
+ href: '/profile'
+ }
+]
+
export default function Layout({ children, ...props }: LayoutProps) {
const router = useRouter();
const { data: session } = useSession();
+ const isAuthRoute = router.pathname.startsWith('/auth');
+
+ const { data: currentUser, loading: userLoading } = useGetUserById(session?.user?.id);
+ useEffect(() => {
+ NProgress.configure({
+ showSpinner: false,
+ trickleSpeed: 200,
+ minimum: 0.08
+ });
+
+ const handleStart = () => {
+ NProgress.start();
+ };
+
+ const handleStop = () => {
+ NProgress.done();
+ };
+
+ router.events.on('routeChangeStart', handleStart);
+ router.events.on('routeChangeComplete', handleStop);
+ router.events.on('routeChangeError', handleStop);
+
+ return () => {
+ router.events.off('routeChangeStart', handleStart);
+ router.events.off('routeChangeComplete', handleStop);
+ router.events.off('routeChangeError', handleStop);
+ };
+ }, [router]);
const onSignOut = async () => {
await signOut();
router.push("/auth/signin");
};
+
+ const handleBack = () => {
+ router.back();
+ };
+
+ const handleRefresh = () => {
+ router.replace(router.asPath);
+ };
+
+
+ if (!session && !isAuthRoute) {
+ return
;
+ }
return (
- <>
- {session?.user && (
-
- )}
-
{children}
-
+
+
+
+ {children}
+
+
);
}
diff --git a/apps/courier/src/pages/deliveries/[deliveryId].tsx b/apps/courier/src/pages/deliveries/[deliveryId].tsx
index f8ddc8c9..f230fa92 100644
--- a/apps/courier/src/pages/deliveries/[deliveryId].tsx
+++ b/apps/courier/src/pages/deliveries/[deliveryId].tsx
@@ -1,84 +1,10 @@
import { useRouter } from "next/router";
import { useFetchDeliveryByPK } from "@sahil/lib/hooks/deliveries";
-import { Card } from "ui";
-import { OrderItem } from "@sahil/features/Orders/OrderItems";
-import { OrderInfoItem } from "@sahil/features/Orders/OrderDetails";
-import { formatDateTime } from "@sahil/lib/dates";
-import {
- HiCalendarDays,
- HiOutlineBanknotes,
- HiOutlineBriefcase,
- HiOutlineMap,
- HiOutlineMapPin,
- HiOutlineCheck,
- HiOutlineTruck,
-} from "react-icons/hi2";
+import { DeliveryDetails } from "@sahil/features/Deliveries/DeliveryDetails";
-const DeliveryOrders = ({ order, deliveryStatus, onUpdateStatus }) => {
- console.log(order);
- return (
-
- {order?.order_items.map((order) => (
-
- Order Details
- Delivery Order ID: {order.id}
- {order?.order_items && order?.order_items?.length > 0 ? (
-
- {order.order_items.map((item, index) => (
-
- ))}
-
- ) : (
- No items found for this order.
- )}
-
-
- ))}
-
- );
-};
-
-const DeliveryActions = ({ orderId, deliveryStatus, onUpdateStatus }) => {
- return (
-
-
-
-
-
- );
-};
-
-// Stub for useUpdateDeliveryStatus hook
const useUpdateDeliveryStatus = () => {
const updateDeliveryStatus = async (orderId: string, newStatus: string) => {
console.log(`Updating order ${orderId} to status ${newStatus}`);
- // Implement actual update logic here when the hook is ready
};
return { updateDeliveryStatus };
@@ -98,25 +24,7 @@ export default function DeliveryPage() {
if (loading) return
Loading delivery information...
;
if (!delivery) return
No delivery found
;
- const deliveryInfoItems = [
- {
- icon:
,
- label: "Payment Method",
- value: "N/A",
- },
- {
- icon:
,
- label: "Client",
- value: "N/A",
- },
- {
- icon:
,
- label: "Status",
- value: "N/A",
- },
- ];
-
- const handleUpdateStatus = async (orderId, newStatus) => {
+ const handleUpdateStatus = async (orderId: string, newStatus: string) => {
try {
await updateDeliveryStatus(orderId, newStatus);
// Optionally, you can refetch the delivery data here to update the UI
@@ -125,49 +33,50 @@ export default function DeliveryPage() {
}
};
- console.log(delivery[0]?.order);
+ // Dummy data for demonstration
+ const dummyDeliveryData = {
+ id: delivery[0]?.id || "D123",
+ status: "pending" as const, // Type assertion to fix status type
+ client: {
+ name: "John Doe",
+ address: "123 Main St, City, Country",
+ phone: "+1 234 567 890"
+ },
+ items: [
+ { name: "Product 1", quantity: 2, price: 29.99 },
+ { name: "Product 2", quantity: 1, price: 49.99 }
+ ],
+ payment: {
+ method: "Credit Card",
+ total: 109.97,
+ commission: 10.99
+ },
+ timing: {
+ startTime: "2024-03-15 14:30",
+ duration: "45 mins"
+ },
+ distance: "3.2 km"
+ };
return (
-
-
-
-
- {deliveryInfoItems.map((item, index) => (
-
- ))}
-
-
-
-
-
- {/* {
-
- delivery.status === 'pending' && (
-
- )} */}
+
+
+ {dummyDeliveryData.status === 'pending' && (
+
+
+
-
-
+ )}
);
}
diff --git a/apps/courier/src/pages/deliveries/index.tsx b/apps/courier/src/pages/deliveries/index.tsx
index a51f4733..2d6f52ce 100644
--- a/apps/courier/src/pages/deliveries/index.tsx
+++ b/apps/courier/src/pages/deliveries/index.tsx
@@ -1,7 +1,24 @@
import { ListDeliveries } from "@sahil/features/Deliveries/ListDeliveries";
+import { Button, IconButton } from "ui";
+import { HiOutlineArrowRight, HiOutlineArrowLeft } from "react-icons/hi2";
+
+
export default function Deliveries() {
return (
-
+
+
+
+
+
+
+
Hello, James
+
+ Here are your delivery requests
+
+
diff --git a/apps/courier/src/pages/requests/index.tsx b/apps/courier/src/pages/requests/index.tsx
index a5af0a62..1a2a1f0c 100644
--- a/apps/courier/src/pages/requests/index.tsx
+++ b/apps/courier/src/pages/requests/index.tsx
@@ -1,8 +1,24 @@
import { ListDeliveryRequests } from "@sahil/features/Deliveries/ListDeliveryRequests";
+import { Button } from "ui";
+import { HiOutlineArrowRight } from "react-icons/hi2";
export default function Requests() {
return (
-
+
+
+
+
Hello, James
+
+ Here are your delivery requests
+
+
+
+
+
+
+
+
+ We are a groundbreaking supply chain management platform that empowers small and medium-sized enterprises
+ (SMEs) in challenging business environments.
+ {''}
+
+ Our platform is committed to providing a seamless
+ experience for all our users, ensuring they can focus on what matters most - growing their
+ business.
+
+
+
+
+ 1 KN 78 St, Kigali - Rwanda
+
+ ),
+ colorScheme: "gray"
+ },
+ {
+ icon: HiPhone,
+ title: "Book a Call",
+ content: "+250-790-336-525",
+ linkHref: "tel:+250790336525",
+ colorScheme: "slate"
+ }
+];
+
export default function ContactPage() {
return (
<>
-
+
+
+
+
+ Reach Us
+
+
+ If you have any questions or need assistance, feel free to reach out to us through our contact details below.
+
+
+ {contactDetails.map((contact, index) => (
+
+ ))}
+
+
+
+
+
+
Last Updated Date: November 21, 2024
+
+ At Sahil, we are committed to protecting your privacy and ensuring that your personal information is handled with care.
+ Our platform connects businesses, suppliers, and couriers to create a seamless and efficient supply chain solution.
+
+
+ We are dedicated to maintaining transparency and providing you with control over your data. If you have any questions or
+ concerns, feel free to reach out to us at sahil.business@gmail.com
+
+
+
+
+
What Information Do We Collect?
+
A. Information You Provide Directly
+
+ • Personal Information: Name, email address, phone number, and business details such as business name and address.
+ • Profile Information: Preferences, feedback, and details you include when setting up your account.
+ • Communication Details: Information you provide through customer support, surveys, or platform feedback.
+
+
B. Information from Third Parties
+
+ • Partners: Suppliers, couriers, or third-party services integrated with Sahil.
+ • Analytics Providers: Tools like Google Analytics to monitor platform performance.
+
+
+
+
+
How We Use Your Information?
+
+ • To Communicate with You: Send updates, respond to inquiries, and provide customer support.
+ • To Enhance User Experience: Analyze platform usage to improve functionality, features, and overall performance.
+ • To Ensure Security: Detect and prevent fraudulent activity or unauthorized access to our platform.
+
+
+
+
What Are Your Privacy Rights?
+
A. Access and Update Your Data
+
+ • You can review and update your account details anytime by logging into the platform or contacting customer support.
+
+
B. Opt-Out of Communications
+
+ • Marketing Emails: Unsubscribe using the link at the bottom of promotional emails.
+ • Cookies and Tracking: Adjust your browser settings to block cookies or use our cookie management tool.
+
+
C. Lodge a Complaint
+
+ • If you believe your rights have been violated, you can file a complaint with your local data protection authority.
+
+
+
+
+
How Do We Keep Your Information Safe?
+
A. Encryption
+
+ • All sensitive data is encrypted during storage and transmission using industry-standard encryption protocols.
+
+
B. Secure Access Controls
+
+ • Access to your information is limited to authorized personnel and protected by multi-factor authentication.
+
+
C. Fraud Prevention Tools
+
+ • Real-time monitoring systems detect and block suspicious activities, such as unauthorized login attempts or fraudulent transactions.
+
+
C. Data Backup and Recovery
+
+ • Automated backups ensure that your information is not lost in case of system failures, and recovery procedures are in place to restore functionality quickly.
+
+
+
+
+ "Despite these efforts, no online platform is 100% secure. We encourage you to take precautions, such as using strong passwords and avoiding sharing sensitive information over insecure channels."
+
+
+