Skip to content

Commit

Permalink
Merge pull request #109 from ES2-UFPI/danillo#108
Browse files Browse the repository at this point in the history 
close issue #108
  • Loading branch information
@basilioarth
basilioarth authored Jun 27, 2021
2 parents f4b1d48 + 0f4b151 commit d4b8b08
Show file tree
Hide file tree
Showing 4 changed files with 99 additions and 67 deletions.
6 changes: 6 additions & 0 deletions frontend/src/routes.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import Acompanhamento from './views/acompanhamento';
import BottomNavigation from './components/BottomNavigation';
import ProfessionalAssociationCode from './views/ProfessionalAssociationCode';
import GerenciarProfessional from './views/GerenciarProfessional';
import About from './views/about';
import FAQ from './views/faq';

const Stack = createStackNavigator<RootStackParamList>();

Expand All @@ -24,6 +26,8 @@ export default function Routes() {
<Stack.Screen name='GerenciarProfessional' component={GerenciarProfessional} />
<Stack.Screen name='Registration' component={Registration} />
<Stack.Screen name='Acompanhamento' component={Acompanhamento} />
<Stack.Screen name='About' component={About} />
<Stack.Screen name='FAQ' component={FAQ} />
</Stack.Navigator>
</NavigationContainer>
);
Expand All @@ -36,4 +40,6 @@ type RootStackParamList = {
GerenciarProfessional:undefined
Registration: undefined
Acompanhamento: undefined
About: undefined
FAQ: undefined
};
53 changes: 35 additions & 18 deletions frontend/src/views/about/index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,34 +13,49 @@ const SCREEN_WIDTH = Dimensions.get("window").width;
const iconColor = '#212325';
const iconSize = SCREEN_WIDTH * 0.075;

var firstParagraph = "O e-motion é um aplicativo criado para facilitar o acompanhamento e interação entre psicólogos e clientes. Nele é possível fazer registros emocionais de situações vividas pelo cliente: quais os sentimentos envolvidos, contextos, causas e consequências. Todos os registros podem ser acessados pelo psicólogo responsável pelo cliente.";
var secondParagraph = "O psicólogo pode ter acesso a todos os registros emocionais de seus pacientes e, consequentemente, fazer um acompanhamento mais próximo. O e-motion não tem a intenção de substituir sessões de terapia, pelo contrário, é uma ferramenta que visa auxiliar o psicólogo no acompanhamento de seu cliente durante o período entre cada sessão.";

export default function About({ navigation, route }: any) {

return (
<View style={styles.container}>
<View style={styles.generalView}>
<TouchableOpacity style={styles.goBack} onPress={() => navigation.goBack()}>
<MaterialCommunityIcons style={styles.goBackIcon} name="chevron-left" color={iconColor} size={iconSize} />
<MaterialCommunityIcons style={styles.goBackIcon} name="chevron-left" color={'#FCFCFF'} size={iconSize} />
<Text style={styles.goBackText}>Voltar</Text>
</TouchableOpacity>
<View style={styles.titleContainer} >
<Text style={styles.text}>Sobre o e-motion</Text>
</View>
<View style={styles.textContainer}>
<Paragraph style={styles.paragraph}>
Contrary to popular belief, Lorem Ipsum is not simply random text. It has roots in a piece of classical Latin literature from 45 BC, making it over 2000 years old. Richard McClintock, a Latin professor at Hampden-Sydney College in Virginia, looked up one of the more obscure Latin words, consectetur, from a Lorem Ipsum passage, and going through the cites of the word in classical literature, discovered the undoubtable source.
</Paragraph>
<Paragraph style={styles.paragraph}>
Lorem Ipsum comes from sections 1.10.32 and 1.10.33 of "de Finibus Bonorum et Malorum" (The Extremes of Good and Evil) by Cicero, written in 45 BC. This book is a treatise on the theory of ethics, very popular during the Renaissance. The first line of Lorem Ipsum, "Lorem ipsum dolor sit amet..", comes from a line in section 1.10.32.
</Paragraph>
</View>
</View >
<View style={styles.container}>
{/* <TouchableOpacity style={styles.goBack} onPress={() => navigation.goBack()}>
<MaterialCommunityIcons style={styles.goBackIcon} name="chevron-left" color={iconColor} size={iconSize} />
<Text style={styles.goBackText}>Voltar</Text>
</TouchableOpacity> */}
<View style={styles.titleContainer} >
<Text style={styles.text}>Sobre o e-motion</Text>
</View>
<View style={styles.textContainer}>
<Paragraph style={styles.paragraph}>
{firstParagraph}
</Paragraph>
<Paragraph style={styles.paragraph}>
{secondParagraph}
</Paragraph>
</View>
</View >
</View>
);
}

const styles = StyleSheet.create({
generalView: {
flex: 1,
backgroundColor: '#E1948B'
},
container: {
flex: 1,
backgroundColor: '#FCFCFF',
paddingHorizontal: SCREEN_WIDTH * 0.06,
borderTopRightRadius: 30,
borderTopLeftRadius: 30,
},
titleContainer: {
alignItems: 'center'
Expand All @@ -57,21 +72,23 @@ const styles = StyleSheet.create({

},
goBackText: {
color: '#000000',
color: '#FCFCFF',
fontSize: 16,
alignSelf: 'center',
paddingLeft: 10,
},
goBack: {
marginTop: SCREEN_WIDTH * 0.15,
marginTop: SCREEN_WIDTH * 0.125,
marginBottom: SCREEN_WIDTH * 0.035,
marginHorizontal: SCREEN_WIDTH * 0.025,
flexDirection: 'row',
backgroundColor: '#E1948B'
},
goBackIcon: {
textAlign: 'center',

},
paragraph: {
fontSize: 16,
fontSize: 14,
marginBottom: SCREEN_WIDTH * 0.05,
}
});
103 changes: 56 additions & 47 deletions frontend/src/views/faq/index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,70 +14,77 @@ const SCREEN_WIDTH = Dimensions.get("window").width;
const iconColor = '#212325';
const iconSize = SCREEN_WIDTH * 0.075;

var firstQuestionTitle = 'O que é o e-motion?';
var secondQuestionTitle = 'Para quem é o e-motion?';
var thirdQuestionTitle = 'Meus dados estão seguros?';

var firstQuestionText = 'O e-motion é um aplicativo de registros emocionais, onde o usuário pode fazer registros emocionais: sentimentos, contextos, ações e reações relacionadas. Além disso, um psicólogo responsável pelo usuário pode fazer o acompanhamento dos registros.';
var secondQuestionText = 'O e-motion é destinado para clientes e psicólogos que buscam melhorar o registro de situações relevantes para o tratamento terapêutico que possam acontecer no período entre sessões.';
var thirdQuestionText = 'O e-motion garante a privacidade de seus usuários. Os registros emocionais de cada usuário estão disponíveis apenas para ele mesmo e, caso seja permitido pelo usuário, o psicólogo responsável.';

export default function FAQ({ navigation, route }: any) {

const [expanded, setExpanded] = useState(true);

const handlePress = () => setExpanded(!expanded);

return (
<ScrollView style={styles.container}>
<View style={styles.generalView}>
<TouchableOpacity style={styles.goBack} onPress={() => navigation.goBack()}>
<MaterialCommunityIcons style={styles.goBackIcon} name="chevron-left" color={iconColor} size={iconSize} />
<MaterialCommunityIcons style={styles.goBackIcon} name="chevron-left" color={'#FCFCFF'} size={iconSize} />
<Text style={styles.goBackText}>Voltar</Text>
</TouchableOpacity>
<View style={styles.titleContainer} >
<Text style={styles.text}>FAQ</Text>
</View>
<List.Section>
<List.Accordion
title="What is Lorem Ipsum?"
style={styles.accordion}
titleStyle={{ color: '#161719' }}
>
<View style={styles.answerContainer}>
<Text style={styles.answerText}>Lorem Ipsum is simply dummy text of the printing and typesetting industry.</Text>
</View>
<ScrollView style={styles.container}>
<View style={styles.titleContainer} >
<Text style={styles.text}>FAQ</Text>
</View>
<List.Section>
<List.Accordion
title={firstQuestionTitle}
style={styles.accordion}
titleStyle={{ color: '#161719' }}
>
<View style={styles.answerContainer}>
<Text style={styles.answerText}>{firstQuestionText}</Text>
</View>

</List.Accordion>
</List.Accordion>

<List.Accordion
title="Where does it come from?"
style={styles.accordion}
titleStyle={{ color: '#161719' }}
>
<View style={styles.answerContainer}>
<Text style={styles.answerText}>Contrary to popular belief, Lorem Ipsum is not simply random text.</Text>
</View>
</List.Accordion>
<List.Accordion
title="Why do we use it?"
style={styles.accordion}
titleStyle={{ color: '#161719' }}
>
<View style={styles.answerContainer}>
<Text style={styles.answerText}>It is a long established fact that a reader will be distracted by the readable content of a page when looking at its layout.</Text>
</View>
</List.Accordion>
<List.Accordion
title="Where can I get some?"
style={styles.accordion}
titleStyle={{ color: '#161719' }}
>
<View style={styles.answerContainer}>
<Text style={styles.answerText}>There are many variations of passages of Lorem Ipsum available, but the majority have suffered alteration in some form, by injected humour, or randomised words which don't look even slightly believable.</Text>
</View>
</List.Accordion>
</List.Section>
</ScrollView >
<List.Accordion
title={secondQuestionTitle}
style={styles.accordion}
titleStyle={{ color: '#161719' }}
>
<View style={styles.answerContainer}>
<Text style={styles.answerText}>{secondQuestionText}</Text>
</View>
</List.Accordion>
<List.Accordion
title={thirdQuestionTitle}
style={styles.accordion}
titleStyle={{ color: '#161719' }}
>
<View style={styles.answerContainer}>
<Text style={styles.answerText}>{thirdQuestionText}</Text>
</View>
</List.Accordion>
</List.Section>
</ScrollView >
</View>
);
}

const styles = StyleSheet.create({
generalView: {
flex: 1,
backgroundColor: '#E1948B'
},
container: {
flex: 1,
backgroundColor: '#FCFCFF',
paddingHorizontal: SCREEN_WIDTH * 0.06,
borderTopRightRadius: 30,
borderTopLeftRadius: 30,
},
titleContainer: {
alignItems: 'center'
Expand All @@ -94,18 +101,20 @@ const styles = StyleSheet.create({

},
goBackText: {
color: '#000000',
color: '#FCFCFF',
fontSize: 16,
alignSelf: 'center',
paddingLeft: 10,
},
goBack: {
marginTop: SCREEN_WIDTH * 0.15,
marginTop: SCREEN_WIDTH * 0.125,
marginBottom: SCREEN_WIDTH * 0.035,
marginHorizontal: SCREEN_WIDTH * 0.025,
flexDirection: 'row',
backgroundColor: '#E1948B'
},
goBackIcon: {
textAlign: 'center',

},
accordion: {
backgroundColor: '#FCFCFF',
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/views/profile/index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,11 +78,11 @@ export default function Profile({ navigation }: any) {
</View>
<View style={styles.accountSettingsContainer}>
<Text style={styles.accountSettingsText}>Suporte</Text>
<TouchableOpacity style={styles.optionContainer}>
<TouchableOpacity style={styles.optionContainer} onPress={() => navigation.navigate('About')}>
<Text style={styles.optionText}>Sobre o e-motion</Text>
<MaterialCommunityIcons style={styles.optionIcon} name="chevron-right" color={iconColor} size={iconSize} />
</TouchableOpacity>
<TouchableOpacity style={styles.optionContainer}>
<TouchableOpacity style={styles.optionContainer} onPress={() => navigation.navigate('FAQ')}>
<Text style={styles.optionText}>FAQ</Text>
<MaterialCommunityIcons style={styles.optionIcon} name="chevron-right" color={iconColor} size={iconSize} />
</TouchableOpacity>
Expand Down

0 comments on commit d4b8b08

Please sign in to comment.