apuc/guild_front
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #37 from apuc/quiz-error-msg

Browse Source 
Quiz error msg
This commit is contained in:
kavalar 2022-10-20 13:02:23 +03:00 committed by GitHub
commit 1651968337
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 106 additions and 22011 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21983
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

16
src/components/ReportForm/ReportForm.js
View File

@ -26,8 +26,9 @@ const ReportForm = () => {
const dispatch = useDispatch()
const history = useHistory()
const role = useSelector(getRole)
const [isFetching, setIsFetching] = useState(false)
const [reportSuccess, setReportSuccess] = useState(false)
const [inputs, setInputs] = useState([ { task: '', hours_spent: '', minutes_spent: 0 } ]);
const [troublesInputValue, setTroublesInputValue] = useState('');
@ -37,8 +38,10 @@ const ReportForm = () => {
setInputs((prev) => [...prev, { task: '', hours_spent: '', minutes_spent: 0 }])
}
const totalHours = inputs.reduce((a,b) => a + b.hours_spent, 0)
const deleteInput = (indexRemove) => {
if (indexRemove !== 1) {
if (indexRemove !== 0) {
setInputs((prev) => prev.filter((el, index) => index !== indexRemove))
}
}
@ -152,6 +155,10 @@ const ReportForm = () => {
logout: () => dispatch(auth(false))
}).then((res) =>
res.json().then((resJSON) => {
if(res.status === 200) {
setReportSuccess(true)
setTimeout(()=> setReportSuccess(false),2000)
}
setInputs( () => [] )
setTroublesInputValue('');
setScheduledInputValue('');
@ -163,8 +170,11 @@ const ReportForm = () => {
{isFetching ? <Loader /> : 'Отправить'}
</button>
<p className='report-form__footer-text'>
Всего за день : <span>60 часов</span>
Всего за день : <span>{totalHours} часов</span>
</p>
{reportSuccess &&
<p className='report-form__footer-done'>Отчет отправлен</p>
}
</div>
</div>
</div>

8
src/components/ReportForm/reportForm.scss
View File

@ -264,6 +264,14 @@
font-weight: 100;
}
}
&-done {
margin-bottom: 0;
font-size: 18px;
color: green;
font-weight: 500;
margin-left: 20px;
}
}
&__form {

38
src/components/features/quiz/HeaderQuiz.js
View File

@ -26,21 +26,25 @@ export const HeaderQuiz = ({header}) => {
}, [dispatch])
return (
<div className="header-quiz">
<div className="header-quiz__container">
{!userInfo ? <h2>Loading...</h2> :
<>
{header && <h2 className={'header-quiz__title-main'}>Добрый день, {userInfo.fio}</h2>}
<div className="header-quiz__body header-quiz__body_interjacent">
<div className="header-quiz__avatar">
<img src={userInfo.photo} alt={userInfo.photo}/>
</div>
<div className="header-quiz__name-user">{userInfo.fio}</div>
<div className="header-quiz__title">{userInfo.position_name}</div>
</div>
</>
}
</div>
</div>
<div>
{ userInfo?.status === 500 ? <div className="error-msg">{userInfo.message}</div> :
<div className="header-quiz">
<div className="header-quiz__container">
{!userInfo ? <h2>Loading...</h2> :
<>
{header && <h2 className={'header-quiz__title-main'}>Добрый день, {userInfo.fio}</h2>}
<div className="header-quiz__body header-quiz__body_interjacent">
<div className="header-quiz__avatar">
<img src={userInfo.photo} alt={userInfo.photo}/>
</div>
<div className="header-quiz__name-user">{userInfo.fio}</div>
<div className="header-quiz__title">{userInfo.position_name}</div>
</div>
</>
}
</div>
</div>
}
</div>
)
}
}

72
src/components/features/quiz/quiz.scss
View File

@ -1,4 +1,4 @@
@use 'sass:math';
@use 'sass:math';
@import 'functions.scss';
$maxWidthContainer: 1123;
@ -11,8 +11,8 @@ $maxWidthContainer: 1123;
.quiz-text{
font-size: 20px;
font-weight: 400;
line-height: math.div(30, 20);
font-weight: 400;
line-height: math.div(30, 20);
}
.title{
color: #282828;
@ -58,7 +58,7 @@ $maxWidthContainer: 1123;
text-decoration: none;
color: #1a310c;
background: #fff;
}
}
}
&_restriction{
max-width: 131px;
@ -69,9 +69,17 @@ $maxWidthContainer: 1123;
font-family: "GT Eesti Pro Display";
font-size: 25px;
font-weight: 400;
line-height: math.div(30, 25);
line-height: math.div(30, 25);
}
//=============================================
.error-msg {
text-align: center;
font-size: 25px;
color: red;
font-weight: 500;
}
.header-quiz{
@include adaptiv-value("padding-top", 48, 30, 1);
@include adaptiv-value("padding-bottom", 85, 30, 1);
@ -120,16 +128,16 @@ $maxWidthContainer: 1123;
color: #000000;
font-family: "GT Eesti Pro Display";
font-size: 16px;
font-weight: 400;
line-height: math.div(30, 20);
margin-right: 70px;
font-weight: 400;
line-height: math.div(30, 20);
margin-right: 70px;
}
&__title{
color: #000000;
font-family: "GT Eesti Pro Display";
@include adaptiv-value("font-size", 25, 16, 1);
font-weight: 700;
line-height: math.div(36, 25);
@include adaptiv-value("font-size", 25, 16, 1);
font-weight: 700;
line-height: math.div(36, 25);
position: relative;
&::before{
@ -140,7 +148,7 @@ $maxWidthContainer: 1123;
border-radius: 3px;
background-color: #54b611;
bottom: -26px;
}
}
}
}
.my-tests{
@ -155,9 +163,9 @@ $maxWidthContainer: 1123;
&__title{
color: #000000;
font-size: 25px;
font-weight: 400;
line-height: math.div(30, 25);
@include adaptiv-value("margin-bottom", 80, 30, 1);
font-weight: 400;
line-height: math.div(30, 25);
@include adaptiv-value("margin-bottom", 80, 30, 1);
}
&__items{
display: flex;
@ -175,21 +183,21 @@ $maxWidthContainer: 1123;
flex: 0 1 100%;
}
&__name-test{
color: #373936;
margin-bottom: 29px;
color: #373936;
margin-bottom: 29px;
}
.active{
color: #54b611;
}
&__body{
}
}
.test-data{
display: flex;
align-items: center;
&__calendar{
padding: 13px 21px;
box-shadow: 0 0 59px rgba(44, 44, 44, 0.05);
@ -243,8 +251,8 @@ $maxWidthContainer: 1123;
}
&__strip{
flex: 1 1 auto;
height: 19px;
height: 19px;
div{
border-radius: 10px;
height: 100%;
@ -260,11 +268,11 @@ $maxWidthContainer: 1123;
margin: 0 auto;
padding: 0 10px;
}
&__title{
margin-bottom: 39px;
&__title{
margin-bottom: 39px;
}
&__form{
}
}
@ -286,22 +294,22 @@ $maxWidthContainer: 1123;
width: initial;
margin-bottom: 0;
display: none;
cursor: pointer;
cursor: pointer;
}
&__buttons{
display: flex;
gap: 56px;
flex-wrap: wrap;
align-items: center;
@include adaptiv-value("margin-top", 60, 30, 1);
@include adaptiv-value("margin-top", 60, 30, 1);
}
}
.form-task__group{
display: block;
margin-bottom: 15px;
label {
color: #373936;
font-family: "GT Eesti Pro Display";
@ -359,8 +367,8 @@ $maxWidthContainer: 1123;
font-family: "GT Eesti Pro Display";
font-size: 18px;
font-weight: 300;
line-height: math.div(28, 18);
@include adaptiv-value("margin-bottom", 50, 20, 1);
line-height: math.div(28, 18);
@include adaptiv-value("margin-bottom", 50, 20, 1);
span{
color: #54b611;
font-weight: 700;
@ -399,4 +407,4 @@ $maxWidthContainer: 1123;
&__score{
color: #5cb42b;
}
}
}