From 199bc75f5539532d6107dadfcfe086d830cbdcfb Mon Sep 17 00:00:00 2001 From: Ivan Chen Date: Wed, 12 May 2021 14:36:27 -0400 Subject: added 17 badges --- src/assets/badges/aap.png | Bin 0 -> 11531 bytes src/assets/badges/cals.png | Bin 0 -> 7488 bytes src/assets/badges/college_of_arts_and_sciences .png | Bin 0 -> 9036 bytes src/assets/badges/college_of_engineering.png | Bin 0 -> 9201 bytes src/assets/badges/college_of_human_ecology.png | Bin 0 -> 10995 bytes src/assets/badges/cornell_law_school.png | Bin 0 -> 10366 bytes src/assets/badges/cornell_of_veterinary_medicine.png | Bin 0 -> 10745 bytes src/assets/badges/cornell_tech.png | Bin 0 -> 7067 bytes src/assets/badges/dyson_school.png | Bin 0 -> 7879 bytes src/assets/badges/entrepreneurship_at_cornell.png | Bin 0 -> 8298 bytes src/assets/badges/graduate_school.png | Bin 0 -> 11612 bytes src/assets/badges/hotel_administration.png | Bin 0 -> 8738 bytes src/assets/badges/ilr.png | Bin 0 -> 7056 bytes src/assets/badges/sc_johnson_school_of_management.png | Bin 0 -> 7149 bytes src/assets/badges/student_agencies.png | Bin 0 -> 14364 bytes src/assets/badges/weill_cornell_medical_sciences.png | Bin 0 -> 14439 bytes src/assets/badges/weill_cornell_medicine.png | Bin 0 -> 13284 bytes 17 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/assets/badges/aap.png create mode 100644 src/assets/badges/cals.png create mode 100644 src/assets/badges/college_of_arts_and_sciences .png create mode 100644 src/assets/badges/college_of_engineering.png create mode 100644 src/assets/badges/college_of_human_ecology.png create mode 100644 src/assets/badges/cornell_law_school.png create mode 100644 src/assets/badges/cornell_of_veterinary_medicine.png create mode 100644 src/assets/badges/cornell_tech.png create mode 100644 src/assets/badges/dyson_school.png create mode 100644 src/assets/badges/entrepreneurship_at_cornell.png create mode 100644 src/assets/badges/graduate_school.png create mode 100644 src/assets/badges/hotel_administration.png create mode 100644 src/assets/badges/ilr.png create mode 100644 src/assets/badges/sc_johnson_school_of_management.png create mode 100644 src/assets/badges/student_agencies.png create mode 100644 src/assets/badges/weill_cornell_medical_sciences.png create mode 100644 src/assets/badges/weill_cornell_medicine.png (limited to 'src/assets') diff --git a/src/assets/badges/aap.png b/src/assets/badges/aap.png new file mode 100644 index 00000000..0f5515b8 Binary files /dev/null and b/src/assets/badges/aap.png differ diff --git a/src/assets/badges/cals.png b/src/assets/badges/cals.png new file mode 100644 index 00000000..ccdc7455 Binary files /dev/null and b/src/assets/badges/cals.png differ diff --git a/src/assets/badges/college_of_arts_and_sciences .png b/src/assets/badges/college_of_arts_and_sciences .png new file mode 100644 index 00000000..dad5ec4a Binary files /dev/null and b/src/assets/badges/college_of_arts_and_sciences .png differ diff --git a/src/assets/badges/college_of_engineering.png b/src/assets/badges/college_of_engineering.png new file mode 100644 index 00000000..a59447c9 Binary files /dev/null and b/src/assets/badges/college_of_engineering.png differ diff --git a/src/assets/badges/college_of_human_ecology.png b/src/assets/badges/college_of_human_ecology.png new file mode 100644 index 00000000..73b907c5 Binary files /dev/null and b/src/assets/badges/college_of_human_ecology.png differ diff --git a/src/assets/badges/cornell_law_school.png b/src/assets/badges/cornell_law_school.png new file mode 100644 index 00000000..ade38d88 Binary files /dev/null and b/src/assets/badges/cornell_law_school.png differ diff --git a/src/assets/badges/cornell_of_veterinary_medicine.png b/src/assets/badges/cornell_of_veterinary_medicine.png new file mode 100644 index 00000000..cab17c19 Binary files /dev/null and b/src/assets/badges/cornell_of_veterinary_medicine.png differ diff --git a/src/assets/badges/cornell_tech.png b/src/assets/badges/cornell_tech.png new file mode 100644 index 00000000..7dde3198 Binary files /dev/null and b/src/assets/badges/cornell_tech.png differ diff --git a/src/assets/badges/dyson_school.png b/src/assets/badges/dyson_school.png new file mode 100644 index 00000000..91eab0c5 Binary files /dev/null and b/src/assets/badges/dyson_school.png differ diff --git a/src/assets/badges/entrepreneurship_at_cornell.png b/src/assets/badges/entrepreneurship_at_cornell.png new file mode 100644 index 00000000..29207f6e Binary files /dev/null and b/src/assets/badges/entrepreneurship_at_cornell.png differ diff --git a/src/assets/badges/graduate_school.png b/src/assets/badges/graduate_school.png new file mode 100644 index 00000000..5852e498 Binary files /dev/null and b/src/assets/badges/graduate_school.png differ diff --git a/src/assets/badges/hotel_administration.png b/src/assets/badges/hotel_administration.png new file mode 100644 index 00000000..be2a4e32 Binary files /dev/null and b/src/assets/badges/hotel_administration.png differ diff --git a/src/assets/badges/ilr.png b/src/assets/badges/ilr.png new file mode 100644 index 00000000..fed6bd8d Binary files /dev/null and b/src/assets/badges/ilr.png differ diff --git a/src/assets/badges/sc_johnson_school_of_management.png b/src/assets/badges/sc_johnson_school_of_management.png new file mode 100644 index 00000000..f4b85471 Binary files /dev/null and b/src/assets/badges/sc_johnson_school_of_management.png differ diff --git a/src/assets/badges/student_agencies.png b/src/assets/badges/student_agencies.png new file mode 100644 index 00000000..d6acf243 Binary files /dev/null and b/src/assets/badges/student_agencies.png differ diff --git a/src/assets/badges/weill_cornell_medical_sciences.png b/src/assets/badges/weill_cornell_medical_sciences.png new file mode 100644 index 00000000..417f47f4 Binary files /dev/null and b/src/assets/badges/weill_cornell_medical_sciences.png differ diff --git a/src/assets/badges/weill_cornell_medicine.png b/src/assets/badges/weill_cornell_medicine.png new file mode 100644 index 00000000..2e310e02 Binary files /dev/null and b/src/assets/badges/weill_cornell_medicine.png differ -- cgit v1.2.3-70-g09d2 From a1248fc2857850cf8e3a060de6cb47d803a30966 Mon Sep 17 00:00:00 2001 From: Ivan Chen Date: Wed, 12 May 2021 14:46:12 -0400 Subject: fixed typos --- src/assets/badges/college_of_arts_and_sciences .png | Bin 9036 -> 0 bytes src/assets/badges/college_of_arts_and_sciences.png | Bin 0 -> 9036 bytes src/assets/badges/college_of_veterinary_medicine.png | Bin 0 -> 10745 bytes src/assets/badges/cornell_of_veterinary_medicine.png | Bin 10745 -> 0 bytes 4 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 src/assets/badges/college_of_arts_and_sciences .png create mode 100644 src/assets/badges/college_of_arts_and_sciences.png create mode 100644 src/assets/badges/college_of_veterinary_medicine.png delete mode 100644 src/assets/badges/cornell_of_veterinary_medicine.png (limited to 'src/assets') diff --git a/src/assets/badges/college_of_arts_and_sciences .png b/src/assets/badges/college_of_arts_and_sciences .png deleted file mode 100644 index dad5ec4a..00000000 Binary files a/src/assets/badges/college_of_arts_and_sciences .png and /dev/null differ diff --git a/src/assets/badges/college_of_arts_and_sciences.png b/src/assets/badges/college_of_arts_and_sciences.png new file mode 100644 index 00000000..dad5ec4a Binary files /dev/null and b/src/assets/badges/college_of_arts_and_sciences.png differ diff --git a/src/assets/badges/college_of_veterinary_medicine.png b/src/assets/badges/college_of_veterinary_medicine.png new file mode 100644 index 00000000..cab17c19 Binary files /dev/null and b/src/assets/badges/college_of_veterinary_medicine.png differ diff --git a/src/assets/badges/cornell_of_veterinary_medicine.png b/src/assets/badges/cornell_of_veterinary_medicine.png deleted file mode 100644 index cab17c19..00000000 Binary files a/src/assets/badges/cornell_of_veterinary_medicine.png and /dev/null differ -- cgit v1.2.3-70-g09d2 From c7fb6698d9c3d449f772e5c5bf9210075108618d Mon Sep 17 00:00:00 2001 From: Ivan Chen Date: Wed, 12 May 2021 18:03:06 -0400 Subject: updated assets to bigger ones --- src/assets/badges/aap.png | Bin 11531 -> 12696 bytes src/assets/badges/cals.png | Bin 7488 -> 13847 bytes src/assets/badges/college_of_arts_and_sciences.png | Bin 9036 -> 15938 bytes src/assets/badges/college_of_engineering.png | Bin 9201 -> 11172 bytes src/assets/badges/college_of_human_ecology.png | Bin 10995 -> 13524 bytes .../badges/college_of_veterinary_medicine.png | Bin 10745 -> 13496 bytes src/assets/badges/cornell_law_school.png | Bin 10366 -> 12782 bytes src/assets/badges/cornell_tech.png | Bin 7067 -> 8537 bytes src/assets/badges/dyson_school.png | Bin 7879 -> 14758 bytes src/assets/badges/entrepreneurship_at_cornell.png | Bin 8298 -> 10134 bytes src/assets/badges/graduate_school.png | Bin 11612 -> 14748 bytes src/assets/badges/hotel_administration.png | Bin 8738 -> 10646 bytes src/assets/badges/ilr.png | Bin 7056 -> 16628 bytes .../badges/sc_johnson_school_of_management.png | Bin 7149 -> 15983 bytes src/assets/badges/student_agencies.png | Bin 14364 -> 18373 bytes .../badges/weill_cornell_medical_sciences.png | Bin 14439 -> 18624 bytes src/assets/badges/weill_cornell_medicine.png | Bin 13284 -> 16821 bytes 17 files changed, 0 insertions(+), 0 deletions(-) (limited to 'src/assets') diff --git a/src/assets/badges/aap.png b/src/assets/badges/aap.png index 0f5515b8..55d66295 100644 Binary files a/src/assets/badges/aap.png and b/src/assets/badges/aap.png differ diff --git a/src/assets/badges/cals.png b/src/assets/badges/cals.png index ccdc7455..04cbbeaa 100644 Binary files a/src/assets/badges/cals.png and b/src/assets/badges/cals.png differ diff --git a/src/assets/badges/college_of_arts_and_sciences.png b/src/assets/badges/college_of_arts_and_sciences.png index dad5ec4a..5f399c10 100644 Binary files a/src/assets/badges/college_of_arts_and_sciences.png and b/src/assets/badges/college_of_arts_and_sciences.png differ diff --git a/src/assets/badges/college_of_engineering.png b/src/assets/badges/college_of_engineering.png index a59447c9..0c50ccc8 100644 Binary files a/src/assets/badges/college_of_engineering.png and b/src/assets/badges/college_of_engineering.png differ diff --git a/src/assets/badges/college_of_human_ecology.png b/src/assets/badges/college_of_human_ecology.png index 73b907c5..14a9fd80 100644 Binary files a/src/assets/badges/college_of_human_ecology.png and b/src/assets/badges/college_of_human_ecology.png differ diff --git a/src/assets/badges/college_of_veterinary_medicine.png b/src/assets/badges/college_of_veterinary_medicine.png index cab17c19..1814aa97 100644 Binary files a/src/assets/badges/college_of_veterinary_medicine.png and b/src/assets/badges/college_of_veterinary_medicine.png differ diff --git a/src/assets/badges/cornell_law_school.png b/src/assets/badges/cornell_law_school.png index ade38d88..43104e41 100644 Binary files a/src/assets/badges/cornell_law_school.png and b/src/assets/badges/cornell_law_school.png differ diff --git a/src/assets/badges/cornell_tech.png b/src/assets/badges/cornell_tech.png index 7dde3198..c40d3889 100644 Binary files a/src/assets/badges/cornell_tech.png and b/src/assets/badges/cornell_tech.png differ diff --git a/src/assets/badges/dyson_school.png b/src/assets/badges/dyson_school.png index 91eab0c5..d17663b7 100644 Binary files a/src/assets/badges/dyson_school.png and b/src/assets/badges/dyson_school.png differ diff --git a/src/assets/badges/entrepreneurship_at_cornell.png b/src/assets/badges/entrepreneurship_at_cornell.png index 29207f6e..9e40b264 100644 Binary files a/src/assets/badges/entrepreneurship_at_cornell.png and b/src/assets/badges/entrepreneurship_at_cornell.png differ diff --git a/src/assets/badges/graduate_school.png b/src/assets/badges/graduate_school.png index 5852e498..f1c4006e 100644 Binary files a/src/assets/badges/graduate_school.png and b/src/assets/badges/graduate_school.png differ diff --git a/src/assets/badges/hotel_administration.png b/src/assets/badges/hotel_administration.png index be2a4e32..a92cfa3d 100644 Binary files a/src/assets/badges/hotel_administration.png and b/src/assets/badges/hotel_administration.png differ diff --git a/src/assets/badges/ilr.png b/src/assets/badges/ilr.png index fed6bd8d..2bdc5e19 100644 Binary files a/src/assets/badges/ilr.png and b/src/assets/badges/ilr.png differ diff --git a/src/assets/badges/sc_johnson_school_of_management.png b/src/assets/badges/sc_johnson_school_of_management.png index f4b85471..3e3acdfb 100644 Binary files a/src/assets/badges/sc_johnson_school_of_management.png and b/src/assets/badges/sc_johnson_school_of_management.png differ diff --git a/src/assets/badges/student_agencies.png b/src/assets/badges/student_agencies.png index d6acf243..ac31a1ee 100644 Binary files a/src/assets/badges/student_agencies.png and b/src/assets/badges/student_agencies.png differ diff --git a/src/assets/badges/weill_cornell_medical_sciences.png b/src/assets/badges/weill_cornell_medical_sciences.png index 417f47f4..3a28ae98 100644 Binary files a/src/assets/badges/weill_cornell_medical_sciences.png and b/src/assets/badges/weill_cornell_medical_sciences.png differ diff --git a/src/assets/badges/weill_cornell_medicine.png b/src/assets/badges/weill_cornell_medicine.png index 2e310e02..3e8a60b3 100644 Binary files a/src/assets/badges/weill_cornell_medicine.png and b/src/assets/badges/weill_cornell_medicine.png differ -- cgit v1.2.3-70-g09d2 From 45331d92a7c9f0a82b5799dba71b0e2f117156b3 Mon Sep 17 00:00:00 2001 From: Ivan Chen Date: Thu, 13 May 2021 12:53:14 -0400 Subject: added adjustment to images --- src/assets/badges/aap.png | Bin 12696 -> 11184 bytes src/assets/badges/cals.png | Bin 13847 -> 11952 bytes src/assets/badges/college_of_arts_and_sciences.png | Bin 15938 -> 13632 bytes src/assets/badges/college_of_engineering.png | Bin 11172 -> 10165 bytes src/assets/badges/entrepreneurship_at_cornell.png | Bin 10134 -> 12587 bytes src/assets/badges/ilr.png | Bin 16628 -> 17000 bytes .../badges/sc_johnson_school_of_management.png | Bin 15983 -> 11346 bytes .../badges/weill_cornell_medical_sciences.png | Bin 18624 -> 17096 bytes 8 files changed, 0 insertions(+), 0 deletions(-) (limited to 'src/assets') diff --git a/src/assets/badges/aap.png b/src/assets/badges/aap.png index 55d66295..dd150b8f 100644 Binary files a/src/assets/badges/aap.png and b/src/assets/badges/aap.png differ diff --git a/src/assets/badges/cals.png b/src/assets/badges/cals.png index 04cbbeaa..fbf0717b 100644 Binary files a/src/assets/badges/cals.png and b/src/assets/badges/cals.png differ diff --git a/src/assets/badges/college_of_arts_and_sciences.png b/src/assets/badges/college_of_arts_and_sciences.png index 5f399c10..146a06ed 100644 Binary files a/src/assets/badges/college_of_arts_and_sciences.png and b/src/assets/badges/college_of_arts_and_sciences.png differ diff --git a/src/assets/badges/college_of_engineering.png b/src/assets/badges/college_of_engineering.png index 0c50ccc8..c3f9e889 100644 Binary files a/src/assets/badges/college_of_engineering.png and b/src/assets/badges/college_of_engineering.png differ diff --git a/src/assets/badges/entrepreneurship_at_cornell.png b/src/assets/badges/entrepreneurship_at_cornell.png index 9e40b264..6b86abd4 100644 Binary files a/src/assets/badges/entrepreneurship_at_cornell.png and b/src/assets/badges/entrepreneurship_at_cornell.png differ diff --git a/src/assets/badges/ilr.png b/src/assets/badges/ilr.png index 2bdc5e19..549d6955 100644 Binary files a/src/assets/badges/ilr.png and b/src/assets/badges/ilr.png differ diff --git a/src/assets/badges/sc_johnson_school_of_management.png b/src/assets/badges/sc_johnson_school_of_management.png index 3e3acdfb..3fc24aa4 100644 Binary files a/src/assets/badges/sc_johnson_school_of_management.png and b/src/assets/badges/sc_johnson_school_of_management.png differ diff --git a/src/assets/badges/weill_cornell_medical_sciences.png b/src/assets/badges/weill_cornell_medical_sciences.png index 3a28ae98..2167df79 100644 Binary files a/src/assets/badges/weill_cornell_medical_sciences.png and b/src/assets/badges/weill_cornell_medical_sciences.png differ -- cgit v1.2.3-70-g09d2 From 1e948b556fd53c02d7462576b183cdd6c4c793bb Mon Sep 17 00:00:00 2001 From: Ivan Chen Date: Thu, 13 May 2021 17:59:29 -0400 Subject: Revert "[TMA-844] Plus sign for profile and header in profile, ability to add on the sc…" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/icons/grey-purple-plus.svg | 5 -- src/assets/icons/purple-plus.svg | 15 ----- src/components/profile/Cover.tsx | 108 +++++----------------------------- src/components/profile/TaggAvatar.tsx | 67 ++------------------- src/utils/common.ts | 17 ------ src/utils/users.ts | 82 -------------------------- 6 files changed, 18 insertions(+), 276 deletions(-) delete mode 100644 src/assets/icons/grey-purple-plus.svg delete mode 100644 src/assets/icons/purple-plus.svg (limited to 'src/assets') diff --git a/src/assets/icons/grey-purple-plus.svg b/src/assets/icons/grey-purple-plus.svg deleted file mode 100644 index 2053d4a7..00000000 --- a/src/assets/icons/grey-purple-plus.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/assets/icons/purple-plus.svg b/src/assets/icons/purple-plus.svg deleted file mode 100644 index 20949b6d..00000000 --- a/src/assets/icons/purple-plus.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/src/components/profile/Cover.tsx b/src/components/profile/Cover.tsx index 5d5b4234..27777b64 100644 --- a/src/components/profile/Cover.tsx +++ b/src/components/profile/Cover.tsx @@ -1,93 +1,28 @@ -import React, {useState, useEffect} from 'react'; -import { - Image, - StyleSheet, - View, - TouchableOpacity, - Text, - ImageBackground, -} from 'react-native'; +import React from 'react'; +import {Image, StyleSheet, View} from 'react-native'; +import {useSelector} from 'react-redux'; import {COVER_HEIGHT, IMAGE_WIDTH} from '../../constants'; -import {ScreenType} from '../../types'; -import GreyPurplePlus from '../../assets/icons/grey-purple-plus.svg'; -import {useDispatch, useSelector} from 'react-redux'; -import {loadUserData, resetHeaderAndProfileImage} from '../../store/actions'; import {RootState} from '../../store/rootreducer'; -import {normalize, patchProfile, validateImageLink} from '../../utils'; +import {ScreenType} from '../../types'; interface CoverProps { userXId: string | undefined; screenType: ScreenType; } const Cover: React.FC = ({userXId, screenType}) => { - const dispatch = useDispatch(); - const {cover, user} = useSelector((state: RootState) => + const {cover} = useSelector((state: RootState) => userXId ? state.userX[screenType][userXId] : state.user, ); - const [needsUpdate, setNeedsUpdate] = useState(false); - const [loading, setLoading] = useState(false); - const [validImage, setValidImage] = useState(true); - - useEffect(() => { - checkAvatar(cover); - }, []); - - useEffect(() => { - if (needsUpdate) { - const userId = user.userId; - const username = user.username; - dispatch(resetHeaderAndProfileImage()); - dispatch(loadUserData({userId, username})); - } - }, [dispatch, needsUpdate]); - - const handleNewImage = async () => { - setLoading(true); - const result = await patchProfile('header', user.userId); - setLoading(true); - if (result) { - setNeedsUpdate(true); - } else { - setLoading(false); - } - }; - - const checkAvatar = async (url: string | undefined) => { - const valid = await validateImageLink(url); - if (valid !== validImage) { - setValidImage(valid); - } - }; - - if (!validImage && userXId === undefined && !loading) { - return ( - - - handleNewImage()}> - - Add Picture - - - - ); - } else { - return ( - - - - ); - } + return ( + + + + ); }; const styles = StyleSheet.create({ @@ -98,20 +33,5 @@ const styles = StyleSheet.create({ width: IMAGE_WIDTH, height: COVER_HEIGHT, }, - plus: { - position: 'absolute', - top: 75, - right: 125, - }, - text: { - color: 'white', - position: 'absolute', - fontSize: normalize(16), - top: 80, - right: 20, - }, - touch: { - flex: 1, - }, }); export default Cover; diff --git a/src/components/profile/TaggAvatar.tsx b/src/components/profile/TaggAvatar.tsx index 304b9e3a..ea0bdb65 100644 --- a/src/components/profile/TaggAvatar.tsx +++ b/src/components/profile/TaggAvatar.tsx @@ -1,12 +1,9 @@ -import React, {useState, useEffect} from 'react'; -import {StyleSheet, TouchableOpacity} from 'react-native'; +import React from 'react'; +import {StyleSheet} from 'react-native'; +import {useSelector} from 'react-redux'; import {RootState} from '../../store/rootreducer'; import {ScreenType} from '../../types'; import {Avatar} from '../common'; -import {useDispatch, useSelector} from 'react-redux'; -import {loadUserData, resetHeaderAndProfileImage} from '../../store/actions'; -import PurplePlus from '../../assets/icons/purple-plus.svg'; -import {patchProfile, validateImageLink} from '../../utils'; const PROFILE_DIM = 100; @@ -23,59 +20,8 @@ const TaggAvatar: React.FC = ({ const {avatar} = useSelector((state: RootState) => userXId ? state.userX[screenType][userXId] : state.user, ); - const dispatch = useDispatch(); - const [needsUpdate, setNeedsUpdate] = useState(false); - const [loading, setLoading] = useState(false); - const [validImage, setValidImage] = useState(true); - const {user} = useSelector((state: RootState) => - userXId ? state.userX[screenType][userXId] : state.user, - ); - - useEffect(() => { - checkAvatar(avatar); - }, []); - - useEffect(() => { - if (needsUpdate) { - const userId = user.userId; - const username = user.username; - dispatch(resetHeaderAndProfileImage()); - dispatch(loadUserData({userId, username})); - } - }, [dispatch, needsUpdate]); - const handleNewImage = async () => { - setLoading(true); - const result = await patchProfile('profile', user.userId); - if (result) { - setNeedsUpdate(true); - } else { - setLoading(false); - } - }; - - const checkAvatar = async (url: string | undefined) => { - const valid = await validateImageLink(url); - if (valid !== validImage) { - setValidImage(valid); - } - }; - - if (!validImage && userXId === undefined && !loading) { - return ( - <> - - handleNewImage()}> - - - - ); - } else { - return ; - } + return ; }; const styles = StyleSheet.create({ @@ -84,11 +30,6 @@ const styles = StyleSheet.create({ width: PROFILE_DIM, borderRadius: PROFILE_DIM / 2, }, - plus: { - position: 'absolute', - bottom: 35, - right: 0, - }, }); export default TaggAvatar; diff --git a/src/utils/common.ts b/src/utils/common.ts index 95e77f64..ce4ab7d1 100644 --- a/src/utils/common.ts +++ b/src/utils/common.ts @@ -180,20 +180,3 @@ const _crestIcon = (university: UniversityType) => { return require('../assets/images/bwbadges.png'); } }; - -export const validateImageLink = async (url: string | undefined) => { - if (!url) { - return false; - } - return fetch(url) - .then((res) => { - if (res.status === 200) { - return true; - } else { - return false; - } - }) - .catch((_) => { - return false; - }); -}; diff --git a/src/utils/users.ts b/src/utils/users.ts index 430c843f..334cb3c0 100644 --- a/src/utils/users.ts +++ b/src/utils/users.ts @@ -1,4 +1,3 @@ -import {Alert} from 'react-native'; import AsyncStorage from '@react-native-community/async-storage'; import {INTEGRATED_SOCIAL_LIST} from '../constants'; import {isUserBlocked, loadSocialPosts, removeBadgesService} from '../services'; @@ -25,8 +24,6 @@ import { UserType, UniversityBadge, } from './../types/types'; -import ImagePicker from 'react-native-image-crop-picker'; -import {patchEditProfile} from '../services'; const loadData = async (dispatch: AppDispatch, user: UserType) => { await Promise.all([ @@ -243,82 +240,3 @@ export const navigateToProfile = async ( screenType, }); }; - -export const patchProfile = async ( - title: 'profile' | 'header', - userId: string, -) => { - let imageSettings = {}; - let screenTitle: string; - let requestTitle: string; - let fileName: string; - switch (title) { - case 'header': - screenTitle = 'Select Header Picture'; - requestTitle = 'largeProfilePicture'; - fileName = 'large_profile_pic.jpg'; - imageSettings = { - smartAlbums: [ - 'Favorites', - 'RecentlyAdded', - 'SelfPortraits', - 'Screenshots', - 'UserLibrary', - ], - width: 580, - height: 580, - cropping: true, - cropperToolbarTitle: screenTitle, - mediaType: 'photo', - }; - break; - case 'profile': - screenTitle = 'Select Profile Picture'; - requestTitle = 'smallProfilePicture'; - fileName = 'small_profile_pic.jpg'; - imageSettings = { - smartAlbums: [ - 'Favorites', - 'RecentlyAdded', - 'SelfPortraits', - 'Screenshots', - 'UserLibrary', - ], - width: 580, - height: 580, - cropping: true, - cropperToolbarTitle: screenTitle, - mediaType: 'photo', - cropperCircleOverlay: true, - }; - break; - default: - screenTitle = ''; - requestTitle = ''; - fileName = ''; - } - - return await ImagePicker.openPicker(imageSettings) - .then((picture) => { - if ('path' in picture) { - const request = new FormData(); - request.append(requestTitle, { - uri: picture.path, - name: fileName, - type: 'image/jpg', - }); - - return patchEditProfile(request, userId) - .then((_) => { - return true; - }) - .catch((error) => { - Alert.alert(error); - return false; - }); - } - }) - .catch((_) => { - return false; - }); -}; -- cgit v1.2.3-70-g09d2