mirror of
https://github.com/lemeow125/StudE-Frontend.git
synced 2025-07-05 03:44:09 +08:00
Improved color scheme naming
This commit is contained in:
parent
a96fe668a8
commit
e6a92bfff2
12 changed files with 58 additions and 79 deletions
|
@ -53,7 +53,7 @@ export default function Activation() {
|
|||
marginBottom: 16,
|
||||
borderRadius: 4,
|
||||
width: "90%",
|
||||
backgroundColor: colors.blue_1,
|
||||
backgroundColor: colors.secondary_1,
|
||||
}}
|
||||
/>
|
||||
<Text style={styles.text_white_large}>Activation</Text>
|
||||
|
@ -61,7 +61,7 @@ export default function Activation() {
|
|||
<ActivityIndicator
|
||||
animating={loading}
|
||||
size={96}
|
||||
color={colors.blue_1}
|
||||
color={colors.secondary_1}
|
||||
/>
|
||||
<Text style={styles.text_white_medium}>{state}</Text>
|
||||
<Text style={styles.text_white_tiny}>{uid + "\n" + token}</Text>
|
||||
|
|
|
@ -95,7 +95,7 @@ export default function Home() {
|
|||
return (
|
||||
<AnimatedContainer>
|
||||
<Text style={styles.text_white_medium}>{feedback}</Text>
|
||||
<Button onPress={() => requestLocation()} color={colors.blue_3}>
|
||||
<Button onPress={() => requestLocation()} color={colors.secondary_3}>
|
||||
<Text style={styles.text_white_small}>Allow Access</Text>
|
||||
</Button>
|
||||
</AnimatedContainer>
|
||||
|
|
|
@ -35,20 +35,12 @@ export default function Login() {
|
|||
return (
|
||||
<View style={styles.background}>
|
||||
<AnimatedContainer>
|
||||
<View style={styles.flex_row}>
|
||||
<View style={styles.flex_row}>
|
||||
<LoginIcon size={32} />
|
||||
<Text style={styles.text_white_large}>Student Login</Text>
|
||||
</View>
|
||||
<View style={{ paddingVertical: 8 }} />
|
||||
<View
|
||||
style={{
|
||||
paddingVertical: 4,
|
||||
marginBottom: 16,
|
||||
borderRadius: 4,
|
||||
width: "90%",
|
||||
backgroundColor: colors.head,
|
||||
}}
|
||||
/>
|
||||
<View style={styles.padding} />
|
||||
<TextInput
|
||||
style={styles.text_input}
|
||||
placeholder="Username"
|
||||
|
@ -109,13 +101,13 @@ export default function Login() {
|
|||
}
|
||||
});
|
||||
}}
|
||||
color={colors.login_color}
|
||||
color={colors.button_1}
|
||||
>
|
||||
<Text style={styles.text_white_small}>Login</Text>
|
||||
</Button>
|
||||
<Button
|
||||
onPress={() => navigation.navigate("Register")}
|
||||
color={colors.reg_color}
|
||||
color={colors.button_2}
|
||||
>
|
||||
<Text style={styles.text_white_small}>Register</Text>
|
||||
</Button>
|
||||
|
|
|
@ -4,19 +4,15 @@ import { View, Text } from "react-native";
|
|||
import { useNavigation } from "@react-navigation/native";
|
||||
import {
|
||||
Course,
|
||||
CourseParams,
|
||||
RootDrawerParamList,
|
||||
Semester,
|
||||
SemesterParams,
|
||||
YearLevel,
|
||||
YearLevelParams,
|
||||
} from "../../interfaces/Interfaces";
|
||||
import { colors } from "../../styles";
|
||||
import { AnimatePresence, MotiView } from "moti";
|
||||
import { useEffect, useState } from "react";
|
||||
import { MotiView } from "moti";
|
||||
import { useState } from "react";
|
||||
import Button from "../../components/Button/Button";
|
||||
import DropDownPicker from "react-native-dropdown-picker";
|
||||
import isStringEmpty from "../../components/IsStringEmpty/IsStringEmpty";
|
||||
import { useQuery } from "@tanstack/react-query";
|
||||
import {
|
||||
GetCourses,
|
||||
|
@ -115,7 +111,7 @@ export default function Onboarding() {
|
|||
marginBottom: 16,
|
||||
borderRadius: 4,
|
||||
width: "90%",
|
||||
backgroundColor: colors.blue_1,
|
||||
backgroundColor: colors.secondary_1,
|
||||
}}
|
||||
/>
|
||||
<View style={{ paddingVertical: 4 }} />
|
||||
|
@ -221,7 +217,7 @@ export default function Onboarding() {
|
|||
setError(result[1]);
|
||||
}
|
||||
}}
|
||||
color={colors.blue_3}
|
||||
color={colors.secondary_3}
|
||||
>
|
||||
<Text style={styles.text_white_small}>Proceed</Text>
|
||||
</Button>
|
||||
|
|
|
@ -34,25 +34,16 @@ export default function Register() {
|
|||
return (
|
||||
<View style={styles.background}>
|
||||
<AnimatedContainer>
|
||||
<View style={styles.flex_row}>
|
||||
<View style={styles.flex_row}>
|
||||
<SignupIcon size={32} />
|
||||
<Text style={styles.text_white_large}>Student Signup</Text>
|
||||
<View style={{ paddingVertical: 8, }} />
|
||||
<View style={{ paddingVertical: 8 }} />
|
||||
</View>
|
||||
<View
|
||||
style={{
|
||||
paddingVertical: 4,
|
||||
marginBottom: 16,
|
||||
marginTop: 8,
|
||||
borderRadius: 4,
|
||||
width: "90%",
|
||||
backgroundColor: colors.head,
|
||||
}}
|
||||
/>
|
||||
<View style={styles.padding} />
|
||||
<TextInput
|
||||
style={styles.text_input}
|
||||
placeholder="First Name"
|
||||
placeholderTextColor="white"
|
||||
placeholderTextColor={colors.text_default}
|
||||
value={user.first_name}
|
||||
onChange={(
|
||||
e: NativeSyntheticEvent<TextInputChangeEventData>
|
||||
|
@ -64,7 +55,7 @@ export default function Register() {
|
|||
<TextInput
|
||||
style={styles.text_input}
|
||||
placeholder="Last Name"
|
||||
placeholderTextColor="white"
|
||||
placeholderTextColor={colors.text_default}
|
||||
value={user.last_name}
|
||||
onChange={(
|
||||
e: NativeSyntheticEvent<TextInputChangeEventData>
|
||||
|
@ -76,7 +67,7 @@ export default function Register() {
|
|||
<TextInput
|
||||
style={styles.text_input}
|
||||
placeholder="USTP ID Number"
|
||||
placeholderTextColor="white"
|
||||
placeholderTextColor={colors.text_default}
|
||||
value={user.student_id_number}
|
||||
onChange={(
|
||||
e: NativeSyntheticEvent<TextInputChangeEventData>
|
||||
|
@ -93,7 +84,7 @@ export default function Register() {
|
|||
<TextInput
|
||||
style={styles.text_input}
|
||||
placeholder="Username"
|
||||
placeholderTextColor="white"
|
||||
placeholderTextColor={colors.text_default}
|
||||
autoCapitalize={"none"}
|
||||
value={user.username}
|
||||
onChange={(
|
||||
|
@ -106,7 +97,7 @@ export default function Register() {
|
|||
<TextInput
|
||||
style={styles.text_input}
|
||||
placeholder="Email"
|
||||
placeholderTextColor="white"
|
||||
placeholderTextColor={colors.text_default}
|
||||
autoCapitalize={"none"}
|
||||
value={user.email}
|
||||
onChange={(
|
||||
|
@ -119,7 +110,7 @@ export default function Register() {
|
|||
<TextInput
|
||||
style={styles.text_input}
|
||||
placeholder="Password"
|
||||
placeholderTextColor="white"
|
||||
placeholderTextColor={colors.text_default}
|
||||
secureTextEntry={true}
|
||||
value={user.password}
|
||||
onChange={(
|
||||
|
@ -167,7 +158,7 @@ export default function Register() {
|
|||
{
|
||||
}
|
||||
}}
|
||||
color={colors.reg_color}
|
||||
color={colors.button_2}
|
||||
>
|
||||
<Text style={styles.text_white_small}>Register</Text>
|
||||
</Button>
|
||||
|
|
|
@ -58,7 +58,7 @@ export default function Revalidation() {
|
|||
<View style={styles.background}>
|
||||
<AnimatedContainer>
|
||||
<View style={{ paddingVertical: 8 }} />
|
||||
<ActivityIndicator size={96} color={colors.blue_1} />
|
||||
<ActivityIndicator size={96} color={colors.secondary_1} />
|
||||
<Text style={styles.text_white_medium}>{state}</Text>
|
||||
</AnimatedContainer>
|
||||
</View>
|
||||
|
|
|
@ -7,9 +7,7 @@ import {
|
|||
NativeSyntheticEvent,
|
||||
TextInputChangeEventData,
|
||||
} from "react-native";
|
||||
import { colors } from "../../styles";
|
||||
import { useState, useEffect } from "react";
|
||||
import Button from "../../components/Button/Button";
|
||||
import { useState } from "react";
|
||||
import { useNavigation } from "@react-navigation/native";
|
||||
import {
|
||||
RootDrawerParamList,
|
||||
|
@ -22,6 +20,7 @@ import SelectDropdown from "react-native-select-dropdown";
|
|||
import DropdownIcon from "../../icons/DropdownIcon/DropdownIcon";
|
||||
import { useQuery } from "react-query";
|
||||
import { UserInfo as GetUserInfo } from "../../components/Api/Api";
|
||||
import { colors } from "../../styles";
|
||||
|
||||
export default function UserInfo() {
|
||||
const UserInfo = useQuery("user", GetUserInfo, {
|
||||
|
@ -172,13 +171,13 @@ export default function UserInfo() {
|
|||
color: "white",
|
||||
}}
|
||||
dropdownStyle={{
|
||||
backgroundColor: "#E3963E",
|
||||
backgroundColor: colors.primary_4,
|
||||
}}
|
||||
data={subjectOptions}
|
||||
buttonStyle={{
|
||||
width: "90%",
|
||||
marginLeft: 10,
|
||||
backgroundColor: "#E3963E",
|
||||
backgroundColor: colors.primary_4,
|
||||
borderRadius: 8,
|
||||
}}
|
||||
/>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue