Skip to content

Commit 6ad31e6

Browse files
enzomurayamaenzomurayama
committed
Pequenos ajustes de design
1 parent d7375a1 commit 6ad31e6

5 files changed

+32
-20
lines changed

‎src/components/myEvent.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ const styles = StyleSheet.create({
5757
shadowRadius: 3,
5858
},
5959
elevation: {
60-
elevation: 4,
60+
elevation: 3,
6161
shadowColor: '#171717',
6262
shadowOffset: { width: 0, height: 1 },
6363
shadowOpacity: 0.2,

‎src/screens/homeScreenAdmin.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export default function UserHome() {
2828
const getCurrentTime = () => {
2929
const hours = new Date().getHours();
3030
if (hours < 12) {
31-
return { greeting: 'Bom dia 🌅', color: '#ffc573' }; // Cor laranja para manhã
31+
return { greeting: 'Bom dia 🌤️', color: '#ffc573' }; // Cor laranja para manhã
3232
} else if (hours >= 12 && hours < 18) {
3333
return { greeting: 'Boa tarde 🌞', color: '#f0a148' }; // Cor dourada para tarde
3434
} else {
@@ -64,7 +64,7 @@ export default function UserHome() {
6464
</View>
6565

6666
<View className='grow'>
67-
<Text style={{ fontFamily: 'Inter_600SemiBold' }} className='text-lg text-neutral-700'>Leitura de Presença</Text>
67+
<Text style={{ fontFamily: 'Inter_600SemiBold' }} className='text-lg text-black'>Leitura de Presença</Text>
6868
</View>
6969

7070
<View className='w-14 h-full ml-2 items-center justify-center'>
@@ -80,7 +80,7 @@ export default function UserHome() {
8080
</View>
8181

8282
<View className='grow'>
83-
<Text style={{ fontFamily: 'Inter_600SemiBold' }} className='text-lg text-neutral-700'>Sair</Text>
83+
<Text style={{ fontFamily: 'Inter_600SemiBold' }} className='text-lg text-black'>Sair</Text>
8484
</View>
8585

8686
<View className='w-14 h-full ml-2 items-center justify-center'>

‎src/screens/homeScreenUser.tsx

+4-4
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export default function UserHome() {
2828
const getCurrentTime = () => {
2929
const hours = new Date().getHours();
3030
if (hours < 12) {
31-
return { greeting: 'Bom dia 🌅', color: '#ffc573' }; // Cor laranja para manhã
31+
return { greeting: 'Bom dia 🌤️', color: '#ffc573' }; // Cor laranja para manhã
3232
} else if (hours >= 12 && hours < 18) {
3333
return { greeting: 'Boa tarde 🌞', color: '#f0a148' }; // Cor dourada para tarde
3434
} else {
@@ -65,7 +65,7 @@ export default function UserHome() {
6565
</View>
6666

6767
<View className='grow'>
68-
<Text style={{ fontFamily: 'Inter_600SemiBold' }} className='text-lg text-neutral-700'>Credencial</Text>
68+
<Text style={{ fontFamily: 'Inter_600SemiBold' }} className='text-lg text-black'>Credencial</Text>
6969
</View>
7070

7171
<View className='w-14 h-full ml-2 items-center justify-center'>
@@ -81,7 +81,7 @@ export default function UserHome() {
8181
</View>
8282

8383
<View className='grow'>
84-
<Text style={{ fontFamily: 'Inter_600SemiBold' }} className='text-lg text-neutral-700'>Eventos</Text>
84+
<Text style={{ fontFamily: 'Inter_600SemiBold' }} className='text-lg text-black'>Eventos</Text>
8585
</View>
8686

8787
<View className='w-14 h-full ml-2 items-center justify-center'>
@@ -97,7 +97,7 @@ export default function UserHome() {
9797
</View>
9898

9999
<View className='grow'>
100-
<Text style={{ fontFamily: 'Inter_600SemiBold' }} className='text-lg text-neutral-700'>Sair</Text>
100+
<Text style={{ fontFamily: 'Inter_600SemiBold' }} className='text-lg text-black'>Sair</Text>
101101
</View>
102102

103103
<View className='w-14 h-full ml-2 items-center justify-center'>

‎src/screens/registrationDetailsScreen.tsx

+23-11
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,18 @@ export default function RegistrationDetails() {
2626

2727
const { item, registered } = route.params as RegistrationDetailsProps
2828

29+
// Mapeamento de categorias
30+
const categoryMap: { [key: number]: string } = {
31+
1: 'Minicurso',
32+
2: 'Palestra',
33+
3: 'Workshop',
34+
4: 'Competição',
35+
5: 'SECOMP'
36+
};
37+
38+
// Acesse item.categoriaId e garanta que é um número
39+
const categoriaId = Number(item.categoriaId);
40+
2941
useEffect(() => {
3042
async function Subscription() {
3143
try {
@@ -49,9 +61,9 @@ export default function RegistrationDetails() {
4961

5062
async function requestSubscription() {
5163
try {
52-
const response = await subscribeToActivity(user.id, item.id);
64+
const response = await subscribeToActivity(user.id, item.id);
5365
const { listaEspera } = response.data;
54-
66+
5567
if (listaEspera === true) {
5668
if (Platform.OS === 'web') {
5769
alert("Limite de vagas atingido: Você entrou na lista de espera.");
@@ -65,18 +77,18 @@ export default function RegistrationDetails() {
6577
Alert.alert('Inscrição realizada', 'Sua inscrição foi realizada com sucesso.');
6678
}
6779
}
68-
69-
navigation.goBack();
80+
81+
navigation.goBack();
7082
} catch (error) {
71-
console.error('Erro ao tentar se inscrever:', error);
83+
console.error('Erro ao tentar se inscrever:', error);
7284
if (Platform.OS === 'web') {
7385
alert("Erro: Não foi possível realizar a inscrição. Tente novamente mais tarde.");
7486
} else {
7587
Alert.alert('Erro', 'Não foi possível realizar a inscrição. Tente novamente mais tarde.');
7688
}
7789
}
7890
}
79-
91+
8092
function requestUnSubscription() {
8193
if (Platform.OS === 'web') {
8294
const confirmUnsubscribe = window.confirm("Você realmente deseja cancelar sua inscrição nesta atividade?");
@@ -113,16 +125,16 @@ export default function RegistrationDetails() {
113125
}
114126

115127
return (
116-
<View className='bg-white flex-1'>
117-
<View className={`flex-row justify-center items-center mt-12 'pb-8'}`}>
128+
<View className='bg-white flex-1 px-8'>
129+
<View className='flex-row justify-center items-center mt-12'>
118130
<TouchableOpacity className='py-2 px-3' style={{ position: 'absolute', left: 0, top: 0 }} onPress={() => navigation.goBack()}>
119131
<FontAwesome6 name="chevron-left" size={14} color="#000000" />
120132
</TouchableOpacity>
121133

122-
<Text style={{ fontFamily: 'Inter_600SemiBold' }} className='text-xl text-black pt-0.5'>Eventos</Text>
134+
<Text style={{ fontFamily: 'Inter_600SemiBold' }} className='text-xl text-black pt-0.5'>{categoryMap[categoriaId] || 'Evento'}</Text>
123135
</View>
124136

125-
<View className="p-8 mt-16 mb-16">
137+
<View className="p-3 mt-6 mb-16">
126138
<View className='flex flex-col justify-start p-2 bg-white rounded-2xl' style={(isIos) ? [styles.shadowProp] : [styles.elevation]}>
127139
<View className="p-4">
128140
<View className='pb-4 items-center'>
@@ -155,7 +167,7 @@ export default function RegistrationDetails() {
155167
<View className='flex-row items-center pb-1'>
156168
<AntDesign name="enviromento" size={24} color="#445BE6" />
157169
<Text className='pl-2'>{item.vagas}</Text>
158-
</View>
170+
</View>
159171
</View>
160172
</View>
161173
<View className="pt-10"></View>

‎src/screens/registrationScreen.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ export default function Registration() {
249249
<View className='flex-row flex-wrap justify-between mb-5'>
250250
{groupedItems[date].map((item, index) => (
251251
<View
252-
className='p-2 w-full'
252+
className='p-2 w-full mb-0.5'
253253
key={index}
254254
>
255255
<MyEvent

0 commit comments

Comments
 (0)