Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit5a9b97c

Browse files
branding updates
1 parentfc1f2aa commit5a9b97c

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-
exportinterfaceBrandingSettings{
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
exportfunctiongetThemeDetailName(key:keyofThemeDetail){
115115
switch(key){
Lines changed: 62 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,88 @@
11
importaxiosfrom'axios';
22

3+
exportinterfaceBrandingSettings{
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+
exportinterfaceBrandingConfig{
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
exportconstgetEnterpriseLicense=async()=>{
5-
constresponse=awaitaxios.get('/api/plugins/enterprise/license');
6-
returnresponse.data;
43+
constresponse=awaitaxios.get('/api/plugins/enterprise/license');
44+
returnresponse.data;
745
};
846

947
exportconstgetAuditLogs=async(params={})=>{
10-
constquery=newURLSearchParams(params).toString();
11-
constresponse=awaitaxios.get(`/api/plugins/enterprise/audit-logs${query ?`?${query}` :''}`);
12-
returnresponse.data;
48+
constquery=newURLSearchParams(params).toString();
49+
constresponse=awaitaxios.get(`/api/plugins/enterprise/audit-logs${query ?`?${query}` :''}`);
50+
returnresponse.data;
1351
};
1452

1553
exportconstgetAuditLogStatistics=async(groupByParam :string)=>{
16-
constresponse=awaitaxios.get(`/api/plugins/enterprise/audit-logs/statistics?groupByParam=${groupByParam}`);
17-
returnresponse.data;
54+
constresponse=awaitaxios.get(`/api/plugins/enterprise/audit-logs/statistics?groupByParam=${groupByParam}`);
55+
returnresponse.data;
1856
};
1957

2058
exportconstgetAppUsageLogs=async(params={})=>{
21-
constquery=newURLSearchParams(params).toString();
22-
constresponse=awaitaxios.get(`/api/plugins/enterprise/app-usage-logs${query ?`?${query}` :''}`);
23-
returnresponse.data;
59+
constquery=newURLSearchParams(params).toString();
60+
constresponse=awaitaxios.get(`/api/plugins/enterprise/app-usage-logs${query ?`?${query}` :''}`);
61+
returnresponse.data;
2462
};
2563

2664
exportconstgetAppUsageStatistics=async(groupByParam :string)=>{
27-
constresponse=awaitaxios.get(`/api/plugins/enterprise/app-usage-logs/statistics?groupByParam=${groupByParam}`);
28-
returnresponse.data;
65+
constresponse=awaitaxios.get(`/api/plugins/enterprise/app-usage-logs/statistics?groupByParam=${groupByParam}`);
66+
returnresponse.data;
2967
};
3068

3169

32-
exportconstgetBranding=async()=>{
33-
constresponse=awaitaxios.get('/api/plugins/enterprise/branding');
34-
returnresponse.data;
70+
exportconstgetBranding=async(orgId:string='')=>{
71+
constresponse=awaitaxios.get('/api/plugins/enterprise/branding?orgId='+orgId);
72+
returnresponse.data;
3573
};
3674

3775
exportconstcreateBranding=async(brandingData :any)=>{
38-
constresponse=awaitaxios.post('/api/plugins/enterprise/branding',brandingData);
39-
returnresponse.data;
76+
letresponse;
77+
if(brandingData.id){
78+
response=awaitaxios.put(`/api/plugins/enterprise/branding?brandId=${brandingData.id}`,brandingData);
79+
}else{
80+
response=awaitaxios.post('/api/plugins/enterprise/branding',brandingData);
81+
}
82+
returnresponse.data;
4083
};
4184

4285
exportconstupdateBranding=async(brandingData :any)=>{
43-
constresponse=awaitaxios.put('/api/plugins/enterprise/branding',brandingData);
44-
returnresponse.data;
86+
constresponse=awaitaxios.put('/api/plugins/enterprise/branding',brandingData);
87+
returnresponse.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
importstyledfrom"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
exportfunctionLayout(props:LayoutProps){
61-
constbrandingSettings=useSelector(getBrandingSettings);
61+
constbrandingSettings={};//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
importhistoryfrom"../../util/history";
14-
import{getBrandingSettings}from"@lowcoder-ee/redux/selectors/commonSettingSelectors";
14+
//import { getBrandingSettings } from "@lowcoder-ee/redux/selectors/commonSettingSelectors";
1515

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

@@ -24,7 +24,7 @@ const Wrapper = styled.div`
2424
exportconstSideBarSection=(props:SideBarSectionProps)=>{
2525
constuser=useSelector<AppState,User>(getUser);
2626
constapplications=useSelector<AppState,ApplicationMeta[]>(normalAppListSelector);
27-
constbrandingSettings=useSelector(getBrandingSettings);
27+
constbrandingSettings={};//useSelector(getBrandingSettings);
2828
constcurrentPath=useLocation().pathname;
2929
constisShow=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
importUserApifrom"@lowcoder-ee/api/userApi";
6565
import{validateResponse}from"@lowcoder-ee/api/apiUtils";
6666
importProfileImagefrom"./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
constdispatch=useDispatch();
381381
constshowAppSnapshot=useSelector(showAppSnapshotSelector);
382382
const{selectedSnapshot, isArchivedSnapshot}=useSelector(getSelectedAppSnapshot);
383-
constbrandingSettings=useSelector(getBrandingSettings);
383+
constbrandingSettings={};//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
exportfunctionAppHeader(){
696696
constuser=useSelector(getUser);
697-
constbrandingSettings=useSelector(getBrandingSettings);
697+
constbrandingSettings={};//useSelector(getBrandingSettings);
698698

699699
constheaderStart=(
700700
<StyledLinkonClick={()=>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
importEditorSkeletonViewfrom"./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
constlocationState=useLocation<UserGuideLocationState>().state;
315318
constshowNewUserGuide=locationState?.showNewUserGuide;
316319
constshowAppSnapshot=useSelector(showAppSnapshotSelector);
317-
constbrandingSettings=useSelector(getBrandingSettings);
320+
constbrandingSettings={};//useSelector(getBrandingSettings);
318321
const[showShortcutList,setShowShortcutList]=useState(false);
319322
consttoggleShortcutList=useCallback(
320323
()=>setShowShortcutList(!showShortcutList),

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp