Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ const CreateFolderAction = ({ filesViewRef, file, onCreateFolder, triggerAction
return (
<>
<NameInput
id="newFolder"
nameInputRef={outsideClick.ref}
maxLength={maxNameLength}
value={folderName}
Expand Down
3 changes: 3 additions & 0 deletions frontend/src/FileManager/Actions/Delete/Delete.action.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import "../../../styles/variables";

.file-delete-confirm {
.file-delete-confirm-text {
border-bottom: 1px solid #dddddd;
Expand All @@ -6,6 +8,7 @@
margin-bottom: .7rem;
word-wrap: break-word;
font-weight: 500;
font-size: $fm-font-size;
}

.file-delete-confirm-actions {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
@import "../../../styles/variables";

.file-previewer {
padding: .8em;
height: 40dvh;
display: flex;
justify-content: center;
font-size: $fm-font-size;

.photo-popup-image {
object-fit: contain;
Expand Down
1 change: 1 addition & 0 deletions frontend/src/FileManager/Actions/Rename/Rename.action.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@ const RenameAction = ({ filesViewRef, file, onRename, triggerAction }) => {
return (
<>
<NameInput
id={file.name}
nameInputRef={outsideClick.ref}
maxLength={maxNameLength}
value={renameFile}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
padding: 18px 15px;
display: flex;
gap: 18px;
font-size: $fm-font-size;

.select-files {
width: 100%;
Expand Down Expand Up @@ -55,7 +56,7 @@
}

.files-progress {
width: 60%;
width: calc(60% - 18px);

.heading {
display: flex;
Expand All @@ -80,7 +81,7 @@
list-style: none;
border-bottom: 1px solid #c6c6c6;
display: flex;
gap: 5px;
gap: 10px;
margin-bottom: 18px;
padding-bottom: 12px;

Expand All @@ -89,7 +90,7 @@
}

.file {
width: 90%;
width: 86%;

.file-details {
display: flex;
Expand All @@ -104,7 +105,7 @@

.file-name {
display: inline-block;
max-width: 72%;
max-width: 66%;
margin-right: 8px;
}
}
Expand Down
1 change: 1 addition & 0 deletions frontend/src/FileManager/BreadCrumb/BreadCrumb.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

.bread-crumb-container {
position: relative;
font-size: $fm-font-size;

.breadcrumb {
height: 22px;
Expand Down
15 changes: 8 additions & 7 deletions frontend/src/FileManager/FileList/FileList.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
@include overflow-y-scroll;
padding: 8px;
padding-right: 4px;
font-size: $fm-font-size;

.drag-move-tooltip {
background-color: white;
Expand Down Expand Up @@ -158,11 +159,11 @@
padding-left: 35px;
cursor: pointer;
user-select: none;

&:hover {
background-color: rgba(0, 0, 0, 0.1);
}

&.active {
background-color: rgba(0, 123, 255, 0.1);
color: #007bff;
Expand All @@ -174,11 +175,11 @@
width: 20%;
cursor: pointer;
user-select: none;

&:hover {
background-color: rgba(0, 0, 0, 0.1);
}

&.active {
background-color: rgba(0, 123, 255, 0.1);
color: #007bff;
Expand All @@ -190,17 +191,17 @@
width: 10%;
cursor: pointer;
user-select: none;

&:hover {
background-color: rgba(0, 0, 0, 0.1);
}

&.active {
background-color: rgba(0, 123, 255, 0.1);
color: #007bff;
}
}

.sort-indicator {
font-size: 0.8em;
margin-left: 4px;
Expand Down
46 changes: 23 additions & 23 deletions frontend/src/FileManager/FileList/FilesHeader.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,44 +36,44 @@ const FilesHeader = ({ unselectFiles, onSort, sortConfig }) => {
>
<div className="file-select-all">
{(showSelectAll || allFilesSelected) && (
<Checkbox checked={allFilesSelected} onChange={handleSelectAll} title="Select all" disabled={currentPathFiles.length === 0} />
<Checkbox
id="selectAll"
checked={allFilesSelected}
onChange={handleSelectAll}
title="Select all"
disabled={currentPathFiles.length === 0}
/>
)}
</div>
<div
className={`file-name ${sortConfig?.key === 'name' ? 'active' : ''}`}
onClick={() => handleSort('name')}
<div
className={`file-name ${sortConfig?.key === "name" ? "active" : ""}`}
onClick={() => handleSort("name")}
>
Name
{sortConfig?.key === 'name' && (
<span className="sort-indicator">
{sortConfig.direction === 'asc' ? ' ▲' : ' ▼'}
</span>
{sortConfig?.key === "name" && (
<span className="sort-indicator">{sortConfig.direction === "asc" ? " ▲" : " ▼"}</span>
)}
</div>
<div
className={`file-date ${sortConfig?.key === 'modified' ? 'active' : ''}`}
onClick={() => handleSort('modified')}
<div
className={`file-date ${sortConfig?.key === "modified" ? "active" : ""}`}
onClick={() => handleSort("modified")}
>
Modified
{sortConfig?.key === 'modified' && (
<span className="sort-indicator">
{sortConfig.direction === 'asc' ? ' ▲' : ' ▼'}
</span>
{sortConfig?.key === "modified" && (
<span className="sort-indicator">{sortConfig.direction === "asc" ? " ▲" : " ▼"}</span>
)}
</div>
<div
className={`file-size ${sortConfig?.key === 'size' ? 'active' : ''}`}
onClick={() => handleSort('size')}
<div
className={`file-size ${sortConfig?.key === "size" ? "active" : ""}`}
onClick={() => handleSort("size")}
>
Size
{sortConfig?.key === 'size' && (
<span className="sort-indicator">
{sortConfig.direction === 'asc' ? ' ▲' : ' ▼'}
</span>
{sortConfig?.key === "size" && (
<span className="sort-indicator">{sortConfig.direction === "asc" ? " ▲" : " ▼"}</span>
)}
</div>
</div>
);
};

export default FilesHeader;
export default FilesHeader;
1 change: 1 addition & 0 deletions frontend/src/FileManager/FileManager.scss
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ svg {

.fm-rename-folder-container {
padding: 8px 0;
text-align: left;

.fm-rename-folder-input {
border-bottom: 1px solid #c6c6c6;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
list-style: none;
margin: 0px 4px;
height: 100%;
font-size: $fm-font-size;
@include overflow-y-scroll;

.folder-collapsible {
Expand Down
1 change: 1 addition & 0 deletions frontend/src/FileManager/Toolbar/Toolbar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
margin: 0;
border: 1px solid #c4c4c4;
border-radius: 5px;
font-size: $fm-font-size;

ul {
list-style: none;
Expand Down
1 change: 1 addition & 0 deletions frontend/src/components/ContextMenu/ContextMenu.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
padding: 4px;
z-index: 1;
transition: opacity 0.1s linear;
font-size: $fm-font-size;

.file-context-menu-list {
font-size: 1.1em;
Expand Down
1 change: 1 addition & 0 deletions frontend/src/components/Modal/Modal.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
align-items: center;
border-bottom: 1px solid $border-color;
padding: 0.3rem 1rem;
font-size: $fm-font-size;

.fm-modal-heading {
margin: 0;
Expand Down
3 changes: 2 additions & 1 deletion frontend/src/components/NameInput/NameInput.jsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import "./NameInput.scss";

const NameInput = ({ nameInputRef, maxLength, value, onChange, onKeyDown, onClick, rows }) => {
const NameInput = ({ nameInputRef, id, maxLength, value, onChange, onKeyDown, onClick, rows }) => {
return (
<textarea
ref={nameInputRef}
id={id}
className="rename-file"
maxLength={maxLength}
value={value}
Expand Down
1 change: 1 addition & 0 deletions frontend/src/components/NameInput/NameInput.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
resize: none;
field-sizing: content;
overflow-y: hidden;
z-index: 1;

&:focus {
outline: none;
Expand Down
1 change: 1 addition & 0 deletions frontend/src/styles/_variables.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// App Colors
$border-color: #cfcfcf;
$item-hover-color: rgb(0, 0, 0, 0.05);
$fm-font-size: 16px;
//

// Resuable Styles
Expand Down