removing trubo

.eslintrc.js

@@ -1,10 +1,8 @@
 module.exports = {
   root: true,
-  // This tells ESLint to load the config from the package `eslint-config-custom`
-  extends: ["custom"],
   settings: {
     next: {
-      rootDir: ["apps/*"],
+      rootDir: ["app/"],
     },
   },
 };

.github/workflows/push-image-backend.yml

@@ -1,4 +1,4 @@
-name: Build and Push Backend Docker Image
+name: Build Api Server Docker Image
 
 on:
   push:
@@ -10,8 +10,11 @@ on:
 
 jobs:
   build_push_backend:
-    name: Build and Push Api Server Docker Image
+    name: Build Api Server Docker Image
     runs-on: ubuntu-20.04
+    permissions:
+      contents: read
+      packages: write
 
     steps:
       - name: Check out the repo
@@ -25,33 +28,20 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2.5.0
 
-      - name: Login to GitHub Container Registry
+      - name: Login to Github Container Registry
         uses: docker/login-action@v2.1.0
         with:
           registry: "ghcr.io"
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Login to Docker Hub
-        uses: docker/login-action@v2.1.0
-        with:
-          registry: "registry.hub.docker.com"
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_PASSWORD }}
-
-      - name: Extract metadata (tags, labels) for Docker (Docker Hub)
-        id: ghmeta
-        uses: docker/metadata-action@v4.3.0
-        with:
-          images: makeplane/plane-backend
-
-      - name: Extract metadata (tags, labels) for Docker (Github)
-        id: dkrmeta
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
         uses: docker/metadata-action@v4.3.0
         with:
           images: ghcr.io/${{ github.repository }}-backend
 
-      - name: Build and Push to GitHub Container Registry
+      - name: Build Api Server
         uses: docker/build-push-action@v4.0.0
         with:
           context: ./apiserver
@@ -60,18 +50,5 @@ jobs:
           push: true
           cache-from: type=gha
           cache-to: type=gha
-          tags: ${{ steps.ghmeta.outputs.tags }}
-          labels: ${{ steps.ghmeta.outputs.labels }}
-
-      - name: Build and Push to Docker Hub
-        uses: docker/build-push-action@v4.0.0
-        with:
-          context: ./apiserver
-          file: ./apiserver/Dockerfile.api
-          platforms: linux/arm64,linux/amd64
-          push: true
-          cache-from: type=gha
-          cache-to: type=gha
-          tags: ${{ steps.dkrmeta.outputs.tags }}
-          labels: ${{ steps.dkrmeta.outputs.labels }}
-
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}

.github/workflows/push-image-frontend.yml

@@ -1,4 +1,4 @@
-name: Build and Push Frontend Docker Image
+name: Build Frontend Docker Image
 
 on:
   push:
@@ -12,6 +12,9 @@ jobs:
   build_push_frontend:
     name: Build Frontend Docker Image
     runs-on: ubuntu-20.04
+    permissions:
+      contents: read
+      packages: write
 
     steps:
       - name: Check out the repo
@@ -32,26 +35,13 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Login to Docker Hub
-        uses: docker/login-action@v2.1.0
-        with:
-          registry: "registry.hub.docker.com"
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_PASSWORD }}
-      
-      - name: Extract metadata (tags, labels) for Docker (Docker Hub)
-        id: ghmeta
-        uses: docker/metadata-action@v4.3.0
-        with:
-          images: makeplane/plane-frontend
-
-      - name: Extract metadata (tags, labels) for Docker (Github)
+      - name: Extract metadata (tags, labels) for Docker
         id: meta
         uses: docker/metadata-action@v4.3.0
         with:
           images: ghcr.io/${{ github.repository }}-frontend
 
-      - name: Build and Push to GitHub Container Registry
+      - name: Build Frontend Server
         uses: docker/build-push-action@v4.0.0
         with:
           context: .
@@ -60,18 +50,5 @@ jobs:
           push: true
           cache-from: type=gha
           cache-to: type=gha
-          tags: ${{ steps.ghmeta.outputs.tags }}
-          labels: ${{ steps.ghmeta.outputs.labels }}
-      
-      - name: Build and Push to Docker Container Registry
-        uses: docker/build-push-action@v4.0.0
-        with:
-          context: .
-          file: ./apps/app/Dockerfile.web
-          platforms: linux/arm64,linux/amd64
-          push: true
-          cache-from: type=gha
-          cache-to: type=gha
-          tags: ${{ steps.dkrmeta.outputs.tags }}
-          labels: ${{ steps.dkrmeta.outputs.labels }}
-
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}

Dockerfile

@@ -3,7 +3,6 @@ RUN apk add --no-cache libc6-compat
 RUN apk update
 # Set working directory
 WORKDIR /app
-ENV NEXT_PUBLIC_API_BASE_URL=http://NEXT_PUBLIC_API_BASE_URL_PLACEHOLDER
 
 RUN yarn global add turbo
 COPY . .
@@ -17,7 +16,7 @@ FROM node:18-alpine AS installer
 RUN apk add --no-cache libc6-compat
 RUN apk update
 WORKDIR /app
-ARG NEXT_PUBLIC_API_BASE_URL=http://localhost:8000
+
 # First install the dependencies (as they change less often)
 COPY .gitignore .gitignore
 COPY --from=builder /app/out/json/ .
@@ -27,16 +26,9 @@ RUN yarn install
 # Build the project
 COPY --from=builder /app/out/full/ .
 COPY turbo.json turbo.json
-COPY replace-env-vars.sh /usr/local/bin/
-USER root
-RUN chmod +x /usr/local/bin/replace-env-vars.sh
 
 RUN yarn turbo run build --filter=app
 
-ENV NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL \
-    BUILT_NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL
-
-RUN /usr/local/bin/replace-env-vars.sh http://NEXT_PUBLIC_WEBAPP_URL_PLACEHOLDER ${NEXT_PUBLIC_API_BASE_URL}
 
 FROM python:3.11.1-alpine3.17 AS backend
 
@@ -116,16 +108,6 @@ COPY nginx/nginx-single-docker-image.conf /etc/nginx/http.d/default.conf
 
 COPY nginx/supervisor.conf /code/supervisor.conf
 
-ARG NEXT_PUBLIC_API_BASE_URL=http://localhost:8000
-ENV NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL \
-    BUILT_NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL
-
-USER root
-COPY replace-env-vars.sh /usr/local/bin/
-COPY start.sh /usr/local/bin/
-RUN chmod +x /usr/local/bin/replace-env-vars.sh
-RUN chmod +x /usr/local/bin/start.sh
-
 
 CMD ["supervisord","-c","/code/supervisor.conf"]
 

README.md

@@ -26,7 +26,7 @@
     </a>
 </p>
 
-Meet [Plane](https://plane.so). An open-source software development tool to manage issues, sprints, and product roadmaps with peace of mind 🧘‍♀️.
+Meet Plane. An open-source software development tool to manage issues, sprints, and product roadmaps with peace of mind 🧘‍♀️.
 
 
 > Plane is still in its early days, not everything will be perfect yet, and hiccups may happen. Please let us know of any suggestions, ideas, or bugs that you encounter on our [Discord](https://discord.com/invite/A92xrEGCge) or GitHub issues, and we will use your feedback to improve on our upcoming releases.
@@ -58,18 +58,11 @@ cd plane
 
 > If running in a cloud env replace localhost with public facing IP address of the VM
 
-- Export Environment Variables
-
-```bash
-set -a
-source .env
-set +a
-```
 
 - Run Docker compose up
 
 ```bash
-docker-compose -f docker-compose-hub.yml up
+docker-compose up
 ```
 
 <strong>You can use the default email and password for your first login `captain@plane.so` and `password123`.</strong> 
@@ -135,7 +128,7 @@ To see how to Contribute, visit [here](https://github.com/makeplane/plane/blob/m
 
 The Plane community can be found on GitHub Discussions, where you can ask questions, voice ideas, and share your projects.
 
-To chat with other community members you can join the [Plane Discord](https://discord.com/invite/A92xrEGCge).
+To chat with other community members you can join the [Plane Discord](https://discord.com/invite/q9HKAdau).
 
 Our [Code of Conduct](https://github.com/makeplane/plane/blob/master/CODE_OF_CONDUCT.md) applies to all Plane community channels.
 

apiserver/.env.example

@@ -0,0 +1,28 @@
+DJANGO_SETTINGS_MODULE="plane.settings.production"
+# Database
+DATABASE_URL=postgres://plane:xyzzyspoon@db:5432/plane
+# Cache
+REDIS_URL=redis://redis:6379/
+# SMTP
+EMAIL_HOST=""
+EMAIL_HOST_USER=""
+EMAIL_HOST_PASSWORD=""
+EMAIL_PORT="587"
+EMAIL_USE_TLS="1"
+EMAIL_FROM="Team Plane <team@mailer.plane.so>"
+# AWS
+AWS_REGION=""
+AWS_ACCESS_KEY_ID=""
+AWS_SECRET_ACCESS_KEY=""
+AWS_S3_BUCKET_NAME=""
+AWS_S3_ENDPOINT_URL=""
+# FE
+WEB_URL="localhost/"
+# OAUTH
+GITHUB_CLIENT_SECRET=""
+# Flags
+DISABLE_COLLECTSTATIC=1
+DOCKERIZED=1
+# GPT Envs
+OPENAI_API_KEY=0
+GPT_ENGINE=0

apiserver/back_migration.py

@@ -3,15 +3,7 @@ import uuid
 import random
 from django.contrib.auth.hashers import make_password
 from plane.db.models import ProjectIdentifier
-from plane.db.models import (
-    Issue,
-    IssueComment,
-    User,
-    Project,
-    ProjectMember,
-    Label,
-    Integration,
-)
+from plane.db.models import Issue, IssueComment, User, Project, ProjectMember, Label
 
 
 # Update description and description html values for old descriptions
@@ -182,43 +174,3 @@ def update_label_color():
     except Exception as e:
         print(e)
         print("Failed")
-
-
-def create_slack_integration():
-    try:
-        _ = Integration.objects.create(provider="slack", network=2, title="Slack")
-        print("Success")
-    except Exception as e:
-        print(e)
-        print("Failed")
-
-
-def update_integration_verified():
-    try:
-        integrations = Integration.objects.all()
-        updated_integrations = []
-        for integration in integrations:
-            integration.verified = True
-            updated_integrations.append(integration)
-
-        Integration.objects.bulk_update(
-            updated_integrations, ["verified"], batch_size=10
-        )
-        print("Success")
-    except Exception as e:
-        print(e)
-        print("Failed")
-
-
-def update_start_date():
-    try:
-        issues = Issue.objects.filter(state__group__in=["started", "completed"])
-        updated_issues = []
-        for issue in issues:
-            issue.start_date = issue.created_at.date()
-            updated_issues.append(issue)
-        Issue.objects.bulk_update(updated_issues, ["start_date"], batch_size=500)
-        print("Success")
-    except Exception as e:
-        print(e)
-        print("Failed")

apiserver/plane/api/serializers/__init__.py

@@ -62,7 +62,6 @@ from .integration import (
     GithubRepositorySerializer,
     GithubRepositorySyncSerializer,
     GithubCommentSyncSerializer,
-    SlackProjectSyncSerializer,
 )
 
 from .importer import ImporterSerializer
@@ -70,5 +69,3 @@ from .importer import ImporterSerializer
 from .page import PageSerializer, PageBlockSerializer, PageFavoriteSerializer
 
 from .estimate import EstimateSerializer, EstimatePointSerializer, EstimateReadSerializer
-
-from .analytic import AnalyticViewSerializer

apiserver/plane/api/serializers/analytic.py

@@ -1,30 +0,0 @@
-from .base import BaseSerializer
-from plane.db.models import AnalyticView
-from plane.utils.issue_filters import issue_filters
-
-
-class AnalyticViewSerializer(BaseSerializer):
-    class Meta:
-        model = AnalyticView
-        fields = "__all__"
-        read_only_fields = [
-            "workspace",
-            "query",
-        ]
-
-    def create(self, validated_data):
-        query_params = validated_data.get("query_dict", {})
-        if bool(query_params):
-            validated_data["query"] = issue_filters(query_params, "POST")
-        else:
-            validated_data["query"] = dict()
-        return AnalyticView.objects.create(**validated_data)
-
-    def update(self, instance, validated_data):
-        query_params = validated_data.get("query_data", {})
-        if bool(query_params):
-            validated_data["query"] = issue_filters(query_params, "POST")
-        else:
-            validated_data["query"] = dict()
-        validated_data["query"] = issue_filters(query_params, "PATCH")
-        return super().update(instance, validated_data)

apiserver/plane/api/serializers/cycle.py

@@ -19,32 +19,10 @@ class CycleSerializer(BaseSerializer):
     started_issues = serializers.IntegerField(read_only=True)
     unstarted_issues = serializers.IntegerField(read_only=True)
     backlog_issues = serializers.IntegerField(read_only=True)
-    assignees = serializers.SerializerMethodField(read_only=True)
-    total_estimates = serializers.IntegerField(read_only=True)
-    completed_estimates = serializers.IntegerField(read_only=True)
-    started_estimates = serializers.IntegerField(read_only=True)
 
     workspace_detail = WorkspaceLiteSerializer(read_only=True, source="workspace")
     project_detail = ProjectLiteSerializer(read_only=True, source="project")
 
-    def get_assignees(self, obj):
-        members = [
-            {
-                "avatar": assignee.avatar,
-                "first_name": assignee.first_name,
-                "id": assignee.id,
-            }
-            for issue_cycle in obj.issue_cycle.all()
-            for assignee in issue_cycle.issue.assignees.all()
-        ]
-        # Use a set comprehension to return only the unique objects
-        unique_objects = {frozenset(item.items()) for item in members}
-
-        # Convert the set back to a list of dictionaries
-        unique_list = [dict(item) for item in unique_objects]
-
-        return unique_list
-
     class Meta:
         model = Cycle
         fields = "__all__"

apiserver/plane/api/serializers/estimate.py

@@ -2,13 +2,9 @@
 from .base import BaseSerializer
 
 from plane.db.models import Estimate, EstimatePoint
-from plane.api.serializers import WorkspaceLiteSerializer, ProjectLiteSerializer
 
 
 class EstimateSerializer(BaseSerializer):
-    workspace_detail = WorkspaceLiteSerializer(read_only=True, source="workspace")
-    project_detail = ProjectLiteSerializer(read_only=True, source="project")
-
     class Meta:
         model = Estimate
         fields = "__all__"
@@ -31,8 +27,6 @@ class EstimatePointSerializer(BaseSerializer):
 
 class EstimateReadSerializer(BaseSerializer):
     points = EstimatePointSerializer(read_only=True, many=True)
-    workspace_detail = WorkspaceLiteSerializer(read_only=True, source="workspace")
-    project_detail = ProjectLiteSerializer(read_only=True, source="project")
 
     class Meta:
         model = Estimate

apiserver/plane/api/serializers/importer.py

@@ -2,14 +2,12 @@
 from .base import BaseSerializer
 from .user import UserLiteSerializer
 from .project import ProjectLiteSerializer
-from .workspace import WorkspaceLiteSerializer
 from plane.db.models import Importer
 
 
 class ImporterSerializer(BaseSerializer):
     initiated_by_detail = UserLiteSerializer(source="initiated_by", read_only=True)
     project_detail = ProjectLiteSerializer(source="project", read_only=True)
-    workspace_detail = WorkspaceLiteSerializer(source="workspace", read_only=True)
 
     class Meta:
         model = Importer

apiserver/plane/api/serializers/integration/__init__.py

@@ -5,4 +5,3 @@ from .github import (
     GithubIssueSyncSerializer,
     GithubCommentSyncSerializer,
 )
-from .slack import SlackProjectSyncSerializer

apiserver/plane/api/serializers/integration/slack.py

@@ -1,14 +0,0 @@
-# Module imports
-from plane.api.serializers import BaseSerializer
-from plane.db.models import SlackProjectSync
-
-
-class SlackProjectSyncSerializer(BaseSerializer):
-    class Meta:
-        model = SlackProjectSync
-        fields = "__all__"
-        read_only_fields = [
-            "project",
-            "workspace",
-            "workspace_integration",
-        ]

apiserver/plane/api/serializers/project.py

@@ -82,9 +82,6 @@ class ProjectDetailSerializer(BaseSerializer):
     default_assignee = UserLiteSerializer(read_only=True)
     project_lead = UserLiteSerializer(read_only=True)
     is_favorite = serializers.BooleanField(read_only=True)
-    total_members = serializers.IntegerField(read_only=True)
-    total_cycles = serializers.IntegerField(read_only=True)
-    total_modules = serializers.IntegerField(read_only=True)
 
     class Meta:
         model = Project

apiserver/plane/api/urls.py

@@ -79,6 +79,7 @@ from plane.api.views import (
     ## End Issues
     # States
     StateViewSet,
+    StateDeleteIssueCheckEndpoint,
     ## End States
     # Estimates
     ProjectEstimatePointEndpoint,
@@ -131,7 +132,6 @@ from plane.api.views import (
     GithubIssueSyncViewSet,
     GithubCommentSyncViewSet,
     BulkCreateGithubIssueSyncEndpoint,
-    SlackProjectSyncViewSet,
     ## End Integrations
     # Importer
     ServiceIssueImportSummaryEndpoint,
@@ -148,13 +148,6 @@ from plane.api.views import (
     # Release Notes
     ReleaseNotesEndpoint,
     ## End Release Notes
-    # Analytics
-    AnalyticsEndpoint,
-    AnalyticViewViewset,
-    SavedAnalyticEndpoint,
-    ExportAnalyticsEndpoint,
-    DefaultAnalyticsEndpoint,
-    ## End Analytics
 )
 
 
@@ -315,6 +308,7 @@ urlpatterns = [
         "workspaces/<str:slug>/members/<uuid:pk>/",
         WorkSpaceMemberViewSet.as_view(
             {
+                "put": "update",
                 "patch": "partial_update",
                 "delete": "destroy",
                 "get": "retrieve",
@@ -424,6 +418,7 @@ urlpatterns = [
         ProjectMemberViewSet.as_view(
             {
                 "get": "retrieve",
+                "put": "update",
                 "patch": "partial_update",
                 "delete": "destroy",
             }
@@ -513,6 +508,11 @@ urlpatterns = [
         ),
         name="project-state",
     ),
+    path(
+        "workspaces/<str:slug>/projects/<uuid:project_id>/states/<uuid:pk>/",
+        StateDeleteIssueCheckEndpoint.as_view(),
+        name="state-delete-check",
+    ),
     # End States ##
     #  Estimates
     path(
@@ -1216,26 +1216,6 @@ urlpatterns = [
         ),
     ),
     ## End Github Integrations
-    # Slack Integration
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/workspace-integrations/<uuid:workspace_integration_id>/project-slack-sync/",
-        SlackProjectSyncViewSet.as_view(
-            {
-                "post": "create",
-                "get": "list",
-            }
-        ),
-    ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/workspace-integrations/<uuid:workspace_integration_id>/project-slack-sync/<uuid:pk>/",
-        SlackProjectSyncViewSet.as_view(
-            {
-                "delete": "destroy",
-                "get": "retrieve",
-            }
-        ),
-    ),
-    ## End Slack Integration
     ## End Integrations
     # Importer
     path(
@@ -1290,38 +1270,4 @@ urlpatterns = [
         name="release-notes",
     ),
     ## End Release Notes
-    # Analytics
-    path(
-        "workspaces/<str:slug>/analytics/",
-        AnalyticsEndpoint.as_view(),
-        name="plane-analytics",
-    ),
-    path(
-        "workspaces/<str:slug>/analytic-view/",
-        AnalyticViewViewset.as_view({"get": "list", "post": "create"}),
-        name="analytic-view",
-    ),
-    path(
-        "workspaces/<str:slug>/analytic-view/<uuid:pk>/",
-        AnalyticViewViewset.as_view(
-            {"get": "retrieve", "patch": "partial_update", "delete": "destroy"}
-        ),
-        name="analytic-view",
-    ),
-    path(
-        "workspaces/<str:slug>/saved-analytic-view/<uuid:analytic_id>/",
-        SavedAnalyticEndpoint.as_view(),
-        name="saved-analytic-view",
-    ),
-    path(
-        "workspaces/<str:slug>/export-analytics/",
-        ExportAnalyticsEndpoint.as_view(),
-        name="export-analytics",
-    ),
-    path(
-        "workspaces/<str:slug>/default-analytics/",
-        DefaultAnalyticsEndpoint.as_view(),
-        name="default-analytics",
-    ),
-    ## End Analytics
 ]

apiserver/plane/api/views/__init__.py

@@ -42,7 +42,7 @@ from .workspace import (
     UserWorkspaceDashboardEndpoint,
     WorkspaceThemeViewSet,
 )
-from .state import StateViewSet
+from .state import StateViewSet, StateDeleteIssueCheckEndpoint
 from .shortcut import ShortCutViewSet
 from .view import IssueViewViewSet, ViewIssuesEndpoint, IssueViewFavoriteViewSet
 from .cycle import (
@@ -106,7 +106,6 @@ from .integration import (
     GithubCommentSyncViewSet,
     GithubRepositoriesEndpoint,
     BulkCreateGithubIssueSyncEndpoint,
-    SlackProjectSyncViewSet,
 )
 
 from .importer import (
@@ -140,11 +139,3 @@ from .estimate import (
 
 
 from .release import ReleaseNotesEndpoint
-
-from .analytic import (
-    AnalyticsEndpoint,
-    AnalyticViewViewset,
-    SavedAnalyticEndpoint,
-    ExportAnalyticsEndpoint,
-    DefaultAnalyticsEndpoint,
-)

apiserver/plane/api/views/analytic.py

@@ -1,295 +0,0 @@
-# Django imports
-from django.db.models import (
-    Count,
-    Sum,
-    F,
-)
-from django.db.models.functions import ExtractMonth
-
-# Third party imports
-from rest_framework import status
-from rest_framework.response import Response
-from sentry_sdk import capture_exception
-
-# Module imports
-from plane.api.views import BaseAPIView, BaseViewSet
-from plane.api.permissions import WorkSpaceAdminPermission
-from plane.db.models import Issue, AnalyticView, Workspace, State, Label
-from plane.api.serializers import AnalyticViewSerializer
-from plane.utils.analytics_plot import build_graph_plot
-from plane.bgtasks.analytic_plot_export import analytic_export_task
-from plane.utils.issue_filters import issue_filters
-
-
-class AnalyticsEndpoint(BaseAPIView):
-    permission_classes = [
-        WorkSpaceAdminPermission,
-    ]
-
-    def get(self, request, slug):
-        try:
-            x_axis = request.GET.get("x_axis", False)
-            y_axis = request.GET.get("y_axis", False)
-
-            if not x_axis or not y_axis:
-                return Response(
-                    {"error": "x-axis and y-axis dimensions are required"},
-                    status=status.HTTP_400_BAD_REQUEST,
-                )
-
-            segment = request.GET.get("segment", False)
-            filters = issue_filters(request.GET, "GET")
-
-            queryset = Issue.objects.filter(workspace__slug=slug, **filters)
-
-            total_issues = queryset.count()
-            distribution = build_graph_plot(
-                queryset=queryset, x_axis=x_axis, y_axis=y_axis, segment=segment
-            )
-
-            colors = dict()
-            if x_axis in ["state__name", "state__group"] or segment in [
-                "state__name",
-                "state__group",
-            ]:
-                if x_axis in ["state__name", "state__group"]:
-                    key = "name" if x_axis == "state__name" else "group"
-                else:
-                    key = "name" if segment == "state__name" else "group"
-
-                colors = (
-                    State.objects.filter(
-                        workspace__slug=slug, project_id__in=filters.get("project__in")
-                    ).values(key, "color")
-                    if filters.get("project__in", False)
-                    else State.objects.filter(workspace__slug=slug).values(key, "color")
-                )
-
-            if x_axis in ["labels__name"] or segment in ["labels__name"]:
-                colors = (
-                    Label.objects.filter(
-                        workspace__slug=slug, project_id__in=filters.get("project__in")
-                    ).values("name", "color")
-                    if filters.get("project__in", False)
-                    else Label.objects.filter(workspace__slug=slug).values(
-                        "name", "color"
-                    )
-                )
-
-            assignee_details = {}
-            if x_axis in ["assignees__email"] or segment in ["assignees__email"]:
-                assignee_details = (
-                    Issue.objects.filter(workspace__slug=slug, **filters, assignees__avatar__isnull=False)
-                    .order_by("assignees__id")
-                    .distinct("assignees__id")
-                    .values("assignees__avatar", "assignees__email", "assignees__first_name", "assignees__last_name")
-                )
-
-
-            return Response(
-                {
-                    "total": total_issues,
-                    "distribution": distribution,
-                    "extras": {"colors": colors, "assignee_details": assignee_details},
-                },
-                status=status.HTTP_200_OK,
-            )
-
-        except Exception as e:
-            capture_exception(e)
-            return Response(
-                {"error": "Something went wrong please try again later"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
-
-class AnalyticViewViewset(BaseViewSet):
-    permission_classes = [
-        WorkSpaceAdminPermission,
-    ]
-    model = AnalyticView
-    serializer_class = AnalyticViewSerializer
-
-    def perform_create(self, serializer):
-        workspace = Workspace.objects.get(slug=self.kwargs.get("slug"))
-        serializer.save(workspace_id=workspace.id)
-
-    def get_queryset(self):
-        return self.filter_queryset(
-            super().get_queryset().filter(workspace__slug=self.kwargs.get("slug"))
-        )
-
-
-class SavedAnalyticEndpoint(BaseAPIView):
-    permission_classes = [
-        WorkSpaceAdminPermission,
-    ]
-
-    def get(self, request, slug, analytic_id):
-        try:
-            analytic_view = AnalyticView.objects.get(
-                pk=analytic_id, workspace__slug=slug
-            )
-
-            filter = analytic_view.query
-            queryset = Issue.objects.filter(**filter)
-
-            x_axis = analytic_view.query_dict.get("x_axis", False)
-            y_axis = analytic_view.query_dict.get("y_axis", False)
-
-            if not x_axis or not y_axis:
-                return Response(
-                    {"error": "x-axis and y-axis dimensions are required"},
-                    status=status.HTTP_400_BAD_REQUEST,
-                )
-
-            segment = request.GET.get("segment", False)
-            distribution = build_graph_plot(
-                queryset=queryset, x_axis=x_axis, y_axis=y_axis, segment=segment
-            )
-            total_issues = queryset.count()
-            return Response(
-                {"total": total_issues, "distribution": distribution},
-                status=status.HTTP_200_OK,
-            )
-
-        except AnalyticView.DoesNotExist:
-            return Response(
-                {"error": "Analytic View Does not exist"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-        except Exception as e:
-            capture_exception(e)
-            return Response(
-                {"error": "Something went wrong please try again later"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
-
-class ExportAnalyticsEndpoint(BaseAPIView):
-    permission_classes = [
-        WorkSpaceAdminPermission,
-    ]
-
-    def post(self, request, slug):
-        try:
-            x_axis = request.data.get("x_axis", False)
-            y_axis = request.data.get("y_axis", False)
-
-            if not x_axis or not y_axis:
-                return Response(
-                    {"error": "x-axis and y-axis dimensions are required"},
-                    status=status.HTTP_400_BAD_REQUEST,
-                )
-
-            analytic_export_task.delay(
-                email=request.user.email, data=request.data, slug=slug
-            )
-
-            return Response(
-                {
-                    "message": f"Once the export is ready it will be emailed to you at {str(request.user.email)}"
-                },
-                status=status.HTTP_200_OK,
-            )
-        except Exception as e:
-            capture_exception(e)
-            return Response(
-                {"error": "Something went wrong please try again later"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
-
-class DefaultAnalyticsEndpoint(BaseAPIView):
-    permission_classes = [
-        WorkSpaceAdminPermission,
-    ]
-
-    def get(self, request, slug):
-        try:
-            filters = issue_filters(request.GET, "GET")
-
-            queryset = Issue.objects.filter(workspace__slug=slug, **filters)
-
-            total_issues = queryset.count()
-
-            total_issues_classified = (
-                queryset.annotate(state_group=F("state__group"))
-                .values("state_group")
-                .annotate(state_count=Count("state_group"))
-                .order_by("state_group")
-            )
-
-            open_issues = queryset.filter(
-                state__group__in=["backlog", "unstarted", "started"]
-            ).count()
-
-            open_issues_classified = (
-                queryset.filter(state__group__in=["backlog", "unstarted", "started"])
-                .annotate(state_group=F("state__group"))
-                .values("state_group")
-                .annotate(state_count=Count("state_group"))
-                .order_by("state_group")
-            )
-
-            issue_completed_month_wise = (
-                queryset.filter(completed_at__isnull=False)
-                .annotate(month=ExtractMonth("completed_at"))
-                .values("month")
-                .annotate(count=Count("*"))
-                .order_by("month")
-            )
-            most_issue_created_user = (
-                queryset.exclude(created_by=None)
-                .values("created_by__first_name", "created_by__last_name", "created_by__avatar", "created_by__email")
-                .annotate(count=Count("id"))
-                .order_by("-count")
-            )[:5]
-
-            most_issue_closed_user = (
-                queryset.filter(completed_at__isnull=False, assignees__isnull=False)
-                .values("assignees__first_name", "assignees__last_name", "assignees__avatar", "assignees__email")
-                .annotate(count=Count("id"))
-                .order_by("-count")
-            )[:5]
-
-            pending_issue_user = (
-                queryset.filter(completed_at__isnull=True)
-                .values("assignees__first_name", "assignees__last_name", "assignees__avatar", "assignees__email")
-                .annotate(count=Count("id"))
-                .order_by("-count")
-            )
-
-            open_estimate_sum = (
-                queryset.filter(
-                    state__group__in=["backlog", "unstarted", "started"]
-                ).aggregate(open_estimate_sum=Sum("estimate_point"))
-            )["open_estimate_sum"]
-            print(open_estimate_sum)
-            
-            total_estimate_sum = queryset.aggregate(
-                total_estimate_sum=Sum("estimate_point")
-            )["total_estimate_sum"]
-
-            return Response(
-                {
-                    "total_issues": total_issues,
-                    "total_issues_classified": total_issues_classified,
-                    "open_issues": open_issues,
-                    "open_issues_classified": open_issues_classified,
-                    "issue_completed_month_wise": issue_completed_month_wise,
-                    "most_issue_created_user": most_issue_created_user,
-                    "most_issue_closed_user": most_issue_closed_user,
-                    "pending_issue_user": pending_issue_user,
-                    "open_estimate_sum": open_estimate_sum,
-                    "total_estimate_sum": total_estimate_sum,
-                },
-                status=status.HTTP_200_OK,
-            )
-
-        except Exception as e:
-            capture_exception(e)
-            return Response(
-                {"error": "Something went wrong please try again later"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )

apiserver/plane/api/views/cycle.py

@@ -3,17 +3,7 @@ import json
 
 # Django imports
 from django.db import IntegrityError
-from django.db.models import (
-    OuterRef,
-    Func,
-    F,
-    Q,
-    Exists,
-    OuterRef,
-    Count,
-    Prefetch,
-    Sum,
-)
+from django.db.models import OuterRef, Func, F, Q, Exists, OuterRef, Count, Prefetch
 from django.core import serializers
 from django.utils import timezone
 from django.utils.decorators import method_decorator
@@ -34,7 +24,6 @@ from plane.api.serializers import (
 )
 from plane.api.permissions import ProjectEntityPermission
 from plane.db.models import (
-    User,
     Cycle,
     CycleIssue,
     Issue,
@@ -59,28 +48,6 @@ class CycleViewSet(BaseViewSet):
             project_id=self.kwargs.get("project_id"), owned_by=self.request.user
         )
 
-    def perform_destroy(self, instance):
-        cycle_issues = list(
-            CycleIssue.objects.filter(cycle_id=self.kwargs.get("pk")).values_list(
-                "issue", flat=True
-            )
-        )
-        issue_activity.delay(
-            type="cycle.activity.deleted",
-            requested_data=json.dumps(
-                {
-                    "cycle_id": str(self.kwargs.get("pk")),
-                    "issues": [str(issue_id) for issue_id in cycle_issues],
-                }
-            ),
-            actor_id=str(self.request.user.id),
-            issue_id=str(self.kwargs.get("pk", None)),
-            project_id=str(self.kwargs.get("project_id", None)),
-            current_instance=None,
-        )
-
-        return super().perform_destroy(instance)
-
     def get_queryset(self):
         subquery = CycleFavorite.objects.filter(
             user=self.request.user,
@@ -129,25 +96,6 @@ class CycleViewSet(BaseViewSet):
                     filter=Q(issue_cycle__issue__state__group="backlog"),
                 )
             )
-            .annotate(total_estimates=Sum("issue_cycle__issue__estimate_point"))
-            .annotate(
-                completed_estimates=Sum(
-                    "issue_cycle__issue__estimate_point",
-                    filter=Q(issue_cycle__issue__state__group="completed"),
-                )
-            )
-            .annotate(
-                started_estimates=Sum(
-                    "issue_cycle__issue__estimate_point",
-                    filter=Q(issue_cycle__issue__state__group="started"),
-                )
-            )
-            .prefetch_related(
-                Prefetch(
-                    "issue_cycle__issue__assignees",
-                    queryset=User.objects.only("avatar", "first_name", "id").distinct(),
-                )
-            )
             .order_by("-is_favorite", "name")
             .distinct()
         )
@@ -233,22 +181,6 @@ class CycleIssueViewSet(BaseViewSet):
             cycle_id=self.kwargs.get("cycle_id"),
         )
 
-    def perform_destroy(self, instance):
-        issue_activity.delay(
-            type="cycle.activity.deleted",
-            requested_data=json.dumps(
-                {
-                    "cycle_id": str(self.kwargs.get("cycle_id")),
-                    "issues": [str(instance.issue_id)],
-                }
-            ),
-            actor_id=str(self.request.user.id),
-            issue_id=str(self.kwargs.get("pk", None)),
-            project_id=str(self.kwargs.get("project_id", None)),
-            current_instance=None,
-        )
-        return super().perform_destroy(instance)
-
     def get_queryset(self):
         return self.filter_queryset(
             super()
@@ -354,9 +286,9 @@ class CycleIssueViewSet(BaseViewSet):
 
             # Get all CycleIssues already created
             cycle_issues = list(CycleIssue.objects.filter(issue_id__in=issues))
+            records_to_update = []
             update_cycle_issue_activity = []
             record_to_create = []
-            records_to_update = []
 
             for issue in issues:
                 cycle_issue = [
@@ -401,7 +333,7 @@ class CycleIssueViewSet(BaseViewSet):
 
             # Capture Issue Activity
             issue_activity.delay(
-                type="cycle.activity.created",
+                type="issue.activity.updated",
                 requested_data=json.dumps({"cycles_list": issues}),
                 actor_id=str(self.request.user.id),
                 issue_id=str(self.kwargs.get("pk", None)),
@@ -443,7 +375,7 @@ class CycleDateCheckEndpoint(BaseAPIView):
         try:
             start_date = request.data.get("start_date", False)
             end_date = request.data.get("end_date", False)
-            cycle_id = request.data.get("cycle_id")
+
             if not start_date or not end_date:
                 return Response(
                     {"error": "Start date and end date both are required"},
@@ -451,14 +383,12 @@ class CycleDateCheckEndpoint(BaseAPIView):
                 )
 
             cycles = Cycle.objects.filter(
-                Q(workspace__slug=slug)
-                & Q(project_id=project_id)
-                & (
-                    Q(start_date__lte=start_date, end_date__gte=start_date)
-                    | Q(start_date__lte=end_date, end_date__gte=end_date)
-                    | Q(start_date__gte=start_date, end_date__lte=end_date)
-                )
-            ).exclude(pk=cycle_id)
+                Q(start_date__lte=start_date, end_date__gte=start_date)
+                | Q(start_date__lte=end_date, end_date__gte=end_date)
+                | Q(start_date__gte=start_date, end_date__lte=end_date),
+                workspace__slug=slug,
+                project_id=project_id,
+            )
 
             if cycles.exists():
                 return Response(
@@ -533,27 +463,6 @@ class CurrentUpcomingCyclesEndpoint(BaseAPIView):
                         filter=Q(issue_cycle__issue__state__group="backlog"),
                     )
                 )
-                .annotate(total_estimates=Sum("issue_cycle__issue__estimate_point"))
-                .annotate(
-                    completed_estimates=Sum(
-                        "issue_cycle__issue__estimate_point",
-                        filter=Q(issue_cycle__issue__state__group="completed"),
-                    )
-                )
-                .annotate(
-                    started_estimates=Sum(
-                        "issue_cycle__issue__estimate_point",
-                        filter=Q(issue_cycle__issue__state__group="started"),
-                    )
-                )
-                .prefetch_related(
-                    Prefetch(
-                        "issue_cycle__issue__assignees",
-                        queryset=User.objects.only(
-                            "avatar", "first_name", "id"
-                        ).distinct(),
-                    )
-                )
                 .order_by("name", "-is_favorite")
             )
 
@@ -598,27 +507,6 @@ class CurrentUpcomingCyclesEndpoint(BaseAPIView):
                         filter=Q(issue_cycle__issue__state__group="backlog"),
                     )
                 )
-                .annotate(total_estimates=Sum("issue_cycle__issue__estimate_point"))
-                .annotate(
-                    completed_estimates=Sum(
-                        "issue_cycle__issue__estimate_point",
-                        filter=Q(issue_cycle__issue__state__group="completed"),
-                    )
-                )
-                .annotate(
-                    started_estimates=Sum(
-                        "issue_cycle__issue__estimate_point",
-                        filter=Q(issue_cycle__issue__state__group="started"),
-                    )
-                )
-                .prefetch_related(
-                    Prefetch(
-                        "issue_cycle__issue__assignees",
-                        queryset=User.objects.only(
-                            "avatar", "first_name", "id"
-                        ).distinct(),
-                    )
-                )
                 .order_by("name", "-is_favorite")
             )
 
@@ -692,27 +580,6 @@ class CompletedCyclesEndpoint(BaseAPIView):
                         filter=Q(issue_cycle__issue__state__group="backlog"),
                     )
                 )
-                .annotate(total_estimates=Sum("issue_cycle__issue__estimate_point"))
-                .annotate(
-                    completed_estimates=Sum(
-                        "issue_cycle__issue__estimate_point",
-                        filter=Q(issue_cycle__issue__state__group="completed"),
-                    )
-                )
-                .annotate(
-                    started_estimates=Sum(
-                        "issue_cycle__issue__estimate_point",
-                        filter=Q(issue_cycle__issue__state__group="started"),
-                    )
-                )
-                .prefetch_related(
-                    Prefetch(
-                        "issue_cycle__issue__assignees",
-                        queryset=User.objects.only(
-                            "avatar", "first_name", "id"
-                        ).distinct(),
-                    )
-                )
                 .order_by("name", "-is_favorite")
             )
 
@@ -788,27 +655,6 @@ class DraftCyclesEndpoint(BaseAPIView):
                         filter=Q(issue_cycle__issue__state__group="backlog"),
                     )
                 )
-                .annotate(total_estimates=Sum("issue_cycle__issue__estimate_point"))
-                .annotate(
-                    completed_estimates=Sum(
-                        "issue_cycle__issue__estimate_point",
-                        filter=Q(issue_cycle__issue__state__group="completed"),
-                    )
-                )
-                .annotate(
-                    started_estimates=Sum(
-                        "issue_cycle__issue__estimate_point",
-                        filter=Q(issue_cycle__issue__state__group="started"),
-                    )
-                )
-                .prefetch_related(
-                    Prefetch(
-                        "issue_cycle__issue__assignees",
-                        queryset=User.objects.only(
-                            "avatar", "first_name", "id"
-                        ).distinct(),
-                    )
-                )
                 .order_by("name", "-is_favorite")
             )
 

apiserver/plane/api/views/estimate.py

@@ -53,11 +53,11 @@ class BulkEstimatePointEndpoint(BaseViewSet):
         try:
             estimates = Estimate.objects.filter(
                 workspace__slug=slug, project_id=project_id
-            ).prefetch_related("points").select_related("workspace", "project")
+            ).prefetch_related("points")
             serializer = EstimateReadSerializer(estimates, many=True)
             return Response(serializer.data, status=status.HTTP_200_OK)
         except Exception as e:
-            capture_exception(e)
+            print(e)
             return Response(
                 {"error": "Something went wrong please try again later"},
                 status=status.HTTP_400_BAD_REQUEST,
@@ -211,7 +211,7 @@ class BulkEstimatePointEndpoint(BaseViewSet):
 
             try:
                 EstimatePoint.objects.bulk_update(
-                    updated_estimate_points, ["value"], batch_size=10,
+                    updated_estimate_points, ["value"], batch_size=10
                 )
             except IntegrityError as e:
                 return Response(

apiserver/plane/api/views/importer.py

@@ -28,7 +28,6 @@ from plane.db.models import (
     Module,
     ModuleLink,
     ModuleIssue,
-    Label,
 )
 from plane.api.serializers import (
     ImporterSerializer,
@@ -236,20 +235,9 @@ class ImportServiceEndpoint(BaseAPIView):
 
     def delete(self, request, slug, service, pk):
         try:
-            importer = Importer.objects.get(
+            importer = Importer.objects.filter(
                 pk=pk, service=service, workspace__slug=slug
             )
-            # Delete all imported Issues
-            imported_issues = importer.imported_data.get("issues", [])
-            Issue.objects.filter(id__in=imported_issues).delete()
-
-            # Delete all imported Labels
-            imported_labels = importer.imported_data.get("labels", [])
-            Label.objects.filter(id__in=imported_labels).delete()
-
-            if importer.service == "jira":
-                imported_modules = importer.imported_data.get("modules", [])
-                Module.objects.filter(id__in=imported_modules).delete()
             importer.delete()
             return Response(status=status.HTTP_204_NO_CONTENT)
         except Exception as e:
@@ -259,27 +247,6 @@ class ImportServiceEndpoint(BaseAPIView):
                 status=status.HTTP_400_BAD_REQUEST,
             )
 
-    def patch(self, request, slug, service, pk):
-        try:
-            importer = Importer.objects.get(
-                pk=pk, service=service, workspace__slug=slug
-            )
-            serializer = ImporterSerializer(importer, data=request.data, partial=True)
-            if serializer.is_valid():
-                serializer.save()
-                return Response(serializer.data, status=status.HTTP_200_OK)
-            return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
-        except Importer.DoesNotExist:
-            return Response(
-                {"error": "Importer Does not exists"}, status=status.HTTP_404_NOT_FOUND
-            )
-        except Exception as e:
-            capture_exception(e)
-            return Response(
-                {"error": "Something went wrong please try again later"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
 
 class UpdateServiceImportStatusEndpoint(BaseAPIView):
     def post(self, request, slug, project_id, service, importer_id):
@@ -363,7 +330,6 @@ class BulkImportIssuesEndpoint(BaseAPIView):
                         start_date=issue_data.get("start_date", None),
                         target_date=issue_data.get("target_date", None),
                         priority=issue_data.get("priority", None),
-                        created_by=request.user,
                     )
                 )
 
@@ -401,6 +367,7 @@ class BulkImportIssuesEndpoint(BaseAPIView):
                         project_id=project_id,
                         workspace_id=project.workspace_id,
                         created_by=request.user,
+                        updated_by=request.user,
                     )
                     for label_id in labels_list
                 ]
@@ -420,6 +387,7 @@ class BulkImportIssuesEndpoint(BaseAPIView):
                         project_id=project_id,
                         workspace_id=project.workspace_id,
                         created_by=request.user,
+                        updated_by=request.user,
                     )
                     for assignee_id in assignees_list
                 ]
@@ -438,7 +406,6 @@ class BulkImportIssuesEndpoint(BaseAPIView):
                         workspace_id=project.workspace_id,
                         comment=f"{request.user.email} importer the issue from {service}",
                         verb="created",
-                        created_by=request.user,
                     )
                     for issue in issues
                 ],
@@ -457,6 +424,7 @@ class BulkImportIssuesEndpoint(BaseAPIView):
                         project_id=project_id,
                         workspace_id=project.workspace_id,
                         created_by=request.user,
+                        updated_by=request.user,
                     )
                     for comment in comments_list
                 ]
@@ -473,6 +441,7 @@ class BulkImportIssuesEndpoint(BaseAPIView):
                         project_id=project_id,
                         workspace_id=project.workspace_id,
                         created_by=request.user,
+                        updated_by=request.user,
                     )
                     for issue, issue_data in zip(issues, issues_data)
                 ]
@@ -510,6 +479,7 @@ class BulkImportModulesEndpoint(BaseAPIView):
                         project_id=project_id,
                         workspace_id=project.workspace_id,
                         created_by=request.user,
+                        updated_by=request.user,
                     )
                     for module in modules_data
                 ],
@@ -517,57 +487,48 @@ class BulkImportModulesEndpoint(BaseAPIView):
                 ignore_conflicts=True,
             )
 
-            modules = Module.objects.filter(id__in=[module.id for module in modules])
+            _ = ModuleLink.objects.bulk_create(
+                [
+                    ModuleLink(
+                        module=module,
+                        url=module_data.get("link", {}).get("url", "https://plane.so"),
+                        title=module_data.get("link", {}).get(
+                            "title", "Original Issue"
+                        ),
+                        project_id=project_id,
+                        workspace_id=project.workspace_id,
+                        created_by=request.user,
+                        updated_by=request.user,
+                    )
+                    for module, module_data in zip(modules, modules_data)
+                ],
+                batch_size=100,
+                ignore_conflicts=True,
+            )
 
-            if len(modules) == len(modules_data):
-                _ = ModuleLink.objects.bulk_create(
-                    [
-                        ModuleLink(
-                            module=module,
-                            url=module_data.get("link", {}).get(
-                                "url", "https://plane.so"
-                            ),
-                            title=module_data.get("link", {}).get(
-                                "title", "Original Issue"
-                            ),
-                            project_id=project_id,
-                            workspace_id=project.workspace_id,
-                            created_by=request.user,
-                        )
-                        for module, module_data in zip(modules, modules_data)
-                    ],
-                    batch_size=100,
-                    ignore_conflicts=True,
-                )
+            bulk_module_issues = []
+            for module, module_data in zip(modules, modules_data):
+                module_issues_list = module_data.get("module_issues_list", [])
+                bulk_module_issues = bulk_module_issues + [
+                    ModuleIssue(
+                        issue_id=issue,
+                        module=module,
+                        project_id=project_id,
+                        workspace_id=project.workspace_id,
+                        created_by=request.user,
+                        updated_by=request.user,
+                    )
+                    for issue in module_issues_list
+                ]
 
-                bulk_module_issues = []
-                for module, module_data in zip(modules, modules_data):
-                    module_issues_list = module_data.get("module_issues_list", [])
-                    bulk_module_issues = bulk_module_issues + [
-                        ModuleIssue(
-                            issue_id=issue,
-                            module=module,
-                            project_id=project_id,
-                            workspace_id=project.workspace_id,
-                            created_by=request.user,
-                        )
-                        for issue in module_issues_list
-                    ]
+            _ = ModuleIssue.objects.bulk_create(
+                bulk_module_issues, batch_size=100, ignore_conflicts=True
+            )
 
-                _ = ModuleIssue.objects.bulk_create(
-                    bulk_module_issues, batch_size=100, ignore_conflicts=True
-                )
-
-                serializer = ModuleSerializer(modules, many=True)
-                return Response(
-                    {"modules": serializer.data}, status=status.HTTP_201_CREATED
-                )
-
-            else:
-                return Response(
-                    {"message": "Modules created but issues could not be imported"},
-                    status=status.HTTP_200_OK,
-                )
+            serializer = ModuleSerializer(modules, many=True)
+            return Response(
+                {"modules": serializer.data}, status=status.HTTP_201_CREATED
+            )
         except Project.DoesNotExist:
             return Response(
                 {"error": "Project does not exist"}, status=status.HTTP_404_NOT_FOUND

apiserver/plane/api/views/integration/__init__.py

@@ -6,4 +6,3 @@ from .github import (
     GithubCommentSyncViewSet,
     GithubRepositoriesEndpoint,
 )
-from .slack import SlackProjectSyncViewSet

apiserver/plane/api/views/integration/base.py

@@ -27,7 +27,6 @@ from plane.utils.integrations.github import (
 )
 from plane.api.permissions import WorkSpaceAdminPermission
 
-
 class IntegrationViewSet(BaseViewSet):
     serializer_class = IntegrationSerializer
     model = Integration
@@ -102,6 +101,7 @@ class WorkspaceIntegrationViewSet(BaseViewSet):
         WorkSpaceAdminPermission,
     ]
 
+
     def get_queryset(self):
         return (
             super()
@@ -112,30 +112,21 @@ class WorkspaceIntegrationViewSet(BaseViewSet):
 
     def create(self, request, slug, provider):
         try:
+            installation_id = request.data.get("installation_id", None)
+
+            if not installation_id:
+                return Response(
+                    {"error": "Installation ID is required"},
+                    status=status.HTTP_400_BAD_REQUEST,
+                )
+
             workspace = Workspace.objects.get(slug=slug)
             integration = Integration.objects.get(provider=provider)
             config = {}
             if provider == "github":
-                installation_id = request.data.get("installation_id", None)
-                if not installation_id:
-                    return Response(
-                        {"error": "Installation ID is required"},
-                        status=status.HTTP_400_BAD_REQUEST,
-                    )
                 metadata = get_github_metadata(installation_id)
                 config = {"installation_id": installation_id}
 
-            if provider == "slack":
-                metadata = request.data.get("metadata", {})
-                access_token = metadata.get("access_token", False)
-                team_id = metadata.get("team", {}).get("id", False)
-                if not metadata or not access_token or not team_id:
-                    return Response(
-                        {"error": "Access token and team id is required"},
-                        status=status.HTTP_400_BAD_REQUEST,
-                    )
-                config = {"team_id": team_id, "access_token": access_token}
-
             # Create a bot user
             bot_user = User.objects.create(
                 email=f"{uuid.uuid4().hex}@plane.so",

apiserver/plane/api/views/integration/slack.py

@@ -1,59 +0,0 @@
-# Django import
-from django.db import IntegrityError
-
-# Third party imports
-from rest_framework import status
-from rest_framework.response import Response
-from sentry_sdk import capture_exception
-
-# Module imports
-from plane.api.views import BaseViewSet, BaseAPIView
-from plane.db.models import SlackProjectSync, WorkspaceIntegration, ProjectMember
-from plane.api.serializers import SlackProjectSyncSerializer
-from plane.api.permissions import ProjectBasePermission, ProjectEntityPermission
-
-
-class SlackProjectSyncViewSet(BaseViewSet):
-    permission_classes = [
-        ProjectBasePermission,
-    ]
-    serializer_class = SlackProjectSyncSerializer
-    model = SlackProjectSync
-
-    def create(self, request, slug, project_id, workspace_integration_id):
-        try:
-            serializer = SlackProjectSyncSerializer(data=request.data)
-
-            workspace_integration = WorkspaceIntegration.objects.get(
-                workspace__slug=slug, pk=workspace_integration_id
-            )
-
-            if serializer.is_valid():
-                serializer.save(
-                    project_id=project_id,
-                    workspace_integration_id=workspace_integration_id,
-                )
-
-                workspace_integration = WorkspaceIntegration.objects.get(
-                    pk=workspace_integration_id, workspace__slug=slug
-                )
-
-                _ = ProjectMember.objects.get_or_create(
-                    member=workspace_integration.actor, role=20, project_id=project_id
-                )
-
-                return Response(serializer.data, status=status.HTTP_200_OK)
-            return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
-        except IntegrityError:
-            return Response({"error": "Slack is already enabled for the project"}, status=status.HTTP_400_BAD_REQUEST)
-        except WorkspaceIntegration.DoesNotExist:
-            return Response(
-                {"error": "Workspace Integration does not exist"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-        except Exception as e:
-            print(e)
-            return Response(
-                {"error": "Something went wrong please try again later"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )

apiserver/plane/api/views/module.py

@@ -109,28 +109,6 @@ class ModuleViewSet(BaseViewSet):
             .order_by("-is_favorite", "name")
         )
 
-    def perform_destroy(self, instance):
-        module_issues = list(
-            ModuleIssue.objects.filter(module_id=self.kwargs.get("pk")).values_list(
-                "issue", flat=True
-            )
-        )
-        issue_activity.delay(
-            type="module.activity.deleted",
-            requested_data=json.dumps(
-                {
-                    "module_id": str(self.kwargs.get("pk")),
-                    "issues": [str(issue_id) for issue_id in module_issues],
-                }
-            ),
-            actor_id=str(self.request.user.id),
-            issue_id=str(self.kwargs.get("pk", None)),
-            project_id=str(self.kwargs.get("project_id", None)),
-            current_instance=None,
-        )
-
-        return super().perform_destroy(instance)
-
     def create(self, request, slug, project_id):
         try:
             project = Project.objects.get(workspace__slug=slug, pk=project_id)
@@ -180,22 +158,6 @@ class ModuleIssueViewSet(BaseViewSet):
             module_id=self.kwargs.get("module_id"),
         )
 
-    def perform_destroy(self, instance):
-        issue_activity.delay(
-            type="module.activity.deleted",
-            requested_data=json.dumps(
-                {
-                    "module_id": str(self.kwargs.get("module_id")),
-                    "issues": [str(instance.issue_id)],
-                }
-            ),
-            actor_id=str(self.request.user.id),
-            issue_id=str(self.kwargs.get("pk", None)),
-            project_id=str(self.kwargs.get("project_id", None)),
-            current_instance=None,
-        )
-        return super().perform_destroy(instance)
-
     def get_queryset(self):
         return self.filter_queryset(
             super()
@@ -340,7 +302,7 @@ class ModuleIssueViewSet(BaseViewSet):
 
             # Capture Issue Activity
             issue_activity.delay(
-                type="module.activity.created",
+                type="issue.activity.updated",
                 requested_data=json.dumps({"modules_list": issues}),
                 actor_id=str(self.request.user.id),
                 issue_id=str(self.kwargs.get("pk", None)),

apiserver/plane/api/views/page.py

@@ -96,36 +96,6 @@ class PageViewSet(BaseViewSet):
                 status=status.HTTP_400_BAD_REQUEST,
             )
 
-    def partial_update(self, request, slug, project_id, pk):
-        try:
-            page = Page.objects.get(pk=pk, workspace__slug=slug, project_id=project_id)
-            # Only update access if the page owner is the requesting  user
-            if (
-                page.access != request.data.get("access", page.access)
-                and page.owned_by_id != request.user.id
-            ):
-                return Response(
-                    {
-                        "error": "Access cannot be updated since this page is owned by someone else"
-                    },
-                    status=status.HTTP_400_BAD_REQUEST,
-                )
-            serializer = PageSerializer(page, data=request.data, partial=True)
-            if serializer.is_valid():
-                serializer.save()
-                return Response(serializer.data, status=status.HTTP_200_OK)
-            return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
-        except Page.DoesNotExist:
-            return Response(
-                {"error": "Page Does not exist"}, status=status.HTTP_400_BAD_REQUEST
-            )
-        except Exception as e:
-            capture_exception(e)
-            return Response(
-                {"error": "Something went wrong please try again later"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
 
 class PageBlockViewSet(BaseViewSet):
     serializer_class = PageBlockSerializer

apiserver/plane/api/views/project.py

@@ -5,7 +5,7 @@ from datetime import datetime
 # Django imports
 from django.core.exceptions import ValidationError
 from django.db import IntegrityError
-from django.db.models import Q, Exists, OuterRef, Func, F
+from django.db.models import Q, Exists, OuterRef
 from django.core.validators import validate_email
 from django.conf import settings
 
@@ -46,8 +46,6 @@ from plane.db.models import (
     ProjectMemberInvite,
     User,
     ProjectIdentifier,
-    Cycle,
-    Module,
 )
 from plane.bgtasks.project_invitation_task import project_invitation
 
@@ -94,26 +92,6 @@ class ProjectViewSet(BaseViewSet):
                 self.get_queryset()
                 .annotate(is_favorite=Exists(subquery))
                 .order_by("-is_favorite", "name")
-                .annotate(
-                    total_members=ProjectMember.objects.filter(
-                        project_id=OuterRef("id")
-                    )
-                    .order_by()
-                    .annotate(count=Func(F("id"), function="Count"))
-                    .values("count")
-                )
-                .annotate(
-                    total_cycles=Cycle.objects.filter(project_id=OuterRef("id"))
-                    .order_by()
-                    .annotate(count=Func(F("id"), function="Count"))
-                    .values("count")
-                )
-                .annotate(
-                    total_modules=Module.objects.filter(project_id=OuterRef("id"))
-                    .order_by()
-                    .annotate(count=Func(F("id"), function="Count"))
-                    .values("count")
-                )
             )
             return Response(ProjectDetailSerializer(projects, many=True).data)
         except Exception as e:
@@ -183,7 +161,6 @@ class ProjectViewSet(BaseViewSet):
                             workspace=serializer.instance.workspace,
                             group=state["group"],
                             default=state.get("default", False),
-                            created_by=request.user,
                         )
                         for state in states
                     ]
@@ -367,7 +344,6 @@ class UserProjectInvitationsViewset(BaseViewSet):
                         workspace=invitation.project.workspace,
                         member=request.user,
                         role=invitation.role,
-                        created_by=request.user,
                     )
                     for invitation in project_invitations
                 ]
@@ -409,41 +385,6 @@ class ProjectMemberViewSet(BaseViewSet):
             .select_related("workspace", "workspace__owner")
         )
 
-    def partial_update(self, request, slug, project_id, pk):
-        try:
-            project_member = ProjectMember.objects.get(pk=pk, workspace__slug=slug, project_id=project_id)
-            if request.user.id == project_member.member_id:
-                return Response(
-                    {"error": "You cannot update your own role"},
-                    status=status.HTTP_400_BAD_REQUEST,
-                )
-
-            if request.data.get("role", 10) > project_member.role:
-                return Response(
-                    {
-                        "error": "You cannot update a role that is higher than your own role"
-                    },
-                    status=status.HTTP_400_BAD_REQUEST,
-                )
-
-            serializer = ProjectMemberSerializer(
-                project_member, data=request.data, partial=True
-            )
-
-            if serializer.is_valid():
-                serializer.save()
-                return Response(serializer.data, status=status.HTTP_200_OK)
-            return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
-        except ProjectMember.DoesNotExist:
-            return Response(
-                {"error": "Project Member does not exist"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-        except Exception as e:
-            capture_exception(e)
-            return Response({"error": "Something went wrong please try again later"}, status=status.HTTP_400_BAD_REQUEST)
-
-
 
 class AddMemberToProjectEndpoint(BaseAPIView):
     permission_classes = [
@@ -524,7 +465,6 @@ class AddTeamToProjectEndpoint(BaseAPIView):
                         project_id=project_id,
                         member_id=member,
                         workspace=workspace,
-                        created_by=request.user,
                     )
                 )
 
@@ -672,7 +612,6 @@ class ProjectJoinEndpoint(BaseAPIView):
                         if workspace_role >= 15
                         else (15 if workspace_role == 10 else workspace_role),
                         workspace=workspace,
-                        created_by=request.user,
                     )
                     for project_id in project_ids
                 ],

apiserver/plane/api/views/state.py

@@ -103,3 +103,22 @@ class StateViewSet(BaseViewSet):
             return Response(status=status.HTTP_204_NO_CONTENT)
         except State.DoesNotExist:
             return Response({"error": "State does not exists"}, status=status.HTTP_404)
+
+
+class StateDeleteIssueCheckEndpoint(BaseAPIView):
+    permission_classes = [
+        ProjectEntityPermission,
+    ]
+
+    def get(self, request, slug, project_id, pk):
+        try:
+            issue_count = Issue.objects.filter(
+                state=pk, workspace__slug=slug, project_id=project_id
+            ).count()
+            return Response({"issue_count": issue_count}, status=status.HTTP_200_OK)
+        except Exception as e:
+            capture_exception(e)
+            return Response(
+                {"error": "Something went wrong please try again later"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )

apiserver/plane/api/views/view.py

@@ -18,6 +18,10 @@ from plane.api.permissions import ProjectEntityPermission
 from plane.db.models import (
     IssueView,
     Issue,
+    IssueBlocker,
+    IssueLink,
+    CycleIssue,
+    ModuleIssue,
     IssueViewFavorite,
 )
 from plane.utils.issue_filters import issue_filters

apiserver/plane/api/views/workspace.py

@@ -223,7 +223,6 @@ class InviteWorkspaceEndpoint(BaseAPIView):
                                 algorithm="HS256",
                             ),
                             role=email.get("role", 10),
-                            created_by=request.user,
                         )
                     )
                 except ValidationError:
@@ -382,7 +381,6 @@ class UserWorkspaceInvitationsEndpoint(BaseViewSet):
                         workspace=invitation.workspace,
                         member=request.user,
                         role=invitation.role,
-                        created_by=request.user,
                     )
                     for invitation in workspace_invitations
                 ],
@@ -423,43 +421,6 @@ class WorkSpaceMemberViewSet(BaseViewSet):
             .select_related("member")
         )
 
-    def partial_update(self, request, slug, pk):
-        try:
-            workspace_member = WorkspaceMember.objects.get(pk=pk, workspace__slug=slug)
-            if request.user.id == workspace_member.member_id:
-                return Response(
-                    {"error": "You cannot update your own role"},
-                    status=status.HTTP_400_BAD_REQUEST,
-                )
-
-            if request.data.get("role", 10) > workspace_member.role:
-                return Response(
-                    {
-                        "error": "You cannot update a role that is higher than your own role"
-                    },
-                    status=status.HTTP_400_BAD_REQUEST,
-                )
-
-            serializer = WorkSpaceMemberSerializer(
-                workspace_member, data=request.data, partial=True
-            )
-
-            if serializer.is_valid():
-                serializer.save()
-                return Response(serializer.data, status=status.HTTP_200_OK)
-            return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
-        except WorkspaceMember.DoesNotExist:
-            return Response(
-                {"error": "Workspace Member does not exist"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-        except Exception as e:
-            capture_exception(e)
-            return Response(
-                {"error": "Something went wrong please try again later"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
 
 class TeamMemberViewSet(BaseViewSet):
     serializer_class = TeamSerializer
@@ -822,3 +783,4 @@ class WorkspaceThemeViewSet(BaseViewSet):
                 {"error": "Something went wrong please try again later"},
                 status=status.HTTP_400_BAD_REQUEST,
             )
+

apiserver/plane/bgtasks/analytic_plot_export.py

@@ -1,174 +0,0 @@
-# Python imports
-import csv
-import io
-
-# Django imports
-from django.core.mail import EmailMultiAlternatives
-from django.template.loader import render_to_string
-from django.utils.html import strip_tags
-from django.conf import settings
-
-# Third party imports
-from celery import shared_task
-from sentry_sdk import capture_exception
-
-# Module imports
-from plane.db.models import Issue
-from plane.utils.analytics_plot import build_graph_plot
-from plane.utils.issue_filters import issue_filters
-
-row_mapping = {
-    "state__name": "State",
-    "state__group": "State Group",
-    "labels__name": "Label",
-    "assignees__email": "Assignee Name",
-    "start_date": "Start Date",
-    "target_date": "Due Date",
-    "completed_at": "Completed At",
-    "created_at": "Created At",
-    "issue_count": "Issue Count",
-    "priority": "Priority",
-    "estimate": "Estimate",
-}
-
-
-@shared_task
-def analytic_export_task(email, data, slug):
-    try:
-        filters = issue_filters(data, "POST")
-        queryset = Issue.objects.filter(**filters, workspace__slug=slug)
-
-        x_axis = data.get("x_axis", False)
-        y_axis = data.get("y_axis", False)
-        segment = data.get("segment", False)
-
-        distribution = build_graph_plot(
-            queryset=queryset, x_axis=x_axis, y_axis=y_axis, segment=segment
-        )
-
-        key = "count" if y_axis == "issue_count" else "estimate"
-
-        segmented = segment
-
-        assignee_details = {}
-        if x_axis in ["assignees__email"] or segment in ["assignees__email"]:
-            assignee_details = (
-                Issue.objects.filter(workspace__slug=slug, **filters, assignees__avatar__isnull=False)
-                .order_by("assignees__id")
-                .distinct("assignees__id")
-                .values("assignees__avatar", "assignees__email", "assignees__first_name", "assignees__last_name")
-            )
-
-        if segment:
-            segment_zero = []
-            for item in distribution:
-                current_dict = distribution.get(item)
-                for current in current_dict:
-                    segment_zero.append(current.get("segment"))
-
-            segment_zero = list(set(segment_zero))
-            row_zero = (
-                [
-                    row_mapping.get(x_axis, "X-Axis"),
-                ]
-                + [
-                    row_mapping.get(y_axis, "Y-Axis"),
-                ]
-                + segment_zero
-            )
-            rows = []
-            for item in distribution:
-                generated_row = [
-                    item,
-                ]
-
-                data = distribution.get(item)
-                # Add y axis values
-                generated_row.append(sum(obj.get(key) for obj in data if obj.get(key, None) is not None))
-
-                for segment in segment_zero:
-                    value = [x for x in data if x.get("segment") == segment]
-                    if len(value):
-                        generated_row.append(value[0].get(key))
-                    else:
-                        generated_row.append("0")
-                # x-axis replacement for names
-                if x_axis in ["assignees__email"]:
-                    assignee = [user for user in assignee_details if str(user.get("assignees__email")) == str(item)]
-                    if len(assignee):
-                        generated_row[0] = str(assignee[0].get("assignees__first_name")) + " " + str(assignee[0].get("assignees__last_name"))
-                rows.append(tuple(generated_row))
-
-            # If segment is ["assignees__email"] then replace segment_zero rows with first and last names
-            if segmented in ["assignees__email"]:
-                for index, segm in enumerate(row_zero[2:]):
-                    # find the name of the user
-                    assignee = [user for user in assignee_details if str(user.get("assignees__email")) == str(segm)]
-                    if len(assignee):
-                        row_zero[index] = str(assignee[0].get("assignees__first_name")) + " " + str(assignee[0].get("assignees__last_name"))
-
-            rows = [tuple(row_zero)] + rows
-            csv_buffer = io.StringIO()
-            writer = csv.writer(csv_buffer, delimiter=",", quoting=csv.QUOTE_ALL)
-
-            # Write CSV data to the buffer
-            for row in rows:
-                writer.writerow(row)
-
-            subject = "Your Export is ready"
-
-            html_content = render_to_string("emails/exports/analytics.html", {})
-
-            text_content = strip_tags(html_content)
-            csv_buffer.seek(0)
-            msg = EmailMultiAlternatives(
-                subject, text_content, settings.EMAIL_FROM, [email]
-            )
-            msg.attach(f"{slug}-analytics.csv", csv_buffer.read())
-            msg.send(fail_silently=False)
-
-        else:
-            row_zero = [
-                row_mapping.get(x_axis, "X-Axis"),
-                row_mapping.get(y_axis, "Y-Axis"),
-            ]
-            rows = []
-            for item in distribution:
-                row =  [
-                            item,
-                            distribution.get(item)[0].get("count")
-                            if y_axis == "issue_count"
-                            else distribution.get(item)[0].get("estimate  "),
-                        ]
-                # x-axis replacement to names
-                if x_axis in ["assignees__email"]:
-                    assignee = [user for user in assignee_details if str(user.get("assignees__email")) == str(item)]
-                    if len(assignee):
-                        row[0] = str(assignee[0].get("assignees__first_name")) + " " + str(assignee[0].get("assignees__last_name"))
-
-                rows.append(tuple(row))
-            rows = [tuple(row_zero)] + rows
-            csv_buffer = io.StringIO()
-            writer = csv.writer(csv_buffer, delimiter=",", quoting=csv.QUOTE_ALL)
-
-            # Write CSV data to the buffer
-            for row in rows:
-                writer.writerow(row)
-
-            subject = "Your Export is ready"
-
-            html_content = render_to_string("emails/exports/analytics.html", {})
-
-            text_content = strip_tags(html_content)
-
-            csv_buffer.seek(0)
-            msg = EmailMultiAlternatives(
-                subject, text_content, settings.EMAIL_FROM, [email]
-            )
-            msg.attach(f"{slug}-analytics.csv", csv_buffer.read())
-            msg.send(fail_silently=False)
-
-    except Exception as e:
-        print(e)
-        capture_exception(e)
-        return

apiserver/plane/bgtasks/importer_task.py

@@ -27,7 +27,6 @@ from plane.db.models import (
     User,
 )
 from .workspace_invitation_task import workspace_invitation
-from plane.bgtasks.user_welcome_task import send_welcome_slack
 
 
 @shared_task
@@ -41,7 +40,7 @@ def service_importer(service, importer_id):
 
         # Check if we need to import users as well
         if len(users):
-            # For all invited users create the users
+            # For all invited users create the uers
             new_users = User.objects.bulk_create(
                 [
                     User(
@@ -57,15 +56,6 @@ def service_importer(service, importer_id):
                 ignore_conflicts=True,
             )
 
-            [
-                send_welcome_slack.delay(
-                    str(user.id),
-                    True,
-                    f"{user.email} was imported to Plane from {service}",
-                )
-                for user in new_users
-            ]
-
             workspace_users = User.objects.filter(
                 email__in=[
                     user.get("email").strip().lower()
@@ -78,11 +68,7 @@ def service_importer(service, importer_id):
             # Add new users to Workspace and project automatically
             WorkspaceMember.objects.bulk_create(
                 [
-                    WorkspaceMember(
-                        member=user,
-                        workspace_id=importer.workspace_id,
-                        created_by=importer.created_by,
-                    )
+                    WorkspaceMember(member=user, workspace_id=importer.workspace_id)
                     for user in workspace_users
                 ],
                 batch_size=100,
@@ -95,7 +81,6 @@ def service_importer(service, importer_id):
                         project_id=importer.project_id,
                         workspace_id=importer.workspace_id,
                         member=user,
-                        created_by=importer.created_by,
                     )
                     for user in workspace_users
                 ],

apiserver/plane/bgtasks/issue_activites_task.py

@@ -136,6 +136,7 @@ def track_priority(
                     comment=f"{actor.email} updated the priority to {requested_data.get('priority')}",
                 )
             )
+    print(issue_activities)
 
 
 # Track chnages in state of the issue
@@ -505,6 +506,119 @@ def track_blockings(
                 )
 
 
+def track_cycles(
+    requested_data,
+    current_instance,
+    issue_id,
+    project,
+    actor,
+    issue_activities,
+):
+    # Updated Records:
+    updated_records = current_instance.get("updated_cycle_issues", [])
+    created_records = json.loads(current_instance.get("created_cycle_issues", []))
+
+    for updated_record in updated_records:
+        old_cycle = Cycle.objects.filter(
+            pk=updated_record.get("old_cycle_id", None)
+        ).first()
+        new_cycle = Cycle.objects.filter(
+            pk=updated_record.get("new_cycle_id", None)
+        ).first()
+
+        issue_activities.append(
+            IssueActivity(
+                issue_id=updated_record.get("issue_id"),
+                actor=actor,
+                verb="updated",
+                old_value=old_cycle.name,
+                new_value=new_cycle.name,
+                field="cycles",
+                project=project,
+                workspace=project.workspace,
+                comment=f"{actor.email} updated cycle from {old_cycle.name} to {new_cycle.name}",
+                old_identifier=old_cycle.id,
+                new_identifier=new_cycle.id,
+            )
+        )
+
+    for created_record in created_records:
+        cycle = Cycle.objects.filter(
+            pk=created_record.get("fields").get("cycle")
+        ).first()
+
+        issue_activities.append(
+            IssueActivity(
+                issue_id=created_record.get("fields").get("issue"),
+                actor=actor,
+                verb="created",
+                old_value="",
+                new_value=cycle.name,
+                field="cycles",
+                project=project,
+                workspace=project.workspace,
+                comment=f"{actor.email} added cycle {cycle.name}",
+                new_identifier=cycle.id,
+            )
+        )
+
+
+def track_modules(
+    requested_data,
+    current_instance,
+    issue_id,
+    project,
+    actor,
+    issue_activities,
+):
+    # Updated Records:
+    updated_records = current_instance.get("updated_module_issues", [])
+    created_records = json.loads(current_instance.get("created_module_issues", []))
+
+    for updated_record in updated_records:
+        old_module = Module.objects.filter(
+            pk=updated_record.get("old_module_id", None)
+        ).first()
+        new_module = Module.objects.filter(
+            pk=updated_record.get("new_module_id", None)
+        ).first()
+
+        issue_activities.append(
+            IssueActivity(
+                issue_id=updated_record.get("issue_id"),
+                actor=actor,
+                verb="updated",
+                old_value=old_module.name,
+                new_value=new_module.name,
+                field="modules",
+                project=project,
+                workspace=project.workspace,
+                comment=f"{actor.email} updated module from {old_module.name} to {new_module.name}",
+                old_identifier=old_module.id,
+                new_identifier=new_module.id,
+            )
+        )
+
+    for created_record in created_records:
+        module = Module.objects.filter(
+            pk=created_record.get("fields").get("module")
+        ).first()
+        issue_activities.append(
+            IssueActivity(
+                issue_id=created_record.get("fields").get("issue"),
+                actor=actor,
+                verb="created",
+                old_value="",
+                new_value=module.name,
+                field="modules",
+                project=project,
+                workspace=project.workspace,
+                comment=f"{actor.email} added module {module.name}",
+                new_identifier=module.id,
+            )
+        )
+
+
 def create_issue_activity(
     requested_data, current_instance, issue_id, project, actor, issue_activities
 ):
@@ -569,6 +683,8 @@ def update_issue_activity(
         "assignees_list": track_assignees,
         "blocks_list": track_blocks,
         "blockers_list": track_blockings,
+        "cycles_list": track_cycles,
+        "modules_list": track_modules,
         "estimate_point": track_estimate_points,
     }
 
@@ -672,177 +788,6 @@ def delete_comment_activity(
     )
 
 
-def create_cycle_issue_activity(
-    requested_data, current_instance, issue_id, project, actor, issue_activities
-):
-    requested_data = json.loads(requested_data) if requested_data is not None else None
-    current_instance = (
-        json.loads(current_instance) if current_instance is not None else None
-    )
-
-    # Updated Records:
-    updated_records = current_instance.get("updated_cycle_issues", [])
-    created_records = json.loads(current_instance.get("created_cycle_issues", []))
-
-    for updated_record in updated_records:
-        old_cycle = Cycle.objects.filter(
-            pk=updated_record.get("old_cycle_id", None)
-        ).first()
-        new_cycle = Cycle.objects.filter(
-            pk=updated_record.get("new_cycle_id", None)
-        ).first()
-
-        issue_activities.append(
-            IssueActivity(
-                issue_id=updated_record.get("issue_id"),
-                actor=actor,
-                verb="updated",
-                old_value=old_cycle.name,
-                new_value=new_cycle.name,
-                field="cycles",
-                project=project,
-                workspace=project.workspace,
-                comment=f"{actor.email} updated cycle from {old_cycle.name} to {new_cycle.name}",
-                old_identifier=old_cycle.id,
-                new_identifier=new_cycle.id,
-            )
-        )
-
-    for created_record in created_records:
-        cycle = Cycle.objects.filter(
-            pk=created_record.get("fields").get("cycle")
-        ).first()
-
-        issue_activities.append(
-            IssueActivity(
-                issue_id=created_record.get("fields").get("issue"),
-                actor=actor,
-                verb="created",
-                old_value="",
-                new_value=cycle.name,
-                field="cycles",
-                project=project,
-                workspace=project.workspace,
-                comment=f"{actor.email} added cycle {cycle.name}",
-                new_identifier=cycle.id,
-            )
-        )
-
-
-def delete_cycle_issue_activity(
-    requested_data, current_instance, issue_id, project, actor, issue_activities
-):
-    requested_data = json.loads(requested_data) if requested_data is not None else None
-    current_instance = (
-        json.loads(current_instance) if current_instance is not None else None
-    )
-
-    cycle_id = requested_data.get("cycle_id", "")
-    cycle = Cycle.objects.filter(pk=cycle_id).first()
-    issues = requested_data.get("issues")
-
-    for issue in issues:
-        issue_activities.append(
-            IssueActivity(
-                issue_id=issue,
-                actor=actor,
-                verb="deleted",
-                old_value=cycle.name if cycle is not None else "",
-                new_value="",
-                field="cycles",
-                project=project,
-                workspace=project.workspace,
-                comment=f"{actor.email} removed this issue from {cycle.name if cycle is not None else None}",
-                old_identifier=cycle.id if cycle is not None else None,
-            )
-        )
-
-
-def create_module_issue_activity(
-    requested_data, current_instance, issue_id, project, actor, issue_activities
-):
-    requested_data = json.loads(requested_data) if requested_data is not None else None
-    current_instance = (
-        json.loads(current_instance) if current_instance is not None else None
-    )
-
-    # Updated Records:
-    updated_records = current_instance.get("updated_module_issues", [])
-    created_records = json.loads(current_instance.get("created_module_issues", []))
-
-    for updated_record in updated_records:
-        old_module = Module.objects.filter(
-            pk=updated_record.get("old_module_id", None)
-        ).first()
-        new_module = Module.objects.filter(
-            pk=updated_record.get("new_module_id", None)
-        ).first()
-
-        issue_activities.append(
-            IssueActivity(
-                issue_id=updated_record.get("issue_id"),
-                actor=actor,
-                verb="updated",
-                old_value=old_module.name,
-                new_value=new_module.name,
-                field="modules",
-                project=project,
-                workspace=project.workspace,
-                comment=f"{actor.email} updated module from {old_module.name} to {new_module.name}",
-                old_identifier=old_module.id,
-                new_identifier=new_module.id,
-            )
-        )
-
-    for created_record in created_records:
-        module = Module.objects.filter(
-            pk=created_record.get("fields").get("module")
-        ).first()
-        issue_activities.append(
-            IssueActivity(
-                issue_id=created_record.get("fields").get("issue"),
-                actor=actor,
-                verb="created",
-                old_value="",
-                new_value=module.name,
-                field="modules",
-                project=project,
-                workspace=project.workspace,
-                comment=f"{actor.email} added module {module.name}",
-                new_identifier=module.id,
-            )
-        )
-
-
-def delete_module_issue_activity(
-    requested_data, current_instance, issue_id, project, actor, issue_activities
-):
-    requested_data = json.loads(requested_data) if requested_data is not None else None
-    current_instance = (
-        json.loads(current_instance) if current_instance is not None else None
-    )
-
-    module_id = requested_data.get("module_id", "")
-    module = Module.objects.filter(pk=module_id).first()
-    issues = requested_data.get("issues")
-
-    for issue in issues:
-        issue_activities.append(
-            IssueActivity(
-                issue_id=issue,
-                actor=actor,
-                verb="deleted",
-                old_value=module.name if module is not None else "",
-                new_value="",
-                field="modules",
-                project=project,
-                workspace=project.workspace,
-                comment=f"{actor.email} removed this issue from {module.name if module is not None else None}",
-                old_identifier=module.id if module is not None else None,
-            )
-        )
-
-
 def create_link_activity(
     requested_data, current_instance, issue_id, project, actor, issue_activities
 ):
@@ -965,10 +910,6 @@ def issue_activity(
             "comment.activity.created": create_comment_activity,
             "comment.activity.updated": update_comment_activity,
             "comment.activity.deleted": delete_comment_activity,
-            "cycle.activity.created": create_cycle_issue_activity,
-            "cycle.activity.deleted": delete_cycle_issue_activity,
-            "module.activity.created": create_module_issue_activity,
-            "module.activity.deleted": delete_module_issue_activity,
             "link.activity.created": create_link_activity,
             "link.activity.updated": update_link_activity,
             "link.activity.deleted": delete_link_activity,

apiserver/plane/bgtasks/user_welcome_task.py

@@ -1,33 +0,0 @@
-# Django imports
-from django.conf import settings
-
-# Third party imports
-from celery import shared_task
-from sentry_sdk import capture_exception
-from slack_sdk import WebClient
-from slack_sdk.errors import SlackApiError
-
-# Module imports
-from plane.db.models import User
-
-
-@shared_task
-def send_welcome_slack(user_id, created, message):
-    try:
-        instance = User.objects.get(pk=user_id)
-
-        if created and not instance.is_bot:
-            # Send message on slack as well
-            if settings.SLACK_BOT_TOKEN:
-                client = WebClient(token=settings.SLACK_BOT_TOKEN)
-                try:
-                    _ = client.chat_postMessage(
-                        channel="#trackers",
-                        text=message,
-                    )
-                except SlackApiError as e:
-                    print(f"Got an error: {e.response['error']}")
-        return
-    except Exception as e:
-        capture_exception(e)
-        return

apiserver/plane/db/migrations/0029_auto_20230502_0126.py

@@ -1,58 +0,0 @@
-# Generated by Django 3.2.18 on 2023-05-01 19:56
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-import uuid
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('db', '0028_auto_20230414_1703'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='cycle',
-            name='view_props',
-            field=models.JSONField(default=dict),
-        ),
-        migrations.AddField(
-            model_name='importer',
-            name='imported_data',
-            field=models.JSONField(null=True),
-        ),
-        migrations.AddField(
-            model_name='module',
-            name='view_props',
-            field=models.JSONField(default=dict),
-        ),
-        migrations.CreateModel(
-            name='SlackProjectSync',
-            fields=[
-                ('created_at', models.DateTimeField(auto_now_add=True, verbose_name='Created At')),
-                ('updated_at', models.DateTimeField(auto_now=True, verbose_name='Last Modified At')),
-                ('id', models.UUIDField(db_index=True, default=uuid.uuid4, editable=False, primary_key=True, serialize=False, unique=True)),
-                ('access_token', models.CharField(max_length=300)),
-                ('scopes', models.TextField()),
-                ('bot_user_id', models.CharField(max_length=50)),
-                ('webhook_url', models.URLField(max_length=1000)),
-                ('data', models.JSONField(default=dict)),
-                ('team_id', models.CharField(max_length=30)),
-                ('team_name', models.CharField(max_length=300)),
-                ('created_by', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='slackprojectsync_created_by', to=settings.AUTH_USER_MODEL, verbose_name='Created By')),
-                ('project', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='project_slackprojectsync', to='db.project')),
-                ('updated_by', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='slackprojectsync_updated_by', to=settings.AUTH_USER_MODEL, verbose_name='Last Modified By')),
-                ('workspace', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='workspace_slackprojectsync', to='db.workspace')),
-                ('workspace_integration', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='slack_syncs', to='db.workspaceintegration')),
-            ],
-            options={
-                'verbose_name': 'Slack Project Sync',
-                'verbose_name_plural': 'Slack Project Syncs',
-                'db_table': 'slack_project_syncs',
-                'ordering': ('-created_at',),
-                'unique_together': {('team_id', 'project')},
-            },
-        ),
-    ]

apiserver/plane/db/migrations/0030_alter_estimatepoint_unique_together.py

@@ -1,17 +0,0 @@
-# Generated by Django 3.2.18 on 2023-05-05 14:17
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('db', '0029_auto_20230502_0126'),
-    ]
-
-    operations = [
-        migrations.AlterUniqueTogether(
-            name='estimatepoint',
-            unique_together=set(),
-        ),
-    ]

apiserver/plane/db/migrations/0031_analyticview.py

@@ -1,37 +0,0 @@
-# Generated by Django 3.2.18 on 2023-05-12 11:31
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-import uuid
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('db', '0030_alter_estimatepoint_unique_together'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='AnalyticView',
-            fields=[
-                ('created_at', models.DateTimeField(auto_now_add=True, verbose_name='Created At')),
-                ('updated_at', models.DateTimeField(auto_now=True, verbose_name='Last Modified At')),
-                ('id', models.UUIDField(db_index=True, default=uuid.uuid4, editable=False, primary_key=True, serialize=False, unique=True)),
-                ('name', models.CharField(max_length=255)),
-                ('description', models.TextField(blank=True)),
-                ('query', models.JSONField()),
-                ('query_dict', models.JSONField(default=dict)),
-                ('created_by', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='analyticview_created_by', to=settings.AUTH_USER_MODEL, verbose_name='Created By')),
-                ('updated_by', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='analyticview_updated_by', to=settings.AUTH_USER_MODEL, verbose_name='Last Modified By')),
-                ('workspace', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='analytics', to='db.workspace')),
-            ],
-            options={
-                'verbose_name': 'Analytic',
-                'verbose_name_plural': 'Analytics',
-                'db_table': 'analytic_views',
-                'ordering': ('-created_at',),
-            },
-        ),
-    ]

apiserver/plane/db/migrations/0032_auto_20230520_2015.py

@@ -1,23 +0,0 @@
-# Generated by Django 3.2.19 on 2023-05-20 14:45
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('db', '0031_analyticview'),
-    ]
-
-    operations = [
-        migrations.RenameField(
-            model_name='project',
-            old_name='icon',
-            new_name='emoji',
-        ),
-        migrations.AddField(
-            model_name='project',
-            name='icon_prop',
-            field=models.JSONField(null=True),
-        ),
-    ]

apiserver/plane/db/models/__init__.py

@@ -59,7 +59,6 @@ from .integration import (
     GithubRepositorySync,
     GithubIssueSync,
     GithubCommentSync,
-    SlackProjectSync,
 )
 
 from .importer import Importer
@@ -67,5 +66,3 @@ from .importer import Importer
 from .page import Page, PageBlock, PageFavorite, PageLabel
 
 from .estimate import Estimate, EstimatePoint
-
-from .analytic import AnalyticView

apiserver/plane/db/models/analytic.py

@@ -1,25 +0,0 @@
-# Django models
-from django.db import models
-from django.conf import settings
-
-from .base import BaseModel
-
-
-class AnalyticView(BaseModel):
-    workspace = models.ForeignKey(
-        "db.Workspace", related_name="analytics", on_delete=models.CASCADE
-    )
-    name = models.CharField(max_length=255)
-    description = models.TextField(blank=True)
-    query = models.JSONField()
-    query_dict = models.JSONField(default=dict)
-
-    class Meta:
-        verbose_name = "Analytic"
-        verbose_name_plural = "Analytics"
-        db_table = "analytic_views"
-        ordering = ("-created_at",)
-
-    def __str__(self):
-        """Return name of the analytic view"""
-        return f"{self.name} <{self.workspace.name}>"

apiserver/plane/db/models/cycle.py

@@ -16,7 +16,6 @@ class Cycle(ProjectBaseModel):
         on_delete=models.CASCADE,
         related_name="owned_by_cycle",
     )
-    view_props = models.JSONField(default=dict)
 
     class Meta:
         verbose_name = "Cycle"

apiserver/plane/db/models/estimate.py

@@ -39,6 +39,7 @@ class EstimatePoint(ProjectBaseModel):
         return f"{self.estimate.name} <{self.key}> <{self.value}>"
 
     class Meta:
+        unique_together = ["value", "estimate"]
         verbose_name = "Estimate Point"
         verbose_name_plural = "Estimate Points"
         db_table = "estimate_points"

apiserver/plane/db/models/importer.py

@@ -33,7 +33,6 @@ class Importer(ProjectBaseModel):
     token = models.ForeignKey(
         "db.APIToken", on_delete=models.CASCADE, related_name="importer"
     )
-    imported_data = models.JSONField(null=True)
 
     class Meta:
         verbose_name = "Importer"

apiserver/plane/db/models/integration/__init__.py

@@ -1,3 +1,2 @@
 from .base import Integration, WorkspaceIntegration
 from .github import GithubRepository, GithubRepositorySync, GithubIssueSync, GithubCommentSync
-from .slack import SlackProjectSync

apiserver/plane/db/models/integration/slack.py

@@ -1,32 +0,0 @@
-# Python imports
-import uuid
-
-# Django imports
-from django.db import models
-
-# Module imports
-from plane.db.models import ProjectBaseModel
-
-
-class SlackProjectSync(ProjectBaseModel):
-    access_token = models.CharField(max_length=300)
-    scopes = models.TextField()
-    bot_user_id = models.CharField(max_length=50)
-    webhook_url = models.URLField(max_length=1000)
-    data = models.JSONField(default=dict)
-    team_id = models.CharField(max_length=30)
-    team_name = models.CharField(max_length=300)
-    workspace_integration = models.ForeignKey(
-        "db.WorkspaceIntegration", related_name="slack_syncs", on_delete=models.CASCADE
-    )
-
-    def __str__(self):
-        """Return the repo name"""
-        return f"{self.project.name}"
-
-    class Meta:
-        unique_together = ["team_id", "project"]
-        verbose_name = "Slack Project Sync"
-        verbose_name_plural = "Slack Project Syncs"
-        db_table = "slack_project_syncs"
-        ordering = ("-created_at",)

apiserver/plane/db/models/issue.py

@@ -85,13 +85,8 @@ class Issue(ProjectBaseModel):
                 ).first()
                 # if there is no default state assign any random state
                 if default_state is None:
-                    random_state = State.objects.filter(project=self.project).first()
-                    self.state = random_state
-                    if random_state.group == "started":
-                        self.start_date = timezone.now().date()
+                    self.state = State.objects.filter(project=self.project).first()
                 else:
-                    if default_state.group == "started":
-                        self.start_date = timezone.now().date()
                     self.state = default_state
             except ImportError:
                 pass
@@ -99,15 +94,18 @@ class Issue(ProjectBaseModel):
             try:
                 from plane.db.models import State, PageBlock
 
+                # Get the completed states of the project
+                completed_states = State.objects.filter(
+                    group="completed", project=self.project
+                ).values_list("pk", flat=True)
                 # Check if the current issue state and completed state id are same
-                if self.state.group == "completed":
+                if self.state.id in completed_states:
                     self.completed_at = timezone.now()
                     # check if there are any page blocks
                     PageBlock.objects.filter(issue_id=self.id).filter().update(
                         completed_at=timezone.now()
                     )
-                elif self.state.group == "started":
-                    self.start_date = timezone.now().date()
+
                 else:
                     PageBlock.objects.filter(issue_id=self.id).filter().update(
                         completed_at=None
@@ -118,6 +116,7 @@ class Issue(ProjectBaseModel):
                 pass
         if self._state.adding:
             # Get the maximum display_id value from the database
+
             last_id = IssueSequence.objects.filter(project=self.project).aggregate(
                 largest=models.Max("sequence")
             )["largest"]
@@ -132,9 +131,6 @@ class Issue(ProjectBaseModel):
             if largest_sort_order is not None:
                 self.sort_order = largest_sort_order + 10000
 
-            # If adding it to started state
-            if self.state.group == "started":
-                self.start_date = timezone.now().date()
         # Strip the html tags using html parser
         self.description_stripped = (
             None

apiserver/plane/db/models/module.py

@@ -39,7 +39,6 @@ class Module(ProjectBaseModel):
         through="ModuleMember",
         through_fields=("module", "member"),
     )
-    view_props = models.JSONField(default=dict)
 
     class Meta:
         unique_together = ["name", "project"]

apiserver/plane/db/models/project.py

@@ -63,8 +63,7 @@ class Project(BaseModel):
         null=True,
         blank=True,
     )
-    emoji = models.CharField(max_length=255, null=True, blank=True)
-    icon_prop = models.JSONField(null=True)
+    icon = models.CharField(max_length=255, null=True, blank=True)
     module_view = models.BooleanField(default=True)
     cycle_view = models.BooleanField(default=True)
     issue_views_view = models.BooleanField(default=True)

apiserver/plane/db/models/user.py

@@ -104,9 +104,29 @@ class User(AbstractBaseUser, PermissionsMixin):
 
 
 @receiver(post_save, sender=User)
-def send_welcome_slack(sender, instance, created, **kwargs):
+def send_welcome_email(sender, instance, created, **kwargs):
     try:
         if created and not instance.is_bot:
+            first_name = instance.first_name.capitalize()
+            to_email = instance.email
+            from_email_string = settings.EMAIL_FROM
+
+            subject = f"Welcome to Plane ✈️!"
+
+            context = {"first_name": first_name, "email": instance.email}
+
+            html_content = render_to_string(
+                "emails/auth/user_welcome_email.html", context
+            )
+
+            text_content = strip_tags(html_content)
+
+            msg = EmailMultiAlternatives(
+                subject, text_content, from_email_string, [to_email]
+            )
+            msg.attach_alternative(html_content, "text/html")
+            msg.send()
+
             # Send message on slack as well
             if settings.SLACK_BOT_TOKEN:
                 client = WebClient(token=settings.SLACK_BOT_TOKEN)

apiserver/plane/settings/staging.py

@@ -80,7 +80,7 @@ AWS_S3_BUCKET_NAME = os.environ.get("AWS_S3_BUCKET_NAME")
 AWS_S3_ADDRESSING_STYLE = "auto"
 
 # The full URL to the S3 endpoint. Leave blank to use the default region URL.
-AWS_S3_ENDPOINT_URL = os.environ.get("AWS_S3_ENDPOINT_URL", "")
+AWS_S3_ENDPOINT_URL = ""
 
 # A prefix to be applied to every stored file. This will be joined to every filename using the "/" separator.
 AWS_S3_KEY_PREFIX = ""

apiserver/plane/utils/analytics_plot.py

@@ -1,76 +0,0 @@
-# Python imports
-from itertools import groupby
-
-# Django import
-from django.db import models
-from django.db.models import Count, F, Sum, Value, Case, When, CharField
-from django.db.models.functions import Coalesce, ExtractMonth, ExtractYear, Concat
-
-
-def build_graph_plot(queryset, x_axis, y_axis, segment=None):
-
-    temp_axis = x_axis
-
-    if x_axis in ["created_at", "start_date", "target_date", "completed_at"]:
-        year = ExtractYear(x_axis)
-        month = ExtractMonth(x_axis)
-        dimension = Concat(year, Value("-"), month, output_field=CharField())
-        queryset = queryset.annotate(dimension=dimension)
-        x_axis = "dimension"
-    else:
-        queryset = queryset.annotate(dimension=F(x_axis))
-        x_axis = "dimension"
-
-    if x_axis in ["created_at", "start_date", "target_date", "completed_at"]:
-        queryset = queryset.exclude(x_axis__is_null=True)
-
-    if segment in ["created_at", "start_date", "target_date", "completed_at"]:
-        year = ExtractYear(segment)
-        month = ExtractMonth(segment)
-        dimension = Concat(year, Value("-"), month, output_field=CharField())
-        queryset = queryset.annotate(segmented=dimension)
-        segment = "segmented"
-
-    queryset = queryset.values(x_axis)
-
-    # Group queryset by x_axis field
-
-    if y_axis == "issue_count":
-        queryset = queryset.annotate(
-            is_null=Case(
-                When(dimension__isnull=True, then=Value("None")),
-                default=Value("not_null"),
-                output_field=models.CharField(max_length=8),
-            ),
-            dimension_ex=Coalesce("dimension", Value("null")),
-        ).values("dimension")
-        if segment:
-            queryset = queryset.annotate(segment=F(segment)).values(
-                "dimension", "segment"
-            )
-        else:
-            queryset = queryset.values("dimension")
-
-        queryset = queryset.annotate(count=Count("*")).order_by("dimension")
-
-    if y_axis == "estimate":
-        queryset = queryset.annotate(estimate=Sum("estimate_point")).order_by(x_axis)
-        if segment:
-            queryset = queryset.annotate(segment=F(segment)).values(
-                "dimension", "segment", "estimate"
-            )
-        else:
-            queryset = queryset.values("dimension", "estimate")
-
-    result_values = list(queryset)
-    grouped_data = {}
-    for key, items in groupby(result_values, key=lambda x: x[str("dimension")]):
-        grouped_data[str(key)] = list(items)
-
-    sorted_data = grouped_data
-    if temp_axis == "priority":
-        order = ["low", "medium", "high", "urgent", "None"]
-        sorted_data = {key: grouped_data[key] for key in order if key in grouped_data}
-    else:
-        sorted_data = dict(sorted(grouped_data.items(), key=lambda x: (x[0] == "None", x[0])))
-    return sorted_data

apiserver/plane/utils/issue_filters.py

@@ -13,17 +13,6 @@ def filter_state(params, filter, method):
     return filter
 
 
-def filter_estimate_point(params, filter, method):
-    if method == "GET":
-        estimate_points = params.get("estimate_point").split(",")
-        if len(estimate_points) and "" not in estimate_points:
-            filter["estimate_point__in"] = estimate_points
-    else:
-        if params.get("estimate_point", None) and len(params.get("estimate_point")):
-            filter["estimate_point__in"] = params.get("estimate_point")
-    return filter
-
-
 def filter_priority(params, filter, method):
     if method == "GET":
         priorties = params.get("priority").split(",")
@@ -198,45 +187,11 @@ def filter_issue_state_type(params, filter, method):
     return filter
 
 
-def filter_project(params, filter, method):
-    if method == "GET":
-        projects = params.get("project").split(",")
-        if len(projects) and "" not in projects:
-            filter["project__in"] = projects
-    else:
-        if params.get("project", None) and len(params.get("project")):
-            filter["project__in"] = params.get("project")
-    return filter
-
-
-def filter_cycle(params, filter, method):
-    if method == "GET":
-        cycles = params.get("cycle").split(",")
-        if len(cycles) and "" not in cycles:
-            filter["issue_cycle__cycle_id__in"] = cycles
-    else:
-        if params.get("cycle", None) and len(params.get("cycle")):
-            filter["issue_cycle__cycle_id__in"] = params.get("cycle")
-    return filter
-
-
-def filter_module(params, filter, method):
-    if method == "GET":
-        modules = params.get("module").split(",")
-        if len(modules) and "" not in modules:
-            filter["issue_module__module_id__in"] = modules
-    else:
-        if params.get("module", None) and len(params.get("module")):
-            filter["issue_module__module_id__in"] = params.get("module")
-    return filter
-
-
 def issue_filters(query_params, method):
     filter = dict()
 
     ISSUE_FILTER = {
         "state": filter_state,
-        "estimate_point": filter_estimate_point,
         "priority": filter_priority,
         "parent": filter_parent,
         "labels": filter_labels,
@@ -249,9 +204,6 @@ def issue_filters(query_params, method):
         "target_date": filter_target_date,
         "completed_at": filter_completed_at,
         "type": filter_issue_state_type,
-        "project": filter_project,
-        "cycle": filter_cycle,
-        "module": filter_module,
     }
 
     for key, value in ISSUE_FILTER.items():

apiserver/requirements/base.txt

@@ -1,6 +1,6 @@
 # base requirements
 
-Django==3.2.19
+Django==3.2.18
 django-braces==1.15.0
 django-taggit==3.1.0
 psycopg2==2.9.5

apiserver/templates/emails/auth/user_welcome_email.html

@@ -0,0 +1,481 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office">
+   <head>
+      <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+      <meta http-equiv="X-UA-Compatible" content="IE=edge">
+      <meta name="format-detection" content="telephone=no">
+      <meta name="viewport" content="width=device-width, initial-scale=1.0">
+      <title>Welcome to Plane ✈️!</title>
+      <style type="text/css" emogrify="no">#outlook a { padding:0; } .ExternalClass { width:100%; } .ExternalClass, .ExternalClass p, .ExternalClass span, .ExternalClass font, .ExternalClass td, .ExternalClass div { line-height: 100%; } table td { border-collapse: collapse; mso-line-height-rule: exactly; } .editable.image { font-size: 0 !important; line-height: 0 !important; } .nl2go_preheader { display: none !important; mso-hide:all !important; mso-line-height-rule: exactly; visibility: hidden !important; line-height: 0px !important; font-size: 0px !important; } body { width:100% !important; -webkit-text-size-adjust:100%; -ms-text-size-adjust:100%; margin:0; padding:0; } img { outline:none; text-decoration:none; -ms-interpolation-mode: bicubic; } a img { border:none; } table { border-collapse:collapse; mso-table-lspace:0pt; mso-table-rspace:0pt; } th { font-weight: normal; text-align: left; } *[class="gmail-fix"] { display: none !important; } </style>
+      <style type="text/css" emogrify="no"> @media (max-width: 600px) { .gmx-killpill { content: ' \03D1';} } </style>
+      <style type="text/css" emogrify="no">@media (max-width: 600px) { .gmx-killpill { content: ' \03D1';} .r0-c { box-sizing: border-box !important; text-align: center !important; valign: top !important; width: 320px !important } .r1-o { border-style: solid !important; margin: 0 auto 0 auto !important; width: 320px !important } .r2-i { background-color: #ffffff !important } .r3-c { box-sizing: border-box !important; text-align: center !important; valign: top !important; width: 100% !important } .r4-o { border-style: solid !important; margin: 0 auto 0 auto !important; width: 100% !important } .r5-i { background-color: #f8f9fa !important; padding-bottom: 20px !important; padding-left: 10px !important; padding-right: 10px !important; padding-top: 20px !important } .r6-c { box-sizing: border-box !important; display: block !important; valign: top !important; width: 100% !important } .r7-o { border-style: solid !important; width: 100% !important } .r8-i { padding-left: 0px !important; padding-right: 0px !important } .r9-i { padding-bottom: 15px !important; padding-top: 15px !important } .r10-c { box-sizing: border-box !important; text-align: left !important; valign: top !important; width: 100% !important } .r11-o { border-style: solid !important; margin: 0 auto 0 0 !important; width: 100% !important } .r12-i { padding-left: 20px !important; padding-right: 20px !important; padding-top: 0px !important; text-align: left !important } .r13-i { padding-bottom: 15px !important; padding-left: 20px !important; padding-right: 20px !important; padding-top: 15px !important; text-align: left !important } .r14-o { border-style: solid !important; margin: 0 auto 0 auto !important; margin-bottom: 15px !important; margin-top: 15px !important; width: 100% !important } .r15-i { text-align: center !important } .r16-r { background-color: #ffffff !important; border-color: #3f76ff !important; border-radius: 4px !important; border-width: 1px !important; box-sizing: border-box; height: initial !important; padding-bottom: 7px !important; padding-left: 5px !important; padding-right: 5px !important; padding-top: 7px !important; text-align: center !important; width: 100% !important } .r17-r { background-color: #ffffff !important; border-color: #000000 !important; border-radius: 4px !important; border-width: 1px !important; box-sizing: border-box; height: initial !important; padding-bottom: 7px !important; padding-left: 5px !important; padding-right: 5px !important; padding-top: 7px !important; text-align: center !important; width: 100% !important } .r18-i { background-color: #eff2f7 !important; padding-bottom: 20px !important; padding-left: 15px !important; padding-right: 15px !important; padding-top: 20px !important } .r19-i { color: #3b3f44 !important; padding-bottom: 0px !important; padding-top: 0px !important; text-align: center !important } .r20-c { box-sizing: border-box !important; text-align: center !important; width: 100% !important } .r21-c { box-sizing: border-box !important; width: 100% !important } .r22-i { font-size: 0px !important; padding-bottom: 15px !important; padding-left: 65px !important; padding-right: 65px !important; padding-top: 15px !important } .r23-c { box-sizing: border-box !important; width: 32px !important } .r24-o { border-style: solid !important; margin-right: 8px !important; width: 32px !important } .r25-i { padding-bottom: 5px !important; padding-top: 5px !important } .r26-o { border-style: solid !important; margin-right: 0px !important; width: 32px !important } .r27-i { color: #3b3f44 !important; padding-bottom: 15px !important; padding-top: 15px !important; text-align: center !important } .r28-i { padding-bottom: 15px !important; padding-left: 0px !important; padding-right: 0px !important; padding-top: 0px !important } .r29-c { box-sizing: border-box !important; text-align: center !important; valign: top !important; width: 129px !important } .r30-o { border-style: solid !important; margin: 0 auto 0 auto !important; width: 129px !important } body { -webkit-text-size-adjust: none } .nl2go-responsive-hide { display: none } .nl2go-body-table { min-width: unset !important } .mobshow { height: auto !important; overflow: visible !important; max-height: unset !important; visibility: visible !important; border: none !important } .resp-table { display: inline-table !important } .magic-resp { display: table-cell !important } } </style>
+      <!--[if !mso]><!-->
+      <style type="text/css" emogrify="no">@import url("https://fonts.googleapis.com/css2?family=Bitter&family=Roboto"); </style>
+      <!--<![endif]-->
+      <style type="text/css">p, h1, h2, h3, h4, ol, ul { margin: 0; } a, a:link { color: #0092ff; text-decoration: underline } .nl2go-default-textstyle { color: #3b3f44; font-family: arial,helvetica,sans-serif; font-size: 16px; line-height: 1.5 } .default-button { border-radius: 4px; color: #ffffff; font-family: arial,helvetica,sans-serif; font-size: 16px; font-style: normal; font-weight: bold; line-height: 1.15; text-decoration: none; width: 50% } .default-heading1 { color: #1F2D3D; font-family: arial,helvetica,sans-serif; font-size: 36px } .default-heading2 { color: #1F2D3D; font-family: arial,helvetica,sans-serif; font-size: 32px } .default-heading3 { color: #1F2D3D; font-family: arial,helvetica,sans-serif; font-size: 24px } .default-heading4 { color: #1F2D3D; font-family: arial,helvetica,sans-serif; font-size: 18px } a[x-apple-data-detectors] { color: inherit !important; text-decoration: inherit !important; font-size: inherit !important; font-family: inherit !important; font-weight: inherit !important; line-height: inherit !important; } .no-show-for-you { border: none; display: none; float: none; font-size: 0; height: 0; line-height: 0; max-height: 0; mso-hide: all; overflow: hidden; table-layout: fixed; visibility: hidden; width: 0; } </style>
+      <!--[if mso]>
+      <xml>
+         <o:OfficeDocumentSettings>
+            <o:AllowPNG/>
+            <o:PixelsPerInch>96</o:PixelsPerInch>
+         </o:OfficeDocumentSettings>
+      </xml>
+      <![endif]-->
+      <style type="text/css">a:link{color: #0092ff; text-decoration: underline;}</style>
+   </head>
+   <body bgcolor="#ffffff" text="#3b3f44" link="#0092ff" yahoo="fix" style="background-color: #ffffff; padding-bottom: 0px; padding-top: 0px;">
+      <table cellspacing="0" cellpadding="0" border="0" role="presentation" class="nl2go-body-table" width="100%" style="background-color: #ffffff; width: 100%;">
+         <tr>
+            <td align="center" class="r0-c">
+               <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="600" class="r1-o" style="table-layout: fixed; width: 600px;">
+                  <tr>
+                     <td valign="top" class="r2-i" style="background-color: #ffffff;">
+                        <table width="100%" cellspacing="0" cellpadding="0" border="0" role="presentation">
+                           <tr>
+                              <td class="r3-c" align="center">
+                                 <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" class="r4-o" style="table-layout: fixed; width: 100%;">
+                                    <!-- -->
+                                    <tr class="nl2go-responsive-hide">
+                                       <td height="20" style="font-size: 20px; line-height: 20px; background-color: #f8f9fa;">­</td>
+                                    </tr>
+                                    <tr>
+                                       <td class="r5-i" style="background-color: #f8f9fa;">
+                                          <table width="100%" cellspacing="0" cellpadding="0" border="0" role="presentation">
+                                             <tr>
+                                                <th width="100%" valign="top" class="r6-c" style="font-weight: normal;">
+                                                   <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" class="r7-o" style="table-layout: fixed; width: 100%;">
+                                                      <!-- -->
+                                                      <tr>
+                                                         <td valign="top" class="r8-i">
+                                                            <table width="100%" cellspacing="0" cellpadding="0" border="0" role="presentation">
+                                                               <tr>
+                                                                  <td class="r3-c" align="center">
+                                                                     <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="120" class="r4-o" style="table-layout: fixed; width: 120px;">
+                                                                        <tr class="nl2go-responsive-hide">
+                                                                           <td height="15" style="font-size: 15px; line-height: 15px;">­</td>
+                                                                        </tr>
+                                                                        <tr>
+                                                                           <td class="r9-i" style="font-size: 0px; line-height: 0px;"> <img src="https://ik.imagekit.io/w2okwbtu2/Plane_Logo_pIhtbyIoa.png?ik-sdk-version=javascript-1.4.3&updatedAt=1670873447444" width="120" border="0" class="" style="display: block; width: 100%;"></td>
+                                                                        </tr>
+                                                                        <tr class="nl2go-responsive-hide">
+                                                                           <td height="15" style="font-size: 15px; line-height: 15px;">­</td>
+                                                                        </tr>
+                                                                     </table>
+                                                                  </td>
+                                                               </tr>
+                                                               <tr>
+                                                                  <td class="r10-c" align="left">
+                                                                     <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" class="r11-o" style="table-layout: fixed; width: 100%;">
+                                                                        <tr>
+                                                                           <td class="nl2go-responsive-hide" width="20" style="font-size: 0px; line-height: 1px;">­ </td>
+                                                                           <td align="left" valign="top" class="r12-i nl2go-default-textstyle" style="color: #3b3f44; font-family: arial,helvetica,sans-serif; font-size: 16px; line-height: 1.5; text-align: left;">
+                                                                              <div>
+                                                                                 <h3 class="default-heading3" style="margin: 0; color: #1f2d3d; font-family: arial,helvetica,sans-serif; font-size: 24px;">Welcome to Plane!</h3>
+                                                                              </div>
+                                                                           </td>
+                                                                           <td class="nl2go-responsive-hide" width="20" style="font-size: 0px; line-height: 1px;">­ </td>
+                                                                        </tr>
+                                                                     </table>
+                                                                  </td>
+                                                               </tr>
+                                                               <tr>
+                                                                  <td class="r10-c" align="left">
+                                                                     <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" class="r11-o" style="table-layout: fixed; width: 100%;">
+                                                                        <tr class="nl2go-responsive-hide">
+                                                                           <td height="15" width="20" style="font-size: 15px; line-height: 15px;">­ </td>
+                                                                           <td height="15" style="font-size: 15px; line-height: 15px;">­</td>
+                                                                           <td height="15" width="20" style="font-size: 15px; line-height: 15px;">­ </td>
+                                                                        </tr>
+                                                                        <tr>
+                                                                           <td class="nl2go-responsive-hide" width="20" style="font-size: 0px; line-height: 1px;">­ </td>
+                                                                           <td align="left" valign="top" class="r13-i nl2go-default-textstyle" style="color: #3b3f44; font-family: arial,helvetica,sans-serif; font-size: 16px; line-height: 1.5; text-align: left;">
+                                                                              <div>
+                                                                                 <p style="margin: 0;">We're thrilled you're here. We know this is the beginning of a long and exciting<br>journey, and we want to be there every step of the way.</p>
+                                                                              </div>
+                                                                           </td>
+                                                                           <td class="nl2go-responsive-hide" width="20" style="font-size: 0px; line-height: 1px;">­ </td>
+                                                                        </tr>
+                                                                        <tr class="nl2go-responsive-hide">
+                                                                           <td height="15" width="20" style="font-size: 15px; line-height: 15px;">­ </td>
+                                                                           <td height="15" style="font-size: 15px; line-height: 15px;">­</td>
+                                                                           <td height="15" width="20" style="font-size: 15px; line-height: 15px;">­ </td>
+                                                                        </tr>
+                                                                     </table>
+                                                                  </td>
+                                                               </tr>
+                                                               <tr>
+                                                                  <td class="r10-c" align="left">
+                                                                     <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" class="r11-o" style="table-layout: fixed; width: 100%;">
+                                                                        <tr class="nl2go-responsive-hide">
+                                                                           <td height="15" width="20" style="font-size: 15px; line-height: 15px;">­ </td>
+                                                                           <td height="15" style="font-size: 15px; line-height: 15px;">­</td>
+                                                                           <td height="15" width="20" style="font-size: 15px; line-height: 15px;">­ </td>
+                                                                        </tr>
+                                                                        <tr>
+                                                                           <td class="nl2go-responsive-hide" width="20" style="font-size: 0px; line-height: 1px;">­ </td>
+                                                                           <td align="left" valign="top" class="r13-i nl2go-default-textstyle" style="color: #3b3f44; font-family: arial,helvetica,sans-serif; font-size: 16px; line-height: 1.5; text-align: left;">
+                                                                              <div>
+                                                                                 <p style="margin: 0;"><strong>Plane is an open-source issue planning and tracking tool</strong> that allows teams to collaborate on projects and prioritize tasks. With Plane, you can easily create and assign issues, set deadlines, and track progress.</p>
+                                                                              </div>
+                                                                           </td>
+                                                                           <td class="nl2go-responsive-hide" width="20" style="font-size: 0px; line-height: 1px;">­ </td>
+                                                                        </tr>
+                                                                        <tr class="nl2go-responsive-hide">
+                                                                           <td height="15" width="20" style="font-size: 15px; line-height: 15px;">­ </td>
+                                                                           <td height="15" style="font-size: 15px; line-height: 15px;">­</td>
+                                                                           <td height="15" width="20" style="font-size: 15px; line-height: 15px;">­ </td>
+                                                                        </tr>
+                                                                     </table>
+                                                                  </td>
+                                                               </tr>
+                                                               <tr>
+                                                                  <td class="r10-c" align="left">
+                                                                     <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" class="r11-o" style="table-layout: fixed; width: 100%;">
+                                                                        <tr class="nl2go-responsive-hide">
+                                                                           <td height="15" width="20" style="font-size: 15px; line-height: 15px;">­ </td>
+                                                                           <td height="15" style="font-size: 15px; line-height: 15px;">­</td>
+                                                                           <td height="15" width="20" style="font-size: 15px; line-height: 15px;">­ </td>
+                                                                        </tr>
+                                                                        <tr>
+                                                                           <td class="nl2go-responsive-hide" width="20" style="font-size: 0px; line-height: 1px;">­ </td>
+                                                                           <td align="left" valign="top" class="r13-i nl2go-default-textstyle" style="color: #3b3f44; font-family: arial,helvetica,sans-serif; font-size: 16px; line-height: 1.5; text-align: left;">
+                                                                              <div>
+                                                                                 <p style="margin: 0;">We have put together some resources to help you get started. Please find them below:</p>
+                                                                                 <p style="margin: 0;"> </p>
+                                                                                 <ul style="margin: 0; margin-top:20px;">
+                                                                                    <li><a href="https://docs.plane.so/quick-start" target="_blank" style="color: #0092ff; text-decoration: underline;">Getting started with Plane</a></li>
+                                                                                    <li><a href="https://plane.so/changelog" target="_blank" style="color: #0092ff; text-decoration: underline;">Plane Changelog</a></li>
+                                                                                 </ul>
+                                                                              </div>
+                                                                           </td>
+                                                                           <td class="nl2go-responsive-hide" width="20" style="font-size: 0px; line-height: 1px;">­ </td>
+                                                                        </tr>
+                                                                        <tr class="nl2go-responsive-hide">
+                                                                           <td height="15" width="20" style="font-size: 15px; line-height: 15px;">­ </td>
+                                                                           <td height="15" style="font-size: 15px; line-height: 15px;">­</td>
+                                                                           <td height="15" width="20" style="font-size: 15px; line-height: 15px;">­ </td>
+                                                                        </tr>
+                                                                     </table>
+                                                                  </td>
+                                                               </tr>
+                                                               <tr>
+                                                                  <td class="r3-c" align="center">
+                                                                     <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="300" class="r14-o" style="table-layout: fixed; width: 300px;">
+                                                                        <tr class="nl2go-responsive-hide">
+                                                                           <td height="15" style="font-size: 15px; line-height: 15px;">­</td>
+                                                                        </tr>
+                                                                        <tr>
+                                                                           <td height="18" align="center" valign="top" class="r15-i nl2go-default-textstyle" style="color: #3b3f44; font-family: arial,helvetica,sans-serif; font-size: 16px; line-height: 1.5;">
+                                                                              <!--[if mso]> 
+                                                                              <v:roundrect xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w="urn:schemas-microsoft-com:office:word" href="https://app.plane.so/" style="v-text-anchor:middle; height: 33px; width: 301px;" arcsize="12%" fillcolor="#ffffff" strokecolor="#3f76ff" strokeweight="1px" data-btn="1">
+                                                                                 <w:anchorlock/>
+                                                                                 <div style="display:none;">
+                                                                                    <center class="default-button">
+                                                                                       <p><span style="color:#3F76FF;font-size:14px;">Open Plane</span></p>
+                                                                                    </center>
+                                                                                 </div>
+                                                                              </v:roundrect>
+                                                                              <![endif]-->  <!--[if !mso]><!-- --> 
+                                                                              <a href="https://app.plane.so/" class="r16-r default-button" target="_blank" data-btn="1" style="font-style: normal; font-weight: bold; line-height: 1.15; text-decoration: none; border-style: solid; word-wrap: break-word; display: inline-block; -webkit-text-size-adjust: none; mso-hide: all; background-color: #ffffff; border-color: #3f76ff; border-radius: 4px; border-width: 1px; color: #ffffff; font-family: arial,helvetica,sans-serif; font-size: 16px; height: 18px; padding-bottom: 7px; padding-left: 5px; padding-right: 5px; padding-top: 7px; width: 288px;">
+                                                                                 <p style="margin: 0;"><span style="color: #3F76FF; font-size: 14px;">Open Plane</span></p>
+                                                                              </a>
+                                                                              <!--<![endif]--> 
+                                                                           </td>
+                                                                        </tr>
+                                                                        <tr class="nl2go-responsive-hide">
+                                                                           <td height="15" style="font-size: 15px; line-height: 15px;">­</td>
+                                                                        </tr>
+                                                                     </table>
+                                                                  </td>
+                                                               </tr>
+                                                               <tr>
+                                                                  <td class="r10-c" align="left">
+                                                                     <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" class="r11-o" style="table-layout: fixed; width: 100%;">
+                                                                        <tr class="nl2go-responsive-hide">
+                                                                           <td height="15" width="20" style="font-size: 15px; line-height: 15px;">­ </td>
+                                                                           <td height="15" style="font-size: 15px; line-height: 15px;">­</td>
+                                                                           <td height="15" width="20" style="font-size: 15px; line-height: 15px;">­ </td>
+                                                                        </tr>
+                                                                        <tr>
+                                                                           <td class="nl2go-responsive-hide" width="20" style="font-size: 0px; line-height: 1px;">­ </td>
+                                                                           <td align="left" valign="top" class="r13-i nl2go-default-textstyle" style="color: #3b3f44; font-family: arial,helvetica,sans-serif; font-size: 16px; line-height: 1.5; text-align: left;">
+                                                                              <div>
+                                                                                 <p style="margin: 0;">Also, if you like Plane, please consider starring us on GitHub. This helps us to grow our community and make Plane even better.</p>
+                                                                              </div>
+                                                                           </td>
+                                                                           <td class="nl2go-responsive-hide" width="20" style="font-size: 0px; line-height: 1px;">­ </td>
+                                                                        </tr>
+                                                                        <tr class="nl2go-responsive-hide">
+                                                                           <td height="15" width="20" style="font-size: 15px; line-height: 15px;">­ </td>
+                                                                           <td height="15" style="font-size: 15px; line-height: 15px;">­</td>
+                                                                           <td height="15" width="20" style="font-size: 15px; line-height: 15px;">­ </td>
+                                                                        </tr>
+                                                                     </table>
+                                                                  </td>
+                                                               </tr>
+                                                               <tr>
+                                                                  <td class="r3-c" align="center">
+                                                                     <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="300" class="r14-o" style="table-layout: fixed; width: 300px;">
+                                                                        <tr class="nl2go-responsive-hide">
+                                                                           <td height="15" style="font-size: 15px; line-height: 15px;">­</td>
+                                                                        </tr>
+                                                                        <tr>
+                                                                           <td height="18" align="center" valign="top" class="r15-i nl2go-default-textstyle" style="color: #3b3f44; font-family: arial,helvetica,sans-serif; font-size: 16px; line-height: 1.5;">
+                                                                              <!--[if mso]> 
+                                                                              <v:roundrect xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w="urn:schemas-microsoft-com:office:word" href="https://github.com/makeplane/plane" style="v-text-anchor:middle; height: 33px; width: 301px;" arcsize="12%" fillcolor="#ffffff" strokecolor="#000000" strokeweight="1px" data-btn="2">
+                                                                                 <w:anchorlock/>
+                                                                                 <div style="display:none;">
+                                                                                    <center class="default-button">
+                                                                                       <p><span style="color:#000000;font-size:14px;">⭐ Star us on GitHub</span></p>
+                                                                                    </center>
+                                                                                 </div>
+                                                                              </v:roundrect>
+                                                                              <![endif]-->  <!--[if !mso]><!-- --> 
+                                                                              <a href="https://github.com/makeplane/plane" class="r17-r default-button" target="_blank" data-btn="2" style="font-style: normal; font-weight: bold; line-height: 1.15; text-decoration: none; border-style: solid; word-wrap: break-word; display: inline-block; -webkit-text-size-adjust: none; mso-hide: all; background-color: #ffffff; border-color: #000000; border-radius: 4px; border-width: 1px; color: #ffffff; font-family: arial,helvetica,sans-serif; font-size: 16px; height: 18px; padding-bottom: 7px; padding-left: 5px; padding-right: 5px; padding-top: 7px; width: 288px;">
+                                                                                 <p style="margin: 0;"><span style="color: #000000; font-size: 14px;">⭐ Star us on GitHub</span></p>
+                                                                              </a>
+                                                                              <!--<![endif]--> 
+                                                                           </td>
+                                                                        </tr>
+                                                                        <tr class="nl2go-responsive-hide">
+                                                                           <td height="15" style="font-size: 15px; line-height: 15px;">­</td>
+                                                                        </tr>
+                                                                     </table>
+                                                                  </td>
+                                                               </tr>
+                                                               <tr>
+                                                                  <td class="r10-c" align="left">
+                                                                     <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" class="r11-o" style="table-layout: fixed; width: 100%;">
+                                                                        <tr class="nl2go-responsive-hide">
+                                                                           <td height="15" width="20" style="font-size: 15px; line-height: 15px;">­ </td>
+                                                                           <td height="15" style="font-size: 15px; line-height: 15px;">­</td>
+                                                                           <td height="15" width="20" style="font-size: 15px; line-height: 15px;">­ </td>
+                                                                        </tr>
+                                                                        <tr>
+                                                                           <td class="nl2go-responsive-hide" width="20" style="font-size: 0px; line-height: 1px;">­ </td>
+                                                                           <td align="left" valign="top" class="r13-i nl2go-default-textstyle" style="color: #3b3f44; font-family: arial,helvetica,sans-serif; font-size: 16px; line-height: 1.5; text-align: left;">
+                                                                              <div>
+                                                                                 <p style="margin: 0;"><span style="font-size: 12px;">Note: Plane is still in its early days, not everything will be perfect yet, and hiccups may happen. Please let us know of any suggestions, ideas, or bugs that you encounter on our </span><a href="https://discord.gg/A92xrEGCge" target="_blank" style="color: #0092ff; text-decoration: underline;"><span style="font-size: 12px;">Discord</span></a><span style="font-size: 12px;"> or </span><a href="https://github.com/makeplane/plane" target="_blank" style="color: #0092ff; text-decoration: underline;"><span style="font-size: 12px;">GitHub</span></a><span style="font-size: 12px;">, and we will use your feedback to improve on our upcoming releases.</span></p>
+                                                                              </div>
+                                                                           </td>
+                                                                           <td class="nl2go-responsive-hide" width="20" style="font-size: 0px; line-height: 1px;">­ </td>
+                                                                        </tr>
+                                                                        <tr class="nl2go-responsive-hide">
+                                                                           <td height="15" width="20" style="font-size: 15px; line-height: 15px;">­ </td>
+                                                                           <td height="15" style="font-size: 15px; line-height: 15px;">­</td>
+                                                                           <td height="15" width="20" style="font-size: 15px; line-height: 15px;">­ </td>
+                                                                        </tr>
+                                                                     </table>
+                                                                  </td>
+                                                               </tr>
+                                                            </table>
+                                                         </td>
+                                                      </tr>
+                                                   </table>
+                                                </th>
+                                             </tr>
+                                          </table>
+                                       </td>
+                                    </tr>
+                                    <tr class="nl2go-responsive-hide">
+                                       <td height="20" style="font-size: 20px; line-height: 20px; background-color: #f8f9fa;">­</td>
+                                    </tr>
+                                 </table>
+                              </td>
+                           </tr>
+                           <tr>
+                              <td class="r3-c" align="center">
+                                 <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" class="r4-o" style="table-layout: fixed; width: 100%;">
+                                    <!-- -->
+                                    <tr class="nl2go-responsive-hide">
+                                       <td height="20" style="font-size: 20px; line-height: 20px; background-color: #eff2f7;">­</td>
+                                    </tr>
+                                    <tr>
+                                       <td class="r18-i" style="background-color: #eff2f7;">
+                                          <table width="100%" cellspacing="0" cellpadding="0" border="0" role="presentation">
+                                             <tr>
+                                                <th width="100%" valign="top" class="r6-c" style="font-weight: normal;">
+                                                   <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" class="r7-o" style="table-layout: fixed; width: 100%;">
+                                                      <!-- -->
+                                                      <tr>
+                                                         <td class="nl2go-responsive-hide" width="15" style="font-size: 0px; line-height: 1px;">­ </td>
+                                                         <td valign="top" class="r8-i">
+                                                            <table width="100%" cellspacing="0" cellpadding="0" border="0" role="presentation">
+                                                               <tr>
+                                                                  <td class="r3-c" align="center">
+                                                                     <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="57" class="r4-o" style="table-layout: fixed; width: 57px;">
+                                                                        <tr class="nl2go-responsive-hide">
+                                                                           <td height="15" style="font-size: 15px; line-height: 15px;">­</td>
+                                                                        </tr>
+                                                                        <tr>
+                                                                           <td class="r9-i" style="font-size: 0px; line-height: 0px;"> <img src="https://ik.imagekit.io/w2okwbtu2/115727700_n9t8rrnwT.png?ik-sdk-version=javascript-1.4.3&updatedAt=1670872429989" width="57" border="0" class="" style="display: block; width: 100%;"></td>
+                                                                        </tr>
+                                                                        <tr class="nl2go-responsive-hide">
+                                                                           <td height="15" style="font-size: 15px; line-height: 15px;">­</td>
+                                                                        </tr>
+                                                                     </table>
+                                                                  </td>
+                                                               </tr>
+                                                               <tr>
+                                                                  <td class="r10-c" align="left">
+                                                                     <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" class="r11-o" style="table-layout: fixed; width: 100%;">
+                                                                        <tr>
+                                                                           <td align="center" valign="top" class="r19-i nl2go-default-textstyle" style="font-family: arial,helvetica,sans-serif; color: #3b3f44; font-size: 18px; line-height: 1.5; text-align: center;">
+                                                                              <div>
+                                                                                 <p style="margin: 0; font-size: 14px;">Proudly made on <strong>Planet Earth  🌍</strong>.</p>
+                                                                              </div>
+                                                                           </td>
+                                                                        </tr>
+                                                                     </table>
+                                                                  </td>
+                                                               </tr>
+                                                               <tr>
+                                                                  <td class="r20-c" align="center">
+                                                                     <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="570" class="r4-o" style="table-layout: fixed; width: 570px;">
+                                                                        <!-- -->
+                                                                        <tr>
+                                                                           <td valign="top" class="">
+                                                                              <table width="100%" cellspacing="0" cellpadding="0" border="0" role="presentation">
+                                                                                 <tr>
+                                                                                    <td class="r21-c" style="display: inline-block;">
+                                                                                       <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="570" class="r7-o" style="table-layout: fixed; width: 570px;">
+                                                                                          <!-- -->
+                                                                                          <tr class="nl2go-responsive-hide">
+                                                                                             <td height="15" width="209" style="font-size: 15px; line-height: 15px;">­ </td>
+                                                                                             <td height="15" style="font-size: 15px; line-height: 15px;">­</td>
+                                                                                             <td height="15" width="209" style="font-size: 15px; line-height: 15px;">­ </td>
+                                                                                          </tr>
+                                                                                          <tr>
+                                                                                             <td class="nl2go-responsive-hide" width="209" style="font-size: 0px; line-height: 1px;">­ </td>
+                                                                                             <td class="r22-i">
+                                                                                                <table width="100%" cellspacing="0" cellpadding="0" border="0" role="presentation">
+                                                                                                   <tr>
+                                                                                                      <th width="40" valign="" class="r23-c mobshow resp-table" style="font-weight: normal;">
+                                                                                                         <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" class="r24-o" style="table-layout: fixed; width: 100%;">
+                                                                                                            <!-- -->
+                                                                                                            <tr class="nl2go-responsive-hide">
+                                                                                                               <td height="5" style="font-size: 5px; line-height: 5px;">­</td>
+                                                                                                               <td height="5" width="8" style="font-size: 5px; line-height: 5px;">­ </td>
+                                                                                                            </tr>
+                                                                                                            <tr>
+                                                                                                               <td class="r25-i" style="font-size: 0px; line-height: 0px;"> <a href="https://github.com/makeplane/plane" target="_blank" style="color: #0092ff; text-decoration: underline;"> <img src="https://sendinblue-templates.s3.eu-west-3.amazonaws.com/icons/rounded_colored/github_32px.png" width="32" border="0" class="" style="display: block; width: 100%;"></a> </td>
+                                                                                                               <td class="nl2go-responsive-hide" width="8" style="font-size: 0px; line-height: 1px;">­ </td>
+                                                                                                            </tr>
+                                                                                                            <tr class="nl2go-responsive-hide">
+                                                                                                               <td height="5" style="font-size: 5px; line-height: 5px;">­</td>
+                                                                                                               <td height="5" width="8" style="font-size: 5px; line-height: 5px;">­ </td>
+                                                                                                            </tr>
+                                                                                                         </table>
+                                                                                                      </th>
+                                                                                                      <th width="40" valign="" class="r23-c mobshow resp-table" style="font-weight: normal;">
+                                                                                                         <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" class="r24-o" style="table-layout: fixed; width: 100%;">
+                                                                                                            <!-- -->
+                                                                                                            <tr class="nl2go-responsive-hide">
+                                                                                                               <td height="5" style="font-size: 5px; line-height: 5px;">­</td>
+                                                                                                               <td height="5" width="8" style="font-size: 5px; line-height: 5px;">­ </td>
+                                                                                                            </tr>
+                                                                                                            <tr>
+                                                                                                               <td class="r25-i" style="font-size: 0px; line-height: 0px;"> <a href="https://discord.gg/A92xrEGCge" target="_blank" style="color: #0092ff; text-decoration: underline;"> <img src="https://sendinblue-templates.s3.eu-west-3.amazonaws.com/icons/rounded_colored/discord_32px.png" width="32" border="0" class="" style="display: block; width: 100%;"></a> </td>
+                                                                                                               <td class="nl2go-responsive-hide" width="8" style="font-size: 0px; line-height: 1px;">­ </td>
+                                                                                                            </tr>
+                                                                                                            <tr class="nl2go-responsive-hide">
+                                                                                                               <td height="5" style="font-size: 5px; line-height: 5px;">­</td>
+                                                                                                               <td height="5" width="8" style="font-size: 5px; line-height: 5px;">­ </td>
+                                                                                                            </tr>
+                                                                                                         </table>
+                                                                                                      </th>
+                                                                                                      <th width="40" valign="" class="r23-c mobshow resp-table" style="font-weight: normal;">
+                                                                                                         <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" class="r24-o" style="table-layout: fixed; width: 100%;">
+                                                                                                            <!-- -->
+                                                                                                            <tr class="nl2go-responsive-hide">
+                                                                                                               <td height="5" style="font-size: 5px; line-height: 5px;">­</td>
+                                                                                                               <td height="5" width="8" style="font-size: 5px; line-height: 5px;">­ </td>
+                                                                                                            </tr>
+                                                                                                            <tr>
+                                                                                                               <td class="r25-i" style="font-size: 0px; line-height: 0px;"> <a href="https://twitter.com/planepowers" target="_blank" style="color: #0092ff; text-decoration: underline;"> <img src="https://sendinblue-templates.s3.eu-west-3.amazonaws.com/icons/rounded_colored/twitter_32px.png" width="32" border="0" class="" style="display: block; width: 100%;"></a> </td>
+                                                                                                               <td class="nl2go-responsive-hide" width="8" style="font-size: 0px; line-height: 1px;">­ </td>
+                                                                                                            </tr>
+                                                                                                            <tr class="nl2go-responsive-hide">
+                                                                                                               <td height="5" style="font-size: 5px; line-height: 5px;">­</td>
+                                                                                                               <td height="5" width="8" style="font-size: 5px; line-height: 5px;">­ </td>
+                                                                                                            </tr>
+                                                                                                         </table>
+                                                                                                      </th>
+                                                                                                      <th width="32" valign="" class="r23-c mobshow resp-table" style="font-weight: normal;">
+                                                                                                         <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" class="r26-o" style="table-layout: fixed; width: 100%;">
+                                                                                                            <!-- -->
+                                                                                                            <tr class="nl2go-responsive-hide">
+                                                                                                               <td height="5" style="font-size: 5px; line-height: 5px;">­</td>
+                                                                                                            </tr>
+                                                                                                            <tr>
+                                                                                                               <td class="r25-i" style="font-size: 0px; line-height: 0px;"> <a href="https://www.linkedin.com/company/planepowers/" target="_blank" style="color: #0092ff; text-decoration: underline;"> <img src="https://sendinblue-templates.s3.eu-west-3.amazonaws.com/icons/rounded_colored/linkedin_32px.png" width="32" border="0" class="" style="display: block; width: 100%;"></a> </td>
+                                                                                                            </tr>
+                                                                                                            <tr class="nl2go-responsive-hide">
+                                                                                                               <td height="5" style="font-size: 5px; line-height: 5px;">­</td>
+                                                                                                            </tr>
+                                                                                                         </table>
+                                                                                                      </th>
+                                                                                                   </tr>
+                                                                                                </table>
+                                                                                             </td>
+                                                                                             <td class="nl2go-responsive-hide" width="209" style="font-size: 0px; line-height: 1px;">­ </td>
+                                                                                          </tr>
+                                                                                          <tr class="nl2go-responsive-hide">
+                                                                                             <td height="15" width="209" style="font-size: 15px; line-height: 15px;">­ </td>
+                                                                                             <td height="15" style="font-size: 15px; line-height: 15px;">­</td>
+                                                                                             <td height="15" width="209" style="font-size: 15px; line-height: 15px;">­ </td>
+                                                                                          </tr>
+                                                                                       </table>
+                                                                                    </td>
+                                                                                 </tr>
+                                                                              </table>
+                                                                           </td>
+                                                                        </tr>
+                                                                     </table>
+                                                                  </td>
+                                                               </tr>
+                                                               <tr>
+                                                                  <td class="r10-c" align="left">
+                                                                     <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" class="r11-o" style="table-layout: fixed; width: 100%;">
+                                                                        <tr class="nl2go-responsive-hide">
+                                                                           <td height="15" style="font-size: 15px; line-height: 15px;">­</td>
+                                                                        </tr>
+                                                                        <tr>
+                                                                           <td align="center" valign="top" class="r27-i nl2go-default-textstyle" style="font-family: arial,helvetica,sans-serif; color: #3b3f44; font-size: 18px; line-height: 1.5; text-align: center;">
+                                                                              <div>
+                                                                                 <p style="margin: 0; font-size: 14px;"><a href="{{ mirror }}" style="color: #0092ff; text-decoration: underline;">View in browser</a> | <a href="{{ unsubscribe }}" style="color: #0092ff; text-decoration: underline;">Unsubscribe</a></p>
+                                                                              </div>
+                                                                           </td>
+                                                                        </tr>
+                                                                        <tr class="nl2go-responsive-hide">
+                                                                           <td height="15" style="font-size: 15px; line-height: 15px;">­</td>
+                                                                        </tr>
+                                                                     </table>
+                                                                  </td>
+                                                               </tr>
+                                                            </table>
+                                                         </td>
+                                                         <td class="nl2go-responsive-hide" width="15" style="font-size: 0px; line-height: 1px;">­ </td>
+                                                      </tr>
+                                                   </table>
+                                                </th>
+                                             </tr>
+                                          </table>
+                                       </td>
+                                    </tr>
+                                    <tr class="nl2go-responsive-hide">
+                                       <td height="20" style="font-size: 20px; line-height: 20px; background-color: #eff2f7;">­</td>
+                                    </tr>
+                                 </table>
+                              </td>
+                           </tr>
+                        </table>
+                     </td>
+                  </tr>
+               </table>
+            </td>
+         </tr>
+      </table>
+   </body>
+</html>

apiserver/templates/emails/exports/analytics.html

@@ -1,8 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-    Hey there,<br/>
-    Your requested data export from Plane Analytics is now ready. The information has been compiled into a CSV format for your convenience.<br/>
-    Please find the attachment and download the CSV file. This file can easily be imported into any spreadsheet program for further analysis.<br/>
-    If you require any assistance or have any questions, please do not hesitate to contact us.<br/>
-    Thank you
-</html>

app/.env.example

@@ -1,4 +1,5 @@
 # Replace with your instance Public IP
+# NEXT_PUBLIC_API_BASE_URL = "http://localhost"
 NEXT_PUBLIC_EXTRA_IMAGE_DOMAINS=
 NEXT_PUBLIC_GOOGLE_CLIENTID=""
 NEXT_PUBLIC_GITHUB_APP_NAME=""
@@ -8,13 +9,3 @@ NEXT_PUBLIC_ENABLE_OAUTH=0
 NEXT_PUBLIC_ENABLE_SENTRY=0
 NEXT_PUBLIC_ENABLE_SESSION_RECORDER=0
 NEXT_PUBLIC_TRACK_EVENTS=0
-NEXT_PUBLIC_SLACK_CLIENT_ID=""
-EMAIL_HOST=""
-EMAIL_HOST_USER=""
-EMAIL_HOST_PASSWORD=""
-AWS_REGION=""
-AWS_ACCESS_KEY_ID=""
-AWS_SECRET_ACCESS_KEY=""
-AWS_S3_BUCKET_NAME=""
-OPENAI_API_KEY=""
-GPT_ENGINE=""

app/.eslintrc.js

@@ -1,12 +1,7 @@
 module.exports = {
-  extends: ["next", "turbo", "prettier"],
+  extends: ["next", "prettier"],
   parser: "@typescript-eslint/parser",
   plugins: ["react", "@typescript-eslint"],
-  settings: {
-    next: {
-      rootDir: ["app/", "docs/", "packages/*/"],
-    },
-  },
   rules: {
     "@next/next/no-html-link-for-pages": "off",
     "react/jsx-key": "off",

app/Dockerfile.dev

@@ -4,9 +4,10 @@ RUN apk update
 # Set working directory
 WORKDIR /app
 
-
 COPY . .
-RUN yarn global add turbo
+
 RUN yarn install
+
 EXPOSE 3000
-CMD ["yarn","dev"]
+
+

app/Dockerfile.web

@@ -0,0 +1,30 @@
+FROM node:18-alpine AS builder
+RUN apk add --no-cache libc6-compat
+RUN apk update
+# Set working directory
+WORKDIR /app
+
+# Install dependencies
+RUN yarn install --frozen-lockfile
+COPY . .
+
+# build
+RUN yarn build
+
+FROM node:18-alpine AS runner
+WORKDIR /app
+
+# Don't run production as root
+RUN addgroup --system --gid 1001 plane
+RUN adduser --system --uid 1001 captain
+USER captain
+
+COPY --from=builder /app/next.config.js .
+COPY --from=builder /app/package.json .
+COPY --from=builder /app/node_modules ./node_modules
+COPY --from=builder /app/.next ./.next
+COPY --from=builder /app/public ./public
+
+ENV NEXT_TELEMETRY_DISABLED 1
+
+EXPOSE 3000

app/components/account/email-code-form.tsx

@@ -92,13 +92,13 @@ export const EmailCodeForm = ({ onSuccess }: any) => {
     <>
       <form className="space-y-5 py-5 px-5">
         {(codeSent || codeResent) && (
-          <div className="rounded-md bg-green-500/20 p-4">
+          <div className="rounded-md bg-green-50 p-4">
             <div className="flex">
               <div className="flex-shrink-0">
-                <CheckCircleIcon className="h-5 w-5 text-green-500" aria-hidden="true" />
+                <CheckCircleIcon className="h-5 w-5 text-green-400" aria-hidden="true" />
               </div>
               <div className="ml-3">
-                <p className="text-sm font-medium text-green-500">
+                <p className="text-sm font-medium text-green-800">
                   {codeResent
                     ? "Please check your mail for new code."
                     : "Please check your mail for code."}
@@ -141,9 +141,7 @@ export const EmailCodeForm = ({ onSuccess }: any) => {
             <button
               type="button"
               className={`mt-5 flex w-full justify-end text-xs outline-none ${
-                isResendDisabled
-                  ? "cursor-default text-brand-secondary"
-                  : "cursor-pointer text-brand-accent"
+                isResendDisabled ? "cursor-default text-gray-400" : "cursor-pointer text-brand-accent"
               } `}
               onClick={() => {
                 setIsCodeResending(true);
@@ -176,8 +174,7 @@ export const EmailCodeForm = ({ onSuccess }: any) => {
               className="w-full text-center"
               size="md"
               onClick={handleSubmit(handleSignin)}
-              disabled={!isValid && isDirty}
-              loading={isSubmitting}
+              loading={isSubmitting || (!isValid && isDirty)}
             >
               {isSubmitting ? "Signing in..." : "Sign in"}
             </PrimaryButton>

app/components/account/email-password-form.tsx

@@ -94,9 +94,7 @@ export const EmailPasswordForm = ({ onSuccess }: any) => {
         <div className="mt-2 flex items-center justify-between">
           <div className="ml-auto text-sm">
             <Link href={"/forgot-password"}>
-              <a className="font-medium text-brand-accent hover:text-brand-accent">
-                Forgot your password?
-              </a>
+              <a className="font-medium text-brand-accent hover:text-indigo-500">Forgot your password?</a>
             </Link>
           </div>
         </div>
@@ -104,8 +102,7 @@ export const EmailPasswordForm = ({ onSuccess }: any) => {
           <SecondaryButton
             type="submit"
             className="w-full text-center"
-            disabled={!isValid && isDirty}
-            loading={isSubmitting}
+            loading={isSubmitting || (!isValid && isDirty)}
           >
             {isSubmitting ? "Signing in..." : "Sign In"}
           </SecondaryButton>

app/components/account/github-login-button.tsx

@@ -33,11 +33,11 @@ export const GithubLoginButton: FC<GithubLoginButtonProps> = (props) => {
   }, []);
 
   return (
-    <div className="w-full px-1">
+    <div className="px-1 w-full">
       <Link
         href={`https://github.com/login/oauth/authorize?client_id=${NEXT_PUBLIC_GITHUB_ID}&redirect_uri=${loginCallBackURL}&scope=read:user,user:email`}
       >
-        <button className="flex w-full items-center justify-center gap-3 rounded-md border border-brand-base p-2 text-sm font-medium text-brand-secondary duration-300 hover:bg-brand-surface-2">
+        <button className="flex w-full items-center justify-center gap-3 rounded-md border border-brand-base p-2 text-sm font-medium text-gray-600 duration-300 hover:bg-gray-50">
           <Image src={githubImage} height={22} width={22} color="#000" alt="GitHub Logo" />
           <span>Sign In with Github</span>
         </button>

app/components/account/google-login.tsx

@@ -47,7 +47,7 @@ export const GoogleLoginButton: FC<IGoogleLoginButton> = (props) => {
   return (
     <>
       <Script src="https://accounts.google.com/gsi/client" async defer onLoad={loadScript} />
-      <div className="overflow-hidden rounded" id="googleSignInButton" ref={googleSignInButton} />
+      <div className="h-12" id="googleSignInButton" ref={googleSignInButton} />
     </>
   );
 };

app/components/auth-screens/not-authorized-view.tsx

@@ -27,7 +27,7 @@ export const NotAuthorizedView: React.FC<Props> = ({ actionButton, type }) => {
         description: "You are not authorized to view this page",
       }}
     >
-      <div className="flex h-full w-full flex-col items-center justify-center gap-y-5 bg-brand-surface-1 text-center">
+      <div className="flex h-full w-full flex-col items-center justify-center gap-y-5 text-center">
         <div className="h-44 w-72">
           <Image
             src={type === "project" ? ProjectNotAuthorizedImg : WorkspaceNotAuthorizedImg}
@@ -40,12 +40,12 @@ export const NotAuthorizedView: React.FC<Props> = ({ actionButton, type }) => {
           Oops! You are not authorized to view this page
         </h1>
 
-        <div className="w-full max-w-md text-base text-brand-secondary">
+        <div className="w-full text-base text-brand-secondary max-w-md ">
           {user ? (
             <p>
               You have signed in as {user.email}. <br />
               <Link href={`/signin?next=${currentPath}`}>
-                <a className="font-medium text-brand-base">Sign in</a>
+                <a className="text-brand-base font-medium">Sign in</a>
               </Link>{" "}
               with different account that has access to this page.
             </p>
@@ -53,7 +53,7 @@ export const NotAuthorizedView: React.FC<Props> = ({ actionButton, type }) => {
             <p>
               You need to{" "}
               <Link href={`/signin?next=${currentPath}`}>
-                <a className="font-medium text-brand-base">Sign in</a>
+                <a className="text-brand-base font-medium">Sign in</a>
               </Link>{" "}
               with an account that has access to this page.
             </p>

app/components/auth-screens/project/join-project.tsx

@@ -41,13 +41,13 @@ export const JoinProject: React.FC = () => {
   };
 
   return (
-    <div className="flex h-full w-full flex-col items-center justify-center gap-y-5 bg-brand-surface-1 text-center">
+    <div className="flex h-full w-full flex-col items-center justify-center gap-y-5 text-center">
       <div className="h-44 w-72">
         <Image src={JoinProjectImg} height="176" width="288" alt="JoinProject" />
       </div>
-      <h1 className="text-xl font-medium text-brand-base">You are not a member of this project</h1>
+      <h1 className="text-xl font-medium text-gray-900">You are not a member of this project</h1>
 
-      <div className="w-full max-w-md text-base text-brand-secondary">
+      <div className="w-full max-w-md text-base text-gray-500 ">
         <p className="mx-auto w-full text-sm md:w-3/4">
           You are not a member of this project, but you can join this project by clicking the button
           below.

app/components/auth-screens/workspace/not-a-member.tsx

@@ -20,12 +20,12 @@ export const NotAWorkspaceMember = () => {
         <div className="space-y-8 text-center">
           <div className="space-y-2">
             <h3 className="text-lg font-semibold">Not Authorized!</h3>
-            <p className="mx-auto w-1/2 text-sm text-brand-secondary">
+            <p className="text-sm text-gray-500 w-1/2 mx-auto">
               You{"'"}re not a member of this workspace. Please contact the workspace admin to get
               an invitation or check your pending invitations.
             </p>
           </div>
-          <div className="flex items-center justify-center gap-2">
+          <div className="flex items-center gap-2 justify-center">
             <Link href="/invitations">
               <a>
                 <SecondaryButton>Check pending invites</SecondaryButton>

app/components/command-palette/change-issue-state.tsx

@@ -14,7 +14,7 @@ import stateService from "services/state.service";
 // types
 import { IIssue } from "types";
 // fetch keys
-import { ISSUE_DETAILS, PROJECT_ISSUES_ACTIVITY, STATES_LIST } from "constants/fetch-keys";
+import { ISSUE_DETAILS, PROJECT_ISSUES_ACTIVITY, STATE_LIST } from "constants/fetch-keys";
 // icons
 import { CheckIcon, getStateGroupIcon } from "components/icons";
 
@@ -28,7 +28,7 @@ export const ChangeIssueState: React.FC<Props> = ({ setIsPaletteOpen, issue }) =
   const { workspaceSlug, projectId, issueId } = router.query;
 
   const { data: stateGroups, mutate: mutateIssueDetails } = useSWR(
-    workspaceSlug && projectId ? STATES_LIST(projectId as string) : null,
+    workspaceSlug && projectId ? STATE_LIST(projectId as string) : null,
     workspaceSlug && projectId
       ? () => stateService.getStates(workspaceSlug as string, projectId as string)
       : null

app/components/command-palette/command-pallette.tsx

@@ -393,7 +393,7 @@ export const CommandPalette: React.FC = () => {
               leaveFrom="opacity-100 translate-y-0 sm:scale-100"
               leaveTo="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
             >
-              <Dialog.Panel className="relative mx-auto max-w-2xl transform divide-y divide-brand-base divide-opacity-10 rounded-xl border border-brand-base bg-brand-surface-2 shadow-2xl transition-all">
+              <Dialog.Panel className="relative mx-auto max-w-2xl transform divide-y divide-brand-base divide-opacity-10 rounded-xl bg-brand-surface-2 border-brand-base border shadow-2xl transition-all">
                 <Command
                   filter={(value, search) => {
                     if (value.toLowerCase().includes(search.toLowerCase())) return 1;
@@ -675,7 +675,7 @@ export const CommandPalette: React.FC = () => {
 
                             <Command.Group heading="Page">
                               <Command.Item onSelect={createNewPage} className="focus:outline-none">
-                                <div className="flex items-center gap-2 text-brand-secondary">
+                                <div className="flex items-center gap-2 text-gray-700">
                                   <DocumentTextIcon className="h-4 w-4" color="#6b7280" />
                                   Create new page
                                 </div>
@@ -821,7 +821,7 @@ export const CommandPalette: React.FC = () => {
                         >
                           <div className="flex items-center gap-2 text-brand-secondary">
                             <SettingIcon className="h-4 w-4 text-brand-secondary" />
-                            Billing and Plans
+                            Billings and Plans
                           </div>
                         </Command.Item>
                         <Command.Item
@@ -839,7 +839,7 @@ export const CommandPalette: React.FC = () => {
                         >
                           <div className="flex items-center gap-2 text-brand-secondary">
                             <SettingIcon className="h-4 w-4 text-brand-secondary" />
-                            Import/ Export
+                            Import/Export
                           </div>
                         </Command.Item>
                       </>

app/components/command-palette/shortcuts-modal.tsx

@@ -4,7 +4,7 @@ import { Dialog, Transition } from "@headlessui/react";
 // icons
 import { XMarkIcon } from "@heroicons/react/20/solid";
 import { MagnifyingGlassIcon } from "@heroicons/react/24/outline";
-import { CommandIcon } from "components/icons";
+import { MacCommandIcon } from "components/icons";
 // ui
 import { Input } from "components/ui";
 
@@ -123,23 +123,17 @@ export const ShortcutsModal: React.FC<Props> = ({ isOpen, setIsOpen }) => {
                               <div key={shortcut.keys} className="flex w-full flex-col">
                                 <div className="flex flex-col gap-y-3">
                                   <div className="flex items-center justify-between">
-                                    <p className="text-sm text-brand-secondary">
-                                      {shortcut.description}
-                                    </p>
+                                    <p className="text-sm text-brand-secondary">{shortcut.description}</p>
                                     <div className="flex items-center gap-x-2.5">
                                       {shortcut.keys.split(",").map((key, index) => (
                                         <span key={index} className="flex items-center gap-1">
                                           {key === "Ctrl" ? (
-                                            <span className="flex h-full items-center rounded-sm border border-brand-base bg-brand-surface-1 p-1.5">
-                                              <CommandIcon className="h-4 w-4 fill-current text-brand-secondary" />
+                                            <span className="flex h-full items-center rounded-sm border border-brand-base bg-brand-surface-1 p-2">
+                                              <MacCommandIcon />
                                             </span>
-                                          ) : key === "Ctrl" ? (
-                                            <kbd className="rounded-sm border border-brand-base bg-brand-surface-1 p-1.5 text-sm font-medium text-brand-secondary">
-                                              <CommandIcon className="h-4 w-4 fill-current text-brand-secondary" />
-                                            </kbd>
                                           ) : (
-                                            <kbd className="rounded-sm border border-brand-base bg-brand-surface-1 px-2 py-1 text-sm font-medium text-brand-secondary">
-                                              {key}
+                                            <kbd className="rounded-sm border border-brand-base bg-brand-surface-1 px-2 py-1 text-sm font-medium text-gray-800">
+                                              {key === "Ctrl" ? <MacCommandIcon /> : key}
                                             </kbd>
                                           )}
                                         </span>
@@ -173,16 +167,12 @@ export const ShortcutsModal: React.FC<Props> = ({ isOpen, setIsOpen }) => {
                                       {keys.split(",").map((key, index) => (
                                         <span key={index} className="flex items-center gap-1">
                                           {key === "Ctrl" ? (
-                                            <span className="flex h-full items-center rounded-sm border border-brand-base bg-brand-surface-1 p-1.5 text-brand-secondary">
-                                              <CommandIcon className="h-4 w-4 fill-current text-brand-secondary" />
+                                            <span className="flex h-full items-center rounded-sm border border-brand-base text-brand-secondary bg-brand-surface-1 p-2">
+                                              <MacCommandIcon />
                                             </span>
-                                          ) : key === "Ctrl" ? (
-                                            <kbd className="rounded-sm border border-brand-base bg-brand-surface-1 p-1.5 text-sm font-medium text-brand-secondary">
-                                              <CommandIcon className="h-4 w-4 fill-current text-brand-secondary" />
-                                            </kbd>
                                           ) : (
                                             <kbd className="rounded-sm border border-brand-base bg-brand-surface-1 px-2 py-1 text-sm font-medium text-brand-secondary">
-                                              {key}
+                                              {key === "Ctrl" ? <MacCommandIcon /> : key}
                                             </kbd>
                                           )}
                                         </span>

app/components/core/board-view/all-boards.tsx

@@ -17,7 +17,7 @@ type Props = {
   openIssuesListModal?: (() => void) | null;
   handleDeleteIssue: (issue: IIssue) => void;
   handleTrashBox: (isDragging: boolean) => void;
-  removeIssue: ((bridgeId: string, issueId: string) => void) | null;
+  removeIssue: ((bridgeId: string) => void) | null;
   isCompleted?: boolean;
   userAuth: UserAuth;
 };
@@ -44,7 +44,7 @@ export const AllBoards: React.FC<Props> = ({
   return (
     <>
       {groupedByIssues ? (
-        <div className="horizontal-scroll-enable flex h-full gap-x-4 p-8">
+        <div className="horizontal-scroll-enable flex h-[calc(100vh-140px)] gap-x-4">
           {Object.keys(groupedByIssues).map((singleGroup, index) => {
             const currentState =
               selectedGroup === "state" ? states?.find((s) => s.id === singleGroup) : null;

app/components/core/board-view/single-board.tsx

@@ -1,4 +1,4 @@
-import { useState } from "react";
+import { useState, useEffect } from "react";
 
 import { useRouter } from "next/router";
 
@@ -29,7 +29,7 @@ type Props = {
   handleDeleteIssue: (issue: IIssue) => void;
   openIssuesListModal?: (() => void) | null;
   handleTrashBox: (isDragging: boolean) => void;
-  removeIssue: ((bridgeId: string, issueId: string) => void) | null;
+  removeIssue: ((bridgeId: string) => void) | null;
   isCompleted?: boolean;
   userAuth: UserAuth;
 };
@@ -60,46 +60,51 @@ export const SingleBoard: React.FC<Props> = ({
 
   const isNotAllowed = userAuth.isGuest || userAuth.isViewer || isCompleted;
 
+  useEffect(() => {
+    if (currentState?.group === "completed" || currentState?.group === "cancelled")
+      setIsCollapsed(false);
+  }, [currentState]);
+
   return (
-    <div className={`flex-shrink-0 ${!isCollapsed ? "" : "flex h-full flex-col w-96"}`}>
-      <BoardHeader
-        addIssueToState={addIssueToState}
-        currentState={currentState}
-        groupTitle={groupTitle}
-        isCollapsed={isCollapsed}
-        setIsCollapsed={setIsCollapsed}
-        isCompleted={isCompleted}
-      />
-      {isCollapsed && (
-        <StrictModeDroppable key={groupTitle} droppableId={groupTitle}>
-          {(provided, snapshot) => (
-            <div
-              className={`relative h-full ${
-                orderBy !== "sort_order" && snapshot.isDraggingOver ? "bg-brand-base/20" : ""
-              } ${!isCollapsed ? "hidden" : "flex flex-col"}`}
-              ref={provided.innerRef}
-              {...provided.droppableProps}
-            >
-              {orderBy !== "sort_order" && (
-                <>
-                  <div
-                    className={`absolute ${
-                      snapshot.isDraggingOver ? "block" : "hidden"
-                    } pointer-events-none top-0 left-0 z-[99] h-full w-full bg-brand-surface-1 opacity-50`}
-                  />
-                  <div
-                    className={`absolute ${
-                      snapshot.isDraggingOver ? "block" : "hidden"
-                    } pointer-events-none top-1/2 left-1/2 z-[99] -translate-y-1/2 -translate-x-1/2 whitespace-nowrap rounded bg-brand-base p-2 text-xs`}
-                  >
-                    This board is ordered by{" "}
-                    {replaceUnderscoreIfSnakeCase(
-                      orderBy ? (orderBy[0] === "-" ? orderBy.slice(1) : orderBy) : "created_at"
-                    )}
-                  </div>
-                </>
-              )}
-              <div className="pt-3 overflow-hidden overflow-y-scroll">
+    <div className={`h-full flex-shrink-0 ${!isCollapsed ? "" : "w-96"}`}>
+      <div className={`${!isCollapsed ? "" : "flex h-full flex-col space-y-3"}`}>
+        <BoardHeader
+          addIssueToState={addIssueToState}
+          currentState={currentState}
+          groupTitle={groupTitle}
+          isCollapsed={isCollapsed}
+          setIsCollapsed={setIsCollapsed}
+          isCompleted={isCompleted}
+        />
+        {isCollapsed && (
+          <StrictModeDroppable key={groupTitle} droppableId={groupTitle}>
+            {(provided, snapshot) => (
+              <div
+                className={`relative h-full overflow-y-auto p-1  ${
+                  snapshot.isDraggingOver ? "bg-brand-base/20" : ""
+                } ${!isCollapsed ? "hidden" : "block"}`}
+                ref={provided.innerRef}
+                {...provided.droppableProps}
+              >
+                {orderBy !== "sort_order" && (
+                  <>
+                    <div
+                      className={`absolute ${
+                        snapshot.isDraggingOver ? "block" : "hidden"
+                      } pointer-events-none top-0 left-0 z-[99] h-full w-full bg-brand-surface-1 opacity-50`}
+                    />
+                    <div
+                      className={`absolute ${
+                        snapshot.isDraggingOver ? "block" : "hidden"
+                      } pointer-events-none top-1/2 left-1/2 z-[99] -translate-y-1/2 -translate-x-1/2 whitespace-nowrap rounded bg-brand-base p-2 text-xs`}
+                    >
+                      This board is ordered by{" "}
+                      {replaceUnderscoreIfSnakeCase(
+                        orderBy ? (orderBy[0] === "-" ? orderBy.slice(1) : orderBy) : "created_at"
+                      )}
+                    </div>
+                  </>
+                )}
                 {groupedByIssues?.[groupTitle].map((issue, index) => (
                   <Draggable
                     key={issue.id}
@@ -125,8 +130,7 @@ export const SingleBoard: React.FC<Props> = ({
                         handleDeleteIssue={handleDeleteIssue}
                         handleTrashBox={handleTrashBox}
                         removeIssue={() => {
-                          if (removeIssue && issue.bridge_id)
-                            removeIssue(issue.bridge_id, issue.id);
+                          if (removeIssue && issue.bridge_id) removeIssue(issue.bridge_id);
                         }}
                         isCompleted={isCompleted}
                         userAuth={userAuth}
@@ -141,12 +145,10 @@ export const SingleBoard: React.FC<Props> = ({
                 >
                   {provided.placeholder}
                 </span>
-              </div>
-              <div>
                 {type === "issue" ? (
                   <button
                     type="button"
-                    className="flex items-center gap-2 font-medium text-brand-accent outline-none p-1"
+                    className="flex items-center gap-2 font-medium text-brand-accent outline-none"
                     onClick={addIssueToState}
                   >
                     <PlusIcon className="h-4 w-4" />
@@ -164,7 +166,7 @@ export const SingleBoard: React.FC<Props> = ({
                           Add Issue
                         </button>
                       }
-                      position="left"
+                      optionsPosition="left"
                       noBorder
                     >
                       <CustomMenu.MenuItem onClick={addIssueToState}>
@@ -179,10 +181,10 @@ export const SingleBoard: React.FC<Props> = ({
                   )
                 )}
               </div>
-            </div>
-          )}
-        </StrictModeDroppable>
-      )}
+            )}
+          </StrictModeDroppable>
+        )}
+      </div>
     </div>
   );
 };

app/components/core/board-view/single-issue.tsx

@@ -1,4 +1,4 @@
-import React, { useCallback, useEffect, useRef, useState } from "react";
+import React, { useCallback, useEffect, useState } from "react";
 
 import Link from "next/link";
 import { useRouter } from "next/router";
@@ -17,7 +17,6 @@ import issuesService from "services/issues.service";
 // hooks
 import useIssuesView from "hooks/use-issues-view";
 import useToast from "hooks/use-toast";
-import useOutsideClickDetector from "hooks/use-outside-click-detector";
 // components
 import {
   ViewAssigneeSelect,
@@ -37,9 +36,7 @@ import {
   XMarkIcon,
   ArrowTopRightOnSquareIcon,
   PaperClipIcon,
-  EllipsisHorizontalIcon,
 } from "@heroicons/react/24/outline";
-import { LayerDiagonalIcon } from "components/icons";
 // helpers
 import { handleIssuesMutation } from "constants/issue";
 import { copyTextToClipboard, truncateText } from "helpers/string.helper";
@@ -92,9 +89,6 @@ export const SingleBoardIssue: React.FC<Props> = ({
   // context menu
   const [contextMenu, setContextMenu] = useState(false);
   const [contextMenuPosition, setContextMenuPosition] = useState({ x: 0, y: 0 });
-  const [isMenuActive, setIsMenuActive] = useState(false);
-
-  const actionSectionRef = useRef<HTMLDivElement | null>(null);
 
   const { orderBy, params } = useIssuesView();
 
@@ -104,7 +98,7 @@ export const SingleBoardIssue: React.FC<Props> = ({
   const { setToastAlert } = useToast();
 
   const partialUpdateIssue = useCallback(
-    (formData: Partial<IIssue>, issueId: string) => {
+    (formData: Partial<IIssue>) => {
       if (!workspaceSlug || !projectId) return;
 
       if (cycleId)
@@ -170,7 +164,7 @@ export const SingleBoardIssue: React.FC<Props> = ({
       }
 
       issuesService
-        .patchIssue(workspaceSlug as string, projectId as string, issueId, formData)
+        .patchIssue(workspaceSlug as string, projectId as string, issue.id, formData)
         .then(() => {
           if (cycleId) {
             mutate(CYCLE_ISSUES_WITH_PARAMS(cycleId as string, params));
@@ -184,7 +178,18 @@ export const SingleBoardIssue: React.FC<Props> = ({
           console.log(error);
         });
     },
-    [workspaceSlug, projectId, cycleId, moduleId, groupTitle, index, selectedGroup, orderBy, params]
+    [
+      workspaceSlug,
+      projectId,
+      cycleId,
+      moduleId,
+      issue,
+      groupTitle,
+      index,
+      selectedGroup,
+      orderBy,
+      params,
+    ]
   );
 
   const getStyle = (
@@ -212,7 +217,6 @@ export const SingleBoardIssue: React.FC<Props> = ({
         title: "Link Copied!",
         message: "Issue link copied to clipboard.",
       });
-      setIsMenuActive(false);
     });
   };
 
@@ -220,8 +224,6 @@ export const SingleBoardIssue: React.FC<Props> = ({
     if (snapshot.isDragging) handleTrashBox(snapshot.isDragging);
   }, [snapshot, handleTrashBox]);
 
-  useOutsideClickDetector(actionSectionRef, () => setIsMenuActive(false));
-
   const isNotAllowed = userAuth.isGuest || userAuth.isViewer || isCompleted;
 
   return (
@@ -274,23 +276,9 @@ export const SingleBoardIssue: React.FC<Props> = ({
       >
         <div className="group/card relative select-none p-3.5">
           {!isNotAllowed && (
-            <div
-              ref={actionSectionRef}
-              className={`z-1 absolute top-1.5 right-1.5 hidden group-hover/card:!flex ${
-                isMenuActive ? "!flex" : ""
-              }`}
-            >
+            <div className="z-1 absolute top-1.5 right-1.5 opacity-0 group-hover/card:opacity-100">
               {type && !isNotAllowed && (
-                <CustomMenu
-                  customButton={
-                    <button
-                      className="flex w-full cursor-pointer items-center justify-between gap-1 rounded p-1 text-left text-xs duration-300 hover:bg-brand-surface-2"
-                      onClick={() => setIsMenuActive(!isMenuActive)}
-                    >
-                      <EllipsisHorizontalIcon className="h-4 w-4" />
-                    </button>
-                  }
-                >
+                <CustomMenu width="auto" ellipsis>
                   <CustomMenu.MenuItem onClick={editIssue}>
                     <div className="flex items-center justify-start gap-2">
                       <PencilIcon className="h-4 w-4" />
@@ -360,6 +348,11 @@ export const SingleBoardIssue: React.FC<Props> = ({
                 isNotAllowed={isNotAllowed}
               />
             )}
+            {properties.sub_issue_count && (
+              <div className="flex flex-shrink-0 items-center gap-1 rounded-md border border-brand-base px-3 py-1.5 text-xs shadow-sm">
+                {issue.sub_issues_count} {issue.sub_issues_count === 1 ? "sub-issue" : "sub-issues"}
+              </div>
+            )}
             {properties.labels && issue.label_details.length > 0 && (
               <div className="flex flex-wrap gap-1">
                 {issue.label_details.map((label) => (
@@ -395,21 +388,11 @@ export const SingleBoardIssue: React.FC<Props> = ({
                 selfPositioned
               />
             )}
-            {properties.sub_issue_count && (
-              <div className="flex cursor-default items-center rounded-md border border-brand-base px-2.5 py-1 text-xs shadow-sm">
-                <Tooltip tooltipHeading="Sub-issue" tooltipContent={`${issue.sub_issues_count}`}>
-                  <div className="flex items-center gap-1 text-brand-secondary">
-                    <LayerDiagonalIcon className="h-3.5 w-3.5" />
-                    {issue.sub_issues_count}
-                  </div>
-                </Tooltip>
-              </div>
-            )}
             {properties.link && (
               <div className="flex cursor-default items-center rounded-md border border-brand-base px-2.5 py-1 text-xs shadow-sm">
                 <Tooltip tooltipHeading="Link" tooltipContent={`${issue.link_count}`}>
-                  <div className="flex items-center gap-1 text-brand-secondary">
-                    <LinkIcon className="h-3.5 w-3.5" />
+                  <div className="flex items-center gap-1 text-gray-500">
+                    <LinkIcon className="h-3.5 w-3.5 text-gray-500" />
                     {issue.link_count}
                   </div>
                 </Tooltip>
@@ -418,8 +401,8 @@ export const SingleBoardIssue: React.FC<Props> = ({
             {properties.attachment_count && (
               <div className="flex cursor-default items-center rounded-md border border-brand-base px-2.5 py-1 text-xs shadow-sm">
                 <Tooltip tooltipHeading="Attachment" tooltipContent={`${issue.attachment_count}`}>
-                  <div className="flex items-center gap-1 text-brand-secondary">
-                    <PaperClipIcon className="h-3.5 w-3.5 -rotate-45" />
+                  <div className="flex items-center gap-1 text-gray-500">
+                    <PaperClipIcon className="h-3.5 w-3.5 -rotate-45 text-gray-500" />
                     {issue.attachment_count}
                   </div>
                 </Tooltip>

app/components/core/bulk-delete-issues-modal.tsx

@@ -121,7 +121,7 @@ export const BulkDeleteIssuesModal: React.FC<Props> = ({ isOpen, setIsOpen }) =>
             leaveFrom="opacity-100 scale-100"
             leaveTo="opacity-0 scale-95"
           >
-            <Dialog.Panel className="relative mx-auto max-w-2xl transform divide-y divide-gray-500 rounded-xl border border-brand-base bg-brand-base shadow-2xl transition-all">
+            <Dialog.Panel className="relative mx-auto max-w-2xl transform divide-y divide-gray-500 divide-opacity-10 rounded-xl bg-brand-surface-2 shadow-2xl ring-1 ring-black ring-opacity-5 transition-all">
               <form>
                 <Combobox
                   onChange={(val: string) => {
@@ -149,7 +149,7 @@ export const BulkDeleteIssuesModal: React.FC<Props> = ({ isOpen, setIsOpen }) =>
 
                   <Combobox.Options
                     static
-                    className="max-h-80 scroll-py-2 divide-y divide-brand-base overflow-y-auto"
+                    className="max-h-80 scroll-py-2 divide-y divide-gray-500 divide-opacity-10 overflow-y-auto"
                   >
                     {filteredIssues.length > 0 ? (
                       <li className="p-2">
@@ -158,15 +158,15 @@ export const BulkDeleteIssuesModal: React.FC<Props> = ({ isOpen, setIsOpen }) =>
                             Select issues to delete
                           </h2>
                         )}
-                        <ul className="text-sm text-brand-secondary">
+                        <ul className="text-sm text-gray-700">
                           {filteredIssues.map((issue) => (
                             <Combobox.Option
                               key={issue.id}
                               as="div"
                               value={issue.id}
-                              className={({ active, selected }) =>
+                              className={({ active }) =>
                                 `flex cursor-pointer select-none items-center justify-between rounded-md px-3 py-2 ${
-                                  active ? "bg-brand-surface-2 text-brand-base" : ""
+                                  active ? "bg-gray-900 bg-opacity-5 text-brand-base" : ""
                                 }`
                               }
                             >
@@ -182,7 +182,7 @@ export const BulkDeleteIssuesModal: React.FC<Props> = ({ isOpen, setIsOpen }) =>
                                     backgroundColor: issue.state_detail.color,
                                   }}
                                 />
-                                <span className="flex-shrink-0 text-xs">
+                                <span className="flex-shrink-0 text-xs text-brand-secondary">
                                   {issue.project_detail.identifier}-{issue.sequence_id}
                                 </span>
                                 <span>{issue.name}</span>

app/components/core/calendar-view/calendar.tsx

@@ -0,0 +1,511 @@
+import React, { useState } from "react";
+import useSWR, { mutate } from "swr";
+import Link from "next/link";
+import { useRouter } from "next/router";
+
+// helper
+import { renderDateFormat } from "helpers/date-time.helper";
+import {
+  startOfWeek,
+  lastDayOfWeek,
+  eachDayOfInterval,
+  weekDayInterval,
+  formatDate,
+  getCurrentWeekStartDate,
+  getCurrentWeekEndDate,
+  subtractMonths,
+  addMonths,
+  updateDateWithYear,
+  updateDateWithMonth,
+  isSameMonth,
+  isSameYear,
+  subtract7DaysToDate,
+  addSevenDaysToDate,
+} from "helpers/calendar.helper";
+// ui
+import { Popover, Transition } from "@headlessui/react";
+import { DragDropContext, Draggable, DropResult } from "react-beautiful-dnd";
+import StrictModeDroppable from "components/dnd/StrictModeDroppable";
+import { CustomMenu, Spinner } from "components/ui";
+// icon
+import {
+  CheckIcon,
+  ChevronDownIcon,
+  ChevronLeftIcon,
+  ChevronRightIcon,
+  PlusIcon,
+} from "@heroicons/react/24/outline";
+// hooks
+import useIssuesView from "hooks/use-issues-view";
+// services
+import issuesService from "services/issues.service";
+import cyclesService from "services/cycles.service";
+// fetch key
+import {
+  CYCLE_CALENDAR_ISSUES,
+  MODULE_CALENDAR_ISSUES,
+  PROJECT_CALENDAR_ISSUES,
+} from "constants/fetch-keys";
+// type
+import { IIssue } from "types";
+// constant
+import { monthOptions, yearOptions } from "constants/calendar";
+import modulesService from "services/modules.service";
+
+type Props = {
+  addIssueToDate: (date: string) => void;
+};
+
+interface ICalendarRange {
+  startDate: Date;
+  endDate: Date;
+}
+
+export const CalendarView: React.FC<Props> = ({ addIssueToDate }) => {
+  const [showWeekEnds, setShowWeekEnds] = useState<boolean>(false);
+  const [currentDate, setCurrentDate] = useState<Date>(new Date());
+  const [isMonthlyView, setIsMonthlyView] = useState<boolean>(true);
+
+  const router = useRouter();
+  const { workspaceSlug, projectId, cycleId, moduleId } = router.query;
+
+  const { params } = useIssuesView();
+
+  const [calendarDateRange, setCalendarDateRange] = useState<ICalendarRange>({
+    startDate: startOfWeek(currentDate),
+    endDate: lastDayOfWeek(currentDate),
+  });
+
+  const targetDateFilter = {
+    target_date: `${renderDateFormat(calendarDateRange.startDate)};after,${renderDateFormat(
+      calendarDateRange.endDate
+    )};before`,
+  };
+
+  const { data: projectCalendarIssues } = useSWR(
+    workspaceSlug && projectId ? PROJECT_CALENDAR_ISSUES(projectId as string) : null,
+    workspaceSlug && projectId
+      ? () =>
+          issuesService.getIssuesWithParams(workspaceSlug as string, projectId as string, {
+            ...params,
+            target_date: `${renderDateFormat(calendarDateRange.startDate)};after,${renderDateFormat(
+              calendarDateRange.endDate
+            )};before`,
+            group_by: null,
+          })
+      : null
+  );
+
+  const { data: cycleCalendarIssues } = useSWR(
+    workspaceSlug && projectId && cycleId
+      ? CYCLE_CALENDAR_ISSUES(projectId as string, cycleId as string)
+      : null,
+    workspaceSlug && projectId && cycleId
+      ? () =>
+          cyclesService.getCycleIssuesWithParams(
+            workspaceSlug as string,
+            projectId as string,
+            cycleId as string,
+            {
+              ...params,
+              target_date: `${renderDateFormat(
+                calendarDateRange.startDate
+              )};after,${renderDateFormat(calendarDateRange.endDate)};before`,
+              group_by: null,
+            }
+          )
+      : null
+  );
+
+  const { data: moduleCalendarIssues } = useSWR(
+    workspaceSlug && projectId && moduleId
+      ? MODULE_CALENDAR_ISSUES(projectId as string, moduleId as string)
+      : null,
+    workspaceSlug && projectId && moduleId
+      ? () =>
+          modulesService.getModuleIssuesWithParams(
+            workspaceSlug as string,
+            projectId as string,
+            moduleId as string,
+            {
+              ...params,
+              target_date: `${renderDateFormat(
+                calendarDateRange.startDate
+              )};after,${renderDateFormat(calendarDateRange.endDate)};before`,
+              group_by: null,
+            }
+          )
+      : null
+  );
+
+  const totalDate = eachDayOfInterval({
+    start: calendarDateRange.startDate,
+    end: calendarDateRange.endDate,
+  });
+
+  const onlyWeekDays = weekDayInterval({
+    start: calendarDateRange.startDate,
+    end: calendarDateRange.endDate,
+  });
+
+  const currentViewDays = showWeekEnds ? totalDate : onlyWeekDays;
+
+  const calendarIssues = cycleId
+    ? cycleCalendarIssues
+    : moduleId
+    ? moduleCalendarIssues
+    : projectCalendarIssues;
+
+  const currentViewDaysData = currentViewDays.map((date: Date) => {
+    const filterIssue =
+      calendarIssues && calendarIssues.length > 0
+        ? (calendarIssues as IIssue[]).filter(
+            (issue) =>
+              issue.target_date && renderDateFormat(issue.target_date) === renderDateFormat(date)
+          )
+        : [];
+    return {
+      date: renderDateFormat(date),
+      issues: filterIssue,
+    };
+  });
+
+  const weeks = ((date: Date[]) => {
+    const weeks = [];
+    if (showWeekEnds) {
+      for (let day = 0; day <= 6; day++) {
+        weeks.push(date[day]);
+      }
+    } else {
+      for (let day = 0; day <= 4; day++) {
+        weeks.push(date[day]);
+      }
+    }
+
+    return weeks;
+  })(currentViewDays);
+
+  const onDragEnd = (result: DropResult) => {
+    const { source, destination, draggableId } = result;
+
+    if (!destination || !workspaceSlug || !projectId) return;
+    if (source.droppableId === destination.droppableId) return;
+
+    const fetchKey = cycleId
+      ? CYCLE_CALENDAR_ISSUES(projectId as string, cycleId as string)
+      : moduleId
+      ? MODULE_CALENDAR_ISSUES(projectId as string, moduleId as string)
+      : PROJECT_CALENDAR_ISSUES(projectId as string);
+
+    mutate<IIssue[]>(
+      fetchKey,
+      (prevData) =>
+        (prevData ?? []).map((p) => {
+          if (p.id === draggableId)
+            return {
+              ...p,
+              target_date: destination.droppableId,
+            };
+          return p;
+        }),
+      false
+    );
+
+    issuesService.patchIssue(workspaceSlug as string, projectId as string, draggableId, {
+      target_date: destination?.droppableId,
+    });
+  };
+
+  const updateDate = (date: Date) => {
+    setCurrentDate(date);
+
+    setCalendarDateRange({
+      startDate: startOfWeek(date),
+      endDate: lastDayOfWeek(date),
+    });
+  };
+
+  return calendarIssues ? (
+    <DragDropContext onDragEnd={onDragEnd}>
+      <div className="-m-2 h-full overflow-y-auto rounded-lg text-brand-secondary">
+        <div className="mb-4 flex items-center justify-between">
+          <div className="relative flex h-full w-full items-center justify-start gap-2 text-sm ">
+            <Popover className="flex h-full items-center justify-start rounded-lg">
+              {({ open }) => (
+                <>
+                  <Popover.Button className={`group flex h-full items-start gap-1 text-brand-base`}>
+                    <div className="flex  items-center   justify-center gap-2 text-2xl font-semibold">
+                      <span>{formatDate(currentDate, "Month")}</span>{" "}
+                      <span>{formatDate(currentDate, "yyyy")}</span>
+                    </div>
+                  </Popover.Button>
+
+                  <Transition
+                    as={React.Fragment}
+                    enter="transition ease-out duration-200"
+                    enterFrom="opacity-0 translate-y-1"
+                    enterTo="opacity-100 translate-y-0"
+                    leave="transition ease-in duration-150"
+                    leaveFrom="opacity-100 translate-y-0"
+                    leaveTo="opacity-0 translate-y-1"
+                  >
+                    <Popover.Panel className="absolute top-10 left-0 z-20 flex w-full max-w-xs transform flex-col overflow-hidden rounded-[10px] bg-brand-surface-2 shadow-lg">
+                      <div className="flex items-center justify-center gap-5 px-2 py-2 text-sm">
+                        {yearOptions.map((year) => (
+                          <button
+                            onClick={() => updateDate(updateDateWithYear(year.label, currentDate))}
+                            className={` ${
+                              isSameYear(year.value, currentDate)
+                                ? "text-sm font-medium text-brand-base"
+                                : "text-xs text-brand-secondary "
+                            } hover:text-sm hover:font-medium hover:text-brand-base`}
+                          >
+                            {year.label}
+                          </button>
+                        ))}
+                      </div>
+                      <div className="grid grid-cols-4  border-t border-brand-base px-2">
+                        {monthOptions.map((month) => (
+                          <button
+                            onClick={() =>
+                              updateDate(updateDateWithMonth(month.value, currentDate))
+                            }
+                            className={`px-2 py-2 text-xs text-brand-secondary hover:font-medium hover:text-brand-base ${
+                              isSameMonth(month.value, currentDate)
+                                ? "font-medium text-brand-base"
+                                : ""
+                            }`}
+                          >
+                            {month.label}
+                          </button>
+                        ))}
+                      </div>
+                    </Popover.Panel>
+                  </Transition>
+                </>
+              )}
+            </Popover>
+
+            <div className="flex items-center gap-2">
+              <button
+                className="cursor-pointer"
+                onClick={() => {
+                  if (isMonthlyView) {
+                    updateDate(subtractMonths(currentDate, 1));
+                  } else {
+                    setCurrentDate(subtract7DaysToDate(currentDate));
+                    setCalendarDateRange({
+                      startDate: getCurrentWeekStartDate(subtract7DaysToDate(currentDate)),
+                      endDate: getCurrentWeekEndDate(subtract7DaysToDate(currentDate)),
+                    });
+                  }
+                }}
+              >
+                <ChevronLeftIcon className="h-4 w-4" />
+              </button>
+              <button
+                className="cursor-pointer"
+                onClick={() => {
+                  if (isMonthlyView) {
+                    updateDate(addMonths(currentDate, 1));
+                  } else {
+                    setCurrentDate(addSevenDaysToDate(currentDate));
+                    setCalendarDateRange({
+                      startDate: getCurrentWeekStartDate(addSevenDaysToDate(currentDate)),
+                      endDate: getCurrentWeekEndDate(addSevenDaysToDate(currentDate)),
+                    });
+                  }
+                }}
+              >
+                <ChevronRightIcon className="h-4 w-4" />
+              </button>
+            </div>
+          </div>
+
+          <div className="flex w-full items-center justify-end gap-2">
+            <button
+              className="group flex cursor-pointer items-center gap-2 rounded-md border border-brand-base bg-brand-surface-2 px-4 py-1.5 text-sm  hover:bg-brand-surface-1 hover:text-brand-base focus:outline-none"
+              onClick={() => {
+                if (isMonthlyView) {
+                  updateDate(new Date());
+                } else {
+                  setCurrentDate(new Date());
+                  setCalendarDateRange({
+                    startDate: getCurrentWeekStartDate(new Date()),
+                    endDate: getCurrentWeekEndDate(new Date()),
+                  });
+                }
+              }}
+            >
+              Today{" "}
+            </button>
+
+            <CustomMenu
+              customButton={
+                <div
+                  className={`group flex cursor-pointer items-center gap-2 rounded-md border border-brand-base bg-brand-surface-2 px-3 py-1.5 text-sm  hover:bg-brand-surface-1 hover:text-brand-base focus:outline-none `}
+                >
+                  {isMonthlyView ? "Monthly" : "Weekly"}
+                  <ChevronDownIcon className="h-3 w-3" aria-hidden="true" />
+                </div>
+              }
+            >
+              <CustomMenu.MenuItem
+                onClick={() => {
+                  setIsMonthlyView(true);
+                  setCalendarDateRange({
+                    startDate: startOfWeek(currentDate),
+                    endDate: lastDayOfWeek(currentDate),
+                  });
+                }}
+                className="w-52 text-sm text-brand-secondary"
+              >
+                <div className="flex w-full max-w-[260px] items-center justify-between gap-2">
+                  <span className="flex items-center gap-2">Monthly View</span>
+                  <CheckIcon
+                    className={`h-4 w-4 flex-shrink-0 ${
+                      isMonthlyView ? "opacity-100" : "opacity-0"
+                    }`}
+                  />
+                </div>
+              </CustomMenu.MenuItem>
+              <CustomMenu.MenuItem
+                onClick={() => {
+                  setIsMonthlyView(false);
+                  setCalendarDateRange({
+                    startDate: getCurrentWeekStartDate(currentDate),
+                    endDate: getCurrentWeekEndDate(currentDate),
+                  });
+                }}
+                className="w-52 text-sm text-brand-secondary"
+              >
+                <div className="flex w-full items-center justify-between gap-2">
+                  <span className="flex items-center gap-2">Weekly View</span>
+                  <CheckIcon
+                    className={`h-4 w-4 flex-shrink-0 ${
+                      isMonthlyView ? "opacity-0" : "opacity-100"
+                    }`}
+                  />
+                </div>
+              </CustomMenu.MenuItem>
+              <div className="mt-1 flex w-52 items-center justify-between border-t border-brand-base py-2 px-1  text-sm text-brand-secondary">
+                <h4>Show weekends</h4>
+                <button
+                  type="button"
+                  className={`relative inline-flex h-3.5 w-6 flex-shrink-0 cursor-pointer rounded-full border-2 border-transparent transition-colors duration-200 ease-in-out focus:outline-none ${
+                    showWeekEnds ? "bg-green-500" : "bg-brand-surface-2"
+                  }`}
+                  role="switch"
+                  aria-checked={showWeekEnds}
+                  onClick={() => setShowWeekEnds(!showWeekEnds)}
+                >
+                  <span className="sr-only">Show weekends</span>
+                  <span
+                    aria-hidden="true"
+                    className={`inline-block h-2.5 w-2.5 transform rounded-full bg-brand-surface-2 shadow ring-0 transition duration-200 ease-in-out ${
+                      showWeekEnds ? "translate-x-2.5" : "translate-x-0"
+                    }`}
+                  />
+                </button>
+              </div>
+            </CustomMenu>
+          </div>
+        </div>
+
+        <div
+          className={`grid auto-rows-[minmax(36px,1fr)] rounded-lg ${
+            showWeekEnds ? "grid-cols-7" : "grid-cols-5"
+          }`}
+        >
+          {weeks.map((date, index) => (
+            <div
+              key={index}
+              className={`flex  items-center justify-start gap-2 border-brand-base bg-brand-surface-1 p-1.5 text-base font-medium text-brand-secondary ${
+                !isMonthlyView
+                  ? showWeekEnds
+                    ? (index + 1) % 7 === 0
+                      ? ""
+                      : "border-r"
+                    : (index + 1) % 5 === 0
+                    ? ""
+                    : "border-r"
+                  : ""
+              }`}
+            >
+              <span>
+                {isMonthlyView ? formatDate(date, "eee").substring(0, 3) : formatDate(date, "eee")}
+              </span>
+              {!isMonthlyView && <span>{formatDate(date, "d")}</span>}
+            </div>
+          ))}
+        </div>
+
+        <div
+          className={`grid h-full auto-rows-[minmax(150px,1fr)] ${
+            showWeekEnds ? "grid-cols-7" : "grid-cols-5"
+          } `}
+        >
+          {currentViewDaysData.map((date, index) => (
+            <StrictModeDroppable droppableId={date.date}>
+              {(provided, snapshot) => (
+                <div
+                  key={index}
+                  ref={provided.innerRef}
+                  {...provided.droppableProps}
+                  className={`group flex flex-col gap-1.5 border-t border-brand-base p-2.5 text-left text-sm font-medium hover:bg-brand-surface-1 ${
+                    showWeekEnds
+                      ? (index + 1) % 7 === 0
+                        ? ""
+                        : "border-r"
+                      : (index + 1) % 5 === 0
+                      ? ""
+                      : "border-r"
+                  }`}
+                >
+                  {isMonthlyView && <span>{formatDate(new Date(date.date), "d")}</span>}
+                  {date.issues.length > 0 &&
+                    date.issues.map((issue: IIssue, index) => (
+                      <Draggable draggableId={issue.id} index={index}>
+                        {(provided, snapshot) => (
+                          <div
+                            key={index}
+                            ref={provided.innerRef}
+                            {...provided.draggableProps}
+                            {...provided.dragHandleProps}
+                            className={`w-full cursor-pointer truncate rounded bg-brand-surface-2 p-1.5 hover:scale-105 ${
+                              snapshot.isDragging ? "shadow-lg" : ""
+                            }`}
+                          >
+                            <Link
+                              href={`/${workspaceSlug}/projects/${issue?.project_detail?.id}/issues/${issue.id}`}
+                              className="w-full"
+                            >
+                              {issue.name}
+                            </Link>
+                          </div>
+                        )}
+                      </Draggable>
+                    ))}
+                  <div className="flex items-center justify-center p-1.5 text-sm text-brand-secondary opacity-0 group-hover:opacity-100">
+                    <button
+                      className="flex items-center justify-center gap-2 text-center"
+                      onClick={() => addIssueToDate(date.date)}
+                    >
+                      <PlusIcon className="h-4 w-4 text-brand-secondary" />
+                      Add new issue
+                    </button>
+                  </div>
+                  {provided.placeholder}
+                </div>
+              )}
+            </StrictModeDroppable>
+          ))}
+        </div>
+      </div>
+    </DragDropContext>
+  ) : (
+    <div className="flex h-full w-full items-center justify-center">
+      <Spinner />
+    </div>
+  );
+};

app/components/core/calendar-view/index.ts

@@ -0,0 +1 @@
+export * from "./calendar"

app/components/core/custom-theme-form.tsx

@@ -0,0 +1,267 @@
+import { useEffect, useState } from "react";
+
+// react-hook-form
+import { useForm } from "react-hook-form";
+// ui
+import { Input, PrimaryButton, SecondaryButton } from "components/ui";
+
+const defaultValues = {
+  palette: "",
+};
+
+export const ThemeForm: React.FC<any> = ({ handleFormSubmit, handleClose, status, data }) => {
+  const {
+    register,
+    formState: { errors, isSubmitting },
+    handleSubmit,
+    reset,
+  } = useForm<any>({
+    defaultValues,
+  });
+  const [darkPalette, setDarkPalette] = useState(false);
+
+  const handleUpdateTheme = async (formData: any) => {
+    await handleFormSubmit({ ...formData, darkPalette });
+
+    reset({
+      ...defaultValues,
+    });
+  };
+
+  useEffect(() => {
+    reset({
+      ...defaultValues,
+      ...data,
+    });
+  }, [data, reset]);
+
+  // --color-bg-base: 25, 27, 27;
+  //   --color-bg-surface-1: 31, 32, 35;
+  //   --color-bg-surface-2: 39, 42, 45;
+
+  //   --color-border: 46, 50, 52;
+  //   --color-bg-sidebar: 19, 20, 22;
+  //   --color-accent: 60, 133, 217;
+
+  //   --color-text-base: 255, 255, 255;
+  //   --color-text-secondary: 142, 148, 146;
+
+  return (
+    <form onSubmit={handleSubmit(handleUpdateTheme)}>
+      <div className="space-y-5">
+        <h3 className="text-lg font-medium leading-6 text-brand-base">Customize your theme</h3>
+        <div className="space-y-4">
+          <div className="mt-6 grid grid-cols-1 gap-x-6 gap-y-4 sm:grid-cols-6">
+            <div className="sm:col-span-2">
+              <Input
+                id="bgBase"
+                label="Background"
+                name="bgBase"
+                type="name"
+                placeholder="#FFFFFF"
+                autoComplete="off"
+                error={errors.bgBase}
+                register={register}
+                validations={{
+                  required: "Background color is required",
+                  pattern: {
+                    value: /^#(?:[0-9a-fA-F]{3}){1,2}$/g,
+                    message: "Background color should be hex format",
+                  },
+                }}
+              />
+            </div>
+            <div className="sm:col-span-2">
+              <Input
+                id="bgSurface1"
+                label="Background surface 1"
+                name="bgSurface1"
+                type="name"
+                placeholder="#FFFFFF"
+                autoComplete="off"
+                error={errors.bgSurface1}
+                register={register}
+                validations={{
+                  required: "Background surface 1 color is required",
+                  pattern: {
+                    value: /^#(?:[0-9a-fA-F]{3}){1,2}$/g,
+                    message: "Background surface 1 color should be hex format",
+                  },
+                }}
+              />
+            </div>
+            <div className="sm:col-span-2">
+              <Input
+                id="bgSurface2"
+                label="Background surface 2"
+                name="bgSurface1"
+                type="name"
+                placeholder="#FFFFFF"
+                autoComplete="off"
+                error={errors.bgSurface1}
+                register={register}
+                validations={{
+                  required: "Background surface 2 color is required",
+                  pattern: {
+                    value: /^#(?:[0-9a-fA-F]{3}){1,2}$/g,
+                    message: "Background surface 2 color should be hex format",
+                  },
+                }}
+              />
+            </div>
+
+            <div className="sm:col-span-2">
+              <Input
+                id="border"
+                label="Border"
+                name="border"
+                type="name"
+                placeholder="#FFFFFF"
+                autoComplete="off"
+                error={errors.border}
+                register={register}
+                validations={{
+                  required: "Border color is required",
+                  pattern: {
+                    value: /^#(?:[0-9a-fA-F]{3}){1,2}$/g,
+                    message: "Border color should be hex format",
+                  },
+                }}
+              />
+            </div>
+            <div className="sm:col-span-2">
+              <Input
+                id="sidebar"
+                label="Sidebar"
+                name="sidebar"
+                type="name"
+                placeholder="#FFFFFF"
+                autoComplete="off"
+                error={errors.sidebar}
+                register={register}
+                validations={{
+                  required: "Sidebar color is required",
+                  pattern: {
+                    value: /^#(?:[0-9a-fA-F]{3}){1,2}$/g,
+                    message: "Sidebar color should be hex format",
+                  },
+                }}
+              />
+            </div>
+            <div className="sm:col-span-2">
+              <Input
+                id="accent"
+                label="Accent"
+                name="accent"
+                type="name"
+                placeholder="#FFFFFF"
+                autoComplete="off"
+                error={errors.accent}
+                register={register}
+                validations={{
+                  required: "Accent color is required",
+                  pattern: {
+                    value: /^#(?:[0-9a-fA-F]{3}){1,2}$/g,
+                    message: "Accent color should be hex format",
+                  },
+                }}
+              />
+            </div>
+            <div className="sm:col-span-3">
+              <Input
+                id="textBase"
+                label="Text primary"
+                name="textBase"
+                type="name"
+                placeholder="#FFFFFF"
+                autoComplete="off"
+                error={errors.textBase}
+                register={register}
+                validations={{
+                  required: "Text primary color is required",
+                  pattern: {
+                    value: /^#(?:[0-9a-fA-F]{3}){1,2}$/g,
+                    message: "Text primary color should be hex format",
+                  },
+                }}
+              />
+            </div>
+            <div className="sm:col-span-3">
+              <Input
+                id="textSecondary"
+                label="Text secondary"
+                name="textSecondary"
+                type="name"
+                placeholder="#FFFFFF"
+                autoComplete="off"
+                error={errors.textSecondary}
+                register={register}
+                validations={{
+                  required: "Text secondary color is required",
+                  pattern: {
+                    value: /^#(?:[0-9a-fA-F]{3}){1,2}$/g,
+                    message: "Text secondary color should be hex format",
+                  },
+                }}
+              />
+            </div>
+          </div>
+
+          <div>
+            <Input
+              id="palette"
+              label="All colors"
+              name="palette"
+              type="name"
+              placeholder="Enter comma separated hex colors"
+              autoComplete="off"
+              error={errors.palette}
+              register={register}
+              validations={{
+                required: "Color values is required",
+                pattern: {
+                  value: /^(#(?:[0-9a-fA-F]{3}){1,2},){7}#(?:[0-9a-fA-F]{3}){1,2}$/g,
+                  message: "Color values should be hex format, separated by commas",
+                },
+              }}
+            />
+          </div>
+          <div
+            className="flex cursor-pointer items-center gap-1"
+            onClick={() => setDarkPalette((prevData) => !prevData)}
+          >
+            <span className="text-xs">Dark palette</span>
+            <button
+              type="button"
+              className={`pointer-events-none relative inline-flex h-4 w-7 flex-shrink-0 cursor-pointer rounded-full border-2 border-transparent ${
+                darkPalette ? "bg-brand-accent" : "bg-gray-300"
+              } transition-colors duration-300 ease-in-out focus:outline-none`}
+              role="switch"
+              aria-checked="false"
+            >
+              <span className="sr-only">Dark palette</span>
+              <span
+                aria-hidden="true"
+                className={`pointer-events-none inline-block h-3 w-3 ${
+                  darkPalette ? "translate-x-3" : "translate-x-0"
+                } transform rounded-full bg-brand-surface-2 shadow ring-0 transition duration-300 ease-in-out`}
+              />
+            </button>
+          </div>
+        </div>
+      </div>
+      <div className="mt-5 flex justify-end gap-2">
+        <SecondaryButton onClick={handleClose}>Cancel</SecondaryButton>
+        <PrimaryButton type="submit" loading={isSubmitting}>
+          {status
+            ? isSubmitting
+              ? "Updating Theme..."
+              : "Update Theme"
+            : isSubmitting
+            ? "Creating Theme..."
+            : "Set Theme"}
+        </PrimaryButton>
+      </div>
+    </form>
+  );
+};

app/components/core/custom-theme-modal.tsx

@@ -0,0 +1,65 @@
+import React from "react";
+
+// headless ui
+import { Dialog, Transition } from "@headlessui/react";
+// components
+import { ThemeForm } from "./custom-theme-form";
+// helpers
+import { applyTheme } from "helpers/theme.helper";
+// fetch-keys
+
+type Props = {
+  isOpen: boolean;
+  handleClose: () => void;
+};
+
+export const CustomThemeModal: React.FC<Props> = ({ isOpen, handleClose }) => {
+  const onClose = () => {
+    handleClose();
+  };
+
+  const handleFormSubmit = async (formData: any) => {
+    applyTheme(formData.palette, formData.darkPalette);
+    onClose();
+  };
+
+  return (
+    <Transition.Root show={isOpen} as={React.Fragment}>
+      <Dialog as="div" className="relative z-20" onClose={handleClose}>
+        <Transition.Child
+          as={React.Fragment}
+          enter="ease-out duration-300"
+          enterFrom="opacity-0"
+          enterTo="opacity-100"
+          leave="ease-in duration-200"
+          leaveFrom="opacity-100"
+          leaveTo="opacity-0"
+        >
+          <div className="fixed inset-0 bg-[#131313] bg-opacity-50 transition-opacity" />
+        </Transition.Child>
+
+        <div className="fixed inset-0 z-20 overflow-y-auto">
+          <div className="flex min-h-full items-center justify-center p-4 text-center sm:p-0">
+            <Transition.Child
+              as={React.Fragment}
+              enter="ease-out duration-300"
+              enterFrom="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
+              enterTo="opacity-100 translate-y-0 sm:scale-100"
+              leave="ease-in duration-200"
+              leaveFrom="opacity-100 translate-y-0 sm:scale-100"
+              leaveTo="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
+            >
+              <Dialog.Panel className="relative transform rounded-lg bg-brand-surface-1 px-5 py-8 text-left shadow-xl transition-all sm:my-8 sm:w-full sm:max-w-2xl sm:p-6">
+                <ThemeForm
+                  handleClose={handleClose}
+                  handleFormSubmit={handleFormSubmit}
+                  status={false}
+                />
+              </Dialog.Panel>
+            </Transition.Child>
+          </div>
+        </div>
+      </Dialog>
+    </Transition.Root>
+  );
+};

app/components/core/existing-issues-list-modal.tsx

@@ -117,7 +117,7 @@ export const ExistingIssuesListModal: React.FC<Props> = ({
             leaveFrom="opacity-100"
             leaveTo="opacity-0"
           >
-            <div className="fixed inset-0 bg-brand-backdrop bg-opacity-50 transition-opacity" />
+            <div className="fixed inset-0 bg-gray-500 bg-opacity-25 transition-opacity" />
           </Transition.Child>
 
           <div className="fixed inset-0 z-10 overflow-y-auto p-4 sm:p-6 md:p-20">
@@ -130,7 +130,7 @@ export const ExistingIssuesListModal: React.FC<Props> = ({
               leaveFrom="opacity-100 scale-100"
               leaveTo="opacity-0 scale-95"
             >
-              <Dialog.Panel className="relative mx-auto max-w-2xl transform rounded-xl border border-brand-base bg-brand-base shadow-2xl transition-all">
+              <Dialog.Panel className="relative mx-auto max-w-2xl transform divide-y divide-gray-500 divide-opacity-10 rounded-xl bg-brand-surface-2 shadow-2xl ring-1 ring-black ring-opacity-5 transition-all">
                 <form>
                   <Controller
                     control={control}
@@ -151,26 +151,26 @@ export const ExistingIssuesListModal: React.FC<Props> = ({
 
                         <Combobox.Options
                           static
-                          className="max-h-80 scroll-py-2 divide-y divide-brand-base overflow-y-auto"
+                          className="max-h-80 scroll-py-2 divide-y divide-gray-500 divide-opacity-10 overflow-y-auto"
                         >
                           {filteredIssues.length > 0 ? (
                             <li className="p-2">
                               {query === "" && (
-                                <h2 className="mb-2 px-3 text-xs font-medium text-brand-base">
+                                <h2 className="mb-2 px-3 text-xs font-semibold text-brand-base">
                                   Select issues to add
                                 </h2>
                               )}
-                              <ul className="text-sm text-brand-base">
+                              <ul className="text-sm text-gray-700">
                                 {filteredIssues.map((issue) => (
                                   <Combobox.Option
                                     key={issue.id}
                                     as="label"
                                     htmlFor={`issue-${issue.id}`}
                                     value={issue.id}
-                                    className={({ active, selected }) =>
-                                      `flex w-full cursor-pointer select-none items-center gap-2 rounded-md px-3 py-2 text-brand-secondary ${
-                                        active ? "bg-brand-surface-2 text-brand-base" : ""
-                                      } ${selected ? "text-brand-base" : ""}`
+                                    className={({ active }) =>
+                                      `flex w-full cursor-pointer select-none items-center gap-2 rounded-md px-3 py-2 ${
+                                        active ? "bg-gray-900 bg-opacity-5 text-brand-base" : ""
+                                      }`
                                     }
                                   >
                                     {({ selected }) => (
@@ -182,7 +182,7 @@ export const ExistingIssuesListModal: React.FC<Props> = ({
                                             backgroundColor: issue.state_detail.color,
                                           }}
                                         />
-                                        <span className="flex-shrink-0 text-xs">
+                                        <span className="flex-shrink-0 text-xs text-brand-secondary">
                                           {issue.project_detail.identifier}-{issue.sequence_id}
                                         </span>
                                         {issue.name}
@@ -194,11 +194,10 @@ export const ExistingIssuesListModal: React.FC<Props> = ({
                             </li>
                           ) : (
                             <div className="flex flex-col items-center justify-center gap-4 px-3 py-8 text-center">
-                              <LayerDiagonalIcon height="52" width="52" />
-                              <h3 className="text-sm text-brand-secondary">
+                              <LayerDiagonalIcon height="56" width="56" />
+                              <h3 className="text-brand-secondary">
                                 No issues found. Create a new issue with{" "}
-                                <pre className="inline rounded bg-brand-surface-2 px-2 py-1">C</pre>
-                                .
+                                <pre className="inline rounded bg-brand-surface-2 px-2 py-1">C</pre>.
                               </h3>
                             </div>
                           )}

app/components/core/feeds.tsx

@@ -67,19 +67,15 @@ const activityDetails: {
   },
   name: {
     message: "set the name to",
-    icon: (
-      <ChatBubbleBottomCenterTextIcon className="h-3 w-3 text-brand-secondary" aria-hidden="true" />
-    ),
+    icon: <ChatBubbleBottomCenterTextIcon className="h-3 w-3 text-brand-secondary" aria-hidden="true" />,
   },
   description: {
     message: "updated the description.",
-    icon: (
-      <ChatBubbleBottomCenterTextIcon className="h-3 w-3 text-brand-secondary" aria-hidden="true" />
-    ),
+    icon: <ChatBubbleBottomCenterTextIcon className="h-3 w-3 text-brand-secondary" aria-hidden="true" />,
   },
   estimate_point: {
     message: "set the estimate point to",
-    icon: <PlayIcon className="h-3 w-3 -rotate-90 text-brand-secondary" aria-hidden="true" />,
+    icon: <PlayIcon className="h-3 w-3 text-gray-500 -rotate-90" aria-hidden="true" />,
   },
   target_date: {
     message: "set the due date to",
@@ -95,7 +91,7 @@ const activityDetails: {
   },
   estimate: {
     message: "updated the estimate",
-    icon: <PlayIcon className="h-3 w-3 -rotate-90 text-gray-500" aria-hidden="true" />,
+    icon: <PlayIcon className="h-3 w-3 text-gray-500 -rotate-90" aria-hidden="true" />,
   },
   link: {
     message: "updated the link",
@@ -157,11 +153,11 @@ export const Feeds: React.FC<any> = ({ activities }) => (
         ) {
           const { workspace_detail, project, issue } = activity;
           value = (
-            <span className="text-brand-secondary">
+            <span className="text-gray-600">
               created{" "}
               <Link href={`/${workspace_detail.slug}/projects/${project}/issues/${issue}`}>
                 <a className="inline-flex items-center hover:underline">
-                  this issue. <ArrowTopRightOnSquareIcon className="ml-1 h-3.5 w-3.5" />
+                  this issue. <ArrowTopRightOnSquareIcon className="h-3.5 w-3.5 ml-1" />
                 </a>
               </Link>
             </span>
@@ -202,7 +198,7 @@ export const Feeds: React.FC<any> = ({ activities }) => (
 
         if (activity.field === "comment") {
           return (
-            <div key={activity.id} className="mt-2">
+            <div key={activity.id}>
               <div className="relative flex items-start space-x-3">
                 <div className="relative px-1">
                   {activity.actor_detail.avatar && activity.actor_detail.avatar !== "" ? (
@@ -223,7 +219,7 @@ export const Feeds: React.FC<any> = ({ activities }) => (
 
                   <span className="absolute -bottom-0.5 -right-1 rounded-tl bg-brand-surface-2 px-0.5 py-px">
                     <ChatBubbleLeftEllipsisIcon
-                      className="h-3.5 w-3.5 text-brand-secondary"
+                      className="h-3.5 w-3.5 text-gray-400"
                       aria-hidden="true"
                     />
                   </span>
@@ -246,8 +242,9 @@ export const Feeds: React.FC<any> = ({ activities }) => (
                           : activity.old_value
                       }
                       editable={false}
+                      onBlur={() => ({})}
                       noBorder
-                      customClassName="text-xs border border-brand-base bg-brand-base"
+                      customClassName="text-xs bg-brand-surface-1"
                     />
                   </div>
                 </div>
@@ -271,7 +268,7 @@ export const Feeds: React.FC<any> = ({ activities }) => (
                     <div>
                       <div className="relative px-1.5">
                         <div className="mt-1.5">
-                          <div className="ring-6 flex h-7 w-7 items-center justify-center rounded-full bg-brand-surface-2 ring-white">
+                          <div className="ring-6 flex h-7 w-7 items-center justify-center rounded-full bg-brand-surface-1 ring-white">
                             {activity.field ? (
                               activityDetails[activity.field as keyof typeof activityDetails]?.icon
                             ) : activity.actor_detail.avatar &&

app/components/core/filter-list.tsx

@@ -15,7 +15,7 @@ import issuesService from "services/issues.service";
 import projectService from "services/project.service";
 import stateService from "services/state.service";
 // types
-import { PROJECT_ISSUE_LABELS, PROJECT_MEMBERS, STATES_LIST } from "constants/fetch-keys";
+import { PROJECT_ISSUE_LABELS, PROJECT_MEMBERS, STATE_LIST } from "constants/fetch-keys";
 import { IIssueFilterOptions } from "types";
 
 export const FilterList: React.FC<any> = ({ filters, setFilters }) => {
@@ -37,7 +37,7 @@ export const FilterList: React.FC<any> = ({ filters, setFilters }) => {
   );
 
   const { data: stateGroups } = useSWR(
-    workspaceSlug && projectId ? STATES_LIST(projectId as string) : null,
+    workspaceSlug && projectId ? STATE_LIST(projectId as string) : null,
     workspaceSlug
       ? () => stateService.getStates(workspaceSlug as string, projectId as string)
       : null
@@ -59,7 +59,7 @@ export const FilterList: React.FC<any> = ({ filters, setFilters }) => {
               key={key}
               className="flex items-center gap-x-2 rounded-full border border-brand-base bg-brand-surface-2 px-2 py-1"
             >
-              <span className="capitalize text-brand-secondary">
+              <span className="font-medium capitalize text-brand-secondary">
                 {replaceUnderscoreIfSnakeCase(key)}:
               </span>
               {filters[key as keyof IIssueFilterOptions] === null ||
@@ -75,7 +75,7 @@ export const FilterList: React.FC<any> = ({ filters, setFilters }) => {
                         return (
                           <p
                             key={state?.id}
-                            className="inline-flex items-center gap-x-1 rounded-full px-2 py-0.5 font-medium"
+                            className="inline-flex items-center gap-x-1 rounded-full px-2 py-0.5 font-medium text-white"
                             style={{
                               color: state?.color,
                               backgroundColor: `${state?.color}20`,
@@ -122,16 +122,16 @@ export const FilterList: React.FC<any> = ({ filters, setFilters }) => {
                       {filters.priority?.map((priority: any) => (
                         <p
                           key={priority}
-                          className={`inline-flex items-center gap-x-1 rounded-full px-2 py-0.5 capitalize ${
+                          className={`inline-flex items-center gap-x-1 rounded-full px-2 py-0.5 font-medium capitalize text-white ${
                             priority === "urgent"
-                              ? "bg-red-500/20 text-red-500"
+                              ? "bg-red-100 text-red-600 hover:bg-red-100"
                               : priority === "high"
-                              ? "bg-orange-500/20 text-orange-500"
+                              ? "bg-orange-100 text-orange-500 hover:bg-orange-100"
                               : priority === "medium"
-                              ? "bg-yellow-500/20 text-yellow-500"
+                              ? "bg-yellow-100 text-yellow-500 hover:bg-yellow-100"
                               : priority === "low"
-                              ? "bg-green-500/20 text-green-500"
-                              : "bg-brand-surface-1 text-brand-secondary"
+                              ? "bg-green-100 text-green-500 hover:bg-green-100"
+                              : "bg-brand-surface-1 text-gray-700 hover:bg-brand-surface-1"
                           }`}
                         >
                           <span>{getPriorityIcon(priority)}</span>
@@ -170,7 +170,7 @@ export const FilterList: React.FC<any> = ({ filters, setFilters }) => {
                         return (
                           <div
                             key={memberId}
-                            className="inline-flex items-center gap-x-1 rounded-full bg-brand-surface-1 px-1 capitalize"
+                            className="inline-flex items-center gap-x-1 rounded-full px-1 font-medium capitalize"
                           >
                             <Avatar user={member} />
                             <span>{member?.first_name}</span>
@@ -203,7 +203,7 @@ export const FilterList: React.FC<any> = ({ filters, setFilters }) => {
                         <XMarkIcon className="h-3 w-3" />
                       </button>
                     </div>
-                  ) : key === "created_by" ? (
+                  ) : (key as keyof IIssueFilterOptions) === "created_by" ? (
                     <div className="flex flex-wrap items-center gap-1">
                       {filters.created_by?.map((memberId: string) => {
                         const member = members?.find((m) => m.member.id === memberId)?.member;
@@ -211,7 +211,7 @@ export const FilterList: React.FC<any> = ({ filters, setFilters }) => {
                         return (
                           <div
                             key={`${memberId}-${key}`}
-                            className="inline-flex items-center gap-x-1 rounded-full bg-brand-surface-1 px-1 capitalize"
+                            className="inline-flex items-center gap-x-1 rounded-full px-1 font-medium capitalize"
                           >
                             <Avatar user={member} />
                             <span>{member?.first_name}</span>
@@ -253,20 +253,25 @@ export const FilterList: React.FC<any> = ({ filters, setFilters }) => {
                         const color = label.color !== "" ? label.color : "#0f172a";
                         return (
                           <div
-                            className="inline-flex items-center gap-x-1 rounded-full px-2 py-0.5"
+                            className="inline-flex items-center gap-x-1 rounded-full px-2 py-0.5 font-medium"
                             style={{
-                              color: color,
-                              backgroundColor: `${color}20`, // add 20% opacity
+                              background: `${color}33`, // add 20% opacity
                             }}
                             key={labelId}
                           >
                             <div
-                              className="h-1.5 w-1.5 rounded-full"
+                              className="h-2 w-2 rounded-full"
                               style={{
                                 backgroundColor: color,
                               }}
                             />
-                            <span>{label.name}</span>
+                            <span
+                              style={{
+                                color: color,
+                              }}
+                            >
+                              {label.name}
+                            </span>
                             <span
                               className="cursor-pointer"
                               onClick={() =>
@@ -336,8 +341,8 @@ export const FilterList: React.FC<any> = ({ filters, setFilters }) => {
           }
           className="flex items-center gap-x-1 rounded-full border border-brand-base bg-brand-surface-2 px-3 py-1.5 text-xs"
         >
-          <span>Clear all filters</span>
-          <XMarkIcon className="h-3 w-3" />
+          <span className="font-medium">Clear all filters</span>
+          <XMarkIcon className="h-4 w-4" />
         </button>
       )}
     </div>

app/components/core/gpt-assistant-modal.tsx

@@ -1,4 +1,4 @@
-import { useEffect, useState, forwardRef, useRef } from "react";
+import { useEffect, useState } from "react";
 
 import { useRouter } from "next/router";
 import dynamic from "next/dynamic";
@@ -35,14 +35,6 @@ const RemirrorRichTextEditor = dynamic(() => import("components/rich-text-editor
   ssr: false,
 });
 
-import { IRemirrorRichTextEditor } from "components/rich-text-editor";
-
-const WrappedRemirrorRichTextEditor = forwardRef<IRemirrorRichTextEditor, IRemirrorRichTextEditor>(
-  (props, ref) => <RemirrorRichTextEditor {...props} forwardedRef={ref} />
-);
-
-WrappedRemirrorRichTextEditor.displayName = "WrappedRemirrorRichTextEditor";
-
 export const GptAssistantModal: React.FC<Props> = ({
   isOpen,
   handleClose,
@@ -60,8 +52,6 @@ export const GptAssistantModal: React.FC<Props> = ({
   const router = useRouter();
   const { workspaceSlug } = router.query;
 
-  const editorRef = useRef<any>(null);
-
   const { setToastAlert } = useToast();
 
   const {
@@ -129,31 +119,26 @@ export const GptAssistantModal: React.FC<Props> = ({
     if (isOpen) setFocus("task");
   }, [isOpen, setFocus]);
 
-  useEffect(() => {
-    editorRef.current?.setEditorValue(htmlContent ?? `<p>${content}</p>`);
-  }, [htmlContent, editorRef, content]);
-
   return (
     <div
-      className={`absolute ${inset} z-20 w-full space-y-4 rounded-[10px] border border-brand-base bg-brand-base p-4 shadow ${
+      className={`absolute ${inset} z-20 w-full space-y-4 rounded-[10px] border border-brand-base bg-brand-surface-2 p-4 shadow ${
         isOpen ? "block" : "hidden"
       }`}
     >
-      {((content && content !== "") || (htmlContent && htmlContent !== "<p></p>")) && (
+      {((content && content !== "") || htmlContent !== "<p></p>") && (
         <div className="remirror-section text-sm">
           Content:
-          <WrappedRemirrorRichTextEditor
+          <RemirrorRichTextEditor
             value={htmlContent ?? <p>{content}</p>}
             customClassName="-m-3"
             noBorder
             borderOnFocus={false}
             editable={false}
-            ref={editorRef}
           />
         </div>
       )}
       {response !== "" && (
-        <div className="page-block-section text-sm">
+        <div className="text-sm page-block-section">
           Response:
           <RemirrorRichTextEditor
             value={`<p>${response}</p>`}

app/components/core/image-picker-popover.tsx

@@ -65,7 +65,7 @@ export const ImagePickerPopover: React.FC<Props> = ({ label, value, onChange })
   return (
     <Popover className="relative z-[2]" ref={ref}>
       <Popover.Button
-        className="rounded-md border border-brand-base bg-brand-surface-2 px-2 py-1 text-xs text-brand-secondary"
+        className="rounded-md border border-brand-base bg-brand-surface-2 px-2 py-1 text-xs text-gray-700"
         onClick={() => setIsOpen((prev) => !prev)}
       >
         {label}
@@ -79,7 +79,7 @@ export const ImagePickerPopover: React.FC<Props> = ({ label, value, onChange })
         leaveFrom="transform opacity-100 scale-100"
         leaveTo="transform opacity-0 scale-95"
       >
-        <Popover.Panel className="absolute right-0 z-10 mt-2 rounded-md border border-brand-base bg-brand-surface-2 shadow-lg">
+        <Popover.Panel className="absolute right-0 z-10 mt-2 rounded-md bg-brand-surface-2 shadow-lg">
           <div className="h-96 w-80 overflow-auto rounded border border-brand-base bg-brand-surface-2 p-5 shadow-2xl sm:max-w-2xl md:w-96 lg:w-[40rem]">
             <Tab.Group>
               <Tab.List as="span" className="inline-block rounded bg-brand-surface-2 p-1">

app/components/core/image-upload-modal.tsx

@@ -110,7 +110,7 @@ export const ImageUploadModal: React.FC<Props> = ({
           leaveFrom="opacity-100"
           leaveTo="opacity-0"
         >
-          <div className="fixed inset-0 bg-brand-backdrop bg-opacity-50 transition-opacity" />
+          <div className="fixed inset-0 bg-[#131313] bg-opacity-50 transition-opacity" />
         </Transition.Child>
 
         <div className="fixed inset-0 z-30 overflow-y-auto">
@@ -124,7 +124,7 @@ export const ImageUploadModal: React.FC<Props> = ({
               leaveFrom="opacity-100 translate-y-0 sm:scale-100"
               leaveTo="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
             >
-              <Dialog.Panel className="relative transform overflow-hidden rounded-lg border border-brand-base bg-brand-base px-5 py-8 text-left shadow-xl transition-all sm:w-full sm:max-w-xl sm:p-6">
+              <Dialog.Panel className="relative transform overflow-hidden rounded-lg bg-brand-surface-2 px-5 py-8 text-left shadow-xl transition-all sm:w-full sm:max-w-xl sm:p-6">
                 <div className="space-y-5">
                   <Dialog.Title as="h3" className="text-lg font-medium leading-6 text-brand-base">
                     Upload Image
@@ -133,9 +133,9 @@ export const ImageUploadModal: React.FC<Props> = ({
                     <div className="flex items-center gap-3">
                       <div
                         {...getRootProps()}
-                        className={`relative grid h-80 w-full cursor-pointer place-items-center rounded-lg p-12 text-center focus:outline-none focus:ring-2 focus:ring-brand-accent focus:ring-offset-2 ${
+                        className={`relative block h-80 w-full rounded-lg p-12 text-center focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2 ${
                           (image === null && isDragActive) || !value
-                            ? "border-2 border-dashed border-brand-base hover:bg-brand-surface-1"
+                            ? "border-2 border-dashed border-brand-base hover:border-gray-400"
                             : ""
                         }`}
                       >
@@ -143,7 +143,7 @@ export const ImageUploadModal: React.FC<Props> = ({
                           <>
                             <button
                               type="button"
-                              className="absolute top-0 right-0 z-40 translate-x-1/2 -translate-y-1/2 rounded bg-brand-surface-1 px-2 py-0.5 text-xs font-medium text-brand-secondary"
+                              className="absolute top-0 right-0 z-40 translate-x-1/2 -translate-y-1/2 rounded bg-brand-surface-1 px-2 py-0.5 text-xs font-medium text-gray-600"
                             >
                               Edit
                             </button>
@@ -152,18 +152,17 @@ export const ImageUploadModal: React.FC<Props> = ({
                               objectFit="cover"
                               src={image ? URL.createObjectURL(image) : value ? value : ""}
                               alt="image"
-                              className="rounded-lg"
                             />
                           </>
                         ) : (
-                          <div>
-                            <UserCircleIcon className="mx-auto h-16 w-16 text-brand-secondary" />
-                            <span className="mt-2 block text-sm font-medium text-brand-secondary">
+                          <>
+                            <UserCircleIcon className="mx-auto h-16 w-16 text-gray-400" />
+                            <span className="mt-2 block text-sm font-medium text-brand-base">
                               {isDragActive
                                 ? "Drop image here to upload"
                                 : "Drag & drop image here"}
                             </span>
-                          </div>
+                          </>
                         )}
 
                         <input {...getInputProps()} type="text" />

app/components/core/index.ts

@@ -1,18 +1,14 @@
 export * from "./board-view";
-export * from "./calendar-view";
-export * from "./gantt-chart-view";
 export * from "./list-view";
 export * from "./sidebar";
 export * from "./bulk-delete-issues-modal";
 export * from "./existing-issues-list-modal";
-export * from "./filters-list";
 export * from "./gpt-assistant-modal";
 export * from "./image-upload-modal";
 export * from "./issues-view-filter";
 export * from "./issues-view";
 export * from "./link-modal";
 export * from "./image-picker-popover";
+export * from "./filter-list";
 export * from "./feeds";
 export * from "./theme-switch";
-export * from "./custom-theme-selector";
-export * from "./color-picker-input";

app/components/core/issues-view-filter.tsx

@@ -10,14 +10,13 @@ import { Popover, Transition } from "@headlessui/react";
 // components
 import { SelectFilters } from "components/views";
 // ui
-import { CustomMenu, ToggleSwitch } from "components/ui";
+import { CustomMenu } from "components/ui";
 // icons
 import {
   ChevronDownIcon,
   ListBulletIcon,
   Squares2X2Icon,
   CalendarDaysIcon,
-  ChartBarIcon,
 } from "@heroicons/react/24/outline";
 // helpers
 import { replaceUnderscoreIfSnakeCase } from "helpers/string.helper";
@@ -83,17 +82,6 @@ export const IssuesFilterView: React.FC = () => {
         >
           <CalendarDaysIcon className="h-4 w-4 text-brand-secondary" />
         </button>
-        <button
-          type="button"
-          className={`grid h-7 w-7 place-items-center rounded outline-none duration-300 hover:bg-brand-surface-2 ${
-            issueView === "gantt_chart" ? "bg-brand-surface-2" : ""
-          }`}
-          onClick={() => setIssueView("gantt_chart")}
-        >
-          <span className="material-symbols-rounded text-brand-secondary text-[18px] rotate-90">
-            waterfall_chart
-          </span>
-        </button>
       </div>
       <SelectFilters
         filters={filters}
@@ -146,7 +134,7 @@ export const IssuesFilterView: React.FC = () => {
               leaveFrom="opacity-100 translate-y-0"
               leaveTo="opacity-0 translate-y-1"
             >
-              <Popover.Panel className="absolute right-0 z-20 mt-1 w-screen max-w-xs transform rounded-lg border border-brand-base bg-brand-surface-1 p-3 shadow-lg">
+              <Popover.Panel className="absolute right-0 z-20 mt-1 w-screen max-w-xs transform overflow-hidden rounded-lg border border-brand-base bg-brand-surface-1 p-3 shadow-lg">
                 <div className="relative divide-y-2 divide-brand-base">
                   <div className="space-y-4 pb-3 text-xs">
                     {issueView !== "calendar" && (
@@ -225,10 +213,23 @@ export const IssuesFilterView: React.FC = () => {
                       <>
                         <div className="flex items-center justify-between">
                           <h4 className="text-brand-secondary">Show empty states</h4>
-                          <ToggleSwitch
-                            value={showEmptyGroups}
-                            onChange={() => setShowEmptyGroups(!showEmptyGroups)}
-                          />
+                          <button
+                            type="button"
+                            className={`relative inline-flex h-3.5 w-6 flex-shrink-0 cursor-pointer rounded-full border-2 border-transparent transition-colors duration-200 ease-in-out focus:outline-none ${
+                              showEmptyGroups ? "bg-green-500" : "bg-brand-surface-2"
+                            }`}
+                            role="switch"
+                            aria-checked={showEmptyGroups}
+                            onClick={() => setShowEmptyGroups(!showEmptyGroups)}
+                          >
+                            <span className="sr-only">Show empty groups</span>
+                            <span
+                              aria-hidden="true"
+                              className={`inline-block h-2.5 w-2.5 transform rounded-full bg-brand-surface-2 shadow ring-0 transition duration-200 ease-in-out ${
+                                showEmptyGroups ? "translate-x-2.5" : "translate-x-0"
+                              }`}
+                            />
+                          </button>
                         </div>
                         <div className="relative flex justify-end gap-x-3">
                           <button type="button" onClick={() => resetFilterToDefault()}>
@@ -245,30 +246,31 @@ export const IssuesFilterView: React.FC = () => {
                       </>
                     )}
                   </div>
+                  {issueView !== "calendar" && (
+                    <div className="space-y-2 py-3">
+                      <h4 className="text-sm text-brand-secondary">Display Properties</h4>
+                      <div className="flex flex-wrap items-center gap-2">
+                        {Object.keys(properties).map((key) => {
+                          if (key === "estimate" && !isEstimateActive) return null;
 
-                  <div className="space-y-2 py-3">
-                    <h4 className="text-sm text-brand-secondary">Display Properties</h4>
-                    <div className="flex flex-wrap items-center gap-2">
-                      {Object.keys(properties).map((key) => {
-                        if (key === "estimate" && !isEstimateActive) return null;
-
-                        return (
-                          <button
-                            key={key}
-                            type="button"
-                            className={`rounded border px-2 py-1 text-xs capitalize ${
-                              properties[key as keyof Properties]
-                                ? "border-brand-accent bg-brand-accent text-white"
-                                : "border-brand-base"
-                            }`}
-                            onClick={() => setProperties(key as keyof Properties)}
-                          >
-                            {key === "key" ? "ID" : replaceUnderscoreIfSnakeCase(key)}
-                          </button>
-                        );
-                      })}
+                          return (
+                            <button
+                              key={key}
+                              type="button"
+                              className={`rounded border px-2 py-1 text-xs capitalize ${
+                                properties[key as keyof Properties]
+                                  ? "border-brand-accent bg-brand-accent text-brand-base"
+                                  : "border-brand-base"
+                              }`}
+                              onClick={() => setProperties(key as keyof Properties)}
+                            >
+                              {key === "key" ? "ID" : replaceUnderscoreIfSnakeCase(key)}
+                            </button>
+                          );
+                        })}
+                      </div>
                     </div>
-                  </div>
+                  )}
                 </div>
               </Popover.Panel>
             </Transition>

app/components/core/issues-view.tsx

@@ -6,7 +6,6 @@ import useSWR, { mutate } from "swr";
 
 // react-beautiful-dnd
 import { DragDropContext, DropResult } from "react-beautiful-dnd";
-import StrictModeDroppable from "components/dnd/StrictModeDroppable";
 // services
 import issuesService from "services/issues.service";
 import stateService from "services/state.service";
@@ -18,13 +17,14 @@ import { useProjectMyMembership } from "contexts/project-member.context";
 import useToast from "hooks/use-toast";
 import useIssuesView from "hooks/use-issues-view";
 // components
-import { AllLists, AllBoards, FilterList, CalendarView, GanttChartView } from "components/core";
+import { AllLists, AllBoards, FilterList } from "components/core";
 import { CreateUpdateIssueModal, DeleteIssueModal } from "components/issues";
+import StrictModeDroppable from "components/dnd/StrictModeDroppable";
 import { CreateUpdateViewModal } from "components/views";
-import { CycleIssuesGanttChartView, TransferIssues, TransferIssuesModal } from "components/cycles";
-import { IssueGanttChartView } from "components/issues/gantt-chart";
+import { TransferIssues, TransferIssuesModal } from "components/cycles";
 // ui
 import { EmptySpace, EmptySpaceItem, EmptyState, PrimaryButton, Spinner } from "components/ui";
+import { CalendarView } from "./calendar-view";
 // icons
 import {
   ListBulletIcon,
@@ -46,9 +46,9 @@ import {
   MODULE_DETAILS,
   MODULE_ISSUES_WITH_PARAMS,
   PROJECT_ISSUES_LIST_WITH_PARAMS,
-  STATES_LIST,
+  STATE_LIST,
 } from "constants/fetch-keys";
-import { ModuleIssuesGanttChartView } from "components/modules";
+// image
 
 type Props = {
   type?: "issue" | "cycle" | "module";
@@ -103,7 +103,7 @@ export const IssuesView: React.FC<Props> = ({
   } = useIssuesView();
 
   const { data: stateGroups } = useSWR(
-    workspaceSlug && projectId ? STATES_LIST(projectId as string) : null,
+    workspaceSlug && projectId ? STATE_LIST(projectId as string) : null,
     workspaceSlug
       ? () => stateService.getStates(workspaceSlug as string, projectId as string)
       : null
@@ -314,26 +314,10 @@ export const IssuesView: React.FC<Props> = ({
   );
 
   const removeIssueFromCycle = useCallback(
-    (bridgeId: string, issueId: string) => {
+    (bridgeId: string) => {
       if (!workspaceSlug || !projectId || !cycleId) return;
 
-      mutate(
-        CYCLE_ISSUES_WITH_PARAMS(cycleId as string, params),
-        (prevData: any) => {
-          if (!prevData) return prevData;
-          if (selectedGroup) {
-            const filteredData: any = {};
-            for (const key in prevData) {
-              filteredData[key] = prevData[key].filter((item: any) => item.id !== issueId);
-            }
-            return filteredData;
-          } else {
-            const filteredData = prevData.filter((i: any) => i.id !== issueId);
-            return filteredData;
-          }
-        },
-        false
-      );
+      mutate(CYCLE_ISSUES_WITH_PARAMS(cycleId as string, params));
 
       issuesService
         .removeIssueFromCycle(
@@ -342,41 +326,18 @@ export const IssuesView: React.FC<Props> = ({
           cycleId as string,
           bridgeId
         )
-        .then(() => {
-          setToastAlert({
-            title: "Success",
-            message: "Issue removed successfully.",
-            type: "success",
-          });
-        })
         .catch((e) => {
           console.log(e);
         });
     },
-    [workspaceSlug, projectId, cycleId, params, selectedGroup, setToastAlert]
+    [workspaceSlug, projectId, cycleId, params]
   );
 
   const removeIssueFromModule = useCallback(
-    (bridgeId: string, issueId: string) => {
+    (bridgeId: string) => {
       if (!workspaceSlug || !projectId || !moduleId) return;
 
-      mutate(
-        MODULE_ISSUES_WITH_PARAMS(moduleId as string, params),
-        (prevData: any) => {
-          if (!prevData) return prevData;
-          if (selectedGroup) {
-            const filteredData: any = {};
-            for (const key in prevData) {
-              filteredData[key] = prevData[key].filter((item: any) => item.id !== issueId);
-            }
-            return filteredData;
-          } else {
-            const filteredData = prevData.filter((item: any) => item.id !== issueId);
-            return filteredData;
-          }
-        },
-        false
-      );
+      mutate(MODULE_ISSUES_WITH_PARAMS(moduleId as string, params));
 
       modulesService
         .removeIssueFromModule(
@@ -385,18 +346,11 @@ export const IssuesView: React.FC<Props> = ({
           moduleId as string,
           bridgeId
         )
-        .then(() => {
-          setToastAlert({
-            title: "Success",
-            message: "Issue removed successfully.",
-            type: "success",
-          });
-        })
         .catch((e) => {
           console.log(e);
         });
     },
-    [workspaceSlug, projectId, moduleId, params, selectedGroup, setToastAlert]
+    [workspaceSlug, projectId, moduleId, params]
   );
 
   const handleTrashBox = useCallback(
@@ -442,10 +396,14 @@ export const IssuesView: React.FC<Props> = ({
         handleClose={() => setTransferIssuesModal(false)}
         isOpen={transferIssuesModal}
       />
-      {areFiltersApplied && (
-        <>
-          <div className="flex items-center justify-between gap-2 px-5 pt-3 pb-0">
-            <FilterList filters={filters} setFilters={setFilters} />
+      <>
+        <div
+          className={`flex items-center justify-between gap-2 ${
+            issueView === "list" ? (areFiltersApplied ? "mt-6 px-8" : "") : "-mt-2"
+          }`}
+        >
+          <FilterList filters={filters} setFilters={setFilters} />
+          {areFiltersApplied && (
             <PrimaryButton
               onClick={() => {
                 if (viewId) {
@@ -465,10 +423,12 @@ export const IssuesView: React.FC<Props> = ({
               {!viewId && <PlusIcon className="h-4 w-4" />}
               {viewId ? "Update" : "Save"} view
             </PrimaryButton>
-          </div>
-          {<div className="mt-3 border-t border-brand-base" />}
-        </>
-      )}
+          )}
+        </div>
+        {areFiltersApplied && (
+          <div className={` ${issueView === "list" ? "mt-4" : "my-4"} border-t`} />
+        )}
+      </>
 
       <DragDropContext onDragEnd={handleOnDragEnd}>
         <StrictModeDroppable droppableId="trashBox">
@@ -476,14 +436,14 @@ export const IssuesView: React.FC<Props> = ({
             <div
               className={`${
                 trashBox ? "pointer-events-auto opacity-100" : "pointer-events-none opacity-0"
-              } fixed top-4 left-1/2 -translate-x-1/2 z-40 w-72 flex items-center justify-center gap-2 rounded border-2 border-red-500/20 bg-brand-base px-3 py-5 text-xs font-medium italic text-red-500 ${
-                snapshot.isDraggingOver ? "bg-red-500 blur-2xl opacity-70" : ""
-              } transition duration-300`}
+              } fixed top-9 right-9 z-30 flex h-28 w-96 flex-col items-center justify-center gap-2 rounded border-2 border-red-500/20 bg-red-500/20 p-3 text-xs font-medium italic text-red-500 ${
+                snapshot.isDraggingOver ? "bg-red-500/100 text-white" : ""
+              } duration-200`}
               ref={provided.innerRef}
               {...provided.droppableProps}
             >
               <TrashIcon className="h-4 w-4" />
-              Drop here to delete the issue.
+              Drop issue here to delete
             </div>
           )}
         </StrictModeDroppable>
@@ -530,16 +490,8 @@ export const IssuesView: React.FC<Props> = ({
                   isCompleted={isCompleted}
                   userAuth={memberRole}
                 />
-              ) : issueView === "calendar" ? (
-                <CalendarView
-                  handleEditIssue={handleEditIssue}
-                  handleDeleteIssue={handleDeleteIssue}
-                  addIssueToDate={addIssueToDate}
-                  isCompleted={isCompleted}
-                  userAuth={memberRole}
-                />
               ) : (
-                issueView === "gantt_chart" && <GanttChartView />
+                <CalendarView addIssueToDate={addIssueToDate} />
               )}
             </>
           ) : type === "issue" ? (