fix: merge conflicts resolved from preview

.eslintrc-staged.js

@@ -7,9 +7,6 @@ module.exports = {
   root: true,
   extends: [
     "custom",
-    "eslint:recommended",
-    "plugin:react/recommended",
-    "plugin:prettier/recommended",
   ],
   parser: "@typescript-eslint/parser",
   settings: {

.gitignore

@@ -81,4 +81,7 @@ tmp/
 ## packages
 dist
 .temp/
-deploy/selfhost/plane-app/
+deploy/selfhost/plane-app/
+## Storybook
+*storybook.log
+output.css

.husky/pre-commit

@@ -1 +0,0 @@
-yarn lint-staged

admin/layouts/default-layout.tsx

@@ -2,11 +2,13 @@
 
 import { FC, ReactNode } from "react";
 import Image from "next/image";
+import Link from "next/link";
 import { useTheme } from "next-themes";
 // logo/ images
 import PlaneBackgroundPatternDark from "public/auth/background-pattern-dark.svg";
 import PlaneBackgroundPattern from "public/auth/background-pattern.svg";
-import BluePlaneLogoWithoutText from "public/plane-logos/blue-without-text.png";
+import BlackHorizontalLogo from "public/plane-logos/black-horizontal-with-blue-logo.svg";
+import WhiteHorizontalLogo from "public/plane-logos/white-horizontal-with-blue-logo.svg";
 
 type TDefaultLayout = {
   children: ReactNode;
@@ -19,13 +21,16 @@ export const DefaultLayout: FC<TDefaultLayout> = (props) => {
   const { resolvedTheme } = useTheme();
   const patternBackground = resolvedTheme === "dark" ? PlaneBackgroundPatternDark : PlaneBackgroundPattern;
 
+  const logo = resolvedTheme === "light" ? BlackHorizontalLogo : WhiteHorizontalLogo;
+
   return (
     <div className="relative">
       <div className="h-screen w-full overflow-hidden overflow-y-auto flex flex-col">
         <div className="container h-[110px] flex-shrink-0 mx-auto px-5 lg:px-0 flex items-center justify-between gap-5 z-50">
           <div className="flex items-center gap-x-2 py-10">
-            <Image src={BluePlaneLogoWithoutText} height={30} width={30} alt="Plane Logo" />
-            <span className="text-2xl font-semibold sm:text-3xl">Plane</span>
+            <Link href={`/`} className="h-[30px] w-[133px]">
+              <Image src={logo} alt="Plane logo" />
+            </Link>
           </div>
         </div>
         {!withoutBackground && (

apiserver/plane/app/views/module/issue.py

@@ -198,46 +198,66 @@ def create_module_issues(self, request, slug, project_id, module_id):
         ]
         return Response({"message": "success"}, status=status.HTTP_201_CREATED)
 
-    # create multiple module inside an issue
+    # add multiple module inside an issue and remove multiple modules from an issue
     def create_issue_modules(self, request, slug, project_id, issue_id):
         modules = request.data.get("modules", [])
-        if not modules:
-            return Response(
-                {"error": "Modules are required"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
+        removed_modules = request.data.get("removed_modules", [])
         project = Project.objects.get(pk=project_id)
-        _ = ModuleIssue.objects.bulk_create(
-            [
-                ModuleIssue(
+
+
+        if modules:
+            _ = ModuleIssue.objects.bulk_create(
+                [
+                    ModuleIssue(
+                        issue_id=issue_id,
+                        module_id=module,
+                        project_id=project_id,
+                        workspace_id=project.workspace_id,
+                        created_by=request.user,
+                        updated_by=request.user,
+                    )
+                    for module in modules
+                ],
+                batch_size=10,
+                ignore_conflicts=True,
+            )
+            # Bulk Update the activity
+            _ = [
+                issue_activity.delay(
+                    type="module.activity.created",
+                    requested_data=json.dumps({"module_id": module}),
+                    actor_id=str(request.user.id),
                     issue_id=issue_id,
-                    module_id=module,
                     project_id=project_id,
-                    workspace_id=project.workspace_id,
-                    created_by=request.user,
-                    updated_by=request.user,
+                    current_instance=None,
+                    epoch=int(timezone.now().timestamp()),
+                    notification=True,
+                    origin=request.META.get("HTTP_ORIGIN"),
                 )
                 for module in modules
-            ],
-            batch_size=10,
-            ignore_conflicts=True,
-        )
-        # Bulk Update the activity
-        _ = [
+            ]
+
+        for module_id in removed_modules:
+            module_issue = ModuleIssue.objects.get(
+                workspace__slug=slug,
+                project_id=project_id,
+                module_id=module_id,
+                issue_id=issue_id,
+            )
             issue_activity.delay(
-                type="module.activity.created",
-                requested_data=json.dumps({"module_id": module}),
+                type="module.activity.deleted",
+                requested_data=json.dumps({"module_id": str(module_id)}),
                 actor_id=str(request.user.id),
-                issue_id=issue_id,
-                project_id=project_id,
-                current_instance=None,
+                issue_id=str(issue_id),
+                project_id=str(project_id),
+                current_instance=json.dumps(
+                    {"module_name": module_issue.module.name}
+                ),
                 epoch=int(timezone.now().timestamp()),
                 notification=True,
                 origin=request.META.get("HTTP_ORIGIN"),
             )
-            for module in modules
-        ]
+            module_issue.delete()
 
         return Response({"message": "success"}, status=status.HTTP_201_CREATED)
 

apiserver/plane/authentication/views/app/signout.py

@@ -1,6 +1,3 @@
-# Python imports
-from urllib.parse import urljoin
-
 # Django imports
 from django.views import View
 from django.contrib.auth import logout
@@ -23,9 +20,10 @@ def post(self, request):
             user.save()
             # Log the user out
             logout(request)
-            url = urljoin(base_host(request=request, is_app=True), "sign-in")
-            return HttpResponseRedirect(url)
+            return HttpResponseRedirect(
+                base_host(request=request, is_app=True)
+            )
         except Exception:
             return HttpResponseRedirect(
-                base_host(request=request, is_app=True), "sign-in"
+                base_host(request=request, is_app=True)
             )

docker-compose-local.yml

@@ -97,7 +97,7 @@ services:
       - dev_env
     volumes:
       - ./apiserver:/code
-    command: ./bin/docker-entrypoint-api.sh
+    command: ./bin/docker-entrypoint-api-local.sh
     env_file:
       - ./apiserver/.env
     depends_on:

nginx/nginx.conf.dev

@@ -53,7 +53,6 @@ http {
         }
 
         location /spaces/ {
-            rewrite ^/spaces/?$ /spaces/login break;            
             proxy_http_version 1.1;
             proxy_set_header Upgrade ${dollar}http_upgrade;
             proxy_set_header Connection "upgrade";

nginx/nginx.conf.template

@@ -53,7 +53,6 @@ http {
         }
 
         location /spaces/ {
-            rewrite ^/spaces/?$ /spaces/login break;            
             proxy_http_version 1.1;
             proxy_set_header Upgrade ${dollar}http_upgrade;
             proxy_set_header Connection "upgrade";

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

@@ -16,6 +16,7 @@ module.exports = {
       "./ui/**/*.tsx",
       "../packages/ui/**/*.{js,ts,jsx,tsx}",
       "../packages/editor/**/src/**/*.{js,ts,jsx,tsx}",
+      "!../packages/ui/**/*.stories{js,ts,jsx,tsx}",
     ],
   },
   theme: {
@@ -108,6 +109,7 @@ module.exports = {
             100: convertToRGB("--color-text-100"),
             200: convertToRGB("--color-text-200"),
             300: convertToRGB("--color-text-300"),
+            350: convertToRGB("--color-text-350"),
             400: convertToRGB("--color-text-400"),
             500: convertToRGB("--color-text-500"),
             600: convertToRGB("--color-text-600"),

packages/ui/.storybook/main.ts

@@ -0,0 +1,28 @@
+import type { StorybookConfig } from "@storybook/react-webpack5";
+
+import { join, dirname } from "path";
+
+/**
+ * This function is used to resolve the absolute path of a package.
+ * It is needed in projects that use Yarn PnP or are set up within a monorepo.
+ */
+function getAbsolutePath(value: string): any {
+  return dirname(require.resolve(join(value, "package.json")));
+}
+const config: StorybookConfig = {
+  stories: ["../src/**/*.mdx", "../src/**/*.stories.@(js|jsx|mjs|ts|tsx)"],
+  addons: [
+    getAbsolutePath("@storybook/addon-webpack5-compiler-swc"),
+    getAbsolutePath("@storybook/addon-onboarding"),
+    getAbsolutePath("@storybook/addon-links"),
+    getAbsolutePath("@storybook/addon-essentials"),
+    getAbsolutePath("@chromatic-com/storybook"),
+    getAbsolutePath("@storybook/addon-interactions"),
+    "@storybook/addon-styling-webpack"
+  ],
+  framework: {
+    name: getAbsolutePath("@storybook/react-webpack5"),
+    options: {},
+  },
+};
+export default config;

packages/ui/.storybook/preview.ts

@@ -0,0 +1,14 @@
+import type { Preview } from "@storybook/react";
+import "../styles/output.css";
+const preview: Preview = {
+  parameters: {
+    controls: {
+      matchers: {
+        color: /(background|color)$/i,
+        date: /Date$/i,
+      },
+    },
+  },
+};
+
+export default preview;

packages/ui/package.json

@@ -14,7 +14,10 @@
   "scripts": {
     "build": "tsup src/index.ts --format esm,cjs --dts --external react --minify",
     "dev": "tsup src/index.ts --format esm,cjs --watch --dts --external react",
-    "clean": "rm -rf .turbo && rm -rf node_modules && rm -rf dist"
+    "clean": "rm -rf .turbo && rm -rf node_modules && rm -rf dist",
+    "storybook": "storybook dev -p 6006",
+    "build-storybook": "storybook build",
+    "postcss": "postcss styles/globals.css -o styles/output.css --watch"
   },
   "dependencies": {
     "@blueprintjs/core": "^4.16.3",
@@ -30,14 +33,30 @@
     "tailwind-merge": "^2.0.0"
   },
   "devDependencies": {
+    "@chromatic-com/storybook": "^1.4.0",
+    "@storybook/addon-essentials": "^8.1.1",
+    "@storybook/addon-interactions": "^8.1.1",
+    "@storybook/addon-links": "^8.1.1",
+    "@storybook/addon-onboarding": "^8.1.1",
+    "@storybook/addon-styling-webpack": "^1.0.0",
+    "@storybook/addon-webpack5-compiler-swc": "^1.0.2",
+    "@storybook/blocks": "^8.1.1",
+    "@storybook/react": "^8.1.1",
+    "@storybook/react-webpack5": "^8.1.1",
+    "@storybook/test": "^8.1.1",
     "@types/node": "^20.5.2",
     "@types/react": "^18.2.42",
     "@types/react-color": "^3.0.9",
     "@types/react-dom": "^18.2.17",
+    "autoprefixer": "^10.4.19",
     "classnames": "^2.3.2",
     "eslint-config-custom": "*",
+    "postcss-cli": "^11.0.0",
+    "postcss-nested": "^6.0.1",
     "react": "^18.2.0",
+    "storybook": "^8.1.1",
     "tailwind-config-custom": "*",
+    "tailwindcss": "^3.4.3",
     "tsconfig": "*",
     "tsup": "^5.10.1",
     "typescript": "4.7.4"

packages/ui/src/avatar/avatar.stories.tsx

@@ -0,0 +1,19 @@
+import type { Meta, StoryObj } from "@storybook/react";
+import { fn } from "@storybook/test";
+import { Avatar } from "./avatar";
+
+const meta: Meta<typeof Avatar> = {
+  title: "Avatar",
+  component: Avatar,
+};
+
+export default meta;
+type Story = StoryObj<typeof Avatar>;
+
+export const Default: Story = {
+  args: { name: "John Doe" },
+};
+
+export const Large: Story = {
+  args: { name: "John Doe" },
+};