Merge branch 'dev-branch' into 'main'

Fixed some text and button placements

See merge request !98

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} />

Frontend/power-tracker/src/pages/overview.tsx

@@ -139,33 +139,6 @@ function Overview() {
               <label className='text-primary text-sm'>Date From</label>
               <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
                   var date = new Date; var sdate = startDate
@@ -189,6 +162,33 @@ function Overview() {
                 </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>
+              
               {/* DATE HELPER BUTTONS */}
               <div className="flex items-center justify-between mb-[5px]">
                 <Button className="w-[100px] h-[30px]" variant="outline" onClick={_ => {