Skip to content

Commit d49d994

Browse files
prateekshourya29prateekshourya29
committed
fix: merge conflicts resolved
Merge branch 'preview' of github.com:makeplane/plane into improvement-rich-fitlers-ui
2 parents b0d81a3 + 9f41e92 commit d49d994

File tree

317 files changed

+6633
-5047
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

317 files changed

+6633
-5047
lines changed

‎.dockerignore‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,3 +61,9 @@ temp/
6161
# Misc
6262
*.pem
6363
*.key
64+
65+
# React Router - https://github.com/remix-run/react-router-templates/blob/dc79b1a065f59f3bfd840d4ef75cc27689b611e6/default/.dockerignore
66+
.react-router/
67+
build/
68+
node_modules/
69+
README.md

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,10 @@ node_modules
1616
/out/
1717

1818
# Production
19-
/build
2019
dist/
2120
out/
21+
build/
22+
.react-router/
2223

2324
# Misc
2425
.DS_Store

‎apps/admin/.eslintrc.js‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,18 @@
11
module.exports = {
22
root: true,
33
extends: ["@plane/eslint-config/next.js"],
4+
rules: {
5+
"no-duplicate-imports": "off",
6+
"import/no-duplicates": ["error", { "prefer-inline": false }],
7+
"import/consistent-type-specifier-style": ["error", "prefer-top-level"],
8+
"@typescript-eslint/no-import-type-side-effects": "error",
9+
"@typescript-eslint/consistent-type-imports": [
10+
"error",
11+
{
12+
prefer: "type-imports",
13+
fixStyle: "separate-type-imports",
14+
disallowTypeAnnotations: false,
15+
},
16+
],
17+
},
418
};

‎apps/admin/app/(all)/(dashboard)/ai/form.tsx‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
"use client";
2-
import { FC } from "react";
2+
import type { FC } from "react";
33
import { useForm } from "react-hook-form";
44
import { Lightbulb } from "lucide-react";
55
import { Button } from "@plane/propel/button";
66
import { TOAST_TYPE, setToast } from "@plane/propel/toast";
7-
import { IFormattedInstanceConfiguration, TInstanceAIConfigurationKeys } from "@plane/types";
7+
import type { IFormattedInstanceConfiguration, TInstanceAIConfigurationKeys } from "@plane/types";
88
// components
9-
import { ControllerInput, TControllerInputFormField } from "@/components/common/controller-input";
9+
import type { TControllerInputFormField } from "@/components/common/controller-input";
10+
import { ControllerInput } from "@/components/common/controller-input";
1011
// hooks
1112
import { useInstance } from "@/hooks/store";
1213

‎apps/admin/app/(all)/(dashboard)/ai/layout.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { ReactNode } from "react";
2-
import { Metadata } from "next";
1+
import type { ReactNode } from "react";
2+
import type { Metadata } from "next";
33

44
export const metadata: Metadata = {
55
title: "Artificial Intelligence Settings - God Mode",

‎apps/admin/app/(all)/(dashboard)/authentication/github/form.tsx‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
"use client";
22

3-
import { FC, useState } from "react";
3+
import type { FC } from "react";
4+
import { useState } from "react";
45
import { isEmpty } from "lodash-es";
56
import Link from "next/link";
67
import { useForm } from "react-hook-form";
@@ -9,14 +10,16 @@ import { Monitor } from "lucide-react";
910
import { API_BASE_URL } from "@plane/constants";
1011
import { Button, getButtonStyling } from "@plane/propel/button";
1112
import { TOAST_TYPE, setToast } from "@plane/propel/toast";
12-
import { IFormattedInstanceConfiguration, TInstanceGithubAuthenticationConfigurationKeys } from "@plane/types";
13+
import type { IFormattedInstanceConfiguration, TInstanceGithubAuthenticationConfigurationKeys } from "@plane/types";
1314

1415
import { cn } from "@plane/utils";
1516
// components
1617
import { CodeBlock } from "@/components/common/code-block";
1718
import { ConfirmDiscardModal } from "@/components/common/confirm-discard-modal";
18-
import { ControllerInput, TControllerInputFormField } from "@/components/common/controller-input";
19-
import { CopyField, TCopyField } from "@/components/common/copy-field";
19+
import type { TControllerInputFormField } from "@/components/common/controller-input";
20+
import { ControllerInput } from "@/components/common/controller-input";
21+
import type { TCopyField } from "@/components/common/copy-field";
22+
import { CopyField } from "@/components/common/copy-field";
2023
// hooks
2124
import { useInstance } from "@/hooks/store";
2225

‎apps/admin/app/(all)/(dashboard)/authentication/github/layout.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { ReactNode } from "react";
2-
import { Metadata } from "next";
1+
import type { ReactNode } from "react";
2+
import type { Metadata } from "next";
33

44
export const metadata: Metadata = {
55
title: "GitHub Authentication - God Mode",

‎apps/admin/app/(all)/(dashboard)/authentication/gitlab/form.tsx‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,21 @@
1-
import { FC, useState } from "react";
1+
import type { FC } from "react";
2+
import { useState } from "react";
23
import { isEmpty } from "lodash-es";
34
import Link from "next/link";
45
import { useForm } from "react-hook-form";
56
// plane internal packages
67
import { API_BASE_URL } from "@plane/constants";
78
import { Button, getButtonStyling } from "@plane/propel/button";
89
import { TOAST_TYPE, setToast } from "@plane/propel/toast";
9-
import { IFormattedInstanceConfiguration, TInstanceGitlabAuthenticationConfigurationKeys } from "@plane/types";
10+
import type { IFormattedInstanceConfiguration, TInstanceGitlabAuthenticationConfigurationKeys } from "@plane/types";
1011
import { cn } from "@plane/utils";
1112
// components
1213
import { CodeBlock } from "@/components/common/code-block";
1314
import { ConfirmDiscardModal } from "@/components/common/confirm-discard-modal";
14-
import { ControllerInput, TControllerInputFormField } from "@/components/common/controller-input";
15-
import { CopyField, TCopyField } from "@/components/common/copy-field";
15+
import type { TControllerInputFormField } from "@/components/common/controller-input";
16+
import { ControllerInput } from "@/components/common/controller-input";
17+
import type { TCopyField } from "@/components/common/copy-field";
18+
import { CopyField } from "@/components/common/copy-field";
1619
// hooks
1720
import { useInstance } from "@/hooks/store";
1821

‎apps/admin/app/(all)/(dashboard)/authentication/gitlab/layout.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { ReactNode } from "react";
2-
import { Metadata } from "next";
1+
import type { ReactNode } from "react";
2+
import type { Metadata } from "next";
33

44
export const metadata: Metadata = {
55
title: "GitLab Authentication - God Mode",

‎apps/admin/app/(all)/(dashboard)/authentication/google/form.tsx‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
"use client";
2-
import { FC, useState } from "react";
2+
import type { FC } from "react";
3+
import { useState } from "react";
34
import { isEmpty } from "lodash-es";
45
import Link from "next/link";
56
import { useForm } from "react-hook-form";
@@ -8,13 +9,15 @@ import { Monitor } from "lucide-react";
89
import { API_BASE_URL } from "@plane/constants";
910
import { Button, getButtonStyling } from "@plane/propel/button";
1011
import { TOAST_TYPE, setToast } from "@plane/propel/toast";
11-
import { IFormattedInstanceConfiguration, TInstanceGoogleAuthenticationConfigurationKeys } from "@plane/types";
12+
import type { IFormattedInstanceConfiguration, TInstanceGoogleAuthenticationConfigurationKeys } from "@plane/types";
1213
import { cn } from "@plane/utils";
1314
// components
1415
import { CodeBlock } from "@/components/common/code-block";
1516
import { ConfirmDiscardModal } from "@/components/common/confirm-discard-modal";
16-
import { ControllerInput, TControllerInputFormField } from "@/components/common/controller-input";
17-
import { CopyField, TCopyField } from "@/components/common/copy-field";
17+
import type { TControllerInputFormField } from "@/components/common/controller-input";
18+
import { ControllerInput } from "@/components/common/controller-input";
19+
import type { TCopyField } from "@/components/common/copy-field";
20+
import { CopyField } from "@/components/common/copy-field";
1821
// hooks
1922
import { useInstance } from "@/hooks/store";
2023

0 commit comments

Comments
 (0)