Skip to content

First iteration cool UI (simulation look) #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alvaromanoso merged 1 commit into from
Jun 3, 2025
Merged

First iteration cool UI (simulation look) #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions src/pages/webapp/Dashboard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ const decisionHttpService = new DecisionHttpService();

function Dashboard() {
return (
<div className={"flex flex-col lg:flex-row gap-5"}>
<div className={"flex flex-col lg:flex-row gap-5 pb-5"}>
<div className={"lg:flex-2"}>
<Portfolio/>
</div>
Expand Down Expand Up @@ -384,8 +384,14 @@ function Portfolio() {
return (
<>
<ChartLineDots chartData={performanceChartData}></ChartLineDots>
<Card className={"shadow-none box-border p-5 mt-5"}>
<div className={"flex flex-col gap-5 items-end"}>
<Card className={"shadow-none box-border mt-5"}>
<CardHeader>
<CardTitle>Portfolio management</CardTitle>
<CardDescription>
Manage the holdings of your portfolio
</CardDescription>
</CardHeader>
<CardContent>
<Table>
<TableHeader>
<TableRow>
Expand Down Expand Up @@ -464,11 +470,12 @@ function Portfolio() {
</TableRow>
</TableFooter>
</Table>
</div>
</CardContent>
</Card>
<Card className={"shadow-none box-border mt-5"}>
<Card className={"shadow-none box-border mt-5 "}>
<CardHeader>
<CardTitle>Add new asset to portfolio</CardTitle>
<CardDescription>Choose an asset and specify how many shares you bought and at what price</CardDescription>
</CardHeader>
<CardContent>
<HoldingCreator onSubmit={onAddHolding}></HoldingCreator>
Expand Down
145 changes: 82 additions & 63 deletions src/pages/webapp/Simulation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import {DatePickerRange} from "@/components/DatePickerRange.tsx";
import {DateRange} from "react-day-picker";
import {addDays, endOfDay, isWithinInterval, startOfDay} from "date-fns";
import {ToggleGroup, ToggleGroupItem} from "@/components/ui/toggle-group.tsx";
import {LoadingLayer} from "@/components/LoadingLayer.tsx";

const portfolioHttpService = new PortfolioHttpService();
const assetsHttpService = new AssetsHttpService();
Expand Down Expand Up @@ -84,14 +83,51 @@ function SimulationConfig({setSimulationConfig}: {
}

return (
<Card className={"shadow-none box-border py-6"}>
<div className={"box-border p-5"}>
<div className={""}>
<p className={"font-semibold pb-2"}>Time period</p>
<div className={"flex flex-col gap-5"}>
<Card className={"shadow-none"}>
<CardHeader>
<CardTitle>Time period</CardTitle>
<CardDescription>Select the start and end dates for the simulation</CardDescription>
</CardHeader>
<CardContent>
<DatePickerRange value={dateRange} onValueChange={setDateRange}/>
</div>
<div className={"mt-4"}>
<p className={"font-semibold pb-2"}>Risk profile</p>
</CardContent>
</Card>
<Card className={"shadow-none"}>
<CardHeader>
<CardTitle>Assets selection</CardTitle>
<CardDescription>Select the assets to be included in the simulation</CardDescription>
</CardHeader>
<CardContent>
<div className={"flex gap-y-4 flex-col"}>
<div className={"flex flex-row gap-4 items-center"}>
<div className={"rounded-xl bg-neutral-100 w-fit box-border p-3"}>
<WalletIcon className={"size-6"}/>
</div>
<div className={"flex-1"}>
<p>Current portfolio</p>
<p className={"font-light text-neutral-500 pt-1"}>All assets in your current
portfolio</p>
</div>
<div className={"text-neutral-500"}>
<Switch
onCheckedChange={event => event ? addPortfolioHoldings() : removePortfolioHoldings()}/>
</div>
</div>
</div>
{simulationItems.length > 0 && (
<Badge variant="secondary" className={"mt-2"}>
{simulationItems.length} assets selected
</Badge>
)}
</CardContent>
</Card>
<Card className={"shadow-none"}>
<CardHeader>
<CardTitle>Risk profile</CardTitle>
<CardDescription>Select the risk profile to use in the simulation</CardDescription>
</CardHeader>
<CardContent>
<ToggleGroup
size="lg"
type="single"
Expand All @@ -117,47 +153,23 @@ function SimulationConfig({setSimulationConfig}: {
{riskLevel === 3 && "Aggressive"}
{riskLevel === 4 && "Very aggressive"}
</Badge>
</div>
<div className={"mt-4"}>
<p className={"font-semibold pb-2"}>Assets selection</p>
<div className={"flex gap-y-4 flex-col"}>
<div className={"flex flex-row gap-4 items-center"}>
<div className={"rounded-xl bg-neutral-100 w-fit box-border p-3"}>
<WalletIcon className={"size-6"}/>
</div>
<div className={"flex-1"}>
<p>Current portfolio</p>
<p className={"font-light text-neutral-500 pt-1"}>All assets in your current portfolio</p>
</div>
<div className={"text-neutral-500"}>
<Switch
onCheckedChange={event => event ? addPortfolioHoldings() : removePortfolioHoldings()}/>
</div>
</div>
</div>
</div>
<div className={"mt-4"}>
<Button className={"block mb-2 cursor-pointer"}
disabled={simulationItems.length === 0 || !dateRange}
onClick={() => {
if (!dateRange?.from || !dateRange?.to) return;
setSimulationConfig({
fromDate: dateRange.from,
toDate: dateRange.to,
riskLevel: riskLevel,
simulationItems: simulationItems
})
}}>
Run simulation
</Button>
{simulationItems.length > 0 && (
<Badge variant="outline">
{simulationItems.length} assets selected
</Badge>
)}
</div>
</div>
</Card>
</CardContent>
</Card>
<hr/>
<Button className={"block mb-2 cursor-pointer"}
disabled={simulationItems.length === 0 || !dateRange}
onClick={() => {
if (!dateRange?.from || !dateRange?.to) return;
setSimulationConfig({
fromDate: dateRange.from,
toDate: dateRange.to,
riskLevel: riskLevel,
simulationItems: simulationItems
})
}}>
Run simulation
</Button>
</div>
)
}

Expand Down Expand Up @@ -285,19 +297,26 @@ function SimulationResults({simulationConfig}: {

return (
<>
{isLoading && <LoadingLayer/>}
{simulationConfig && <div>
<DataChart
data={chartData}
filterBy={(item) => {
return item.select
}}
sortByFilterBy={(a, b) => {
if (a === "Overview") return -1;
if (b === "Overview") return 1;
return a.localeCompare(b);
}}/>
</div>}
{isLoading &&
<div className="w-full flex items-center justify-center h-full">
<div
className="w-12 h-12 border-4 border-blue-500 border-t-transparent rounded-full animate-spin"></div>
</div>
}
{simulationConfig && !isLoading &&
<div>
<DataChart
data={chartData}
filterBy={(item) => {
return item.select
}}
sortByFilterBy={(a, b) => {
if (a === "Overview") return -1;
if (b === "Overview") return 1;
return a.localeCompare(b);
}}/>
</div>
}
</>
)
}
Expand Down Expand Up @@ -408,7 +427,7 @@ function DataChart<T extends BaseChartData>
axisLine={false}
tickMargin={8}
domain={([dataMin, dataMax]) => {
const margin = (dataMax - dataMin)/10;
const margin = (dataMax - dataMin) / 10;
return [Math.max(0, dataMin - margin), dataMax + margin]
}}
tickFormatter={(value) => {
Expand Down
Loading