Skip to content

Commit 5a9b97c

Browse files
raheeliftikhar5raheeliftikhar5
committed
branding updates
1 parent fc1f2aa commit 5a9b97c

File tree

12 files changed

+305
-1394
lines changed

12 files changed

+305
-1394
lines changed

‎client/packages/lowcoder/src/api/commonSettingApi.ts

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -82,34 +82,34 @@ export interface ThemeDetail {
8282
dataLoadingIndicator?: string;
8383
}
8484

85-
export interface BrandingSettings {
86-
logo: string | null;
87-
squareLogo: string | null;
88-
mainBrandingColor: string;
89-
appHeaderColor: string;
90-
adminSidebarColor: string;
91-
adminSidebarFontColor: string;
92-
adminSidebarActiveBgColor: string;
93-
adminSidebarActiveFontColor: string;
94-
editorSidebarColor: string;
95-
editorSidebarFontColor: string;
96-
editorSidebarActiveBgColor: string;
97-
editorSidebarActiveFontColor: string;
98-
font: string;
99-
errorPageText: string;
100-
errorPageImage: string | null;
101-
signUpPageText: string;
102-
signUpPageImage: string | null;
103-
loggedOutPageText: string;
104-
loggedOutPageImage: string | null;
105-
standardDescription: string;
106-
standardTitle: string;
107-
showDocumentation: boolean;
108-
documentationLink: string | null;
109-
submitIssue: boolean;
110-
whatsNew: boolean;
111-
whatsNewLink: string | null;
112-
}
85+
// export interface BrandingSettings {
86+
// logo: string | null;
87+
// squareLogo: string | null;
88+
// mainBrandingColor: string;
89+
// appHeaderColor: string;
90+
// adminSidebarColor: string;
91+
// adminSidebarFontColor: string;
92+
// adminSidebarActiveBgColor: string;
93+
// adminSidebarActiveFontColor: string;
94+
// editorSidebarColor: string;
95+
// editorSidebarFontColor: string;
96+
// editorSidebarActiveBgColor: string;
97+
// editorSidebarActiveFontColor: string;
98+
// font: string;
99+
// errorPageText: string;
100+
// errorPageImage: string | null;
101+
// signUpPageText: string;
102+
// signUpPageImage: string | null;
103+
// loggedOutPageText: string;
104+
// loggedOutPageImage: string | null;
105+
// standardDescription: string;
106+
// standardTitle: string;
107+
// showDocumentation: boolean;
108+
// documentationLink: string | null;
109+
// submitIssue: boolean;
110+
// whatsNew: boolean;
111+
// whatsNewLink: string | null;
112+
// }
113113

114114
export function getThemeDetailName(key: keyof ThemeDetail) {
115115
switch (key) {

‎client/packages/lowcoder/src/api/enterpriseApi.ts

Lines changed: 62 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,88 @@
11
import axios from 'axios';
22

3+
export interface BrandingSettings {
4+
logo?: string | null;
5+
squareLogo?: string | null;
6+
mainBrandingColor?: string;
7+
appHeaderColor?: string;
8+
adminSidebarColor?: string;
9+
adminSidebarFontColor?: string;
10+
adminSidebarActiveBgColor?: string;
11+
adminSidebarActiveFontColor?: string;
12+
editorSidebarColor?: string;
13+
editorSidebarFontColor?: string;
14+
editorSidebarActiveBgColor?: string;
15+
editorSidebarActiveFontColor?: string;
16+
font?: string;
17+
errorPageText?: string;
18+
errorPageImage?: string | null;
19+
signUpPageText?: string;
20+
signUpPageImage?: string | null;
21+
loggedOutPageText?: string;
22+
loggedOutPageImage?: string | null;
23+
standardDescription?: string;
24+
standardTitle?: string;
25+
showDocumentation?: boolean;
26+
documentationLink?: string | null;
27+
submitIssue?: boolean;
28+
whatsNew?: boolean;
29+
whatsNewLink?: string | null;
30+
}
31+
export interface BrandingConfig {
32+
config_name?: string,
33+
config_description?: string,
34+
config_icon?: string,
35+
config_set?: BrandingSettings,
36+
org_id?: string,
37+
user_id?: string,
38+
id?: string,
39+
}
40+
341
// Existing functions
442
export const getEnterpriseLicense = async () => {
5-
const response = await axios.get('/api/plugins/enterprise/license');
6-
return response.data;
43+
const response = await axios.get('/api/plugins/enterprise/license');
44+
return response.data;
745
};
846

947
export const getAuditLogs = async (params = {}) => {
10-
const query = new URLSearchParams(params).toString();
11-
const response = await axios.get(`/api/plugins/enterprise/audit-logs${query ? `?${query}` : ''}`);
12-
return response.data;
48+
const query = new URLSearchParams(params).toString();
49+
const response = await axios.get(`/api/plugins/enterprise/audit-logs${query ? `?${query}` : ''}`);
50+
return response.data;
1351
};
1452

1553
export const getAuditLogStatistics = async (groupByParam : string) => {
16-
const response = await axios.get(`/api/plugins/enterprise/audit-logs/statistics?groupByParam=${groupByParam}`);
17-
return response.data;
54+
const response = await axios.get(`/api/plugins/enterprise/audit-logs/statistics?groupByParam=${groupByParam}`);
55+
return response.data;
1856
};
1957

2058
export const getAppUsageLogs = async (params = {}) => {
21-
const query = new URLSearchParams(params).toString();
22-
const response = await axios.get(`/api/plugins/enterprise/app-usage-logs${query ? `?${query}` : ''}`);
23-
return response.data;
59+
const query = new URLSearchParams(params).toString();
60+
const response = await axios.get(`/api/plugins/enterprise/app-usage-logs${query ? `?${query}` : ''}`);
61+
return response.data;
2462
};
2563

2664
export const getAppUsageStatistics = async (groupByParam : string) => {
27-
const response = await axios.get(`/api/plugins/enterprise/app-usage-logs/statistics?groupByParam=${groupByParam}`);
28-
return response.data;
65+
const response = await axios.get(`/api/plugins/enterprise/app-usage-logs/statistics?groupByParam=${groupByParam}`);
66+
return response.data;
2967
};
3068

3169

32-
export const getBranding = async () => {
33-
const response = await axios.get('/api/plugins/enterprise/branding');
34-
return response.data;
70+
export const getBranding = async (orgId: string = '') => {
71+
const response = await axios.get('/api/plugins/enterprise/branding?orgId='+orgId);
72+
return response.data;
3573
};
3674

3775
export const createBranding = async (brandingData : any) => {
38-
const response = await axios.post('/api/plugins/enterprise/branding', brandingData);
39-
return response.data;
76+
let response;
77+
if (brandingData.id) {
78+
response = await axios.put(`/api/plugins/enterprise/branding?brandId=${brandingData.id}`, brandingData);
79+
} else {
80+
response = await axios.post('/api/plugins/enterprise/branding', brandingData);
81+
}
82+
return response.data;
4083
};
4184

4285
export const updateBranding = async (brandingData : any) => {
43-
const response = await axios.put('/api/plugins/enterprise/branding', brandingData);
44-
return response.data;
86+
const response = await axios.put('/api/plugins/enterprise/branding', brandingData);
87+
return response.data;
4588
};

‎client/packages/lowcoder/src/components/layout/Layout.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { CNMainContent, CNSidebar } from "constants/styleSelectors";
1010
import { SideBarSection, SideBarSectionProps } from "./SideBarSection";
1111
import styled from "styled-components";
1212
import { useSelector } from "react-redux";
13-
import { getBrandingSettings } from "@lowcoder-ee/redux/selectors/commonSettingSelectors";
13+
// import { getBrandingSettings } from "@lowcoder-ee/redux/selectors/commonSettingSelectors";
1414
import { MenuOutlined } from "@ant-design/icons";
1515
import { Drawer, Button } from "antd";
1616

@@ -58,7 +58,7 @@ const DrawerContentWrapper = styled.div`
5858
`;
5959

6060
export function Layout(props: LayoutProps) {
61-
const brandingSettings = useSelector(getBrandingSettings);
61+
const brandingSettings = {}; //useSelector(getBrandingSettings);
6262
const [drawerVisible, setDrawerVisible] = useState(false);
6363
const [isMobile, setIsMobile] = useState(false);
6464

‎client/packages/lowcoder/src/components/layout/SideBarSection.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { getUser } from "../../redux/selectors/usersSelectors";
1111
import { normalAppListSelector } from "../../redux/selectors/applicationSelector";
1212
import { useLocation } from "react-router-dom";
1313
import history from "../../util/history";
14-
import { getBrandingSettings } from "@lowcoder-ee/redux/selectors/commonSettingSelectors";
14+
// import { getBrandingSettings } from "@lowcoder-ee/redux/selectors/commonSettingSelectors";
1515

1616
const defaultOnSelectedFn = (routePath: string, currentPath: string) => routePath === currentPath;
1717

@@ -24,7 +24,7 @@ const Wrapper = styled.div`
2424
export const SideBarSection = (props: SideBarSectionProps) => {
2525
const user = useSelector<AppState, User>(getUser);
2626
const applications = useSelector<AppState, ApplicationMeta[]>(normalAppListSelector);
27-
const brandingSettings = useSelector(getBrandingSettings);
27+
const brandingSettings = {}; //useSelector(getBrandingSettings);
2828
const currentPath = useLocation().pathname;
2929
const isShow = props.items
3030
.map((item) => (item.visible ? item.visible({ user: user, applications: applications }) : true))

‎client/packages/lowcoder/src/i18n/locales/en.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2850,6 +2850,7 @@ export const en = {
28502850

28512851
"branding": {
28522852
"title": "Branding Settings",
2853+
"selectWorkspace": "Select Workspace",
28532854
"logoSection": "Logos",
28542855
"logo": "Logo",
28552856
"logoHelp": "Upload your company's logo in SVG or PNG format.",

‎client/packages/lowcoder/src/pages/common/header.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ import Avatar from 'antd/es/avatar';
6464
import UserApi from "@lowcoder-ee/api/userApi";
6565
import { validateResponse } from "@lowcoder-ee/api/apiUtils";
6666
import ProfileImage from "./profileImage";
67-
import { getBrandingSettings } from "@lowcoder-ee/redux/selectors/commonSettingSelectors";
67+
// import { getBrandingSettings } from "@lowcoder-ee/redux/selectors/commonSettingSelectors";
6868
import { buildMaterialPreviewURL } from "@lowcoder-ee/util/materialUtils";
6969

7070
const { Countdown } = Statistic;
@@ -380,7 +380,7 @@ export default function Header(props: HeaderProps) {
380380
const dispatch = useDispatch();
381381
const showAppSnapshot = useSelector(showAppSnapshotSelector);
382382
const {selectedSnapshot, isArchivedSnapshot} = useSelector(getSelectedAppSnapshot);
383-
const brandingSettings = useSelector(getBrandingSettings);
383+
const brandingSettings = {}; //useSelector(getBrandingSettings);
384384
const { appType } = useContext(ExternalEditorContext);
385385
const [editName, setEditName] = useState(false);
386386
const [editing, setEditing] = useState(false);
@@ -694,7 +694,7 @@ export default function Header(props: HeaderProps) {
694694
// header in manager page
695695
export function AppHeader() {
696696
const user = useSelector(getUser);
697-
const brandingSettings = useSelector(getBrandingSettings);
697+
const brandingSettings = {}; //useSelector(getBrandingSettings);
698698

699699
const headerStart = (
700700
<StyledLink onClick={() => history.push(ALL_APPLICATIONS_URL)}>

‎client/packages/lowcoder/src/pages/editor/editorView.tsx

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,10 @@ import {
5555
} from "util/localStorageUtil";
5656
import { isAggregationApp } from "util/appUtils";
5757
import EditorSkeletonView from "./editorSkeletonView";
58-
import { getBrandingSettings, getCommonSettings } from "@lowcoder-ee/redux/selectors/commonSettingSelectors";
58+
import {
59+
// getBrandingSettings,
60+
getCommonSettings
61+
} from "@lowcoder-ee/redux/selectors/commonSettingSelectors";
5962
import { isEqual, noop } from "lodash";
6063
import { AppSettingContext, AppSettingType } from "@lowcoder-ee/comps/utils/appSettingContext";
6164
// import { BottomSkeleton } from "./bottom/BottomContent";
@@ -314,7 +317,7 @@ function EditorView(props: EditorViewProps) {
314317
const locationState = useLocation<UserGuideLocationState>().state;
315318
const showNewUserGuide = locationState?.showNewUserGuide;
316319
const showAppSnapshot = useSelector(showAppSnapshotSelector);
317-
const brandingSettings = useSelector(getBrandingSettings);
320+
const brandingSettings = {}; //useSelector(getBrandingSettings);
318321
const [showShortcutList, setShowShortcutList] = useState(false);
319322
const toggleShortcutList = useCallback(
320323
() => setShowShortcutList(!showShortcutList),

0 commit comments

Comments
 (0)