Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
"react-hook-form": "^7.53.2",
"react-redux": "^9.2.0",
"react-router-dom": "^6.28.0",
"redux-persist": "^6.0.0",
"tailwind-merge": "^2.6.0",
"tailwindcss-animate": "^1.0.7",
"zod": "^3.23.8"
Expand Down
5 changes: 4 additions & 1 deletion src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@ import CreateForm from "./components/form/form";
import InfoPage from "./app/explorer/info";
import UpdatePage from "./app/explorer/update_form";

import { selectResources, store } from './state/store';
import { selectResources, store, persistor } from './state/store';
import { Provider } from 'react-redux'
import { PersistGate } from 'redux-persist/integration/react'
import { useAppSelector } from "./hooks/store";

function transformUrlForRouter(url: string): string {
Expand Down Expand Up @@ -52,7 +53,9 @@ function createRoutes(resources: ResourceSchema[]): RouteObject[] {
function App() {
return (
<Provider store={store} >
<PersistGate loading={null} persistor={persistor}>
<Routes />
</PersistGate>
</Provider>
);
}
Expand Down
75 changes: 17 additions & 58 deletions src/app/sidebar/app-sidebar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@ import * as React from "react";
import {
Sidebar,
SidebarContent,
SidebarGroup,
SidebarGroupContent,
SidebarHeader,
SidebarInput,
SidebarRail,
SidebarMenu,
SidebarMenuItem,
SidebarMenuButton,
} from "@/components/ui/sidebar";
import { useAppDispatch, useAppSelector } from "@/hooks/store";
import { selectHeaders, selectRootResources, setHeaders, selectMockServerEnabled, setMockServerEnabled } from "@/state/store";
import { Label } from "../../components/ui/label";
import { Checkbox } from "../../components/ui/checkbox";
import { useAppSelector } from "@/hooks/store";
import { selectRootResources } from "@/state/store";
import { ResourceTypeList } from "@/components/resource_types/resource_type_list";
import { Home } from "lucide-react";
import { Link } from "react-router-dom";

// The AppSidebar. This fetches the list of root resources from the schema and displays them.
export function AppSidebar({ ...props }: React.ComponentProps<typeof Sidebar>) {
Expand All @@ -21,8 +21,16 @@ export function AppSidebar({ ...props }: React.ComponentProps<typeof Sidebar>) {
return (
<Sidebar {...props}>
<SidebarHeader>
<HeadersInput />
<MockServerToggle />
<SidebarMenu>
<SidebarMenuItem>
<SidebarMenuButton asChild>
<Link to="/">
<Home className="h-4 w-4" />
<span>Home</span>
</Link>
</SidebarMenuButton>
</SidebarMenuItem>
</SidebarMenu>
</SidebarHeader>
<SidebarContent>
<ResourceTypeList resources={resources} />
Expand All @@ -31,52 +39,3 @@ export function AppSidebar({ ...props }: React.ComponentProps<typeof Sidebar>) {
</Sidebar>
);
}

export function HeadersInput() {
const headers = useAppSelector(selectHeaders);
const dispatch = useAppDispatch();

const handleTextChange = (event: React.ChangeEvent<HTMLInputElement>) => {
dispatch(setHeaders(event.target.value));
};

return (
<form>
<SidebarGroup className="py-0">
<SidebarGroupContent className="relative">
<Label htmlFor="headers" className="sr-only">
Headers
</Label>
<SidebarInput
id="headers"
placeholder="Headers"
type="text"
value={headers!}
onChange={handleTextChange} />
</SidebarGroupContent>
</SidebarGroup>
</form>
);
}

export function MockServerToggle() {
const mockServerEnabled = useAppSelector(selectMockServerEnabled);
const dispatch = useAppDispatch();

const handleToggle = (event: React.ChangeEvent<HTMLInputElement>) => {
dispatch(setMockServerEnabled(event.target.checked));
};

return (
<SidebarGroup className="py-2">
<SidebarGroupContent>
<Checkbox
id="mock-server"
checked={mockServerEnabled}
onChange={handleToggle}
label="Use Mock Server"
/>
</SidebarGroupContent>
</SidebarGroup>
);
}
17 changes: 6 additions & 11 deletions src/app/spec_specifier/page.tsx
Original file line number Diff line number Diff line change
@@ -1,16 +1,11 @@
import { OASSelector } from "@/components/oas-selector";
import { Settings } from "@/components/settings";
import { useAppSelector } from "@/hooks/store";

Check failure on line 2 in src/app/spec_specifier/page.tsx

View workflow job for this annotation

GitHub Actions / test (20)

'useAppSelector' is defined but never used

Check failure on line 2 in src/app/spec_specifier/page.tsx

View workflow job for this annotation

GitHub Actions / test (18)

'useAppSelector' is defined but never used

Check failure on line 2 in src/app/spec_specifier/page.tsx

View workflow job for this annotation

GitHub Actions / checks

'useAppSelector' is defined but never used
import { schemaState } from "@/state/store";

Check failure on line 3 in src/app/spec_specifier/page.tsx

View workflow job for this annotation

GitHub Actions / test (20)

'schemaState' is defined but never used

Check failure on line 3 in src/app/spec_specifier/page.tsx

View workflow job for this annotation

GitHub Actions / test (18)

'schemaState' is defined but never used

Check failure on line 3 in src/app/spec_specifier/page.tsx

View workflow job for this annotation

GitHub Actions / checks

'schemaState' is defined but never used

export default function SpecSpecifierPage() {
const state = useAppSelector(schemaState);
if(state == 'unset') {
return (
<div className="flex h-screen w-full items-center justify-center px-4">
<OASSelector />
</div>
)
} else {
return <div />
}
return (
<div className="flex h-screen w-full items-center justify-center px-4">
<Settings />
</div>
)
}
107 changes: 0 additions & 107 deletions src/components/oas-selector.tsx

This file was deleted.

Loading
Loading