shiyue/kan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: remove supabase auth

Browse Source
This commit is contained in:
Henry
2025-05-05 15:16:30 +01:00
parent 091fea6f38
commit b6daaa41de
42 changed files with 319 additions and 1591 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apps/web/src/views/board/components/Card.tsx
View File

@@ -1,7 +1,6 @@
import Avatar from "~/components/Avatar";
import Badge from "~/components/Badge";
import LabelIcon from "~/components/LabelIcon";
import { getPublicUrl } from "~/utils/supabase/getPublicUrl";
const Card = ({
title,
@@ -32,9 +31,7 @@ const Card = ({
{members.map(({ user }) => {
if (!user) return null;
const avatarUrl = user.image
? getPublicUrl(user.image)
: undefined;
const avatarUrl = user.image ? "" : undefined;
return (
<Avatar

5
apps/web/src/views/board/components/Filters.tsx
View File

@@ -11,7 +11,6 @@ import Button from "~/components/Button";
import CheckboxDropdown from "~/components/CheckboxDropdown";
import LabelIcon from "~/components/LabelIcon";
import { formatMemberDisplayName, formatToArray } from "~/utils/helpers";
import { getPublicUrl } from "~/utils/supabase/getPublicUrl";
interface Member {
publicId: string;
@@ -66,9 +65,7 @@ const Filters = ({
<Avatar
size="xs"
name={member.user?.name ?? ""}
imageUrl={
member.user?.image ? getPublicUrl(member.user.image) : undefined
}
imageUrl={member.user?.image ? "" : undefined}
email={member.user?.email ?? ""}
/>
),

17
apps/web/src/views/board/components/NewCardForm.tsx
View File

@@ -19,7 +19,6 @@ import { useModal } from "~/providers/modal";
import { usePopup } from "~/providers/popup";
import { api } from "~/utils/api";
import { formatMemberDisplayName } from "~/utils/helpers";
import { getPublicUrl } from "~/utils/supabase/getPublicUrl";
type NewCardFormInput = NewCardInput & {
isCreateAnotherEnabled: boolean;
@@ -89,7 +88,7 @@ export function NewCardForm({
args.labelPublicIds.includes(label.publicId),
),
members:
oldBoard.workspace?.members.filter((member) =>
oldBoard.workspace.members.filter((member) =>
args.memberPublicIds.includes(member.publicId),
) ?? [],
_filteredLabels: labelPublicIds.map((id) => ({ publicId: id })),
@@ -146,20 +145,18 @@ export function NewCardForm({
})) ?? [];
const formattedMembers =
boardData?.workspace?.members.map((member) => ({
boardData?.workspace.members.map((member) => ({
key: member.publicId,
value: formatMemberDisplayName(
member.user?.name ?? null,
member.user?.email ?? null,
member.user.name ?? null,
member.user.email ?? null,
),
leftIcon: (
<Avatar
size="xs"
name={member.user?.name ?? ""}
imageUrl={
member.user?.image ? getPublicUrl(member.user.image) : undefined
}
email={member.user?.email ?? ""}
name={member.user.name ?? ""}
imageUrl={member.user.image ? "" : undefined}
email={member.user.email ?? ""}
/>
),
})) ?? [];

19
apps/web/src/views/card/index.tsx
View File

@@ -15,7 +15,6 @@ import { usePopup } from "~/providers/popup";
import { useWorkspace } from "~/providers/workspace";
import { api } from "~/utils/api";
import { formatMemberDisplayName } from "~/utils/helpers";
import { getPublicUrl } from "~/utils/supabase/getPublicUrl";
import { DeleteLabelConfirmation } from "../../components/DeleteLabelConfirmation";
import ActivityList from "./components/ActivityList";
import { DeleteCardConfirmation } from "./components/DeleteCardConfirmation";
@@ -51,11 +50,11 @@ export default function CardPage() {
if (cardId) await utils.card.byId.refetch({ cardPublicId: cardId });
};
const board = card?.list?.board;
const board = card?.list.board;
const boardId = board?.publicId;
const labels = board?.labels;
const activities = card?.activities;
const workspaceMembers = board?.workspace?.members;
const workspaceMembers = board?.workspace.members;
const selectedLabels = card?.labels;
const selectedMembers = card?.members;
@@ -77,7 +76,7 @@ export default function CardPage() {
board?.lists.map((list) => ({
key: list.publicId,
value: list.name,
selected: list.publicId === card?.list?.publicId,
selected: list.publicId === card?.list.publicId,
})) ?? [];
const formattedMembers =
@@ -89,21 +88,21 @@ export default function CardPage() {
return {
key: member.publicId,
value: formatMemberDisplayName(
member.user?.name ?? null,
member.user?.email ?? null,
member.user.name ?? null,
member.user.email ?? null,
),
imageUrl: member.user?.image
imageUrl: member.user.image
? getPublicUrl(member.user.image)
: undefined,
selected: isSelected ?? false,
leftIcon: (
<Avatar
size="xs"
name={member.user?.name ?? ""}
name={member.user.name ?? ""}
imageUrl={
member.user?.image ? getPublicUrl(member.user.image) : undefined
member.user.image ? getPublicUrl(member.user.image) : undefined
}
email={member.user?.email ?? ""}
email={member.user.email ?? ""}
/>
),
};

4
apps/web/src/views/home/components/Layout.tsx
View File

@@ -12,9 +12,11 @@ export default function Layout({ children }: { children: React.ReactNode }) {
const token =
typeof window !== "undefined"
? Cookies.get(env.NEXT_PUBLIC_SUPABASE_AUTH_COOKIE_NAME)
? Cookies.get('kan.session_token')
: null;
const getSession = async () => {
const { data } = api.user.getUser.useQuery(undefined, {
enabled: !!token,
});

9
apps/web/src/views/members/index.tsx
View File

@@ -11,7 +11,6 @@ import { useModal } from "~/providers/modal";
import { useWorkspace } from "~/providers/workspace";
import { api } from "~/utils/api";
import { getInitialsFromName, inferInitialsFromEmail } from "~/utils/helpers";
import { getPublicUrl } from "~/utils/supabase/getPublicUrl";
import { DeleteMemberConfirmation } from "./components/DeleteMemberConfirmation";
import { InviteMemberForm } from "./components/InviteMemberForm";
@@ -58,7 +57,7 @@ export default function MembersPage() {
<Avatar
name={memberName ?? ""}
email={memberEmail ?? ""}
imageUrl={memberImage ? getPublicUrl(memberImage) : undefined}
imageUrl={memberImage ? "" : undefined}
/>
)}
</div>
@@ -189,9 +188,9 @@ export default function MembersPage() {
<TableRow
key={member.publicId}
memberPublicId={member.publicId}
memberName={member.user?.name}
memberEmail={member.user?.email}
memberImage={member.user?.image}
memberName={member.user.name}
memberEmail={member.user.email}
memberImage={member.user.image}
memberRole={member.role}
memberStatus={member.status}
isLastRow={index === data.members.length - 1}

17
apps/web/src/views/settings/components/Avatar.tsx
View File

@@ -3,8 +3,6 @@ import { useState } from "react";
import { usePopup } from "~/providers/popup";
import { api } from "~/utils/api";
import createClient from "~/utils/supabase/client";
import { getPublicUrl } from "~/utils/supabase/getPublicUrl";
export default function Avatar({
userId,
@@ -13,7 +11,6 @@ export default function Avatar({
userId: string | undefined;
userImage: string | null | undefined;
}) {
const supabase = createClient();
const utils = api.useUtils();
const { showPopup } = usePopup();
const [uploading, setUploading] = useState(false);
@@ -41,7 +38,7 @@ export default function Avatar({
},
});
const avatarUrl = userImage ? getPublicUrl(userImage) : undefined;
const avatarUrl = userImage ? "" : undefined;
const uploadAvatar = async (event: React.ChangeEvent<HTMLInputElement>) => {
try {
@@ -65,13 +62,13 @@ export default function Avatar({
const fileName = `${userId}/avatar.${fileExt}`;
const filePath = `${fileName}`;
const { error: uploadError } = await supabase.storage
.from("avatars")
.upload(filePath, file, { upsert: true });
// const { error: uploadError } = await supabase.storage
// .from("avatars")
// .upload(filePath, file, { upsert: true });
if (uploadError) {
throw uploadError;
}
// if (uploadError) {
// throw uploadError;
// }
updateUser.mutate({ image: filePath });
} catch (error) {