mirror of
https://github.com/mountain-loop/yaak.git
synced 2026-11-17 14:11:23 +01:00
Move stuff around
This commit is contained in:
1 parent
02574cf5e0
commit
a209a486aa
51 files changed
+52
-202
No files matched your search
@@ -0,0 +1,89 @@
|
||||
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
|
||||
import { listen } from '@tauri-apps/api/event';
|
||||
import { MotionConfig } from 'framer-motion';
|
||||
import { HelmetProvider } from 'react-helmet-async';
|
||||
import { AppRouter } from './AppRouter';
|
||||
import { requestsQueryKey } from '../hooks/useRequests';
|
||||
import { responsesQueryKey } from '../hooks/useResponses';
|
||||
import { DEFAULT_FONT_SIZE } from '../lib/constants';
|
||||
import type { HttpRequest, HttpResponse } from '../lib/models';
|
||||
import { convertDates } from '../lib/models';
|
||||
|
||||
const queryClient = new QueryClient();
|
||||
|
||||
await listen('updated_request', ({ payload: request }: { payload: HttpRequest }) => {
|
||||
queryClient.setQueryData(
|
||||
requestsQueryKey(request.workspaceId),
|
||||
(requests: HttpRequest[] = []) => {
|
||||
const newRequests = [];
|
||||
let found = false;
|
||||
for (const r of requests) {
|
||||
if (r.id === request.id) {
|
||||
found = true;
|
||||
newRequests.push(convertDates(request));
|
||||
} else {
|
||||
newRequests.push(r);
|
||||
}
|
||||
}
|
||||
if (!found) {
|
||||
newRequests.push(convertDates(request));
|
||||
}
|
||||
return newRequests;
|
||||
},
|
||||
);
|
||||
});
|
||||
|
||||
await listen('deleted_request', ({ payload: request }: { payload: HttpRequest }) => {
|
||||
queryClient.setQueryData(requestsQueryKey(request.workspaceId), (requests: HttpRequest[] = []) =>
|
||||
requests.filter((r) => r.id !== request.id),
|
||||
);
|
||||
});
|
||||
|
||||
await listen('updated_response', ({ payload: response }: { payload: HttpResponse }) => {
|
||||
queryClient.setQueryData(
|
||||
responsesQueryKey(response.requestId),
|
||||
(responses: HttpResponse[] = []) => {
|
||||
const newResponses = [];
|
||||
let found = false;
|
||||
for (const r of responses) {
|
||||
if (r.id === response.id) {
|
||||
found = true;
|
||||
newResponses.push(convertDates(response));
|
||||
} else {
|
||||
newResponses.push(r);
|
||||
}
|
||||
}
|
||||
if (!found) {
|
||||
newResponses.push(convertDates(response));
|
||||
}
|
||||
return newResponses;
|
||||
},
|
||||
);
|
||||
});
|
||||
|
||||
await listen('zoom', ({ payload: zoomDelta }: { payload: number }) => {
|
||||
const fontSize = parseFloat(window.getComputedStyle(document.documentElement).fontSize);
|
||||
|
||||
let newFontSize;
|
||||
if (zoomDelta === 0) {
|
||||
newFontSize = DEFAULT_FONT_SIZE;
|
||||
} else if (zoomDelta > 0) {
|
||||
newFontSize = Math.min(fontSize * 1.1, DEFAULT_FONT_SIZE * 5);
|
||||
} else if (zoomDelta < 0) {
|
||||
newFontSize = Math.max(fontSize * 0.9, DEFAULT_FONT_SIZE * 0.4);
|
||||
}
|
||||
|
||||
document.documentElement.style.fontSize = `${newFontSize}px`;
|
||||
});
|
||||
|
||||
export function App() {
|
||||
return (
|
||||
<QueryClientProvider client={queryClient}>
|
||||
<MotionConfig transition={{ duration: 0.1 }}>
|
||||
<HelmetProvider>
|
||||
<AppRouter />
|
||||
</HelmetProvider>
|
||||
</MotionConfig>
|
||||
</QueryClientProvider>
|
||||
);
|
||||
}
|
||||
@@ -1,8 +1,8 @@
|
||||
import { lazy, Suspense } from 'react';
|
||||
import { createBrowserRouter, RouterProvider } from 'react-router-dom';
|
||||
|
||||
const Workspaces = lazy(() => import('../pages/Workspaces'));
|
||||
const Workspace = lazy(() => import('../pages/Workspace'));
|
||||
const Workspaces = lazy(() => import('./Workspaces'));
|
||||
const Workspace = lazy(() => import('./Workspace'));
|
||||
const RouteError = lazy(() => import('./RouteError'));
|
||||
|
||||
const router = createBrowserRouter([
|
||||
|
||||
@@ -1,104 +0,0 @@
|
||||
import classnames from 'classnames';
|
||||
import { HStack, VStack } from './Stacks';
|
||||
|
||||
export function Colors() {
|
||||
return (
|
||||
<HStack>
|
||||
<VStack>
|
||||
<Color className="bg-gray-50" />
|
||||
<Color className="bg-gray-100" />
|
||||
<Color className="bg-gray-200" />
|
||||
<Color className="bg-gray-300" />
|
||||
<Color className="bg-gray-400" />
|
||||
<Color className="bg-gray-500" />
|
||||
<Color className="bg-gray-600" />
|
||||
<Color className="bg-gray-700" />
|
||||
<Color className="bg-gray-800" />
|
||||
<Color className="bg-gray-900" />
|
||||
<Color className="bg-gray-950" />
|
||||
</VStack>
|
||||
<VStack>
|
||||
<Color className="bg-red-50" />
|
||||
<Color className="bg-red-100" />
|
||||
<Color className="bg-red-200" />
|
||||
<Color className="bg-red-300" />
|
||||
<Color className="bg-red-400" />
|
||||
<Color className="bg-red-500" />
|
||||
<Color className="bg-red-600" />
|
||||
<Color className="bg-red-700" />
|
||||
<Color className="bg-red-800" />
|
||||
<Color className="bg-red-900" />
|
||||
<Color className="bg-red-950" />
|
||||
</VStack>
|
||||
<VStack>
|
||||
<Color className="bg-orange-50" />
|
||||
<Color className="bg-orange-100" />
|
||||
<Color className="bg-orange-200" />
|
||||
<Color className="bg-orange-300" />
|
||||
<Color className="bg-orange-400" />
|
||||
<Color className="bg-orange-500" />
|
||||
<Color className="bg-orange-600" />
|
||||
<Color className="bg-orange-700" />
|
||||
<Color className="bg-orange-800" />
|
||||
<Color className="bg-orange-900" />
|
||||
<Color className="bg-orange-950" />
|
||||
</VStack>
|
||||
<VStack>
|
||||
<Color className="bg-yellow-50" />
|
||||
<Color className="bg-yellow-100" />
|
||||
<Color className="bg-yellow-200" />
|
||||
<Color className="bg-yellow-300" />
|
||||
<Color className="bg-yellow-400" />
|
||||
<Color className="bg-yellow-500" />
|
||||
<Color className="bg-yellow-600" />
|
||||
<Color className="bg-yellow-700" />
|
||||
<Color className="bg-yellow-800" />
|
||||
<Color className="bg-yellow-900" />
|
||||
<Color className="bg-yellow-950" />
|
||||
</VStack>
|
||||
<VStack>
|
||||
<Color className="bg-green-50" />
|
||||
<Color className="bg-green-100" />
|
||||
<Color className="bg-green-200" />
|
||||
<Color className="bg-green-300" />
|
||||
<Color className="bg-green-400" />
|
||||
<Color className="bg-green-500" />
|
||||
<Color className="bg-green-600" />
|
||||
<Color className="bg-green-700" />
|
||||
<Color className="bg-green-800" />
|
||||
<Color className="bg-green-900" />
|
||||
<Color className="bg-green-950" />
|
||||
</VStack>
|
||||
<VStack>
|
||||
<Color className="bg-blue-50" />
|
||||
<Color className="bg-blue-100" />
|
||||
<Color className="bg-blue-200" />
|
||||
<Color className="bg-blue-300" />
|
||||
<Color className="bg-blue-400" />
|
||||
<Color className="bg-blue-500" />
|
||||
<Color className="bg-blue-600" />
|
||||
<Color className="bg-blue-700" />
|
||||
<Color className="bg-blue-800" />
|
||||
<Color className="bg-blue-900" />
|
||||
<Color className="bg-blue-950" />
|
||||
</VStack>
|
||||
<VStack>
|
||||
<Color className="bg-violet-50" />
|
||||
<Color className="bg-violet-100" />
|
||||
<Color className="bg-violet-200" />
|
||||
<Color className="bg-violet-300" />
|
||||
<Color className="bg-violet-400" />
|
||||
<Color className="bg-violet-500" />
|
||||
<Color className="bg-violet-600" />
|
||||
<Color className="bg-violet-700" />
|
||||
<Color className="bg-violet-800" />
|
||||
<Color className="bg-violet-900" />
|
||||
<Color className="bg-violet-950" />
|
||||
</VStack>
|
||||
</HStack>
|
||||
);
|
||||
}
|
||||
|
||||
function Color({ className }: { className: string }) {
|
||||
return <div className={classnames(className, 'w-full h-5')} />;
|
||||
}
|
||||
@@ -1,48 +0,0 @@
|
||||
import classnames from 'classnames';
|
||||
import type { ReactNode } from 'react';
|
||||
|
||||
const colsClasses: Record<string | number, string> = {
|
||||
none: 'grid-cols-none',
|
||||
1: 'grid-cols-1',
|
||||
2: 'grid-cols-2',
|
||||
3: 'grid-cols-3',
|
||||
11: 'grid-cols-11',
|
||||
};
|
||||
|
||||
const rowsClasses = {
|
||||
none: 'grid-rows-none',
|
||||
1: 'grid-rows-1',
|
||||
2: 'grid-rows-2',
|
||||
3: 'grid-rows-3',
|
||||
11: 'grid-rows-11',
|
||||
};
|
||||
|
||||
const gapClasses = {
|
||||
0: 'gap-0',
|
||||
1: 'gap-1',
|
||||
2: 'gap-2',
|
||||
3: 'gap-3',
|
||||
};
|
||||
|
||||
interface Props {
|
||||
rows?: keyof typeof rowsClasses;
|
||||
cols?: keyof typeof colsClasses;
|
||||
gap?: keyof typeof gapClasses;
|
||||
className?: string;
|
||||
children?: ReactNode;
|
||||
}
|
||||
|
||||
export function Grid({ className, cols, gap, children }: Props) {
|
||||
return (
|
||||
<div
|
||||
className={classnames(
|
||||
className,
|
||||
'grid w-full',
|
||||
cols && colsClasses[cols],
|
||||
gap && gapClasses[gap],
|
||||
)}
|
||||
>
|
||||
{children}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -2,9 +2,9 @@ import classnames from 'classnames';
|
||||
import { useEffect, useState } from 'react';
|
||||
import { useUpdateRequest } from '../hooks/useUpdateRequest';
|
||||
import type { HttpHeader, HttpRequest } from '../lib/models';
|
||||
import { IconButton } from './IconButton';
|
||||
import { Input } from './Input';
|
||||
import { VStack } from './Stacks';
|
||||
import { IconButton } from './core/IconButton';
|
||||
import { Input } from './core/Input';
|
||||
import { VStack } from './core/Stacks';
|
||||
|
||||
interface Props {
|
||||
request: HttpRequest;
|
||||
|
||||
@@ -2,9 +2,9 @@ import classnames from 'classnames';
|
||||
import { useActiveRequest } from '../hooks/useActiveRequest';
|
||||
import { useSendRequest } from '../hooks/useSendRequest';
|
||||
import { useUpdateRequest } from '../hooks/useUpdateRequest';
|
||||
import { Editor } from './Editor';
|
||||
import { Editor } from './core/Editor';
|
||||
import { HeaderEditor } from './HeaderEditor';
|
||||
import { TabContent, Tabs } from './Tabs';
|
||||
import { TabContent, Tabs } from './core/Tabs/Tabs';
|
||||
import { UrlBar } from './UrlBar';
|
||||
|
||||
interface Props {
|
||||
|
||||
@@ -4,13 +4,13 @@ import { useDeleteResponses } from '../hooks/useDeleteResponses';
|
||||
import { useDeleteResponse } from '../hooks/useResponseDelete';
|
||||
import { useResponses } from '../hooks/useResponses';
|
||||
import { tryFormatJson } from '../lib/formatters';
|
||||
import { Dropdown } from './Dropdown';
|
||||
import { Editor } from './Editor';
|
||||
import { Icon } from './Icon';
|
||||
import { IconButton } from './IconButton';
|
||||
import { HStack } from './Stacks';
|
||||
import { StatusColor } from './StatusColor';
|
||||
import { Webview } from './Webview';
|
||||
import { Dropdown } from './core/Dropdown';
|
||||
import { Editor } from './core/Editor';
|
||||
import { Icon } from './core/Icon';
|
||||
import { IconButton } from './core/IconButton';
|
||||
import { HStack } from './core/Stacks';
|
||||
import { StatusColor } from './core/StatusColor';
|
||||
import { Webview } from './core/Webview';
|
||||
|
||||
interface Props {
|
||||
className?: string;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { useRouteError } from 'react-router-dom';
|
||||
import { ButtonLink } from './ButtonLink';
|
||||
import { Heading } from './Heading';
|
||||
import { VStack } from './Stacks';
|
||||
import { ButtonLink } from './core/ButtonLink';
|
||||
import { Heading } from './core/Heading';
|
||||
import { VStack } from './core/Stacks';
|
||||
|
||||
export default function RouteError() {
|
||||
const error = useRouteError();
|
||||
|
||||
@@ -6,10 +6,10 @@ import { useRequests } from '../hooks/useRequests';
|
||||
import { useTheme } from '../hooks/useTheme';
|
||||
import { useUpdateRequest } from '../hooks/useUpdateRequest';
|
||||
import type { HttpRequest } from '../lib/models';
|
||||
import { ButtonLink } from './ButtonLink';
|
||||
import { IconButton } from './IconButton';
|
||||
import { HStack, VStack } from './Stacks';
|
||||
import { WindowDragRegion } from './WindowDragRegion';
|
||||
import { ButtonLink } from './core/ButtonLink';
|
||||
import { IconButton } from './core/IconButton';
|
||||
import { HStack, VStack } from './core/Stacks';
|
||||
import { WindowDragRegion } from './core/WindowDragRegion';
|
||||
|
||||
interface Props {
|
||||
className?: string;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { Button } from './Button';
|
||||
import { DropdownMenuRadio } from './Dropdown';
|
||||
import { IconButton } from './IconButton';
|
||||
import { Input } from './Input';
|
||||
import { Button } from './core/Button';
|
||||
import { DropdownMenuRadio } from './core/Dropdown';
|
||||
import { IconButton } from './core/IconButton';
|
||||
import { Input } from './core/Input';
|
||||
|
||||
interface Props {
|
||||
sendRequest: () => void;
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
import classnames from 'classnames';
|
||||
import { useWindowSize } from 'react-use';
|
||||
import { RequestPane } from './RequestPane';
|
||||
import { ResponsePane } from './ResponsePane';
|
||||
import { Sidebar } from './Sidebar';
|
||||
import { HStack } from './core/Stacks';
|
||||
import { WindowDragRegion } from './core/WindowDragRegion';
|
||||
import { useActiveRequest } from '../hooks/useActiveRequest';
|
||||
|
||||
export default function Workspace() {
|
||||
const activeRequest = useActiveRequest();
|
||||
const { width } = useWindowSize();
|
||||
const isH = width > 900;
|
||||
|
||||
return (
|
||||
<div className="grid grid-cols-[auto_1fr] grid-rows-1 h-full text-gray-900">
|
||||
<Sidebar />
|
||||
<div className="grid grid-rows-[auto_minmax(0,1fr)] h-full">
|
||||
<HStack
|
||||
as={WindowDragRegion}
|
||||
className="px-3 bg-gray-50 text-gray-900 border-b border-b-gray-200 pt-[1px]"
|
||||
alignItems="center"
|
||||
>
|
||||
{activeRequest?.name}
|
||||
</HStack>
|
||||
<div
|
||||
className={classnames(
|
||||
'grid',
|
||||
isH
|
||||
? 'grid-cols-[1fr_1fr] grid-rows-1'
|
||||
: 'grid-cols-1 grid-rows-[minmax(0,auto)_minmax(0,100%)]',
|
||||
)}
|
||||
>
|
||||
<RequestPane fullHeight={isH} className={classnames(!isH && 'pr-2 pb-0')} />
|
||||
<ResponsePane />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
import { ButtonLink } from './core/ButtonLink';
|
||||
import { Heading } from './core/Heading';
|
||||
import { VStack } from './core/Stacks';
|
||||
import { useWorkspaces } from '../hooks/useWorkspaces';
|
||||
|
||||
export default function Workspaces() {
|
||||
const workspaces = useWorkspaces();
|
||||
return (
|
||||
<VStack as="ul" className="p-12">
|
||||
<Heading>Workspaces</Heading>
|
||||
{workspaces.map((w) => (
|
||||
<ButtonLink key={w.id} color="gray" to={`/workspaces/${w.id}`}>
|
||||
{w.name}
|
||||
</ButtonLink>
|
||||
))}
|
||||
</VStack>
|
||||
);
|
||||
}
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -6,7 +6,7 @@ import { EditorView } from 'codemirror';
|
||||
import { formatSdl } from 'format-graphql';
|
||||
import { useEffect, useRef } from 'react';
|
||||
import { useDebounce, useUnmount } from 'react-use';
|
||||
import { debounce } from '../../lib/debounce';
|
||||
import { debounce } from '../../../lib/debounce';
|
||||
import { IconButton } from '../IconButton';
|
||||
import './Editor.css';
|
||||
import { baseExtensions, getLanguageExtension, multiLineExtensions } from './extensions';
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
import { closeCompletion, startCompletion } from '@codemirror/autocomplete';
|
||||
import { EditorView } from 'codemirror';
|
||||
import { debounce } from '../../lib/debounce';
|
||||
import { debounce } from '../../../lib/debounce';
|
||||
|
||||
/*
|
||||
* Debounce autocomplete until user stops typing for `millis` milliseconds.
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -1,5 +1,5 @@
|
||||
import classnames from 'classnames';
|
||||
import { forwardRef } from "react";
|
||||
import { forwardRef } from 'react';
|
||||
import type { ButtonProps } from './Button';
|
||||
import { Button } from './Button';
|
||||
import type { IconProps } from './Icon';
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -2,9 +2,9 @@ import * as T from '@radix-ui/react-tabs';
|
||||
import classnames from 'classnames';
|
||||
import type { ReactNode } from 'react';
|
||||
import { useState } from 'react';
|
||||
import { Button } from './Button';
|
||||
import { ScrollArea } from './ScrollArea';
|
||||
import { HStack } from './Stacks';
|
||||
import { Button } from '../Button';
|
||||
import { ScrollArea } from '../ScrollArea';
|
||||
import { HStack } from '../Stacks';
|
||||
|
||||
import './Tabs.css';
|
||||
|
||||
@@ -27,7 +27,10 @@ export function Tabs({ defaultValue, label, children, tabs, className, tabListCl
|
||||
>
|
||||
<T.List
|
||||
aria-label={label}
|
||||
className={classnames(tabListClassName, 'h-auto flex items-center overflow-x-auto mb-1 pb-1')}
|
||||
className={classnames(
|
||||
tabListClassName,
|
||||
'h-auto flex items-center overflow-x-auto mb-1 pb-1',
|
||||
)}
|
||||
>
|
||||
{/*<ScrollArea className="w-full pb-2">*/}
|
||||
<HStack space={1}>
|
||||
File renamed without changes.
File renamed without changes.
Reference in new issue
Block a user