updated a bit removed from feed.js added to proilfeScreen

This commit is contained in:
ue 2018-10-03 00:48:57 +03:00
parent 600a90b9da
commit ae0d2a7b75
3 changed files with 63 additions and 69 deletions

View File

@ -22,9 +22,7 @@ import Placeholder from "rn-placeholder";
// COMPONENTS // COMPONENTS
import { PostCard } from "../../components/postCard"; import { PostCard } from "../../components/postCard";
import { FilterBar } from "../../components/filterBar"; import { FilterBar } from "../../components/filterBar";
import { ProfileSummary } from "../../components/profileSummary";
import { CollapsibleCard } from "../../components/collapsibleCard";
/* eslint-enable no-unused-vars */ /* eslint-enable no-unused-vars */
class FeedPage extends React.Component { class FeedPage extends React.Component {
@ -115,19 +113,7 @@ class FeedPage extends React.Component {
render() { render() {
return ( return (
<View style={{ flex: 1 }}> <View style={{ flex: 1 }}>
<CollapsibleCard {this.state.isReady && (
title="eSteem CMO / product lead / illustator"
expanded={true}
>
<ProfileSummary
percent={92.28}
hours={9}
location="Saint Petersburg, Russia"
link="dunsky.ru"
date="24 July, 2017"
/>
</CollapsibleCard>
{/* {this.state.isReady && (
<FilterBar <FilterBar
dropdownIconName="md-arrow-dropdown" dropdownIconName="md-arrow-dropdown"
options={[ options={[
@ -195,7 +181,7 @@ class FeedPage extends React.Component {
/> />
</View> </View>
</View> </View>
)} */} )}
</View> </View>
); );
} }

View File

@ -1,19 +1,19 @@
/* eslint-disable no-unused-vars */ /* eslint-disable no-unused-vars */
import React from "react"; import React from "react";
import { FlatList, ActivityIndicator } from "react-native"; import { FlatList, ActivityIndicator } from "react-native";
import { Card, CardItem, View, Body, Icon, Text } from "native-base";
import { getTimeFromNow } from "../../../utils/time"; import { getTimeFromNow } from "../../../utils/time";
import FastImage from "react-native-fast-image"; import FastImage from "react-native-fast-image";
// Components
import ScrollableTabView from "@esteemapp/react-native-scrollable-tab-view"; import ScrollableTabView from "@esteemapp/react-native-scrollable-tab-view";
import { TabBar } from "../../../components/tabBar"; import { TabBar } from "../../../components/tabBar";
import DiscoverPage from "../../discover/discover"; import DiscoverPage from "../../discover/discover";
import { PostCard } from "../../../components/postCard"; import { PostCard } from "../../../components/postCard";
import { ProfileSummary } from "../../../components/profileSummary";
import Comment from "../../../components/comment/comment"; import Comment from "../../../components/comment/comment";
import { Card, CardItem, View, Body, Icon, Text } from "native-base"; // Utilitites
import { getUserData, getAuthStatus } from "../../../realm/realm"; import { getUserData, getAuthStatus } from "../../../realm/realm";
import { import {
getUser, getUser,
@ -177,10 +177,17 @@ class ProfileScreen extends React.Component {
//TODO: Refactor ME ! //TODO: Refactor ME !
return ( return (
<View style={styles.container}> <View style={styles.container}>
<CollapsibleCard title="Customized Card 1" expanded={true}> <CollapsibleCard
<Text>Hello, this is first line.</Text> title="eSteem CMO / product lead / illustator"
<Text>Hello, this is second line.</Text> expanded={true}
<Text>Hello, this is third line.</Text> >
<ProfileSummary
percent={92.28}
hours={9}
location="Saint Petersburg, Russia"
link="dunsky.ru"
date="24 July, 2017"
/>
</CollapsibleCard> </CollapsibleCard>
{/* {this.state.isLoggedIn ? ( {/* {this.state.isLoggedIn ? (
<View style={{ flex: 1 }}> <View style={{ flex: 1 }}>

View File

@ -2,49 +2,50 @@ import EStyleSheet from "react-native-extended-stylesheet";
import { StatusBar } from "react-native"; import { StatusBar } from "react-native";
export default EStyleSheet.create({ export default EStyleSheet.create({
container: { container: {
flex: 1, flex: 1,
top: StatusBar.currentHeight, top: StatusBar.currentHeight,
}, backgroundColor: "#f6f6f6",
content: { },
backgroundColor: "#f9f9f9", content: {
}, backgroundColor: "#f9f9f9",
cover: { },
width: "$deviceWidth", cover: {
height: 160, width: "$deviceWidth",
}, height: 160,
avatar: { },
width: 100, avatar: {
height: 100, width: 100,
borderRadius: 50, height: 100,
top: -50, borderRadius: 50,
borderWidth: 1, top: -50,
borderColor: "white", borderWidth: 1,
alignSelf: "center", borderColor: "white",
}, alignSelf: "center",
about: { },
borderColor: "lightgray", about: {
borderTopWidth: 1, borderColor: "lightgray",
borderBottomWidth: 1, borderTopWidth: 1,
flexDirection: "row", borderBottomWidth: 1,
}, flexDirection: "row",
info: { },
flexDirection: "row", info: {
borderBottomWidth: 0, flexDirection: "row",
}, borderBottomWidth: 0,
tabs: { },
alignSelf: "center", tabs: {
backgroundColor: "transparent", alignSelf: "center",
}, backgroundColor: "transparent",
tabbar: { },
alignSelf: "center", tabbar: {
height: 40, alignSelf: "center",
backgroundColor: "#fff", height: 40,
}, backgroundColor: "#fff",
tabbarItem: { },
flex: 1, tabbarItem: {
paddingHorizontal: 7, flex: 1,
backgroundColor: "#f9f9f9", paddingHorizontal: 7,
minWidth: "$deviceWidth", backgroundColor: "#f9f9f9",
}, minWidth: "$deviceWidth",
},
}); });