fix: event tracking

* fix: file structure changes

* fix: pages update

* fix: license imports changed

.env.example

@@ -21,20 +21,15 @@ AWS_S3_BUCKET_NAME="uploads"
 FILE_SIZE_LIMIT=5242880
 
 # GPT settings
-OPENAI_API_BASE="https://api.openai.com/v1" # change if using a custom endpoint
-OPENAI_API_KEY="sk-" # add your openai key here
-GPT_ENGINE="gpt-3.5-turbo" # use "gpt-4" if you have access
+OPENAI_API_BASE="https://api.openai.com/v1" # deprecated
+OPENAI_API_KEY="sk-" # deprecated
+GPT_ENGINE="gpt-3.5-turbo" # deprecated
 
 # Settings related to Docker
-DOCKERIZED=1
+DOCKERIZED=1  # deprecated
+
 # set to 1 If using the pre-configured minio setup
 USE_MINIO=1
 
 # Nginx Configuration
 NGINX_PORT=80
-
-# Set it to 0, to disable it
-ENABLE_WEBHOOK=1
-
-# Set it to 0, to disable it
-ENABLE_API=1

.gitignore

@@ -79,3 +79,4 @@ pnpm-workspace.yaml
 tmp/
 ## packages
 dist
+.temp/

Dockerfile

@@ -43,8 +43,6 @@ FROM python:3.11.1-alpine3.17 AS backend
 ENV PYTHONDONTWRITEBYTECODE 1
 ENV PYTHONUNBUFFERED 1
 ENV PIP_DISABLE_PIP_VERSION_CHECK=1 
-ENV DJANGO_SETTINGS_MODULE plane.settings.production
-ENV DOCKERIZED 1
 
 WORKDIR /code
 

ENV_SETUP.md

@@ -31,12 +31,10 @@ AWS_S3_BUCKET_NAME="uploads"
 FILE_SIZE_LIMIT=5242880
 ​
 # GPT settings
-OPENAI_API_BASE="https://api.openai.com/v1" # change if using a custom endpoint
-OPENAI_API_KEY="sk-" # add your openai key here
-GPT_ENGINE="gpt-3.5-turbo" # use "gpt-4" if you have access
+OPENAI_API_BASE="https://api.openai.com/v1" # deprecated
+OPENAI_API_KEY="sk-" # deprecated
+GPT_ENGINE="gpt-3.5-turbo" # deprecated
 ​
-# Settings related to Docker
-DOCKERIZED=1
 # set to 1 If using the pre-configured minio setup
 USE_MINIO=1
 ​
@@ -78,7 +76,7 @@ NEXT_PUBLIC_ENABLE_OAUTH=0
 # Backend
 # Debug value for api server use it as 0 for production use
 DEBUG=0
-DJANGO_SETTINGS_MODULE="plane.settings.selfhosted"
+DJANGO_SETTINGS_MODULE="plane.settings.selfhosted" # deprecated
 ​
 # Error logs
 SENTRY_DSN=""
@@ -115,24 +113,22 @@ AWS_S3_BUCKET_NAME="uploads"
 FILE_SIZE_LIMIT=5242880
 ​
 # GPT settings
-OPENAI_API_BASE="https://api.openai.com/v1" # change if using a custom endpoint
-OPENAI_API_KEY="sk-" # add your openai key here
-GPT_ENGINE="gpt-3.5-turbo" # use "gpt-4" if you have access
+OPENAI_API_BASE="https://api.openai.com/v1" # deprecated
+OPENAI_API_KEY="sk-" # deprecated
+GPT_ENGINE="gpt-3.5-turbo" # deprecated
 ​
+# Settings related to Docker
+DOCKERIZED=1  # Deprecated
+
 # Github
 GITHUB_CLIENT_SECRET="" # For fetching release notes
 ​
-# Settings related to Docker
-DOCKERIZED=1
 # set to 1 If using the pre-configured minio setup
 USE_MINIO=1
 ​
 # Nginx Configuration
 NGINX_PORT=80
 ​
-# Default Creds
-DEFAULT_EMAIL="captain@plane.so"
-DEFAULT_PASSWORD="password123"
 ​
 # SignUps
 ENABLE_SIGNUP="1"

apiserver/.env.example

@@ -1,10 +1,11 @@
 # Backend
 # Debug value for api server use it as 0 for production use
 DEBUG=0
-CORS_ALLOWED_ORIGINS="http://localhost"
+CORS_ALLOWED_ORIGINS=""
 
 # Error logs
 SENTRY_DSN=""
+SENTRY_ENVIRONMENT="development"
 
 # Database Settings
 PGUSER="plane"
@@ -18,15 +19,6 @@ REDIS_HOST="plane-redis"
 REDIS_PORT="6379"
 REDIS_URL="redis://${REDIS_HOST}:6379/"
 
-# Email Settings
-EMAIL_HOST=""
-EMAIL_HOST_USER=""
-EMAIL_HOST_PASSWORD=""
-EMAIL_PORT=587
-EMAIL_FROM="Team Plane <team@mailer.plane.so>"
-EMAIL_USE_TLS="1"
-EMAIL_USE_SSL="0"
-
 # AWS Settings
 AWS_REGION=""
 AWS_ACCESS_KEY_ID="access-key"
@@ -38,9 +30,9 @@ AWS_S3_BUCKET_NAME="uploads"
 FILE_SIZE_LIMIT=5242880
 
 # GPT settings
-OPENAI_API_BASE="https://api.openai.com/v1" # change if using a custom endpoint
-OPENAI_API_KEY="sk-" # add your openai key here
-GPT_ENGINE="gpt-3.5-turbo" # use "gpt-4" if you have access
+OPENAI_API_BASE="https://api.openai.com/v1" # deprecated
+OPENAI_API_KEY="sk-" # deprecated
+GPT_ENGINE="gpt-3.5-turbo" # deprecated
 
 # Github
 GITHUB_CLIENT_SECRET="" # For fetching release notes
@@ -53,9 +45,6 @@ USE_MINIO=1
 # Nginx Configuration
 NGINX_PORT=80
 
-# Default Creds
-DEFAULT_EMAIL="captain@plane.so"
-DEFAULT_PASSWORD="password123"
 
 # SignUps
 ENABLE_SIGNUP="1"
@@ -70,12 +59,6 @@ ENABLE_MAGIC_LINK_LOGIN="0"
 # Email redirections and minio domain settings
 WEB_URL="http://localhost"
 
-# Set it to 0, to disable it
-ENABLE_WEBHOOK=1
-
-# Set it to 0, to disable it
-ENABLE_API=1
-
 # Gunicorn Workers
 GUNICORN_WORKERS=2
 

apiserver/Dockerfile.api

@@ -43,7 +43,7 @@ USER captain
 COPY manage.py manage.py
 COPY plane plane/
 COPY templates templates/
-
+COPY package.json package.json
 COPY gunicorn.config.py ./
 USER root
 RUN apk --no-cache add "bash~=5.2"

apiserver/bin/bucket_script.py

@@ -1,83 +0,0 @@
-import os, sys
-import boto3
-import json
-from botocore.exceptions import ClientError
-
-
-sys.path.append("/code")
-
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "plane.settings.production")
-import django
-
-django.setup()
-
-def set_bucket_public_policy(s3_client, bucket_name):
-    public_policy = {
-        "Version": "2012-10-17",
-        "Statement": [{
-            "Effect": "Allow",
-            "Principal": "*",
-            "Action": ["s3:GetObject"],
-            "Resource": [f"arn:aws:s3:::{bucket_name}/*"]
-        }]
-    }
-
-    try:
-        s3_client.put_bucket_policy(
-            Bucket=bucket_name,
-            Policy=json.dumps(public_policy)
-        )
-        print(f"Public read access policy set for bucket '{bucket_name}'.")
-    except ClientError as e:
-        print(f"Error setting public read access policy: {e}")
-
-
-
-def create_bucket():
-    try:
-        from django.conf import settings
-        
-        # Create a session using the credentials from Django settings
-        session = boto3.session.Session(
-            aws_access_key_id=settings.AWS_ACCESS_KEY_ID,
-            aws_secret_access_key=settings.AWS_SECRET_ACCESS_KEY,
-        )
-
-        # Create an S3 client using the session
-        s3_client = session.client('s3', endpoint_url=settings.AWS_S3_ENDPOINT_URL)
-        bucket_name = settings.AWS_STORAGE_BUCKET_NAME
-        
-        print("Checking bucket...")
-        
-        # Check if the bucket exists
-        s3_client.head_bucket(Bucket=bucket_name)
-        
-        # If head_bucket does not raise an exception, the bucket exists
-        print(f"Bucket '{bucket_name}' already exists.")
-
-        set_bucket_public_policy(s3_client, bucket_name)
-        
-    except ClientError as e:
-        error_code = int(e.response['Error']['Code'])
-        bucket_name = settings.AWS_STORAGE_BUCKET_NAME
-        if error_code == 404:
-            # Bucket does not exist, create it
-            print(f"Bucket '{bucket_name}' does not exist. Creating bucket...")
-            try:
-                s3_client.create_bucket(Bucket=bucket_name)
-                print(f"Bucket '{bucket_name}' created successfully.")
-                set_bucket_public_policy(s3_client, bucket_name)
-            except ClientError as create_error:
-                print(f"Failed to create bucket: {create_error}")
-        elif error_code == 403:
-            # Access to the bucket is forbidden
-            print(f"Access to the bucket '{bucket_name}' is forbidden. Check permissions.")
-        else:
-            # Another ClientError occurred
-            print(f"Failed to check bucket: {e}")
-    except Exception as ex:
-        # Handle any other exception
-        print(f"An error occurred: {ex}")
-
-if __name__ == "__main__":
-    create_bucket()

apiserver/bin/takeoff

@@ -3,8 +3,17 @@ set -e
 python manage.py wait_for_db
 python manage.py migrate
 
-# Create a Default User
-python bin/user_script.py
+# Set default value for ENABLE_REGISTRATION
+ENABLE_REGISTRATION=${ENABLE_REGISTRATION:-1}
+
+# Check if ENABLE_REGISTRATION is not set to '0'
+if [ "$ENABLE_REGISTRATION" != "0" ]; then
+    # Register instance
+    python manage.py register_instance
+    # Load the configuration variable
+    python manage.py configure_instance
+fi
+
 # Create the default bucket
 python bin/bucket_script.py
 

apiserver/bin/user_script.py

@@ -1,28 +0,0 @@
-import os, sys
-import uuid
-
-sys.path.append("/code")
-
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "plane.settings.production")
-import django
-
-django.setup()
-
-from plane.db.models import User
-
-
-def populate():
-    default_email = os.environ.get("DEFAULT_EMAIL", "captain@plane.so")
-    default_password = os.environ.get("DEFAULT_PASSWORD", "password123")
-
-    if not User.objects.filter(email=default_email).exists():
-        user = User.objects.create(email=default_email, username=uuid.uuid4().hex)
-        user.set_password(default_password)
-        user.save()
-        print(f"User created with an email: {default_email}")
-    else:
-        print(f"User already exists with the default email: {default_email}")
-
-
-if __name__ == "__main__":
-    populate()

apiserver/package.json

@@ -0,0 +1,4 @@
+{
+    "name": "plane-api",
+    "version": "0.13.2"
+}

apiserver/plane/analytics/urls.py

@@ -0,0 +1,8 @@
+# from django.contrib import admin
+from django.urls import path
+
+from plane.analytics.views import EventTrackingEndpoint
+
+urlpatterns = [
+    path('track-event/', EventTrackingEndpoint.as_view(), name='event_tracking'),
+]

apiserver/plane/analytics/views/__init__.py

@@ -0,0 +1 @@
+from .event_tacking import EventTrackingEndpoint

apiserver/plane/analytics/views/event_tacking.py

@@ -0,0 +1,52 @@
+# Python imports
+import requests
+import json
+
+# Module imports
+from plane.app.views import BaseAPIView
+
+# Third party imports
+from rest_framework import status
+from rest_framework.response import Response
+from rest_framework.permissions import IsAuthenticated
+
+# Django imports
+from django.conf import settings
+from django.core.serializers.json import DjangoJSONEncoder
+
+
+class EventTrackingEndpoint(BaseAPIView):
+    permission_class = [
+        IsAuthenticated,
+    ]
+
+    def post(self, request):
+        event_name = request.data.get("event_name", None)
+        extra = request.data.get("extra", None)
+
+        if not event_name or not extra:
+            return Response(
+                {"error": "event name and extra are required"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+
+        _ = requests.post(
+            settings.ANALYTICS_BASE_API,
+            params={"token": settings.ANALYTICS_SECRET_KEY},
+            json=json.dumps(
+                {
+                    "eventName": event_name,
+                    "extra": extra,
+                    "user": {
+                        "id": str(request.user.id),
+                        "email": str(request.user.email),
+                        "first_name": str(request.user.first_name),
+                        "last_name": str(request.user.last_name),
+                        "last_login_ip": str(request.META.get("REMOTE_ADDR")),
+                        "last_login_uagent": str(request.META.get("HTTP_USER_AGENT"))
+                    },
+                },
+                cls=DjangoJSONEncoder,
+            ),
+        )
+        return Response({"message": "success"}, status=status.HTTP_200_OK)

apiserver/plane/api/apps.py

@@ -1,5 +0,0 @@
-from django.apps import AppConfig
-
-
-class ApiConfig(AppConfig):
-    name = "plane.api"

apiserver/plane/api/urls/page.py

@@ -1,79 +0,0 @@
-from django.urls import path
-
-
-from plane.api.views import (
-    PageViewSet,
-    PageBlockViewSet,
-    PageFavoriteViewSet,
-    CreateIssueFromPageBlockEndpoint,
-)
-
-
-urlpatterns = [
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/pages/",
-        PageViewSet.as_view(
-            {
-                "get": "list",
-                "post": "create",
-            }
-        ),
-        name="project-pages",
-    ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/pages/<uuid:pk>/",
-        PageViewSet.as_view(
-            {
-                "get": "retrieve",
-                "patch": "partial_update",
-                "delete": "destroy",
-            }
-        ),
-        name="project-pages",
-    ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/pages/<uuid:page_id>/page-blocks/",
-        PageBlockViewSet.as_view(
-            {
-                "get": "list",
-                "post": "create",
-            }
-        ),
-        name="project-page-blocks",
-    ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/pages/<uuid:page_id>/page-blocks/<uuid:pk>/",
-        PageBlockViewSet.as_view(
-            {
-                "get": "retrieve",
-                "patch": "partial_update",
-                "delete": "destroy",
-            }
-        ),
-        name="project-page-blocks",
-    ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/user-favorite-pages/",
-        PageFavoriteViewSet.as_view(
-            {
-                "get": "list",
-                "post": "create",
-            }
-        ),
-        name="user-favorite-pages",
-    ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/user-favorite-pages/<uuid:page_id>/",
-        PageFavoriteViewSet.as_view(
-            {
-                "delete": "destroy",
-            }
-        ),
-        name="user-favorite-pages",
-    ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/pages/<uuid:page_id>/page-blocks/<uuid:page_block_id>/issues/",
-        CreateIssueFromPageBlockEndpoint.as_view(),
-        name="page-block-issues",
-    ),
-]

apiserver/plane/api/urls/public_board.py

@@ -1,151 +0,0 @@
-from django.urls import path
-
-
-from plane.api.views import (
-    ProjectDeployBoardViewSet,
-    ProjectDeployBoardPublicSettingsEndpoint,
-    ProjectIssuesPublicEndpoint,
-    IssueRetrievePublicEndpoint,
-    IssueCommentPublicViewSet,
-    IssueReactionPublicViewSet,
-    CommentReactionPublicViewSet,
-    InboxIssuePublicViewSet,
-    IssueVotePublicViewSet,
-    WorkspaceProjectDeployBoardEndpoint,
-)
-
-
-urlpatterns = [
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/project-deploy-boards/",
-        ProjectDeployBoardViewSet.as_view(
-            {
-                "get": "list",
-                "post": "create",
-            }
-        ),
-        name="project-deploy-board",
-    ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/project-deploy-boards/<uuid:pk>/",
-        ProjectDeployBoardViewSet.as_view(
-            {
-                "get": "retrieve",
-                "patch": "partial_update",
-                "delete": "destroy",
-            }
-        ),
-        name="project-deploy-board",
-    ),
-    path(
-        "public/workspaces/<str:slug>/project-boards/<uuid:project_id>/settings/",
-        ProjectDeployBoardPublicSettingsEndpoint.as_view(),
-        name="project-deploy-board-settings",
-    ),
-    path(
-        "public/workspaces/<str:slug>/project-boards/<uuid:project_id>/issues/",
-        ProjectIssuesPublicEndpoint.as_view(),
-        name="project-deploy-board",
-    ),
-    path(
-        "public/workspaces/<str:slug>/project-boards/<uuid:project_id>/issues/<uuid:issue_id>/",
-        IssueRetrievePublicEndpoint.as_view(),
-        name="workspace-project-boards",
-    ),
-    path(
-        "public/workspaces/<str:slug>/project-boards/<uuid:project_id>/issues/<uuid:issue_id>/comments/",
-        IssueCommentPublicViewSet.as_view(
-            {
-                "get": "list",
-                "post": "create",
-            }
-        ),
-        name="issue-comments-project-board",
-    ),
-    path(
-        "public/workspaces/<str:slug>/project-boards/<uuid:project_id>/issues/<uuid:issue_id>/comments/<uuid:pk>/",
-        IssueCommentPublicViewSet.as_view(
-            {
-                "get": "retrieve",
-                "patch": "partial_update",
-                "delete": "destroy",
-            }
-        ),
-        name="issue-comments-project-board",
-    ),
-    path(
-        "public/workspaces/<str:slug>/project-boards/<uuid:project_id>/issues/<uuid:issue_id>/reactions/",
-        IssueReactionPublicViewSet.as_view(
-            {
-                "get": "list",
-                "post": "create",
-            }
-        ),
-        name="issue-reactions-project-board",
-    ),
-    path(
-        "public/workspaces/<str:slug>/project-boards/<uuid:project_id>/issues/<uuid:issue_id>/reactions/<str:reaction_code>/",
-        IssueReactionPublicViewSet.as_view(
-            {
-                "delete": "destroy",
-            }
-        ),
-        name="issue-reactions-project-board",
-    ),
-    path(
-        "public/workspaces/<str:slug>/project-boards/<uuid:project_id>/comments/<uuid:comment_id>/reactions/",
-        CommentReactionPublicViewSet.as_view(
-            {
-                "get": "list",
-                "post": "create",
-            }
-        ),
-        name="comment-reactions-project-board",
-    ),
-    path(
-        "public/workspaces/<str:slug>/project-boards/<uuid:project_id>/comments/<uuid:comment_id>/reactions/<str:reaction_code>/",
-        CommentReactionPublicViewSet.as_view(
-            {
-                "delete": "destroy",
-            }
-        ),
-        name="comment-reactions-project-board",
-    ),
-    path(
-        "public/workspaces/<str:slug>/project-boards/<uuid:project_id>/inboxes/<uuid:inbox_id>/inbox-issues/",
-        InboxIssuePublicViewSet.as_view(
-            {
-                "get": "list",
-                "post": "create",
-            }
-        ),
-        name="inbox-issue",
-    ),
-    path(
-        "public/workspaces/<str:slug>/project-boards/<uuid:project_id>/inboxes/<uuid:inbox_id>/inbox-issues/<uuid:pk>/",
-        InboxIssuePublicViewSet.as_view(
-            {
-                "get": "retrieve",
-                "patch": "partial_update",
-                "delete": "destroy",
-            }
-        ),
-        name="inbox-issue",
-    ),
-    path(
-        "public/workspaces/<str:slug>/project-boards/<uuid:project_id>/issues/<uuid:issue_id>/votes/",
-        IssueVotePublicViewSet.as_view(
-            {
-                "get": "list",
-                "post": "create",
-                "delete": "destroy",
-            }
-        ),
-        name="issue-vote-project-board",
-    ),
-    path(
-        "public/workspaces/<str:slug>/project-boards/",
-        WorkspaceProjectDeployBoardEndpoint.as_view(),
-        name="workspace-project-boards",
-    ),
-]

apiserver/plane/api/views/config.py

@@ -1,37 +0,0 @@
-# Python imports
-import os
-
-# Django imports
-from django.conf import settings
-
-# Third party imports
-from rest_framework.permissions import AllowAny
-from rest_framework import status
-from rest_framework.response import Response
-from sentry_sdk import capture_exception
-
-# Module imports
-from .base import BaseAPIView
-
-
-class ConfigurationEndpoint(BaseAPIView):
-    permission_classes = [
-        AllowAny,
-    ]
-
-    def get(self, request):
-        data = {}
-        data["google_client_id"] = os.environ.get("GOOGLE_CLIENT_ID", None)
-        data["github_client_id"] = os.environ.get("GITHUB_CLIENT_ID", None)
-        data["github_app_name"] = os.environ.get("GITHUB_APP_NAME", None)
-        data["magic_login"] = (
-            bool(settings.EMAIL_HOST_USER) and bool(settings.EMAIL_HOST_PASSWORD)
-        ) and os.environ.get("ENABLE_MAGIC_LINK_LOGIN", "0") == "1"
-        data["email_password_login"] = (
-            os.environ.get("ENABLE_EMAIL_PASSWORD", "0") == "1"
-        )
-        data["slack_client_id"] = os.environ.get("SLACK_CLIENT_ID", None)
-        data["posthog_api_key"] = os.environ.get("POSTHOG_API_KEY", None)
-        data["posthog_host"] = os.environ.get("POSTHOG_HOST", None)
-        data["has_unsplash_configured"] = bool(settings.UNSPLASH_ACCESS_KEY)
-        return Response(data, status=status.HTTP_200_OK)

apiserver/plane/api/views/page.py

@@ -1,255 +0,0 @@
-# Python imports
-from datetime import timedelta, date
-
-# Django imports
-from django.db.models import Exists, OuterRef, Q, Prefetch
-from django.utils import timezone
-
-# Third party imports
-from rest_framework import status
-from rest_framework.response import Response
-from sentry_sdk import capture_exception
-
-# Module imports
-from .base import BaseViewSet, BaseAPIView
-from plane.api.permissions import ProjectEntityPermission
-from plane.db.models import (
-    Page,
-    PageBlock,
-    PageFavorite,
-    Issue,
-    IssueAssignee,
-    IssueActivity,
-)
-from plane.api.serializers import (
-    PageSerializer,
-    PageBlockSerializer,
-    PageFavoriteSerializer,
-    IssueLiteSerializer,
-)
-
-
-class PageViewSet(BaseViewSet):
-    serializer_class = PageSerializer
-    model = Page
-    permission_classes = [
-        ProjectEntityPermission,
-    ]
-    search_fields = [
-        "name",
-    ]
-
-    def get_queryset(self):
-        subquery = PageFavorite.objects.filter(
-            user=self.request.user,
-            page_id=OuterRef("pk"),
-            project_id=self.kwargs.get("project_id"),
-            workspace__slug=self.kwargs.get("slug"),
-        )
-        return self.filter_queryset(
-            super()
-            .get_queryset()
-            .filter(workspace__slug=self.kwargs.get("slug"))
-            .filter(project_id=self.kwargs.get("project_id"))
-            .filter(project__project_projectmember__member=self.request.user)
-            .filter(Q(owned_by=self.request.user) | Q(access=0))
-            .select_related("project")
-            .select_related("workspace")
-            .select_related("owned_by")
-            .annotate(is_favorite=Exists(subquery))
-            .order_by(self.request.GET.get("order_by", "-created_at"))
-            .prefetch_related("labels")
-            .order_by("name", "-is_favorite")
-            .prefetch_related(
-                Prefetch(
-                    "blocks",
-                    queryset=PageBlock.objects.select_related(
-                        "page", "issue", "workspace", "project"
-                    ),
-                )
-            )
-            .distinct()
-        )
-
-    def perform_create(self, serializer):
-        serializer.save(
-            project_id=self.kwargs.get("project_id"), owned_by=self.request.user
-        )
-
-    def create(self, request, slug, project_id):
-        serializer = PageSerializer(
-            data=request.data,
-            context={"project_id": project_id, "owned_by_id": request.user.id},
-        )
-
-        if serializer.is_valid():
-            serializer.save()
-            return Response(serializer.data, status=status.HTTP_201_CREATED)
-        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
-
-    def partial_update(self, request, slug, project_id, pk):
-        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)
-        
-    def list(self, request, slug, project_id):
-        queryset = self.get_queryset()
-        page_view = request.GET.get("page_view", False)
-
-        if not page_view:
-            return Response({"error": "Page View parameter is required"}, status=status.HTTP_400_BAD_REQUEST)
-
-        # All Pages
-        if page_view == "all":
-            return Response(PageSerializer(queryset, many=True).data, status=status.HTTP_200_OK)
-
-        # Recent pages
-        if page_view == "recent":
-            current_time = date.today()
-            day_before = current_time - timedelta(days=1)
-            todays_pages = queryset.filter(updated_at__date=date.today())
-            yesterdays_pages = queryset.filter(updated_at__date=day_before)
-            earlier_this_week = queryset.filter(                    updated_at__date__range=(
-                    (timezone.now() - timedelta(days=7)),
-                    (timezone.now() - timedelta(days=2)),
-                ))
-            return Response(
-            {
-                "today": PageSerializer(todays_pages, many=True).data,
-                "yesterday": PageSerializer(yesterdays_pages, many=True).data,
-                "earlier_this_week": PageSerializer(earlier_this_week, many=True).data,
-            },
-            status=status.HTTP_200_OK,
-        )
-
-        # Favorite Pages
-        if page_view == "favorite":
-            queryset = queryset.filter(is_favorite=True)
-            return Response(PageSerializer(queryset, many=True).data, status=status.HTTP_200_OK)
-        
-        # My pages
-        if page_view == "created_by_me":
-            queryset = queryset.filter(owned_by=request.user)
-            return Response(PageSerializer(queryset, many=True).data, status=status.HTTP_200_OK)
-
-        # Created by other Pages
-        if page_view == "created_by_other":
-            queryset = queryset.filter(~Q(owned_by=request.user),  access=0)
-            return Response(PageSerializer(queryset, many=True).data, status=status.HTTP_200_OK)
-
-        return Response({"error": "No matching view found"}, status=status.HTTP_400_BAD_REQUEST)
-
-
-class PageBlockViewSet(BaseViewSet):
-    serializer_class = PageBlockSerializer
-    model = PageBlock
-    permission_classes = [
-        ProjectEntityPermission,
-    ]
-
-    def get_queryset(self):
-        return self.filter_queryset(
-            super()
-            .get_queryset()
-            .filter(workspace__slug=self.kwargs.get("slug"))
-            .filter(project_id=self.kwargs.get("project_id"))
-            .filter(page_id=self.kwargs.get("page_id"))
-            .filter(project__project_projectmember__member=self.request.user)
-            .select_related("project")
-            .select_related("workspace")
-            .select_related("page")
-            .select_related("issue")
-            .order_by("sort_order")
-            .distinct()
-        )
-
-    def perform_create(self, serializer):
-        serializer.save(
-            project_id=self.kwargs.get("project_id"),
-            page_id=self.kwargs.get("page_id"),
-        )
-
-
-class PageFavoriteViewSet(BaseViewSet):
-    permission_classes = [
-        ProjectEntityPermission,
-    ]
-
-    serializer_class = PageFavoriteSerializer
-    model = PageFavorite
-
-    def get_queryset(self):
-        return self.filter_queryset(
-            super()
-            .get_queryset()
-            .filter(workspace__slug=self.kwargs.get("slug"))
-            .filter(user=self.request.user)
-            .select_related("page", "page__owned_by")
-        )
-
-    def create(self, request, slug, project_id):
-        serializer = PageFavoriteSerializer(data=request.data)
-        if serializer.is_valid():
-            serializer.save(user=request.user, project_id=project_id)
-            return Response(serializer.data, status=status.HTTP_201_CREATED)
-        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
-
-    def destroy(self, request, slug, project_id, page_id):
-        page_favorite = PageFavorite.objects.get(
-            project=project_id,
-            user=request.user,
-            workspace__slug=slug,
-            page_id=page_id,
-        )
-        page_favorite.delete()
-        return Response(status=status.HTTP_204_NO_CONTENT)
-
-class CreateIssueFromPageBlockEndpoint(BaseAPIView):
-    permission_classes = [
-        ProjectEntityPermission,
-    ]
-
-    def post(self, request, slug, project_id, page_id, page_block_id):
-        page_block = PageBlock.objects.get(
-            pk=page_block_id,
-            workspace__slug=slug,
-            project_id=project_id,
-            page_id=page_id,
-        )
-        issue = Issue.objects.create(
-            name=page_block.name,
-            project_id=project_id,
-            description=page_block.description,
-            description_html=page_block.description_html,
-            description_stripped=page_block.description_stripped,
-        )
-        _ = IssueAssignee.objects.create(
-            issue=issue, assignee=request.user, project_id=project_id
-        )
-
-        _ = IssueActivity.objects.create(
-            issue=issue,
-            actor=request.user,
-            project_id=project_id,
-            comment=f"created the issue from {page_block.name} block",
-            verb="created",
-        )
-
-        page_block.issue = issue
-        page_block.save()
-
-        return Response(IssueLiteSerializer(issue).data, status=status.HTTP_200_OK)

apiserver/plane/app/apps.py

@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class AppConfig(AppConfig):
+    name = "plane.app"

apiserver/plane/app/serializers/__init__.py

@@ -85,7 +85,7 @@ from .integration import (
 
 from .importer import ImporterSerializer
 
-from .page import PageSerializer, PageBlockSerializer, PageFavoriteSerializer
+from .page import PageSerializer, PageLogSerializer, SubPageSerializer, PageFavoriteSerializer
 
 from .estimate import (
     EstimateSerializer,

apiserver/plane/app/serializers/estimate.py

@@ -2,7 +2,7 @@
 from .base import BaseSerializer
 
 from plane.db.models import Estimate, EstimatePoint
-from plane.api.serializers import WorkspaceLiteSerializer, ProjectLiteSerializer
+from plane.app.serializers import WorkspaceLiteSerializer, ProjectLiteSerializer
 
 
 class EstimateSerializer(BaseSerializer):

apiserver/plane/app/serializers/integration/base.py

@@ -1,5 +1,5 @@
 # Module imports
-from plane.api.serializers import BaseSerializer
+from plane.app.serializers import BaseSerializer
 from plane.db.models import Integration, WorkspaceIntegration
 
 

apiserver/plane/app/serializers/integration/github.py

@@ -1,5 +1,5 @@
 # Module imports
-from plane.api.serializers import BaseSerializer
+from plane.app.serializers import BaseSerializer
 from plane.db.models import (
     GithubIssueSync,
     GithubRepository,

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

@@ -1,5 +1,5 @@
 # Module imports
-from plane.api.serializers import BaseSerializer
+from plane.app.serializers import BaseSerializer
 from plane.db.models import SlackProjectSync
 
 

apiserver/plane/app/serializers/issue.py

@@ -505,7 +505,7 @@ class IssueStateFlatSerializer(BaseSerializer):
 
 
 # Issue Serializer with state details
-class IssueStateSerializer(BaseSerializer):
+class IssueStateSerializer(DynamicBaseSerializer):
     label_details = LabelLiteSerializer(read_only=True, source="labels", many=True)
     state_detail = StateLiteSerializer(read_only=True, source="state")
     project_detail = ProjectLiteSerializer(read_only=True, source="project")

apiserver/plane/app/serializers/page.py

@@ -6,28 +6,7 @@ from .base import BaseSerializer
 from .issue import IssueFlatSerializer, LabelLiteSerializer
 from .workspace import WorkspaceLiteSerializer
 from .project import ProjectLiteSerializer
-from plane.db.models import Page, PageBlock, PageFavorite, PageLabel, Label
-
-
-class PageBlockSerializer(BaseSerializer):
-    issue_detail = IssueFlatSerializer(source="issue", read_only=True)
-    project_detail = ProjectLiteSerializer(source="project", read_only=True)
-    workspace_detail = WorkspaceLiteSerializer(source="workspace", read_only=True)
-
-    class Meta:
-        model = PageBlock
-        fields = "__all__"
-        read_only_fields = [
-            "workspace",
-            "project",
-            "page",
-        ]
-
-class PageBlockLiteSerializer(BaseSerializer):
-
-    class Meta:
-        model = PageBlock
-        fields = "__all__"
+from plane.db.models import Page, PageLog, PageFavorite, PageLabel, Label, Issue, Module
 
 
 class PageSerializer(BaseSerializer):
@@ -38,7 +17,6 @@ class PageSerializer(BaseSerializer):
         write_only=True,
         required=False,
     )
-    blocks = PageBlockLiteSerializer(read_only=True, many=True)
     project_detail = ProjectLiteSerializer(source="project", read_only=True)
     workspace_detail = WorkspaceLiteSerializer(source="workspace", read_only=True)
 
@@ -102,6 +80,41 @@ class PageSerializer(BaseSerializer):
         return super().update(instance, validated_data)
 
 
+class SubPageSerializer(BaseSerializer):
+    entity_details = serializers.SerializerMethodField()
+
+    class Meta:
+        model = PageLog
+        fields = "__all__"
+        read_only_fields = [
+            "workspace",
+            "project",
+            "page",
+        ]
+
+    def get_entity_details(self, obj):
+        entity_name = obj.entity_name
+        if entity_name == 'forward_link' or entity_name == 'back_link':
+            try:
+                page = Page.objects.get(pk=obj.entity_identifier)
+                return PageSerializer(page).data
+            except Page.DoesNotExist:
+                return None
+        return None
+
+
+class PageLogSerializer(BaseSerializer):
+
+    class Meta:
+        model = PageLog
+        fields = "__all__"
+        read_only_fields = [
+            "workspace",
+            "project",
+            "page",
+        ]
+
+
 class PageFavoriteSerializer(BaseSerializer):
     page_detail = PageSerializer(source="page", read_only=True)
 

apiserver/plane/app/serializers/project.py

@@ -3,8 +3,8 @@ from rest_framework import serializers
 
 # Module imports
 from .base import BaseSerializer, DynamicBaseSerializer
-from plane.api.serializers.workspace import WorkSpaceSerializer, WorkspaceLiteSerializer
-from plane.api.serializers.user import UserLiteSerializer, UserAdminLiteSerializer
+from plane.app.serializers.workspace import WorkspaceLiteSerializer
+from plane.app.serializers.user import UserLiteSerializer, UserAdminLiteSerializer
 from plane.db.models import (
     Project,
     ProjectMember,

apiserver/plane/app/serializers/state.py

@@ -1,7 +1,6 @@
 # Module imports
 from .base import BaseSerializer
-from .workspace import WorkspaceLiteSerializer
-from .project import ProjectLiteSerializer
+
 
 from plane.db.models import State
 

apiserver/plane/app/serializers/user.py

@@ -4,6 +4,7 @@ from rest_framework import serializers
 # Module import
 from .base import BaseSerializer
 from plane.db.models import User, Workspace, WorkspaceMemberInvite
+from plane.license.models import InstanceAdmin, Instance
 
 
 class UserSerializer(BaseSerializer):
@@ -86,7 +87,9 @@ class UserMeSettingsSerializer(BaseSerializer):
                 "last_workspace_id": obj.last_workspace_id,
                 "last_workspace_slug": workspace.slug if workspace is not None else "",
                 "fallback_workspace_id": obj.last_workspace_id,
-                "fallback_workspace_slug": workspace.slug if workspace is not None else "",
+                "fallback_workspace_slug": workspace.slug
+                if workspace is not None
+                else "",
                 "invites": workspace_invites,
             }
         else:

apiserver/plane/app/urls/__init__.py

@@ -13,7 +13,6 @@ from .module import urlpatterns as module_urls
 from .notification import urlpatterns as notification_urls
 from .page import urlpatterns as page_urls
 from .project import urlpatterns as project_urls
-from .public_board import urlpatterns as public_board_urls
 from .search import urlpatterns as search_urls
 from .state import urlpatterns as state_urls
 from .user import urlpatterns as user_urls
@@ -23,10 +22,6 @@ from .api import urlpatterns as api_urls
 from .webhook import urlpatterns as webhook_urls
 
 
-# Django imports
-from django.conf import settings
-
-
 urlpatterns = [
     *analytic_urls,
     *asset_urls,
@@ -43,16 +38,11 @@ urlpatterns = [
     *notification_urls,
     *page_urls,
     *project_urls,
-    *public_board_urls,
     *search_urls,
     *state_urls,
     *user_urls,
     *view_urls,
     *workspace_urls,
+    *api_urls,
+    *webhook_urls,
 ]
-
-if settings.ENABLE_WEBHOOK:
-    urlpatterns += webhook_urls
-
-if settings.ENABLE_API:
-    urlpatterns += api_urls

apiserver/plane/app/urls/analytic.py

@@ -1,7 +1,7 @@
 from django.urls import path
 
 
-from plane.api.views import (
+from plane.app.views import (
     AnalyticsEndpoint,
     AnalyticViewViewset,
     SavedAnalyticEndpoint,

apiserver/plane/app/urls/api.py

@@ -1,5 +1,5 @@
 from django.urls import path
-from plane.api.views import ApiTokenEndpoint
+from plane.app.views import ApiTokenEndpoint
 
 urlpatterns = [
     # API Tokens

apiserver/plane/app/urls/asset.py

@@ -1,7 +1,7 @@
 from django.urls import path
 
 
-from plane.api.views import (
+from plane.app.views import (
     FileAssetEndpoint,
     UserAssetsEndpoint,
 )

apiserver/plane/app/urls/authentication.py

@@ -3,7 +3,7 @@ from django.urls import path
 from rest_framework_simplejwt.views import TokenRefreshView
 
 
-from plane.api.views import (
+from plane.app.views import (
     # Authentication
     SignUpEndpoint,
     SignInEndpoint,

apiserver/plane/app/urls/config.py

@@ -1,7 +1,7 @@
 from django.urls import path
 
 
-from plane.api.views import ConfigurationEndpoint
+from plane.app.views import ConfigurationEndpoint
 
 urlpatterns = [
     path(

apiserver/plane/app/urls/cycle.py

@@ -1,12 +1,13 @@
 from django.urls import path
 
 
-from plane.api.views import (
+from plane.app.views import (
     CycleViewSet,
     CycleIssueViewSet,
     CycleDateCheckEndpoint,
     CycleFavoriteViewSet,
     TransferCycleIssueEndpoint,
+    CycleIssueGroupedEndpoint,
 )
 
 
@@ -43,6 +44,11 @@ urlpatterns = [
         ),
         name="project-issue-cycle",
     ),
+    path(
+        "v3/workspaces/<str:slug>/projects/<uuid:project_id>/cycles/<uuid:cycle_id>/cycle-issues/",
+        CycleIssueGroupedEndpoint.as_view(),
+        name="project-issue-cycle",
+    ),
     path(
         "workspaces/<str:slug>/projects/<uuid:project_id>/cycles/<uuid:cycle_id>/cycle-issues/<uuid:pk>/",
         CycleIssueViewSet.as_view(

apiserver/plane/app/urls/estimate.py

@@ -1,7 +1,7 @@
 from django.urls import path
 
 
-from plane.api.views import (
+from plane.app.views import (
     ProjectEstimatePointEndpoint,
     BulkEstimatePointEndpoint,
 )

apiserver/plane/app/urls/external.py

@@ -1,9 +1,9 @@
 from django.urls import path
 
 
-from plane.api.views import UnsplashEndpoint
-from plane.api.views import ReleaseNotesEndpoint
-from plane.api.views import GPTIntegrationEndpoint
+from plane.app.views import UnsplashEndpoint
+from plane.app.views import ReleaseNotesEndpoint
+from plane.app.views import GPTIntegrationEndpoint
 
 
 urlpatterns = [

apiserver/plane/app/urls/importer.py

@@ -1,7 +1,7 @@
 from django.urls import path
 
 
-from plane.api.views import (
+from plane.app.views import (
     ServiceIssueImportSummaryEndpoint,
     ImportServiceEndpoint,
     UpdateServiceImportStatusEndpoint,

apiserver/plane/app/urls/inbox.py

@@ -1,7 +1,7 @@
 from django.urls import path
 
 
-from plane.api.views import (
+from plane.app.views import (
     InboxViewSet,
     InboxIssueViewSet,
 )

apiserver/plane/app/urls/integration.py

@@ -1,7 +1,7 @@
 from django.urls import path
 
 
-from plane.api.views import (
+from plane.app.views import (
     IntegrationViewSet,
     WorkspaceIntegrationViewSet,
     GithubRepositoriesEndpoint,

apiserver/plane/app/urls/issue.py

@@ -1,7 +1,7 @@
 from django.urls import path
 
 
-from plane.api.views import (
+from plane.app.views import (
     IssueViewSet,
     IssueListEndpoint,
     IssueListGroupedEndpoint,

apiserver/plane/app/urls/module.py

@@ -1,12 +1,13 @@
 from django.urls import path
 
 
-from plane.api.views import (
+from plane.app.views import (
     ModuleViewSet,
     ModuleIssueViewSet,
     ModuleLinkViewSet,
     ModuleFavoriteViewSet,
     BulkImportModulesEndpoint,
+    ModuleIssueGroupedEndpoint,
 )
 
 
@@ -43,6 +44,11 @@ urlpatterns = [
         ),
         name="project-module-issues",
     ),
+    path(
+        "v3/workspaces/<str:slug>/projects/<uuid:project_id>/modules/<uuid:module_id>/module-issues/",
+        ModuleIssueGroupedEndpoint.as_view(),
+        name="project-issue-cycle",
+    ),
     path(
         "workspaces/<str:slug>/projects/<uuid:project_id>/modules/<uuid:module_id>/module-issues/<uuid:pk>/",
         ModuleIssueViewSet.as_view(

apiserver/plane/app/urls/notification.py

@@ -1,7 +1,7 @@
 from django.urls import path
 
 
-from plane.api.views import (
+from plane.app.views import (
     NotificationViewSet,
     UnreadNotificationEndpoint,
     MarkAllReadNotificationViewSet,

apiserver/plane/app/urls/page.py

@@ -0,0 +1,133 @@
+from django.urls import path
+
+
+from plane.app.views import (
+    PageViewSet,
+    PageFavoriteViewSet,
+    PageLogEndpoint,
+    SubPagesEndpoint,
+)
+
+
+urlpatterns = [
+    path(
+        "workspaces/<str:slug>/projects/<uuid:project_id>/pages/",
+        PageViewSet.as_view(
+            {
+                "get": "list",
+                "post": "create",
+            }
+        ),
+        name="project-pages",
+    ),
+    path(
+        "workspaces/<str:slug>/projects/<uuid:project_id>/pages/<uuid:pk>/",
+        PageViewSet.as_view(
+            {
+                "get": "retrieve",
+                "patch": "partial_update",
+                "delete": "destroy",
+            }
+        ),
+        name="project-pages",
+    ),
+    path(
+        "workspaces/<str:slug>/projects/<uuid:project_id>/user-favorite-pages/",
+        PageFavoriteViewSet.as_view(
+            {
+                "get": "list",
+                "post": "create",
+            }
+        ),
+        name="user-favorite-pages",
+    ),
+    path(
+        "workspaces/<str:slug>/projects/<uuid:project_id>/user-favorite-pages/<uuid:page_id>/",
+        PageFavoriteViewSet.as_view(
+            {
+                "delete": "destroy",
+            }
+        ),
+        name="user-favorite-pages",
+    ),
+    path(
+        "workspaces/<str:slug>/projects/<uuid:project_id>/pages/",
+        PageViewSet.as_view(
+            {
+                "get": "list",
+                "post": "create",
+            }
+        ),
+        name="project-pages",
+    ),
+    path(
+        "workspaces/<str:slug>/projects/<uuid:project_id>/pages/<uuid:pk>/",
+        PageViewSet.as_view(
+            {
+                "get": "retrieve",
+                "patch": "partial_update",
+                "delete": "destroy",
+            }
+        ),
+        name="project-pages",
+    ),
+    path(
+        "workspaces/<str:slug>/projects/<uuid:project_id>/pages/<uuid:page_id>/archive/",
+        PageViewSet.as_view(
+            {
+                "post": "archive",
+            }
+        ),
+        name="project-page-archive",
+    ),
+    path(
+        "workspaces/<str:slug>/projects/<uuid:project_id>/pages/<uuid:page_id>/unarchive/",
+        PageViewSet.as_view(
+            {
+                "post": "unarchive",
+            }
+        ),
+        name="project-page-unarchive",
+    ),
+    path(
+        "workspaces/<str:slug>/projects/<uuid:project_id>/archived-pages/",
+        PageViewSet.as_view(
+            {
+                "get": "archive_list",
+            }
+        ),
+        name="project-pages",
+    ),
+    path(
+        "workspaces/<str:slug>/projects/<uuid:project_id>/pages/<uuid:page_id>/lock/",
+        PageViewSet.as_view(
+            {
+                "post": "lock",
+            }
+        ),
+        name="project-pages",
+    ),
+    path(
+        "workspaces/<str:slug>/projects/<uuid:project_id>/pages/<uuid:page_id>/unlock/",
+        PageViewSet.as_view(
+            {
+                "post": "unlock",
+            }
+        ),
+    ),
+    path(
+        "workspaces/<str:slug>/projects/<uuid:project_id>/pages/<uuid:page_id>/transactions/",
+        PageLogEndpoint.as_view(),
+        name="page-transactions",
+    ),
+    path(
+        "workspaces/<str:slug>/projects/<uuid:project_id>/pages/<uuid:page_id>/transactions/<uuid:transaction>/",
+        PageLogEndpoint.as_view(),
+        name="page-transactions",
+    ),
+    path(
+        "workspaces/<str:slug>/projects/<uuid:project_id>/pages/<uuid:page_id>/sub-pages/",
+        SubPagesEndpoint.as_view(),
+        name="sub-page",
+    ),
+]

apiserver/plane/app/urls/project.py

@@ -1,6 +1,6 @@
 from django.urls import path
 
-from plane.api.views import (
+from plane.app.views import (
     ProjectViewSet,
     ProjectInvitationsViewset,
     ProjectMemberViewSet,
@@ -10,8 +10,9 @@ from plane.api.views import (
     ProjectUserViewsEndpoint,
     ProjectIdentifierEndpoint,
     ProjectFavoritesViewSet,
-    ProjectPublicCoverImagesEndpoint,
     UserProjectInvitationsViewset,
+    ProjectPublicCoverImagesEndpoint,
+    ProjectDeployBoardViewSet,
 )
 
 
@@ -147,4 +148,25 @@ urlpatterns = [
         ProjectPublicCoverImagesEndpoint.as_view(),
         name="project-covers",
     ),
+    path(
+        "workspaces/<str:slug>/projects/<uuid:project_id>/project-deploy-boards/",
+        ProjectDeployBoardViewSet.as_view(
+            {
+                "get": "list",
+                "post": "create",
+            }
+        ),
+        name="project-deploy-board",
+    ),
+    path(
+        "workspaces/<str:slug>/projects/<uuid:project_id>/project-deploy-boards/<uuid:pk>/",
+        ProjectDeployBoardViewSet.as_view(
+            {
+                "get": "retrieve",
+                "patch": "partial_update",
+                "delete": "destroy",
+            }
+        ),
+        name="project-deploy-board",
+    ),
 ]

apiserver/plane/app/urls/search.py

@@ -1,7 +1,7 @@
 from django.urls import path
 
 
-from plane.api.views import (
+from plane.app.views import (
     GlobalSearchEndpoint,
     IssueSearchEndpoint,
 )

apiserver/plane/app/urls/state.py

@@ -1,7 +1,7 @@
 from django.urls import path
 
 
-from plane.api.views import StateViewSet
+from plane.app.views import StateViewSet
 
 
 urlpatterns = [

apiserver/plane/app/urls/user.py

@@ -1,6 +1,6 @@
 from django.urls import path
 
-from plane.api.views import (
+from plane.app.views import (
     ## User
     UserEndpoint,
     UpdateUserOnBoardedEndpoint,
@@ -38,6 +38,15 @@ urlpatterns = [
         ),
         name="users",
     ),
+    path(
+        "users/me/instance-admin/",
+        UserEndpoint.as_view(
+            {
+                "get": "retrieve_instance_admin",
+            }
+        ),
+        name="users",
+    ),
     path(
         "users/me/change-password/",
         ChangePasswordEndpoint.as_view(),

apiserver/plane/app/urls/views.py

@@ -1,7 +1,7 @@
 from django.urls import path
 
 
-from plane.api.views import (
+from plane.app.views import (
     IssueViewViewSet,
     GlobalViewViewSet,
     GlobalViewIssuesViewSet,

apiserver/plane/app/urls/webhook.py

@@ -1,6 +1,6 @@
 from django.urls import path
 
-from plane.api.views import (
+from plane.app.views import (
     WebhookEndpoint,
     WebhookLogsEndpoint,
     WebhookSecretRegenerateEndpoint,

apiserver/plane/app/urls/workspace.py

@@ -1,7 +1,7 @@
 from django.urls import path
 
 
-from plane.api.views import (
+from plane.app.views import (
     UserWorkspaceInvitationsViewSet,
     WorkSpaceViewSet,
     WorkspaceJoinEndpoint,

apiserver/plane/app/urls_deprecated.py

@@ -4,7 +4,7 @@ from rest_framework_simplejwt.views import TokenRefreshView
 
 # Create your urls here.
 
-from plane.api.views import (
+from plane.app.views import (
     # Authentication
     SignUpEndpoint,
     SignInEndpoint,
@@ -124,9 +124,10 @@ from plane.api.views import (
     ## End Modules
     # Pages
     PageViewSet,
-    PageBlockViewSet,
+    PageLogEndpoint,
+    SubPagesEndpoint,
     PageFavoriteViewSet,
-    CreateIssueFromPageBlockEndpoint,
+    CreateIssueFromBlockEndpoint,
     ## End Pages
     # Api Tokens
     ApiTokenEndpoint,
@@ -1222,25 +1223,81 @@ urlpatterns = [
         name="project-pages",
     ),
     path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/pages/<uuid:page_id>/page-blocks/",
-        PageBlockViewSet.as_view(
+        "workspaces/<str:slug>/projects/<uuid:project_id>/pages/<uuid:page_id>/archive/",
+        PageViewSet.as_view(
+            {
+                "post": "archive",
+            }
+        ),
+        name="project-page-archive",
+    ),
+    path(
+        "workspaces/<str:slug>/projects/<uuid:project_id>/pages/<uuid:page_id>/unarchive/",
+        PageViewSet.as_view(
+            {
+                "post": "unarchive",
+            }
+        ),
+        name="project-page-unarchive"
+    ),
+    path(
+        "workspaces/<str:slug>/projects/<uuid:project_id>/archived-pages/",
+        PageViewSet.as_view(
+            {
+                "get": "archive_list",
+            }
+        ),
+        name="project-pages",
+    ),
+    path(
+        "workspaces/<str:slug>/projects/<uuid:project_id>/pages/<uuid:page_id>/lock/",
+        PageViewSet.as_view(
+            {
+                "post": "lock",
+            }
+        ),
+        name="project-pages",
+    ),
+    path(
+        "workspaces/<str:slug>/projects/<uuid:project_id>/pages/<uuid:page_id>/unlock/",
+        PageViewSet.as_view(
+            {
+                "post": "unlock",
+            }
+        )
+    ),
+    path(
+        "workspaces/<str:slug>/projects/<uuid:project_id>/pages/<uuid:page_id>/transactions/",
+        PageLogEndpoint.as_view(), name="page-transactions"
+    ),
+    path(
+        "workspaces/<str:slug>/projects/<uuid:project_id>/pages/<uuid:page_id>/transactions/<uuid:transaction>/",
+        PageLogEndpoint.as_view(), name="page-transactions"
+    ),
+    path(
+        "workspaces/<str:slug>/projects/<uuid:project_id>/pages/<uuid:page_id>/sub-pages/",
+          SubPagesEndpoint.as_view(), name="sub-page"
+    ),
+    path(
+        "workspaces/<str:slug>/projects/<uuid:project_id>/estimates/",
+        BulkEstimatePointEndpoint.as_view(
             {
                 "get": "list",
                 "post": "create",
             }
         ),
-        name="project-page-blocks",
+        name="bulk-create-estimate-points",
     ),
     path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/pages/<uuid:page_id>/page-blocks/<uuid:pk>/",
-        PageBlockViewSet.as_view(
+        "workspaces/<str:slug>/projects/<uuid:project_id>/estimates/<uuid:estimate_id>/",
+        BulkEstimatePointEndpoint.as_view(
             {
                 "get": "retrieve",
                 "patch": "partial_update",
                 "delete": "destroy",
             }
         ),
-        name="project-page-blocks",
+        name="bulk-create-estimate-points",
     ),
     path(
         "workspaces/<str:slug>/projects/<uuid:project_id>/user-favorite-pages/",
@@ -1263,7 +1320,7 @@ urlpatterns = [
     ),
     path(
         "workspaces/<str:slug>/projects/<uuid:project_id>/pages/<uuid:page_id>/page-blocks/<uuid:page_block_id>/issues/",
-        CreateIssueFromPageBlockEndpoint.as_view(),
+        CreateIssueFromBlockEndpoint.as_view(),
         name="page-block-issues",
     ),
     ## End Pages

apiserver/plane/app/views/__init__.py

@@ -9,10 +9,8 @@ from .project import (
     ProjectUserViewsEndpoint,
     ProjectMemberUserEndpoint,
     ProjectFavoritesViewSet,
-    ProjectDeployBoardViewSet,
-    ProjectDeployBoardPublicSettingsEndpoint,
-    WorkspaceProjectDeployBoardEndpoint,
     ProjectPublicCoverImagesEndpoint,
+    ProjectDeployBoardViewSet,
 )
 from .user import (
     UserEndpoint,
@@ -60,6 +58,7 @@ from .cycle import (
     CycleDateCheckEndpoint,
     CycleFavoriteViewSet,
     TransferCycleIssueEndpoint,
+    CycleIssueGroupedEndpoint,
 )
 from .asset import FileAssetEndpoint, UserAssetsEndpoint
 from .issue import (
@@ -79,15 +78,9 @@ from .issue import (
     IssueAttachmentEndpoint,
     IssueArchiveViewSet,
     IssueSubscriberViewSet,
-    IssueCommentPublicViewSet,
     CommentReactionViewSet,
     IssueReactionViewSet,
-    IssueReactionPublicViewSet,
-    CommentReactionPublicViewSet,
-    IssueVotePublicViewSet,
     IssueRelationViewSet,
-    IssueRetrievePublicEndpoint,
-    ProjectIssuesPublicEndpoint,
     IssueDraftViewSet,
 )
 
@@ -113,6 +106,7 @@ from .module import (
     ModuleIssueViewSet,
     ModuleLinkViewSet,
     ModuleFavoriteViewSet,
+    ModuleIssueGroupedEndpoint,
 )
 
 from .api import ApiTokenEndpoint
@@ -138,9 +132,10 @@ from .importer import (
 
 from .page import (
     PageViewSet,
-    PageBlockViewSet,
     PageFavoriteViewSet,
-    CreateIssueFromPageBlockEndpoint,
+    PageLogEndpoint,
+    SubPagesEndpoint,
+    CreateIssueFromBlockEndpoint,
 )
 
 from .search import GlobalSearchEndpoint, IssueSearchEndpoint
@@ -153,7 +148,7 @@ from .estimate import (
     BulkEstimatePointEndpoint,
 )
 
-from .inbox import InboxViewSet, InboxIssueViewSet, InboxIssuePublicViewSet
+from .inbox import InboxViewSet, InboxIssueViewSet
 
 from .analytic import (
     AnalyticsEndpoint,

apiserver/plane/app/views/analytic.py

@@ -5,13 +5,12 @@ 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.app.views import BaseAPIView, BaseViewSet
+from plane.app.permissions import WorkSpaceAdminPermission
 from plane.db.models import Issue, AnalyticView, Workspace, State, Label
-from plane.api.serializers import AnalyticViewSerializer
+from plane.app.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

apiserver/plane/app/views/api.py

@@ -8,8 +8,8 @@ from rest_framework import status
 # Module import
 from .base import BaseAPIView
 from plane.db.models import APIToken, Workspace
-from plane.api.serializers import APITokenSerializer, APITokenReadSerializer
-from plane.api.permissions import WorkspaceOwnerPermission
+from plane.app.serializers import APITokenSerializer, APITokenReadSerializer
+from plane.app.permissions import WorkspaceOwnerPermission
 
 
 class ApiTokenEndpoint(BaseAPIView):

apiserver/plane/app/views/asset.py

@@ -2,12 +2,11 @@
 from rest_framework import status
 from rest_framework.response import Response
 from rest_framework.parsers import MultiPartParser, FormParser
-from sentry_sdk import capture_exception
-from django.conf import settings
+
 # Module imports
 from .base import BaseAPIView
 from plane.db.models import FileAsset, Workspace
-from plane.api.serializers import FileAssetSerializer
+from plane.app.serializers import FileAssetSerializer
 
 
 class FileAssetEndpoint(BaseAPIView):

apiserver/plane/app/views/auth_extended.py

@@ -21,7 +21,7 @@ from sentry_sdk import capture_exception
 
 ## Module imports
 from . import BaseAPIView
-from plane.api.serializers import (
+from plane.app.serializers import (
     ChangePasswordSerializer,
     ResetPasswordSerializer,
 )

apiserver/plane/app/views/authentication.py

@@ -5,6 +5,7 @@ import string
 import json
 import requests
 from requests.exceptions import RequestException
+
 # Django imports
 from django.utils import timezone
 from django.core.exceptions import ValidationError
@@ -320,11 +321,11 @@ class SignInEndpoint(BaseAPIView):
         except RequestException as e:
             capture_exception(e)
 
+        access_token, refresh_token = get_tokens_for_user(user)
         data = {
             "access_token": access_token,
             "refresh_token": refresh_token,
         }
-        access_token, refresh_token = get_tokens_for_user(user)
         return Response(data, status=status.HTTP_200_OK)
 
 

apiserver/plane/app/views/base.py

@@ -0,0 +1,260 @@
+# Python imports
+import zoneinfo
+import json
+
+# Django imports
+from django.urls import resolve
+from django.conf import settings
+from django.utils import timezone
+from django.db import IntegrityError
+from django.core.exceptions import ObjectDoesNotExist, ValidationError
+from django.core.serializers.json import DjangoJSONEncoder
+
+# Third part imports
+from rest_framework import status
+from rest_framework import status
+from rest_framework.viewsets import ModelViewSet
+from rest_framework.response import Response
+from rest_framework.exceptions import APIException
+from rest_framework.views import APIView
+from rest_framework.filters import SearchFilter
+from rest_framework.permissions import IsAuthenticated
+from sentry_sdk import capture_exception
+from django_filters.rest_framework import DjangoFilterBackend
+
+# Module imports
+from plane.utils.paginator import BasePaginator
+from plane.bgtasks.webhook_task import send_webhook
+from plane.bgtasks.track_events import track_event
+
+class TimezoneMixin:
+    """
+    This enables timezone conversion according
+    to the user set timezone
+    """
+
+    def initial(self, request, *args, **kwargs):
+        super().initial(request, *args, **kwargs)
+        if request.user.is_authenticated:
+            timezone.activate(zoneinfo.ZoneInfo(request.user.user_timezone))
+        else:
+            timezone.deactivate()
+
+
+class WebhookMixin:
+    webhook_event = None
+
+    def initial_request(self, request, response, *args, **kwargs):
+        response = super().initial_request(request, response, *args, **kwargs)
+
+        if (
+            self.webhook_event
+            and self.request.method in ["POST", "PATCH", "DELETE"]
+            and response.status_code in [200, 201, 204]
+        ):
+            send_webhook.delay(
+                event=self.webhook_event,
+                event_data=json.dumps(response.data, cls=DjangoJSONEncoder),
+                action=self.request.method,
+                slug=self.workspace_slug,
+            )
+
+        return response
+
+
+class AnalyticsMixin:
+    analytic_event = None
+    print("did it come here or not")
+
+    def initial(self, request, *args, **kwargs):
+        super().initial(request, *args, **kwargs)
+        print("hieieie")
+        print(self.workspace_slug,"workspace_slug")
+        # if (
+        #     self.analytic_event
+        #     and self.request.method in ["POST", "PATCH", "DELETE"]
+        #     and response.status_code in [200, 201, 204]
+        # ):
+        #     print(self.workspace_slug,"workspace_slug")
+        #     track_event.delay(
+        #         event_name=self.analytic_event,
+        #         slug=self.workspace_slug,
+        #         project_id=self.project_id,
+        #         user_id=self.request.user.id,
+        #     )
+
+        # return response
+    
+
+class BaseViewSet(TimezoneMixin, ModelViewSet, BasePaginator):
+    model = None
+
+    permission_classes = [
+        IsAuthenticated,
+    ]
+
+    filter_backends = (
+        DjangoFilterBackend,
+        SearchFilter,
+    )
+
+    filterset_fields = []
+
+    search_fields = []
+
+    def get_queryset(self):
+        try:
+            return self.model.objects.all()
+        except Exception as e:
+            capture_exception(e)
+            raise APIException("Please check the view", status.HTTP_400_BAD_REQUEST)
+
+    def handle_exception(self, exc):
+        """
+        Handle any exception that occurs, by returning an appropriate response,
+        or re-raising the error.
+        """
+        try:
+            response = super().handle_exception(exc)
+            return response
+        except Exception as e:
+            if isinstance(e, IntegrityError):
+                return Response(
+                    {"error": "The payload is not valid"},
+                    status=status.HTTP_400_BAD_REQUEST,
+                )
+
+            if isinstance(e, ValidationError):
+                return Response(
+                    {"error": "Please provide valid detail"},
+                    status=status.HTTP_400_BAD_REQUEST,
+                )
+
+            if isinstance(e, ObjectDoesNotExist):
+                model_name = str(exc).split(" matching query does not exist.")[0]
+                return Response(
+                    {"error": f"{model_name} does not exist."},
+                    status=status.HTTP_404_NOT_FOUND,
+                )
+
+            if isinstance(e, KeyError):
+                capture_exception(e)
+                return Response(
+                    {"error": f"key {e} does not exist"},
+                    status=status.HTTP_400_BAD_REQUEST,
+                )
+            
+            print(e) if settings.DEBUG else print("Server Error")
+            capture_exception(e)
+            return Response({"error": "Something went wrong please try again later"}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+
+    def dispatch(self, request, *args, **kwargs):
+        try:
+            response = super().dispatch(request, *args, **kwargs)
+
+            if settings.DEBUG:
+                from django.db import connection
+
+                print(
+                    f"{request.method} - {request.get_full_path()} of Queries: {len(connection.queries)}"
+                )
+
+            return response
+        except Exception as exc:
+            response = self.handle_exception(exc)
+            return exc
+
+    @property
+    def workspace_slug(self):
+        return self.kwargs.get("slug", None)
+
+    @property
+    def project_id(self):
+        project_id = self.kwargs.get("project_id", None)
+        if project_id:
+            return project_id
+
+        if resolve(self.request.path_info).url_name == "project":
+            return self.kwargs.get("pk", None)
+
+
+class BaseAPIView(TimezoneMixin, APIView, BasePaginator):
+    permission_classes = [
+        IsAuthenticated,
+    ]
+
+    filter_backends = (
+        DjangoFilterBackend,
+        SearchFilter,
+    )
+
+    filterset_fields = []
+
+    search_fields = []
+
+    def filter_queryset(self, queryset):
+        for backend in list(self.filter_backends):
+            queryset = backend().filter_queryset(self.request, queryset, self)
+        return queryset
+
+    def handle_exception(self, exc):
+        """
+        Handle any exception that occurs, by returning an appropriate response,
+        or re-raising the error.
+        """
+        try:
+            response = super().handle_exception(exc)
+            return response
+        except Exception as e:
+            if isinstance(e, IntegrityError):
+                return Response(
+                    {"error": "The payload is not valid"},
+                    status=status.HTTP_400_BAD_REQUEST,
+                )
+
+            if isinstance(e, ValidationError):
+                return Response(
+                    {"error": "Please provide valid detail"},
+                    status=status.HTTP_400_BAD_REQUEST,
+                )
+
+            if isinstance(e, ObjectDoesNotExist):
+                model_name = str(exc).split(" matching query does not exist.")[0]
+                return Response(
+                    {"error": f"{model_name} does not exist."},
+                    status=status.HTTP_404_NOT_FOUND,
+                )
+            
+            if isinstance(e, KeyError):
+                return Response({"error": f"key {e} does not exist"}, status=status.HTTP_400_BAD_REQUEST)
+
+            if settings.DEBUG:
+                print(e)
+            capture_exception(e)
+            return Response({"error": "Something went wrong please try again later"}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+
+    def dispatch(self, request, *args, **kwargs):
+        try:
+            response = super().dispatch(request, *args, **kwargs)
+
+            if settings.DEBUG:
+                from django.db import connection
+
+                print(
+                    f"{request.method} - {request.get_full_path()} of Queries: {len(connection.queries)}"
+                )
+            return response
+
+        except Exception as exc:
+            response = self.handle_exception(exc)
+            return exc
+
+    @property
+    def workspace_slug(self):
+        return self.kwargs.get("slug", None)
+
+    @property
+    def project_id(self):
+        return self.kwargs.get("project_id", None)

apiserver/plane/app/views/config.py

@@ -0,0 +1,95 @@
+# Python imports
+import os
+
+# Django imports
+from django.conf import settings
+
+# Third party imports
+from rest_framework.permissions import AllowAny
+from rest_framework import status
+from rest_framework.response import Response
+
+# Module imports
+from .base import BaseAPIView
+from plane.license.models import Instance, InstanceConfiguration
+from plane.license.utils.instance_value import get_configuration_value
+
+
+class ConfigurationEndpoint(BaseAPIView):
+    permission_classes = [
+        AllowAny,
+    ]
+
+    def get(self, request):
+        instance_configuration = InstanceConfiguration.objects.values("key", "value")
+
+        data = {}
+        # Authentication
+        data["google_client_id"] = get_configuration_value(
+            instance_configuration,
+            "GOOGLE_CLIENT_ID",
+            os.environ.get("GOOGLE_CLIENT_ID", None),
+        )
+        data["github_client_id"] = get_configuration_value(
+            instance_configuration,
+            "GITHUB_CLIENT_ID",
+            os.environ.get("GITHUB_CLIENT_ID", None),
+        )
+        data["github_app_name"] = get_configuration_value(
+            instance_configuration,
+            "GITHUB_APP_NAME",
+            os.environ.get("GITHUB_APP_NAME", None),
+        )
+        data["magic_login"] = (
+            bool(
+                get_configuration_value(
+                    instance_configuration,
+                    "EMAIL_HOST_USER",
+                    os.environ.get("GITHUB_APP_NAME", None),
+                ),
+            )
+            and bool(
+                get_configuration_value(
+                    instance_configuration,
+                    "EMAIL_HOST_PASSWORD",
+                    os.environ.get("GITHUB_APP_NAME", None),
+                )
+            )
+        ) and get_configuration_value(
+            instance_configuration, "ENABLE_MAGIC_LINK_LOGIN", "0"
+        ) == "1"
+        data["email_password_login"] = (
+            get_configuration_value(
+                instance_configuration, "ENABLE_EMAIL_PASSWORD", "0"
+            )
+            == "1"
+        )
+        # Slack client
+        data["slack_client_id"] = get_configuration_value(
+            instance_configuration,
+            "SLACK_CLIENT_ID",
+            os.environ.get("SLACK_CLIENT_ID", None),
+        )
+
+        # Posthog
+        data["posthog_api_key"] = get_configuration_value(
+            instance_configuration,
+            "POSTHOG_API_KEY",
+            os.environ.get("POSTHOG_API_KEY", None),
+        )
+        data["posthog_host"] = get_configuration_value(
+            instance_configuration,
+            "POSTHOG_HOST",
+            os.environ.get("POSTHOG_HOST", None),
+        )
+
+        # Unsplash
+        data["has_unsplash_configured"] = bool(
+            get_configuration_value(
+                instance_configuration,
+                "UNSPLASH_ACCESS_KEY",
+                os.environ.get("UNSPLASH_ACCESS_KEY", None),
+            )
+        )
+
+        return Response(data, status=status.HTTP_200_OK)

apiserver/plane/app/views/cycle.py

@@ -20,18 +20,17 @@ from django.views.decorators.gzip import gzip_page
 # Third party imports
 from rest_framework.response import Response
 from rest_framework import status
-from sentry_sdk import capture_exception
 
 # Module imports
 from . import BaseViewSet, BaseAPIView, WebhookMixin
-from plane.api.serializers import (
+from plane.app.serializers import (
     CycleSerializer,
     CycleIssueSerializer,
     CycleFavoriteSerializer,
     IssueStateSerializer,
     CycleWriteSerializer,
 )
-from plane.api.permissions import ProjectEntityPermission
+from plane.app.permissions import ProjectEntityPermission
 from plane.db.models import (
     User,
     Cycle,
@@ -707,6 +706,56 @@ class CycleIssueViewSet(WebhookMixin, BaseViewSet):
         return Response(status=status.HTTP_204_NO_CONTENT)
 
 
+class CycleIssueGroupedEndpoint(BaseAPIView):
+
+    permission_classes = [
+        ProjectEntityPermission,
+    ]
+
+    def get(self, request, slug, project_id, cycle_id):
+        filters = issue_filters(request.query_params, "GET")
+        fields = [field for field in request.GET.get("fields", "").split(",") if field]
+
+        issues = (
+            Issue.issue_objects.filter(issue_cycle__cycle_id=cycle_id)
+            .annotate(
+                sub_issues_count=Issue.issue_objects.filter(parent=OuterRef("id"))
+                .order_by()
+                .annotate(count=Func(F("id"), function="Count"))
+                .values("count")
+            )
+            .annotate(bridge_id=F("issue_cycle__id"))
+            .filter(project_id=project_id)
+            .filter(workspace__slug=slug)
+            .select_related("project")
+            .select_related("workspace")
+            .select_related("state")
+            .select_related("parent")
+            .prefetch_related("assignees")
+            .prefetch_related("labels")
+            .filter(**filters)
+            .annotate(
+                link_count=IssueLink.objects.filter(issue=OuterRef("id"))
+                .order_by()
+                .annotate(count=Func(F("id"), function="Count"))
+                .values("count")
+            )
+            .annotate(
+                attachment_count=IssueAttachment.objects.filter(issue=OuterRef("id"))
+                .order_by()
+                .annotate(count=Func(F("id"), function="Count"))
+                .values("count")
+            )
+        )
+
+        issues = IssueStateSerializer(issues, many=True, fields=fields if fields else None).data
+        issue_dict = {str(issue["id"]): issue for issue in issues}
+        return Response(
+            issue_dict,
+            status=status.HTTP_200_OK,
+        )
+
+
 class CycleDateCheckEndpoint(BaseAPIView):
     permission_classes = [
         ProjectEntityPermission,

apiserver/plane/app/views/estimate.py

@@ -1,13 +1,12 @@
 # Third party imports
 from rest_framework.response import Response
 from rest_framework import status
-from sentry_sdk import capture_exception
 
 # Module imports
 from .base import BaseViewSet, BaseAPIView
-from plane.api.permissions import ProjectEntityPermission
+from plane.app.permissions import ProjectEntityPermission
 from plane.db.models import Project, Estimate, EstimatePoint
-from plane.api.serializers import (
+from plane.app.serializers import (
     EstimateSerializer,
     EstimatePointSerializer,
     EstimateReadSerializer,

apiserver/plane/app/views/exporter.py

@@ -1,15 +1,14 @@
 # Third Party imports
 from rest_framework.response import Response
 from rest_framework import status
-from sentry_sdk import capture_exception
 
 # Module imports
 from . import BaseAPIView
-from plane.api.permissions import WorkSpaceAdminPermission
+from plane.app.permissions import WorkSpaceAdminPermission
 from plane.bgtasks.export_task import issue_export_task
 from plane.db.models import Project, ExporterHistory, Workspace
 
-from plane.api.serializers import ExporterHistorySerializer
+from plane.app.serializers import ExporterHistorySerializer
 
 
 class ExportIssuesEndpoint(BaseAPIView):

apiserver/plane/app/views/external.py

@@ -2,22 +2,21 @@
 import requests
 
 # Third party imports
-import openai
+from openai import OpenAI
 from rest_framework.response import Response
 from rest_framework import status
-from rest_framework.permissions import AllowAny
-from sentry_sdk import capture_exception
 
 # Django imports
 from django.conf import settings
 
 # Module imports
 from .base import BaseAPIView
-from plane.api.permissions import ProjectEntityPermission
+from plane.app.permissions import ProjectEntityPermission
 from plane.db.models import Workspace, Project
-from plane.api.serializers import ProjectLiteSerializer, WorkspaceLiteSerializer
+from plane.app.serializers import ProjectLiteSerializer, WorkspaceLiteSerializer
 from plane.utils.integrations.github import get_release_notes
-
+from plane.license.models import InstanceConfiguration
+from plane.license.utils.instance_value import get_configuration_value
 
 class GPTIntegrationEndpoint(BaseAPIView):
     permission_classes = [
@@ -25,7 +24,14 @@ class GPTIntegrationEndpoint(BaseAPIView):
     ]
 
     def post(self, request, slug, project_id):
-        if not settings.OPENAI_API_KEY or not settings.GPT_ENGINE:
+
+        # Get the configuration value
+        instance_configuration = InstanceConfiguration.objects.values("key", "value")
+        api_key = get_configuration_value(instance_configuration, "OPENAI_API_KEY")
+        gpt_engine = get_configuration_value(instance_configuration, "GPT_ENGINE")
+
+        # Check the keys
+        if not api_key or not gpt_engine:
             return Response(
                 {"error": "OpenAI API key and engine is required"},
                 status=status.HTTP_400_BAD_REQUEST,
@@ -41,12 +47,17 @@ class GPTIntegrationEndpoint(BaseAPIView):
 
         final_text = task + "\n" + prompt
 
-        openai.api_key = settings.OPENAI_API_KEY
-        response = openai.ChatCompletion.create(
-            model=settings.GPT_ENGINE,
+        instance_configuration = InstanceConfiguration.objects.values("key", "value")
+        
+        gpt_engine = get_configuration_value(instance_configuration, "GPT_ENGINE")
+
+        client = OpenAI(
+            api_key=api_key,
+        )
+
+        response = client.chat.completions.create(
+            model=gpt_engine,
             messages=[{"role": "user", "content": final_text}],
-            temperature=0.7,
-            max_tokens=1024,
         )
 
         workspace = Workspace.objects.get(slug=slug)

apiserver/plane/app/views/importer.py

@@ -4,13 +4,12 @@ import uuid
 # Third party imports
 from rest_framework import status
 from rest_framework.response import Response
-from sentry_sdk import capture_exception
 
 # Django imports
 from django.db.models import Max, Q
 
 # Module imports
-from plane.api.views import BaseAPIView
+from plane.app.views import BaseAPIView
 from plane.db.models import (
     WorkspaceIntegration,
     Importer,
@@ -30,7 +29,7 @@ from plane.db.models import (
     ModuleIssue,
     Label,
 )
-from plane.api.serializers import (
+from plane.app.serializers import (
     ImporterSerializer,
     IssueFlatSerializer,
     ModuleSerializer,
@@ -39,7 +38,7 @@ from plane.utils.integrations.github import get_github_repo_details
 from plane.utils.importers.jira import jira_project_issue_summary
 from plane.bgtasks.importer_task import service_importer
 from plane.utils.html_processor import strip_tags
-from plane.api.permissions import WorkSpaceAdminPermission
+from plane.app.permissions import WorkSpaceAdminPermission
 
 
 class ServiceIssueImportSummaryEndpoint(BaseAPIView):

apiserver/plane/app/views/inbox.py

@@ -9,11 +9,10 @@ from django.core.serializers.json import DjangoJSONEncoder
 # Third party imports
 from rest_framework import status
 from rest_framework.response import Response
-from sentry_sdk import capture_exception
 
 # Module imports
 from .base import BaseViewSet
-from plane.api.permissions import ProjectBasePermission, ProjectLitePermission
+from plane.app.permissions import ProjectBasePermission, ProjectLitePermission
 from plane.db.models import (
     Inbox,
     InboxIssue,
@@ -22,9 +21,8 @@ from plane.db.models import (
     IssueLink,
     IssueAttachment,
     ProjectMember,
-    ProjectDeployBoard,
 )
-from plane.api.serializers import (
+from plane.app.serializers import (
     IssueSerializer,
     InboxSerializer,
     InboxIssueSerializer,
@@ -359,253 +357,3 @@ class InboxIssueViewSet(BaseViewSet):
         return Response(status=status.HTTP_204_NO_CONTENT)
 
 
-class InboxIssuePublicViewSet(BaseViewSet):
-    serializer_class = InboxIssueSerializer
-    model = InboxIssue
-
-    filterset_fields = [
-        "status",
-    ]
-
-    def get_queryset(self):
-        project_deploy_board = ProjectDeployBoard.objects.get(
-            workspace__slug=self.kwargs.get("slug"),
-            project_id=self.kwargs.get("project_id"),
-        )
-        if project_deploy_board is not None:
-            return self.filter_queryset(
-                super()
-                .get_queryset()
-                .filter(
-                    Q(snoozed_till__gte=timezone.now()) | Q(snoozed_till__isnull=True),
-                    project_id=self.kwargs.get("project_id"),
-                    workspace__slug=self.kwargs.get("slug"),
-                    inbox_id=self.kwargs.get("inbox_id"),
-                )
-                .select_related("issue", "workspace", "project")
-            )
-        return InboxIssue.objects.none()
-
-    def list(self, request, slug, project_id, inbox_id):
-        project_deploy_board = ProjectDeployBoard.objects.get(
-            workspace__slug=slug, project_id=project_id
-        )
-        if project_deploy_board.inbox is None:
-            return Response(
-                {"error": "Inbox is not enabled for this Project Board"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
-        filters = issue_filters(request.query_params, "GET")
-        issues = (
-            Issue.objects.filter(
-                issue_inbox__inbox_id=inbox_id,
-                workspace__slug=slug,
-                project_id=project_id,
-            )
-            .filter(**filters)
-            .annotate(bridge_id=F("issue_inbox__id"))
-            .select_related("workspace", "project", "state", "parent")
-            .prefetch_related("assignees", "labels")
-            .order_by("issue_inbox__snoozed_till", "issue_inbox__status")
-            .annotate(
-                sub_issues_count=Issue.issue_objects.filter(parent=OuterRef("id"))
-                .order_by()
-                .annotate(count=Func(F("id"), function="Count"))
-                .values("count")
-            )
-            .annotate(
-                link_count=IssueLink.objects.filter(issue=OuterRef("id"))
-                .order_by()
-                .annotate(count=Func(F("id"), function="Count"))
-                .values("count")
-            )
-            .annotate(
-                attachment_count=IssueAttachment.objects.filter(issue=OuterRef("id"))
-                .order_by()
-                .annotate(count=Func(F("id"), function="Count"))
-                .values("count")
-            )
-            .prefetch_related(
-                Prefetch(
-                    "issue_inbox",
-                    queryset=InboxIssue.objects.only(
-                        "status", "duplicate_to", "snoozed_till", "source"
-                    ),
-                )
-            )
-        )
-        issues_data = IssueStateInboxSerializer(issues, many=True).data
-        return Response(
-            issues_data,
-            status=status.HTTP_200_OK,
-        )
-
-    def create(self, request, slug, project_id, inbox_id):
-        project_deploy_board = ProjectDeployBoard.objects.get(
-            workspace__slug=slug, project_id=project_id
-        )
-        if project_deploy_board.inbox is None:
-            return Response(
-                {"error": "Inbox is not enabled for this Project Board"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
-        if not request.data.get("issue", {}).get("name", False):
-            return Response(
-                {"error": "Name is required"}, status=status.HTTP_400_BAD_REQUEST
-            )
-
-        # Check for valid priority
-        if not request.data.get("issue", {}).get("priority", "none") in [
-            "low",
-            "medium",
-            "high",
-            "urgent",
-            "none",
-        ]:
-            return Response(
-                {"error": "Invalid priority"}, status=status.HTTP_400_BAD_REQUEST
-            )
-
-        # Create or get state
-        state, _ = State.objects.get_or_create(
-            name="Triage",
-            group="backlog",
-            description="Default state for managing all Inbox Issues",
-            project_id=project_id,
-            color="#ff7700",
-        )
-
-        # create an issue
-        issue = Issue.objects.create(
-            name=request.data.get("issue", {}).get("name"),
-            description=request.data.get("issue", {}).get("description", {}),
-            description_html=request.data.get("issue", {}).get(
-                "description_html", "<p></p>"
-            ),
-            priority=request.data.get("issue", {}).get("priority", "low"),
-            project_id=project_id,
-            state=state,
-        )
-
-        # Create an Issue Activity
-        issue_activity.delay(
-            type="issue.activity.created",
-            requested_data=json.dumps(request.data, cls=DjangoJSONEncoder),
-            actor_id=str(request.user.id),
-            issue_id=str(issue.id),
-            project_id=str(project_id),
-            current_instance=None,
-            epoch=int(timezone.now().timestamp()),
-        )
-        # create an inbox issue
-        InboxIssue.objects.create(
-            inbox_id=inbox_id,
-            project_id=project_id,
-            issue=issue,
-            source=request.data.get("source", "in-app"),
-        )
-
-        serializer = IssueStateInboxSerializer(issue)
-        return Response(serializer.data, status=status.HTTP_200_OK)
-
-    def partial_update(self, request, slug, project_id, inbox_id, pk):
-        project_deploy_board = ProjectDeployBoard.objects.get(
-            workspace__slug=slug, project_id=project_id
-        )
-        if project_deploy_board.inbox is None:
-            return Response(
-                {"error": "Inbox is not enabled for this Project Board"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
-        inbox_issue = InboxIssue.objects.get(
-            pk=pk, workspace__slug=slug, project_id=project_id, inbox_id=inbox_id
-        )
-        # Get the project member
-        if str(inbox_issue.created_by_id) != str(request.user.id):
-            return Response(
-                {"error": "You cannot edit inbox issues"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
-        # Get issue data
-        issue_data = request.data.pop("issue", False)
-
-        issue = Issue.objects.get(
-            pk=inbox_issue.issue_id, workspace__slug=slug, project_id=project_id
-        )
-        # viewers and guests since only viewers and guests
-        issue_data = {
-            "name": issue_data.get("name", issue.name),
-            "description_html": issue_data.get(
-                "description_html", issue.description_html
-            ),
-            "description": issue_data.get("description", issue.description),
-        }
-
-        issue_serializer = IssueCreateSerializer(issue, data=issue_data, partial=True)
-
-        if issue_serializer.is_valid():
-            current_instance = issue
-            # Log all the updates
-            requested_data = json.dumps(issue_data, cls=DjangoJSONEncoder)
-            if issue is not None:
-                issue_activity.delay(
-                    type="issue.activity.updated",
-                    requested_data=requested_data,
-                    actor_id=str(request.user.id),
-                    issue_id=str(issue.id),
-                    project_id=str(project_id),
-                    current_instance=json.dumps(
-                        IssueSerializer(current_instance).data,
-                        cls=DjangoJSONEncoder,
-                    ),
-                    epoch=int(timezone.now().timestamp()),
-                )
-            issue_serializer.save()
-            return Response(issue_serializer.data, status=status.HTTP_200_OK)
-        return Response(issue_serializer.errors, status=status.HTTP_400_BAD_REQUEST)
-
-    def retrieve(self, request, slug, project_id, inbox_id, pk):
-        project_deploy_board = ProjectDeployBoard.objects.get(
-            workspace__slug=slug, project_id=project_id
-        )
-        if project_deploy_board.inbox is None:
-            return Response(
-                {"error": "Inbox is not enabled for this Project Board"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
-        inbox_issue = InboxIssue.objects.get(
-            pk=pk, workspace__slug=slug, project_id=project_id, inbox_id=inbox_id
-        )
-        issue = Issue.objects.get(
-            pk=inbox_issue.issue_id, workspace__slug=slug, project_id=project_id
-        )
-        serializer = IssueStateInboxSerializer(issue)
-        return Response(serializer.data, status=status.HTTP_200_OK)
-
-    def destroy(self, request, slug, project_id, inbox_id, pk):
-        project_deploy_board = ProjectDeployBoard.objects.get(
-            workspace__slug=slug, project_id=project_id
-        )
-        if project_deploy_board.inbox is None:
-            return Response(
-                {"error": "Inbox is not enabled for this Project Board"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
-        inbox_issue = InboxIssue.objects.get(
-            pk=pk, workspace__slug=slug, project_id=project_id, inbox_id=inbox_id
-        )
-
-        if str(inbox_issue.created_by_id) != str(request.user.id):
-            return Response(
-                {"error": "You cannot delete inbox issue"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
-        inbox_issue.delete()
-        return Response(status=status.HTTP_204_NO_CONTENT)

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

@@ -10,7 +10,7 @@ from rest_framework import status
 from sentry_sdk import capture_exception
 
 # Module imports
-from plane.api.views import BaseViewSet
+from plane.app.views import BaseViewSet
 from plane.db.models import (
     Integration,
     WorkspaceIntegration,
@@ -19,12 +19,12 @@ from plane.db.models import (
     WorkspaceMember,
     APIToken,
 )
-from plane.api.serializers import IntegrationSerializer, WorkspaceIntegrationSerializer
+from plane.app.serializers import IntegrationSerializer, WorkspaceIntegrationSerializer
 from plane.utils.integrations.github import (
     get_github_metadata,
     delete_github_installation,
 )
-from plane.api.permissions import WorkSpaceAdminPermission
+from plane.app.permissions import WorkSpaceAdminPermission
 from plane.utils.integrations.slack import slack_oauth
 
 class IntegrationViewSet(BaseViewSet):

apiserver/plane/app/views/integration/github.py

@@ -4,7 +4,7 @@ from rest_framework.response import Response
 from sentry_sdk import capture_exception
 
 # Module imports
-from plane.api.views import BaseViewSet, BaseAPIView
+from plane.app.views import BaseViewSet, BaseAPIView
 from plane.db.models import (
     GithubIssueSync,
     GithubRepositorySync,
@@ -15,13 +15,13 @@ from plane.db.models import (
     GithubCommentSync,
     Project,
 )
-from plane.api.serializers import (
+from plane.app.serializers import (
     GithubIssueSyncSerializer,
     GithubRepositorySyncSerializer,
     GithubCommentSyncSerializer,
 )
 from plane.utils.integrations.github import get_github_repos
-from plane.api.permissions import ProjectBasePermission, ProjectEntityPermission
+from plane.app.permissions import ProjectBasePermission, ProjectEntityPermission
 
 
 class GithubRepositoriesEndpoint(BaseAPIView):

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

@@ -7,10 +7,10 @@ from rest_framework.response import Response
 from sentry_sdk import capture_exception
 
 # Module imports
-from plane.api.views import BaseViewSet, BaseAPIView
+from plane.app.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
+from plane.app.serializers import SlackProjectSyncSerializer
+from plane.app.permissions import ProjectBasePermission, ProjectEntityPermission
 from plane.utils.integrations.slack import slack_oauth
 
 

apiserver/plane/app/views/issue.py

@@ -29,12 +29,10 @@ from django.db import IntegrityError
 from rest_framework.response import Response
 from rest_framework import status
 from rest_framework.parsers import MultiPartParser, FormParser
-from rest_framework.permissions import AllowAny, IsAuthenticated
-from sentry_sdk import capture_exception
 
 # Module imports
 from . import BaseViewSet, BaseAPIView, WebhookMixin
-from plane.api.serializers import (
+from plane.app.serializers import (
     IssueCreateSerializer,
     IssueActivitySerializer,
     IssueCommentSerializer,
@@ -54,7 +52,7 @@ from plane.api.serializers import (
     RelatedIssueSerializer,
     IssuePublicSerializer,
 )
-from plane.api.permissions import (
+from plane.app.permissions import (
     ProjectEntityPermission,
     WorkSpaceAdminPermission,
     ProjectMemberPermission,
@@ -1462,432 +1460,6 @@ class CommentReactionViewSet(BaseViewSet):
         return Response(status=status.HTTP_204_NO_CONTENT)
 
 
-class IssueCommentPublicViewSet(BaseViewSet):
-    serializer_class = IssueCommentSerializer
-    model = IssueComment
-
-    filterset_fields = [
-        "issue__id",
-        "workspace__id",
-    ]
-
-    def get_permissions(self):
-        if self.action in ["list", "retrieve"]:
-            self.permission_classes = [
-                AllowAny,
-            ]
-        else:
-            self.permission_classes = [
-                IsAuthenticated,
-            ]
-
-        return super(IssueCommentPublicViewSet, self).get_permissions()
-
-    def get_queryset(self):
-        try:
-            project_deploy_board = ProjectDeployBoard.objects.get(
-                workspace__slug=self.kwargs.get("slug"),
-                project_id=self.kwargs.get("project_id"),
-            )
-            if project_deploy_board.comments:
-                return self.filter_queryset(
-                    super()
-                    .get_queryset()
-                    .filter(workspace__slug=self.kwargs.get("slug"))
-                    .filter(issue_id=self.kwargs.get("issue_id"))
-                    .filter(access="EXTERNAL")
-                    .select_related("project")
-                    .select_related("workspace")
-                    .select_related("issue")
-                    .annotate(
-                        is_member=Exists(
-                            ProjectMember.objects.filter(
-                                workspace__slug=self.kwargs.get("slug"),
-                                project_id=self.kwargs.get("project_id"),
-                                member_id=self.request.user.id,
-                                is_active=True,
-                            )
-                        )
-                    )
-                    .distinct()
-                ).order_by("created_at")
-            return IssueComment.objects.none()
-        except ProjectDeployBoard.DoesNotExist:
-            return IssueComment.objects.none()
-
-    def create(self, request, slug, project_id, issue_id):
-        project_deploy_board = ProjectDeployBoard.objects.get(
-            workspace__slug=slug, project_id=project_id
-        )
-
-        if not project_deploy_board.comments:
-            return Response(
-                {"error": "Comments are not enabled for this project"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
-        serializer = IssueCommentSerializer(data=request.data)
-        if serializer.is_valid():
-            serializer.save(
-                project_id=project_id,
-                issue_id=issue_id,
-                actor=request.user,
-                access="EXTERNAL",
-            )
-            issue_activity.delay(
-                type="comment.activity.created",
-                requested_data=json.dumps(serializer.data, cls=DjangoJSONEncoder),
-                actor_id=str(request.user.id),
-                issue_id=str(issue_id),
-                project_id=str(project_id),
-                current_instance=None,
-                epoch=int(timezone.now().timestamp()),
-            )
-            if not ProjectMember.objects.filter(
-                project_id=project_id,
-                member=request.user,
-                is_active=True,
-            ).exists():
-                # Add the user for workspace tracking
-                _ = ProjectPublicMember.objects.get_or_create(
-                    project_id=project_id,
-                    member=request.user,
-                )
-
-            return Response(serializer.data, status=status.HTTP_201_CREATED)
-        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
-
-    def partial_update(self, request, slug, project_id, issue_id, pk):
-        project_deploy_board = ProjectDeployBoard.objects.get(
-            workspace__slug=slug, project_id=project_id
-        )
-
-        if not project_deploy_board.comments:
-            return Response(
-                {"error": "Comments are not enabled for this project"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-        comment = IssueComment.objects.get(
-            workspace__slug=slug, pk=pk, actor=request.user
-        )
-        serializer = IssueCommentSerializer(comment, data=request.data, partial=True)
-        if serializer.is_valid():
-            serializer.save()
-            issue_activity.delay(
-                type="comment.activity.updated",
-                requested_data=json.dumps(request.data, cls=DjangoJSONEncoder),
-                actor_id=str(request.user.id),
-                issue_id=str(issue_id),
-                project_id=str(project_id),
-                current_instance=json.dumps(
-                    IssueCommentSerializer(comment).data,
-                    cls=DjangoJSONEncoder,
-                ),
-                epoch=int(timezone.now().timestamp()),
-            )
-            return Response(serializer.data, status=status.HTTP_200_OK)
-        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
-
-    def destroy(self, request, slug, project_id, issue_id, pk):
-        project_deploy_board = ProjectDeployBoard.objects.get(
-            workspace__slug=slug, project_id=project_id
-        )
-
-        if not project_deploy_board.comments:
-            return Response(
-                {"error": "Comments are not enabled for this project"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-        comment = IssueComment.objects.get(
-            workspace__slug=slug, pk=pk, project_id=project_id, actor=request.user
-        )
-        issue_activity.delay(
-            type="comment.activity.deleted",
-            requested_data=json.dumps({"comment_id": str(pk)}),
-            actor_id=str(request.user.id),
-            issue_id=str(issue_id),
-            project_id=str(project_id),
-            current_instance=json.dumps(
-                IssueCommentSerializer(comment).data,
-                cls=DjangoJSONEncoder,
-            ),
-            epoch=int(timezone.now().timestamp()),
-        )
-        comment.delete()
-        return Response(status=status.HTTP_204_NO_CONTENT)
-
-
-class IssueReactionPublicViewSet(BaseViewSet):
-    serializer_class = IssueReactionSerializer
-    model = IssueReaction
-
-    def get_queryset(self):
-        try:
-            project_deploy_board = ProjectDeployBoard.objects.get(
-                workspace__slug=self.kwargs.get("slug"),
-                project_id=self.kwargs.get("project_id"),
-            )
-            if project_deploy_board.reactions:
-                return (
-                    super()
-                    .get_queryset()
-                    .filter(workspace__slug=self.kwargs.get("slug"))
-                    .filter(project_id=self.kwargs.get("project_id"))
-                    .filter(issue_id=self.kwargs.get("issue_id"))
-                    .order_by("-created_at")
-                    .distinct()
-                )
-            return IssueReaction.objects.none()
-        except ProjectDeployBoard.DoesNotExist:
-            return IssueReaction.objects.none()
-
-    def create(self, request, slug, project_id, issue_id):
-        project_deploy_board = ProjectDeployBoard.objects.get(
-            workspace__slug=slug, project_id=project_id
-        )
-
-        if not project_deploy_board.reactions:
-            return Response(
-                {"error": "Reactions are not enabled for this project board"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
-        serializer = IssueReactionSerializer(data=request.data)
-        if serializer.is_valid():
-            serializer.save(
-                project_id=project_id, issue_id=issue_id, actor=request.user
-            )
-            if not ProjectMember.objects.filter(
-                project_id=project_id,
-                member=request.user,
-                is_active=True,
-            ).exists():
-                # Add the user for workspace tracking
-                _ = ProjectPublicMember.objects.get_or_create(
-                    project_id=project_id,
-                    member=request.user,
-                )
-            issue_activity.delay(
-                type="issue_reaction.activity.created",
-                requested_data=json.dumps(self.request.data, cls=DjangoJSONEncoder),
-                actor_id=str(self.request.user.id),
-                issue_id=str(self.kwargs.get("issue_id", None)),
-                project_id=str(self.kwargs.get("project_id", None)),
-                current_instance=None,
-                epoch=int(timezone.now().timestamp()),
-            )
-            return Response(serializer.data, status=status.HTTP_201_CREATED)
-        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
-
-    def destroy(self, request, slug, project_id, issue_id, reaction_code):
-        project_deploy_board = ProjectDeployBoard.objects.get(
-            workspace__slug=slug, project_id=project_id
-        )
-
-        if not project_deploy_board.reactions:
-            return Response(
-                {"error": "Reactions are not enabled for this project board"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-        issue_reaction = IssueReaction.objects.get(
-            workspace__slug=slug,
-            issue_id=issue_id,
-            reaction=reaction_code,
-            actor=request.user,
-        )
-        issue_activity.delay(
-            type="issue_reaction.activity.deleted",
-            requested_data=None,
-            actor_id=str(self.request.user.id),
-            issue_id=str(self.kwargs.get("issue_id", None)),
-            project_id=str(self.kwargs.get("project_id", None)),
-            current_instance=json.dumps(
-                {
-                    "reaction": str(reaction_code),
-                    "identifier": str(issue_reaction.id),
-                }
-            ),
-            epoch=int(timezone.now().timestamp()),
-        )
-        issue_reaction.delete()
-        return Response(status=status.HTTP_204_NO_CONTENT)
-
-
-class CommentReactionPublicViewSet(BaseViewSet):
-    serializer_class = CommentReactionSerializer
-    model = CommentReaction
-
-    def get_queryset(self):
-        try:
-            project_deploy_board = ProjectDeployBoard.objects.get(
-                workspace__slug=self.kwargs.get("slug"),
-                project_id=self.kwargs.get("project_id"),
-            )
-            if project_deploy_board.reactions:
-                return (
-                    super()
-                    .get_queryset()
-                    .filter(workspace__slug=self.kwargs.get("slug"))
-                    .filter(project_id=self.kwargs.get("project_id"))
-                    .filter(comment_id=self.kwargs.get("comment_id"))
-                    .order_by("-created_at")
-                    .distinct()
-                )
-            return CommentReaction.objects.none()
-        except ProjectDeployBoard.DoesNotExist:
-            return CommentReaction.objects.none()
-
-    def create(self, request, slug, project_id, comment_id):
-        project_deploy_board = ProjectDeployBoard.objects.get(
-            workspace__slug=slug, project_id=project_id
-        )
-
-        if not project_deploy_board.reactions:
-            return Response(
-                {"error": "Reactions are not enabled for this board"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
-        serializer = CommentReactionSerializer(data=request.data)
-        if serializer.is_valid():
-            serializer.save(
-                project_id=project_id, comment_id=comment_id, actor=request.user
-            )
-            if not ProjectMember.objects.filter(
-                project_id=project_id,
-                member=request.user,
-                is_active=True,
-            ).exists():
-                # Add the user for workspace tracking
-                _ = ProjectPublicMember.objects.get_or_create(
-                    project_id=project_id,
-                    member=request.user,
-                )
-            issue_activity.delay(
-                type="comment_reaction.activity.created",
-                requested_data=json.dumps(self.request.data, cls=DjangoJSONEncoder),
-                actor_id=str(self.request.user.id),
-                issue_id=None,
-                project_id=str(self.kwargs.get("project_id", None)),
-                current_instance=None,
-                epoch=int(timezone.now().timestamp()),
-            )
-            return Response(serializer.data, status=status.HTTP_201_CREATED)
-        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
-
-    def destroy(self, request, slug, project_id, comment_id, reaction_code):
-        project_deploy_board = ProjectDeployBoard.objects.get(
-            workspace__slug=slug, project_id=project_id
-        )
-        if not project_deploy_board.reactions:
-            return Response(
-                {"error": "Reactions are not enabled for this board"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
-        comment_reaction = CommentReaction.objects.get(
-            project_id=project_id,
-            workspace__slug=slug,
-            comment_id=comment_id,
-            reaction=reaction_code,
-            actor=request.user,
-        )
-        issue_activity.delay(
-            type="comment_reaction.activity.deleted",
-            requested_data=None,
-            actor_id=str(self.request.user.id),
-            issue_id=None,
-            project_id=str(self.kwargs.get("project_id", None)),
-            current_instance=json.dumps(
-                {
-                    "reaction": str(reaction_code),
-                    "identifier": str(comment_reaction.id),
-                    "comment_id": str(comment_id),
-                }
-            ),
-            epoch=int(timezone.now().timestamp()),
-        )
-        comment_reaction.delete()
-        return Response(status=status.HTTP_204_NO_CONTENT)
-
-
-class IssueVotePublicViewSet(BaseViewSet):
-    model = IssueVote
-    serializer_class = IssueVoteSerializer
-
-    def get_queryset(self):
-        try:
-            project_deploy_board = ProjectDeployBoard.objects.get(
-                workspace__slug=self.kwargs.get("slug"),
-                project_id=self.kwargs.get("project_id"),
-            )
-            if project_deploy_board.votes:
-                return (
-                    super()
-                    .get_queryset()
-                    .filter(issue_id=self.kwargs.get("issue_id"))
-                    .filter(workspace__slug=self.kwargs.get("slug"))
-                    .filter(project_id=self.kwargs.get("project_id"))
-                )
-            return IssueVote.objects.none()
-        except ProjectDeployBoard.DoesNotExist:
-            return IssueVote.objects.none()
-
-    def create(self, request, slug, project_id, issue_id):
-        issue_vote, _ = IssueVote.objects.get_or_create(
-            actor_id=request.user.id,
-            project_id=project_id,
-            issue_id=issue_id,
-        )
-        # Add the user for workspace tracking
-        if not ProjectMember.objects.filter(
-            project_id=project_id,
-            member=request.user,
-            is_active=True,
-        ).exists():
-            _ = ProjectPublicMember.objects.get_or_create(
-                project_id=project_id,
-                member=request.user,
-            )
-        issue_vote.vote = request.data.get("vote", 1)
-        issue_vote.save()
-        issue_activity.delay(
-            type="issue_vote.activity.created",
-            requested_data=json.dumps(self.request.data, cls=DjangoJSONEncoder),
-            actor_id=str(self.request.user.id),
-            issue_id=str(self.kwargs.get("issue_id", None)),
-            project_id=str(self.kwargs.get("project_id", None)),
-            current_instance=None,
-            epoch=int(timezone.now().timestamp()),
-        )
-        serializer = IssueVoteSerializer(issue_vote)
-        return Response(serializer.data, status=status.HTTP_201_CREATED)
-
-    def destroy(self, request, slug, project_id, issue_id):
-        issue_vote = IssueVote.objects.get(
-            workspace__slug=slug,
-            project_id=project_id,
-            issue_id=issue_id,
-            actor_id=request.user.id,
-        )
-        issue_activity.delay(
-            type="issue_vote.activity.deleted",
-            requested_data=None,
-            actor_id=str(self.request.user.id),
-            issue_id=str(self.kwargs.get("issue_id", None)),
-            project_id=str(self.kwargs.get("project_id", None)),
-            current_instance=json.dumps(
-                {
-                    "vote": str(issue_vote.vote),
-                    "identifier": str(issue_vote.id),
-                }
-            ),
-            epoch=int(timezone.now().timestamp()),
-        )
-        issue_vote.delete()
-        return Response(status=status.HTTP_204_NO_CONTENT)
-
-
 class IssueRelationViewSet(BaseViewSet):
     serializer_class = IssueRelationSerializer
     model = IssueRelation
@@ -1973,182 +1545,6 @@ class IssueRelationViewSet(BaseViewSet):
         return Response(status=status.HTTP_204_NO_CONTENT)
 
 
-class IssueRetrievePublicEndpoint(BaseAPIView):
-    permission_classes = [
-        AllowAny,
-    ]
-
-    def get(self, request, slug, project_id, issue_id):
-        issue = Issue.objects.get(
-            workspace__slug=slug, project_id=project_id, pk=issue_id
-        )
-        serializer = IssuePublicSerializer(issue)
-        return Response(serializer.data, status=status.HTTP_200_OK)
-
-
-class ProjectIssuesPublicEndpoint(BaseAPIView):
-    permission_classes = [
-        AllowAny,
-    ]
-
-    def get(self, request, slug, project_id):
-        project_deploy_board = ProjectDeployBoard.objects.get(
-            workspace__slug=slug, project_id=project_id
-        )
-
-        filters = issue_filters(request.query_params, "GET")
-
-        # Custom ordering for priority and state
-        priority_order = ["urgent", "high", "medium", "low", "none"]
-        state_order = ["backlog", "unstarted", "started", "completed", "cancelled"]
-
-        order_by_param = request.GET.get("order_by", "-created_at")
-
-        issue_queryset = (
-            Issue.issue_objects.annotate(
-                sub_issues_count=Issue.issue_objects.filter(parent=OuterRef("id"))
-                .order_by()
-                .annotate(count=Func(F("id"), function="Count"))
-                .values("count")
-            )
-            .filter(project_id=project_id)
-            .filter(workspace__slug=slug)
-            .select_related("project", "workspace", "state", "parent")
-            .prefetch_related("assignees", "labels")
-            .prefetch_related(
-                Prefetch(
-                    "issue_reactions",
-                    queryset=IssueReaction.objects.select_related("actor"),
-                )
-            )
-            .prefetch_related(
-                Prefetch(
-                    "votes",
-                    queryset=IssueVote.objects.select_related("actor"),
-                )
-            )
-            .filter(**filters)
-            .annotate(cycle_id=F("issue_cycle__cycle_id"))
-            .annotate(module_id=F("issue_module__module_id"))
-            .annotate(
-                link_count=IssueLink.objects.filter(issue=OuterRef("id"))
-                .order_by()
-                .annotate(count=Func(F("id"), function="Count"))
-                .values("count")
-            )
-            .annotate(
-                attachment_count=IssueAttachment.objects.filter(issue=OuterRef("id"))
-                .order_by()
-                .annotate(count=Func(F("id"), function="Count"))
-                .values("count")
-            )
-        )
-
-        # Priority Ordering
-        if order_by_param == "priority" or order_by_param == "-priority":
-            priority_order = (
-                priority_order if order_by_param == "priority" else priority_order[::-1]
-            )
-            issue_queryset = issue_queryset.annotate(
-                priority_order=Case(
-                    *[
-                        When(priority=p, then=Value(i))
-                        for i, p in enumerate(priority_order)
-                    ],
-                    output_field=CharField(),
-                )
-            ).order_by("priority_order")
-
-        # State Ordering
-        elif order_by_param in [
-            "state__name",
-            "state__group",
-            "-state__name",
-            "-state__group",
-        ]:
-            state_order = (
-                state_order
-                if order_by_param in ["state__name", "state__group"]
-                else state_order[::-1]
-            )
-            issue_queryset = issue_queryset.annotate(
-                state_order=Case(
-                    *[
-                        When(state__group=state_group, then=Value(i))
-                        for i, state_group in enumerate(state_order)
-                    ],
-                    default=Value(len(state_order)),
-                    output_field=CharField(),
-                )
-            ).order_by("state_order")
-        # assignee and label ordering
-        elif order_by_param in [
-            "labels__name",
-            "-labels__name",
-            "assignees__first_name",
-            "-assignees__first_name",
-        ]:
-            issue_queryset = issue_queryset.annotate(
-                max_values=Max(
-                    order_by_param[1::]
-                    if order_by_param.startswith("-")
-                    else order_by_param
-                )
-            ).order_by(
-                "-max_values" if order_by_param.startswith("-") else "max_values"
-            )
-        else:
-            issue_queryset = issue_queryset.order_by(order_by_param)
-
-        issues = IssuePublicSerializer(issue_queryset, many=True).data
-
-        state_group_order = [
-            "backlog",
-            "unstarted",
-            "started",
-            "completed",
-            "cancelled",
-        ]
-
-        states = (
-            State.objects.filter(
-                ~Q(name="Triage"),
-                workspace__slug=slug,
-                project_id=project_id,
-            )
-            .annotate(
-                custom_order=Case(
-                    *[
-                        When(group=value, then=Value(index))
-                        for index, value in enumerate(state_group_order)
-                    ],
-                    default=Value(len(state_group_order)),
-                    output_field=IntegerField(),
-                ),
-            )
-            .values("name", "group", "color", "id")
-            .order_by("custom_order", "sequence")
-        )
-
-        labels = Label.objects.filter(
-            workspace__slug=slug, project_id=project_id
-        ).values("id", "name", "color", "parent")
-
-        ## Grouping the results
-        group_by = request.GET.get("group_by", False)
-        if group_by:
-            issues = group_results(issues, group_by)
-
-        return Response(
-            {
-                "issues": issues,
-                "states": states,
-                "labels": labels,
-            },
-            status=status.HTTP_200_OK,
-        )
-
-
 class IssueDraftViewSet(BaseViewSet):
     permission_classes = [
         ProjectEntityPermission,

apiserver/plane/app/views/module.py

@@ -3,7 +3,6 @@ import json
 
 # Django Imports
 from django.utils import timezone
-from django.db import IntegrityError
 from django.db.models import Prefetch, F, OuterRef, Func, Exists, Count, Q
 from django.core import serializers
 from django.utils.decorators import method_decorator
@@ -12,11 +11,10 @@ from django.views.decorators.gzip import gzip_page
 # Third party imports
 from rest_framework.response import Response
 from rest_framework import status
-from sentry_sdk import capture_exception
 
 # Module imports
-from . import BaseViewSet, WebhookMixin
-from plane.api.serializers import (
+from . import BaseViewSet, BaseAPIView, WebhookMixin
+from plane.app.serializers import (
     ModuleWriteSerializer,
     ModuleSerializer,
     ModuleIssueSerializer,
@@ -24,7 +22,7 @@ from plane.api.serializers import (
     ModuleFavoriteSerializer,
     IssueStateSerializer,
 )
-from plane.api.permissions import ProjectEntityPermission
+from plane.app.permissions import ProjectEntityPermission
 from plane.db.models import (
     Module,
     ModuleIssue,
@@ -481,6 +479,55 @@ class ModuleIssueViewSet(BaseViewSet):
         return Response(status=status.HTTP_204_NO_CONTENT)
 
 
+class ModuleIssueGroupedEndpoint(BaseAPIView):
+
+    permission_classes = [
+        ProjectEntityPermission,
+    ]
+
+    def get(self, request, slug, project_id, module_id):
+        filters = issue_filters(request.query_params, "GET")
+        fields = [field for field in request.GET.get("fields", "").split(",") if field]
+
+        issues = (
+            Issue.issue_objects.filter(issue_module__module_id=module_id)
+            .annotate(
+                sub_issues_count=Issue.issue_objects.filter(parent=OuterRef("id"))
+                .order_by()
+                .annotate(count=Func(F("id"), function="Count"))
+                .values("count")
+            )
+            .annotate(bridge_id=F("issue_module__id"))
+            .filter(project_id=project_id)
+            .filter(workspace__slug=slug)
+            .select_related("project")
+            .select_related("workspace")
+            .select_related("state")
+            .select_related("parent")
+            .prefetch_related("assignees")
+            .prefetch_related("labels")
+            .filter(**filters)
+            .annotate(
+                link_count=IssueLink.objects.filter(issue=OuterRef("id"))
+                .order_by()
+                .annotate(count=Func(F("id"), function="Count"))
+                .values("count")
+            )
+            .annotate(
+                attachment_count=IssueAttachment.objects.filter(issue=OuterRef("id"))
+                .order_by()
+                .annotate(count=Func(F("id"), function="Count"))
+                .values("count")
+            )
+        )
+
+        issues = IssueStateSerializer(issues, many=True, fields=fields if fields else None).data
+        issue_dict = {str(issue["id"]): issue for issue in issues}
+        return Response(
+            issue_dict,
+            status=status.HTTP_200_OK,
+        )
+
 class ModuleLinkViewSet(BaseViewSet):
     permission_classes = [
         ProjectEntityPermission,

apiserver/plane/app/views/notification.py

@@ -5,7 +5,6 @@ from django.utils import timezone
 # Third party imports
 from rest_framework import status
 from rest_framework.response import Response
-from sentry_sdk import capture_exception
 from plane.utils.paginator import BasePaginator
 
 # Module imports
@@ -17,7 +16,7 @@ from plane.db.models import (
     Issue,
     WorkspaceMember,
 )
-from plane.api.serializers import NotificationSerializer
+from plane.app.serializers import NotificationSerializer
 
 
 class NotificationViewSet(BaseViewSet, BasePaginator):

apiserver/plane/app/views/oauth.py

@@ -29,7 +29,6 @@ from plane.db.models import (
     ProjectMemberInvite,
     ProjectMember,
 )
-from plane.api.serializers import UserSerializer
 from .base import BaseAPIView
 
 

apiserver/plane/app/views/page.py

@@ -0,0 +1,400 @@
+# Python imports
+from datetime import timedelta, date, datetime
+
+# Django imports
+from django.db import connection
+from django.db.models import Exists, OuterRef, Q
+from django.utils import timezone
+from django.utils.decorators import method_decorator
+from django.views.decorators.gzip import gzip_page
+
+# Third party imports
+from rest_framework import status
+from rest_framework.response import Response
+
+# Module imports
+from .base import BaseViewSet, BaseAPIView
+from plane.app.permissions import ProjectEntityPermission
+from plane.db.models import (
+    Page,
+    PageFavorite,
+    Issue,
+    IssueAssignee,
+    IssueActivity,
+    PageLog,
+)
+from plane.app.serializers import (
+    PageSerializer,
+    PageFavoriteSerializer,
+    PageLogSerializer,
+    IssueLiteSerializer,
+    SubPageSerializer,
+)
+
+
+def unarchive_archive_page_and_descendants(page_id, archived_at):
+    # Your SQL query
+    sql = """
+    WITH RECURSIVE descendants AS (
+        SELECT id FROM pages WHERE id = %s
+        UNION ALL
+        SELECT pages.id FROM pages, descendants WHERE pages.parent_id = descendants.id
+    )
+    UPDATE pages SET archived_at = %s WHERE id IN (SELECT id FROM descendants);
+    """
+
+    # Execute the SQL query
+    with connection.cursor() as cursor:
+        cursor.execute(sql, [page_id, archived_at])
+
+
+class PageViewSet(BaseViewSet):
+    serializer_class = PageSerializer
+    model = Page
+    permission_classes = [
+        ProjectEntityPermission,
+    ]
+    search_fields = [
+        "name",
+    ]
+
+    def get_queryset(self):
+        subquery = PageFavorite.objects.filter(
+            user=self.request.user,
+            page_id=OuterRef("pk"),
+            project_id=self.kwargs.get("project_id"),
+            workspace__slug=self.kwargs.get("slug"),
+        )
+        return self.filter_queryset(
+            super()
+            .get_queryset()
+            .filter(workspace__slug=self.kwargs.get("slug"))
+            .filter(project_id=self.kwargs.get("project_id"))
+            .filter(project__project_projectmember__member=self.request.user)
+            .filter(parent__isnull=True)
+            .filter(Q(owned_by=self.request.user) | Q(access=0))
+            .select_related("project")
+            .select_related("workspace")
+            .select_related("owned_by")
+            .annotate(is_favorite=Exists(subquery))
+            .order_by(self.request.GET.get("order_by", "-created_at"))
+            .prefetch_related("labels")
+            .order_by("-is_favorite", "-created_at")
+            .distinct()
+        )
+
+    def create(self, request, slug, project_id):
+        serializer = PageSerializer(
+            data=request.data,
+            context={"project_id": project_id, "owned_by_id": request.user.id},
+        )
+
+        if serializer.is_valid():
+            serializer.save()
+            return Response(serializer.data, status=status.HTTP_201_CREATED)
+        return Response(serializer.errors, 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)
+
+            if page.is_locked:
+                return Response(
+                    {"error": "Page is locked"},
+                    status=status.HTTP_400_BAD_REQUEST,
+                )
+
+            parent = request.data.get("parent", None)
+            if parent:
+                _ = Page.objects.get(
+                    pk=parent, 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": "Access cannot be updated since this page is owned by someone else"
+                },
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+
+    def lock(self, request, slug, project_id, page_id):
+        page = Page.objects.get(pk=page_id, workspace__slug=slug, project_id=project_id)
+
+        # only the owner can lock the page
+        if request.user.id != page.owned_by_id:
+            return Response(
+                {"error": "Only the page owner can lock the page"},
+            )
+
+        page.is_locked = True
+        page.save()
+        return Response(status=status.HTTP_204_NO_CONTENT)
+
+    def unlock(self, request, slug, project_id, page_id):
+        page = Page.objects.get(pk=page_id, workspace__slug=slug, project_id=project_id)
+
+        # only the owner can unlock the page
+        if request.user.id != page.owned_by_id:
+            return Response(
+                {"error": "Only the page owner can unlock the page"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+        page.is_locked = False
+        page.save()
+
+        return Response(status=status.HTTP_204_NO_CONTENT)
+
+    def list(self, request, slug, project_id):
+        queryset = self.get_queryset().filter(archived_at__isnull=True)
+        page_view = request.GET.get("page_view", False)
+
+        if not page_view:
+            return Response(
+                {"error": "Page View parameter is required"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+
+        # All Pages
+        if page_view == "all":
+            return Response(
+                PageSerializer(queryset, many=True).data, status=status.HTTP_200_OK
+            )
+
+        # Recent pages
+        if page_view == "recent":
+            current_time = date.today()
+            day_before = current_time - timedelta(days=1)
+            todays_pages = queryset.filter(updated_at__date=date.today())
+            yesterdays_pages = queryset.filter(updated_at__date=day_before)
+            earlier_this_week = queryset.filter(
+                updated_at__date__range=(
+                    (timezone.now() - timedelta(days=7)),
+                    (timezone.now() - timedelta(days=2)),
+                )
+            )
+            return Response(
+                {
+                    "today": PageSerializer(todays_pages, many=True).data,
+                    "yesterday": PageSerializer(yesterdays_pages, many=True).data,
+                    "earlier_this_week": PageSerializer(
+                        earlier_this_week, many=True
+                    ).data,
+                },
+                status=status.HTTP_200_OK,
+            )
+
+        # Favorite Pages
+        if page_view == "favorite":
+            queryset = queryset.filter(is_favorite=True)
+            return Response(
+                PageSerializer(queryset, many=True).data, status=status.HTTP_200_OK
+            )
+
+        # My pages
+        if page_view == "created_by_me":
+            queryset = queryset.filter(owned_by=request.user)
+            return Response(
+                PageSerializer(queryset, many=True).data, status=status.HTTP_200_OK
+            )
+
+        # Created by other Pages
+        if page_view == "created_by_other":
+            queryset = queryset.filter(~Q(owned_by=request.user), access=0)
+            return Response(
+                PageSerializer(queryset, many=True).data, status=status.HTTP_200_OK
+            )
+
+        return Response(
+            {"error": "No matching view found"}, status=status.HTTP_400_BAD_REQUEST
+        )
+
+    def archive(self, request, slug, project_id, page_id):
+        page = Page.objects.get(pk=page_id, workspace__slug=slug, project_id=project_id)
+
+        if page.owned_by_id != request.user.id:
+            return Response(
+                {"error": "Only the owner of the page can archive a page"},
+                status=status.HTTP_204_NO_CONTENT,
+            )
+
+        unarchive_archive_page_and_descendants(page_id, datetime.now())
+
+        return Response(status=status.HTTP_204_NO_CONTENT)
+
+    def unarchive(self, request, slug, project_id, page_id):
+        page = Page.objects.get(pk=page_id, workspace__slug=slug, project_id=project_id)
+
+        if page.owned_by_id != request.user.id:
+            return Response(
+                {"error": "Only the owner of the page can unarchive a page"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+        
+        # if parent page is archived then the page will be un archived breaking the hierarchy
+        if page.parent_id and page.parent.archived_at:
+            page.parent = None
+            page.save(update_fields=['parent'])
+
+        unarchive_archive_page_and_descendants(page_id, None)
+
+        return Response(status=status.HTTP_204_NO_CONTENT)
+
+    def archive_list(self, request, slug, project_id):
+        pages = (
+            Page.objects.filter(
+                project_id=project_id,
+                workspace__slug=slug,
+            )
+            .filter(archived_at__isnull=False)
+        )
+
+        return Response(
+            PageSerializer(pages, many=True).data, status=status.HTTP_200_OK
+        )
+
+
+class PageFavoriteViewSet(BaseViewSet):
+    permission_classes = [
+        ProjectEntityPermission,
+    ]
+
+    serializer_class = PageFavoriteSerializer
+    model = PageFavorite
+
+    def get_queryset(self):
+        return self.filter_queryset(
+            super()
+            .get_queryset()
+            .filter(archived_at__isnull=True)
+            .filter(workspace__slug=self.kwargs.get("slug"))
+            .filter(user=self.request.user)
+            .select_related("page", "page__owned_by")
+        )
+
+    def create(self, request, slug, project_id):
+        serializer = PageFavoriteSerializer(data=request.data)
+        if serializer.is_valid():
+            serializer.save(user=request.user, project_id=project_id)
+            return Response(serializer.data, status=status.HTTP_201_CREATED)
+        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
+
+    def destroy(self, request, slug, project_id, page_id):
+        page_favorite = PageFavorite.objects.get(
+            project=project_id,
+            user=request.user,
+            workspace__slug=slug,
+            page_id=page_id,
+        )
+        page_favorite.delete()
+        return Response(status=status.HTTP_204_NO_CONTENT)
+
+class PageLogEndpoint(BaseAPIView):
+    permission_classes = [
+        ProjectEntityPermission,
+    ]
+
+    serializer_class = PageLogSerializer
+    model = PageLog
+
+    def post(self, request, slug, project_id, page_id):
+        serializer = PageLogSerializer(data=request.data)
+        if serializer.is_valid():
+            serializer.save(project_id=project_id, page_id=page_id)
+            return Response(serializer.data, status=status.HTTP_201_CREATED)
+        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
+
+    def patch(self, request, slug, project_id, page_id, transaction):
+        page_transaction = PageLog.objects.get(
+            workspace__slug=slug,
+            project_id=project_id,
+            page_id=page_id,
+            transaction=transaction,
+        )
+        serializer = PageLogSerializer(
+            page_transaction, 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)
+
+    def delete(self, request, slug, project_id, page_id, transaction):
+        transaction = PageLog.objects.get(
+            workspace__slug=slug,
+            project_id=project_id,
+            page_id=page_id,
+            transaction=transaction,
+        )
+        # Delete the transaction object
+        transaction.delete()
+        return Response(status=status.HTTP_204_NO_CONTENT)
+
+
+class CreateIssueFromBlockEndpoint(BaseAPIView):
+    permission_classes = [
+        ProjectEntityPermission,
+    ]
+
+    def post(self, request, slug, project_id, page_id):
+        page = Page.objects.get(
+            workspace__slug=slug,
+            project_id=project_id,
+            pk=page_id,
+        )
+        issue = Issue.objects.create(
+            name=request.data.get("name"),
+            project_id=project_id,
+        )
+        _ = IssueAssignee.objects.create(
+            issue=issue, assignee=request.user, project_id=project_id
+        )
+
+        _ = IssueActivity.objects.create(
+            issue=issue,
+            actor=request.user,
+            project_id=project_id,
+            comment=f"created the issue from {page.name} block",
+            verb="created",
+        )
+
+        return Response(IssueLiteSerializer(issue).data, status=status.HTTP_200_OK)
+
+
+class SubPagesEndpoint(BaseAPIView):
+    permission_classes = [
+        ProjectEntityPermission,
+    ]
+
+    @method_decorator(gzip_page)
+    def get(self, request, slug, project_id, page_id):
+        pages = (
+            PageLog.objects.filter(
+                page_id=page_id,
+                project_id=project_id,
+                workspace__slug=slug,
+                entity_name__in=["forward_link", "back_link"],
+            )
+            .select_related("project")
+            .select_related("workspace")
+        )
+        return Response(
+            SubPageSerializer(pages, many=True).data, status=status.HTTP_200_OK
+        )

apiserver/plane/app/views/project.py

@@ -26,8 +26,8 @@ from rest_framework import serializers
 from rest_framework.permissions import AllowAny
 
 # Module imports
-from .base import BaseViewSet, BaseAPIView, WebhookMixin
-from plane.api.serializers import (
+from .base import BaseViewSet, BaseAPIView, WebhookMixin, AnalyticsMixin
+from plane.app.serializers import (
     ProjectSerializer,
     ProjectListSerializer,
     ProjectMemberSerializer,
@@ -38,12 +38,9 @@ from plane.api.serializers import (
     ProjectMemberAdminSerializer,
 )
 
-from plane.api.permissions import (
-    WorkspaceUserPermission,
+from plane.app.permissions import (
     ProjectBasePermission,
-    ProjectEntityPermission,
     ProjectMemberPermission,
-    ProjectLitePermission,
 )
 
 from plane.db.models import (
@@ -67,10 +64,11 @@ from plane.db.models import (
 from plane.bgtasks.project_invitation_task import project_invitation
 
 
-class ProjectViewSet(WebhookMixin, BaseViewSet):
+class ProjectViewSet(WebhookMixin, AnalyticsMixin, BaseViewSet):
     serializer_class = ProjectSerializer
     model = Project
     webhook_event = "project"
+    analytic_event = "project"
 
     permission_classes = [
         ProjectBasePermission,
@@ -427,7 +425,7 @@ class ProjectInvitationsViewset(BaseViewSet):
         project_invitations = ProjectMemberInvite.objects.bulk_create(
             project_invitations, batch_size=10, ignore_conflicts=True
         )
-        current_site = f"{request.scheme}://{request.get_host()}",
+        current_site = request.META.get('HTTP_ORIGIN')
 
         # Send invitations
         for invitation in project_invitations:
@@ -965,6 +963,37 @@ class ProjectFavoritesViewSet(BaseViewSet):
         return Response(status=status.HTTP_204_NO_CONTENT)
 
 
+class ProjectPublicCoverImagesEndpoint(BaseAPIView):
+    permission_classes = [
+        AllowAny,
+    ]
+
+    def get(self, request):
+        files = []
+        s3 = boto3.client(
+            "s3",
+            aws_access_key_id=settings.AWS_ACCESS_KEY_ID,
+            aws_secret_access_key=settings.AWS_SECRET_ACCESS_KEY,
+        )
+        params = {
+            "Bucket": settings.AWS_S3_BUCKET_NAME,
+            "Prefix": "static/project-cover/",
+        }
+
+        response = s3.list_objects_v2(**params)
+        # Extracting file keys from the response
+        if "Contents" in response:
+            for content in response["Contents"]:
+                if not content["Key"].endswith(
+                    "/"
+                ):  # This line ensures we're only getting files, not "sub-folders"
+                    files.append(
+                        f"https://{settings.AWS_S3_BUCKET_NAME}.s3.{settings.AWS_REGION}.amazonaws.com/{content['Key']}"
+                    )
+
+        return Response(files, status=status.HTTP_200_OK)
+
+
 class ProjectDeployBoardViewSet(BaseViewSet):
     permission_classes = [
         ProjectMemberPermission,
@@ -1012,77 +1041,4 @@ class ProjectDeployBoardViewSet(BaseViewSet):
         project_deploy_board.save()
 
         serializer = ProjectDeployBoardSerializer(project_deploy_board)
-        return Response(serializer.data, status=status.HTTP_200_OK)
-
-
-class ProjectDeployBoardPublicSettingsEndpoint(BaseAPIView):
-    permission_classes = [
-        AllowAny,
-    ]
-
-    def get(self, request, slug, project_id):
-        project_deploy_board = ProjectDeployBoard.objects.get(
-            workspace__slug=slug, project_id=project_id
-        )
-        serializer = ProjectDeployBoardSerializer(project_deploy_board)
-        return Response(serializer.data, status=status.HTTP_200_OK)
-
-
-class WorkspaceProjectDeployBoardEndpoint(BaseAPIView):
-    permission_classes = [
-        AllowAny,
-    ]
-
-    def get(self, request, slug):
-        projects = (
-            Project.objects.filter(workspace__slug=slug)
-            .annotate(
-                is_public=Exists(
-                    ProjectDeployBoard.objects.filter(
-                        workspace__slug=slug, project_id=OuterRef("pk")
-                    )
-                )
-            )
-            .filter(is_public=True)
-        ).values(
-            "id",
-            "identifier",
-            "name",
-            "description",
-            "emoji",
-            "icon_prop",
-            "cover_image",
-        )
-
-        return Response(projects, status=status.HTTP_200_OK)
-
-
-class ProjectPublicCoverImagesEndpoint(BaseAPIView):
-    permission_classes = [
-        AllowAny,
-    ]
-
-    def get(self, request):
-        files = []
-        s3 = boto3.client(
-            "s3",
-            aws_access_key_id=settings.AWS_ACCESS_KEY_ID,
-            aws_secret_access_key=settings.AWS_SECRET_ACCESS_KEY,
-        )
-        params = {
-            "Bucket": settings.AWS_S3_BUCKET_NAME,
-            "Prefix": "static/project-cover/",
-        }
-
-        response = s3.list_objects_v2(**params)
-        # Extracting file keys from the response
-        if "Contents" in response:
-            for content in response["Contents"]:
-                if not content["Key"].endswith(
-                    "/"
-                ):  # This line ensures we're only getting files, not "sub-folders"
-                    files.append(
-                        f"https://{settings.AWS_S3_BUCKET_NAME}.s3.{settings.AWS_REGION}.amazonaws.com/{content['Key']}"
-                    )
-
-        return Response(files, status=status.HTTP_200_OK)
+        return Response(serializer.data, status=status.HTTP_200_OK)

apiserver/plane/app/views/search.py

@@ -7,7 +7,6 @@ from django.db.models import Q
 # Third party imports
 from rest_framework import status
 from rest_framework.response import Response
-from sentry_sdk import capture_exception
 
 # Module imports
 from .base import BaseAPIView

apiserver/plane/app/views/state.py

@@ -7,12 +7,11 @@ from django.db.models import Q
 # Third party imports
 from rest_framework.response import Response
 from rest_framework import status
-from sentry_sdk import capture_exception
 
 # Module imports
-from . import BaseViewSet, BaseAPIView
-from plane.api.serializers import StateSerializer
-from plane.api.permissions import ProjectEntityPermission
+from . import BaseViewSet
+from plane.app.serializers import StateSerializer
+from plane.app.permissions import ProjectEntityPermission
 from plane.db.models import State, Issue
 
 

apiserver/plane/app/views/user.py

@@ -2,18 +2,18 @@
 from rest_framework.response import Response
 from rest_framework import status
 
-from sentry_sdk import capture_exception
 
 # Module imports
-from plane.api.serializers import (
+from plane.app.serializers import (
     UserSerializer,
     IssueActivitySerializer,
     UserMeSerializer,
     UserMeSettingsSerializer,
 )
 
-from plane.api.views.base import BaseViewSet, BaseAPIView
+from plane.app.views.base import BaseViewSet, BaseAPIView
 from plane.db.models import User, IssueActivity, WorkspaceMember
+from plane.license.models import Instance, InstanceAdmin
 from plane.utils.paginator import BasePaginator
 
 
@@ -35,12 +35,17 @@ class UserEndpoint(BaseViewSet):
         serialized_data = UserMeSettingsSerializer(request.user).data
         return Response(serialized_data, status=status.HTTP_200_OK)
 
+    def retrieve_instance_admin(self, request):
+        instance = Instance.objects.first()
+        is_admin = InstanceAdmin.objects.filter(
+            instance=instance, user=request.user
+        ).exists()
+        return Response({"is_instance_admin": is_admin}, status=status.HTTP_200_OK)
+
     def deactivate(self, request):
         # Check all workspace user is active
         user = self.get_object()
-        if WorkspaceMember.objects.filter(
-            member=request.user, is_active=True
-        ).exists():
+        if WorkspaceMember.objects.filter(member=request.user, is_active=True).exists():
             return Response(
                 {
                     "error": "User cannot deactivate account as user is active in some workspaces"

apiserver/plane/app/views/view.py

@@ -18,17 +18,16 @@ from django.db.models import Prefetch, OuterRef, Exists
 # Third party imports
 from rest_framework.response import Response
 from rest_framework import status
-from sentry_sdk import capture_exception
 
 # Module imports
-from . import BaseViewSet, BaseAPIView
-from plane.api.serializers import (
+from . import BaseViewSet
+from plane.app.serializers import (
     GlobalViewSerializer,
     IssueViewSerializer,
     IssueLiteSerializer,
     IssueViewFavoriteSerializer,
 )
-from plane.api.permissions import WorkspaceEntityPermission, ProjectEntityPermission
+from plane.app.permissions import WorkspaceEntityPermission, ProjectEntityPermission
 from plane.db.models import (
     Workspace,
     GlobalView,

apiserver/plane/app/views/webhook.py

@@ -9,8 +9,8 @@ from rest_framework.response import Response
 from plane.db.models import Webhook, WebhookLog, Workspace
 from plane.db.models.webhook import generate_token
 from .base import BaseAPIView
-from plane.api.permissions import WorkspaceOwnerPermission
-from plane.api.serializers import WebhookSerializer, WebhookLogSerializer
+from plane.app.permissions import WorkspaceOwnerPermission
+from plane.app.serializers import WebhookSerializer, WebhookLogSerializer
 
 
 class WebhookEndpoint(BaseAPIView):