keannu125/StudE-Frontend
1
0
Fork 0
mirror of https://github.com/lemeow125/StudE-Frontend.git synced 2025-07-05 03:44:09 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changed auth slice to status slice to better reflect onboarding state tracking

Browse source
This commit is contained in:
Keannu Christian Bernasol 2023-07-06 21:13:02 +08:00
parent 90f227a2c0
commit b30bbb62df
6 changed files with 38 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/routes/Login/Login.tsx
View file

@ -18,7 +18,7 @@ import { UserInfo, UserLogin } from "../../components/Api/Api";
import { ParseLoginError } from "../../components/ParseError/ParseError";
import AnimatedContainer from "../../components/AnimatedContainer/AnimatedContainer";
import { setUser } from "../../features/redux/slices/UserSlice/UserSlice";
import { login } from "../../features/redux/slices/AuthSlice/AuthSlice";
import { login } from "../../features/redux/slices/StatusSlice/StatusSlice";
export default function Login() {
const navigation = useNavigation<RootDrawerParamList>();
@ -55,7 +55,7 @@ export default function Login() {
onChange={(
e: NativeSyntheticEvent<TextInputChangeEventData>
): void => {
setUser({ ...creds, username: e.nativeEvent.text });
setCreds({ ...creds, username: e.nativeEvent.text });
}}
/>
<View style={{ paddingVertical: 4 }} />
@ -68,7 +68,7 @@ export default function Login() {
onChange={(
e: NativeSyntheticEvent<TextInputChangeEventData>
): void => {
setUser({ ...creds, password: e.nativeEvent.text });
setCreds({ ...creds, password: e.nativeEvent.text });
}}
/>
<View style={{ paddingVertical: 2 }} />
@ -84,7 +84,7 @@ export default function Login() {
setUser({ ...creds, username: "", password: "", error: "" });
let user_info = await UserInfo();
dispatch(login());
console.log(dispatch(setUser(user_info[1])));
dispatch(setUser(user_info[1]));
// Redirect to onboarding if no year level, course, or semester specified
if (
user_info[1].year_level == null ||

4
src/routes/Revalidation/Revalidation.tsx
View file

@ -7,7 +7,7 @@ import { colors } from "../../styles";
import { useEffect, useState } from "react";
import { useNavigation } from "@react-navigation/native";
import { RootDrawerParamList } from "../../interfaces/Interfaces";
import { login } from "../../features/redux/slices/AuthSlice/AuthSlice";
import { login } from "../../features/redux/slices/StatusSlice/StatusSlice";
import AnimatedContainer from "../../components/AnimatedContainer/AnimatedContainer";
import { setUser } from "../../features/redux/slices/UserSlice/UserSlice";
@ -21,7 +21,7 @@ export default function Revalidation() {
let user_info = await UserInfo();
if (response && user_info[0]) {
dispatch(login());
console.log(dispatch(setUser(user_info[1])));
dispatch(setUser(user_info[1]));
if (
!(
user_info[1].year_level ||