binarybeach/bb-plane-fork
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[WEB-2173] fix: app sidebar spacing and build error (#5300)

Browse source 
* fix: app sidebar spacing

* fix: build error
This commit is contained in:
Anmol Singh Bhatia 2024-08-05 15:13:51 +05:30 • committed by GitHub
parent f9e7a5826b
commit 21343034c2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 19 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
admin/app/general/form.tsx
View file

@ -9,9 +9,9 @@ import { IInstance, IInstanceAdmin } from "@plane/types";
import { Button, Input, TOAST_TYPE, ToggleSwitch, setToast } from "@plane/ui"; import { Button, Input, TOAST_TYPE, ToggleSwitch, setToast } from "@plane/ui";
// components // components
import { ControllerInput } from "@/components/common"; import { ControllerInput } from "@/components/common";
import { useInstance } from "@/hooks/store";
import { IntercomConfig } from "./intercom"; import { IntercomConfig } from "./intercom";
// hooks // hooks
import { useInstance } from "@/hooks/store";
export interface IGeneralConfigurationForm { export interface IGeneralConfigurationForm {
instance: IInstance; instance: IInstance;

8
admin/app/general/intercom.tsx
View file

@ -1,11 +1,11 @@
"use client"; "use client";
import { FC, FormEvent, useEffect, useState } from "react"; import { FC, useState } from "react";
import { observer } from "mobx-react"; import { observer } from "mobx-react";
import { MessageSquare } from "lucide-react";
import useSWR from "swr"; import useSWR from "swr";
import { MessageSquare } from "lucide-react";
import { IFormattedInstanceConfiguration } from "@plane/types"; import { IFormattedInstanceConfiguration } from "@plane/types";
import { Button, Input, ToggleSwitch } from "@plane/ui"; import { ToggleSwitch } from "@plane/ui";
// hooks // hooks
import { useInstance } from "@/hooks/store"; import { useInstance } from "@/hooks/store";
@ -16,7 +16,7 @@ type TIntercomConfig = {
export const IntercomConfig: FC<TIntercomConfig> = observer((props) => { export const IntercomConfig: FC<TIntercomConfig> = observer((props) => {
const { isTelemetryEnabled } = props; const { isTelemetryEnabled } = props;
// hooks // hooks
const { instanceConfigurations, instance, updateInstanceConfigurations, fetchInstanceConfigurations } = useInstance(); const { instanceConfigurations, updateInstanceConfigurations, fetchInstanceConfigurations } = useInstance();
// states // states
const [isSubmitting, setIsSubmitting] = useState<boolean>(false); const [isSubmitting, setIsSubmitting] = useState<boolean>(false);

14
web/app/[workspaceSlug]/(projects)/sidebar.tsx
View file

@ -53,21 +53,23 @@ export const AppSidebar: FC<IAppSidebar> = observer(() => {
> >
<div <div
ref={ref} ref={ref}
className={cn("size-full flex flex-col flex-1 p-4 pb-0", { className={cn("size-full flex flex-col flex-1 pt-4 pb-0", {
"p-2": sidebarCollapsed, "p-2": sidebarCollapsed,
})} })}
> >
<SidebarDropdown /> <div className="px-4">
<div className="flex-shrink-0 h-4" /> <SidebarDropdown />
<SidebarAppSwitcher /> <div className="flex-shrink-0 h-4" />
<SidebarQuickActions /> <SidebarAppSwitcher />
<SidebarQuickActions />
</div>
<hr <hr
className={cn("flex-shrink-0 border-custom-sidebar-border-300 h-[0.5px] w-3/5 mx-auto my-1", { className={cn("flex-shrink-0 border-custom-sidebar-border-300 h-[0.5px] w-3/5 mx-auto my-1", {
"opacity-0": !sidebarCollapsed, "opacity-0": !sidebarCollapsed,
})} })}
/> />
<div <div
className={cn("overflow-x-hidden scrollbar-sm h-full w-full overflow-y-auto px-2.5", { className={cn("overflow-x-hidden scrollbar-sm h-full w-full overflow-y-auto px-4", {
"vertical-scrollbar": !sidebarCollapsed, "vertical-scrollbar": !sidebarCollapsed,
})} })}
> >

7
web/core/components/workspace/sidebar/favorites/favorite-folder.tsx
View file

@ -306,7 +306,12 @@ export const FavoriteFolder: React.FC<Props> = (props) => {
leaveFrom="transform scale-100 opacity-100" leaveFrom="transform scale-100 opacity-100"
leaveTo="transform scale-95 opacity-0" leaveTo="transform scale-95 opacity-0"
> >
<Disclosure.Panel as="div" className="flex flex-col gap-0.5 mt-1 px-2"> <Disclosure.Panel
as="div"
className={cn("flex flex-col gap-0.5 mt-1", {
"px-2": !isSidebarCollapsed,
})}
>
{favorite.children.map((child) => ( {favorite.children.map((child) => (
<FavoriteItem <FavoriteItem
key={child.id} key={child.id}