Merge branch 'dev' of https://github.com/spicecat/qOverflow into dev
This commit is contained in:
commit
bc3e0ca577
18 changed files with 108 additions and 170 deletions
|
|
@ -17,8 +17,8 @@ export default function MailUnit({
|
|||
<Accordion>
|
||||
<AccordionSummary
|
||||
expandIcon={<ExpandMoreIcon />}
|
||||
onClick={() => {readMail(mail_id)}}
|
||||
sx={read && {backgroundColor: 'lightGray'}}
|
||||
onClick={() => { readMail(mail_id) }}
|
||||
sx={read && { backgroundColor: 'lightGray' }}
|
||||
>
|
||||
<Box style={{ width: '100%' }} display={'flex'}>
|
||||
<Typography>From {sender}</Typography>
|
||||
|
|
@ -28,8 +28,6 @@ export default function MailUnit({
|
|||
<Typography>
|
||||
<b>{subject}</b>
|
||||
</Typography>
|
||||
<span style={{ width: '2vw' }} />
|
||||
<Typography>Read: {String(read)}</Typography>
|
||||
</Box>
|
||||
</AccordionSummary>
|
||||
<AccordionDetails>
|
||||
|
|
|
|||
|
|
@ -35,7 +35,6 @@ export default function PaginatedListController({
|
|||
if (hasAnswerAnchor) {
|
||||
const anchorAnswer = document.getElementById('answersList');
|
||||
anchorAnswer.scrollIntoView({ behavior: 'smooth' });
|
||||
console.log(123, scroll, anchorAnswer)
|
||||
}
|
||||
}, 2000)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ export function AnswersList() {
|
|||
.catch(() => []);
|
||||
const currentLocation = window.location.href;
|
||||
const hasAnswerAnchor = currentLocation.includes('#');
|
||||
// console.log(answersList, 1111)
|
||||
|
||||
if (hasAnswerAnchor) {
|
||||
const anchorAnswerId = `${currentLocation.substring(currentLocation.indexOf("#") + 1)}`;
|
||||
answersList.forEach(function (answer, i) {
|
||||
|
|
@ -45,8 +45,9 @@ export function AnswersList() {
|
|||
}
|
||||
});
|
||||
}
|
||||
// console.log(answersList, 222)
|
||||
|
||||
if (answersList.length > 2 && answersList[0].answer_id === answersList[1].answer_id)
|
||||
answersList.splice(0, 1);
|
||||
|
||||
return answersList;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -6,6 +6,6 @@
|
|||
"Level 5": 125,
|
||||
"Level 6": 1000,
|
||||
"Level 7": 2000,
|
||||
"Level 8" : 3000,
|
||||
"Level 9" : 10000
|
||||
"Level 8": 3000,
|
||||
"Level 9": 10000
|
||||
}
|
||||
|
|
|
|||
Reference in a new issue