From 34dc7c1dabae24d405d9078ea63631d7329e7d70 Mon Sep 17 00:00:00 2001 From: mertmit Date: Sat, 6 Jan 2024 08:47:48 +0000 Subject: [PATCH] fix: CreatedBy & LastModifiedBy icons --- .../smartsheet/header/VirtualCellIcon.ts | 2 +- packages/nc-gui/utils/iconUtils.ts | 38 ++++++++++--------- 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/packages/nc-gui/components/smartsheet/header/VirtualCellIcon.ts b/packages/nc-gui/components/smartsheet/header/VirtualCellIcon.ts index d239e8482f..5f1c140522 100644 --- a/packages/nc-gui/components/smartsheet/header/VirtualCellIcon.ts +++ b/packages/nc-gui/components/smartsheet/header/VirtualCellIcon.ts @@ -67,7 +67,7 @@ const renderIcon = (column: ColumnType, relationColumn?: ColumnType) => { return { icon: iconMap.datetime, color: 'text-grey' } case UITypes.CreatedBy: case UITypes.LastModifiedBy: - return { icon: iconMap.account, color: 'text-grey' } + return { icon: iconMap.phUserGear, color: 'text-grey' } } return { icon: iconMap.generic, color: 'text-grey' } diff --git a/packages/nc-gui/utils/iconUtils.ts b/packages/nc-gui/utils/iconUtils.ts index 4d0b105c88..e8c4d5307f 100644 --- a/packages/nc-gui/utils/iconUtils.ts +++ b/packages/nc-gui/utils/iconUtils.ts @@ -19,23 +19,15 @@ import MdiTableLarge from '~icons/mdi/table-large' import TablerColumnInsertLeft from '~icons/tabler/column-insert-left' import TablerColumnInsertRight from '~icons/tabler/column-insert-right' import MdiEyeCircleOutline from '~icons/mdi/eye-circle-outline' -import NcEye from '~icons/nc-icons/eye' import MsGroup from '~icons/material-symbols/groups-outline-rounded' import MsAddBoxOutline from '~icons/nc-icons/add-box' import MsDownloadRounded from '~icons/nc-icons/download' import LogosAirtable from '~icons/logos/airtable' -import NcStar from '~icons/nc-icons/star' -import NcUnStar from '~icons/nc-icons/star-remove' import MsSort from '~icons/material-symbols/sort' import MaterialSymbolsEdit from '~icons/material-symbols/edit-outline-rounded' import MaterialDuplicate from '~icons/material-symbols/file-copy-outline-rounded' import MaterialSymbolsWarningOutlineRounded from '~icons/material-symbols/warning-outline-rounded' import MaterialSymbolsDragIndicator from '~icons/ri/draggable' -import NcSearch from '~icons/nc-icons/search' -import NcCreditCard from '~icons/nc-icons/credit-card' -import NcLayers from '~icons/nc-icons/layers' -import NcUsers from '~icons/nc-icons/users' -import NcCheck from '~icons/nc-icons/check' import PlusSquare from '~icons/nc-icons/plus-square' import MobileShare from '~icons/nc-icons/share' import PhLayout from '~icons/ph/layout' @@ -58,27 +50,18 @@ import LogosDiscordIcon from '~icons/logos/discord-icon' import LogosRedditIcon from '~icons/logos/reddit-icon' import RiTwitterXFill from '~icons/ri/twitter-x-line' import PhGithubLogoLight from '~icons/ph/github-logo-light' -import NcIconsRowHeightMedium from '~icons/nc-icons/row-height-medium' -import NcIconsRowHeightShort from '~icons/nc-icons/row-height-short' -import NcIconsRowHeightTall from '~icons/nc-icons/row-height-tall' -import NcIconsRowHeightExtraTall from '~icons/nc-icons/row-height-extra-tall' import MsInfo from '~icons/material-symbols/info-outline-rounded' import PhSparkleFill from '~icons/ph/sparkle-fill' -import NcArticle from '~icons/nc-icons/article' import MsDatabase from '~icons/mdi/database-outline' import MdiDatabaseSearch from '~icons/mdi/database-search' import MdiMagicStaff from '~icons/mdi/magic-staff' import PhCaretDoubleLeftThin from '~icons/ph/caret-double-left-light' -import NcNotification from '~icons/material-symbols/notifications-outline' import Right from '~icons/material-symbols/chevron-right-rounded' import Left from '~icons/material-symbols/chevron-left-rounded' import Up from '~icons/material-symbols/keyboard-arrow-up-rounded' import Down from '~icons/material-symbols/keyboard-arrow-down-rounded' import PhTriangleFill from '~icons/ph/triangle-fill' import LcSend from '~icons/lucide/send' -import NcCommentHere from '~icons/nc-icons/comment-here' -import NcAddDataSource from '~icons/nc-icons/add-data-source' -import NcDatabaseIcon from '~icons/nc-icons/database' import HasManyIcon from '~icons/nc-icons/hasmany' import ManytoManyIcon from '~icons/nc-icons/manytomany' @@ -93,6 +76,7 @@ import FileImageIcon from '~icons/nc-icons/file-image' import PhUsers from '~icons/ph/users' import PhUser from '~icons/ph/user' +import PhUserGear from '~icons/ph/user-gear' // Roles import SuperAdmin from '~icons/nc-icons/super-admin' @@ -109,6 +93,25 @@ import Filter from '~icons/nc-icons/filter' import Group from '~icons/nc-icons/group' import Sort from '~icons/nc-icons/sort' +// NocoDB Icons +import NcEye from '~icons/nc-icons/eye' +import NcStar from '~icons/nc-icons/star' +import NcUnStar from '~icons/nc-icons/star-remove' +import NcSearch from '~icons/nc-icons/search' +import NcCreditCard from '~icons/nc-icons/credit-card' +import NcLayers from '~icons/nc-icons/layers' +import NcUsers from '~icons/nc-icons/users' +import NcCheck from '~icons/nc-icons/check' +import NcIconsRowHeightMedium from '~icons/nc-icons/row-height-medium' +import NcIconsRowHeightShort from '~icons/nc-icons/row-height-short' +import NcIconsRowHeightTall from '~icons/nc-icons/row-height-tall' +import NcIconsRowHeightExtraTall from '~icons/nc-icons/row-height-extra-tall' +import NcArticle from '~icons/nc-icons/article' +import NcNotification from '~icons/material-symbols/notifications-outline' +import NcCommentHere from '~icons/nc-icons/comment-here' +import NcAddDataSource from '~icons/nc-icons/add-data-source' +import NcDatabaseIcon from '~icons/nc-icons/database' + // keep it for reference // todo: remove it after all icons are migrated /* export const iconMapOld = { @@ -325,6 +328,7 @@ export const iconMap = { accountCircle: h('span', { class: 'material-symbols' }, 'account_circle'), phUser: PhUser, phUsers: PhUsers, + phUserGear: PhUserGear, users: NcUsers, cloudDownload: h('span', { class: 'material-symbols' }, 'cloud_download'), download: MsDownloadRounded,