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

Overhauled redux states and separated auth state from user info state

Browse source
This commit is contained in:
Keannu Christian Bernasol 2023-07-06 20:56:19 +08:00
parent acfb28ce3c
commit 9a246b45e1
6 changed files with 65 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -17,7 +17,8 @@ import { RootDrawerParamList } from "../../interfaces/Interfaces";
import { UserInfo, UserLogin } from "../../components/Api/Api";
import { ParseLoginError } from "../../components/ParseError/ParseError";
import AnimatedContainer from "../../components/AnimatedContainer/AnimatedContainer";
import { setUser as setStateUser } from "../../features/redux/slices/AuthSlice/AuthSlice";
import { setUser as setStateUser } from "../../features/redux/slices/UserSlice/UserSlice";
import { login } from "../../features/redux/slices/AuthSlice/AuthSlice";
export default function Login() {
const navigation = useNavigation<RootDrawerParamList>();
@ -82,6 +83,7 @@ export default function Login() {
if (result[0]) {
setUser({ ...user, username: "", password: "", error: "" });
let user_info = await UserInfo();
dispatch(login());
dispatch(setStateUser(user_info));
// Redirect to onboarding if no year level, course, or semester specified
if (

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

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