diff --git a/app/client/src/assets/images/empy-state-2x.png b/app/client/src/assets/images/empy-state-2x.png new file mode 100644 index 0000000000..3ac6533397 Binary files /dev/null and b/app/client/src/assets/images/empy-state-2x.png differ diff --git a/app/client/src/assets/images/empy-state-3x.png b/app/client/src/assets/images/empy-state-3x.png new file mode 100644 index 0000000000..6d93cbf1f2 Binary files /dev/null and b/app/client/src/assets/images/empy-state-3x.png differ diff --git a/app/client/src/assets/images/empy-state.png b/app/client/src/assets/images/empy-state.png new file mode 100644 index 0000000000..dfc37a722f Binary files /dev/null and b/app/client/src/assets/images/empy-state.png differ diff --git a/app/client/src/ce/constants/messages.ts b/app/client/src/ce/constants/messages.ts index 5ffc8ca79a..e779b640aa 100644 --- a/app/client/src/ce/constants/messages.ts +++ b/app/client/src/ce/constants/messages.ts @@ -1023,6 +1023,12 @@ export const TEST_EMAIL_FAILURE = () => "Sending Test Email Failed"; export const DISCONNECT_AUTH_ERROR = () => "Cannot disconnect the only connected authentication method."; export const MANDATORY_FIELDS_ERROR = () => "Mandatory fields cannot be empty"; + +// Audit logs begin +export const AUDIT_LOGS = () => "Audit logs"; +export const TRY_AGAIN_WITH_YOUR_FILTER = () => "Try again with your filter"; +// Audit logs end + // export const WELCOME_FORM_NON_SUPER_USER_ROLE_DROPDOWN = () => "Tell us more about what you do at work?"; diff --git a/app/client/src/ce/pages/AdminSettings/LeftPane.tsx b/app/client/src/ce/pages/AdminSettings/LeftPane.tsx index e403320d99..ce6dc2c0f1 100644 --- a/app/client/src/ce/pages/AdminSettings/LeftPane.tsx +++ b/app/client/src/ce/pages/AdminSettings/LeftPane.tsx @@ -1,7 +1,7 @@ import React from "react"; import { Link, useParams } from "react-router-dom"; import styled from "styled-components"; -import AdminConfig from "./config"; +import AdminConfig from "@appsmith/pages/AdminSettings/config"; import { Category } from "@appsmith/pages/AdminSettings/config/types"; import { adminSettingsCategoryUrl } from "RouteBuilder"; diff --git a/app/client/src/pages/Home/LeftPaneBottomSection.tsx b/app/client/src/pages/Home/LeftPaneBottomSection.tsx index 1997121f7f..febfa824be 100644 --- a/app/client/src/pages/Home/LeftPaneBottomSection.tsx +++ b/app/client/src/pages/Home/LeftPaneBottomSection.tsx @@ -4,10 +4,11 @@ import styled from "styled-components"; import { Classes as BlueprintClasses } from "@blueprintjs/core"; import { MenuItem } from "design-system"; import { + ADMIN_SETTINGS, + APPSMITH_DISPLAY_VERSION, createMessage, DOCUMENTATION, WELCOME_TOUR, - APPSMITH_DISPLAY_VERSION, } from "@appsmith/constants/messages"; import { getIsFetchingApplications } from "selectors/applicationSelectors"; import { getOnboardingWorkspaces } from "selectors/onboardingSelectors"; @@ -23,7 +24,6 @@ import { } from "../common/CustomizedDropdown/dropdownHelpers"; import { ADMIN_SETTINGS_CATEGORY_DEFAULT_PATH } from "constants/routes"; import { getCurrentUser } from "selectors/usersSelectors"; -import { ADMIN_SETTINGS } from "@appsmith/constants/messages"; const Wrapper = styled.div` padding-bottom: ${(props) => props.theme.spaces[3]}px; diff --git a/app/client/src/pages/common/MobileSidebar.tsx b/app/client/src/pages/common/MobileSidebar.tsx index b1726ac061..759bdef6e9 100644 --- a/app/client/src/pages/common/MobileSidebar.tsx +++ b/app/client/src/pages/common/MobileSidebar.tsx @@ -5,17 +5,17 @@ import ProfileImage from "pages/common/ProfileImage"; import { MenuItem } from "design-system"; import { ADMIN_SETTINGS_CATEGORY_DEFAULT_PATH } from "constants/routes"; import { - getOnSelectAction, DropdownOnSelectActions, + getOnSelectAction, } from "./CustomizedDropdown/dropdownHelpers"; import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants"; import { useSelector } from "react-redux"; import { getCurrentUser } from "selectors/usersSelectors"; import { - createMessage, ADMIN_SETTINGS, - DOCUMENTATION, APPSMITH_DISPLAY_VERSION, + createMessage, + DOCUMENTATION, } from "@appsmith/constants/messages"; import { getAppsmithConfigs } from "@appsmith/configs"; import { howMuchTimeBeforeText } from "utils/helpers"; diff --git a/app/client/src/pages/common/ProfileDropdown.tsx b/app/client/src/pages/common/ProfileDropdown.tsx index b868db0b20..e76b987318 100644 --- a/app/client/src/pages/common/ProfileDropdown.tsx +++ b/app/client/src/pages/common/ProfileDropdown.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { CommonComponentProps, Classes } from "components/ads/common"; +import { Classes, CommonComponentProps } from "components/ads/common"; import { Menu, MenuDivider, @@ -9,14 +9,17 @@ import { TooltipComponent, } from "design-system"; import styled from "styled-components"; -import { Position, Classes as BlueprintClasses } from "@blueprintjs/core"; import { - getOnSelectAction, + Classes as BlueprintClasses, + PopperModifiers, + Position, +} from "@blueprintjs/core"; +import { DropdownOnSelectActions, + getOnSelectAction, } from "./CustomizedDropdown/dropdownHelpers"; import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants"; import ProfileImage from "./ProfileImage"; -import { PopperModifiers } from "@blueprintjs/core"; import { PROFILE } from "constants/routes"; import { Colors } from "constants/Colors"; import { ACCOUNT_TOOLTIP, createMessage } from "@appsmith/constants/messages"; @@ -35,6 +38,7 @@ const StyledMenuItem = styled(MenuItem)` width: 18px; height: 18px; fill: ${Colors.GRAY}; + path { fill: ${Colors.GRAY}; } @@ -56,6 +60,7 @@ const UserInformation = styled.div` white-space: nowrap; overflow: hidden; text-overflow: ellipsis; + .${Classes.TEXT} { color: ${(props) => props.theme.colors.profileDropdown.userName}; } @@ -66,6 +71,7 @@ const UserInformation = styled.div` white-space: nowrap; overflow: hidden; text-overflow: ellipsis; + .${Classes.TEXT} { color: ${(props) => props.theme.colors.profileDropdown.name}; } @@ -73,6 +79,7 @@ const UserInformation = styled.div` .user-image { margin-right: ${(props) => props.theme.spaces[4]}px; + div { cursor: default; }