Skip to content

Commit 9b80aa2

Browse files
jmacugajmacuga
authored
Merge pull request #27 from jmacuga/deleting-users
Deleting users from teams
2 parents a08a630 + 028422c commit 9b80aa2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+1477
-497
lines changed

‎auth.config.ts

-27
This file was deleted.

‎components/app-sidebar.tsx

+2-7
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
import {
22
Inbox,
33
Users,
4-
User,
5-
UserPlus,
64
Files,
75
GitPullRequest,
86
LogOut,
@@ -23,10 +21,8 @@ import {
2321
SidebarMenuButton,
2422
SidebarMenuItem,
2523
SidebarHeader,
26-
SidebarFooter,
2724
} from "@/components/ui/sidebar";
2825
import SignOutModal from "@/components/auth/sign-out-modal";
29-
import { NetworkStatusIndicator } from "@/components/ui/network-status-indicator";
3026
import { useRouter } from "next/router";
3127

3228
const data = {
@@ -59,8 +55,7 @@ const data = {
5955
icon: Files,
6056
},
6157
{
62-
title: "Logout",
63-
url: "/api/auth/signout",
58+
title: "Sign Out",
6459
icon: LogOut,
6560
},
6661
],
@@ -115,7 +110,7 @@ export function AppSidebar() {
115110
<SidebarMenu>
116111
{item.items.map((subItem) => (
117112
<SidebarMenuItem key={subItem.title}>
118-
{subItem.title === "Logout" ? (
113+
{subItem.title === "Sign Out" ? (
119114
<SignOutModal>
120115
<SidebarMenuButton asChild>
121116
<button className="flex w-full items-center">

‎components/auth/login-form.tsx

-111
This file was deleted.

‎components/auth/sign-in-form.tsx

+135
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,135 @@
1+
"use client";
2+
3+
import {
4+
AtSymbolIcon,
5+
KeyIcon,
6+
ExclamationCircleIcon,
7+
} from "@heroicons/react/24/outline";
8+
import { ArrowRightIcon } from "@heroicons/react/20/solid";
9+
import { Button } from "../ui/button";
10+
import { useState } from "react";
11+
import { useRouter } from "next/router";
12+
import { toast } from "react-hot-toast";
13+
import { useForm } from "react-hook-form";
14+
import { zodResolver } from "@hookform/resolvers/zod";
15+
import { schemaSignIn } from "@/lib/schemas/sign-in.schema";
16+
import { z } from "zod";
17+
import { signIn } from "next-auth/react";
18+
19+
type FormData = z.infer<typeof schemaSignIn>;
20+
21+
export function SignInForm() {
22+
const [isLoading, setIsLoading] = useState(false);
23+
const router = useRouter();
24+
const form = useForm<FormData>({
25+
resolver: zodResolver(schemaSignIn),
26+
defaultValues: {
27+
email: "",
28+
password: "",
29+
},
30+
});
31+
32+
const onSubmit = async (data: FormData) => {
33+
try {
34+
setIsLoading(true);
35+
36+
const result = await signIn("credentials", {
37+
email: data.email,
38+
password: data.password,
39+
redirect: false,
40+
callbackUrl: "/teams",
41+
});
42+
43+
if (result?.error) {
44+
toast.error("Invalid email or password");
45+
return;
46+
}
47+
toast.success("Sign in successful!");
48+
router.push("/teams");
49+
} catch (error) {
50+
toast.error(
51+
error instanceof Error ? error.message : "Something went wrong"
52+
);
53+
console.error("Sign in error:", error);
54+
} finally {
55+
setIsLoading(false);
56+
}
57+
};
58+
59+
return (
60+
<form onSubmit={form.handleSubmit(onSubmit)} className="space-y-3">
61+
<div className="flex-1 rounded-lg bg-gray-50 px-6 pb-4 pt-8">
62+
<h1 className={`mb-3 text-2xl`}>Please sign in to continue.</h1>
63+
<div className="w-full">
64+
<div>
65+
<label
66+
className="mb-3 mt-5 block text-xs font-medium text-gray-900"
67+
htmlFor="email"
68+
>
69+
Email
70+
</label>
71+
<div className="relative">
72+
<input
73+
className="peer block w-full rounded-md border border-gray-200 py-[9px] pl-10 text-sm outline-2 placeholder:text-gray-500"
74+
id="email"
75+
type="email"
76+
{...form.register("email")}
77+
placeholder="Enter your email address"
78+
aria-describedby="email-error"
79+
/>
80+
<AtSymbolIcon className="pointer-events-none absolute left-3 top-1/2 h-[18px] w-[18px] -translate-y-1/2 text-gray-500 peer-focus:text-gray-900" />
81+
</div>
82+
{form.formState.errors.email && (
83+
<div className="mt-2 flex items-center text-sm text-red-500">
84+
<ExclamationCircleIcon className="mr-1 h-4 w-4" />
85+
<p>{form.formState.errors.email.message}</p>
86+
</div>
87+
)}
88+
</div>
89+
<div className="mt-4">
90+
<label
91+
className="mb-3 mt-5 block text-xs font-medium text-gray-900"
92+
htmlFor="password"
93+
>
94+
Password
95+
</label>
96+
<div className="relative">
97+
<input
98+
className="peer block w-full rounded-md border border-gray-200 py-[9px] pl-10 text-sm outline-2 placeholder:text-gray-500"
99+
id="password"
100+
type="password"
101+
{...form.register("password")}
102+
placeholder="Enter password"
103+
aria-describedby="password-error"
104+
/>
105+
<KeyIcon className="pointer-events-none absolute left-3 top-1/2 h-[18px] w-[18px] -translate-y-1/2 text-gray-500 peer-focus:text-gray-900" />
106+
</div>
107+
{form.formState.errors.password && (
108+
<div className="mt-2 flex items-center text-sm text-red-500">
109+
<ExclamationCircleIcon className="mr-1 h-4 w-4" />
110+
<p>{form.formState.errors.password.message}</p>
111+
</div>
112+
)}
113+
</div>
114+
</div>
115+
<Button
116+
type="submit"
117+
className="mt-6 w-full"
118+
aria-disabled={isLoading}
119+
disabled={isLoading}
120+
>
121+
{isLoading ? (
122+
<div className="flex items-center justify-center gap-2">
123+
<div className="h-5 w-5 animate-spin rounded-full border-2 border-white border-t-transparent" />
124+
Signing in...
125+
</div>
126+
) : (
127+
<div className="flex items-center justify-center gap-2">
128+
Sign in <ArrowRightIcon className="ml-auto h-5 w-5" />
129+
</div>
130+
)}
131+
</Button>
132+
</div>
133+
</form>
134+
);
135+
}

‎components/auth/sign-out-modal.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ const SignOutModal = ({ children }: SignOutModalProps) => {
3030

3131
await signOut({
3232
redirect: false,
33-
callbackUrl: "/auth/login",
33+
callbackUrl: "/auth/sign-in",
3434
});
3535

36-
router.push("/auth/login");
36+
router.push("/auth/sign-in");
3737
} catch (error) {
3838
console.error("Error during sign out:", error);
3939
} finally {

‎components/auth/register-form.tsx ‎components/auth/sign-up-form.tsx

+5-10
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,12 @@
1-
import {
2-
AtSymbolIcon,
3-
KeyIcon,
4-
ExclamationCircleIcon,
5-
UserIcon,
6-
} from "@heroicons/react/24/outline";
1+
import { AtSymbolIcon, KeyIcon, UserIcon } from "@heroicons/react/24/outline";
72
import { ArrowRightIcon } from "@heroicons/react/20/solid";
83
import { Button } from "../ui/button";
9-
import { register } from "@/lib/auth/actions";
4+
import { signUp } from "@/lib/auth/actions";
105
import { useState } from "react";
116
import { useRouter } from "next/router";
127
import toast from "react-hot-toast";
138

14-
export function RegisterForm() {
9+
export function SignUpForm() {
1510
const [isLoading, setIsLoading] = useState(false);
1611
const router = useRouter();
1712

@@ -21,7 +16,7 @@ export function RegisterForm() {
2116
const formData = new FormData(e.currentTarget);
2217

2318
try {
24-
const { error } = await register(formData);
19+
const { error } = await signUp(formData);
2520

2621
if (error) {
2722
toast.error(error);
@@ -30,7 +25,7 @@ export function RegisterForm() {
3025
}
3126

3227
toast.success("Account created successfully! Please log in.");
33-
await router.push("/auth/login");
28+
await router.push("/auth/sign-in");
3429
} catch (error) {
3530
toast.error("An error occurred while creating your account");
3631
setIsLoading(false);

‎components/board/board.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import { ShapeColorPalette } from "@/components/board/components/shape-color-pal
2222
import { KonvaEventObject } from "konva/lib/Node";
2323
import { Text } from "konva/lib/shapes/Text";
2424

25-
export default function Board({}: BoardProps) {
25+
export default function Board() {
2626
const clientSyncService = useClientSync();
2727
const docUrl = clientSyncService.getDocUrl() as AnyDocumentId;
2828
const [localDoc] = useDocument<LayerSchema>(docUrl);

‎components/board/hooks/use-board-interactions.ts

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
import { useCallback, useContext, useRef, useEffect } from "react";
1+
import { useCallback, useContext, useRef } from "react";
22
import { KonvaEventObject } from "konva/lib/Node";
3-
import { BoardMode } from "@/types/board";
43
import { useDrawing } from "./use-drawing";
54
import { useDragging } from "./use-dragging";
65
import { useErasing } from "./use-erasing";
@@ -57,7 +56,7 @@ export const useBoardInteractions = () => {
5756
(e: KeyboardEvent) => {
5857
if (mode !== "selecting") return;
5958

60-
if (e.key === "Delete" || e.key === "Backspace") {
59+
if (e.key === "Delete") {
6160
e.preventDefault();
6261
handleDelete();
6362
}

0 commit comments

Comments
 (0)