Get correct files from other branch

This commit is contained in:
Nicola Benaglia 2025-04-20 17:08:03 +02:00
parent 958acbe943
commit 2f3252a2e3
2 changed files with 51 additions and 63 deletions

View File

@ -18,11 +18,9 @@ import {
AppsLibraryContainer, AppsLibraryContainer,
AppsWidthLimiter, AppsWidthLimiter,
} from './Apps-styles'; } from './Apps-styles';
import { Avatar, Box, ButtonBase, InputBase } from '@mui/material'; import { Avatar, Box } from '@mui/material';
import { Add } from '@mui/icons-material'; import { getBaseApiReact } from '../../App';
import { getBaseApiReact, isMobile } from '../../App';
import LogoSelected from '../../assets/svgs/LogoSelected.svg'; import LogoSelected from '../../assets/svgs/LogoSelected.svg';
import { Spacer } from '../../common/Spacer'; import { Spacer } from '../../common/Spacer';
import { executeEvent } from '../../utils/events'; import { executeEvent } from '../../utils/events';
import { AppRating } from './AppRating'; import { AppRating } from './AppRating';
@ -49,9 +47,8 @@ export const AppInfo = ({ app, myName }) => {
return ( return (
<AppsLibraryContainer <AppsLibraryContainer
sx={{ sx={{
height: !isMobile && '100%', height: '100%',
justifyContent: !isMobile && 'flex-start', justifyContent: 'flex-start',
alignItems: isMobile && 'center',
}} }}
> >
<Box <Box
@ -62,7 +59,8 @@ export const AppInfo = ({ app, myName }) => {
width: '90%', width: '90%',
}} }}
> >
{!isMobile && <Spacer height="30px" />} <Spacer height="30px" />
<AppsWidthLimiter> <AppsWidthLimiter>
<AppInfoSnippetContainer> <AppInfoSnippetContainer>
<AppInfoSnippetLeft <AppInfoSnippetLeft
@ -170,15 +168,9 @@ export const AppInfo = ({ app, myName }) => {
}} }}
> >
<AppDownloadButtonText> <AppDownloadButtonText>
{!isMobile ? (
<>
{isSelectedAppPinned {isSelectedAppPinned
? 'Unpin from dashboard' ? 'Unpin from dashboard'
: 'Pin to dashboard'} : 'Pin to dashboard'}
</>
) : (
<>{isSelectedAppPinned ? 'Unpin' : 'Pin'}</>
)}
</AppDownloadButtonText> </AppDownloadButtonText>
</AppDownloadButton> </AppDownloadButton>
<AppDownloadButton <AppDownloadButton

View File

@ -12,9 +12,8 @@ import {
AppInfoUserName, AppInfoUserName,
} from './Apps-styles'; } from './Apps-styles';
import { Avatar, ButtonBase } from '@mui/material'; import { Avatar, ButtonBase } from '@mui/material';
import { getBaseApiReact, isMobile } from '../../App'; import { getBaseApiReact } from '../../App';
import LogoSelected from '../../assets/svgs/LogoSelected.svg'; import LogoSelected from '../../assets/svgs/LogoSelected.svg';
import { Spacer } from '../../common/Spacer'; import { Spacer } from '../../common/Spacer';
import { executeEvent } from '../../utils/events'; import { executeEvent } from '../../utils/events';
import { AppRating } from './AppRating'; import { AppRating } from './AppRating';
@ -124,7 +123,6 @@ export const AppInfoSnippet = ({
gap: '10px', gap: '10px',
}} }}
> >
{!isMobile && (
<AppDownloadButton <AppDownloadButton
onClick={() => { onClick={() => {
setSortablePinnedApps((prev) => { setSortablePinnedApps((prev) => {
@ -135,8 +133,7 @@ export const AppInfoSnippet = ({
updatedApps = prev.filter( updatedApps = prev.filter(
(item) => (item) =>
!( !(
item?.name === app?.name && item?.name === app?.name && item?.service === app?.service
item?.service === app?.service
) )
); );
} else { } else {
@ -169,7 +166,6 @@ export const AppInfoSnippet = ({
{isSelectedAppPinned ? 'Unpin' : 'Pin'} {isSelectedAppPinned ? 'Unpin' : 'Pin'}
</AppDownloadButtonText> </AppDownloadButtonText>
</AppDownloadButton> </AppDownloadButton>
)}
<AppDownloadButton <AppDownloadButton
onClick={() => { onClick={() => {