Merge pull request #44 from prateek-pareek/develop-prateek-pareek

Develop prateek pareek
Mi-Tech-Consulting · Jul 6, 2024 · 22c261a · 22c261a
2 parents 8c12ecb + 59f8f30
commit 22c261a
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 247 deletions.
diff --git a/app/(root)/campaigns/[id]/page.tsx b/app/(root)/campaigns/[id]/page.tsx
diff --git a/app/(root)/campaigns/create/page.tsx b/app/(root)/campaigns/create/page.tsx
@@ -1,16 +1,9 @@
-'use client'
-import CampaignForm from '@/components/ui/create-campaign-form';
-import { fetchChannels } from '@/lib/api';
-import { useEffect, useState } from 'react';
-
+"use client";
+
+import React from "react";
+import CampaignForm from "@/components/ui/campaigns/create"
 export default function Page() {
-  const [channels, setChannels] = useState<any[]>([]);
-  useEffect(() => {
-    fetchChannels().then(data => setChannels(data.result));
-  }, []);
   return (
-    <main className='mx-auto'>
-      <CampaignForm />
-    </main>
+    <CampaignForm />
   );
-}
+};
diff --git a/app/(root)/campaigns/list/page.tsx b/app/(root)/campaigns/list/page.tsx
diff --git a/app/campaigns/page.tsx → app/(root)/campaigns/page.tsx b/app/campaigns/page.tsx → app/(root)/campaigns/page.tsx
@@ -1,13 +1,10 @@
 "use client";
 
 import React from "react";
-import Layout from "@/components/ui/layout/index";
 import Campaigns from "@/components/ui/campaigns/campaigns";
 
 export default function Page() {
   return (
-        <Layout>
-          <Campaigns />
-        </Layout>
+    <Campaigns />
   );
 };
diff --git a/app/(root)/campaigns/update/[id]/page.tsx b/app/(root)/campaigns/update/[id]/page.tsx
diff --git a/app/dashboard/page.tsx → app/(root)/dashboard/page.tsx b/app/dashboard/page.tsx → app/(root)/dashboard/page.tsx
@@ -6,9 +6,7 @@ import Dashboard from "@/components/ui/dashboard/dashboard";
 
 export default function Page() {
   return (
-        <Layout>
-          <Dashboard />
-        </Layout>
+    <Dashboard />
   );
 };
 
diff --git a/app/reports/automation/page.tsx → app/(root)/reports/automation/page.tsx b/app/reports/automation/page.tsx → app/(root)/reports/automation/page.tsx
@@ -5,9 +5,7 @@ import Layout from "@/components/ui/layout/index";
 
 const Page: React.FC<any> = () => {
   return (
-    <Layout>
       <ScheduleAutomationPage />
-    </Layout>
   );
 };
 

diff --git a/app/reports/import/page.tsx → app/(root)/reports/import/page.tsx b/app/reports/import/page.tsx → app/(root)/reports/import/page.tsx
@@ -6,12 +6,10 @@ import ImportPage from "@/components/ui/report/import/import";
 
 const Page: React.FC<any> = () => {
   return (
-        <Layout>
-          <ImportPage/>
-        </Layout>
+    <ImportPage />
   );
 };
 
 
- 
+
 export default Page
diff --git a/app/reports/page.tsx → app/(root)/reports/page.tsx b/app/reports/page.tsx → app/(root)/reports/page.tsx
@@ -1,17 +1,14 @@
 "use client";
 
 import React from "react";
-import Layout from "@/components/ui/layout/index";
 import Report from "@/components/ui/report/report";
 
 const Page: React.FC<any> = () => {
   return (
-        <Layout>
-          <Report/>
-        </Layout>
+    <Report />
   );
 };
 
 
- 
+
 export default Page
diff --git a/app/campaigns/create_campaigns/page.tsx b/app/campaigns/create_campaigns/page.tsx
diff --git a/app/reports/layout.tsx b/app/reports/layout.tsx
diff --git a/components/ui/dashboard/dashboard.tsx b/components/ui/dashboard/dashboard.tsx
@@ -12,7 +12,6 @@ const Dashboard = () => {
     const [startDate, setStartDate] = useState(new Date('2023-01-01').getTime());
     const [endDate, setEndDate] = useState(new Date('2023-12-31').getTime());
     const [filteredData, setFilteredData] = useState([]);
-
     const handleChange = (event: React.ChangeEvent<HTMLInputElement>, isStart: boolean) => {
         const newValue = +event;
         if (isStart) {
@@ -23,7 +22,6 @@ const Dashboard = () => {
         filterData(newValue)
     };
 
-
     const formatDate = (timestamp: number) => {
         return format(new Date(timestamp), 'MM/dd/yyyy');
     };