From 01045a538c9ef86b560ec7cdcfc0bb9e19e6c59c Mon Sep 17 00:00:00 2001 From: amvanbaren Date: Fri, 29 Nov 2024 16:02:49 +0200 Subject: [PATCH] test dee19c0f --- Dockerfile | 2 +- website/package.json | 2 +- website/src/menu-content.tsx | 41 ++---------------------------------- website/yarn.lock | 10 ++++----- 4 files changed, 9 insertions(+), 46 deletions(-) diff --git a/Dockerfile b/Dockerfile index 95c7efe9..25c38e28 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,7 +19,7 @@ RUN apt-get update \ && corepack prepare yarn@stable --activate # bump to update website -ENV WEBSITE_VERSION 0.13.1-next.b220b868 +ENV WEBSITE_VERSION 0.13.1-next.dee19c0f COPY . /workdir RUN /usr/bin/yarn --cwd website \ diff --git a/website/package.json b/website/package.json index 100b2cde..faebd54c 100644 --- a/website/package.json +++ b/website/package.json @@ -6,7 +6,7 @@ "repository": "https://github.com/eclipse/open-vsx.org", "license": "EPL-2.0", "dependencies": { - "openvsx-webui": "0.13.1-next.b220b868" + "openvsx-webui": "0.13.1-next.dee19c0f" }, "peerDependencies": { "@babel/core": "^7.0.0" diff --git a/website/src/menu-content.tsx b/website/src/menu-content.tsx index a164e624..d9fadb18 100644 --- a/website/src/menu-content.tsx +++ b/website/src/menu-content.tsx @@ -8,7 +8,7 @@ * SPDX-License-Identifier: EPL-2.0 ********************************************************************************/ -import React, { FunctionComponent, PropsWithChildren, useState, useRef, useContext } from 'react'; +import React, { FunctionComponent, useState, useRef, useContext } from 'react'; import { Theme, Typography, Menu, MenuItem, Link, Button, Accordion, AccordionDetails, AccordionSummary, IconButton } from '@mui/material'; import { styled } from '@mui/material/styles'; import { Link as RouteLink } from 'react-router-dom'; @@ -25,32 +25,11 @@ import HubIcon from '@mui/icons-material/Hub'; import AccountBoxIcon from '@mui/icons-material/AccountBox'; import { UserSettingsRoutes } from 'openvsx-webui'; import { MainContext } from 'openvsx-webui/lib/context'; -import { MobileUserAvatar } from 'openvsx-webui/lib/default/menu-content' +import { MobileMenuItem, itemIcon, MobileMenuItemText, MobileUserAvatar, headerItem, MenuLink, MenuRouteLink } from 'openvsx-webui/lib/default/menu-content' import { UserAvatar } from 'openvsx-webui/lib/pages/user/avatar'; //-------------------- Mobile View --------------------// -const MobileMenuItem = styled(MenuItem)({ - cursor: 'auto', - '&>a': { - textDecoration: 'none' - } -}); - -const itemIcon = { - mr: 1, - width: '16px', - height: '16px', -}; - -const MobileMenuItemText: FunctionComponent = ({ children }) => { - return ( - - {children} - - ); -}; - export const MobileMenuContent: FunctionComponent = () => { const {service, user} = useContext(MainContext) return <> @@ -154,27 +133,11 @@ export const MobileMenuContent: FunctionComponent = () => { //-------------------- Default View --------------------// -const headerItem = ({ theme }: { theme: Theme }) => ({ - margin: theme.spacing(2.5), - color: theme.palette.text.primary, - textDecoration: 'none', - fontSize: '1.1rem', - fontFamily: theme.typography.fontFamily, - fontWeight: theme.typography.fontWeightLight, - letterSpacing: 1, - '&:hover': { - color: theme.palette.secondary.main, - textDecoration: 'none' - } -}); - const headerTypography = ({ theme }: { theme: Theme }) => ({ ...headerItem({theme}), cursor: 'pointer' }); -const MenuLink = styled(Link)(headerItem); -const MenuRouteLink = styled(RouteLink)(headerItem); const MenuTypography = styled(Typography)(headerTypography); const subMenuItem = ({ theme }: { theme: Theme }) => ({ diff --git a/website/yarn.lock b/website/yarn.lock index 9efd8c9b..b27eca40 100644 --- a/website/yarn.lock +++ b/website/yarn.lock @@ -2399,7 +2399,7 @@ __metadata: "@types/react-router-dom": "npm:^5.3.3" css-loader: "npm:^6.8.1" express: "npm:^4.21.1" - openvsx-webui: "npm:0.13.1-next.b220b868" + openvsx-webui: "npm:0.13.1-next.dee19c0f" source-map-loader: "npm:^4.0.1" style-loader: "npm:^3.3.3" typescript: "npm:~5.1.6" @@ -2420,9 +2420,9 @@ __metadata: languageName: node linkType: hard -"openvsx-webui@npm:0.13.1-next.b220b868": - version: 0.13.1-next.b220b868 - resolution: "openvsx-webui@npm:0.13.1-next.b220b868" +"openvsx-webui@npm:0.13.1-next.dee19c0f": + version: 0.13.1-next.dee19c0f + resolution: "openvsx-webui@npm:0.13.1-next.dee19c0f" dependencies: "@emotion/react": "npm:^11.11.1" "@emotion/styled": "npm:^11.11.0" @@ -2448,7 +2448,7 @@ __metadata: react-router-dom: "npm:^6.14.1" peerDependencies: "@babel/core": ^7.0.0 - checksum: 10/1800fc864702efae62bfd2682600d511f0fe4ccd0443acf5899a8c4e17f2b7b053a6c0a95ed5532e9c3c411d03258ffd5f78adc9106a1ca92b5a25ba92581390 + checksum: 10/9875a6154d8d23e6aa8251af83fe0f48a080c8aeff661876a1472c6489e2b5723a33a59db8161341629017681b4a1baf0b0b44f4f808c1dfb28baa591c11cae5 languageName: node linkType: hard