From 2f5c5e88ad3098ca6b776113fe8a20ebce34e04d Mon Sep 17 00:00:00 2001 From: Rudra Date: Wed, 16 Oct 2024 13:41:25 +0530 Subject: [PATCH 1/4] init --- .../OrganizationManager/CustomSelect.jsx | 47 +++++++----- .../_components/OrganizationManager/List.jsx | 70 +++++++++++++----- frontend/src/_styles/theme.scss | 27 +++++++ server/src/mails/assets/github.png | Bin 16824 -> 12095 bytes server/src/mails/assets/linkedin.png | Bin 6155 -> 6607 bytes server/src/mails/assets/twitter.png | Bin 10389 -> 9321 bytes server/src/mails/assets/youtube.png | Bin 5137 -> 5004 bytes server/src/mails/base/partials/footer.hbs | 8 +- server/src/mails/base/partials/header.hbs | 4 +- 9 files changed, 112 insertions(+), 44 deletions(-) diff --git a/frontend/src/_components/OrganizationManager/CustomSelect.jsx b/frontend/src/_components/OrganizationManager/CustomSelect.jsx index 2642b3a9f1..e070d1e97c 100644 --- a/frontend/src/_components/OrganizationManager/CustomSelect.jsx +++ b/frontend/src/_components/OrganizationManager/CustomSelect.jsx @@ -8,31 +8,42 @@ import { authenticationService } from '@/_services'; import SolidIcon from '@/_ui/Icon/SolidIcons'; import { ToolTip } from '@/_components'; import { decodeEntities } from '@/_helpers/utils'; - const Menu = (props) => { const { t } = useTranslation(); const { admin } = authenticationService.currentSessionValue; const darkMode = localStorage.getItem('darkMode') === 'true'; + return (
- {admin && ( - <> -
props.selectProps.setShowEditOrg(true)} - > -
-
{props?.selectProps?.value?.label}
-
- -
-
+ <> +
props.selectProps.setShowEditOrg(true)} + > +
+
Workspaces ({props.options.length})
+ {admin && ( + +
+ {/* */} + +
+ + )}
- - )} +
+ +
{props.children}
+
{ const [showEditOrg, setShowEditOrg] = useState(false); const [showCreateOrg, setShowCreateOrg] = useState(false); const darkMode = localStorage.getItem('darkMode') === 'true'; - const currentValue = props?.options.find((option) => option?.value === props?.value); + // const currentValue = props?.options.find((option) => option?.value === props?.value); return ( <> - + {/* */} {org.id === current_organization_id && admin ? ( - +
) : ( org.id !== current_organization_id && ( - +
switchOrganization(org.id)} > - +
) @@ -103,7 +103,7 @@ export const OrganizationList = function () { isLoading={isGettingOrganizations} options={options} value={current_organization_id} - // onChange={(id) => switchOrganization(id)} + onChange={(id) => switchOrganization(id)} className={`tj-org-select ${darkMode && 'dark-theme'}`} />
diff --git a/frontend/src/_styles/theme.scss b/frontend/src/_styles/theme.scss index 724be3e7d2..77233c0dbd 100644 --- a/frontend/src/_styles/theme.scss +++ b/frontend/src/_styles/theme.scss @@ -10677,7 +10677,7 @@ tbody { } .current-org-indicator { - padding: 8px 8px; + padding: 0px 8px 0px 8px; margin-left: auto; margin-right: 5px; } @@ -10698,6 +10698,10 @@ tbody { } } +.org-dropdown-shadow{ + box-shadow: var(--elevation-400-box-shadow) +} + .css-1q0xftk-menu { background-color: var(--base-black) !important; border: 1px solid hsl(197, 6.8%, 13.6%) !important; @@ -10715,6 +10719,14 @@ tbody { .org-custom-select-header-wrap { border-bottom: 1px solid var(--slate5); + + .select-header-font{ +font-size: 14px; +font-weight: 500; +line-height: 20px; +color: var(--text-default); + + } } .btn-close:focus { From 05eb8482d802490f8ca4c0537315742942a8e4c4 Mon Sep 17 00:00:00 2001 From: Rudra Date: Tue, 22 Oct 2024 12:34:10 +0530 Subject: [PATCH 4/4] tick size --- frontend/src/_components/OrganizationManager/List.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/_components/OrganizationManager/List.jsx b/frontend/src/_components/OrganizationManager/List.jsx index 182c13224a..8ac54710bb 100644 --- a/frontend/src/_components/OrganizationManager/List.jsx +++ b/frontend/src/_components/OrganizationManager/List.jsx @@ -47,7 +47,7 @@ export const OrganizationList = function () {
{org.id === current_organization_id ? (
- +
) : (