bug fixes

This commit is contained in:
PhilReact 2024-10-24 21:47:30 +03:00
parent b9bf20b39b
commit d83bbd40a0
9 changed files with 21 additions and 34 deletions

View File

@ -149,7 +149,7 @@ const defaultValues: MyContextInterface = {
message: "", message: "",
}, },
}; };
export let isMobile = false; export let isMobile = true;
const isMobileDevice = () => { const isMobileDevice = () => {
const userAgent = navigator.userAgent || navigator.vendor || window.opera; const userAgent = navigator.userAgent || navigator.vendor || window.opera;

View File

@ -43,6 +43,7 @@ export const AppInfo = ({ app, myName }) => {
display: 'flex', display: 'flex',
flexDirection: 'column', flexDirection: 'column',
maxWidth: "500px", maxWidth: "500px",
width: '90%'
}}> }}>

View File

@ -258,12 +258,12 @@ export const AppPublish = ({ names, categories }) => {
}; };
return ( return (
<AppsLibraryContainer sx={{ <AppsLibraryContainer sx={{
height: !isMobile && '100%', height: !isMobile ? '100%' : 'auto',
paddingTop: !isMobile && '30px', paddingTop: !isMobile && '30px',
alignItems: !isMobile && 'center' alignItems: !isMobile && 'center'
}}> }}>
<AppsWidthLimiter sx={{ <AppsWidthLimiter sx={{
width: !isMobile && 'auto' width: !isMobile ? 'auto' : '90%'
}}> }}>
<AppLibrarySubTitle>Create Apps!</AppLibrarySubTitle> <AppLibrarySubTitle>Create Apps!</AppLibrarySubTitle>
<Spacer height="18px" /> <Spacer height="18px" />
@ -513,6 +513,7 @@ export const AppPublish = ({ names, categories }) => {
info={infoSnack} info={infoSnack}
setInfo={setInfoSnack} setInfo={setInfoSnack}
/> />
</AppsLibraryContainer> </AppsLibraryContainer>
); );
}; };

View File

@ -303,10 +303,10 @@ export const Apps = ({ mode, setMode, show , myName}) => {
categories={categories} categories={categories}
/> />
{mode === "appInfo" && <AppInfo app={selectedAppInfo} myName={myName} />} {mode === "appInfo" && !selectedTab && <AppInfo app={selectedAppInfo} myName={myName} />}
{mode === "appInfo-from-category" && <AppInfo app={selectedAppInfo} myName={myName} />} {mode === "appInfo-from-category" && !selectedTab && <AppInfo app={selectedAppInfo} myName={myName} />}
<AppsCategory availableQapps={availableQapps} isShow={mode === 'category' && !selectedTab} category={selectedCategory} myName={myName} /> <AppsCategory availableQapps={availableQapps} isShow={mode === 'category' && !selectedTab} category={selectedCategory} myName={myName} />
{mode === "publish" && <AppPublish names={myName ? [myName] : []} categories={categories} />} {mode === "publish" && !selectedTab && <AppPublish names={myName ? [myName] : []} categories={categories} />}
{tabs.map((tab) => { {tabs.map((tab) => {
return ( return (

View File

@ -394,10 +394,10 @@ export const AppsDesktop = ({ mode, setMode, show , myName, goToHome, setDesktop
categories={categories} categories={categories}
/> />
{mode === "appInfo" && <AppInfo app={selectedAppInfo} myName={myName} />} {mode === "appInfo" && !selectedTab && <AppInfo app={selectedAppInfo} myName={myName} />}
{mode === "appInfo-from-category" && <AppInfo app={selectedAppInfo} myName={myName} />} {mode === "appInfo-from-category" && !selectedTab && <AppInfo app={selectedAppInfo} myName={myName} />}
<AppsCategoryDesktop availableQapps={availableQapps} isShow={mode === 'category' && !selectedTab} category={selectedCategory} myName={myName} /> <AppsCategoryDesktop availableQapps={availableQapps} isShow={mode === 'category' && !selectedTab} category={selectedCategory} myName={myName} />
{mode === "publish" && <AppPublish names={myName ? [myName] : []} categories={categories} />} {mode === "publish" && !selectedTab && <AppPublish names={myName ? [myName] : []} categories={categories} />}
{tabs.map((tab) => { {tabs.map((tab) => {
return ( return (

View File

@ -172,6 +172,7 @@ export const GroupMail = ({
const getAllThreads = React.useCallback( const getAllThreads = React.useCallback(
async (groupId: string, mode: string, isInitial?: boolean) => { async (groupId: string, mode: string, isInitial?: boolean) => {
try { try {
console.log('mode', mode)
setIsLoading(true) setIsLoading(true)
const offset = isInitial ? 0 : allThreads.length; const offset = isInitial ? 0 : allThreads.length;
const isReverse = mode === "Newest" ? true : false; const isReverse = mode === "Newest" ? true : false;
@ -536,10 +537,14 @@ export const GroupMail = ({
}); });
// Convert the map back to an array and sort by "created" timestamp in descending order // Convert the map back to an array and sort by "created" timestamp in descending order
const sortedList = Array.from(uniqueItems.values()).sort((a, b) => b.threadData?.createdAt - a.threadData?.createdAt); const sortedList = Array.from(uniqueItems.values()).sort((a, b) =>
filterMode === 'Oldest'
? a.threadData?.createdAt - b.threadData?.createdAt
: b.threadData?.createdAt - a.threadData?.createdAt
);
return sortedList; return sortedList;
}, [tempPublishedList, listOfThreadsToDisplay]); }, [tempPublishedList, listOfThreadsToDisplay, filterMode]);
if (currentThread) if (currentThread)
return ( return (

View File

@ -754,29 +754,7 @@ export const GroupContainer = styled(Box)`
position: relative; position: relative;
overflow: auto; overflow: auto;
width: 100%; width: 100%;
&::-webkit-scrollbar-track {
background-color: transparent;
}
&::-webkit-scrollbar-track:hover {
background-color: transparent;
}
&::-webkit-scrollbar {
width: 16px;
height: 10px;
background-color: white;
}
&::-webkit-scrollbar-thumb {
background-color: #838eee;
border-radius: 8px;
background-clip: content-box;
border: 4px solid transparent;
}
&::-webkit-scrollbar-thumb:hover {
background-color: #6270f0;
}
` `

View File

@ -134,6 +134,7 @@ export const GroupMenu = ({ setGroupSection, groupSection, setOpenManageMembers,
"& .MuiTypography-root": { "& .MuiTypography-root": {
fontSize: "12px", fontSize: "12px",
fontWeight: 600, fontWeight: 600,
color: hasUnreadChat ? "var(--unread)" :"#fff"
}, },
}} primary="Chat" /> }} primary="Chat" />
</MenuItem> </MenuItem>
@ -153,6 +154,7 @@ export const GroupMenu = ({ setGroupSection, groupSection, setOpenManageMembers,
"& .MuiTypography-root": { "& .MuiTypography-root": {
fontSize: "12px", fontSize: "12px",
fontWeight: 600, fontWeight: 600,
color: hasUnreadAnnouncements ? "var(--unread)" :"#fff"
}, },
}} primary="Announcements" /> }} primary="Announcements" />
</MenuItem> </MenuItem>

View File

@ -203,7 +203,7 @@ const Header = ({
"& .MuiTypography-root": { "& .MuiTypography-root": {
fontSize: "12px", fontSize: "12px",
fontWeight: 600, fontWeight: 600,
color: hasUnreadDirects ? "var(--unread)" :"rgba(250, 250, 250, 0.5)" color: hasUnreadGroups ? "var(--unread)" :"rgba(250, 250, 250, 0.5)"
}, },
}} primary="Hubs" /> }} primary="Hubs" />
</MenuItem> </MenuItem>