From 1e948b556fd53c02d7462576b183cdd6c4c793bb Mon Sep 17 00:00:00 2001
From: Ivan Chen <ivan.if.chen@gmail.com>
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/components/profile/Cover.tsx      | 108 +++++-----------------------------
 src/components/profile/TaggAvatar.tsx |  67 ++-------------------
 2 files changed, 18 insertions(+), 157 deletions(-)

(limited to 'src/components')

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<CoverProps> = ({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<boolean>(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 (
-      <View style={[styles.container]}>
-        <ImageBackground
-          style={styles.image}
-          defaultSource={require('../../assets/images/cover-placeholder.png')}
-          source={{uri: cover, cache: 'reload'}}>
-          <TouchableOpacity
-            accessible={true}
-            accessibilityLabel="ADD HEADER PICTURE"
-            onPress={() => handleNewImage()}>
-            <GreyPurplePlus style={styles.plus} />
-            <Text style={styles.text}>Add Picture</Text>
-          </TouchableOpacity>
-        </ImageBackground>
-      </View>
-    );
-  } else {
-    return (
-      <View style={styles.container}>
-        <Image
-          style={styles.image}
-          defaultSource={require('../../assets/images/cover-placeholder.png')}
-          source={{uri: cover, cache: 'reload'}}
-        />
-      </View>
-    );
-  }
+  return (
+    <View style={[styles.container]}>
+      <Image
+        style={styles.image}
+        defaultSource={require('../../assets/images/cover-placeholder.png')}
+        source={{uri: cover, cache: 'reload'}}
+      />
+    </View>
+  );
 };
 
 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<TaggAvatarProps> = ({
   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<boolean>(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 (
-      <>
-        <Avatar style={[styles.image, style]} uri={avatar} />
-        <TouchableOpacity
-          accessible={true}
-          accessibilityLabel="ADD PROFILE PICTURE"
-          onPress={() => handleNewImage()}>
-          <PurplePlus style={styles.plus} />
-        </TouchableOpacity>
-      </>
-    );
-  } else {
-    return <Avatar style={[styles.image, style]} uri={avatar} />;
-  }
+  return <Avatar style={[styles.image, style]} uri={avatar} />;
 };
 
 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;
-- 
cgit v1.2.3-70-g09d2