albert/qmining-page
1
0
Fork 0
mirror of https://gitlab.com/MrFry/qmining-page synced 2025-04-01 20:23:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into new_style

Browse source
This commit is contained in:
mrfry 2021-03-06 14:54:49 +01:00
commit 843f0a7dad
6 changed files with 58 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/modal.module.css
View file

@ -1,5 +1,5 @@
.modal {
z-index: 9999;
z-index: 99;
position: fixed;
top: 0;
left: 0;

16
src/components/newsEntry.js
View file

@ -8,7 +8,8 @@ import styles from './newsEntry.module.css'
export default function NewsEntry({
newsItem,
uid,
onReact,
onCommentReact,
onNewsReact,
onComment,
onDelete,
onPostDelete,
@ -19,19 +20,20 @@ export default function NewsEntry({
<div className={styles.newsRoot}>
<div className={`${styles.newsContainer} ${admin && styles.adminPost}`}>
<div className={styles.newsHeader}>
<div
className={styles.newsTitle}
dangerouslySetInnerHTML={{ __html: title }}
/>
<div className={styles.newsTitle}>{title}</div>
<div className={styles.user}>
<div>User #{user}</div>
<div className={styles.newsDate}>{date}</div>
</div>
</div>
{admin ? (
<div
className={styles.newsBody}
dangerouslySetInnerHTML={{ __html: content }}
/>
) : (
<div className={styles.newsBody}>{content}</div>
)}
</div>
<div className={'actions'}>
{uid === user ? (
@ -47,14 +49,14 @@ export default function NewsEntry({
existingReacts={reacts}
uid={uid}
onClick={(reaction, isDelete) => {
onReact({ type: 'news', reaction, isDelete })
onNewsReact({ reaction, isDelete })
}}
/>
</div>
<Comments
uid={uid}
onReact={(path, reaction, isDelete) => {
onReact({ type: 'comment', path, reaction, isDelete })
onCommentReact({ path, reaction, isDelete })
}}
onComment={onComment}
onDelete={onDelete}

1
src/components/newsEntry.module.css
View file

@ -1,6 +1,7 @@
.newsBody {
margin: 0px 5px;
color: #fff;
white-space: pre-line;
}
.newsTitle {

1
src/components/reactButton.js
View file

@ -76,7 +76,6 @@ export default function ReactButton({ onClick, existingReacts, uid }) {
onClick={() => {
setOpened(true)
}}
onMouseEnter={() => {}}
onMouseLeave={() => {
setOpened(false)
}}

2
src/components/tooltip.module.css
View file

@ -15,7 +15,7 @@
border-radius: 6px;
padding: 5px;
position: absolute;
z-index: 1;
z-index: 9999;
bottom: 100%;
left: 0%;
margin-left: -60px;

14
src/pages/index.js
View file

@ -143,9 +143,8 @@ export default function Index({ globalData }) {
setNews(res.news)
})
}}
onReact={({ type, path, reaction, isDelete }) => {
if (type === 'news') {
fetch(constants.apiUrl + 'infos', {
onNewsReact={({ reaction, isDelete }) => {
fetch(constants.apiUrl + 'react', {
method: 'POST',
credentials: 'include',
headers: {
@ -153,7 +152,7 @@ export default function Index({ globalData }) {
'Content-Type': 'application/json',
},
body: JSON.stringify({
react: reaction,
reaction: reaction,
newsKey: key,
isDelete: isDelete,
}),
@ -162,10 +161,12 @@ export default function Index({ globalData }) {
return res.json()
})
.then((res) => {
console.log(res)
setNews(res.news)
})
} else if (type === 'comment') {
fetch(constants.apiUrl + 'comment', {
}}
onCommentReact={({ path, reaction, isDelete }) => {
fetch(constants.apiUrl + 'react', {
method: 'POST',
credentials: 'include',
headers: {
@ -186,7 +187,6 @@ export default function Index({ globalData }) {
.then((res) => {
setNews(res.news)
})
}
}}
onDelete={(path) => {
fetch(constants.apiUrl + 'comment', {