Skip to content

Commit d8f2167

Browse files
authored
Merge pull request #3842 from amvanbaren/website-improvements
website improvements
2 parents 71b701b + 4050016 commit d8f2167

File tree

4 files changed

+7
-11
lines changed

4 files changed

+7
-11
lines changed

website/dev/main-dev.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ const App: FunctionComponent = () => {
2929
try {
3030
const result = await service.getRegistryVersion(abortController);
3131
return result.version;
32-
} catch (error) {
32+
} catch {
3333
console.error('Could not determine server version');
3434
return 'unknown';
3535
}

website/src/components/members-list.tsx

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ interface MemberItemProps {
8181
memberId?: number;
8282
name: string;
8383
logo?: string | null;
84-
url?: string;
8584
}
8685

8786
const bordered = (theme: Theme) => {
@@ -120,7 +119,7 @@ const GridContainer = styled(Grid)({
120119
textAlign: 'center',
121120
});
122121

123-
const MemberItem: FunctionComponent<MemberItemProps> = ({ name, logo, url, memberId }) => {
122+
const MemberItem: FunctionComponent<MemberItemProps> = ({ name, logo, memberId }) => {
124123
const styles = {
125124
heading: {
126125
width: '100%',
@@ -139,9 +138,7 @@ const MemberItem: FunctionComponent<MemberItemProps> = ({ name, logo, url, membe
139138
},
140139
};
141140

142-
// Use url prop if provided, otherwise use their eclipse.org page url.
143-
const websiteUrl = url || `https://www.eclipse.org/membership/showMember.php?member_id=${memberId}`;
144-
141+
const websiteUrl = `https://www.eclipse.org/membership/showMember.php?member_id=${memberId}`;
145142
return (
146143
<GridContainer item xs={12} md={4}>
147144
<HeaderBox p={2}>

website/src/main.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ const App: FunctionComponent = () => {
2929
try {
3030
const result = await service.getRegistryVersion(abortController);
3131
return result.version;
32-
} catch (error) {
32+
} catch {
3333
console.error('Could not determine server version');
3434
return 'unknown';
3535
}

website/src/page-settings.tsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import Adopters from './adopters';
2424
import Members from './members';
2525

2626
//---------- HEAD TAGS
27-
const HeadTags: FunctionComponent<{ title?: string, description?: string, keywords?: string, url?: string, imageUrl?: string, type?: string }> = (props) => {
27+
const HeadTags: FunctionComponent<{ title?: string, description?: string, keywords?: string, url?: string, imageUrl?: string }> = (props) => {
2828
const handleChangeClientState = (newState: any, addedTags: HelmetTags, removedTags: HelmetTags): void => {
2929
if (addedTags.metaTags) {
3030
addedTags.metaTags.forEach((value: HTMLMetaElement) => {
@@ -36,15 +36,14 @@ const HeadTags: FunctionComponent<{ title?: string, description?: string, keywor
3636
};
3737

3838
const twitterCard = props.imageUrl ? 'summary_large_image' : 'summary';
39-
const type = props.type || 'website';
4039
return <Helmet onChangeClientState={handleChangeClientState}>
4140
<title>{props.title}</title>
4241

4342
{/* SEO Meta Tags */}
4443
<meta name='description' content={props.description} />
4544
<meta name='keywords' content={props.keywords} />
4645
<meta property='og:url' content={props.url} />
47-
<meta property='og:type' content={type} />
46+
<meta property='og:type' content='website' />
4847
<meta property='og:title' content={props.title} />
4948
<meta property='og:description' content={props.description} />
5049
<meta property='og:image' content={props.imageUrl} />
@@ -79,7 +78,7 @@ const ExtensionHeadTags: FunctionComponent<{ extension?: Extension, pageSettings
7978
let description: string | undefined;
8079
let keywords: string | undefined;
8180
if (props.extension) {
82-
title = (props.extension.displayName || props.extension.name) + title;
81+
title = (props.extension.displayName ?? props.extension.name) + title;
8382
url += `${props.extension.namespace}/${props.extension.name}`;
8483
description = props.extension.description;
8584
// extension description can be up to 2048 characters, truncate it.

0 commit comments

Comments
 (0)