Skip to content

file tree style improvements #339

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
foundling merged 5 commits into from
Oct 25, 2023
Merged

file tree style improvements #339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3b962d2
fix filetree scrollbar
Oct 25, 2023
137c5ff
Merge branch 'STUDIO-93' of github.com:HarperDB/hdbms into STUDIO-93
Oct 25, 2023
98b5f07
move file tree bg color to outer container, not autosized tree contai…
Oct 25, 2023
a99b3f7
make file tree container background transparent
Oct 25, 2023
2bba6c3
Merge pull request #338 from HarperDB/STUDIO-93
foundling Oct 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 6 additions & 13 deletions src/assets/styles/components/_web-ide.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,9 @@
color: #c2c2c2 !important;
}

.file-browser-scroll-container {
}

.file-browser button {
color: lightgray;
}
Expand Down Expand Up @@ -239,10 +242,6 @@
// #5e5e5e;
}

.file-browser {
background: #f9f9f9;
}

.file.folder-selected {
background: rgba(200, 200, 200, 0.2) !important;
//background: lightgray !important;
Expand Down Expand Up @@ -359,21 +358,15 @@
}

.file-browser-scroll-container {
height: 100%;
overflow-y: auto;

}



// top-level element (left-side)
.file-browser-outer-container {
background: transparent;
height: 100%;
overflow-y: auto;
}

.file-browser-inner-container {
.file-browser-outer-container {

height: 100%;
padding: 20px;

.file-menu {
Expand Down
186 changes: 92 additions & 94 deletions src/components/shared/webide/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,116 +121,114 @@ function WebIDE({
return (
<Row className="web-ide">
<Col md="3" className="file-browser-outer-container">
<div className="file-browser-inner-container" >
<FileMenu>
<AddProjectButton
onAddProject={
() => {
updateActiveEditorWindow(EDITOR_WINDOWS.NAME_PROJECT_WINDOW, activeEditorWindow);
}
} />
<AddProjectFolderButton
disabled={ !canAddProjectFolder }
onAddProjectFolder={() => {
updateActiveEditorWindow(EDITOR_WINDOWS.NAME_PROJECT_FOLDER_WINDOW, activeEditorWindow);
}} />
<DeleteFolderButton
disabled={ !canDeleteFolder }
onClick={
() => {
if (selectedPackage) {
updateActiveEditorWindow(EDITOR_WINDOWS.DELETE_PACKAGE_WINDOW, activeEditorWindow);
} else if (selectedFolder) {
updateActiveEditorWindow(EDITOR_WINDOWS.DELETE_FOLDER_WINDOW, activeEditorWindow);
}
}
} />
<AddFileButton
onAddFile={() => {
updateActiveEditorWindow(EDITOR_WINDOWS.NAME_FILE_WINDOW, activeEditorWindow);
}}
disabled={ !canAddFile } />
<DeleteFileButton
disabled={ !selectedFile?.path }
onClick={
() => {
updateActiveEditorWindow(EDITOR_WINDOWS.DELETE_FILE_WINDOW, activeEditorWindow);
}
} />
<InstallPackageButton
onClick={
() => {
setSelectedPackage(null);
updateActiveEditorWindow(EDITOR_WINDOWS.INSTALL_PACKAGE_WINDOW, activeEditorWindow)
<FileMenu>
<AddProjectButton
onAddProject={
() => {
updateActiveEditorWindow(EDITOR_WINDOWS.NAME_PROJECT_WINDOW, activeEditorWindow);
}
} />
<AddProjectFolderButton
disabled={ !canAddProjectFolder }
onAddProjectFolder={() => {
updateActiveEditorWindow(EDITOR_WINDOWS.NAME_PROJECT_FOLDER_WINDOW, activeEditorWindow);
}} />
<DeleteFolderButton
disabled={ !canDeleteFolder }
onClick={
() => {
if (selectedPackage) {
updateActiveEditorWindow(EDITOR_WINDOWS.DELETE_PACKAGE_WINDOW, activeEditorWindow);
} else if (selectedFolder) {
updateActiveEditorWindow(EDITOR_WINDOWS.DELETE_FOLDER_WINDOW, activeEditorWindow);
}
}
/>
</FileMenu>
<FileBrowser
files={ fileTree }
root={ fileTree.path }
selectedFile={ selectedFile?.path }
selectedFolder={ selectedFolder }
selectedPackage={ selectedPackage }
onFolderRename={() => {
// updateActiveEditorWindow(EDITOR_WINDOWS.RENAME_FOLDER_WINDOW, activeEditorWindow);
}}
onFileRename={() => {
// updateActiveEditorWindow(EDITOR_WINDOWS.RENAME_FILE_WINDOW, activeEditorWindow);
} />
<AddFileButton
onAddFile={() => {
updateActiveEditorWindow(EDITOR_WINDOWS.NAME_FILE_WINDOW, activeEditorWindow);
}}
onDeployProject={
(e) => {
onDeployProject(e);
// TODO: open deploy package window
disabled={ !canAddFile } />
<DeleteFileButton
disabled={ !selectedFile?.path }
onClick={
() => {
updateActiveEditorWindow(EDITOR_WINDOWS.DELETE_FILE_WINDOW, activeEditorWindow);
}
}
onFolderSelect={
(folder) => {
// shouldnt deselect anything
setSelectedFolder(folder);
} />
<InstallPackageButton
onClick={
() => {
setSelectedPackage(null);
updateActiveEditorWindow(EDITOR_WINDOWS.INSTALL_PACKAGE_WINDOW, activeEditorWindow)
}
}
onPackageSelect={
(pkg) => {
// set selected package,
// unset selectedFile
// TODO: make sure 'remote fetch package' window has correct data.

setSelectedPackage(pkg);
setSelectedFile(null);

if (!pkg) {
updateActiveEditorWindow(EDITOR_WINDOWS.DEFAULT_WINDOW, activeEditorWindow)
} else {
updateActiveEditorWindow(EDITOR_WINDOWS.INSTALL_PACKAGE_WINDOW, activeEditorWindow)
}

/>
</FileMenu>
<FileBrowser
files={ fileTree }
root={ fileTree.path }
selectedFile={ selectedFile?.path }
selectedFolder={ selectedFolder }
selectedPackage={ selectedPackage }
onFolderRename={() => {
// updateActiveEditorWindow(EDITOR_WINDOWS.RENAME_FOLDER_WINDOW, activeEditorWindow);
}}
onFileRename={() => {
// updateActiveEditorWindow(EDITOR_WINDOWS.RENAME_FILE_WINDOW, activeEditorWindow);
}}
onDeployProject={
(e) => {
onDeployProject(e);
// TODO: open deploy package window
}
}
onFolderSelect={
(folder) => {
// shouldnt deselect anything
setSelectedFolder(folder);
}
}
onPackageSelect={
(pkg) => {
// set selected package,
// unset selectedFile
// TODO: make sure 'remote fetch package' window has correct data.

setSelectedPackage(pkg);
setSelectedFile(null);

if (!pkg) {
updateActiveEditorWindow(EDITOR_WINDOWS.DEFAULT_WINDOW, activeEditorWindow)
} else {
updateActiveEditorWindow(EDITOR_WINDOWS.INSTALL_PACKAGE_WINDOW, activeEditorWindow)
}

}
onFileSelect={
async (entry) => {
}
onFileSelect={
async (entry) => {

setSelectedPackage(null);
setSelectedPackage(null);

// file unselected
if (!entry) {
// file unselected
if (!entry) {

setSelectedFile(null);
updateActiveEditorWindow(EDITOR_WINDOWS.DEFAULT_WINDOW, activeEditorWindow);
setSelectedFile(null);
updateActiveEditorWindow(EDITOR_WINDOWS.DEFAULT_WINDOW, activeEditorWindow);

} else {
} else {

// file selected
const { content } = await onFileSelect(entry);
setSelectedFile({ ...entry, content });
updateActiveEditorWindow(EDITOR_WINDOWS.CODE_EDITOR_WINDOW, activeEditorWindow);
// file selected
const { content } = await onFileSelect(entry);
setSelectedFile({ ...entry, content });
updateActiveEditorWindow(EDITOR_WINDOWS.CODE_EDITOR_WINDOW, activeEditorWindow);

}
}


}
} />
</div>
}
} />
</Col>
<Col className="editor-window-container col-md-8">
<EditorMenu
Expand Down