resolve the cropIssues

coderdojobraga · Jun 19, 2023 · 3e4fed3 · 3e4fed3
1 parent 604cf94
commit 3e4fed3
Show file tree

Hide file tree

Showing 8 changed files with 66 additions and 88 deletions.
diff --git a/apps/app/components/AppMenu/index.tsx b/apps/app/components/AppMenu/index.tsx
@@ -16,12 +16,10 @@ import {
   UsergroupAddOutlined,
 } from "@ant-design/icons";
 import { useAuth } from "@coderdojobraga/ui";
-import { EUser, IUser,API_URL } from "bokkenjs";
+import { API_URL, EUser, IUser } from "bokkenjs";
 
 import styles from "./style.module.css";
 
-
-
 const { SubMenu, Item } = Menu;
 const { Text, Title } = Typography;
 
@@ -64,7 +62,11 @@ function AppMenu({ hidePrimaryMenu, collapsed }: any) {
     setSecondarySelectedKeys([key]);
   };
   let avatarSrc;
-  if (!avatarPreview && typeof user?.photo === 'string' && user?.photo.startsWith('/uploads/')) {
+  if (
+    !avatarPreview &&
+    typeof user?.photo === "string" &&
+    user?.photo.startsWith("/uploads/")
+  ) {
     const previewUrl = `${API_URL}${user.photo}`;
     avatarSrc = previewUrl;
   } else {

diff --git a/apps/app/components/Profile/index.tsx b/apps/app/components/Profile/index.tsx
@@ -20,7 +20,7 @@ import * as api from "bokkenjs";
 import * as socials from "~/lib/social";
 import { notifyError, notifyInfo } from "~/components/Notification";
 import styles from "./style.module.css";
-import { EUser, API_URL } from "bokkenjs";
+import { API_URL, EUser } from "bokkenjs";
 
 import { BsFileEarmarkPersonFill } from "react-icons/bs";
 
@@ -29,8 +29,6 @@ import { getIcon } from "~/lib/utils";
 const { TabPane } = Tabs;
 const { Title } = Typography;
 
-
-
 interface Props {
   id: string;
   role: EUser;
@@ -102,7 +100,11 @@ function Profile({ id, role }: Props) {
   }, [info]);
 
   let avatarSrc;
-  if (!avatarPreview && typeof info?.photo === 'string' && info?.photo.startsWith('/uploads/')) {
+  if (
+    !avatarPreview &&
+    typeof info?.photo === "string" &&
+    info?.photo.startsWith("/uploads/")
+  ) {
     const previewUrl = `${API_URL}${info.photo}`;
     avatarSrc = previewUrl;
   } else {

diff --git a/apps/app/components/Register/index.tsx b/apps/app/components/Register/index.tsx
@@ -22,22 +22,18 @@ import {
 } from "@ant-design/icons";
 import { useAuth } from "@coderdojobraga/ui";
 import * as api from "bokkenjs";
-import {getBase64,getAvatarSrc} from "~/lib/images";
+import { getAvatarSrc, getBase64 } from "~/lib/images";
 import Emoji from "~/components/Emoji";
 
 import styles from "./style.module.css";
 import { useState } from "react";
-import { EUser, API_URL } from "bokkenjs";
+import { API_URL, EUser } from "bokkenjs";
 import { notifyError, notifyInfo } from "~/components/Notification";
 
 import { getIcon } from "~/lib/utils";
 
 const [avatarPreview, setAvatarPreview] = useState<null | string>();
 
-
-
-
-
 const { Option } = Select;
 
 const CountrySelect = () => (
@@ -48,15 +44,13 @@ const CountrySelect = () => (
   </Select>
 );
 
-
-
 function Register({ cities }: any) {
   const router = useRouter();
   const { Title } = Typography;
   const { user } = useAuth();
   const [isLoading, setLoading] = useState(false);
   const [errors, setErrors] = useState();
-  const [avatar, setAvatar] = useState< void | File|string>();
+  const [avatar, setAvatar] = useState<void | File | string>();
   const [socials] = useState([
     "Scratch",
     "Codewars",
@@ -67,7 +61,6 @@ function Register({ cities }: any) {
     "Slack",
   ]);
 
-
   const onFinish = (values: any) => {
     console.log(avatar);
     values["user[photo]"] = avatar;
@@ -89,11 +82,12 @@ function Register({ cities }: any) {
       .finally(() => setLoading(false));
   };
 
-
-
-
   let avatarSrc;
-  if (!avatarPreview && typeof user?.photo === 'string' && user?.photo.startsWith('/uploads/')) {
+  if (
+    !avatarPreview &&
+    typeof user?.photo === "string" &&
+    user?.photo.startsWith("/uploads/")
+  ) {
     const previewUrl = `${API_URL}${user.photo}`;
     avatarSrc = previewUrl;
   } else {
@@ -227,22 +221,22 @@ function Register({ cities }: any) {
               label="Foto de perfil"
               valuePropName="avatar"
             >
-         <ImgCrop>
-              <Upload
-                accept="image/*"
-                maxCount={1}
-                beforeUpload={(file:File) => {
-                  setAvatar(file);
-                  getBase64(file, (result: string) => {
-                    setAvatarPreview(result);
-                  });
-                  return false;
-                }}
-                 onRemove={() => setAvatar(user?.photo )}
-                 >
-                <Button icon={<UploadOutlined />}>Upload</Button>
-              </Upload>
-            </ImgCrop>
+              <ImgCrop>
+                <Upload
+                  accept="image/*"
+                  maxCount={1}
+                  beforeUpload={(file: File) => {
+                    setAvatar(file);
+                    getBase64(file, (result: string) => {
+                      setAvatarPreview(result);
+                    });
+                    return false;
+                  }}
+                  onRemove={() => setAvatar(user?.photo)}
+                >
+                  <Button icon={<UploadOutlined />}>Upload</Button>
+                </Upload>
+              </ImgCrop>
             </Form.Item>
             {user?.role == EUser.Mentor && (
               <Form.Item name="user[socials]" label="Redes Sociais">

diff --git a/apps/app/lib/images.ts b/apps/app/lib/images.ts
@@ -1,21 +1,23 @@
-export function getBase64(img:File, callback:Function) {
+export function getBase64(img: File, callback: Function) {
   const reader = new FileReader();
   reader.addEventListener("load", () => callback(reader.result));
   reader.readAsDataURL(img);
 }
 
-
 export function getAvatarSrc(
-  avatarPreview: null | string | undefined ,
+  avatarPreview: null | string | undefined,
   userPhoto: string | undefined,
-  API_URL: string | undefined,
+  API_URL: string | undefined
 ): string | undefined {
-  if (typeof avatarPreview === 'undefined' && typeof userPhoto === 'string' && userPhoto.startsWith('/uploads/')) {
+  if (
+    typeof avatarPreview === "undefined" &&
+    typeof userPhoto === "string" &&
+    userPhoto.startsWith("/uploads/")
+  ) {
     const previewUrl = `${API_URL}${userPhoto}`;
-    console.log('previewUrl', previewUrl);
+    console.log("previewUrl", previewUrl);
     return previewUrl;
   } else {
     return userPhoto;
   }
 }
-
diff --git a/apps/app/pages/admin/lectures/index.tsx b/apps/app/pages/admin/lectures/index.tsx
@@ -240,10 +240,7 @@ function Lectures() {
               onOk={handleOk}
               onCancel={handleOk}
             >
-
-
-
-          {/* const PresenceList: React.FC<PresenceListProps> = ({ attendees }) => {
+              {/* const PresenceList: React.FC<PresenceListProps> = ({ attendees }) => {
             const [presence, setPresence] = useState<boolean[]>(Array(attendees.length).fill(false));
 
             const handlePresenceChange = (index: number) => {
@@ -271,24 +268,6 @@ function Lectures() {
           export default PresenceList; 
  */}
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
               <Descriptions size="small" column={1} layout="horizontal">
                 <Descriptions.Item
                   labelStyle={labelStyle}

diff --git a/apps/app/pages/lectures/[role]/[id].tsx b/apps/app/pages/lectures/[role]/[id].tsx
@@ -97,7 +97,8 @@ function Lectures() {
                   {moment(new Date(lecture.event.start_time)).format(
                     "DD/MM/YYYY"
                   )}
-                </Text>1
+                </Text>
+                1
               </Col>
             </Row>
             <Row align="middle" gutter={[16, 16]}>

diff --git a/apps/app/pages/settings.tsx b/apps/app/pages/settings.tsx
@@ -22,7 +22,7 @@ import {
   PlusOutlined,
   UploadOutlined,
 } from "@ant-design/icons";
-import { getBase64, getAvatarSrc } from "~/lib/images";
+import { getAvatarSrc, getBase64 } from "~/lib/images";
 import { useAuth } from "@coderdojobraga/ui";
 import { notifyError, notifyInfo } from "~/components/Notification";
 import { getIcon } from "~/lib/utils";
@@ -67,9 +67,11 @@ function Settings() {
   const [formPersonal] = Form.useForm();
   const [formPassword] = Form.useForm();
   const [avatar, setAvatar] = useState<null | File | string>();
-  const [avatarPreview, setAvatarPreview] = useState<null | string | undefined>();
+  const [avatarPreview, setAvatarPreview] = useState<
+    null | string | undefined
+  >();
 
-  const [userSkills, setUserSkills] = useState<any[]>([]); 
+  const [userSkills, setUserSkills] = useState<any[]>([]);
   const [skills, setSkills] = useState<any[]>([]);
   const [selectedSkills, setSelectedSkills] = useState<any[]>([]);
   const [mentorSocials, setMentorSocials] = useState([]);
@@ -82,20 +84,20 @@ function Settings() {
     "Discord",
     "Slack",
   ]);
-
 
   // const avatarSrc = getAvatarSrc(avatarPreview, user?.photo, API_URL);
   // if (avatarSrc !== avatarPreview) {
   //   setAvatarPreview(avatarSrc);
   // }
 
-  if (!avatarPreview && typeof avatar === "string" && avatar.startsWith("/uploads/")) {
-    console.log("avatar", API_URL+avatar);
+  if (
+    !avatarPreview &&
+    typeof avatar === "string" &&
+    avatar.startsWith("/uploads/")
+  ) {
+    console.log("avatar", API_URL + avatar);
     setAvatarPreview(API_URL + avatar);
   }
-
-
-
 
   const onSubmit = (values: any) => {
     if (avatar) {
@@ -200,8 +202,6 @@ function Settings() {
     }
   };
 
-
-
   const changeSkills = () => {
     const deleted = userSkills
       .map((skill: any) => skill.id)
@@ -241,9 +241,9 @@ function Settings() {
   useEffect(() => {
     if (user?.photo) {
       setAvatar(user?.photo);
-    };
-   getUserSkills();
-   getAllSkills();
+    }
+    getUserSkills();
+    getAllSkills();
   }, [user, getUserSkills]);
 
   const breakpoints = {
@@ -288,19 +288,19 @@ function Settings() {
         <Space>
           <Avatar size={100} src={avatarPreview} />
           <Form.Item name="user[photo]">
-          <ImgCrop>
+            <ImgCrop>
               <Upload
                 accept="image/*"
                 maxCount={1}
-                beforeUpload={(file:File) => {
+                beforeUpload={(file: File) => {
                   setAvatar(file);
                   getBase64(file, (result: string) => {
                     setAvatarPreview(result);
                   });
                   return false;
                 }}
-                 onRemove={() => setAvatar(user?.photo )}
-                 >
+                onRemove={() => setAvatar(user?.photo)}
+              >
                 <Button icon={<UploadOutlined />}>Upload</Button>
               </Upload>
             </ImgCrop>

diff --git a/packages/bokkenjs/lib/auth/auth.ts b/packages/bokkenjs/lib/auth/auth.ts
@@ -132,5 +132,3 @@ export async function registerUser(values: any) {
 
   return response.data;
 }
-
-
Original file line number	Diff line number	Diff line change
Expand Up		@@ -132,5 +132,3 @@ export async function registerUser(values: any) {

		return response.data;
		}