Skip to content
This repository has been archived by the owner on May 18, 2022. It is now read-only.

[NEU-171] Fix small details show up incorrectly in standalone builds #852

Merged
merged 1 commit into from
Mar 30, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 15 additions & 12 deletions src/components/add-workspace/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import MoreVertIcon from '@material-ui/icons/MoreVert';

import connectComponent from '../../helpers/connect-component';
import getWorkspaceFriendlyName from '../../helpers/get-workspace-friendly-name';
import isMenubarBrowser from '../../helpers/is-menubar-browser';

import { updateMode } from '../../state/dialog-add-workspace/actions';

Expand Down Expand Up @@ -89,18 +90,20 @@ const AddWorkspace = ({
label: classes.bottomNavigationActionLabel,
}}
/>
<BottomNavigationAction
value="more"
icon={<MoreVertIcon />}
classes={{
root: classes.bottomNavigationActionRootSmall,
wrapper: classes.bottomNavigationActionWrapper,
label: classes.bottomNavigationActionLabel,
}}
onClick={(e) => {
requestShowAppMiniMenu(e.x, e.y);
}}
/>
{isMenubarBrowser() && (
<BottomNavigationAction
value="more"
icon={<MoreVertIcon />}
classes={{
root: classes.bottomNavigationActionRootSmall,
wrapper: classes.bottomNavigationActionWrapper,
label: classes.bottomNavigationActionLabel,
}}
onClick={(e) => {
requestShowAppMiniMenu(e.x, e.y);
}}
/>
)}
</BottomNavigation>
</Paper>
</div>
Expand Down
15 changes: 14 additions & 1 deletion src/components/add-workspace/submit-app-card.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ import Typography from '@material-ui/core/Typography';
import Paper from '@material-ui/core/Paper';
import AddCircleIcon from '@material-ui/icons/AddCircle';

import isWebcatalog from '../../helpers/is-webcatalog';
import getStaticGlobal from '../../helpers/get-static-global';

import connectComponent from '../../helpers/connect-component';
import { requestOpenInBrowser } from '../../senders';

Expand Down Expand Up @@ -58,9 +61,19 @@ const SubmitAppCard = (props) => {
classes,
} = props;

let submitUrl;
if (isWebcatalog()) submitUrl = 'https://webcatalog.io/webcatalog/apps/submit/';
else if (getStaticGlobal('appJson').id === 'singlebox') submitUrl = 'https://webcatalog.io/singlebox/apps/submit/';

if (!submitUrl) return null;

return (
<Grid item xs={12}>
<Paper elevation={0} className={classes.card} onClick={() => requestOpenInBrowser('https://webcatalog.io/webcatalog/apps/submit/')}>
<Paper
elevation={0}
className={classes.card}
onClick={() => requestOpenInBrowser(submitUrl)}
>
<div>
<AddCircleIcon className={classes.paperIcon} />
</div>
Expand Down