Skip to content
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

Jump to bottom

feat: show variance between days with two esp #124

Merged
merged 10 commits into from
Aug 27, 2024
Merged

feat: show variance between days with two esp #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a22929b
feat: show variance between days with two esp
adbme Aug 27, 2024
ff453db
Merge branch 'main' into show-variance-between-days
adbme Aug 27, 2024
f73d8cc
feat: show variance between days with two esp
adbme Aug 27, 2024
f4d6442
Merge remote-tracking branch 'origin/show-variance-between-days' into…
adbme Aug 27, 2024
06df2a9
style: reformat code
adbme Aug 27, 2024
9400155
refactor: reformat code
adbme Aug 27, 2024
df90247
refactor: reformat code
adbme Aug 27, 2024
9b9dc9a
style: responsive esp page, dashboard
adbme Aug 27, 2024
bb7b9b6
refactor: reformat code
adbme Aug 27, 2024
a98c3ed
style: remove comment
adbme Aug 27, 2024
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
4 changes: 2 additions & 2 deletions nextjs-interface/src/app/dashboard/esp/[espId]/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ export default function Page({ params }: { params: any }) {
date?.from && date?.to ? differenceInDays(date.to, date.from) : 0;

return (
<div className="flex h-full w-full min-w-[500px] flex-col gap-y-5 pt-2">
<div className="flex h-full w-full flex-col gap-y-5 pt-2">
<div className="flex justify-between text-xl font-bold uppercase">
<div>{esp.name}</div>
<RenameElement id={params.espId} />
Expand Down Expand Up @@ -194,7 +194,7 @@ export default function Page({ params }: { params: any }) {
<Card className="flex justify-center rounded-xl dark:border-zinc-700 dark:bg-zinc-900">
<CardContent>
<svg
className="h-[500px] w-[500px] xl:h-[1000px] xl:w-[1000px]"
className="h-[500px] w-[500px] max-sm:h-full max-sm:w-full xl:h-[1000px] xl:w-[1000px]"
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 100 100"
>
Expand Down
9 changes: 8 additions & 1 deletion nextjs-interface/src/app/dashboard/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,19 @@
// import components
import DataCircle from "@/app/ui/dashboard/DataCircle";
import { useAllEsp } from "@/lib/data";
import DataGraph from "@/app/ui/dashboard/DataGraph";

export default function Page() {
const ESPList = useAllEsp();
return (
<>
<div className="px-auto grid h-fit w-full min-w-[500px] grid-cols-1 gap-10 xl:grid-cols-2 2xl:grid-cols-3">
<div>
<DataGraph />
</div>

<br />

<div className="px-auto grid h-fit w-full grid-cols-1 gap-10 xl:grid-cols-2 2xl:grid-cols-3">
{ESPList.map((esp, index) => (
<DataCircle key={index} esp={esp} />
))}
Expand Down
1 change: 0 additions & 1 deletion nextjs-interface/src/app/ui/dashboard/ChartElement.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,6 @@ export function ChartElement({ data }: { data: avgData[] }) {
x={date}
stroke="Gray"
ifOverflow="extendDomain"
label={{ value: "Date change", position: "top", fill: "green" }}
/>
))}
</LineChart>
Expand Down
2 changes: 1 addition & 1 deletion nextjs-interface/src/app/ui/dashboard/DataCircle.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export default function DataCircle({ esp }: { esp: any }) {
<CardTitle className="w-full border-b-2 pb-5 pt-5 text-center text-gray-800 dark:border-zinc-700 dark:text-white">
{esp.name}
</CardTitle>
<CardContent className="sm:py-auto flex h-full w-full flex-row py-14">
<CardContent className="sm:py-auto flex h-full w-full flex-row py-14 max-sm:flex-col max-sm:justify-center">
<PieChartTemperature data={temperature} />
<PieChartHumidity data={humidity} />
</CardContent>
Expand Down
Loading