From 8b67d26a2d6bbd30d6fdc8893c1d53a61a3a40dc Mon Sep 17 00:00:00 2001 From: Paul Frazee Date: Fri, 24 Feb 2023 11:29:27 -0600 Subject: [PATCH] Remove the desktop right column for now --- .../com/discover/LiteSuggestedFollows.tsx | 190 ------------------ src/view/shell/web/DesktopRightColumn.tsx | 28 --- src/view/shell/web/index.tsx | 2 - 3 files changed, 220 deletions(-) delete mode 100644 src/view/com/discover/LiteSuggestedFollows.tsx delete mode 100644 src/view/shell/web/DesktopRightColumn.tsx diff --git a/src/view/com/discover/LiteSuggestedFollows.tsx b/src/view/com/discover/LiteSuggestedFollows.tsx deleted file mode 100644 index d9620f3873..0000000000 --- a/src/view/com/discover/LiteSuggestedFollows.tsx +++ /dev/null @@ -1,190 +0,0 @@ -import React, {useEffect, useState} from 'react' -import { - ActivityIndicator, - StyleSheet, - TouchableOpacity, - View, -} from 'react-native' -import {observer} from 'mobx-react-lite' -import _omit from 'lodash.omit' -import {Link} from '../util/Link' -import {Text} from '../util/text/Text' -import {UserAvatar} from '../util/UserAvatar' -import * as Toast from '../util/Toast' -import {useStores} from 'state/index' -import * as apilib from 'lib/api/index' -import { - SuggestedActorsViewModel, - SuggestedActor, -} from 'state/models/suggested-actors-view' -import {s, gradients} from 'lib/styles' -import {usePalette} from 'lib/hooks/usePalette' - -export const LiteSuggestedFollows = observer(() => { - const store = useStores() - const [suggestions, setSuggestions] = useState( - undefined, - ) - const [follows, setFollows] = useState>({}) - - useEffect(() => { - const view = new SuggestedActorsViewModel(store) - view.loadMore().then( - () => { - setSuggestions(view.suggestions.slice().sort(randomize).slice(0, 3)) - }, - (err: any) => { - setSuggestions([]) - store.log.error('Failed to fetch suggestions', err) - }, - ) - }, [store, store.log]) - - const onPressFollow = async (item: SuggestedActor) => { - try { - const res = await apilib.follow(store, item.did, item.declaration.cid) - setFollows({[item.did]: res.uri, ...follows}) - } catch (e: any) { - store.log.error('Failed fo create follow', e) - Toast.show('An issue occurred, please try again.') - } - } - const onPressUnfollow = async (item: SuggestedActor) => { - try { - await apilib.unfollow(store, follows[item.did]) - setFollows(_omit(follows, [item.did])) - } catch (e: any) { - store.log.error('Failed fo delete follow', e) - Toast.show('An issue occurred, please try again.') - } - } - - return ( - - {!suggestions ? ( - - - - ) : ( - - {suggestions.map(item => ( - - - - ))} - - )} - - ) -}) - -const User = ({ - item, - follow, - onPressFollow, - onPressUnfollow, -}: { - item: SuggestedActor - follow: string | undefined - onPressFollow: (item: SuggestedActor) => void - onPressUnfollow: (item: SuggestedActor) => void -}) => { - const pal = usePalette('default') - const palInverted = usePalette('inverted') - return ( - - - - - - - - {item.displayName || item.handle} - - - @{item.handle} - - - - {follow ? ( - onPressUnfollow(item)}> - - - Unfollow - - - - ) : ( - onPressFollow(item)} - style={[styles.btn, palInverted.view]}> - - Follow - - - )} - - - - ) -} - -function randomize() { - return Math.random() > 0.5 ? 1 : -1 -} - -const styles = StyleSheet.create({ - footer: { - height: 200, - paddingTop: 20, - }, - - actor: {}, - actorMeta: { - flexDirection: 'row', - }, - actorAvi: { - width: 50, - paddingTop: 10, - paddingBottom: 10, - }, - actorContent: { - flex: 1, - paddingRight: 10, - paddingTop: 10, - }, - actorBtn: { - paddingRight: 10, - paddingTop: 10, - }, - - gradientBtn: { - paddingHorizontal: 14, - paddingVertical: 6, - }, - secondaryBtn: { - paddingHorizontal: 8, - }, - btn: { - flexDirection: 'row', - alignItems: 'center', - justifyContent: 'center', - paddingVertical: 7, - paddingHorizontal: 14, - borderRadius: 50, - marginLeft: 6, - }, -}) diff --git a/src/view/shell/web/DesktopRightColumn.tsx b/src/view/shell/web/DesktopRightColumn.tsx deleted file mode 100644 index 6a59f4e85c..0000000000 --- a/src/view/shell/web/DesktopRightColumn.tsx +++ /dev/null @@ -1,28 +0,0 @@ -import React from 'react' -import {StyleSheet, View} from 'react-native' -import {Text} from '../../com/util/text/Text' -import {LiteSuggestedFollows} from '../../com/discover/LiteSuggestedFollows' -import {s} from 'lib/styles' - -export const DesktopRightColumn: React.FC = () => { - return ( - - - Suggested Follows - - - - ) -} - -const styles = StyleSheet.create({ - container: { - position: 'absolute', - right: 0, - top: 60, - width: '400px', - paddingHorizontal: 16, - paddingRight: 32, - paddingTop: 20, - }, -}) diff --git a/src/view/shell/web/index.tsx b/src/view/shell/web/index.tsx index ae1a526a0f..358ab5d4d8 100644 --- a/src/view/shell/web/index.tsx +++ b/src/view/shell/web/index.tsx @@ -6,7 +6,6 @@ import {useStores} from 'state/index' import {NavigationModel} from 'state/models/navigation' import {match, MatchResult} from '../../routes' import {DesktopHeader} from './DesktopHeader' -import {DesktopRightColumn} from './DesktopRightColumn' import {Onboard} from '../../screens/Onboard' import {Login} from '../../screens/Login' import {ErrorBoundary} from '../../com/util/ErrorBoundary' @@ -58,7 +57,6 @@ export const WebShell: React.FC = observer(() => { ))} - store.shell.closeComposer()}