From 92ccea43bec2d30240b22a95cc61a566d82cf666 Mon Sep 17 00:00:00 2001 From: amvanbaren Date: Tue, 19 Nov 2024 14:27:23 +0200 Subject: [PATCH 01/21] test 07617750 --- Dockerfile | 5 +++-- configuration/ehcache.xml | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index f3fa041d..1a18a7f3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG SERVER_VERSION=v0.19.0 +ARG SERVER_VERSION=07617750 # Builder image to compile the website FROM ubuntu AS builder @@ -27,7 +27,8 @@ RUN /usr/bin/yarn --cwd website \ && /usr/bin/yarn --cwd website build # Main image derived from openvsx-server -FROM ghcr.io/eclipse/openvsx-server:${SERVER_VERSION} +#FROM ghcr.io/eclipse/openvsx-server:${SERVER_VERSION} +FROM docker.io/amvanbaren/openvsx-server:${SERVER_VERSION} ARG SERVER_VERSION COPY --from=builder --chown=openvsx:openvsx /workdir/website/static/ BOOT-INF/classes/static/ diff --git a/configuration/ehcache.xml b/configuration/ehcache.xml index c0752420..0318d507 100644 --- a/configuration/ehcache.xml +++ b/configuration/ehcache.xml @@ -80,4 +80,40 @@ 8 + + + 5 + + + + org.eclipse.openvsx.cache.ExpiredFileListener + ASYNCHRONOUS + UNORDERED + EXPIRED + EVICTED + REMOVED + + + + 150 + + + + + 5 + + + + org.eclipse.openvsx.cache.ExpiredFileListener + ASYNCHRONOUS + UNORDERED + EXPIRED + EVICTED + REMOVED + + + + 20 + + \ No newline at end of file From 8c6434c6ca2863b031587af6fa77bb8968ef4c83 Mon Sep 17 00:00:00 2001 From: amvanbaren Date: Tue, 19 Nov 2024 15:06:10 +0200 Subject: [PATCH 02/21] test 07617751 --- Dockerfile | 2 +- configuration/application.yml | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1a18a7f3..27c4a436 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG SERVER_VERSION=07617750 +ARG SERVER_VERSION=07617751 # Builder image to compile the website FROM ubuntu AS builder diff --git a/configuration/application.yml b/configuration/application.yml index cb0364d1..574f6054 100644 --- a/configuration/application.yml +++ b/configuration/application.yml @@ -25,9 +25,6 @@ server: spring: application: name: openvsx-server - autoconfigure: - # don't send traces to Zipkin - exclude: org.springframework.boot.actuate.autoconfigure.tracing.zipkin.ZipkinAutoConfiguration config: import: file:${DEPLOYMENT_CONFIG} cache: @@ -84,7 +81,7 @@ management: exposure: include: - health - # - prometheus + - prometheus tracing: sampling: probability: 0.1 From d8791090a81716425929e280c6c72649b52c8bb3 Mon Sep 17 00:00:00 2001 From: amvanbaren Date: Tue, 19 Nov 2024 15:26:11 +0200 Subject: [PATCH 03/21] test 07617752 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 27c4a436..753b2f5c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG SERVER_VERSION=07617751 +ARG SERVER_VERSION=07617752 # Builder image to compile the website FROM ubuntu AS builder From 7354f54f0923b72859b4f737cdc4d51e281a9749 Mon Sep 17 00:00:00 2001 From: amvanbaren Date: Tue, 19 Nov 2024 15:49:05 +0200 Subject: [PATCH 04/21] test 07617753 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 753b2f5c..0402a82b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG SERVER_VERSION=07617752 +ARG SERVER_VERSION=07617753 # Builder image to compile the website FROM ubuntu AS builder From bfcc3bee922330696dad7823612e27ba682fc8cf Mon Sep 17 00:00:00 2001 From: amvanbaren Date: Wed, 20 Nov 2024 11:07:17 +0200 Subject: [PATCH 05/21] test 465f6bcd - test 465f6bcd - update cross-spawn --- Dockerfile | 7 +++---- website/package.json | 2 +- website/yarn.lock | 16 ++++++++-------- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0402a82b..32a1f622 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG SERVER_VERSION=07617753 +ARG SERVER_VERSION=465f6bc # 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.0 +ENV WEBSITE_VERSION 0.13.0-next.465f6bcd COPY . /workdir RUN /usr/bin/yarn --cwd website \ @@ -27,8 +27,7 @@ RUN /usr/bin/yarn --cwd website \ && /usr/bin/yarn --cwd website build # Main image derived from openvsx-server -#FROM ghcr.io/eclipse/openvsx-server:${SERVER_VERSION} -FROM docker.io/amvanbaren/openvsx-server:${SERVER_VERSION} +FROM ghcr.io/eclipse/openvsx-server:${SERVER_VERSION} ARG SERVER_VERSION COPY --from=builder --chown=openvsx:openvsx /workdir/website/static/ BOOT-INF/classes/static/ diff --git a/website/package.json b/website/package.json index f6260118..a43376e9 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.0" + "openvsx-webui": "0.13.0-next.465f6bcd" }, "peerDependencies": { "@babel/core": "^7.0.0" diff --git a/website/yarn.lock b/website/yarn.lock index 84aedc82..0b1d20a5 100644 --- a/website/yarn.lock +++ b/website/yarn.lock @@ -1407,13 +1407,13 @@ __metadata: linkType: hard "cross-spawn@npm:^7.0.3": - version: 7.0.3 - resolution: "cross-spawn@npm:7.0.3" + version: 7.0.6 + resolution: "cross-spawn@npm:7.0.6" dependencies: path-key: "npm:^3.1.0" shebang-command: "npm:^2.0.0" which: "npm:^2.0.1" - checksum: 10/e1a13869d2f57d974de0d9ef7acbf69dc6937db20b918525a01dacb5032129bd552d290d886d981e99f1b624cb03657084cc87bd40f115c07ecf376821c729ce + checksum: 10/0d52657d7ae36eb130999dffff1168ec348687b48dd38e2ff59992ed916c88d328cf1d07ff4a4a10bc78de5e1c23f04b306d569e42f7a2293915c081e4dfee86 languageName: node linkType: hard @@ -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.0" + openvsx-webui: "npm:0.13.0-next.465f6bcd" 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.0": - version: 0.13.0 - resolution: "openvsx-webui@npm:0.13.0" +"openvsx-webui@npm:0.13.0-next.465f6bcd": + version: 0.13.0-next.465f6bcd + resolution: "openvsx-webui@npm:0.13.0-next.465f6bcd" 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/b0245fd107f2b88d86cf7fea5a9ded80ad9084a13fdff16904614f5bdeb9f750b916feb976748eee9da0e230065b0d9fc06f789f74153f21005d16eef57c1f07 + checksum: 10/2ea2590d9a8080ab8b9f505743743d3904671c289c53ea4d31667ab2116f2a7e4766d0e8b28d12502b25bffd55248b256099f558ad2dad209208d2c401565085 languageName: node linkType: hard From 87afb4ddd0b260d76e6f18937119e2817820d4a3 Mon Sep 17 00:00:00 2001 From: amvanbaren Date: Wed, 20 Nov 2024 12:51:17 +0200 Subject: [PATCH 06/21] Release 0.20.0 --- Dockerfile | 4 ++-- website/package.json | 2 +- website/yarn.lock | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 32a1f622..1f456b85 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG SERVER_VERSION=465f6bc +ARG SERVER_VERSION=v0.20.0 # 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.0-next.465f6bcd +ENV WEBSITE_VERSION 0.13.1 COPY . /workdir RUN /usr/bin/yarn --cwd website \ diff --git a/website/package.json b/website/package.json index a43376e9..1e9778d3 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.0-next.465f6bcd" + "openvsx-webui": "0.13.1" }, "peerDependencies": { "@babel/core": "^7.0.0" diff --git a/website/yarn.lock b/website/yarn.lock index 0b1d20a5..2520fc2d 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.0-next.465f6bcd" + openvsx-webui: "npm:0.13.1" 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.0-next.465f6bcd": - version: 0.13.0-next.465f6bcd - resolution: "openvsx-webui@npm:0.13.0-next.465f6bcd" +"openvsx-webui@npm:0.13.1": + version: 0.13.1 + resolution: "openvsx-webui@npm:0.13.1" 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/2ea2590d9a8080ab8b9f505743743d3904671c289c53ea4d31667ab2116f2a7e4766d0e8b28d12502b25bffd55248b256099f558ad2dad209208d2c401565085 + checksum: 10/31b8624e2cf8a93a2c756e5cf3a2e7ecbac097bdc1c0033ca9e7f9c4938e2aaed40b07c3e016a61550aab9156d781de4ce79826fd880d35778ba4b333960f406 languageName: node linkType: hard From 54bb8383a12b434bc47ecd48a0814dc273f404af Mon Sep 17 00:00:00 2001 From: amvanbaren Date: Wed, 20 Nov 2024 13:23:45 +0200 Subject: [PATCH 07/21] Increase files caching --- configuration/ehcache.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configuration/ehcache.xml b/configuration/ehcache.xml index 0318d507..dcf54a0a 100644 --- a/configuration/ehcache.xml +++ b/configuration/ehcache.xml @@ -82,7 +82,7 @@ - 5 + 1 @@ -100,7 +100,7 @@ - 5 + 1 From 6fc0a8134bdcf6da82d6dd8fd14cc37ca20cc123 Mon Sep 17 00:00:00 2001 From: John Kellerman Date: Tue, 26 Nov 2024 13:13:11 -0500 Subject: [PATCH 08/21] Update menu-content.tsx Fix documentation link in default menu to point to correct wiki --- website/src/menu-content.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/src/menu-content.tsx b/website/src/menu-content.tsx index 1f27f122..e0ea9fc0 100644 --- a/website/src/menu-content.tsx +++ b/website/src/menu-content.tsx @@ -182,7 +182,7 @@ export const DefaultMenuContent: FunctionComponent = () => { const closeWorkingGroupMenu = () => setWorkingGroupMenuOpen(false); return <> - + Documentation From e968ab46a9574bc6d2178485b1b8366d60287945 Mon Sep 17 00:00:00 2001 From: amvanbaren Date: Fri, 29 Nov 2024 14:40:07 +0200 Subject: [PATCH 09/21] Test webui menu --- Dockerfile | 2 +- website/package.json | 2 +- website/src/menu-content.tsx | 57 +++++++++++++++++++++++++++--------- website/yarn.lock | 10 +++---- 4 files changed, 50 insertions(+), 21 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1f456b85..646b3920 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 +ENV WEBSITE_VERSION 0.13.1-next.f600763d COPY . /workdir RUN /usr/bin/yarn --cwd website \ diff --git a/website/package.json b/website/package.json index 1e9778d3..9faeb295 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" + "openvsx-webui": "0.13.1-next.f600763d" }, "peerDependencies": { "@babel/core": "^7.0.0" diff --git a/website/src/menu-content.tsx b/website/src/menu-content.tsx index e0ea9fc0..7991e20c 100644 --- a/website/src/menu-content.tsx +++ b/website/src/menu-content.tsx @@ -8,8 +8,8 @@ * SPDX-License-Identifier: EPL-2.0 ********************************************************************************/ -import React, { FunctionComponent, PropsWithChildren, useState, useRef } from 'react'; -import { Theme, Typography, Menu, MenuItem, Link, Button, Accordion, AccordionDetails, AccordionSummary } from '@mui/material'; +import React, { FunctionComponent, PropsWithChildren, 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'; import ExpandMoreIcon from '@mui/icons-material/ExpandMore'; @@ -22,7 +22,11 @@ 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 { MobileUserAvatar } from 'openvsx-webui/lib/default/menu-content' +import { UserAvatar } from 'openvsx-webui/lib/pages/user/avatar'; //-------------------- Mobile View --------------------// @@ -48,7 +52,32 @@ const MobileMenuItemText: FunctionComponent = ({ children }) }; export const MobileMenuContent: FunctionComponent = () => { + const {service, user} = useContext(MainContext) return <> + + { + user + ? + : + + + Log In + + + } + + { + !location.pathname.startsWith(UserSettingsRoutes.ROOT) + ? + + + + Publish Extension + + + + : null + } @@ -119,18 +148,6 @@ export const MobileMenuContent: FunctionComponent = () => { - { - !location.pathname.startsWith(UserSettingsRoutes.ROOT) - ? - - - - Publish Extension - - - - : null - } ; } @@ -176,6 +193,7 @@ const SubMenuLink = styled(Link)(subMenuLink); export const DefaultMenuContent: FunctionComponent = () => { + const {service, user} = useContext(MainContext) const [workingGroupMenuOpen, setWorkingGroupMenuOpen] = useState(false); const workingGroupMenuEl = useRef(null); const toggleWorkingGroupMenu = () => setWorkingGroupMenuOpen(!workingGroupMenuOpen); @@ -210,5 +228,16 @@ export const DefaultMenuContent: FunctionComponent = () => { + { + user ? + + : + + + + } ; } diff --git a/website/yarn.lock b/website/yarn.lock index 2520fc2d..c3a1652c 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" + openvsx-webui: "npm:0.13.1-next.f600763d" 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": - version: 0.13.1 - resolution: "openvsx-webui@npm:0.13.1" +"openvsx-webui@npm:0.13.1-next.f600763d": + version: 0.13.1-next.f600763d + resolution: "openvsx-webui@npm:0.13.1-next.f600763d" 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/31b8624e2cf8a93a2c756e5cf3a2e7ecbac097bdc1c0033ca9e7f9c4938e2aaed40b07c3e016a61550aab9156d781de4ce79826fd880d35778ba4b333960f406 + checksum: 10/285872702f78f37929a48917f469b1b1591c03923f0bc40a7dd0ede196403c981d21263ae7b64a67030c8241426dbbd33f77ca6da9dfeff1ef725d0451e1525b languageName: node linkType: hard From 4df05746c0986c7a440d4eea1a1e2929d25ec9fd Mon Sep 17 00:00:00 2001 From: amvanbaren Date: Fri, 29 Nov 2024 15:26:45 +0200 Subject: [PATCH 10/21] Test mobile user menu --- Dockerfile | 2 +- website/package.json | 2 +- website/src/menu-content.tsx | 18 +++++++++--------- website/yarn.lock | 10 +++++----- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Dockerfile b/Dockerfile index 646b3920..95c7efe9 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.f600763d +ENV WEBSITE_VERSION 0.13.1-next.b220b868 COPY . /workdir RUN /usr/bin/yarn --cwd website \ diff --git a/website/package.json b/website/package.json index 9faeb295..100b2cde 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.f600763d" + "openvsx-webui": "0.13.1-next.b220b868" }, "peerDependencies": { "@babel/core": "^7.0.0" diff --git a/website/src/menu-content.tsx b/website/src/menu-content.tsx index 7991e20c..a164e624 100644 --- a/website/src/menu-content.tsx +++ b/website/src/menu-content.tsx @@ -45,7 +45,7 @@ const itemIcon = { const MobileMenuItemText: FunctionComponent = ({ children }) => { return ( - + {children} ); @@ -54,18 +54,18 @@ const MobileMenuItemText: FunctionComponent = ({ children }) export const MobileMenuContent: FunctionComponent = () => { const {service, user} = useContext(MainContext) return <> - - { - user - ? - : + { + user + ? + : + Log In - - } - + + + } { !location.pathname.startsWith(UserSettingsRoutes.ROOT) ? diff --git a/website/yarn.lock b/website/yarn.lock index c3a1652c..9efd8c9b 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.f600763d" + openvsx-webui: "npm:0.13.1-next.b220b868" 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.f600763d": - version: 0.13.1-next.f600763d - resolution: "openvsx-webui@npm:0.13.1-next.f600763d" +"openvsx-webui@npm:0.13.1-next.b220b868": + version: 0.13.1-next.b220b868 + resolution: "openvsx-webui@npm:0.13.1-next.b220b868" 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/285872702f78f37929a48917f469b1b1591c03923f0bc40a7dd0ede196403c981d21263ae7b64a67030c8241426dbbd33f77ca6da9dfeff1ef725d0451e1525b + checksum: 10/1800fc864702efae62bfd2682600d511f0fe4ccd0443acf5899a8c4e17f2b7b053a6c0a95ed5532e9c3c411d03258ffd5f78adc9106a1ca92b5a25ba92581390 languageName: node linkType: hard From 01045a538c9ef86b560ec7cdcfc0bb9e19e6c59c Mon Sep 17 00:00:00 2001 From: amvanbaren Date: Fri, 29 Nov 2024 16:02:49 +0200 Subject: [PATCH 11/21] 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 From c26c13a0182a861f834e6cc21fb55f2358147ce8 Mon Sep 17 00:00:00 2001 From: John Kellerman Date: Tue, 10 Dec 2024 13:30:06 -0500 Subject: [PATCH 12/21] Update application.yml Adjusting ranking parameters --- configuration/application.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configuration/application.yml b/configuration/application.yml index 574f6054..854a7d23 100644 --- a/configuration/application.yml +++ b/configuration/application.yml @@ -176,9 +176,9 @@ ovsx: ssl: true search: relevance: - rating: 0.2 - downloads: 1.0 - timestamp: 3.0 + rating: 0.5 + downloads: 2.0 + timestamp: 1.2 migrations: delay: seconds: 300 @@ -187,4 +187,4 @@ ovsx: integrity: key-pair: create registry: - version: \ No newline at end of file + version: From dab90e35a727f0f3927e4e2e2673e8be9cf4f9d0 Mon Sep 17 00:00:00 2001 From: amvanbaren Date: Mon, 13 Jan 2025 13:41:29 +0200 Subject: [PATCH 13/21] Test release v0.21.0 --- Dockerfile | 7 ++++--- website/package.json | 2 +- website/yarn.lock | 10 +++++----- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index 25c38e28..8e5908e7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG SERVER_VERSION=v0.20.0 +ARG SERVER_VERSION=v0.21.0-rc.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.dee19c0f +ENV WEBSITE_VERSION 0.13.1-next.f0cc5cdd COPY . /workdir RUN /usr/bin/yarn --cwd website \ @@ -27,7 +27,8 @@ RUN /usr/bin/yarn --cwd website \ && /usr/bin/yarn --cwd website build # Main image derived from openvsx-server -FROM ghcr.io/eclipse/openvsx-server:${SERVER_VERSION} +# FROM ghcr.io/eclipse/openvsx-server:${SERVER_VERSION} +FROM docker.io/amvanbaren/openvsx-server:${SERVER_VERSION} ARG SERVER_VERSION COPY --from=builder --chown=openvsx:openvsx /workdir/website/static/ BOOT-INF/classes/static/ diff --git a/website/package.json b/website/package.json index faebd54c..b13c8b69 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.dee19c0f" + "openvsx-webui": "0.13.1-next.f0cc5cdd" }, "peerDependencies": { "@babel/core": "^7.0.0" diff --git a/website/yarn.lock b/website/yarn.lock index b27eca40..5480f750 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.dee19c0f" + openvsx-webui: "npm:0.13.1-next.f0cc5cdd" 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.dee19c0f": - version: 0.13.1-next.dee19c0f - resolution: "openvsx-webui@npm:0.13.1-next.dee19c0f" +"openvsx-webui@npm:0.13.1-next.f0cc5cdd": + version: 0.13.1-next.f0cc5cdd + resolution: "openvsx-webui@npm:0.13.1-next.f0cc5cdd" 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/9875a6154d8d23e6aa8251af83fe0f48a080c8aeff661876a1472c6489e2b5723a33a59db8161341629017681b4a1baf0b0b44f4f808c1dfb28baa591c11cae5 + checksum: 10/e35b54a7fb99ef7e1ac66b981ae37b81f3d3298d3a5ca015806a20476e3ad6c9cf81210216de33c2087c90280d2cd38198d4cd78a75ca14fa4e13508a2f00ea7 languageName: node linkType: hard From 55da2de3b81ba448adbbd396e07de4b5c1e3635b Mon Sep 17 00:00:00 2001 From: amvanbaren Date: Mon, 13 Jan 2025 14:44:18 +0200 Subject: [PATCH 14/21] Test release v0.21.0 --- Dockerfile | 2 +- website/package.json | 2 +- website/yarn.lock | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8e5908e7..7cc28372 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.f0cc5cdd +ENV WEBSITE_VERSION 0.13.1-next.4864a03d COPY . /workdir RUN /usr/bin/yarn --cwd website \ diff --git a/website/package.json b/website/package.json index b13c8b69..f5d62335 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.f0cc5cdd" + "openvsx-webui": "0.13.1-next.4864a03d" }, "peerDependencies": { "@babel/core": "^7.0.0" diff --git a/website/yarn.lock b/website/yarn.lock index 5480f750..f16d9f14 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.f0cc5cdd" + openvsx-webui: "npm:0.13.1-next.4864a03d" 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.f0cc5cdd": - version: 0.13.1-next.f0cc5cdd - resolution: "openvsx-webui@npm:0.13.1-next.f0cc5cdd" +"openvsx-webui@npm:0.13.1-next.4864a03d": + version: 0.13.1-next.4864a03d + resolution: "openvsx-webui@npm:0.13.1-next.4864a03d" 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/e35b54a7fb99ef7e1ac66b981ae37b81f3d3298d3a5ca015806a20476e3ad6c9cf81210216de33c2087c90280d2cd38198d4cd78a75ca14fa4e13508a2f00ea7 + checksum: 10/4cd4cf9bcc0ddaea08bef8c56c087d5a954e23899f9fb5804c003c720873277a598a3ef4f9278349b20bb1f812ac7b479a1fa73cce5668a703f42e9acd4b7f46 languageName: node linkType: hard From 0e969c086e931375e56b174ee4ca74d0f925e20e Mon Sep 17 00:00:00 2001 From: amvanbaren Date: Tue, 14 Jan 2025 11:54:15 +0200 Subject: [PATCH 15/21] Disable Grafana for caching test --- configuration/application.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/configuration/application.yml b/configuration/application.yml index 854a7d23..a3b4619a 100644 --- a/configuration/application.yml +++ b/configuration/application.yml @@ -25,6 +25,9 @@ server: spring: application: name: openvsx-server + autoconfigure: + # don't send traces to Zipkin + exclude: org.springframework.boot.actuate.autoconfigure.tracing.zipkin.ZipkinAutoConfiguration config: import: file:${DEPLOYMENT_CONFIG} cache: @@ -81,7 +84,7 @@ management: exposure: include: - health - - prometheus + # - prometheus tracing: sampling: probability: 0.1 From a49d79afaecfb169084d6a6e3768e501c211a215 Mon Sep 17 00:00:00 2001 From: amvanbaren Date: Wed, 15 Jan 2025 13:24:59 +0200 Subject: [PATCH 16/21] caching test baseline --- Dockerfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7cc28372..f41153cb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG SERVER_VERSION=v0.21.0-rc.1 +ARG SERVER_VERSION=v0.19.0 # Builder image to compile the website FROM ubuntu AS builder @@ -27,8 +27,7 @@ RUN /usr/bin/yarn --cwd website \ && /usr/bin/yarn --cwd website build # Main image derived from openvsx-server -# FROM ghcr.io/eclipse/openvsx-server:${SERVER_VERSION} -FROM docker.io/amvanbaren/openvsx-server:${SERVER_VERSION} +FROM ghcr.io/eclipse/openvsx-server:${SERVER_VERSION} ARG SERVER_VERSION COPY --from=builder --chown=openvsx:openvsx /workdir/website/static/ BOOT-INF/classes/static/ From 0bea92a695aa06ec6db16d5f59000517eb6aabd0 Mon Sep 17 00:00:00 2001 From: amvanbaren Date: Wed, 15 Jan 2025 13:48:30 +0200 Subject: [PATCH 17/21] Change ehcache.xml --- configuration/ehcache.xml | 36 ------------------------------------ 1 file changed, 36 deletions(-) diff --git a/configuration/ehcache.xml b/configuration/ehcache.xml index dcf54a0a..c0752420 100644 --- a/configuration/ehcache.xml +++ b/configuration/ehcache.xml @@ -80,40 +80,4 @@ 8 - - - 1 - - - - org.eclipse.openvsx.cache.ExpiredFileListener - ASYNCHRONOUS - UNORDERED - EXPIRED - EVICTED - REMOVED - - - - 150 - - - - - 1 - - - - org.eclipse.openvsx.cache.ExpiredFileListener - ASYNCHRONOUS - UNORDERED - EXPIRED - EVICTED - REMOVED - - - - 20 - - \ No newline at end of file From 27a61f4442faa26c05445f54057c9ecfe4b8b3a8 Mon Sep 17 00:00:00 2001 From: JK Date: Mon, 20 Jan 2025 12:45:12 -0500 Subject: [PATCH 18/21] updating about page --- website/src/about.tsx | 48 ++++++++++++------------------------------- 1 file changed, 13 insertions(+), 35 deletions(-) diff --git a/website/src/about.tsx b/website/src/about.tsx index 1177f0f3..6b7b0f0c 100644 --- a/website/src/about.tsx +++ b/website/src/about.tsx @@ -37,45 +37,23 @@ const About = () => { more information. - This service is operated by the Eclipse Foundation. + This service is operated by the Eclipse Foundation + under the responsibility of the Open VSX Working Group. The Open VSX Working Group ensures the continued sustainability, + integrity, evolution and adoption of the Open VSX Registry. It provides governance, guidance, and funding for the + communities that support its implementation, deployment and maintenance. If you're interested in joining the working group, + please let us know. - The source code of Open VSX is managed by - the Eclipse Open VSX project - and is licensed under - the Eclipse Public License v2.0. - The code is split in two repositories: + For information on using the registry, publishing extensions, its API, implementation + and deployment details, see our wiki. + + + Communication + + We use Slack for instant messaging and general communication, + use this link to join our Slack workspace. - -
  • - eclipse/openvsx – - main code with server, web UI and CLI. These components can be reused to deploy other registry instances - (both public and private). -
    • -
  • - EclipseFdn/open-vsx.org – - additional code for this website. -
    • -     - Resources - - - - The publishing process is described in the openvsx Wiki. - - - - - The FAQ section explains what you can and cannot do as a user of our service. - - - - - Get involved in the community. - - - ; } From 48b394bd1481fc42fd21878d84a3b4aa95978c85 Mon Sep 17 00:00:00 2001 From: JK Date: Mon, 20 Jan 2025 15:55:13 -0500 Subject: [PATCH 19/21] update about page - removing yarn compile errors --- README.md | 1 + website/src/about.tsx | 11 ++--------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 969bf36d..64fd6d06 100644 --- a/README.md +++ b/README.md @@ -20,6 +20,7 @@ If you want to refute a previously granted ownership, please comment on the corr Install dependencies, build assets and start a dev server: ```bash +cd website yarn --cwd website yarn --cwd website build yarn --cwd website start:dev diff --git a/website/src/about.tsx b/website/src/about.tsx index 6b7b0f0c..09cbe513 100644 --- a/website/src/about.tsx +++ b/website/src/about.tsx @@ -9,7 +9,7 @@ ********************************************************************************/ import * as React from 'react'; -import { Link, Typography, Container, List, ListItem, ListItemText } from '@mui/material'; +import { Link, Typography, Container } from '@mui/material'; import { styled, Theme } from '@mui/material/styles'; const Heading = styled(Typography)(({ theme }: { theme: Theme }) => ({ @@ -20,13 +20,6 @@ const Paragraph = styled(Typography)(({ theme }: { theme: Theme }) => ({ marginTop: theme.spacing(2) })); -const RepositoryList = styled('ul')(({ theme }: { theme: Theme }) => ({ - fontSize: theme.typography.body1.fontSize, - fontFamily: theme.typography.body1.fontFamily, - fontWeight: theme.typography.body1.fontWeight, - lineHeight: theme.typography.body1.lineHeight -})); - const About = () => { return About This Service @@ -37,7 +30,7 @@ const About = () => { more information. - This service is operated by the Eclipse Foundation + This service is operated by the Eclipse Foundation under the responsibility of the Open VSX Working Group. The Open VSX Working Group ensures the continued sustainability, integrity, evolution and adoption of the Open VSX Registry. It provides governance, guidance, and funding for the communities that support its implementation, deployment and maintenance. If you're interested in joining the working group, From d3cff1fcbdfcb953743f04ac0a98ee639d14872c Mon Sep 17 00:00:00 2001 From: amvanbaren Date: Mon, 20 Jan 2025 22:26:05 +0200 Subject: [PATCH 20/21] Update get started documentation --- README.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 64fd6d06..c82e0a07 100644 --- a/README.md +++ b/README.md @@ -17,12 +17,15 @@ If you want to refute a previously granted ownership, please comment on the corr ## Getting started -Install dependencies, build assets and start a dev server: +Enable Yarn, install dependencies, build assets and start a dev server: ```bash -cd website +corepack enable +corepack prepare yarn@stable --activate yarn --cwd website +yarn --cwd website compile yarn --cwd website build +yarn --cwd website build:dev yarn --cwd website start:dev ``` From 853bb3fdd1845fcad15b02b797ba45f093af57fc Mon Sep 17 00:00:00 2001 From: amvanbaren Date: Wed, 22 Jan 2025 14:22:45 +0200 Subject: [PATCH 21/21] Release v0.19.1 --- Dockerfile | 4 +- website/package.json | 2 +- website/src/menu-content.tsx | 96 +++++++++++++++++++----------------- website/yarn.lock | 10 ++-- 4 files changed, 60 insertions(+), 52 deletions(-) diff --git a/Dockerfile b/Dockerfile index f41153cb..9d27635b 100644 --- a/Dockerfile +++ b/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 \ diff --git a/website/package.json b/website/package.json index f5d62335..f6260118 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.4864a03d" + "openvsx-webui": "0.13.0" }, "peerDependencies": { "@babel/core": "^7.0.0" diff --git a/website/src/menu-content.tsx b/website/src/menu-content.tsx index d9fadb18..1f27f122 100644 --- a/website/src/menu-content.tsx +++ b/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 = ({ children }) => { + return ( + + {children} + + ); +}; + export const MobileMenuContent: FunctionComponent = () => { - const {service, user} = useContext(MainContext) return <> - { - user - ? - : - - - - Log In - - - - } - { - !location.pathname.startsWith(UserSettingsRoutes.ROOT) - ? - - - - Publish Extension - - - - : null - } @@ -127,17 +119,45 @@ export const MobileMenuContent: FunctionComponent = () => { + { + !location.pathname.startsWith(UserSettingsRoutes.ROOT) + ? + + + + Publish Extension + + + + : 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(null); const toggleWorkingGroupMenu = () => setWorkingGroupMenuOpen(!workingGroupMenuOpen); const closeWorkingGroupMenu = () => setWorkingGroupMenuOpen(false); return <> - + Documentation @@ -191,16 +210,5 @@ export const DefaultMenuContent: FunctionComponent = () => { - { - user ? - - : - - - - } ; } diff --git a/website/yarn.lock b/website/yarn.lock index f16d9f14..6f936d91 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.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