merge conflicts resolved.

This commit is contained in:
Kartik Datrika
2026-03-25 12:15:37 +05:30
parent dc59189cc6
commit 698bdf488a
65 changed files with 458 additions and 179 deletions

View File

@@ -1,5 +1,4 @@
import type { ReactNode } from "react";
import { createContext, useCallback, useContext, useEffect, useState } from "react";
import { type ReactNode, createContext, useCallback, useContext, useEffect, useState } from "react";
import { apiClient } from "@/lib/api-client";
import { ADS_QUERY, CALLS_QUERY, CAMPAIGNS_QUERY, FOLLOW_UPS_QUERY, LEADS_QUERY, LEAD_ACTIVITIES_QUERY, PATIENTS_QUERY } from "@/lib/queries";
import {

View File

@@ -1,7 +1,6 @@
import { type PropsWithChildren } from "react";
import { RouterProvider } from "react-aria-components";
import { useNavigate } from "react-router";
import type { NavigateOptions } from "react-router";
import { type NavigateOptions, useNavigate } from "react-router";
declare module "react-aria-components" {
interface RouterConfig {

View File

@@ -1,5 +1,4 @@
import type { ReactNode } from "react";
import { createContext, useContext, useEffect, useState } from "react";
import { type ReactNode, createContext, useContext, useEffect, useState } from "react";
type Theme = "light" | "dark" | "system";