Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
84 changes: 19 additions & 65 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 15 additions & 0 deletions src/hooks/useCurrentUser.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import { useSelector, useDispatch } from 'react-redux';

import { userActions } from 'resources/user/user.slice';

export default function useCurrentUser() {
const dispatch = useDispatch();
const currentUser = useSelector(({ user }) => user);

const setCurrentUser = (v) => dispatch(userActions.setUser(v));

return {
currentUser,
setCurrentUser,
};
}
14 changes: 6 additions & 8 deletions src/pages/sign-in/sign-in.jsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import React from 'react';
import { useDispatch, useSelector } from 'react-redux';
import { Link, Redirect } from 'react-router-dom';

import { routes } from 'routes';

import * as userSelectors from 'resources/user/user.selectors';
import { userActions } from 'resources/user/user.slice';
import { signIn } from 'resources/user/user.api';
import useCurrentUser from 'hooks/useCurrentUser';

import Input from 'components/input';
import Button from 'components/button';
Expand All @@ -14,15 +13,14 @@ import Form from 'components/form';
import styles from './sign-in.pcss';

function SignIn() {
const user = useSelector(userSelectors.selectUser);

const dispatch = useDispatch();
const { currentUser, setCurrentUser } = useCurrentUser();

const handleSubmit = async (submitValues) => {
await dispatch(userActions.signIn(submitValues));
const user = await signIn(submitValues);
setCurrentUser(user);
};

if (user) {
if (currentUser) {
const redirectPath = new URLSearchParams(window.location.search).get('to');

return <Redirect to={redirectPath || routes.home.url()} />;
Expand Down