mirror of
https://github.com/Qortal/Qortal-Hub.git
synced 2025-06-15 12:31:21 +00:00
added qmail status
This commit is contained in:
parent
059f05ed20
commit
ae12c31fd0
@ -115,7 +115,9 @@ import {
|
|||||||
hasSettingsChangedAtom,
|
hasSettingsChangedAtom,
|
||||||
isDisabledEditorEnterAtom,
|
isDisabledEditorEnterAtom,
|
||||||
isUsingImportExportSettingsAtom,
|
isUsingImportExportSettingsAtom,
|
||||||
|
mailsAtom,
|
||||||
oldPinnedAppsAtom,
|
oldPinnedAppsAtom,
|
||||||
|
qMailLastEnteredTimestampAtom,
|
||||||
settingsLocalLastUpdatedAtom,
|
settingsLocalLastUpdatedAtom,
|
||||||
settingsQDNLastUpdatedAtom,
|
settingsQDNLastUpdatedAtom,
|
||||||
sortablePinnedAppsAtom,
|
sortablePinnedAppsAtom,
|
||||||
@ -138,6 +140,7 @@ import BoundedNumericTextField from "./common/BoundedNumericTextField";
|
|||||||
import { useHandleUserInfo } from "./components/Group/useHandleUserInfo";
|
import { useHandleUserInfo } from "./components/Group/useHandleUserInfo";
|
||||||
import { Minting } from "./components/Minting/Minting";
|
import { Minting } from "./components/Minting/Minting";
|
||||||
import { isRunningGateway } from "./qortalRequests";
|
import { isRunningGateway } from "./qortalRequests";
|
||||||
|
import { QMailStatus } from "./components/QMailStatus";
|
||||||
|
|
||||||
type extStates =
|
type extStates =
|
||||||
| "not-authenticated"
|
| "not-authenticated"
|
||||||
@ -471,6 +474,8 @@ function App() {
|
|||||||
settingsLocalLastUpdatedAtom
|
settingsLocalLastUpdatedAtom
|
||||||
);
|
);
|
||||||
const resetAtomOldPinnedAppsAtom = useResetRecoilState(oldPinnedAppsAtom);
|
const resetAtomOldPinnedAppsAtom = useResetRecoilState(oldPinnedAppsAtom);
|
||||||
|
const resetAtomQMailLastEnteredTimestampAtom = useResetRecoilState(qMailLastEnteredTimestampAtom)
|
||||||
|
const resetAtomMailsAtom = useResetRecoilState(mailsAtom)
|
||||||
|
|
||||||
const resetAllRecoil = () => {
|
const resetAllRecoil = () => {
|
||||||
resetAtomSortablePinnedAppsAtom();
|
resetAtomSortablePinnedAppsAtom();
|
||||||
@ -479,6 +484,8 @@ function App() {
|
|||||||
resetAtomSettingsLocalLastUpdatedAtom();
|
resetAtomSettingsLocalLastUpdatedAtom();
|
||||||
resetAtomOldPinnedAppsAtom();
|
resetAtomOldPinnedAppsAtom();
|
||||||
resetAtomIsUsingImportExportSettingsAtom()
|
resetAtomIsUsingImportExportSettingsAtom()
|
||||||
|
resetAtomQMailLastEnteredTimestampAtom()
|
||||||
|
resetAtomMailsAtom()
|
||||||
};
|
};
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!isMobile) return;
|
if (!isMobile) return;
|
||||||
@ -1585,6 +1592,8 @@ function App() {
|
|||||||
)}
|
)}
|
||||||
<Spacer height="20px" />
|
<Spacer height="20px" />
|
||||||
<CoreSyncStatus />
|
<CoreSyncStatus />
|
||||||
|
<Spacer height="20px" />
|
||||||
|
<QMailStatus />
|
||||||
</Box>
|
</Box>
|
||||||
<Box
|
<Box
|
||||||
sx={{
|
sx={{
|
||||||
|
BIN
src/assets/QMailLogo.png
Normal file
BIN
src/assets/QMailLogo.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 7.7 KiB |
@ -159,4 +159,14 @@ export const addressInfoKeySelector = selectorFamily({
|
|||||||
export const isDisabledEditorEnterAtom = atom({
|
export const isDisabledEditorEnterAtom = atom({
|
||||||
key: 'isDisabledEditorEnterAtom',
|
key: 'isDisabledEditorEnterAtom',
|
||||||
default: false,
|
default: false,
|
||||||
|
});
|
||||||
|
|
||||||
|
export const qMailLastEnteredTimestampAtom = atom({
|
||||||
|
key: 'qMailLastEnteredTimestampAtom',
|
||||||
|
default: null,
|
||||||
|
});
|
||||||
|
|
||||||
|
export const mailsAtom = atom({
|
||||||
|
key: 'mailsAtom',
|
||||||
|
default: [],
|
||||||
});
|
});
|
@ -2485,7 +2485,9 @@ export const Group = ({
|
|||||||
)}
|
)}
|
||||||
|
|
||||||
|
|
||||||
{!isMobile && desktopViewMode === 'home' && (
|
{!isMobile && (
|
||||||
|
|
||||||
|
|
||||||
<HomeDesktop
|
<HomeDesktop
|
||||||
refreshHomeDataFunc={refreshHomeDataFunc}
|
refreshHomeDataFunc={refreshHomeDataFunc}
|
||||||
myAddress={myAddress}
|
myAddress={myAddress}
|
||||||
@ -2500,7 +2502,9 @@ export const Group = ({
|
|||||||
setOpenAddGroup={setOpenAddGroup}
|
setOpenAddGroup={setOpenAddGroup}
|
||||||
setMobileViewMode={setMobileViewMode}
|
setMobileViewMode={setMobileViewMode}
|
||||||
setDesktopViewMode={setDesktopViewMode}
|
setDesktopViewMode={setDesktopViewMode}
|
||||||
|
desktopViewMode={desktopViewMode}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
)}
|
)}
|
||||||
|
|
||||||
|
|
||||||
|
@ -21,18 +21,18 @@ export const HomeDesktop = ({
|
|||||||
setOpenManageMembers,
|
setOpenManageMembers,
|
||||||
setOpenAddGroup,
|
setOpenAddGroup,
|
||||||
setMobileViewMode,
|
setMobileViewMode,
|
||||||
setDesktopViewMode
|
setDesktopViewMode,
|
||||||
|
desktopViewMode
|
||||||
}) => {
|
}) => {
|
||||||
return (
|
return (
|
||||||
<Box
|
<Box
|
||||||
sx={{
|
sx={{
|
||||||
display: "flex",
|
display: desktopViewMode === 'home' ? "flex" : "none",
|
||||||
width: "100%",
|
width: "100%",
|
||||||
flexDirection: "column",
|
flexDirection: "column",
|
||||||
height: "100%",
|
height: "100%",
|
||||||
overflow: "auto",
|
overflow: "auto",
|
||||||
alignItems: "center",
|
alignItems: "center",
|
||||||
|
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<Spacer height="20px" />
|
<Spacer height="20px" />
|
||||||
@ -85,7 +85,9 @@ export const HomeDesktop = ({
|
|||||||
hasGroups={groups?.length !== 0}
|
hasGroups={groups?.length !== 0}
|
||||||
/>
|
/>
|
||||||
</Box>
|
</Box>
|
||||||
<Box sx={{
|
{desktopViewMode === 'home' && (
|
||||||
|
<>
|
||||||
|
<Box sx={{
|
||||||
width: '330px',
|
width: '330px',
|
||||||
display: 'flex',
|
display: 'flex',
|
||||||
alignItems: 'center',
|
alignItems: 'center',
|
||||||
@ -123,6 +125,9 @@ export const HomeDesktop = ({
|
|||||||
setMobileViewMode={setMobileViewMode}
|
setMobileViewMode={setMobileViewMode}
|
||||||
/>
|
/>
|
||||||
</Box>
|
</Box>
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
|
||||||
</Box>
|
</Box>
|
||||||
)}
|
)}
|
||||||
{!isLoadingGroups && (
|
{!isLoadingGroups && (
|
||||||
|
@ -13,7 +13,9 @@ import MailIcon from '@mui/icons-material/Mail';
|
|||||||
import MailOutlineIcon from '@mui/icons-material/MailOutline';
|
import MailOutlineIcon from '@mui/icons-material/MailOutline';
|
||||||
import { executeEvent } from '../../utils/events';
|
import { executeEvent } from '../../utils/events';
|
||||||
import { CustomLoader } from '../../common/CustomLoader';
|
import { CustomLoader } from '../../common/CustomLoader';
|
||||||
const isLessThanOneWeekOld = (timestamp) => {
|
import { useRecoilState } from 'recoil';
|
||||||
|
import { mailsAtom, qMailLastEnteredTimestampAtom } from '../../atoms/global';
|
||||||
|
export const isLessThanOneWeekOld = (timestamp) => {
|
||||||
// Current time in milliseconds
|
// Current time in milliseconds
|
||||||
const now = Date.now();
|
const now = Date.now();
|
||||||
|
|
||||||
@ -39,8 +41,8 @@ export function formatEmailDate(timestamp: number) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
export const QMailMessages = ({userName, userAddress}) => {
|
export const QMailMessages = ({userName, userAddress}) => {
|
||||||
const [mails, setMails] = useState([])
|
const [mails, setMails] = useRecoilState(mailsAtom)
|
||||||
const [lastEnteredTimestamp, setLastEnteredTimestamp] = useState(null)
|
const [lastEnteredTimestamp, setLastEnteredTimestamp] = useRecoilState(qMailLastEnteredTimestampAtom)
|
||||||
const [loading, setLoading] = useState(true)
|
const [loading, setLoading] = useState(true)
|
||||||
|
|
||||||
const getMails = useCallback(async () => {
|
const getMails = useCallback(async () => {
|
||||||
@ -187,6 +189,8 @@ export const QMailMessages = ({userName, userAddress}) => {
|
|||||||
onClick={()=> {
|
onClick={()=> {
|
||||||
executeEvent("addTab", { data: { service: 'APP', name: 'q-mail' } });
|
executeEvent("addTab", { data: { service: 'APP', name: 'q-mail' } });
|
||||||
executeEvent("open-apps-mode", { });
|
executeEvent("open-apps-mode", { });
|
||||||
|
setLastEnteredTimestamp(Date.now())
|
||||||
|
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<ListItemButton
|
<ListItemButton
|
||||||
@ -220,7 +224,7 @@ export const QMailMessages = ({userName, userAddress}) => {
|
|||||||
<MailOutlineIcon sx={{
|
<MailOutlineIcon sx={{
|
||||||
color: 'white'
|
color: 'white'
|
||||||
}} />
|
}} />
|
||||||
): lastEnteredTimestamp < mail?.created ? (
|
): (lastEnteredTimestamp < mail?.created) && isLessThanOneWeekOld(mail?.created) ? (
|
||||||
<MailIcon sx={{
|
<MailIcon sx={{
|
||||||
color: 'var(--unread)'
|
color: 'var(--unread)'
|
||||||
}} />
|
}} />
|
||||||
|
43
src/components/QMailStatus.tsx
Normal file
43
src/components/QMailStatus.tsx
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
import React, { useMemo } from 'react'
|
||||||
|
import QMailLogo from '../assets/QMailLogo.png'
|
||||||
|
import { useRecoilState } from 'recoil'
|
||||||
|
import { mailsAtom, qMailLastEnteredTimestampAtom } from '../atoms/global'
|
||||||
|
import { isLessThanOneWeekOld } from './Group/QMailMessages'
|
||||||
|
import { ButtonBase } from '@mui/material'
|
||||||
|
import { executeEvent } from '../utils/events'
|
||||||
|
export const QMailStatus = () => {
|
||||||
|
const [lastEnteredTimestamp, setLastEnteredTimestamp] = useRecoilState(qMailLastEnteredTimestampAtom)
|
||||||
|
const [mails, setMails] = useRecoilState(mailsAtom)
|
||||||
|
|
||||||
|
const hasNewMail = useMemo(()=> {
|
||||||
|
if(mails?.length === 0) return false
|
||||||
|
const latestMail = mails[0]
|
||||||
|
if(!lastEnteredTimestamp && isLessThanOneWeekOld(latestMail?.created)) return true
|
||||||
|
if((lastEnteredTimestamp < latestMail?.created) && isLessThanOneWeekOld(latestMail?.created)) return true
|
||||||
|
return false
|
||||||
|
}, [lastEnteredTimestamp, mails])
|
||||||
|
return (
|
||||||
|
<ButtonBase onClick={()=> {
|
||||||
|
executeEvent("addTab", { data: { service: 'APP', name: 'q-mail' } });
|
||||||
|
executeEvent("open-apps-mode", { });
|
||||||
|
setLastEnteredTimestamp(Date.now())
|
||||||
|
}} style={{
|
||||||
|
position: 'relative'
|
||||||
|
}}>{hasNewMail && (
|
||||||
|
<div style={{
|
||||||
|
position: 'absolute',
|
||||||
|
zIndex: 1,
|
||||||
|
top: '-7px',
|
||||||
|
right: '-7px',
|
||||||
|
backgroundColor: 'var(--unread)',
|
||||||
|
height: '15px',
|
||||||
|
width: '15px',
|
||||||
|
borderRadius: '50%',
|
||||||
|
outline: '1px solid white'
|
||||||
|
}} />
|
||||||
|
)}<img style={{
|
||||||
|
width: '24px',
|
||||||
|
height: 'auto'
|
||||||
|
}} src={QMailLogo} /></ButtonBase>
|
||||||
|
)
|
||||||
|
}
|
Loading…
x
Reference in New Issue
Block a user