fix: merge conflicts resolved from develop

.github/workflows/create-sync-pr.yml

@@ -29,7 +29,7 @@ jobs:
           else
             echo "MATCH=false" >> $GITHUB_OUTPUT
           fi
-  Auto_Merge:
+  Create_PR:
     if: ${{ needs.Check_Branch.outputs.BRANCH_MATCH == 'true' }}
     needs: [Check_Branch]
     runs-on: ubuntu-latest

.github/workflows/repo-sync.yml

@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
   push:
     branches:
-      - preview
+      - develop
 
 env:
   SOURCE_BRANCH_NAME: ${{ github.ref_name }}

packages/tailwind-config-custom/tailwind.config.js

@@ -9,6 +9,9 @@ module.exports = {
     relative: true,
     files: [
       "./app/**/*.{js,ts,jsx,tsx}",
+      "./core/**/*.{js,ts,jsx,tsx}",
+      "./ce/**/*.{js,ts,jsx,tsx}",
+      "./ee/**/*.{js,ts,jsx,tsx}",
       "./components/**/*.tsx",
       "./constants/**/*.{js,ts,jsx,tsx}",
       "./layouts/**/*.tsx",

web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/cycles/(detail)/[cycleId]/page.tsx

@@ -12,7 +12,7 @@ import { CycleLayoutRoot } from "@/components/issues/issue-layouts";
 import { useCycle, useProject } from "@/hooks/store";
 import useLocalStorage from "@/hooks/use-local-storage";
 // assets
-import emptyCycle from "public/empty-state/cycle.svg";
+import emptyCycle from "@/public/empty-state/cycle.svg";
 
 const CycleDetailPage = observer(() => {
   // router

web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/modules/(detail)/[moduleId]/page.tsx

@@ -12,7 +12,7 @@ import { ModuleDetailsSidebar } from "@/components/modules";
 import { useModule, useProject } from "@/hooks/store";
 import useLocalStorage from "@/hooks/use-local-storage";
 // assets
-import emptyModule from "public/empty-state/module.svg";
+import emptyModule from "@/public/empty-state/module.svg";
 
 const ModuleIssuesPage = observer(() => {
   // router

web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/views/(detail)/[viewId]/page.tsx

@@ -10,7 +10,7 @@ import { ProjectViewLayoutRoot } from "@/components/issues";
 // hooks
 import { useProject, useProjectView } from "@/hooks/store";
 // assets
-import emptyView from "public/empty-state/view.svg";
+import emptyView from "@/public/empty-state/view.svg";
 
 const ProjectViewIssuesPage = observer(() => {
   // router

web/app/accounts/forgot-password/page.tsx

@@ -21,12 +21,12 @@ import useTimer from "@/hooks/use-timer";
 // wrappers
 import { AuthenticationWrapper } from "@/lib/wrappers";
 // services
-import { AuthService } from "@/services/auth.service";
 // images
-import PlaneBackgroundPatternDark from "public/auth/background-pattern-dark.svg";
+import PlaneBackgroundPatternDark from "@/public/auth/background-pattern-dark.svg";
-import PlaneBackgroundPattern from "public/auth/background-pattern.svg";
+import PlaneBackgroundPattern from "@/public/auth/background-pattern.svg";
-import BlackHorizontalLogo from "public/plane-logos/black-horizontal-with-blue-logo.png";
+import BlackHorizontalLogo from "@/public/plane-logos/black-horizontal-with-blue-logo.png";
-import WhiteHorizontalLogo from "public/plane-logos/white-horizontal-with-blue-logo.png";
+import WhiteHorizontalLogo from "@/public/plane-logos/white-horizontal-with-blue-logo.png";
+import { AuthService } from "@/services/auth.service";
 
 type TForgotPasswordFormValues = {
   email: string;

web/app/accounts/reset-password/page.tsx

@@ -24,12 +24,12 @@ import { getPasswordStrength } from "@/helpers/password.helper";
 // wrappers
 import { AuthenticationWrapper } from "@/lib/wrappers";
 // services
-import { AuthService } from "@/services/auth.service";
 // images
-import PlaneBackgroundPatternDark from "public/auth/background-pattern-dark.svg";
+import PlaneBackgroundPatternDark from "@/public/auth/background-pattern-dark.svg";
-import PlaneBackgroundPattern from "public/auth/background-pattern.svg";
+import PlaneBackgroundPattern from "@/public/auth/background-pattern.svg";
-import BlackHorizontalLogo from "public/plane-logos/black-horizontal-with-blue-logo.png";
+import BlackHorizontalLogo from "@/public/plane-logos/black-horizontal-with-blue-logo.png";
-import WhiteHorizontalLogo from "public/plane-logos/white-horizontal-with-blue-logo.png";
+import WhiteHorizontalLogo from "@/public/plane-logos/white-horizontal-with-blue-logo.png";
+import { AuthService } from "@/services/auth.service";
 
 type TResetPasswordFormValues = {
   email: string;
@@ -83,8 +83,8 @@ export default function ResetPasswordPage() {
   const isButtonDisabled = useMemo(
     () =>
       !!resetFormData.password &&
-        getPasswordStrength(resetFormData.password) >= 3 &&
+      getPasswordStrength(resetFormData.password) >= 3 &&
-        resetFormData.password === resetFormData.confirm_password
+      resetFormData.password === resetFormData.confirm_password
         ? false
         : true,
     [resetFormData]

web/app/accounts/set-password/page.tsx

@@ -20,12 +20,12 @@ import { useUser } from "@/hooks/store";
 // wrappers
 import { AuthenticationWrapper } from "@/lib/wrappers";
 // services
-import { AuthService } from "@/services/auth.service";
 // images
-import PlaneBackgroundPatternDark from "public/auth/background-pattern-dark.svg";
+import PlaneBackgroundPatternDark from "@/public/auth/background-pattern-dark.svg";
-import PlaneBackgroundPattern from "public/auth/background-pattern.svg";
+import PlaneBackgroundPattern from "@/public/auth/background-pattern.svg";
-import BlackHorizontalLogo from "public/plane-logos/black-horizontal-with-blue-logo.png";
+import BlackHorizontalLogo from "@/public/plane-logos/black-horizontal-with-blue-logo.png";
-import WhiteHorizontalLogo from "public/plane-logos/white-horizontal-with-blue-logo.png";
+import WhiteHorizontalLogo from "@/public/plane-logos/white-horizontal-with-blue-logo.png";
+import { AuthService } from "@/services/auth.service";
 
 type TResetPasswordFormValues = {
   email: string;
@@ -78,8 +78,8 @@ const SetPasswordPage = observer(() => {
   const isButtonDisabled = useMemo(
     () =>
       !!passwordFormData.password &&
-        getPasswordStrength(passwordFormData.password) >= 3 &&
+      getPasswordStrength(passwordFormData.password) >= 3 &&
-        passwordFormData.password === passwordFormData.confirm_password
+      passwordFormData.password === passwordFormData.confirm_password
         ? false
         : true,
     [passwordFormData]

web/app/create-workspace/page.tsx

@@ -14,8 +14,8 @@ import { useUser, useUserProfile } from "@/hooks/store";
 // wrappers
 import { AuthenticationWrapper } from "@/lib/wrappers";
 // images
-import BlackHorizontalLogo from "public/plane-logos/black-horizontal-with-blue-logo.png";
+import BlackHorizontalLogo from "@/public/plane-logos/black-horizontal-with-blue-logo.png";
-import WhiteHorizontalLogo from "public/plane-logos/white-horizontal-with-blue-logo.png";
+import WhiteHorizontalLogo from "@/public/plane-logos/white-horizontal-with-blue-logo.png";
 
 const CreateWorkspacePage = observer(() => {
   // router

web/app/invitations/page.tsx

@@ -25,11 +25,11 @@ import { getUserRole } from "@/helpers/user.helper";
 import { useEventTracker, useUser, useUserProfile, useWorkspace } from "@/hooks/store";
 // services
 import { AuthenticationWrapper } from "@/lib/wrappers";
-import { WorkspaceService } from "@/services/workspace.service";
 // images
-import emptyInvitation from "public/empty-state/invitation.svg";
+import emptyInvitation from "@/public/empty-state/invitation.svg";
-import BlackHorizontalLogo from "public/plane-logos/black-horizontal-with-blue-logo.png";
+import BlackHorizontalLogo from "@/public/plane-logos/black-horizontal-with-blue-logo.png";
-import WhiteHorizontalLogo from "public/plane-logos/white-horizontal-with-blue-logo.png";
+import WhiteHorizontalLogo from "@/public/plane-logos/white-horizontal-with-blue-logo.png";
+import { WorkspaceService } from "@/services/workspace.service";
 
 const workspaceService = new WorkspaceService();
 
@@ -153,10 +153,11 @@ const UserInvitationsPage = observer(() => {
                     return (
                       <div
                         key={invitation.id}
-                        className={`flex cursor-pointer items-center gap-2 rounded border px-3.5 py-5 ${isSelected
+                        className={`flex cursor-pointer items-center gap-2 rounded border px-3.5 py-5 ${
+                          isSelected
                             ? "border-custom-primary-100"
                             : "border-custom-border-200 hover:bg-custom-background-80"
-                          }`}
+                        }`}
                         onClick={() => handleInvitation(invitation, isSelected ? "withdraw" : "accepted")}
                       >
                         <div className="flex-shrink-0">

web/app/not-found.tsx

@@ -7,7 +7,7 @@ import Link from "next/link";
 // ui
 import { Button } from "@plane/ui";
 // images
-import Image404 from "public/404.svg";
+import Image404 from "@/public/404.svg";
 
 export const metadata: Metadata = {
   title: "404 - Page Not Found",

web/app/page.tsx

@@ -20,10 +20,10 @@ import DefaultLayout from "@/layouts/default-layout";
 // wrappers
 import { AuthenticationWrapper } from "@/lib/wrappers";
 // assets
-import PlaneBackgroundPatternDark from "public/auth/background-pattern-dark.svg";
+import PlaneBackgroundPatternDark from "@/public/auth/background-pattern-dark.svg";
-import PlaneBackgroundPattern from "public/auth/background-pattern.svg";
+import PlaneBackgroundPattern from "@/public/auth/background-pattern.svg";
-import BlackHorizontalLogo from "public/plane-logos/black-horizontal-with-blue-logo.png";
+import BlackHorizontalLogo from "@/public/plane-logos/black-horizontal-with-blue-logo.png";
-import WhiteHorizontalLogo from "public/plane-logos/white-horizontal-with-blue-logo.png";
+import WhiteHorizontalLogo from "@/public/plane-logos/white-horizontal-with-blue-logo.png";
 
 const HomePage = observer(() => {
   const { resolvedTheme } = useTheme();

web/app/sign-up/page.tsx

@@ -15,10 +15,10 @@ import { EAuthModes, EPageTypes } from "@/helpers/authentication.helper";
 import { useEventTracker } from "@/hooks/store";
 // assets
 import { AuthenticationWrapper } from "@/lib/wrappers";
-import PlaneBackgroundPatternDark from "public/auth/background-pattern-dark.svg";
+import PlaneBackgroundPatternDark from "@/public/auth/background-pattern-dark.svg";
-import PlaneBackgroundPattern from "public/auth/background-pattern.svg";
+import PlaneBackgroundPattern from "@/public/auth/background-pattern.svg";
-import BlackHorizontalLogo from "public/plane-logos/black-horizontal-with-blue-logo.png";
+import BlackHorizontalLogo from "@/public/plane-logos/black-horizontal-with-blue-logo.png";
-import WhiteHorizontalLogo from "public/plane-logos/white-horizontal-with-blue-logo.png";
+import WhiteHorizontalLogo from "@/public/plane-logos/white-horizontal-with-blue-logo.png";
 
 export type AuthType = "sign-in" | "sign-up";
 

web/core/components/analytics/scope-and-demand/leaderboard.tsx

@@ -1,7 +1,7 @@
 // ui
 import { ProfileEmptyState } from "@/components/ui";
 // image
-import emptyUsers from "public/empty-state/empty_users.svg";
+import emptyUsers from "@/public/empty-state/empty_users.svg";
 
 type Props = {
   users: {

web/core/components/analytics/scope-and-demand/scope.tsx

@@ -2,7 +2,7 @@
 import { IDefaultAnalyticsUser } from "@plane/types";
 import { BarGraph, ProfileEmptyState } from "@/components/ui";
 // image
-import emptyBarGraph from "public/empty-state/empty_bar_graph.svg";
+import emptyBarGraph from "@/public/empty-state/empty_bar_graph.svg";
 // types
 
 type Props = {

web/core/components/analytics/scope-and-demand/year-wise-issues.tsx

@@ -3,7 +3,7 @@ import { IDefaultAnalyticsResponse } from "@plane/types";
 import { LineGraph, ProfileEmptyState } from "@/components/ui";
 // image
 import { MONTHS_LIST } from "@/constants/calendar";
-import emptyGraph from "public/empty-state/empty_graph.svg";
+import emptyGraph from "@/public/empty-state/empty_graph.svg";
 // types
 // constants
 

web/core/components/api-token/empty-state.tsx

@@ -5,7 +5,7 @@ import Image from "next/image";
 // ui
 import { Button } from "@plane/ui";
 // assets
-import emptyApiTokens from "public/empty-state/api-token.svg";
+import emptyApiTokens from "@/public/empty-state/api-token.svg";
 
 type Props = {
   onClick: () => void;

web/core/components/auth-screens/not-authorized-view.tsx

@@ -8,8 +8,8 @@ import { useUser } from "@/hooks/store";
 // layouts
 import DefaultLayout from "@/layouts/default-layout";
 // images
-import ProjectNotAuthorizedImg from "public/auth/project-not-authorized.svg";
+import ProjectNotAuthorizedImg from "@/public/auth/project-not-authorized.svg";
-import WorkspaceNotAuthorizedImg from "public/auth/workspace-not-authorized.svg";
+import WorkspaceNotAuthorizedImg from "@/public/auth/workspace-not-authorized.svg";
 
 type Props = {
   actionButton?: React.ReactNode;

web/core/components/auth-screens/project/join-project.tsx

@@ -9,7 +9,7 @@ import { useProject, useUser } from "@/hooks/store";
 // ui
 // icons
 // images
-import JoinProjectImg from "public/auth/project-not-authorized.svg";
+import JoinProjectImg from "@/public/auth/project-not-authorized.svg";
 
 export const JoinProject: React.FC = () => {
   // states

web/core/components/common/latest-feature-block.tsx

@@ -4,7 +4,7 @@ import { useTheme } from "next-themes";
 // icons
 import { Lightbulb } from "lucide-react";
 // images
-import latestFeatures from "public/onboarding/onboarding-pages.svg";
+import latestFeatures from "@/public/onboarding/onboarding-pages.svg";
 
 export const LatestFeatureBlock = () => {
   const { resolvedTheme } = useTheme();