Skip to content

Commit

Permalink
Merge pull request #2255 from ever-co/develop
Browse files Browse the repository at this point in the history 
2232 feature svgr configuration for web (#2246)
  • Loading branch information
@evereq
evereq authored Mar 1, 2024
2 parents 96a5dd0 + 561f4a8 commit f3250b8
Show file tree
Hide file tree
Showing 207 changed files with 1,657 additions and 3,558 deletions.
1 change: 1 addition & 0 deletions .cspell.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,7 @@
"stylesheet",
"subsquently",
"svgs",
"svgr",
"Swith",
"Syle",
"Synk",
Expand Down
6 changes: 3 additions & 3 deletions apps/web/app/[locale]/auth/passcode/component.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { TAuthenticationPasscode, useAuthenticationPasscode } from '@app/hooks';
import { IClassName } from '@app/interfaces';
import { clsxm } from '@app/utils';
import { AuthCodeInputField, Avatar, BackButton, Button, Card, InputField, SpinnerLoader, Text } from 'lib/components';
import { CircleIcon, TickCircleIconV2 } from 'lib/components/svgs';
import { CircleIcon, CheckCircleOutlineIcon } from 'assets/svg';
import { AuthLayout } from 'lib/layout';
import { useTranslations } from 'next-intl';
import Link from 'next/link';
Expand Down Expand Up @@ -308,7 +308,7 @@ function WorkSpaceScreen({ form, className }: { form: TAuthenticationPasscode }
}}
>
{selectedWorkspace === index ? (
<TickCircleIconV2 className="w-6 h-6 stroke-[#27AE60] fill-[#27AE60]" />
<CheckCircleOutlineIcon className="w-6 h-6 stroke-[#27AE60] fill-[#27AE60]" />
) : (
<CircleIcon className="w-6 h-6" />
)}
Expand Down Expand Up @@ -345,7 +345,7 @@ function WorkSpaceScreen({ form, className }: { form: TAuthenticationPasscode }
}}
>
{selectedTeam === team.team_id ? (
<TickCircleIconV2 className="w-5 h-5 stroke-[#27AE60] fill-[#27AE60]" />
<CheckCircleOutlineIcon className="w-5 h-5 stroke-[#27AE60] fill-[#27AE60]" />
) : (
<CircleIcon className="w-5 h-5" />
)}
Expand Down
19 changes: 8 additions & 11 deletions apps/web/app/[locale]/kanban/page.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@ import { useKanban } from '@app/hooks/features/useKanban';
import KanbanBoardSkeleton from '@components/shared/skeleton/KanbanBoardSkeleton';
import { withAuthentication } from 'lib/app/authenticator';
import { Breadcrumb, Button, InputField } from 'lib/components';
import { AddIcon, PeopleIcon, SearchNormalIcon, Settings4Icon } from 'lib/components/svgs';
import { ChevronDownIcon } from '@heroicons/react/20/solid';

import { KanbanView } from 'lib/features/team-members-kanban-view';
import { MainLayout } from 'lib/layout';
import { useState } from 'react';
Expand All @@ -18,8 +15,8 @@ import ImageComponent, { ImageOverlapperProps } from 'lib/components/image-overl
import Separator from '@components/ui/separator';
import { clsxm } from '@app/utils';
import HeaderTabs from '@components/pages/main/header-tabs';
import { Select, SelectContent, SelectItem } from '@components/ui/select';
import { SelectTrigger } from '@radix-ui/react-select';
import { AddIcon, SearchNormalIcon, SettingFilterIcon, PeoplesIcon } from 'assets/svg';
import { Select, SelectContent, SelectItem, SelectTrigger } from '@components/ui/select';

const Kanban = () => {
const { data } = useKanban();
Expand Down Expand Up @@ -58,7 +55,7 @@ const Kanban = () => {
<div className={'sticky top-16 flex flex-col z-10 mx-[0px] w-full'}>
<div className="flex bg-white dark:bg-dark--theme px-8 flex-row items-start justify-between pt-12">
<div className="flex justify-center items-center gap-8 h-10">
<PeopleIcon className="stroke-dark dark:stroke-[#6b7280] h-6 w-6" />
<PeoplesIcon className="text-dark dark:text-[#6b7280] h-6 w-6" />
<Breadcrumb paths={breadcrumbPath} className="text-sm" />
</div>
<div className="flex h-10 w-max items-center justify-center gap-1">
Expand All @@ -78,8 +75,10 @@ const Kanban = () => {
<div className="mt-1">
<Separator />
</div>

<button className="p-2 rounded-full border-2 border-[#0000001a] dark:border-white">
<AddIcon width={24} height={24} className={'dark:stroke-white'} />
{/* <AddIcon width={24} height={24} className={'dark:stroke-white'} /> */}
<AddIcon className="w-6 h-6 text-foreground" />
</button>
</div>
</div>
Expand Down Expand Up @@ -107,7 +106,6 @@ const Kanban = () => {
<Select>
<SelectTrigger className="py-0 flex text-sm font-semibold px-4 w-24 justify-between items-center rounded-xl h-11 border-[1px] input-border bg-light--theme-light dark:bg-dark--theme-light dark:text-white ">
<p>{t('pages.taskDetails.EPIC')}</p>
<ChevronDownIcon className={clsxm(' h-4 w-4 dark:text-white ')} />
</SelectTrigger>
<SelectContent className="bg-light--theme-light border-[1px] input-border dark:bg-dark--theme-light dark:text-white font-normal focus:ring-0 ">
{Array.from({ length: 3 }).map((_, index) => (
Expand All @@ -124,7 +122,6 @@ const Kanban = () => {
<Select>
<SelectTrigger className="py-0 flex text-sm font-semibold px-4 w-24 justify-between items-center rounded-xl h-11 border-[1px] input-border bg-light--theme-light dark:bg-dark--theme-light dark:text-white ">
<p>{t('common.LABEL')}</p>
<ChevronDownIcon className={clsxm(' h-4 w-4 dark:text-white ')} />
</SelectTrigger>
<SelectContent className="bg-light--theme-light border-[1px] input-border dark:bg-dark--theme-light dark:text-white font-normal focus:ring-0 ">
{Array.from({ length: 3 }).map((_, index) => (
Expand All @@ -144,7 +141,7 @@ const Kanban = () => {
'h-[2.75rem]'
)}
>
<Settings4Icon className="dark:stroke-white" />
<SettingFilterIcon className="text-foreground w-4 h-4" />
<span>{t('common.FILTER')}</span>
</button>
<div className="mt-1">
Expand All @@ -161,7 +158,7 @@ const Kanban = () => {
className="p-0 m-0 ml-[0.9rem] min-w-0 absolute right-3"
type="submit"
>
<SearchNormalIcon className="w-[1rem] dark:stroke-[#ffffff] " />
<SearchNormalIcon className="w-4 h-4" />
</Button>
}
/>
Expand Down
4 changes: 2 additions & 2 deletions apps/web/app/[locale]/page-component.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import { clsxm } from '@app/utils';
import NoTeam from '@components/pages/main/no-team';
import { withAuthentication } from 'lib/app/authenticator';
import { Breadcrumb, Card, Container } from 'lib/components';
import { PeopleIcon } from 'lib/components/svgs';
import {
AuthUserTaskInput,
TeamInvitations,
Expand Down Expand Up @@ -37,6 +36,7 @@ import { ChevronDown } from 'lucide-react';
import HeaderTabs from '@components/pages/main/header-tabs';
import { headerTabs } from '@app/stores/header-tabs';
import { usePathname } from 'next/navigation';
import { PeoplesIcon } from 'assets/svg';

function MainPage() {
const t = useTranslations();
Expand Down Expand Up @@ -67,7 +67,7 @@ function MainPage() {
<MainHeader className="pb-1" fullWidth={fullWidth}>
<div className="flex flex-row items-start justify-between ">
<div className="flex justify-center items-center gap-8 h-10">
<PeopleIcon className="stroke-dark dark:stroke-[#6b7280] h-6 w-6" />
<PeoplesIcon className="text-dark dark:text-[#6b7280] h-6 w-6" />
<Breadcrumb paths={breadcrumb} className="text-sm" />
</div>
<div className="flex h-10 w-max items-center justify-center gap-1">
Expand Down
4 changes: 2 additions & 2 deletions apps/web/app/[locale]/profile/[memberId]/page.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { clsxm, isValidUrl } from '@app/utils';
import clsx from 'clsx';
import { withAuthentication } from 'lib/app/authenticator';
import { Avatar, Breadcrumb, Container, Text, VerticalSeparator } from 'lib/components';
import { ArrowLeft } from 'lib/components/svgs';
import { ArrowLeftIcon } from 'assets/svg';
import { TaskFilter, Timer, TimerStatus, UserProfileTask, getTimerStatusValue, useTaskFilter } from 'lib/features';
import { MainHeader, MainLayout } from 'lib/layout';
import Link from 'next/link';
Expand Down Expand Up @@ -74,7 +74,7 @@ const Profile = React.memo(function ProfilePage({ params }: { params: { memberId
{/* Breadcrumb */}
<div className="flex items-center gap-8">
<Link href="/">
<ArrowLeft className="w-6 h-6" />
<ArrowLeftIcon className="w-6 h-6" />
</Link>

<Breadcrumb paths={breadcrumb} className="text-sm" />
Expand Down
4 changes: 2 additions & 2 deletions apps/web/app/[locale]/settings/layout.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { userState } from '@app/stores';
import { fullWidthState } from '@app/stores/fullWidth';
import SettingsPersonalSkeleton from '@components/shared/skeleton/SettingsPersonalSkeleton';
import { Breadcrumb, Container } from 'lib/components';
import { ArrowLeft } from 'lib/components/svgs';
import { ArrowLeftIcon } from 'assets/svg';
import { MainLayout } from 'lib/layout';
import { LeftSideSettingMenu } from 'lib/settings';
import { useTranslations } from 'next-intl';
Expand Down Expand Up @@ -34,7 +34,7 @@ const SettingsLayout = ({ children }: { children: JSX.Element }) => {
<Container fullWidth={fullWidth}>
<div className="flex flex-row items-center justify-start gap-8">
<Link href="/">
<ArrowLeft className="w-6 h-6" />
<ArrowLeftIcon className="w-6 h-6" />
</Link>

<Breadcrumb paths={breadcrumb} className="text-sm" />
Expand Down
4 changes: 2 additions & 2 deletions apps/web/app/[locale]/task/[id]/page.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import TaskDetailsAside from '@components/pages/task/task-details-aside';
import TaskTitleBlock from '@components/pages/task/title-block/task-title-block';
import { withAuthentication } from 'lib/app/authenticator';
import { Breadcrumb, Container } from 'lib/components';
import { ArrowLeft } from 'lib/components/svgs';
import { ArrowLeftIcon } from 'assets/svg';
import { MainLayout } from 'lib/layout';
import { useRouter, useParams } from 'next/navigation';
import { useEffect } from 'react';
Expand Down Expand Up @@ -62,7 +62,7 @@ const TaskDetails = () => {
router.replace('/');
}}
>
<ArrowLeft className="w-6 h-6" />
<ArrowLeftIcon className="w-6 h-6" />
</span>

<Breadcrumb paths={breadcrumb} className="text-sm" />
Expand Down
Loading

0 comments on commit f3250b8

Please sign in to comment.