From fd7c0cf027144a20118f2888060456614d3bc808 Mon Sep 17 00:00:00 2001 From: lankaukk Date: Thu, 12 Oct 2023 15:48:56 -0400 Subject: [PATCH 1/5] github pane --- .../navigator/left-pane/github-pane/index.tsx | 32 +++++++++---------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/editor/src/components/navigator/left-pane/github-pane/index.tsx b/editor/src/components/navigator/left-pane/github-pane/index.tsx index efd8e9211aeb..7e995c5b9f17 100644 --- a/editor/src/components/navigator/left-pane/github-pane/index.tsx +++ b/editor/src/components/navigator/left-pane/github-pane/index.tsx @@ -1120,24 +1120,22 @@ export const GithubPane = React.memo(() => {
- - Github + + + {githubUser != null ? ( + + ) : null} - {when( - githubUser != null, - , - )} {unless( isLoggedIn, From 2a7d1c26e5c86fe600dc521695e48b8e982de4bc Mon Sep 17 00:00:00 2001 From: lankaukk Date: Thu, 12 Oct 2023 15:52:08 -0400 Subject: [PATCH 2/5] project files pane --- editor/src/components/filebrowser/filebrowser.tsx | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/editor/src/components/filebrowser/filebrowser.tsx b/editor/src/components/filebrowser/filebrowser.tsx index 35247727e2b1..798c7ad1921d 100644 --- a/editor/src/components/filebrowser/filebrowser.tsx +++ b/editor/src/components/filebrowser/filebrowser.tsx @@ -213,12 +213,20 @@ export const FileBrowser = React.memo(() => { setAddingFile({ fileOrFolder: fileOrFolder, filename: '' }) }, []) + const projectName = useEditorState( + Substores.restOfEditor, + (store) => { + return store.editor.projectName + }, + 'TitleBar projectName', + ) + return ( <>
- Project + {projectName} Date: Thu, 12 Oct 2023 15:54:54 -0400 Subject: [PATCH 3/5] settings pane --- .../src/components/navigator/left-pane/settings-pane.tsx | 9 --------- 1 file changed, 9 deletions(-) diff --git a/editor/src/components/navigator/left-pane/settings-pane.tsx b/editor/src/components/navigator/left-pane/settings-pane.tsx index a645f29ddefb..c4c23c8ae8e2 100644 --- a/editor/src/components/navigator/left-pane/settings-pane.tsx +++ b/editor/src/components/navigator/left-pane/settings-pane.tsx @@ -221,16 +221,7 @@ export const SettingsPane = React.memo(() => { }} >
- -

Project

-
- {isMyProject === 'yes' ? null : } - Name {userState.loginState.type !== 'LOGGED_IN' ? ( From a23b525d0b8f39be171eb469ef273f7908edcf54 Mon Sep 17 00:00:00 2001 From: lankaukk Date: Thu, 12 Oct 2023 15:56:40 -0400 Subject: [PATCH 4/5] insert tab --- .../components/navigator/insert-menu-pane.tsx | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/editor/src/components/navigator/insert-menu-pane.tsx b/editor/src/components/navigator/insert-menu-pane.tsx index 6b831161a43a..bd21192b4efb 100644 --- a/editor/src/components/navigator/insert-menu-pane.tsx +++ b/editor/src/components/navigator/insert-menu-pane.tsx @@ -3,16 +3,7 @@ /** @jsxFrag React.Fragment */ import { jsx } from '@emotion/react' import React from 'react' -import { NO_OP } from '../../core/shared/utils' -import { - Button, - FlexRow, - Icons, - Section, - SectionBodyArea, - SectionTitleRow, - Title, -} from '../../uuiui' +import { Section, SectionBodyArea } from '../../uuiui' import { setFocus } from '../common/actions' import type { EditorDispatch, LoginState } from '../editor/action-types' import { InsertMenu } from '../editor/insertmenu' @@ -61,14 +52,6 @@ export const InsertMenuPane = React.memo(() => { tabIndex={-1} style={{ width: '100%', height: '100%' }} > - - - Insert - - - From 4c1905f90d2d4415bd770179fea95f1abc3e91d6 Mon Sep 17 00:00:00 2001 From: lankaukk Date: Thu, 12 Oct 2023 16:23:10 -0400 Subject: [PATCH 5/5] file browser icons and (root) --- editor/src/components/filebrowser/filebrowser.tsx | 4 ++-- editor/src/components/filebrowser/fileitem.tsx | 2 +- editor/src/uuiui/icons.tsx | 8 +++++++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/editor/src/components/filebrowser/filebrowser.tsx b/editor/src/components/filebrowser/filebrowser.tsx index 798c7ad1921d..f9b5d19a9286 100644 --- a/editor/src/components/filebrowser/filebrowser.tsx +++ b/editor/src/components/filebrowser/filebrowser.tsx @@ -226,7 +226,7 @@ export const FileBrowser = React.memo(() => {
- {projectName} + (root) - + diff --git a/editor/src/components/filebrowser/fileitem.tsx b/editor/src/components/filebrowser/fileitem.tsx index e68cd4c5f781..6ce4bc66bc3d 100644 --- a/editor/src/components/filebrowser/fileitem.tsx +++ b/editor/src/components/filebrowser/fileitem.tsx @@ -812,7 +812,7 @@ class FileBrowserItemInner extends React.PureComponent< ) : null} {displayAddFolder ? ( ) : null} {displayAddTextFile ? ( diff --git a/editor/src/uuiui/icons.tsx b/editor/src/uuiui/icons.tsx index 88a9a77dd726..ff66b3a14187 100644 --- a/editor/src/uuiui/icons.tsx +++ b/editor/src/uuiui/icons.tsx @@ -227,9 +227,15 @@ export const Icons = { color: 'main', category: 'layout/flex', }), - Downloaded: makeIcon({ type: 'downloaded', color: 'main', width: 18, height: 18 }), Gear: makeIcon({ type: 'gear', color: 'main' }), + GroupClosed: makeIcon({ + type: 'group-closed', + category: 'element', + color: 'main', + width: 18, + height: 18, + }), Threedots: makeIcon({ type: 'threedots', color: 'main' }), LinkClosed: makeIcon({ type: 'link-closed', color: 'main' }), LinkStrikethrough: makeIcon({ type: 'link-strikethrough', color: 'main' }),