Merge pull request #3350 from amvanbaren/release-v0.19.1

Release v0.19.1

Author: amvanbaren

Dockerfile

@@ -1,4 +1,4 @@
-ARG SERVER_VERSION=v0.19.0
+ARG SERVER_VERSION=v0.19.1
 
 # Builder image to compile the website
 FROM ubuntu AS builder
@@ -19,7 +19,7 @@ RUN apt-get update \
   && corepack prepare yarn@stable --activate
 
 # bump to update website
-ENV WEBSITE_VERSION 0.13.1-next.4864a03d
+ENV WEBSITE_VERSION 0.13.0
 COPY . /workdir
 
 RUN /usr/bin/yarn --cwd website \

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.4864a03d"
+        "openvsx-webui": "0.13.0"
     },
     "peerDependencies": {
         "@babel/core": "^7.0.0"

website/src/menu-content.tsx

@@ -8,8 +8,8 @@
  * SPDX-License-Identifier: EPL-2.0
  ********************************************************************************/
 
-import React, { FunctionComponent, useState, useRef, useContext } from 'react';
-import { Theme, Typography, Menu, MenuItem, Link, Button, Accordion, AccordionDetails, AccordionSummary, IconButton } from '@mui/material';
+import React, { FunctionComponent, PropsWithChildren, useState, useRef } from 'react';
+import { Theme, Typography, Menu, MenuItem, Link, Button, Accordion, AccordionDetails, AccordionSummary } from '@mui/material';
 import { styled } from '@mui/material/styles';
 import { Link as RouteLink } from 'react-router-dom';
 import ExpandMoreIcon from '@mui/icons-material/ExpandMore';
@@ -22,41 +22,33 @@ import PublishIcon from '@mui/icons-material/Publish';
 import GroupWorkIcon from '@mui/icons-material/GroupWork';
 import PeopleAltIcon from '@mui/icons-material/PeopleAlt';
 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 { 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<PropsWithChildren> = ({ children }) => {
+    return (
+        <Typography variant='body2' sx={{ color: 'text.primary', display: 'flex', alignItems: 'center' }}>
+            {children}
+        </Typography>
+    );
+};
+
 export const MobileMenuContent: FunctionComponent = () => {
-    const {service, user} = useContext(MainContext)
     return <>
-        {
-            user
-                ? <MobileUserAvatar/>
-                : <MobileMenuItem>
-                    <Link href={service.getLoginUrl()}>
-                        <MobileMenuItemText>
-                            <AccountBoxIcon sx={itemIcon} />
-                            Log In
-                        </MobileMenuItemText>
-                    </Link>
-                </MobileMenuItem>
-        }
-        {
-            !location.pathname.startsWith(UserSettingsRoutes.ROOT)
-            ? <MobileMenuItem>
-                <RouteLink to='/user-settings/extensions'>
-                    <MobileMenuItemText>
-                        <PublishIcon sx={itemIcon} />
-                        Publish Extension
-                    </MobileMenuItemText>
-                </RouteLink>
-            </MobileMenuItem>
-            : null
-        }
         <MobileMenuItem>
             <Link target='_blank' href='https://github.com/eclipse/openvsx'>
                 <MobileMenuItemText>
@@ -127,17 +119,45 @@ export const MobileMenuContent: FunctionComponent = () => {
                 </MobileMenuItemText>
             </RouteLink>
         </MobileMenuItem>
+        {
+            !location.pathname.startsWith(UserSettingsRoutes.ROOT)
+            ? <MobileMenuItem>
+                <RouteLink to='/user-settings/extensions'>
+                    <MobileMenuItemText>
+                        <PublishIcon sx={itemIcon} />
+                        Publish Extension
+                    </MobileMenuItemText>
+                </RouteLink>
+            </MobileMenuItem>
+            : null
+        }
     </>;
 }
 
 
 //-------------------- 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 }) => ({
@@ -156,14 +176,13 @@ const SubMenuLink = styled(Link)(subMenuLink);
 
 
 export const DefaultMenuContent: FunctionComponent = () => {
-    const {service, user} = useContext(MainContext)
     const [workingGroupMenuOpen, setWorkingGroupMenuOpen] = useState(false);
     const workingGroupMenuEl = useRef<HTMLButtonElement | null>(null);
     const toggleWorkingGroupMenu = () => setWorkingGroupMenuOpen(!workingGroupMenuOpen);
     const closeWorkingGroupMenu = () => setWorkingGroupMenuOpen(false);
 
     return <>
-        <MenuLink href='https://github.com/EclipseFdn/open-vsx.org/wiki'>
+        <MenuLink href='https://github.com/eclipse/openvsx/wiki'>
             Documentation
         </MenuLink>
         <MenuLink href='https://status.open-vsx.org/'>
@@ -191,16 +210,5 @@ export const DefaultMenuContent: FunctionComponent = () => {
         <Button variant='contained' color='secondary' href='/user-settings/extensions' sx={{ mx: 2.5 }}>
             Publish
         </Button>
-        {
-            user ?
-                <UserAvatar />
-                :
-                <IconButton
-                    href={service.getLoginUrl()}
-                    title='Log In'
-                    aria-label='Log In' >
-                    <AccountBoxIcon />
-                </IconButton>
-        }
     </>;
 }

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.4864a03d"
+    openvsx-webui: "npm:0.13.0"
     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.4864a03d":
-  version: 0.13.1-next.4864a03d
-  resolution: "openvsx-webui@npm:0.13.1-next.4864a03d"
+"openvsx-webui@npm:0.13.0":
+  version: 0.13.0
+  resolution: "openvsx-webui@npm:0.13.0"
   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/4cd4cf9bcc0ddaea08bef8c56c087d5a954e23899f9fb5804c003c720873277a598a3ef4f9278349b20bb1f812ac7b479a1fa73cce5668a703f42e9acd4b7f46
+  checksum: 10/b0245fd107f2b88d86cf7fea5a9ded80ad9084a13fdff16904614f5bdeb9f750b916feb976748eee9da0e230065b0d9fc06f789f74153f21005d16eef57c1f07
   languageName: node
   linkType: hard