-
-
+
- Overview
- Analytics
+ {projects.map((project) => (
+ {project.project_name}
+ ))}
-
+
-
- Total Funds Raised
-
+ Total Funds Raised
-
-
- Profile Views
-
+ Profile Views
diff --git a/src/app/loading.tsx b/src/app/loading.tsx
index 97af30b..c38f7da 100644
--- a/src/app/loading.tsx
+++ b/src/app/loading.tsx
@@ -1,22 +1,4 @@
+import { Loader } from "@/components/loading/loader";
export default function Loading() {
- return (
- Follow Us
-
-
+
+
+
diff --git a/src/app/portfolio/[uid]/page.tsx b/src/app/portfolio/[uid]/page.tsx
new file mode 100644
index 0000000..d9a7ff9
--- /dev/null
+++ b/src/app/portfolio/[uid]/page.tsx
@@ -0,0 +1,245 @@
+import { Overview } from "@/components/ui/overview";
+import { createSupabaseClient } from "@/lib/supabase/serverComponentClient";
+import { getInvestorDeal } from "@/lib/data/investmentQuery";
+import PieChart from "@/components/pieChart";
+import {
+ overAllGraphData,
+ fourYearGraphData,
+ dayOftheWeekData,
+ getInvestorProjectTag,
+ countTags,
+ getBusinessTypeName,
+ countValues,
+ checkForInvest,
+ getLatestInvestment,
+ getTotalInvestment,
+} from "./query";
+import CountUpComponent from "@/components/countUp";
+import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
+import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip";
+import { RecentFunds } from "@/components/recent-funds";
+import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
+import QuestionMarkIcon from "@/components/icon/questionMark";
+import { NoDataAlert } from "@/components/alert/noData/alert";
+import { error } from "console";
+import { UnAuthorizedAlert } from "@/components/alert/unauthorized/alert";
+
+export default async function Portfolio({ params }: { params: { uid: string } }) {
+ const supabase = createSupabaseClient();
+ // if user hasn't invest in anything
+ const hasInvestments = await checkForInvest(supabase, params.uid);
+ if (!hasInvestments) {
+ return (
+
-
-
- {/* end of pack */}
- {projectData?.project_name}
- -{projectData?.project_short_description}
-
- {projectData?.tags.map((tag, index) => (
-
- {tag.tag_name}
-
- ))}
-
+ {/* Name, star and share button packed */}
+
+
+
+
+
+ {/* end of pack */}
+ {projectData?.project_name}
+ +{projectData?.project_short_description}
+
+ {projectData?.tags.map((tag, index) => (
+
+ {tag.tag_name}
+
+ ))}
+
+
+ {/* image carousel */}
+
);
}
diff --git a/src/app/dashboard/hook.ts b/src/app/dashboard/hook.ts
index 676d249..0b2cdb8 100644
--- a/src/app/dashboard/hook.ts
+++ b/src/app/dashboard/hook.ts
@@ -10,7 +10,7 @@ export function useDealList() {
const fetchDealList = async () => {
// set the state to the deal list of current business user
setDealList(await getDealList(await getCurrentUserID()));
- }
+ };
useEffect(() => {
fetchDealList();
@@ -28,7 +28,7 @@ export function useGraphData() {
if (dealList) {
setGraphData(convertToGraphData(dealList));
}
- }
+ };
useEffect(() => {
fetchGraphData();
@@ -43,11 +43,11 @@ export function useRecentDealData() {
const fetchRecentDealData = async () => {
// set the state to the deal list of current business user
setRecentDealData(await getRecentDealData(await getCurrentUserID()));
- }
+ };
useEffect(() => {
fetchRecentDealData();
}, []);
return recentDealData;
-}
\ No newline at end of file
+}
diff --git a/src/app/dashboard/page.tsx b/src/app/dashboard/page.tsx
index 68a471b..2224f29 100644
--- a/src/app/dashboard/page.tsx
+++ b/src/app/dashboard/page.tsx
@@ -1,29 +1,101 @@
"use client";
import Image from "next/image";
-import {
- Card,
- CardContent,
- CardDescription,
- CardHeader,
- CardTitle,
-} from "@/components/ui/card";
+import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card";
import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
import { Overview } from "@/components/ui/overview";
import { RecentFunds } from "@/components/recent-funds";
-import { useState } from "react";
+import { useEffect, useState } from "react";
+import { useDealList } from "./hook";
+import { createSupabaseClient } from "@/lib/supabase/clientComponentClient";
+import useSession from "@/lib/supabase/useSession";
+import { getProjectByUserId } from "@/lib/data/projectQuery";
+import { Loader } from "@/components/loading/loader";
-import { useDealList, useGraphData, useRecentDealData } from "./hook";
-import { sumByKey } from "@/lib/utils";
+const data = [
+ {
+ name: "Jan",
+ value: Math.floor(Math.random() * 5000) + 1000,
+ },
+ {
+ name: "Feb",
+ value: Math.floor(Math.random() * 5000) + 1000,
+ },
+ {
+ name: "Mar",
+ value: Math.floor(Math.random() * 5000) + 1000,
+ },
+ {
+ name: "Apr",
+ value: Math.floor(Math.random() * 5000) + 1000,
+ },
+ {
+ name: "May",
+ value: Math.floor(Math.random() * 5000) + 1000,
+ },
+ {
+ name: "Jun",
+ value: Math.floor(Math.random() * 5000) + 1000,
+ },
+ {
+ name: "Jul",
+ value: Math.floor(Math.random() * 5000) + 1000,
+ },
+ {
+ name: "Aug",
+ value: Math.floor(Math.random() * 5000) + 1000,
+ },
+ {
+ name: "Sep",
+ value: Math.floor(Math.random() * 5000) + 1000,
+ },
+ {
+ name: "Oct",
+ value: Math.floor(Math.random() * 5000) + 1000,
+ },
+ {
+ name: "Nov",
+ value: Math.floor(Math.random() * 5000) + 1000,
+ },
+ {
+ name: "Dec",
+ value: Math.floor(Math.random() * 5000) + 1000,
+ },
+];
export default function Dashboard() {
+ let supabase = createSupabaseClient();
+ const userId = useSession().session?.user.id;
+ const [projects, setProjects] = useState<
+ { id: number; project_name: string; business_id: { user_id: number }[]; dataroom_id: number }[]
+ >([]);
+ const [isSuccess, setIsSuccess] = useState(false);
const [graphType, setGraphType] = useState("line");
- const graphData = useGraphData();
+ const [currentTab, setCurrentTab] = useState();
const dealList = useDealList();
- // #TODO dependency injection refactor + define default value inside function (and not here)
- const recentDealData = useRecentDealData() || [];
+ const totalDealAmount = dealList?.reduce((sum, deal) => sum + deal.deal_amount, 0) || 0;
+ useEffect(() => {
+ const fetchProjects = async () => {
+ if (userId) {
+ const { data, error } = await getProjectByUserId(supabase, userId);
+ // alert(JSON.stringify(data));
+ if (error) {
+ console.error("Error while fetching projects");
+ }
+ if (data) {
+ setProjects(data);
+ // console.table(data);
+ }
+ } else {
+ console.error("Error with UserId while fetching projects");
+ }
+ setIsSuccess(true);
+ };
+ fetchProjects();
+ }, [supabase, userId]);
return (
<>
+
+ {/* first carousel */}
+
+
+ {carouselData.map((item, index) => (
+
+
+ ))}
+
+
+ {/* second carousel */}
+
+
+ {carouselData.map((item, index) => (
+
+
+ ))}
+
+
-
- {/* image carousel */}
- {
// Create a sorted graph data object
const sortedGraphData: Record = {};
- sortedKeys.forEach((key) => {sortedGraphData[key] = graphData[key]});
+ sortedKeys.forEach((key) => {
+ sortedGraphData[key] = graphData[key];
+ });
return sortedGraphData;
}
diff --git a/src/app/business/apply/page.tsx b/src/app/business/apply/page.tsx
index e61a801..b425e16 100644
--- a/src/app/business/apply/page.tsx
+++ b/src/app/business/apply/page.tsx
@@ -15,7 +15,6 @@ const BUCKET_PITCH_NAME = "business-application";
let supabase = createSupabaseClient();
export default function ApplyBusiness() {
- const [applyProject, setApplyProject] = useState(false);
const alertShownRef = useRef(false);
const [success, setSucess] = useState(false);
@@ -49,7 +48,7 @@ export default function ApplyBusiness() {
}
}
- const { error } = await supabase
+ const { data, error } = await supabase
.from("business_application")
.insert([
{
@@ -67,28 +66,29 @@ export default function ApplyBusiness() {
])
.select();
setSucess(true);
-
+ // console.table(data);
Swal.fire({
icon: error == null ? "success" : "error",
title: error == null ? "success" : "Error: " + error.code,
text: error == null ? "Your application has been submitted" : error.message,
confirmButtonColor: error == null ? "green" : "red",
- }).then((result) => {
- if (result.isConfirmed && applyProject) {
- window.location.href = "/project/apply";
- } else {
- window.location.href = "/";
- }
+ }).then(() => {
+ window.location.href = "/";
});
};
const hasUserApplied = async (userID: string) => {
let { data: business, error } = await supabase.from("business").select("*").eq("user_id", userID);
- console.table(business);
- if (error) {
+ let { data: businessApplication, error: applicationError } = await supabase
+ .from("business_application")
+ .select("*")
+ .eq("user_id", userID);
+ // console.table(business);
+ if (error || applicationError) {
console.error(error);
+ console.error(applicationError);
}
- if (business) {
+ if ((business && business.length != 0) || (businessApplication && businessApplication.length != 0)) {
return true;
}
return false;
@@ -165,7 +165,7 @@ export default function ApplyBusiness() {
{/* form */}
{/*
-
-
- {carouselData.map((item, index) => (
-
-
- ))}
-
-
-
-
- {carouselData.map((item, index) => (
-
-
- ))}
-
-
-
-
-
diff --git a/src/app/about/page.tsx b/src/app/about/page.tsx
new file mode 100644
index 0000000..2612166
--- /dev/null
+++ b/src/app/about/page.tsx
@@ -0,0 +1,79 @@
+import Image from "next/image";
+
+export default function About() {
+ // Static data for the cards
+ const cardData = [
+ {
+ imageSrc: 'https://avatars.githubusercontent.com/u/86756025',
+ name: 'Pattadon Loyprasert',
+ description:
+ 'Driven by a passion for innovation, Pattadon leads B2D Ventures with the belief that' +
+ 'every great idea deserves the resources and support to thrive. He’s dedicated to' +
+ 'helping entrepreneurs turn visions into reality.',
+ },
+ {
+ imageSrc: 'https://avatars.githubusercontent.com/u/22256420',
+ name: 'Sirin Puenggun',
+ description:
+ 'Sirin brings a wealth of experience in empowering entrepreneurs, aiming to' +
+ 'create an ecosystem where bold ideas meet the right partners. He’s committed to' +
+ 'making a lasting impact on the entrepreneurial world.',
+ },
+ {
+ imageSrc: 'https://avatars.githubusercontent.com/u/108450436',
+ name: 'Naytitorn Chaovirachot',
+ description:
+ 'With a strong foundation in collaboration and trust, Naytitorn is focused' +
+ 'on building lasting partnerships that help drive the success of both investors and founders.' +
+ 'He thrives on turning challenges into growth opportunities.',
+ },
+ {
+ imageSrc: 'https://avatars.githubusercontent.com/u/114897362',
+ name: 'Nantawat Sukrisunt',
+ description:
+ 'Nantawat is a passionate advocate for innovation and teamwork.' +
+ 'He strives to foster a community where both investors and startups can achieve' +
+ 'their full potential, creating a future where collaboration leads to success.',
+ },
+ ];
+
+ return (
+
-
-
+ ${totalDealAmount}
-- {toPercentage(totalDealAmount, projectData?.target_investment)}% raised of $ - {projectData?.target_investment} max goal -
- - - --
{dealList.length}
- -Investors
- -{Math.floor(hourLeft)} hours
-Left to invest
- - ) : ( -No deadline
- )} - - -
+
+
+
${totalDealAmount}
++ {toPercentage(totalDealAmount, projectData?.target_investment)}% raised of $ + {projectData?.target_investment} max goal +
+ + + ++
{dealList.length}
+ +Investors
+ +{Math.floor(hourLeft)} hours
+Left to invest
+ + ) : ( +No deadline
+ )} + +
+
+ );
+}
\ No newline at end of file
diff --git a/src/app/api/dealApi.ts b/src/app/api/dealApi.ts
index 28204b5..0752168 100644
--- a/src/app/api/dealApi.ts
+++ b/src/app/api/dealApi.ts
@@ -35,7 +35,7 @@ export async function getDealList(userId: string | undefined) {
}
if (!dealData || !dealData.project.length) {
- alert("No project available");
+ // alert("No project available");
return []; // Exit if there's no data
}
@@ -70,7 +70,7 @@ export async function getRecentDealData(userId: string | undefined) {
console.error("User not found");
return; // Exit on error
}
-
+
const supabase = createSupabaseClient();
const dealList = await getDealList(userId);
@@ -111,7 +111,6 @@ export async function getRecentDealData(userId: string | undefined) {
return { ...item, ...recentUserData[index] };
});
-
return recentDealData;
}
@@ -133,6 +132,8 @@ export function convertToGraphData(deals: Deal[]): RecordAbout us
++ Welcome to B2D Ventures! We're a dynamic platform committed to bridging the gap + between visionary entrepreneurs and passionate investors. Our mission is to empower + innovation by connecting groundbreaking ideas with the resources they need to thrive. + Through B2D Ventures, we foster a community where investors and innovators come together + to transform concepts into impactful, real-world solutions. +
++ At B2D Ventures, we believe in the power of collaboration. Whether you're an investor + looking to support the next big idea or a founder aiming to bring your vision to life, + our platform offers the tools and connections to make it happen. + + Join us on a journey to reshape industries, drive positive change, and make a lasting impact. +
++ Let's build the future, together. +
+ +
+
+
+ {/* Card Section */}
+ Our Team
+
+ {cardData.map((card, index) => (
+
+
+
+ ))}
+
+
+ {card.name}
+{card.description}
+Business Dashboard
${sumByKey(dealList, "deal_amount")}
+ ${totalDealAmount}
{/* +20.1% from last month
*/} @@ -79,9 +150,7 @@ export default function Dashboard() {
-
- );
+ return
-
-
- Loading data...
-
+
+ );
+ }
+ const { data: deals, error: investorDealError } = await getInvestorDeal(supabase, params.uid);
+ if (investorDealError) {
+ console.error(investorDealError);
+ }
+ const { data: localUser, error: localUserError } = await supabase.auth.getUser();
+ if (localUserError) {
+ console.error("Error while fetching user" + error);
+ }
+ // block user from try to see other user portfolio
+ if (params.uid != localUser.user?.id) {
+ return (
+ <>
+
+ {/* {JSON.stringify(params.uid)} */}
+ {/* {JSON.stringify(tagCount)} */}
+ {/* {JSON.stringify(deals)} */}
+ {/* {JSON.stringify(dayOfWeekData)} */}
+ {/* {JSON.stringify(overAllGraphData)} */}
+ {/* {JSON.stringify(threeYearGraphData)} */}
+ {/* {JSON.stringify(uniqueProjectIds)} */}
+ {/*
+ );
+}
diff --git a/src/app/portfolio/[uid]/query.ts b/src/app/portfolio/[uid]/query.ts
new file mode 100644
index 0000000..151d0eb
--- /dev/null
+++ b/src/app/portfolio/[uid]/query.ts
@@ -0,0 +1,256 @@
+import { SupabaseClient } from "@supabase/supabase-js";
+import { getProjectTag, getTagName } from "@/lib/data/tagQuery";
+
+async function fetchLogoURL(supabase: SupabaseClient, projectId: number) {
+ const logoIndex = 1;
+ let { data: project_material, error } = await supabase
+ .from("project_material")
+ .select("material_url")
+ .eq("project_id", projectId)
+ .eq("material_type_id", logoIndex);
+ if (error) {
+ console.error("Error while fetching golo url" + error);
+ }
+ if (project_material && project_material.length > 0) {
+ return project_material[0].material_url;
+ }
+ return "";
+}
+
+function getTotalInvestment(deals: { deal_amount: number }[]) {
+ let total = 0;
+ for (let index = 0; index < deals.length; index++) {
+ total += deals[index].deal_amount;
+ }
+ return total;
+}
+async function getLatestInvestment(
+ supabase: SupabaseClient,
+ deals: { project_id: number; deal_amount: number; created_time: Date }[]
+) {
+ const llist = [];
+ const count = 8;
+
+ for (let i = deals.length - 1; i >= 0 && llist.length < count; --i) {
+ let { data: project, error } = await supabase.from("project").select("project_name").eq("id", deals[i].project_id);
+ if (error) {
+ console.error(error);
+ }
+ let url = fetchLogoURL(supabase, deals[i].project_id);
+ llist.push({
+ name: project?.[0]?.project_name,
+ amount: deals[i].deal_amount,
+ date: new Date(deals[i].created_time),
+ logo_url: url,
+ });
+ }
+
+ return llist;
+}
+
+async function checkForInvest(supabase: SupabaseClient, userId: string) {
+ let { count, error } = await supabase
+ .from("investment_deal")
+ .select("*", { count: "exact" })
+ .eq("investor_id", userId);
+ if (error) {
+ console.error(error);
+ return false;
+ }
+ // if user already invest in something
+ if (count !== null && count > 0) {
+ return true;
+ }
+ return false;
+}
+
+function countValues(arr: { value: string }[][]): Record
+
*/}
+ {/* Total Invest :
+{totalInvest}
+
+
+
+ Welcome to your Portfolio, {username}!
++ Here‘s an overview of your investment journey and progress. +
+
+ Total Investment: $
+
+
+
+ Daily
+ Monthly
+ Yearly
+
+
+
+
+ Monthly Investment Trend
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Yearly Investment Summary
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Daily Investment Breakdown
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Displays total investments each month over the past 12
+ months, up to today.
+
+ Shows total investments for each of the last four years,
+ including the current year to date.
+
+ Illustrates total investments for each day over the past
+ year, up to today.
+
+
+
+ Categories of Invested Projects
+
+
+
+
+
+
+
+
+
+
+ item.count)}
+ labels={tagCount.map((item: { name: string; count: number }) => item.name)}
+ header="Total"
+ />
+
+
+
+
+ Types of Businesses Invested In
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Recent investment
+
+
+
+
+
+
+ Displays the distribution of project tags in your
+ investments, highlighting areas of interest.
+
+ Shows the breakdown of business types in your portfolio,
+ illustrating sector diversity.
+
- setApplyProject(!applyProject)}>
-
-
-
-
- Would you like to apply for your first fundraising project as well?
-
-
-
-
-
-
-
- Toggling this option allows you to begin your first project,
which is crucial for unlocking
- the tools necessary to raise funds.
-