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

Empty msg fix, unread after opening msg fix

Browse source
This commit is contained in:
mrfry 2022-05-12 19:52:49 +02:00
parent 02954e0d01
commit 98164ff4fa
2 changed files with 13 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/pages/_app.js
View file

@ -7,7 +7,7 @@ import Layout from '../components/layout'
import '../defaultStyles.css' import '../defaultStyles.css'
import constants from '../constants.json' import constants from '../constants.json'
const queryClient = new QueryClient({ export const queryClient = new QueryClient({
defaultOptions: { defaultOptions: {
queries: { queries: {
staleTime: Infinity, staleTime: Infinity,
@ -44,20 +44,12 @@ const getGlobalProps = () => {
} }
function App({ Component, pageProps, router }) { function App({ Component, pageProps, router }) {
const [userId, setUserId] = useState()
const [motd, setMotd] = useState()
const [unreads, setUnreads] = useState()
const [globalState, setGlobalState] = useState({}) const [globalState, setGlobalState] = useState({})
const { data } = useQuery('hasNewMsgs', () => getGlobalProps(), { const { data } = useQuery(['infos'], () => getGlobalProps(), {
refetchOnWindowFocus: true, refetchOnWindowFocus: true,
}) })
useEffect(() => { const { motd, uid: userId, unreads } = data || {}
if (!data) return
setUserId(data.uid)
setMotd(data.motd)
setUnreads(data.unreads)
}, [data])
useEffect(() => { useEffect(() => {
getGlobalProps() getGlobalProps()

14
src/pages/chat.js
View file

@ -1,11 +1,12 @@
import React from 'react' import React from 'react'
import Head from 'next/head' import Head from 'next/head'
import io from 'socket.io-client' import io from 'socket.io-client'
import linkifyString from 'linkify-string' import linkifyString from 'linkify-string'
import constants from '../constants.json' import constants from '../constants.json'
import LoadingIndicator from '../components/LoadingIndicator' import LoadingIndicator from '../components/LoadingIndicator'
import { queryClient } from '../pages/_app'
import styles from './chat.module.css' import styles from './chat.module.css'
const byDate = (a, b) => { const byDate = (a, b) => {
@ -277,7 +278,8 @@ export default class Chat extends React.Component {
sendMsg(currMsg, type) { sendMsg(currMsg, type) {
this.chatInputRef.current.style.height = '40px' this.chatInputRef.current.style.height = '40px'
const { msgs, selectedUser, user } = this.state const { msgs, selectedUser, user } = this.state
if (!currMsg) {
if (!currMsg || !currMsg.trim()) {
return return
} }
if (this.socket && selectedUser) { if (this.socket && selectedUser) {
@ -386,6 +388,10 @@ export default class Chat extends React.Component {
} catch (e) { } catch (e) {
// e // e
} }
queryClient.setQueryData('infos', (oldData) => ({
...oldData,
unreads: oldData.unreads.filter((x) => x !== val),
}))
} }
renderChatInput() { renderChatInput() {
@ -649,7 +655,7 @@ export default class Chat extends React.Component {
) )
} }
renderSidebarEntryes() { renderSidebarEntries() {
const { msgs } = this.state const { msgs } = this.state
const sorted = Object.keys(msgs).sort((a, b) => { const sorted = Object.keys(msgs).sort((a, b) => {
return msgs[b].lastMessage.date - msgs[a].lastMessage.date return msgs[b].lastMessage.date - msgs[a].lastMessage.date
@ -692,7 +698,7 @@ export default class Chat extends React.Component {
<div>Új beszélgetés</div> <div>Új beszélgetés</div>
</div> </div>
<hr /> <hr />
{msgs && this.renderSidebarEntryes()} {msgs && this.renderSidebarEntries()}
</div> </div>
<span className={styles.spacer} /> <span className={styles.spacer} />
<div></div> <div></div>