diff --git a/src/components/Auth/AuthForDevelopers.module.css b/src/components/Auth/AuthForDevelopers.module.css index 92a2b572..8c1b888c 100644 --- a/src/components/Auth/AuthForDevelopers.module.css +++ b/src/components/Auth/AuthForDevelopers.module.css @@ -156,6 +156,10 @@ border: 2px solid #6aaf5c; } +.form__btn:hover .loader * { + fill: #6aaf5c; +} + .form__btn:hover { background-image: none; background-color: #ffffff; diff --git a/src/components/Auth/AuthForPartners.js b/src/components/Auth/AuthForPartners.js index 985d6653..98ef5e87 100644 --- a/src/components/Auth/AuthForPartners.js +++ b/src/components/Auth/AuthForPartners.js @@ -1,7 +1,7 @@ import React, { useState } from 'react'; import { useDispatch } from 'react-redux'; import { auth } from '../../redux/outstaffingSlice'; -import { loading } from '../../redux/loaderSlice' +import { loading } from '../../redux/loaderSlice'; import style from './AuthForPartners.module.css'; import ellipse from '../../images/ellipse.png'; import arrow from '../../images/arrow__login_page.png'; @@ -25,7 +25,7 @@ const AuthForPartners = () => { const dispatch = useDispatch() const isAuth = useSelector(selectAuth) const isLoading = useSelector(selectIsLoading) -console.log('iL',isLoading); + const [username, setUsername] = useState('') const [password, setPassword] = useState('') @@ -67,14 +67,14 @@ console.log('iL',isLoading); onClick={!isLoading ? (e) => { e.preventDefault(); dispatch(loading(true)) - fetchAuth({ - username, - password, - dispatch: ()=> { - dispatch(auth(true)) - dispatch(loading(false)) - } - }) + // fetchAuth({ + // username, + // password, + // dispatch: ()=> { + // dispatch(auth(true)) + // dispatch(loading(false)) + // } + // }) } : ()=>{}} > { isLoading ? : 'Войти' } diff --git a/src/components/Description/Description.js b/src/components/Description/Description.js index f34c78af..17e298b7 100644 --- a/src/components/Description/Description.js +++ b/src/components/Description/Description.js @@ -21,44 +21,46 @@ const Description = ({ onLoadMore }) => {
- {filteredListArr && filteredListArr.length > 0 - ? filteredListArr.map((el) => ( -
-
- -
-
-

- - {SKILLS[el.position_id]}, {LEVELS[el.level]} - -

+ {filteredListArr + ? (filteredListArr.length > 0 + ? <> + : filteredListArr.map((el) => ( +
+
+ +
+
+

+ + {SKILLS[el.position_id]}, {LEVELS[el.level]} + +

- {el.vc_text_short ? ( -
{el.vc_text_short}
- ) : ( -

Описание отсутствует...

- )} + {el.vc_text_short ? ( +
{el.vc_text_short}
+ ) : ( +

Описание отсутствует...

+ )} +
+
+ + + +
+
+
+
    + {el.skillValues.map((e) => ( +
  • + {e.skill.name} +
  • + ))} +
+ +
+
-
- - - -
-
-
-
    - {el.skillValues.map((e) => ( -
  • - {e.skill.name} -
  • - ))} -
- -
-
-
- )) + ))) : candidatesListArr.map((el) => (
diff --git a/src/components/Loader/Loader.js b/src/components/Loader/Loader.js index a0645068..4b757384 100644 --- a/src/components/Loader/Loader.js +++ b/src/components/Loader/Loader.js @@ -1,4 +1,6 @@ import SVGLoader from "react-loader-spinner"; +import './loader.css' + export const Loader = () => { return (
@@ -7,7 +9,6 @@ export const Loader = () => { color="#fff" height={50} width={50} - timeout={3000} />
); diff --git a/src/components/Loader/loader.css b/src/components/Loader/loader.css new file mode 100644 index 00000000..bd38bca5 --- /dev/null +++ b/src/components/Loader/loader.css @@ -0,0 +1,11 @@ +.loader { + height: 100%; + width: 100%; + display: flex; + justify-content: center; + align-items: center; +} + +.loader:hover path { + fill: #6aaf5c; +} \ No newline at end of file diff --git a/src/components/Select/TagSelect.js b/src/components/Select/TagSelect.js index a78075b4..db075124 100644 --- a/src/components/Select/TagSelect.js +++ b/src/components/Select/TagSelect.js @@ -1,12 +1,15 @@ import React from 'react'; import { useSelector, useDispatch } from 'react-redux'; import Select from 'react-select'; +import { Loader } from '../Loader/Loader'; import style from './TagSelect.module.css'; import { selectedItems, selectItems, selectTags, filteredCandidates } from '../../redux/outstaffingSlice'; import { fetchItemsForId } from '../../server/server'; +import { selectIsLoading } from '../../redux/loaderSlice'; const TagSelect = () => { const dispatch = useDispatch(); + const isLoading = useSelector(selectIsLoading) const itemsArr = useSelector(selectItems); @@ -41,8 +44,8 @@ const TagSelect = () => { return { id: item.id, value: item.value, label: item.value }; })} /> -
diff --git a/src/components/Select/TagSelect.module.css b/src/components/Select/TagSelect.module.css index 6b1c26a7..e5490bfe 100644 --- a/src/components/Select/TagSelect.module.css +++ b/src/components/Select/TagSelect.module.css @@ -70,3 +70,7 @@ font-size: 1.6em !important; color: gray !important; } + +.search__submit:hover .loader path { + fill: #6aaf5c; +} \ No newline at end of file