Merge pull request #806 from amvanbaren/fix-gitpod-webui

Fix gitpod workspace
eclipse · Sep 5, 2023 · d7fba39 · d7fba39
2 parents 0caa5f4 + eafe80e
commit d7fba39
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/.gitpod.yml b/.gitpod.yml
@@ -31,9 +31,14 @@ ports:
 tasks:
 - init: |
     # Build all components
-    yarn --cwd cli
-    yarn --cwd webui
-    yarn --cwd webui build:default
+    cd cli
+    yarn install
+    yarn prepare
+    cd ../webui
+    yarn install
+    yarn build
+    yarn build:default
+    cd ..
     server/gradlew -p server assemble downloadTestExtensions
   name: Server
   command: |

diff --git a/webui/src/pages/user/avatar.tsx b/webui/src/pages/user/avatar.tsx
@@ -9,9 +9,8 @@
  ********************************************************************************/
 
 import React, { FunctionComponent, useContext, useEffect, useRef, useState } from 'react';
-import Button from '@mui/base/Button';
 import { styled } from '@mui/material/styles';
-import { Avatar, Menu, Typography, MenuItem, Link, Divider, IconButton } from '@mui/material';
+import { Avatar, Button, Menu, Typography, MenuItem, Link, Divider, IconButton } from '@mui/material';
 import { Link as RouteLink } from 'react-router-dom';
 import { isError, CsrfTokenJson } from '../../extension-registry-types';
 import { UserSettingsRoutes } from './user-settings';