swapped news and user forum

This commit is contained in:
mrfry 2022-12-04 19:09:43 +01:00
parent cf3edd8976
commit d301bcd17f
8 changed files with 54 additions and 185 deletions

View file

@ -288,7 +288,6 @@ export default function Forum({
globalState,
setGlobalState,
forumName,
children,
allowPost,
}) {
const userId = globalData.userId
@ -435,7 +434,6 @@ export default function Forum({
<div>
<Header />
<Sleep />
{children || null}
{renderNews()}
{postInModalKey && (
<Modal

View file

@ -1,12 +1,12 @@
{
"index": {
"href": "/",
"text": "Hírek"
},
"userForum": {
"href": "/userForum",
"text": "Fórum"
},
"news": {
"href": "/news",
"text": "Hírek"
},
"script": {
"href": "/script",
"text": "Script"

View file

@ -4,7 +4,7 @@ import Forum from '../components/forum'
import styles from './index.module.css'
export default function Index({
export default function UserForum({
router,
globalData,
globalState,
@ -13,15 +13,9 @@ export default function Index({
const motd = globalData.motd
return (
<Forum
router={router}
globalState={globalState}
setGlobalState={setGlobalState}
globalData={globalData}
forumName={'frontpage'}
>
<>
{motd && (
<div className={styles.motd}>
<div className={styles.topMsg}>
<div className={styles.title}>MOTD</div>
{motd ? (
<div dangerouslySetInnerHTML={{ __html: motd }} />
@ -30,6 +24,14 @@ export default function Index({
)}
</div>
)}
</Forum>
<Forum
allowPost
router={router}
globalState={globalState}
setGlobalState={setGlobalState}
globalData={globalData}
forumName={'userForum'}
/>
</>
)
}

View file

@ -1,13 +1,6 @@
.title {
color: var(--text-color);
font-size: 32px;
.topMsg {
text-align: center;
letter-spacing: 2.5px;
}
.motd {
text-align: center;
font-size: 20px;
font-size: 18px;
border: 2px dashed var(--text-color);
padding-top: 13px;
@ -19,3 +12,10 @@
margin-left: 5px;
margin-right: 5px;
}
.title {
color: var(--text-color);
font-size: 32px;
text-align: center;
letter-spacing: 2.5px;
}

20
src/pages/news.js Normal file
View file

@ -0,0 +1,20 @@
import React from 'react'
import Forum from '../components/forum'
export default function Index({
router,
globalData,
globalState,
setGlobalState,
}) {
return (
<Forum
router={router}
globalState={globalState}
setGlobalState={setGlobalState}
globalData={globalData}
forumName={'frontpage'}
/>
)
}

View file

@ -1,6 +1,13 @@
.topMsg {
.title {
color: var(--text-color);
font-size: 32px;
text-align: center;
font-size: 18px;
letter-spacing: 2.5px;
}
.motd {
text-align: center;
font-size: 20px;
border: 2px dashed var(--text-color);
padding-top: 13px;
@ -12,10 +19,3 @@
margin-left: 5px;
margin-right: 5px;
}
.title {
color: var(--text-color);
font-size: 32px;
text-align: center;
letter-spacing: 2.5px;
}

View file

@ -1,29 +0,0 @@
import React from 'react'
import Forum from '../components/forum'
import styles from './userForum.module.css'
export default function UserForum({
router,
globalData,
globalState,
setGlobalState,
}) {
return (
<Forum
allowPost
router={router}
globalState={globalState}
setGlobalState={setGlobalState}
globalData={globalData}
forumName={'userForum'}
>
<div className={styles.topMsg}>
<div className={styles.title}>Felhasználói fórum</div>
Itt lehet témákat felvetni és megbeszélni a többi felhasználóval, vagy
adminnal.
</div>
</Forum>
)
}

View file

@ -1,122 +0,0 @@
.tableContainer {
user-select: none;
display: flex;
flex-flow: column;
}
.tableContainer > div {
padding: 5px 5px;
display: flex;
align-items: stretch;
}
.tableContainer > div > div {
padding: 5px;
}
.tableContainer > div > div:nth-child(1) {
flex: 1 0 100px;
}
.tableContainer > div > div:nth-child(2) {
flex: 0 200px;
}
.tableContainer > div > div:nth-child(3) {
flex: 0 90px;
}
.tableContainer > div > div:nth-child(4) {
flex: 0 100px;
}
.tableContainer > div > div:nth-child(5) {
flex: 0 110px;
}
.tableContainer > div > div:nth-child(6) {
flex: 0 100px;
}
.rows > div {
word-wrap: anywhere;
cursor: pointer;
align-items: center;
}
.rows > div:nth-child(2n + 1) {
background-color: var(--dark-color);
}
.rows > div:hover {
background-color: var(--hoover-color);
}
.header > div > div {
color: var(--text-color);
display: flex;
align-items: center;
cursor: pointer;
background-color: var(--background-color);
}
.header > div > div:hover {
background-color: var(--hoover-color);
}
@media screen and (max-width: 700px) {
.header > div > div {
height: 100px;
writing-mode: vertical-rl;
text-orientation: sideways;
}
}
.uploadContainer > div {
padding: 5px;
text-align: center;
}
.deleteButton {
text-align: center;
padding: 2px;
border: 1px solid var(--hoover-color);
border-radius: 3px;
cursor: pointer;
}
.deleteButton:hover {
background-color: var(--dark-color);
}
.newButton {
width: 35%;
}
.description {
padding: 5px;
text-align: center;
}
.description > b {
color: red;
}
.currDir {
color: var(--text-color);
text-align: center;
font-size: 20px;
}
.title {
display: flex;
justify-content: center;
align-items: center;
}
.title > div:nth-child(1) {
padding: 0px 16px;
}
.title > div:nth-child(2) {
flex: 1;
}