Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make scratchpad banner dismissable #6620

Merged
merged 2 commits into from
Oct 2, 2023
Merged

Make scratchpad banner dismissable #6620

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
12ab947
make scratchpad banner dismissable
gatzjames Oct 2, 2023
0e3c322
update banner text
gatzjames Oct 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
27 changes: 19 additions & 8 deletions packages/insomnia/src/ui/routes/organization.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import {
useParams,
useRouteLoaderData,
} from 'react-router-dom';
import { useLocalStorage } from 'react-use';

import * as session from '../../account/session';
import {
Expand Down Expand Up @@ -349,6 +350,11 @@ const OrganizationRoute = () => {
':workspaceId',
) as WorkspaceLoaderData | null;
const logoutFetcher = useFetcher();
const [isScratchPadBannerDismissed, setIsScratchPadBannerDismissed] = useLocalStorage('scratchpad-banner-dismissed', '');
const isScratchpadWorkspace =
workspaceData?.activeWorkspace &&
isScratchpad(workspaceData.activeWorkspace);
const isScratchPadBannerVisible = !isScratchPadBannerDismissed && isScratchpadWorkspace;

const { organizationId, projectId, workspaceId } = useParams() as {
organizationId: string;
Expand All @@ -370,14 +376,10 @@ const OrganizationRoute = () => {
};
}, []);

const isScratchpadWorkspace =
workspaceData?.activeWorkspace &&
isScratchpad(workspaceData.activeWorkspace);

return (
<PresenceProvider>
<div className="w-full h-full">
<div className={`w-full h-full divide-x divide-solid divide-y divide-[--hl-md] ${workspaceData?.activeWorkspace && isScratchpad(workspaceData?.activeWorkspace) ? 'grid-template-app-layout-with-banner' : 'grid-template-app-layout'} grid relative bg-[--color-bg]`}>
<div className={`w-full h-full divide-x divide-solid divide-y divide-[--hl-md] ${isScratchPadBannerVisible ? 'grid-template-app-layout-with-banner' : 'grid-template-app-layout'} grid relative bg-[--color-bg]`}>
<header className="[grid-area:Header] grid grid-cols-3 items-center">
<div className="flex items-center">
<div className="flex w-[50px] py-2">
Expand Down Expand Up @@ -483,7 +485,7 @@ const OrganizationRoute = () => {
)}
</div>
</header>
{isScratchpadWorkspace ? (
{isScratchPadBannerVisible ? (
<div className="flex h-[30px] items-center [grid-area:Banner] text-white bg-gradient-to-r from-[#7400e1] to-[#4000bf]">
<div className="flex flex-shrink-0 basis-[50px] h-full">
<div className="border-solid border-r-[--hl-xl] border-r border-l border-l-[--hl-xl] box-border flex items-center justify-center w-full h-full">
Expand All @@ -492,8 +494,9 @@ const OrganizationRoute = () => {
</div>
<div className="py-[--padding-xs] overflow-hidden px-[--padding-md] w-full h-full flex items-center text-xs">
<p className='w-full truncate leading-normal'>
Welcome to the local Scratch Pad. To get the most out of
Insomnia and see your projects{' '}
Welcome to the Scratch Pad where you can work locally with up to 1 collection.
To create more and see your projects
{' '}
<NavLink
to="/auth/login"
className="font-bold text-white inline-flex"
Expand All @@ -502,6 +505,14 @@ const OrganizationRoute = () => {
</NavLink>
</p>
</div>
<Button
className="flex flex-shrink-0 mr-2 items-center justify-center aspect-square h-6 aria-pressed:bg-[--hl-sm] rounded-sm text-[--color-font] hover:bg-[--hl-xs] focus:ring-inset ring-1 ring-transparent focus:ring-[--hl-md] transition-all text-sm"
onPress={() => {
setIsScratchPadBannerDismissed('true');
}}
>
<Icon icon="x" />
</Button>
</div>
) : null}
<div className="[grid-area:Navbar]">
Expand Down