Skip to content

Commit

Permalink
chore: applied prettier format to our codebase (gitcoinco#13)
Browse files Browse the repository at this point in the history
  • Loading branch information
hussedev authored Oct 25, 2024
1 parent fd8ecbf commit 5563307
Show file tree
Hide file tree
Showing 73 changed files with 1,279 additions and 1,539 deletions.
2 changes: 1 addition & 1 deletion .storybook/main.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { StorybookConfig } from "@storybook/react-vite";
import { withoutVitePlugins } from "@storybook/builder-vite";
import type { StorybookConfig } from "@storybook/react-vite";

const config: StorybookConfig = {
stories: ["../src/**/*.mdx", "../src/**/*.stories.@(js|jsx|mjs|ts|tsx)"],
Expand Down
8 changes: 3 additions & 5 deletions .storybook/preview.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
import type { Preview } from "@storybook/react";

import { withThemeByDataAttribute } from "@storybook/addon-themes";

import type { Preview } from "@storybook/react";
import { initialize, mswLoader } from "msw-storybook-addon";

import "../src/index.css";
import { handlers } from "../src/mocks/handlers";

initialize();

import "../src/index.css";

const preview: Preview = {
parameters: {
controls: {
Expand Down
4 changes: 2 additions & 2 deletions eslint.config.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import eslint from "@eslint/js";
import globals from "globals";
import tseslint from "typescript-eslint";
import eslintConfigPrettier from "eslint-config-prettier";
import tailwind from "eslint-plugin-tailwindcss";
import globals from "globals";
import tseslint from "typescript-eslint";

export default tseslint.config(
eslint.configs.recommended,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { Meta, Title, Primary, Stories, Controls, Story } from "@storybook/blocks";
import * as CheckerAILabelStories from "./CheckerAILabel.stories";

import { CheckerAILabel } from "./CheckerAILabel";
import * as CheckerAILabelStories from "./CheckerAILabel.stories";

# CheckerAILabel

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import type { Meta, StoryObj } from "@storybook/react";

import { CheckerAILabel } from "./CheckerAILabel";

const meta = {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Icon, IconType } from "@/primitives/Icon";
import { cn } from "@/lib/utils";
import { Icon, IconType } from "@/primitives/Icon";

export type CheckerAILabelProps = React.HTMLAttributes<HTMLDivElement> & {
percent: number;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { Meta, Title, Primary, Stories, Controls, Story } from "@storybook/blocks";
import * as CheckerDateLabelStories from "./CheckerDateLabel.stories";

import { CheckerDateLabel } from "./CheckerDateLabel";
import * as CheckerDateLabelStories from "./CheckerDateLabel.stories";

# CheckerDateLabel

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import type { Meta, StoryObj } from "@storybook/react";

import { CheckerDateLabel } from "./CheckerDateLabel";

const meta = {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Icon, IconType } from "@/primitives/Icon";
import { cn } from "@/lib/utils";
import { formatDate, DateFormat } from "@/lib/dates/formatDate";
import { cn } from "@/lib/utils";
import { Icon, IconType } from "@/primitives/Icon";

export type CheckerDateLabelProps = React.HTMLAttributes<HTMLDivElement> & {
date: Date;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { Meta, Title, Primary, Stories, Controls, Story } from "@storybook/blocks";
import * as CheckerReviewsLabelStories from "./CheckerReviewsLabel.stories";

import { CheckerReviewsLabel } from "./CheckerReviewsLabel";
import * as CheckerReviewsLabelStories from "./CheckerReviewsLabel.stories";

# CheckerReviewsLabel

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import type { Meta, StoryObj } from "@storybook/react";

import { CheckerReviewsLabel } from "./CheckerReviewsLabel";

const meta = {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Icon, IconType } from "@/primitives/Icon";
import { cn } from "@/lib/utils";
import { Icon, IconType } from "@/primitives/Icon";

export type CheckerReviewsLabelProps = React.SVGProps<SVGSVGElement> & {
posReviews: number;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import type { Meta, StoryObj } from "@storybook/react";

import { OverviewPageTitle } from "@/features/checker/pages/OverviewPage/components";

const meta = {
Expand Down
3 changes: 2 additions & 1 deletion src/features/project/components/ProjectCard.mdx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { Meta, Title, Primary, Stories, Controls, Story } from "@storybook/blocks";
import * as ProjectCardStories from "./ProjectCard.stories";

import { ProjectCard } from "./ProjectCard";
import * as ProjectCardStories from "./ProjectCard.stories";

# ProjectCard

Expand Down
2 changes: 1 addition & 1 deletion src/features/project/components/ProjectCard.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import type { Meta, StoryObj } from "@storybook/react";
import { expect, within } from "@storybook/test";

import { ProjectCard } from "./ProjectCard";
import { QueryError, QueryPending, QuerySuccess, singleProject } from "../mocks/objects";
import { ProjectCard } from "./ProjectCard";

const meta: Meta<typeof ProjectCard> = {
title: "Components/Project/ProjectCard",
Expand Down
7 changes: 4 additions & 3 deletions src/features/project/components/ProjectCard.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import React from "react";
import { Card, CardContent } from "@/ui-shadcn/card";
import { match, P } from "ts-pattern";

import { UseQueryResult } from "@tanstack/react-query";
import { match, P } from "ts-pattern";

import { Project } from "@/features/project/types/types";
import { BannerImage } from "@/primitives/BannerImage";
import { Avatar } from "@/primitives/Avatar";
import { BannerImage } from "@/primitives/BannerImage";
import { Card, CardContent } from "@/ui-shadcn/card";
import { Skeleton } from "@/ui-shadcn/skeleton";

interface ProjectCardProps {
Expand Down
3 changes: 2 additions & 1 deletion src/features/project/mocks/objects.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { Project } from "../types/types";
import { UseQueryResult } from "@tanstack/react-query";

import { Project } from "../types/types";

export const singleProject: Project = {
id: "0x00065ad5b4ac5b42ac82c60ac9e939505f7996e95b6181919a5353fc50e6b664",
metadata: {
Expand Down
3 changes: 2 additions & 1 deletion src/primitives/Avatar/Avatar.mdx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { Meta, Title, Primary, Stories, Controls, Story } from "@storybook/blocks";
import * as AvatarStories from "./Avatar.stories";

import { Avatar } from "./Avatar";
import * as AvatarStories from "./Avatar.stories";

# Avatar

Expand Down
4 changes: 3 additions & 1 deletion src/primitives/Avatar/Avatar.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import React, { useMemo } from "react";
import DefaultLogo from "@/assets/default_logo.png";

import { match, P } from "ts-pattern";

import DefaultLogo from "@/assets/default_logo.png";
import { Avatar as ShadCNAvatar, AvatarFallback, AvatarImage } from "@/ui-shadcn/avatar";

interface AvatarProps {
Expand Down
3 changes: 2 additions & 1 deletion src/primitives/BannerImage/BannerImage.mdx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { Meta, Title, Primary, Stories, Controls, Story } from "@storybook/blocks";
import * as BannerImageStories from "./BannerImage.stories";

import { BannerImage } from "./BannerImage";
import * as BannerImageStories from "./BannerImage.stories";

# BannerImage

Expand Down
6 changes: 4 additions & 2 deletions src/primitives/BannerImage/BannerImage.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import React, { useMemo } from "react";
import DefaultBanner from "@/assets/default_banner.jpg";
import { match, P } from "ts-pattern";

import clsx from "clsx";
import { match, P } from "ts-pattern";

import DefaultBanner from "@/assets/default_banner.jpg";

interface BannerImageProps {
ipfsCID?: string;
Expand Down
3 changes: 2 additions & 1 deletion src/primitives/Icon/Icon.mdx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { Meta, Title, Primary, Stories, Controls, Story } from "@storybook/blocks";
import * as IconStories from "./Icon.stories";

import { Icon } from "./Icon";
import * as IconStories from "./Icon.stories";

# Icon

Expand Down
1 change: 1 addition & 0 deletions src/primitives/Icon/Icon.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import type { Meta, StoryObj } from "@storybook/react";

import { Icon, IconType } from "./Icon";

const meta = {
Expand Down
1 change: 1 addition & 0 deletions src/primitives/StatCard/StatCard.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import type { Meta, StoryObj } from "@storybook/react";

import { StatCard } from "./StatCard";

const meta = {
Expand Down
1 change: 1 addition & 0 deletions src/tokens/colors.mdx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Meta, ColorPalette, ColorItem, Title } from "@storybook/blocks";

import { colors } from "./colors";

<Meta title="Examples/Tokens/Colors" />
Expand Down
1 change: 1 addition & 0 deletions src/tokens/icons.mdx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Meta, Title, IconGallery, IconItem } from "@storybook/blocks";

import { icons, Icon } from "@/primitives/Icon";

<Meta title="Examples/Tokens/Icons" />
Expand Down
33 changes: 15 additions & 18 deletions src/ui-shadcn/accordion.tsx
Original file line number Diff line number Diff line change
@@ -1,22 +1,19 @@
import * as React from "react"
import * as AccordionPrimitive from "@radix-ui/react-accordion"
import { ChevronDown } from "lucide-react"
import * as React from "react";

import { cn } from "@/lib/utils"
import * as AccordionPrimitive from "@radix-ui/react-accordion";
import { ChevronDown } from "lucide-react";

const Accordion = AccordionPrimitive.Root
import { cn } from "@/lib/utils";

const Accordion = AccordionPrimitive.Root;

const AccordionItem = React.forwardRef<
React.ElementRef<typeof AccordionPrimitive.Item>,
React.ComponentPropsWithoutRef<typeof AccordionPrimitive.Item>
>(({ className, ...props }, ref) => (
<AccordionPrimitive.Item
ref={ref}
className={cn("border-b", className)}
{...props}
/>
))
AccordionItem.displayName = "AccordionItem"
<AccordionPrimitive.Item ref={ref} className={cn("border-b", className)} {...props} />
));
AccordionItem.displayName = "AccordionItem";

const AccordionTrigger = React.forwardRef<
React.ElementRef<typeof AccordionPrimitive.Trigger>,
Expand All @@ -27,16 +24,16 @@ const AccordionTrigger = React.forwardRef<
ref={ref}
className={cn(
"flex flex-1 items-center justify-between py-4 font-medium transition-all hover:underline [&[data-state=open]>svg]:rotate-180",
className
className,
)}
{...props}
>
{children}
<ChevronDown className="h-4 w-4 shrink-0 transition-transform duration-200" />
</AccordionPrimitive.Trigger>
</AccordionPrimitive.Header>
))
AccordionTrigger.displayName = AccordionPrimitive.Trigger.displayName
));
AccordionTrigger.displayName = AccordionPrimitive.Trigger.displayName;

const AccordionContent = React.forwardRef<
React.ElementRef<typeof AccordionPrimitive.Content>,
Expand All @@ -49,8 +46,8 @@ const AccordionContent = React.forwardRef<
>
<div className={cn("pb-4 pt-0", className)}>{children}</div>
</AccordionPrimitive.Content>
))
));

AccordionContent.displayName = AccordionPrimitive.Content.displayName
AccordionContent.displayName = AccordionPrimitive.Content.displayName;

export { Accordion, AccordionItem, AccordionTrigger, AccordionContent }
export { Accordion, AccordionItem, AccordionTrigger, AccordionContent };
Loading

0 comments on commit 5563307

Please sign in to comment.