Merge pull request #16 from Nikitosiki/dev

Fix: load avatar and other

client/src/components/AddReactionButton/index.tsx

@@ -31,7 +31,10 @@ const AddReactionButton: FC<AddReactionProps> = ({ onClick, buttonProps }) => {
  <DropdownTrigger>
  <Button
  size="sm"
- className={buttonProps?.className ?? "h-7 w-7 min-w-0 rounded-full bg-default-200 text-sm"}
+ className={
+ buttonProps?.className ??
+ "h-7 w-7 min-w-0 rounded-full bg-default-200 text-sm"
+ }
  {...buttonProps}
  >
  {buttonProps?.content ?? "+"}
@@ -46,7 +49,7 @@ const AddReactionButton: FC<AddReactionProps> = ({ onClick, buttonProps }) => {
  selectedKeys={selectedKeys}
  onSelectionChange={setSelectedKeys}
  classNames={{
- list: "flex-row flex-wrap",
+ list: "flex-row flex-wrap justify-between",
  base: "max-w-[188px]",
  }}
  items={reactions}

client/src/components/AddTag/index.tsx

@@ -13,7 +13,7 @@ import { ITag } from "src/interfaces";
 
 type TypeAddTagProps = {
  add(tag: ITag | string): void;
-} & Omit<AutocompleteProps, "children">;
+} & Pick<AutocompleteProps, "isDisabled">;
 
 const AddTag: FC<TypeAddTagProps> = ({ add, ...props }) => {
  const [inputValue, setInputValue] = useState<string>("");
@@ -44,21 +44,16 @@ const AddTag: FC<TypeAddTagProps> = ({ add, ...props }) => {
  list.setFilterText(val);
  setInputValue(val);
  }}
- onFocusChange={(isFocused) => console.log(isFocused)}
  scrollShadowProps={{
  isEnabled: false,
  }}
  isClearable={false}
  maxLength={30}
  {...props}
  >
- {(item) =>
- "title" in item && typeof item.title === "string" ? (
- <AutocompleteItem key={item.title}>{item.title}</AutocompleteItem>
- ) : (
- <></>
- )
- }
+ {(item) => (
+ <AutocompleteItem key={item.id}>{item.title}</AutocompleteItem>
+ )}
  </Autocomplete>
  {inputValue.length > 1 && (
  <motion.div

client/src/components/Author/index.tsx

@@ -45,6 +45,7 @@ const Author: FC<TypeAuthorProps> = ({
  isBordered
  src={nullToUndefined(author.image_url)}
  className="mr-2 h-7 w-7 shrink-0 text-tiny ring-primary"
+ imgProps={{referrerPolicy: "no-referrer"}}
  {...rest}
  />
  <div className="flex flex-col flex-nowrap overflow-hidden">

client/src/components/Comment/index.tsx

@@ -115,6 +115,7 @@ const Comment: FC<ICommentProps> = ({ comment, postId, user, children }) => {
  size="sm"
  name={comment.author.name}
  src={nullToUndefined(comment.author.image_url)}
+ imgProps={{referrerPolicy: "no-referrer"}}
  />
  </Link>
  <div

client/src/hooks/index.ts

@@ -1,2 +1,4 @@
 export { useSwitchTheme } from "./useSwitchTheme";
-export { useStateWindowSize } from "./useStateWindowSize"
+export { useStateWindowSize } from "./useStateWindowSize";
+export { useFingerprintData } from "./useFingerprintData";
+export { useReload } from "./useReload";

client/src/hooks/useReload.ts

@@ -0,0 +1,13 @@
+import { useCallback } from "react";
+import { useLocation, useNavigate } from "react-router-dom";
+
+export const useReload = () => {
+ const location = useLocation();
+ const navigate = useNavigate();
+
+ const reload = useCallback(() => {
+ navigate(location);
+ }, []);
+
+ return { reload };
+};

client/src/modules/CardComments/index.tsx

@@ -44,6 +44,7 @@ const CardComments: FC<CardCommentsProps> = ({ fatherContent }) => {
  size="sm"
  name={user?.name}
  src={user?.image_url ?? undefined}
+ imgProps={{referrerPolicy: "no-referrer"}}
  />
  <Button
  size="sm"

client/src/modules/Header/components/UserButton/index.tsx

@@ -33,6 +33,7 @@ const UserButton = () => {
  size={"sm"}
  isBordered={true}
  color={"primary"}
+ imgProps={{referrerPolicy: "no-referrer"}}
  className="bg-default"
  />
  <p className="hidden max-w-[20rem] truncate md:block md:max-w-[10rem] md:pl-4">

client/src/modules/ProfileEditModal/index.tsx

@@ -16,6 +16,7 @@ import { yupResolver } from "@hookform/resolvers/yup";
 import { useForm } from "react-hook-form";
 import { ProfileSchema, ProfileSchemaType } from "src/validations";
 import { updateUserById } from "src/services/supabase/user";
+import { useReload } from "src/hooks";
 
 type ProfileModalProps = Pick<UseDisclosureReturn, "isOpen" | "onOpenChange">;
 const ProfileEditModal: FC<ProfileModalProps> = ({ isOpen, onOpenChange }) => {
@@ -26,6 +27,7 @@ const ProfileEditModal: FC<ProfileModalProps> = ({ isOpen, onOpenChange }) => {
  const [isLoading, setIsLoading] = useState(false);
 
  const { user } = useAuth();
+ const { reload } = useReload();
 
  const {
  register,
@@ -94,8 +96,8 @@ const ProfileEditModal: FC<ProfileModalProps> = ({ isOpen, onOpenChange }) => {
  if (!user) return;
  updateUserById(user?.id, submitData.name, verifImageUrl).then((response) => {
  if (response) {
+ reload();
  closeAuthModal();
- location.reload();
  }
  });
  };
@@ -121,6 +123,7 @@ const ProfileEditModal: FC<ProfileModalProps> = ({ isOpen, onOpenChange }) => {
  isBordered
  size="lg"
  src={verifImageUrl ?? user.image_url ?? ""}
+ imgProps={{referrerPolicy: "no-referrer"}}
  className="shrink-0 text-tiny ring-primary"
  />
  <div className="flex flex-col flex-nowrap overflow-hidden">

client/src/pages/Author/index.tsx

@@ -75,6 +75,7 @@ const Author = () => {
  isBlurred
  radius="full"
  src={author.image_url ?? ""}
+ referrerPolicy="no-referrer"
  alt={(author.name ?? "Author's") + " avatar"}
  classNames={{
  blurredImg: "m-5",