Skip to content

Commit 62cb8b4

Browse files
committed
[dashboard] Don't load all images from one module
Fixes #3550 (comment)
1 parent 49474d5 commit 62cb8b4

File tree

7 files changed

+15
-39
lines changed

7 files changed

+15
-39
lines changed

components/dashboard/src/Login.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@
44
* See License-AGPL.txt in the project root for license information.
55
*/
66

7-
import { gitpod, gitpodIcon } from './images';
87
import { AuthProviderInfo } from "@gitpod/gitpod-protocol";
98
import { useContext, useEffect, useState } from "react";
109
import { UserContext } from "./user-context";
1110
import { getGitpodService, gitpodHostUrl, reconnectGitpodService } from "./service/service";
1211
import { iconForAuthProvider, simplifyProviderName } from "./provider-utils";
12+
import gitpod from './images/gitpod.svg';
13+
import gitpodIcon from './icons/gitpod.svg';
1314
import automate from "./images/welcome/automate.svg";
1415
import code from "./images/welcome/code.svg";
1516
import collaborate from "./images/welcome/collaborate.svg";

components/dashboard/src/components/Menu.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
import { User } from "@gitpod/gitpod-protocol";
88
import { useContext } from "react";
99
import { Link } from "react-router-dom";
10+
import gitpodIcon from '../icons/gitpod.svg';
1011
import { gitpodHostUrl } from "../service/service";
1112
import { UserContext } from "../user-context";
1213
import ContextMenu from "./ContextMenu";
13-
import * as images from '../images';
1414
import { useLocation } from "react-router";
1515
interface Entry {
1616
title: string, link: string, alternatives?: string[]
@@ -44,7 +44,7 @@ function Menu(props: { left: Entry[], right: Entry[] }) {
4444
<header className="lg:px-28 px-10 bg-white flex flex-wrap items-center py-4">
4545
<div className="flex justify-between items-center pr-3">
4646
<Link to="/">
47-
<img src={images.gitpodIcon} className="h-6" />
47+
<img src={gitpodIcon} className="h-6" />
4848
</Link>
4949
</div>
5050
<div className="flex flex-1 items-center w-auto w-full" id="menu">

components/dashboard/src/images.ts

Lines changed: 0 additions & 29 deletions
This file was deleted.

components/dashboard/src/provider-utils.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@
44
* See License-AGPL.txt in the project root for license information.
55
*/
66

7-
import {github, gitlab, bitbucket} from './images';
7+
import bitbucket from './images/bitbucket.svg';
8+
import github from './images/github.svg';
9+
import gitlab from './images/gitlab.svg';
810
import { gitpodHostUrl } from "./service/service";
911

1012

components/dashboard/src/settings/Integrations.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@
44
* See License-AGPL.txt in the project root for license information.
55
*/
66

7-
import { copy, exclamation } from '../images';
87
import { AuthProviderEntry, AuthProviderInfo } from "@gitpod/gitpod-protocol";
98
import React, { useContext, useEffect, useState } from "react";
109
import ContextMenu, { ContextMenuEntry } from "../components/ContextMenu";
1110
import { SettingsPage } from "./SettingsPage";
1211
import { getGitpodService, gitpodHostUrl } from "../service/service";
1312
import { UserContext } from "../user-context";
13+
import copy from '../images/copy.svg';
14+
import exclamation from '../images/exclamation.svg';
1415
import ThreeDots from '../icons/ThreeDots.svg';
1516
import Modal from "../components/Modal";
1617
import { openAuthorizeWindow } from "../provider-utils";

components/dashboard/src/settings/Preferences.tsx

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ import { getGitpodService } from "../service/service";
99
import SelectableCard from "../components/SelectableCard";
1010
import { UserContext } from "../user-context";
1111
import { SettingsPage } from "./SettingsPage";
12-
import * as images from '../images';
12+
import theia from '../images/theia-gray.svg';
13+
import vscode from '../images/vscode.svg';
1314

1415
export default function Preferences() {
1516
const { user } = useContext(UserContext);
@@ -34,12 +35,12 @@ export default function Preferences() {
3435
<div className="mt-4 space-x-4 flex">
3536
<SelectableCard className="w-36 h-40" title="VS Code" selected={defaultIde === 'code'} onClick={() => actuallySetDefaultIde('code')}>
3637
<div className="flex-grow flex justify-center align-center">
37-
<img className="w-16 filter-grayscale" src={images.vscode}/>
38+
<img className="w-16 filter-grayscale" src={vscode}/>
3839
</div>
3940
</SelectableCard>
4041
<SelectableCard className="w-36 h-40" title="Theia" selected={defaultIde === 'theia'} onClick={() => actuallySetDefaultIde('theia')}>
4142
<div className="flex-grow flex justify-center align-center">
42-
<img className="w-16" src={images.theia}/>
43+
<img className="w-16" src={theia}/>
4344
</div>
4445
</SelectableCard>
4546
</div>

components/dashboard/src/start/StartPage.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* See License-AGPL.txt in the project root for license information.
55
*/
66

7-
import * as images from '../images';
7+
import gitpodIcon from '../icons/gitpod.svg';
88

99
export enum StartPhase {
1010
Checking = 0,
@@ -73,7 +73,7 @@ export function StartPage(props: StartPageProps) {
7373
return <div className="w-screen h-screen bg-white align-middle">
7474
<div className="flex flex-col mx-auto items-center h-screen">
7575
<div className="h-1/3"></div>
76-
<img src={images.gitpodIcon} className={`h-16 flex-shrink-0 ${(error || phase === StartPhase.Stopped) ? '' : 'animate-bounce'}`} />
76+
<img src={gitpodIcon} className={`h-16 flex-shrink-0 ${(error || phase === StartPhase.Stopped) ? '' : 'animate-bounce'}`} />
7777
<h3 className="mt-8 text-xl">{title}</h3>
7878
{typeof(phase) === 'number' && phase < StartPhase.Stopping && <ProgressBar phase={phase} error={!!error} />}
7979
{props.children}

0 commit comments

Comments
 (0)