fix: merge issues

This commit is contained in:
Elie Baier 2023-12-05 21:25:29 +01:00
parent 80ef4007f7
commit 76d9e12de2
1 changed files with 37 additions and 7 deletions

View File

@ -1,11 +1,41 @@
"use client";
'use client';
import { Bar } from 'react-chartjs-2';
import {DayCard} from "@components/custom/dayCard";
import prisma from '@lib/prisma';
import Head from 'next/head';
import { Chart as ChartJS, CategoryScale, LinearScale, PointElement, LineElement, Title, Tooltip, Legend, Filler } from 'chart.js';
ChartJS.register(CategoryScale, LinearScale, PointElement, LineElement, Filler, Title, Tooltip, Legend);
interface IPower {
date: string;
value: number;
}
interface IChart {
labels: string[];
datasets: [
{
label: string;
data: number[];
fill: true;
backgroundColor: string;
borderColor: string;
}
];
}
export default function Results() {
return (
<div>
<DayCard day={1} enabled={true} name={"Michal Polka"}/>
</div>
)
return (
<>
<Head>
<title>Solar</title>
<meta name="description" content="Generated by create next app" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<link rel="icon" href="/favicon.ico" />
</Head>
</>
);
}