alteração nos estilos das telas

Julio-Pupim · Nov 18, 2024 · e301ca7 · e301ca7
1 parent c650e14
commit e301ca7
Show file tree

Hide file tree

Showing 6 changed files with 77 additions and 43 deletions.
diff --git a/frontend/app/(agenda)/agendamento.tsx b/frontend/app/(agenda)/agendamento.tsx
@@ -141,10 +141,10 @@ export default function Agendamento() {
         rules={{ required: 'Serviço é um campo obrigatório' }}
         defaultValue={async () => {
           if (parsedIdServico) {
-            return await ServicoService.getServic oById().then((response)=>{
+            return await ServicoService.getServicoById().then((response)=>{
               setValue('servico',response.descricao)
               setServicos(response)
-            })
+            })  
           }
           return ''
         }}
@@ -164,21 +164,24 @@ export default function Agendamento() {
       />
       {errors.servico && <Text style={styles.errorText}>{errors.servico.message?.toString()}</Text>}
 
+      <View style={styles.dataTempo}>  
+        <DateInput
+          control={control}
+          name="data"
+          label="Data de Agendamento"
+        />
+
 
-      <DateInput
-        control={control}
-        name="data"
-        label="Data de Agendamento"
-      />
+        {errors.data && <Text style={styles.errorText}>{errors.data.message}</Text>}
 
-      {errors.data && <Text style={styles.errorText}>{errors.data.message}</Text>}
+        <TimeInput
+          control={control}
+          name="hora"
+          label="Escolha um horário para atendimento"
+        />
+        {errors.hora && <Text style={styles.errorText}>{errors.hora.message}</Text>}
 
-      <TimeInput
-        control={control}
-        name="hora"
-        label="Escolha um horário para atendimento"
-      />
-      {errors.hora && <Text style={styles.errorText}>{errors.hora.message}</Text>}
+      </View>
 
       <Controller
         control={control}
@@ -267,4 +270,8 @@ const styles = StyleSheet.create({
   backIcon: {
     paddingRight: 15,
   },
+  dataTempo:{
+    paddingRight:25,
+    paddingLeft:3
+  }
 });
diff --git a/frontend/app/(servico)/criaservico.tsx b/frontend/app/(servico)/criaservico.tsx
@@ -6,9 +6,14 @@ import { Picker } from '@react-native-picker/picker';
 import ServicoService from '../../service/ServicoService'
 import { Setor } from '@/constants/SetorEnum';
 import { router } from 'expo-router';
+import { TouchableOpacity } from 'react-native-gesture-handler';
 
 
-const usuarioLogado = { id: 1, nome: 'p' };
+const usuarioLogado = { id: 1, nome: 'Usuário' };
+const perfilClick =()=>{
+  router.navigate('/(tabs)/perfil');
+};
+
 
 type criarServicoForm = {
   servico: string;
@@ -96,6 +101,11 @@ export default function criaServico() {
     <SafeAreaView style={estilos.container}>
       <View style={estilos.header}>
         <View style={estilos.userText}>
+        <TouchableOpacity onPress={perfilClick}>
+        <Ionicons name="arrow-back-outline" size={30} style={estilos.backIcon}
+              color="white"
+            />
+          </TouchableOpacity>
           <Ionicons name="person-circle-outline" size={35} color="white" />
           <Text style={estilos.userName}>{usuarioLogado.nome}</Text>
         </View>
@@ -275,4 +285,7 @@ const estilos = StyleSheet.create({
     left: 15,
     top: 15,
   },
+  backIcon: {
+    paddingRight: 15,
+  },
 });
diff --git a/frontend/app/(servico)/prestador.tsx b/frontend/app/(servico)/prestador.tsx
@@ -8,6 +8,7 @@ import UsuarioService from '../../service/UsuarioService'
 
 const Prestadores = () => {
   const [prestadores, setPrestadores] = useState([]);
+  const [nomeUsuario, setNomeUsuario] = useState('Usuário');
   const [setores, setSetor] = useState([]);
   const navigation = useNavigation();
 
@@ -36,15 +37,20 @@ const Prestadores = () => {
   };
   return (
     <View style={styles.container}>
-      <View style={styles.topoTela}>
+      <View style={styles.header}>
+        <View style={styles.userText}>
         <TouchableOpacity onPress={inicioClick}>
-          <Ionicons name="arrow-back-outline" size={30} color="white" />
-        </TouchableOpacity>
-        <View style={styles.centralTitulo}>
-          <Ionicons name="bag-handle-outline" size={35} color="white" />
-          <Text style={styles.userName}>Prestadores</Text>
+            <Ionicons name="arrow-back-outline" size={30} style={styles.backIcon}
+              color="white"
+            />
+          </TouchableOpacity>
+          <Ionicons name="person-circle-outline" size={35} color="white" />
+          <Text style={styles.userName}>{nomeUsuario}</Text>
         </View>
       </View>
+
+      <Text style={styles.title}>Prestador</Text>
+
       <ScrollView>
         {prestadores.map((prestador: any) => (
           <View style={styles.header} key={prestador.id}>
@@ -72,16 +78,14 @@ const Prestadores = () => {
 const styles = StyleSheet.create({
   container: {
     flex: 1,
-    backgroundColor: 'white',
+    backgroundColor: '#f5f5f5',
   },
   topoTela: {
-    backgroundColor: '#FBCB1C',
+    backgroundColor: '#FFD700',
     borderBottomLeftRadius: 20,
     borderBottomRightRadius: 20,
     padding: 25,
     marginBottom: 20,
-    flexDirection: 'row',
-    justifyContent: 'center',
   },
   userText: {
     flexDirection: 'row',
@@ -94,13 +98,11 @@ const styles = StyleSheet.create({
     marginLeft: 15,
   },
   header: {
-    backgroundColor: '#D9D9D9',
-    flexDirection: 'column',
-    justifyContent: 'space-around',
-    padding: 19,
-    height: 120,
-    margin: 4,
-    borderRadius: 10,
+    backgroundColor: '#FBCB1C',
+    borderBottomLeftRadius: 20,
+    borderBottomRightRadius: 20,
+    padding: 25,
+    marginBottom: 20,
   },
   imagem: {
     flexDirection: 'row',
@@ -136,11 +138,14 @@ const styles = StyleSheet.create({
     borderWidth: 1,
     alignItems: 'center'
   },
-  centralTitulo: {
-    margin: 'auto',
-    flexDirection: 'row',
-    //alignItems:'center',
-    //justifyContent:'center'
-  }
+  backIcon: {
+    paddingRight: 15,
+  },
+  title: {
+    fontSize: 22,
+    fontWeight: 'bold',
+    alignSelf: 'center',
+    marginBottom: 20,
+  },
 });
 export default Prestadores;
diff --git a/frontend/app/(tabs)/agenda.tsx b/frontend/app/(tabs)/agenda.tsx
@@ -13,8 +13,8 @@ type AgendamentoForm = {
   anotacao: string;
 };
 
-const prestadorClick = () => {
-  router.navigate('/(servico)/prestador')
+const inicioClick = () => {
+  router.navigate('/(tabs)/inicio')
 
 }
 
@@ -58,7 +58,7 @@ const AgendaScreen = () => {
       <StatusBar hidden />
       <View style={styles.header}>
         <View style={styles.userText}>
-          <Pressable onPress={prestadorClick}>
+          <Pressable onPress={inicioClick}>
             <Ionicons name="arrow-back-outline" size={30} style={styles.backIcon}
               color="white"
             />

diff --git a/frontend/app/(tabs)/perfil.tsx b/frontend/app/(tabs)/perfil.tsx
@@ -5,6 +5,11 @@ import { Text, SafeAreaView, StyleSheet, View, Image, ScrollView, StatusBar, Pre
 import Icon from 'react-native-vector-icons/MaterialIcons';
 
 const Perfil = () => {
+
+  const loginClick = () => {
+    router.navigate ('/(auth)/login');
+  };
+
   return (
     <SafeAreaView style={styles.container}>
       <StatusBar hidden />
@@ -65,7 +70,7 @@ const Perfil = () => {
           <Ionicons name="chevron-forward" size={20} color="black" />
         </Pressable>
 
-        <Pressable style={styles.menuItem}>
+        <Pressable style={styles.menuItem} onPress={loginClick}>
           <Icon name="logout" size={24} color="black" />
           <Text style={styles.menuText}>Sair</Text>
           <Ionicons name="chevron-forward" size={20} color="black" />

diff --git a/frontend/components/AutocompleteInput.tsx b/frontend/components/AutocompleteInput.tsx
@@ -32,7 +32,7 @@ export const AutocompleteInput: React.FC<AutocompleteInputProps> = ({
     );
 
     return (
-        <View>
+        <View style={styles.posicao}>
             <TextInput
                 style={styles.input}
                 placeholder={placeholder}
@@ -82,4 +82,8 @@ const styles = StyleSheet.create({
         borderColor: '#EEE',
         backgroundColor: '#FFF',
     },
+    posicao:{
+        paddingLeft:3,
+        paddingRight:5
+    }
 });