diff --git a/src/components/specific/files/files-manager/FilesManager.vue b/src/components/specific/files/files-manager/FilesManager.vue index d92904645..243a31375 100644 --- a/src/components/specific/files/files-manager/FilesManager.vue +++ b/src/components/specific/files/files-manager/FilesManager.vue @@ -301,7 +301,7 @@ export default { if (selectedFileTab.value.id === "folders") { // WARNING displayedRows is name from DS, may change const folderFiles = filesTable.value.filesTable.displayedRows.map((row) => row.data); - documentList = folderFiles.filter(f => !isFolder(f)); + documentList = folderFiles.filter((f) => !isFolder(f)); } if (selectedFileTab.value.id === "files") { documentList = filesTable.value.displayedListFiles; @@ -663,11 +663,13 @@ export default { onActivated(() => { const folderId = gedTargetFolder.get(); + if (folderId) { - jumpToTargetFolder(folderId); + jumpToTargetFolder(folderId, true); } else { jumpToTargetFolder(props.fileStructure.id); } + gedTargetFolder.clear(); }); diff --git a/src/components/specific/models/models-table/ModelsTable.vue b/src/components/specific/models/models-table/ModelsTable.vue index d35d88dd4..8ffa59722 100644 --- a/src/components/specific/models/models-table/ModelsTable.vue +++ b/src/components/specific/models/models-table/ModelsTable.vue @@ -42,7 +42,7 @@ - + @@ -102,7 +96,7 @@ export default { const hovering = ref(false); const showFullPath = ref(false); const hasLocation = computed( - () => ![MODEL_TYPE.META_BUILDING, MODEL_TYPE.PHOTOSPHERE_BUILDING].includes(props.model.type) + () => ![MODEL_TYPE.META_BUILDING, MODEL_TYPE.PHOTOSPHERE_BUILDING].includes(props.model.type), ); const folderLocation = (model) => { diff --git a/src/components/specific/projects/project-history-activity/ProjectHistoryActivity.css b/src/components/specific/projects/project-history-activity/ProjectHistoryActivity.css new file mode 100644 index 000000000..e511e6671 --- /dev/null +++ b/src/components/specific/projects/project-history-activity/ProjectHistoryActivity.css @@ -0,0 +1,31 @@ +.history-activity-panel { + height: calc(100vh - 44px - 40px - 12px - 12px); + overflow: auto; + .header { + h3 { + margin-bottom: 12px; + font-size: 18px; + } + } + .input-search { + border: 1px solid transparent; + border-radius: 3px; + &.focus { + background-color: var(--color-silver-light); + box-shadow: none; + border: 1px solid #efefef; + } + } + .day-group { + margin-top: 20px; + .day-title { + font-size: 13px; + color: var(--color-granite); + margin-bottom: 8px; + font-weight: 600; + } + + } + +} + diff --git a/src/components/specific/projects/project-history-activity/ProjectHistoryActivity.vue b/src/components/specific/projects/project-history-activity/ProjectHistoryActivity.vue new file mode 100644 index 000000000..27fb99663 --- /dev/null +++ b/src/components/specific/projects/project-history-activity/ProjectHistoryActivity.vue @@ -0,0 +1,146 @@ + + + + + diff --git a/src/components/specific/projects/project-history-activity/activity-item/ActivityItem.css b/src/components/specific/projects/project-history-activity/activity-item/ActivityItem.css new file mode 100644 index 000000000..86b8c403b --- /dev/null +++ b/src/components/specific/projects/project-history-activity/activity-item/ActivityItem.css @@ -0,0 +1,150 @@ +.activity-item { + padding: 8px; + margin-bottom: 6px; + display: flex; + border-radius: 12px; + gap: 6px; + border: 1px solid var(--color-silver-light); + transition: 0.2s; + cursor: pointer; + &:hover { + background: #f9fafb; + } + .icon { + width: 26px; + height: 26px; + border-radius: 50%; + display: flex; + align-items: center; + justify-content: center; + margin-right: 6px; + font-size: 14px; + } + .content { + flex: 1; + min-width: 0; + .title { + display: flex; + align-items: center; + gap: 6px; + min-width: 0; + width: 100%; + font-size: 14px; + color: var(--color-granite); + user-select: none; + .title-label { + flex: 0 0 auto; + min-width: 0; + white-space: nowrap; + } + .target-text { + flex: 1 1 auto; + min-width: 0; + } + &:deep() { + .target-text .bimdata-textbox__tooltip { + max-width: 100%; + } + } + .primary { + color: var(--color-primary); + font-weight: 500; + } + } + .date { + font-size: 12px; + color: #6b7280; + margin-top: 4px; + } + .details { + margin: 6px 0; + font-size: 11px; + color: var(--color-granite-light); + .detail { + &.detail-path { + min-height: 32px; + gap: 6px; + } + span { + flex-shrink: 0; + } + strong, .primary { + flex: 1 1 auto; + min-width: 0; + color: var(--color-primary); + font-weight: 500; + } + } + } + .meta { + font-size: 12px; + color: #6b7280; + margin-top: 4px; + display: flex; + align-items: center; + gap: 6px; + .badge { + padding: 3px 8px; + border-radius: 50px; + font-size: 10px; + } + + .user { + background: #f3f4f6; + padding: 2px 6px; + border-radius: 999px; + font-size: 10px; + } + } + } + .arrow { + color: #9ca3af; + font-size: 18px; + } + .blue { + background: rgba(32, 93, 189, 0.1); + color: var(--color-neutral); + } + .flame { + background: rgba(255, 61, 30, .1); + color: var(--color-high); + } + .green { + background: rgba(0, 175, 80, .1); + color: var(--color-success); + } + .middle-blue { + background: rgba(0, 136, 224, 0.1); + color: #0088E0; + } + .orange { + background: rgba(255, 145, 0, 0.1); + color: var(--color-warning); + } + .pink { + background: rgba(227,85,119, 0.1); + color: #E35577; + } + .purple { + background: rgba(162,89,234, 0.1); + color: #A259EA; + } + .red { + background: rgba(188, 0, 10, 0.1); + color: var(--color-danger); + } + .teal { + background: rgba(27, 155, 162, 0.1); + color: #1B9BA2; + } + .expand-enter-active, + .expand-leave-active { + transition: all 0.2s ease; + } + + .expand-enter-from, + .expand-leave-to { + opacity: 0; + transform: translateY(-5px); + } +} \ No newline at end of file diff --git a/src/components/specific/projects/project-history-activity/activity-item/ActivityItem.vue b/src/components/specific/projects/project-history-activity/activity-item/ActivityItem.vue new file mode 100644 index 000000000..d213c603e --- /dev/null +++ b/src/components/specific/projects/project-history-activity/activity-item/ActivityItem.vue @@ -0,0 +1,124 @@ + + + + + diff --git a/src/components/specific/projects/project-notifications-settings/ProjectNotificationsSettings.css b/src/components/specific/projects/project-notifications-settings/ProjectNotificationsSettings.css index b84fee9c7..44a61341b 100644 --- a/src/components/specific/projects/project-notifications-settings/ProjectNotificationsSettings.css +++ b/src/components/specific/projects/project-notifications-settings/ProjectNotificationsSettings.css @@ -1,8 +1,7 @@ .project-notifications-settings { - padding: 0 6px; - height: 100%; + height: calc(100% - var(--spacing-unit) - 12px); .content { - height: calc(100% - 32px - 32px); + height: calc(100% - 32px - 6px); overflow: auto; .content-text { color: var(--color-granite); @@ -11,9 +10,6 @@ line-height: 160%; } - } - .header { - } .footer { left: 0; diff --git a/src/components/specific/projects/project-notifications-settings/ProjectNotificationsSettings.vue b/src/components/specific/projects/project-notifications-settings/ProjectNotificationsSettings.vue index 0a62a95aa..69019b511 100644 --- a/src/components/specific/projects/project-notifications-settings/ProjectNotificationsSettings.vue +++ b/src/components/specific/projects/project-notifications-settings/ProjectNotificationsSettings.vue @@ -1,19 +1,5 @@