implementando issues #25, #26 e #27

ES2-UFPI · Jun 26, 2021 · bd1dd1c · bd1dd1c
1 parent 88416d4
commit bd1dd1c
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 6 deletions.
diff --git a/frontend/src/views/acompanhamento/index.tsx b/frontend/src/views/acompanhamento/index.tsx
@@ -1,6 +1,9 @@
 import React from 'react';
 import { createStackNavigator } from '@react-navigation/stack';
 import Client from './views/Client';
+import AcompanharAntecedentes from './views/antecedentes';
+import AcompanharComportamento from './views/comportamento';
+import AcompanharConsequencias from './views/consequencias';
 
 const StackSettings = createStackNavigator<RoutesList>();
 
@@ -9,10 +12,16 @@ export default function Acompanhamento(props: any) {
     return (
         <StackSettings.Navigator screenOptions={{ headerShown: false }}>
             <StackSettings.Screen name="Client" component={Client} initialParams={props.route.params}/>
+            <StackSettings.Screen name="AcompanharAntecedentes" component={AcompanharAntecedentes}/>
+            <StackSettings.Screen name="AcompanharComportamento" component={AcompanharComportamento}/>
+            <StackSettings.Screen name="AcompanharConsequencias" component={AcompanharConsequencias}/>
         </StackSettings.Navigator>
     );
 }
 
 type RoutesList = {
     Client: undefined
+    AcompanharAntecedentes: undefined
+    AcompanharComportamento: undefined
+    AcompanharConsequencias: undefined
 };
diff --git a/frontend/src/views/acompanhamento/views/antecedentes/index.tsx b/frontend/src/views/acompanhamento/views/antecedentes/index.tsx
@@ -24,7 +24,7 @@ export default function AcompanharAntecedentes({ navigation }: any) {
 
     return (
         <View style={styles.generalView}>
-            <TouchableOpacity style={styles.goBack} onPress={() => navigation.navigate('Profile')}>
+            <TouchableOpacity style={styles.goBack} onPress={() => navigation.navigate('Client')}>
                 <MaterialCommunityIcons style={styles.goBackIcon} name="chevron-left" color={'#FCFCFF'} size={iconSize} />
                 <Text style={styles.goBackText}>Voltar</Text>
             </TouchableOpacity>

diff --git a/...ews/acompanhamento/views/Client/index.tsx → ...ws/acompanhamento/views/cliente/index.tsx b/...ews/acompanhamento/views/Client/index.tsx → ...ws/acompanhamento/views/cliente/index.tsx
@@ -27,7 +27,9 @@ const Client = (props: any) => {
     const profilePicture = require('../../../../assets/profile.png');
 
     function onPressDelete(id:string){}
-    function onPressCard(){}
+    function onPressCard(){
+        navigation.navigate('AcompanharComportamento');
+    }
 
     const staticRegisters = [
         {

diff --git a/...ews/acompanhamento/views/Client/styles.ts → ...ws/acompanhamento/views/cliente/styles.ts b/...ews/acompanhamento/views/Client/styles.ts → ...ws/acompanhamento/views/cliente/styles.ts
diff --git a/frontend/src/views/acompanhamento/views/comportamento/index.tsx b/frontend/src/views/acompanhamento/views/comportamento/index.tsx
@@ -21,7 +21,7 @@ export default function AcompanharComportamento({ navigation }: any) {
 
     return (
         <View style={styles.generalView}>
-            <TouchableOpacity style={styles.goBack} onPress={() => navigation.goBack()}>
+            <TouchableOpacity style={styles.goBack} onPress={() => navigation.navigate('Client')}>
                 <MaterialCommunityIcons style={styles.goBackIcon} name="chevron-left" color={'#FCFCFF'} size={iconSize} />
                 <Text style={styles.goBackText}>Voltar</Text>
             </TouchableOpacity>

diff --git a/frontend/src/views/acompanhamento/views/consequencias/index.tsx b/frontend/src/views/acompanhamento/views/consequencias/index.tsx
@@ -13,7 +13,7 @@ import MaterialCommunityIcons from 'react-native-vector-icons/MaterialCommunityI
 const SCREEN_WIDTH = Dimensions.get("window").width;
 const iconSize = SCREEN_WIDTH * 0.075;
 
-export default function AcompanharAntecedentes({ navigation }: any) {
+export default function AcompanharConsequencias({ navigation }: any) {
 
     const [questao1, onChangeQuestao1] = useState("Fui para casa.");
     const [questao2, onChangeQuestao2] = useState("Comemorei.");
@@ -24,7 +24,7 @@ export default function AcompanharAntecedentes({ navigation }: any) {
 
     return (
         <View style={styles.generalView}>
-            <TouchableOpacity style={styles.goBack} onPress={() => navigation.navigate('Profile')}>
+            <TouchableOpacity style={styles.goBack} onPress={() => navigation.navigate('Client')}>
                 <MaterialCommunityIcons style={styles.goBackIcon} name="chevron-left" color={'#FCFCFF'} size={iconSize} />
                 <Text style={styles.goBackText}>Voltar</Text>
             </TouchableOpacity>
@@ -91,7 +91,7 @@ export default function AcompanharAntecedentes({ navigation }: any) {
                         <MaterialCommunityIcons style={styles.previousIcon} name="chevron-left" color={'#FCFCFF'} size={iconSize} />
                         <Text style={styles.previousText}>Anterior</Text>
                     </TouchableOpacity>
-                    <TouchableOpacity style={styles.continueContainer} onPress={() => navigation.navigate('Profile')}>
+                    <TouchableOpacity style={styles.continueContainer} onPress={() => navigation.navigate('Client')}>
                         <Text style={styles.continueText}>Fim</Text>
                     </TouchableOpacity>
                 </View>