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

🩹 Simple fix #106

Merged
merged 1 commit into from
Nov 30, 2023
Merged

🩹 Simple fix #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
188 changes: 0 additions & 188 deletions packages/webapp/src/components/api-keys/components/choose-project.tsx
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions packages/webapp/src/components/api-keys/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { PlusCircledIcon } from "@radix-ui/react-icons";
import { Button } from "../ui/button";
import ChooseProjectSwitcher from "./components/choose-project";
import { useEffect, useState } from "react";
import { API_KEYS } from "./data/api-keys";
import { columns } from "./data/columns";
Expand Down Expand Up @@ -41,7 +40,6 @@ export default function ApiKeysPage() {
</div>
<div className="flex space-y-8 md:flex pb-4">
<div></div>
<ChooseProjectSwitcher className="w-52 mr-4" />
<Dialog>
<DialogTrigger asChild>
<Button>
Expand Down
113 changes: 61 additions & 52 deletions packages/webapp/src/components/shared/team-switcher.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,6 @@ import {
PopoverContent,
PopoverTrigger,
} from "@/components/ui/popover"
import {
Select,
SelectContent,
SelectItem,
SelectTrigger,
SelectValue,
} from "@/components/ui/select"

const groups = [
{
Expand Down Expand Up @@ -86,15 +79,27 @@ type PopoverTriggerProps = React.ComponentPropsWithoutRef<typeof PopoverTrigger>

interface TeamSwitcherProps extends PopoverTriggerProps {}

interface ModalObj {
open: boolean;
status?: number; // 0 for org, 1 for project
}

export default function TeamSwitcher({ className }: TeamSwitcherProps) {
const [open, setOpen] = React.useState(false)
const [showNewTeamDialog, setShowNewTeamDialog] = React.useState(false)
const [selectedTeam, setSelectedTeam] = React.useState<Team>(
groups[0].teams[0]
)

const [showNewDialog, setShowNewDialog] = React.useState<ModalObj>({
open: false,
})

const handleOpenChange = (open: boolean) => {
setShowNewDialog(prevState => ({ ...prevState, open }));
};

return (
<Dialog open={showNewTeamDialog} onOpenChange={setShowNewTeamDialog}>
<Dialog open={showNewDialog.open} onOpenChange={handleOpenChange}>
<Popover open={open} onOpenChange={setOpen}>
<PopoverTrigger asChild>
<Button
Expand Down Expand Up @@ -154,18 +159,18 @@ export default function TeamSwitcher({ className }: TeamSwitcherProps) {
<CommandItem
onSelect={() => {
setOpen(false)
setShowNewTeamDialog(true)
setShowNewDialog({open: true, status: 0})
}}
>
<PlusCircledIcon className="mr-2 h-5 w-5" />
Create Team
Create Organisation
</CommandItem>
</DialogTrigger>
<DialogTrigger asChild>
<CommandItem
onSelect={() => {
setOpen(false)
setShowNewTeamDialog(true)
setShowNewDialog({open: true, status: 1})
}}
>
<PlusCircledIcon className="mr-2 h-5 w-5" />
Expand All @@ -178,48 +183,52 @@ export default function TeamSwitcher({ className }: TeamSwitcherProps) {
</PopoverContent>
</Popover>
<DialogContent>
<DialogHeader>
<DialogTitle>Create team</DialogTitle>
<DialogDescription>
Add a new team to manage products and customers.
</DialogDescription>
</DialogHeader>
<div>
<div className="space-y-4 py-2 pb-4">
<div className="space-y-2">
<Label htmlFor="name">Team name</Label>
<Input id="name" placeholder="Acme Inc." />
{showNewDialog.status == 0 ?
<>
<DialogHeader>
<DialogTitle>Create organisation</DialogTitle>
<DialogDescription>
Add a new organisation to manage your integrations.
</DialogDescription>
</DialogHeader>
<div>
<div className="space-y-4 py-2 pb-4">
<div className="space-y-2">
<Label htmlFor="name">Organisation name</Label>
<Input id="name" placeholder="Acme Inc." />
</div>
</div>
</div>
<div className="space-y-2">
<Label htmlFor="plan">Subscription plan</Label>
<Select>
<SelectTrigger>
<SelectValue placeholder="Select a plan" />
</SelectTrigger>
<SelectContent>
<SelectItem value="free">
<span className="font-medium">Free</span> -{" "}
<span className="text-muted-foreground">
Trial for two weeks
</span>
</SelectItem>
<SelectItem value="pro">
<span className="font-medium">Pro</span> -{" "}
<span className="text-muted-foreground">
$9/month per user
</span>
</SelectItem>
</SelectContent>
</Select>
<DialogFooter>
<Button variant="outline" onClick={() => setShowNewDialog({open:false})}>
Cancel
</Button>
<Button type="submit">Continue</Button>
</DialogFooter>
</> :
<>
<DialogHeader>
<DialogTitle>Create project</DialogTitle>
<DialogDescription>
Add a new project to manage your integrations.
</DialogDescription>
</DialogHeader>
<div>
<div className="space-y-4 py-2 pb-4">
<div className="space-y-2">
<Label htmlFor="name">Project name</Label>
<Input id="name" placeholder="Project Inc." />
</div>
</div>
</div>
</div>
</div>
<DialogFooter>
<Button variant="outline" onClick={() => setShowNewTeamDialog(false)}>
Cancel
</Button>
<Button type="submit">Continue</Button>
</DialogFooter>
<DialogFooter>
<Button variant="outline" onClick={() => setShowNewDialog({open:false})}>
Cancel
</Button>
<Button type="submit">Continue</Button>
</DialogFooter>
</>
}
</DialogContent>
</Dialog>
)
Expand Down
Loading