Skip to content

Commit 23d9fae

Browse files
amvanbarenamvanbaren
authored
Merge pull request #3063 from EclipseFdn/main
Release v0.18.0
2 parents 6d7bddd + fdca676 commit 23d9fae

File tree

9 files changed

+208
-201
lines changed

9 files changed

+208
-201
lines changed

‎Dockerfile

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,25 @@
1-
ARG SERVER_VERSION=v0.17.0
1+
ARG SERVER_VERSION=v0.18.0
22

33
# Builder image to compile the website
4-
FROM ubuntu as builder
4+
FROM ubuntu AS builder
55

66
WORKDIR /workdir
77

8+
# See https://github.com/nodesource/distributions for Node.js package
89
RUN apt-get update \
910
&& apt-get install --no-install-recommends -y \
1011
bash \
1112
ca-certificates \
1213
curl \
14+
&& rm -rf /var/lib/apt/lists/* \
15+
&& curl -sSL https://deb.nodesource.com/setup_20.x | bash - \
16+
&& apt-get install -y nodejs \
1317
&& apt-get clean \
14-
&& rm -rf /var/lib/apt/lists/*
15-
16-
# See https://github.com/nodesource/distributions/blob/main/README.md#debinstall
17-
RUN curl -sSL https://deb.nodesource.com/setup_20.x | bash - \
18-
&& apt-get install -y nodejs
19-
20-
RUN corepack enable
21-
RUN corepack prepare yarn@stable --activate
18+
&& corepack enable \
19+
&& corepack prepare yarn@stable --activate
2220

2321
# bump to update website
24-
ENV WEBSITE_VERSION 0.12.0
22+
ENV WEBSITE_VERSION 0.13.0
2523
COPY . /workdir
2624

2725
RUN /usr/bin/yarn --cwd website \

‎website/dev/mock-service.ts

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@ const avatarUrl = 'https://upload.wikimedia.org/wikipedia/commons/9/99/Avatar_cu
1919
export class MockRegistryService extends ExtensionRegistryService {
2020

2121
constructor() {
22-
// FIXME cannot reference `this` in super constructor call
23-
super('', new MockAdminService(undefined!));
24-
(this.admin.registry as any) = this;
22+
super('', MockAdminService);
2523
}
2624

2725
search(abortController: AbortController, filter?: ExtensionFilter): Promise<Readonly<SearchResult | ErrorResult>> {
@@ -152,7 +150,9 @@ export class MockRegistryService extends ExtensionRegistryService {
152150
}
153151
}
154152

155-
export class MockAdminService extends AdminService {
153+
export class MockAdminService implements AdminService {
154+
155+
constructor(readonly registry: ExtensionRegistryService) {}
156156

157157
getExtension(abortController: AbortController, namespace: string, extension: string): Promise<Readonly<Extension>> {
158158
return this.registry.getExtensionDetail(abortController, '') as Promise<Extension>;
@@ -187,4 +187,8 @@ export class MockAdminService extends AdminService {
187187
async revokePublisherContributions(abortController: AbortController, provider: string, login: string): Promise<Readonly<SuccessResult | ErrorResult>> {
188188
return Promise.resolve({ success: 'ok' });
189189
}
190+
191+
changeNamespace(abortController: AbortController, req: {oldNamespace: string, newNamespace: string, removeOldNamespace: boolean, mergeIfNewNamespaceAlreadyExists: boolean}): Promise<Readonly<SuccessResult | ErrorResult>> {
192+
return Promise.resolve({ success: 'ok' });
193+
}
190194
}

‎website/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"repository": "https://github.com/eclipse/open-vsx.org",
77
"license": "EPL-2.0",
88
"dependencies": {
9-
"openvsx-webui": "0.12.0"
9+
"openvsx-webui": "0.13.0"
1010
},
1111
"peerDependencies": {
1212
"@babel/core": "^7.0.0"

‎website/src/footer-content.tsx

Lines changed: 49 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -43,56 +43,59 @@ const LegalLink = styled(RouteLink)(({ theme }: { theme: Theme }) => ({
4343
fontWeight: theme.typography.fontWeightLight
4444
}));
4545

46-
46+
interface MainFooterProps {
47+
isSmallDisplay: boolean
48+
isLargeDisplay: boolean
49+
}
50+
51+
const MainFooter = ({isSmallDisplay, isLargeDisplay}: MainFooterProps) => {
52+
const itemSpacing = 2.5;
53+
return <Box display='flex' justifyContent='space-between' alignItems='center'>
54+
{isSmallDisplay ? null : repositoryLink()}
55+
{
56+
isLargeDisplay ?
57+
<Box display='flex'>
58+
<Box>
59+
{privacyPolicy()}
60+
</Box>
61+
<Box ml={itemSpacing}>
62+
{termsOfUse()}
63+
</Box>
64+
<Box ml={itemSpacing}>
65+
{publisherAgreement()}
66+
</Box>
67+
<Box ml={itemSpacing}>
68+
{copyrightAgent()}
69+
</Box>
70+
<Box ml={itemSpacing}>
71+
{legalResources()}
72+
</Box>
73+
<Box ml={itemSpacing}>
74+
{manageCookies()}
75+
</Box>
76+
<Box ml={itemSpacing}>
77+
{copyrightText()}
78+
</Box>
79+
<Box ml={itemSpacing}>
80+
{rightsReservedText()}
81+
</Box>
82+
</Box>
83+
:
84+
<>
85+
{copyrightText()}
86+
<Box display='flex' alignItems='center'>
87+
<ExpandLessIcon /> Legal
88+
</Box>
89+
</>
90+
}
91+
</Box>;
92+
}
4793

4894
const FooterContent: FunctionComponent<{ expanded: boolean }> = ({ expanded }) => {
4995
const theme = useTheme();
5096
const isSmallDisplay = useMediaQuery(theme.breakpoints.down('sm'));
5197
const isLargeDisplay = useMediaQuery(theme.breakpoints.up('xl'));
5298

53-
const MainFooter = () => {
54-
const itemSpacing = 2.5;
55-
return <Box display='flex' justifyContent='space-between' alignItems='center'>
56-
{isSmallDisplay ? null : repositoryLink()}
57-
{
58-
isLargeDisplay ?
59-
<Box display='flex'>
60-
<Box>
61-
{privacyPolicy()}
62-
</Box>
63-
<Box ml={itemSpacing}>
64-
{termsOfUse()}
65-
</Box>
66-
<Box ml={itemSpacing}>
67-
{publisherAgreement()}
68-
</Box>
69-
<Box ml={itemSpacing}>
70-
{copyrightAgent()}
71-
</Box>
72-
<Box ml={itemSpacing}>
73-
{legalResources()}
74-
</Box>
75-
<Box ml={itemSpacing}>
76-
{manageCookies()}
77-
</Box>
78-
<Box ml={itemSpacing}>
79-
{copyrightText()}
80-
</Box>
81-
<Box ml={itemSpacing}>
82-
{rightsReservedText()}
83-
</Box>
84-
</Box>
85-
:
86-
<>
87-
{copyrightText()}
88-
<Box display='flex' alignItems='center'>
89-
<ExpandLessIcon /> Legal
90-
</Box>
91-
</>
92-
}
93-
</Box>;
94-
}
95-
9699
if (expanded && !isLargeDisplay) {
97100
const itemSpacing = 1;
98101
return <Box display='flex' flexDirection='column' alignItems='stretch'>
@@ -116,10 +119,10 @@ const FooterContent: FunctionComponent<{ expanded: boolean }> = ({ expanded }) =
116119
{manageCookies()}
117120
</Box>
118121
</Box>
119-
<MainFooter />
122+
<MainFooter isSmallDisplay={isSmallDisplay} isLargeDisplay={isLargeDisplay}/>
120123
</Box>;
121124
} else {
122-
return <MainFooter />;
125+
return <MainFooter isSmallDisplay={isSmallDisplay} isLargeDisplay={isLargeDisplay}/>;
123126
}
124127
};
125128

‎website/src/members.tsx

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,20 @@ const Members = () => {
3232
VSX Registry at open-vsx.org.
3333
</Typography>
3434

35-
<Box my={4} textAlign='center'>
35+
<Box display="flex" gap={1} my={4} justifyContent="center" textAlign="center" >
3636
<Button
3737
variant='contained'
3838
color='secondary'
39-
href='https://membership.eclipse.org/application'
39+
href='https://www.eclipse.org/membership/join-us/'
4040
>
41-
Become a Member
41+
Contact Us About Membership
42+
</Button>
43+
<Button
44+
variant='contained'
45+
color='secondary'
46+
href='https://membership.eclipse.org/application/ready-to-join'
47+
>
48+
My Organisation Is Ready to Join Now
4249
</Button>
4350
</Box>
4451

‎website/src/menu-content.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -176,10 +176,10 @@ const SubMenuLink = styled(Link)(subMenuLink);
176176

177177

178178
export const DefaultMenuContent: FunctionComponent = () => {
179-
const [workingGroupMenuOpen, setWorkingGroupOpen] = useState(false);
179+
const [workingGroupMenuOpen, setWorkingGroupMenuOpen] = useState(false);
180180
const workingGroupMenuEl = useRef<HTMLButtonElement | null>(null);
181-
const toggleWorkingGroupMenu = () => setWorkingGroupOpen(!workingGroupMenuOpen);
182-
const closeWorkingGroupMenu = () => setWorkingGroupOpen(false);
181+
const toggleWorkingGroupMenu = () => setWorkingGroupMenuOpen(!workingGroupMenuOpen);
182+
const closeWorkingGroupMenu = () => setWorkingGroupMenuOpen(false);
183183

184184
return <>
185185
<MenuLink href='https://github.com/eclipse/openvsx/wiki'>

0 commit comments

Comments
 (0)