Skip to content

Commit 3abde55

Browse files
RecxsmacxRyukemeisterPeerRichromitg2
authored
fix: Auth page in settings design fixed (calcom#27294)
* fixed text issue * matched style of api keys page * o auth design fixed --------- Co-authored-by: Rajiv Sahal <sahalrajiv-extc@atharvacoe.ac.in> Co-authored-by: Peer Richelsen <peeroke@gmail.com> Co-authored-by: Romit <romitgabani@icloud.com> Co-authored-by: Romit <85230081+romitg2@users.noreply.github.com>
1 parent b45d7c1 commit 3abde55

3 files changed

Lines changed: 31 additions & 26 deletions

File tree

apps/web/modules/event-types/views/event-types-listing-view.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1105,4 +1105,4 @@ const EventTypesPage = ({ userEventGroupsData, user }: Props) => {
11051105

11061106
export const SearchContext: React.Context<SearchContextType | undefined> = SearchContextInternal;
11071107

1108-
export default EventTypesPage;
1108+
export default EventTypesPage;

apps/web/modules/settings/developer/oauth-clients-view.tsx

Lines changed: 29 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -112,30 +112,35 @@ const OAuthClientsView = () => {
112112
<SettingsHeader
113113
title={t("oauth_clients")}
114114
description={t("oauth_clients_description")}
115-
CTA={newOAuthClientButton}>
116-
{oAuthClients && oAuthClients.length > 0 ? (
117-
<OAuthClientsList
118-
clients={oAuthClients.map((client) => ({
119-
clientId: client.clientId,
120-
name: client.name,
121-
purpose: client.purpose,
122-
redirectUri: client.redirectUri,
123-
websiteUrl: client.websiteUrl,
124-
logo: client.logo,
125-
status: client.status,
126-
rejectionReason: client.rejectionReason,
127-
clientType: client.clientType,
128-
}))}
129-
onSelectClient={(client) => setSelectedClient(client)}
130-
/>
131-
) : (
132-
<EmptyScreen
133-
Icon="key"
134-
headline={t("no_oauth_clients")}
135-
description={t("no_oauth_clients_description")}
136-
buttonRaw={newOAuthClientButton}
137-
/>
138-
)}
115+
CTA={newOAuthClientButton}
116+
borderInShellHeader={true}>
117+
<div>
118+
{oAuthClients && oAuthClients.length > 0 ? (
119+
<div className="border-subtle rounded-b-lg border border-t-0">
120+
<OAuthClientsList
121+
clients={oAuthClients.map((client) => ({
122+
clientId: client.clientId,
123+
name: client.name,
124+
purpose: client.purpose,
125+
redirectUri: client.redirectUri,
126+
websiteUrl: client.websiteUrl,
127+
logo: client.logo,
128+
status: client.status,
129+
rejectionReason: client.rejectionReason,
130+
clientType: client.clientType,
131+
}))}
132+
onSelectClient={(client) => setSelectedClient(client)}
133+
/>
134+
</div>
135+
) : (
136+
<EmptyScreen
137+
Icon="key"
138+
headline={t("no_oauth_clients")}
139+
description={t("no_oauth_clients_description")}
140+
className="rounded-b-lg rounded-t-none border-t-0"
141+
buttonRaw={newOAuthClientButton}
142+
/>
143+
)}</div>
139144

140145
{submittedClient ? (
141146
<OAuthClientPreviewDialog

apps/web/modules/settings/oauth/OAuthClientsList.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ export const OAuthClientsList = ({
3434
const { t } = useLocale();
3535

3636
return (
37-
<div className="border-subtle rounded-lg border" data-testid="oauth-clients-list">
37+
<div data-testid="oauth-clients-list">
3838
{clients.map((client, index) => (
3939
<div
4040
key={client.clientId}

0 commit comments

Comments
 (0)