-
Notifications
You must be signed in to change notification settings - Fork 47
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2928 from ever-co/stage
Release
- Loading branch information
Showing
65 changed files
with
1,507 additions
and
217 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -32,6 +32,7 @@ | |
| "borde", | ||
| "Bowser", | ||
| "Btns", | ||
| "Konviser", | ||
| "Bugsnag", | ||
| "buildjet", | ||
| "cacheable", | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,31 +1,150 @@ | ||
| import { clsxm } from "@app/utils"; | ||
| import { DatePicker } from "@components/ui/DatePicker"; | ||
| import { QueueListIcon } from "@heroicons/react/20/solid"; | ||
| import { addDays, format } from "date-fns"; | ||
| import { Button } from "lib/components"; | ||
| import { TimeSheetFilter, timesheetCalendar } from "lib/features/integrations/calendar"; | ||
| import { | ||
| Select, | ||
| SelectContent, | ||
| SelectGroup, | ||
| SelectItem, | ||
| SelectTrigger, | ||
| SelectValue, | ||
| } from "@components/ui/select" | ||
| import { cn } from "lib/utils"; | ||
| import { CalendarDays } from "lucide-react"; | ||
| import React from "react"; | ||
| import { DateRange } from "react-day-picker"; | ||
| import { LuCalendarDays } from "react-icons/lu"; | ||
|
|
||
| export function HeadCalendar({ openModal }: { openModal?: () => void }) { | ||
| export function HeadCalendar({ | ||
| openModal, | ||
| timesheet, | ||
| setCalendarTimeSheet | ||
| }: { | ||
| openModal?: () => void, | ||
| timesheet: timesheetCalendar, | ||
| setCalendarTimeSheet: React.Dispatch<React.SetStateAction<timesheetCalendar>> | ||
| }) { | ||
|
|
||
| return ( | ||
| <div className="flex justify-between items-center mt-10 bg-white dark:bg-dark-high py-2"> | ||
| <h1 className="text-4xl font-semibold">CALENDAR</h1> | ||
| <h1 className="text-4xl font-semibold">{timesheet === 'Calendar' ? "Calendar" : "Timesheet"}</h1> | ||
| <div className='flex items-center space-x-3'> | ||
| <button | ||
| className='hover:bg-gray-100 text-xl h-10 w-10 rounded-lg flex items-center justify-center' | ||
| onClick={() => setCalendarTimeSheet('TimeSheet')} | ||
| className={clsxm('hover:bg-gray-200 dark:hover:bg-gray-700 text-xl h-10 w-10 rounded-lg flex items-center justify-center', | ||
| `${timesheet === 'TimeSheet' ? 'bg-gray-200 dark:bg-gray-700' : ''}` | ||
| )} | ||
| > | ||
| <QueueListIcon className={clsxm('w-5 h-5')} /> | ||
| </button> | ||
| <button | ||
| className='bg-gray-100 text-xl h-10 w-10 rounded-lg flex items-center justify-center' | ||
| > | ||
| onClick={() => setCalendarTimeSheet('Calendar')} | ||
| className={clsxm('hover:bg-gray-200 dark:hover:bg-gray-700 text-xl h-10 w-10 rounded-lg flex items-center justify-center', | ||
| `${timesheet === 'Calendar' ? 'bg-gray-200 dark:bg-gray-700' : ''}` | ||
| )} > | ||
| <LuCalendarDays /> | ||
| </button> | ||
| <Button | ||
| onClick={openModal} | ||
| variant='primary' | ||
| className='bg-primary dark:bg-primary-light' | ||
| > | ||
| className='bg-primary dark:bg-primary-light'> | ||
| Add Time | ||
| </Button> | ||
| </div> | ||
| </div> | ||
| ); | ||
| } | ||
|
|
||
|
|
||
| export function HeadTimeSheet({ timesheet }: { timesheet?: timesheetCalendar }) { | ||
|
|
||
| const [date, setDate] = React.useState<DateRange | undefined>({ | ||
| from: new Date(2022, 0, 20), | ||
| to: addDays(new Date(2022, 0, 20), 20) | ||
| }); | ||
| console.log(timesheet); | ||
| return ( | ||
| <div> | ||
| <div className='flex items-center justify-between w-full dark:!bg-dark--theme h-28'> | ||
| {timesheet === 'TimeSheet' && ( | ||
| <div className='flex items-center space-x-5 dark:!bg-dark--theme '> | ||
| <div> | ||
| <CustomSelect /> | ||
| </div> | ||
| <DatePicker | ||
| buttonVariant={'link'} | ||
| className="dark:bg-dark--theme-light rounded-lg" | ||
| buttonClassName={'decoration-transparent flex items-center w-full border-gray-300 justify-start text-left font-normal text-black h-10 border dark:border-slate-600 rounded-md"'} | ||
| customInput={ | ||
| <> | ||
| <CalendarDays className="h-5 w-5 dark:text-gray-500" /> | ||
| <Button | ||
| variant={"outline"} | ||
| className={cn( | ||
| "w-[230px] justify-start text-left font-normal text-black h-10 border border-transparent dark:border-transparent", | ||
| !date && "text-muted-foreground" | ||
| )}> | ||
| {date?.from ? ( | ||
| date.to ? ( | ||
| <> | ||
| {format(date.from, "LLL dd, y")} -{" "} | ||
| {format(date.to, "LLL dd, y")} | ||
| </> | ||
| ) : ( | ||
| format(date.from, "LLL dd, y") | ||
| ) | ||
| ) : ( | ||
| <span>Pick a date</span> | ||
| )} | ||
| </Button> | ||
| </> | ||
| } | ||
| mode={'range'} | ||
| numberOfMonths={2} | ||
| initialFocus | ||
| defaultMonth={date?.from} | ||
| selected={date} | ||
| onSelect={(value) => { | ||
| value && setDate(value); | ||
| }} | ||
| /> | ||
| <div> | ||
| <TimeSheetFilter /> | ||
| </div> | ||
| </div> | ||
| )} | ||
| </div> | ||
| </div> | ||
| ) | ||
| } | ||
|
|
||
|
|
||
|
|
||
| export function CustomSelect() { | ||
| const [selectedValue, setSelectedValue] = React.useState<string | undefined>(undefined); | ||
|
|
||
| const handleSelectChange = (value: string) => { | ||
| setSelectedValue(value); | ||
| }; | ||
|
|
||
| return ( | ||
| <Select | ||
| value={selectedValue} | ||
| onValueChange={handleSelectChange} | ||
| > | ||
| <SelectTrigger className="w-[180px] border border-gray-200 dark:border-gray-700 bg-transparent"> | ||
| <SelectValue placeholder="Select a daily" /> | ||
| </SelectTrigger> | ||
| <SelectContent> | ||
| <SelectGroup> | ||
| <SelectItem value="daily">Daily</SelectItem> | ||
| <SelectItem value="weekly">Weekly</SelectItem> | ||
| <SelectItem value="monthly">Monthly</SelectItem> | ||
| </SelectGroup> | ||
| </SelectContent> | ||
| </Select> | ||
| ); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.