github/plane
0
0
Fork 1
mirror of https://github.com/makeplane/plane synced 2024-06-14 14:31:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1928 from makeplane/develop

Browse Source 
promote: develop to stage-release
This commit is contained in:
Nikhil 2023-08-21 20:51:46 +05:30 committed by GitHub
commit aa2e1697b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/app/components/issues/my-issues/my-issues-view.tsx
View File

@ -270,7 +270,9 @@ export const MyIssuesView: React.FC<Props> = ({
? "You have not created any issue yet." ? "You have not created any issue yet."
: "You have not subscribed to any issue yet.", : "You have not subscribed to any issue yet.",
description: "Keep track of your work in a single place.", description: "Keep track of your work in a single place.",
primaryButton: { primaryButton: filters.subscriber
? undefined
: {
icon: <PlusIcon className="h-4 w-4" />, icon: <PlusIcon className="h-4 w-4" />,
text: "New Issue", text: "New Issue",
onClick: () => { onClick: () => {

10
apps/app/components/project/sidebar-list.tsx
View File

@ -9,7 +9,6 @@ import { DragDropContext, Draggable, DropResult, Droppable } from "react-beautif
import { Disclosure, Transition } from "@headlessui/react"; import { Disclosure, Transition } from "@headlessui/react";
// hooks // hooks
import useToast from "hooks/use-toast"; import useToast from "hooks/use-toast";
import useTheme from "hooks/use-theme";
import useUserAuth from "hooks/use-user-auth"; import useUserAuth from "hooks/use-user-auth";
import useProjects from "hooks/use-projects"; import useProjects from "hooks/use-projects";
// components // components
@ -42,18 +41,15 @@ export const ProjectSidebarList: FC = () => {
const containerRef = useRef<HTMLDivElement | null>(null); const containerRef = useRef<HTMLDivElement | null>(null);
const router = useRouter(); const router = useRouter();
const { workspaceSlug, projectId } = router.query; const { workspaceSlug } = router.query;
const { user } = useUserAuth(); const { user } = useUserAuth();
const { collapsed: sidebarCollapse } = useTheme();
const { setToastAlert } = useToast(); const { setToastAlert } = useToast();
const { projects: allProjects } = useProjects(); const { projects: allProjects } = useProjects();
const joinedProjects = allProjects?.filter((p) => p.sort_order); const joinedProjects = allProjects?.filter((p) => p.sort_order);
const favoriteProjects = allProjects?.filter((p) => p.is_favorite); const favoriteProjects = allProjects?.filter((p) => p.is_favorite);
const otherProjects = allProjects?.filter((p) => p.sort_order === null);
const orderedJoinedProjects: IProject[] | undefined = joinedProjects const orderedJoinedProjects: IProject[] | undefined = joinedProjects
? orderArrayBy(joinedProjects, "sort_order", "ascending") ? orderArrayBy(joinedProjects, "sort_order", "ascending")
@ -300,10 +296,10 @@ export const ProjectSidebarList: FC = () => {
</Droppable> </Droppable>
</DragDropContext> </DragDropContext>
{allProjects && allProjects.length === 0 && ( {joinedProjects && joinedProjects.length === 0 && (
<button <button
type="button" type="button"
className="flex w-full items-center gap-2 px-3 py-2 text-sm text-custom-sidebar-text-200 mt-5" className="flex w-full items-center gap-2 px-3 text-sm text-custom-sidebar-text-200"
onClick={() => { onClick={() => {
const e = new KeyboardEvent("keydown", { const e = new KeyboardEvent("keydown", {
key: "p", key: "p",

2
docker-compose.yml
View File

@ -64,7 +64,7 @@ services:
container_name: planedeploy container_name: planedeploy
build: build:
context: . context: .
dockerfile: ./apps/space/Dockerfile.space space dockerfile: ./apps/space/Dockerfile.space
args: args:
NEXT_PUBLIC_API_BASE_URL: http://localhost:8000 NEXT_PUBLIC_API_BASE_URL: http://localhost:8000
restart: always restart: always