From cbe5906b1e37eb20f52a3addfda201257e2adebd Mon Sep 17 00:00:00 2001 From: Nevo David Date: Sun, 17 Mar 2024 11:12:41 +0700 Subject: [PATCH] feat: Inter font --- apps/frontend/src/app/auth/providers/github.provider.tsx | 3 ++- apps/frontend/src/app/layout.tsx | 8 ++++---- apps/frontend/src/components/auth/login.tsx | 3 ++- apps/frontend/src/components/auth/register.tsx | 3 ++- apps/frontend/src/components/billing/faq.component.tsx | 5 +++-- .../src/components/billing/main.billing.component.tsx | 3 ++- .../components/launches/comments/comment.component.tsx | 5 +++-- apps/frontend/src/components/launches/menu/menu.tsx | 3 ++- .../components/launches/providers/devto/devto.tags.tsx | 3 ++- .../launches/providers/hashnode/hashnode.tags.tsx | 3 ++- .../launches/providers/medium/medium.provider.tsx | 3 ++- .../components/launches/providers/medium/medium.tags.tsx | 3 ++- .../launches/providers/reddit/reddit.provider.tsx | 3 ++- apps/frontend/src/components/media/media.component.tsx | 5 +++-- .../components/notifications/notification.component.tsx | 5 +++-- .../frontend/src/components/settings/github.component.tsx | 7 ++++--- apps/frontend/src/components/settings/teams.component.tsx | 3 ++- .../react-shared-libraries/src/helpers/inter.font.ts | 6 ++++++ 18 files changed, 48 insertions(+), 26 deletions(-) create mode 100644 libraries/react-shared-libraries/src/helpers/inter.font.ts diff --git a/apps/frontend/src/app/auth/providers/github.provider.tsx b/apps/frontend/src/app/auth/providers/github.provider.tsx index 9e2fefb8..1d9910b5 100644 --- a/apps/frontend/src/app/auth/providers/github.provider.tsx +++ b/apps/frontend/src/app/auth/providers/github.provider.tsx @@ -1,5 +1,6 @@ import { useCallback } from 'react'; import { useFetch } from '@gitroom/helpers/utils/custom.fetch'; +import interClass from '@gitroom/react/helpers/inter.font'; export const GithubProvider = () => { const fetch = useFetch(); @@ -11,7 +12,7 @@ export const GithubProvider = () => { return (
+ diff --git a/apps/frontend/src/components/auth/login.tsx b/apps/frontend/src/components/auth/login.tsx index e76d5699..b6eeb90f 100644 --- a/apps/frontend/src/components/auth/login.tsx +++ b/apps/frontend/src/components/auth/login.tsx @@ -9,6 +9,7 @@ import { useMemo, useState } from 'react'; import { classValidatorResolver } from '@hookform/resolvers/class-validator'; import { LoginUserDto } from '@gitroom/nestjs-libraries/dtos/auth/login.user.dto'; import { GithubProvider } from '@gitroom/frontend/app/auth/providers/github.provider'; +import interClass from '@gitroom/react/helpers/inter.font'; type Inputs = { email: string; @@ -60,7 +61,7 @@ export function Login() {
-
+
OR
diff --git a/apps/frontend/src/components/auth/register.tsx b/apps/frontend/src/components/auth/register.tsx index da32449f..623f3874 100644 --- a/apps/frontend/src/components/auth/register.tsx +++ b/apps/frontend/src/components/auth/register.tsx @@ -11,6 +11,7 @@ import { CreateOrgUserDto } from '@gitroom/nestjs-libraries/dtos/auth/create.org import { GithubProvider } from '@gitroom/frontend/app/auth/providers/github.provider'; import { useSearchParams } from 'next/navigation'; import { LoadingComponent } from '@gitroom/frontend/components/layout/loading'; +import interClass from '@gitroom/react/helpers/inter.font'; type Inputs = { email: string; @@ -113,7 +114,7 @@ export function RegisterAfter({ {!isAfterProvider && (
-
+
OR
diff --git a/apps/frontend/src/components/billing/faq.component.tsx b/apps/frontend/src/components/billing/faq.component.tsx index 3af521e1..267cf73b 100644 --- a/apps/frontend/src/components/billing/faq.component.tsx +++ b/apps/frontend/src/components/billing/faq.component.tsx @@ -1,5 +1,6 @@ import { FC, useCallback, useState } from 'react'; import clsx from 'clsx'; +import interClass from '@gitroom/react/helpers/inter.font'; const list = [ { @@ -55,7 +56,7 @@ export const FAQSection: FC<{ title: string; description: string }> = ( className="bg-sixth p-[24px] border border-tableBorder rounded-[4px] flex flex-col" onClick={changeShow} > -
+
{title}
{!show ? ( @@ -101,7 +102,7 @@ export const FAQSection: FC<{ title: string; description: string }> = ( onClick={(e) => { e.stopPropagation(); }} - className="mt-[16px] w-full text-wrap font-['Inter'] font-[400] text-[16px] text-[#D3D3D3] select-text" + className={`mt-[16px] w-full text-wrap ${interClass} font-[400] text-[16px] text-[#D3D3D3] select-text`} dangerouslySetInnerHTML={{ __html: description }} />
diff --git a/apps/frontend/src/components/billing/main.billing.component.tsx b/apps/frontend/src/components/billing/main.billing.component.tsx index 1a445514..6e0e63b3 100644 --- a/apps/frontend/src/components/billing/main.billing.component.tsx +++ b/apps/frontend/src/components/billing/main.billing.component.tsx @@ -18,6 +18,7 @@ import { FAQComponent } from '@gitroom/frontend/components/billing/faq.component import { useSWRConfig } from 'swr'; import { useUser } from '@gitroom/frontend/components/layout/user.context'; import { useRouter } from 'next/navigation'; +import interClass from '@gitroom/react/helpers/inter.font'; export interface Tiers { month: Array<{ @@ -366,7 +367,7 @@ export const MainBillingComponent: FC<{
{p.price ? '$' + totalChannels * p.price : p.name}
{!!p.price && ( -
+
{monthlyOrYearly === 'on' ? '/year' : '/month'}
)} diff --git a/apps/frontend/src/components/launches/comments/comment.component.tsx b/apps/frontend/src/components/launches/comments/comment.component.tsx index 121fa9ee..91b1d24d 100644 --- a/apps/frontend/src/components/launches/comments/comment.component.tsx +++ b/apps/frontend/src/components/launches/comments/comment.component.tsx @@ -9,6 +9,7 @@ import { useUser } from '@gitroom/frontend/components/layout/user.context'; import { Input } from '@gitroom/react/form/input'; import { useFetch } from '@gitroom/helpers/utils/custom.fetch'; import { deleteDialog } from '@gitroom/react/helpers/delete.dialog'; +import interClass from '@gitroom/react/helpers/inter.font'; export const CommentBox: FC<{ value?: string; @@ -310,7 +311,7 @@ export const CommentComponent: FC<{ date: dayjs.Dayjs }> = (props) => { >
-
+
{comment.user.email[0].toUpperCase()}
@@ -336,7 +337,7 @@ export const CommentComponent: FC<{ date: dayjs.Dayjs }> = (props) => { className={clsx(`flex gap-[8px] relative`)} >
-
+
{childComment.user.email[0].toUpperCase()}
diff --git a/apps/frontend/src/components/launches/menu/menu.tsx b/apps/frontend/src/components/launches/menu/menu.tsx index 085d71eb..162de917 100644 --- a/apps/frontend/src/components/launches/menu/menu.tsx +++ b/apps/frontend/src/components/launches/menu/menu.tsx @@ -3,6 +3,7 @@ import { useClickOutside } from '@mantine/hooks'; import { useFetch } from '@gitroom/helpers/utils/custom.fetch'; import { deleteDialog } from '@gitroom/react/helpers/delete.dialog'; import { useToaster } from '@gitroom/react/toaster/toaster'; +import interClass from '@gitroom/react/helpers/inter.font'; export const Menu: FC<{ canEnable: boolean; @@ -100,7 +101,7 @@ export const Menu: FC<{ {show && (
e.stopPropagation()} - className="absolute top-[100%] left-0 p-[8px] px-[20px] bg-fifth flex flex-col gap-[16px] z-[100] rounded-[8px] border border-tableBorder font-['Inter'] text-nowrap" + className={`absolute top-[100%] left-0 p-[8px] px-[20px] bg-fifth flex flex-col gap-[16px] z-[100] rounded-[8px] border border-tableBorder ${interClass} text-nowrap`} > {canEnable && (
-
{label}
+
{label}
-
{label}
+
{label}
{ return (
diff --git a/apps/frontend/src/components/launches/providers/medium/medium.tags.tsx b/apps/frontend/src/components/launches/providers/medium/medium.tags.tsx index 1b3ffedb..7c458875 100644 --- a/apps/frontend/src/components/launches/providers/medium/medium.tags.tsx +++ b/apps/frontend/src/components/launches/providers/medium/medium.tags.tsx @@ -1,6 +1,7 @@ import { FC, useCallback, useEffect, useMemo, useState } from 'react'; import { useSettings } from '@gitroom/frontend/components/launches/helpers/use.values'; import { ReactTags } from 'react-tag-autocomplete'; +import interClass from '@gitroom/react/helpers/inter.font'; export const MediumTags: FC<{ name: string; @@ -46,7 +47,7 @@ export const MediumTags: FC<{ return (
-
{label}
+
{label}
{
diff --git a/apps/frontend/src/components/media/media.component.tsx b/apps/frontend/src/components/media/media.component.tsx index ec59db86..7adb8013 100644 --- a/apps/frontend/src/components/media/media.component.tsx +++ b/apps/frontend/src/components/media/media.component.tsx @@ -10,6 +10,7 @@ import { useSettings } from '@gitroom/frontend/components/launches/helpers/use.v import EventEmitter from 'events'; import { TopTitle } from '@gitroom/frontend/components/launches/helpers/top.title.component'; import clsx from 'clsx'; +import interClass from '@gitroom/react/helpers/inter.font'; const showModalEmitter = new EventEmitter(); export const ShowMediaBoxModal: FC = () => { @@ -141,7 +142,7 @@ export const MediaBox: FC<{ accept="image/*" onChange={uploadMedia} /> -