From 5e15f89c79d12a383059c57afa4ed9c22c0c263d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20H=C3=B8yland?= <daniehoy@stud.ntnu.no> Date: Sat, 11 May 2024 13:56:19 +0200 Subject: [PATCH] Fixed some text and button placements --- .../power-tracker/src/components/enoekAdd.tsx | 2 +- Frontend/power-tracker/src/pages/overview.tsx | 56 +++++++++---------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/Frontend/power-tracker/src/components/enoekAdd.tsx b/Frontend/power-tracker/src/components/enoekAdd.tsx index bbdcc36..92d8141 100644 --- a/Frontend/power-tracker/src/components/enoekAdd.tsx +++ b/Frontend/power-tracker/src/components/enoekAdd.tsx @@ -242,7 +242,7 @@ const MainComponent: React.FC<ManageAddingProps> = ({ enoek, setData, search }) name='end_date' render={({ field }) => ( <FormItem> - <FormLabel>Start Date</FormLabel> + <FormLabel>End Date</FormLabel> <br></br> <FormControl> <DatePicker dates={endDate} setDate={setEndDate} allowedDate={new Date("3000 01 01")} {...field} /> diff --git a/Frontend/power-tracker/src/pages/overview.tsx b/Frontend/power-tracker/src/pages/overview.tsx index f4b8599..8b85d34 100644 --- a/Frontend/power-tracker/src/pages/overview.tsx +++ b/Frontend/power-tracker/src/pages/overview.tsx @@ -140,34 +140,7 @@ function Overview() { <div className='flex'> <DatePicker width={280} dates={endDate} setDate={setEndDate} allowedDate={startDate} /> <div className='flex flex-col h-[40px] ml-[5px]'> - <Button className='h-[20px] w-[25px] rounded-none rounded-r-lg' variant="ghost" size="icon" onClick={_ => { //TODO: CLEAN UP THESE LATER ------------------------------- NO REALLY, THEY SUCK ATM - var date = new Date; - if(startDate !== undefined){ - date.setTime(startDate.getTime() + 1 * millisInDays); - setStartDate(date); - } - }}> - <Plus className='h-[20px]'></Plus> - </Button> - <Button className='h-[20px] w-[25px] rounded-none rounded-r-lg' variant="ghost" size="icon" onClick={_ => { - var date = new Date; var edate = endDate - if(startDate !== undefined){ - if(edate === undefined) edate = new Date(1) - if (edate.getTime() < startDate.getTime()){ - date.setTime(startDate.getTime() - 1 * millisInDays); - setStartDate(date); - }}}}> - <Minus className='h-[22px]'></Minus> - </Button> - </div> - </div> - - {/* DATE TO datepicker */} - <label className='text-primary text-sm'>Date To</label> - <div className='flex mb-[10px]'> - <DatePicker width={280} dates={startDate} setDate={setStartDate} allowedDate={new Date()}/> - <div className='flex flex-col h-[40px] ml-[5px]'> - <Button className='h-[20px] w-[25px] rounded-none rounded-r-lg' variant="ghost" size="icon" onClick={e => { //TODO: CLEAN UP THESE LATER ------------------------------- NO REALLY, THEY SUCK ATM + <Button className='h-[20px] w-[25px] rounded-none rounded-r-lg' variant="ghost" size="icon" onClick={e => { //TODO: CLEAN UP THESE LATER ------------------------------- NO REALLY, THEY SUCK ATM var date = new Date; var sdate = startDate if(endDate !== undefined){ if(sdate === undefined) sdate = new Date(1) @@ -186,6 +159,33 @@ function Overview() { }}> <Minus className='h-[22px]'></Minus> </Button> + </div> + </div> + + {/* DATE TO datepicker */} + <label className='text-primary text-sm'>Date To</label> + <div className='flex mb-[10px]'> + <DatePicker width={280} dates={startDate} setDate={setStartDate} allowedDate={new Date()}/> + <div className='flex flex-col h-[40px] ml-[5px]'> + <Button className='h-[20px] w-[25px] rounded-none rounded-r-lg' variant="ghost" size="icon" onClick={_ => { //TODO: CLEAN UP THESE LATER ------------------------------- NO REALLY, THEY SUCK ATM + var date = new Date; + if(startDate !== undefined){ + date.setTime(startDate.getTime() + 1 * millisInDays); + setStartDate(date); + } + }}> + <Plus className='h-[20px]'></Plus> + </Button> + <Button className='h-[20px] w-[25px] rounded-none rounded-r-lg' variant="ghost" size="icon" onClick={_ => { + var date = new Date; var edate = endDate + if(startDate !== undefined){ + if(edate === undefined) edate = new Date(1) + if (edate.getTime() < startDate.getTime()){ + date.setTime(startDate.getTime() - 1 * millisInDays); + setStartDate(date); + }}}}> + <Minus className='h-[22px]'></Minus> + </Button> </div> </div> -- GitLab