diff --git a/src/app/navigation/AccountNavigator.js b/src/app/navigation/AccountNavigator.js
index c164918..4e04229 100644
--- a/src/app/navigation/AccountNavigator.js
+++ b/src/app/navigation/AccountNavigator.js
@@ -3,6 +3,10 @@ import { createStackNavigator } from "@react-navigation/stack";
import AccountScreen from "../screens/AccountScreen";
import PluviometerRegisterScreen from '../screens/PluviometerRegisterScreen';
import MapFormScreen from "../screens/MapFormScreen";
+import Abbout from "../screens/Abbout";
+import ActivateInstitution from "../screens/ActivateInstitution";
+import UpdatePassword from "../screens/UpdatePassword";
+import EditUserData from "../screens/EditUserData";
const Stack = createStackNavigator();
@@ -29,6 +33,48 @@ const AccountNavigator = () => (
},
}}
/>
+
+
+
+
+
+
+ Abbout
+
+ )
+}
diff --git a/src/app/screens/AccountScreen.js b/src/app/screens/AccountScreen.js
index d98b64e..4b5e028 100644
--- a/src/app/screens/AccountScreen.js
+++ b/src/app/screens/AccountScreen.js
@@ -1,13 +1,17 @@
import React, { useContext } from "react";
-import { Text, Button, Image, View, StyleSheet } from "react-native";
+import {
+ Text,
+ Image,
+ View,
+ StyleSheet,
+ ScrollView,
+} from "react-native";
import Screen from "../components/Screen";
import { AuthContext } from "../auth/context";
import authStorage from "../auth/storage";
import { TouchableOpacity } from "react-native-gesture-handler";
import assets from "../config/assets";
-import { MaterialCommunityIcons } from "@expo/vector-icons";
-
-import { scaleDimsFromWidth, dimensions } from "../config/dimensions";
+import { MaterialCommunityIcons, FontAwesome } from "@expo/vector-icons";
import colors from "../config/colors";
function handleLogOut(setUser) {
@@ -30,7 +34,7 @@ function UserHeader({ name, fone }) {
);
}
-function ProfileItensList({ icon, title, onPress }) {
+function ProfileItensList({ icon, IconProvider, title, onPress }) {
return (
-
-
+
+
{title}
+
+
+
@@ -55,41 +77,47 @@ function AccountScreen(props) {
const profileItems = [
{
icon: "account",
+ IconProvider: MaterialCommunityIcons,
title: "Editar Perfil",
onPress: () => {
- console.log("1");
+ props.navigation.navigate("EditUserData");
},
},
{
icon: "lock",
+ IconProvider: MaterialCommunityIcons,
title: "Alterar senha",
onPress: () => {
- console.log("2");
+ props.navigation.navigate("UpdatePassword");
},
},
{
icon: "account",
+ IconProvider: MaterialCommunityIcons,
title: "Cadastrar pluviômetro",
onPress: () => {
- console.log("3");
+ props.navigation.navigate("PluviometerRegister");
},
},
{
- icon: "account",
+ icon: "institution",
+ IconProvider: FontAwesome,
title: "ATIVAR INSTITUIÇÃO",
onPress: () => {
- console.log("4");
+ props.navigation.navigate("ActivateInstitution");
},
},
{
icon: "information-outline",
+ IconProvider: MaterialCommunityIcons,
title: "SOBRE O PROJETO",
onPress: () => {
- console.log("5");
+ props.navigation.navigate("Abbout");
},
},
{
icon: "logout",
+ IconProvider: MaterialCommunityIcons,
title: "sair",
onPress: () => {
handleLogOut(setUser);
@@ -97,34 +125,36 @@ function AccountScreen(props) {
},
{
icon: "trash-can",
+ IconProvider: MaterialCommunityIcons,
title: "Desativar conta",
onPress: () => {
console.log("7");
},
},
];
- console.log("a");
- return (
-
-
-
- {profileItems.map(({ icon, title, onPress }) => (
-
- ))}
-
-
-
+ >
+
+
+
+ {profileItems.map(({ icon, IconProvider, title, onPress }) => (
+
+ ))}
+
+
+
);
}
diff --git a/src/app/screens/ActivateInstitution.js b/src/app/screens/ActivateInstitution.js
new file mode 100644
index 0000000..ebd007f
--- /dev/null
+++ b/src/app/screens/ActivateInstitution.js
@@ -0,0 +1,10 @@
+import React from "react";
+import {View, Text} from "react-native";
+
+export default function ActivateInstitution(props) {
+ return (
+
+ Ativar instituição
+
+ )
+}
diff --git a/src/app/screens/EditUserData.js b/src/app/screens/EditUserData.js
new file mode 100644
index 0000000..b42ecfb
--- /dev/null
+++ b/src/app/screens/EditUserData.js
@@ -0,0 +1,11 @@
+import React from "react";
+import {View, Text} from "react-native";
+
+export default function EditUserData(props) {
+ return (
+
+ Editar perfil
+
+ )
+}
+
diff --git a/src/app/screens/UpdatePassword.js b/src/app/screens/UpdatePassword.js
new file mode 100644
index 0000000..8d84635
--- /dev/null
+++ b/src/app/screens/UpdatePassword.js
@@ -0,0 +1,11 @@
+import React from "react";
+import {View, Text} from "react-native";
+
+export default function UpdatePassword(props) {
+ return (
+
+ Alterar senha
+
+ )
+}
+