loader hover and devlist fixes

This commit is contained in:
kurpfish 2021-08-09 16:12:06 +03:00
parent f0a92fd8f2
commit 21d95a9c04
7 changed files with 74 additions and 49 deletions

View File

@ -156,6 +156,10 @@
border: 2px solid #6aaf5c; border: 2px solid #6aaf5c;
} }
.form__btn:hover .loader * {
fill: #6aaf5c;
}
.form__btn:hover { .form__btn:hover {
background-image: none; background-image: none;
background-color: #ffffff; background-color: #ffffff;

View File

@ -1,7 +1,7 @@
import React, { useState } from 'react'; import React, { useState } from 'react';
import { useDispatch } from 'react-redux'; import { useDispatch } from 'react-redux';
import { auth } from '../../redux/outstaffingSlice'; import { auth } from '../../redux/outstaffingSlice';
import { loading } from '../../redux/loaderSlice' import { loading } from '../../redux/loaderSlice';
import style from './AuthForPartners.module.css'; import style from './AuthForPartners.module.css';
import ellipse from '../../images/ellipse.png'; import ellipse from '../../images/ellipse.png';
import arrow from '../../images/arrow__login_page.png'; import arrow from '../../images/arrow__login_page.png';
@ -25,7 +25,7 @@ const AuthForPartners = () => {
const dispatch = useDispatch() const dispatch = useDispatch()
const isAuth = useSelector(selectAuth) const isAuth = useSelector(selectAuth)
const isLoading = useSelector(selectIsLoading) const isLoading = useSelector(selectIsLoading)
console.log('iL',isLoading);
const [username, setUsername] = useState('') const [username, setUsername] = useState('')
const [password, setPassword] = useState('') const [password, setPassword] = useState('')
@ -67,14 +67,14 @@ console.log('iL',isLoading);
onClick={!isLoading ? (e) => { onClick={!isLoading ? (e) => {
e.preventDefault(); e.preventDefault();
dispatch(loading(true)) dispatch(loading(true))
fetchAuth({ // fetchAuth({
username, // username,
password, // password,
dispatch: ()=> { // dispatch: ()=> {
dispatch(auth(true)) // dispatch(auth(true))
dispatch(loading(false)) // dispatch(loading(false))
} // }
}) // })
} : ()=>{}} } : ()=>{}}
> >
{ isLoading ? <Loader /> : 'Войти' } { isLoading ? <Loader /> : 'Войти' }

View File

@ -21,8 +21,10 @@ const Description = ({ onLoadMore }) => {
<section className={style.description}> <section className={style.description}>
<div className="container"> <div className="container">
<div className={style.description__wrapper}> <div className={style.description__wrapper}>
{filteredListArr && filteredListArr.length > 0 {filteredListArr
? filteredListArr.map((el) => ( ? (filteredListArr.length > 0
? <></>
: filteredListArr.map((el) => (
<div className="row" key={el.id}> <div className="row" key={el.id}>
<div className="col-2"> <div className="col-2">
<img className={style.description__img} src={male} alt="" /> <img className={style.description__img} src={male} alt="" />
@ -58,7 +60,7 @@ const Description = ({ onLoadMore }) => {
</div> </div>
<div className="col-xl-4"></div> <div className="col-xl-4"></div>
</div> </div>
)) )))
: candidatesListArr.map((el) => ( : candidatesListArr.map((el) => (
<div className="row" key={el.id}> <div className="row" key={el.id}>
<div className="col-2"> <div className="col-2">

View File

@ -1,4 +1,6 @@
import SVGLoader from "react-loader-spinner"; import SVGLoader from "react-loader-spinner";
import './loader.css'
export const Loader = () => { export const Loader = () => {
return ( return (
<div className='loader'> <div className='loader'>
@ -7,7 +9,6 @@ export const Loader = () => {
color="#fff" color="#fff"
height={50} height={50}
width={50} width={50}
timeout={3000}
/> />
</div> </div>
); );

View File

@ -0,0 +1,11 @@
.loader {
height: 100%;
width: 100%;
display: flex;
justify-content: center;
align-items: center;
}
.loader:hover path {
fill: #6aaf5c;
}

View File

@ -1,12 +1,15 @@
import React from 'react'; import React from 'react';
import { useSelector, useDispatch } from 'react-redux'; import { useSelector, useDispatch } from 'react-redux';
import Select from 'react-select'; import Select from 'react-select';
import { Loader } from '../Loader/Loader';
import style from './TagSelect.module.css'; import style from './TagSelect.module.css';
import { selectedItems, selectItems, selectTags, filteredCandidates } from '../../redux/outstaffingSlice'; import { selectedItems, selectItems, selectTags, filteredCandidates } from '../../redux/outstaffingSlice';
import { fetchItemsForId } from '../../server/server'; import { fetchItemsForId } from '../../server/server';
import { selectIsLoading } from '../../redux/loaderSlice';
const TagSelect = () => { const TagSelect = () => {
const dispatch = useDispatch(); const dispatch = useDispatch();
const isLoading = useSelector(selectIsLoading)
const itemsArr = useSelector(selectItems); const itemsArr = useSelector(selectItems);
@ -41,8 +44,8 @@ const TagSelect = () => {
return { id: item.id, value: item.value, label: item.value }; return { id: item.id, value: item.value, label: item.value };
})} })}
/> />
<button onClick={handleSubmit} type="submit"> <button onClick={handleSubmit} type="submit" className={style.search__submit}>
Поиск { isLoading ? <Loader /> : 'Поиск' }
</button> </button>
</div> </div>
</div> </div>

View File

@ -70,3 +70,7 @@
font-size: 1.6em !important; font-size: 1.6em !important;
color: gray !important; color: gray !important;
} }
.search__submit:hover .loader path {
fill: #6aaf5c;
}