Skip to content

Remove CrowdsignalOauthMasterbar and usage in logged-out #103845

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 3, 2025
Merged

Remove CrowdsignalOauthMasterbar and usage in logged-out #103845

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3d92836
Remove CrowdsignalOauthMasterbar and references/use in logged-out
chriskmnds May 30, 2025
4add746
more cleanup
chriskmnds May 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions client/layout/logged-out.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,11 +167,6 @@ const LayoutLoggedOut = ( {
classes.dops = true;
classes[ oauth2Client.name ] = true;

// Force masterbar for all Crowdsignal OAuth pages
if ( isCrowdsignalOAuth2Client( oauth2Client ) ) {
classes[ 'has-no-masterbar' ] = false;
}

masterbar = <OauthClientMasterbar oauth2Client={ oauth2Client } />;
} else if (
config.isEnabled( 'jetpack-cloud' ) ||
Expand Down
74 changes: 0 additions & 74 deletions client/layout/masterbar/crowdsignal.jsx
View file
Open in desktop

This file was deleted.

106 changes: 0 additions & 106 deletions client/layout/masterbar/crowdsignal.scss
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions client/layout/masterbar/oauth-client.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,12 @@ import PropTypes from 'prop-types';
import A4ALogo from 'calypso/a8c-for-agencies/components/a4a-logo';
import JetpackLogo from 'calypso/components/jetpack-logo';
import {
isCrowdsignalOAuth2Client,
isWooOAuth2Client,
isJetpackCloudOAuth2Client,
isA4AOAuth2Client,
isBlazeProOAuth2Client,
} from 'calypso/lib/oauth2-clients';
import BlazeProOauthMasterbar from './blaze-pro';
import CrowdsignalOauthMasterbar from './crowdsignal';
import WooOauthMasterbar from './woo';

import './oauth-client.scss';
Expand Down Expand Up @@ -61,10 +59,6 @@ const DefaultOauthClientMasterbar = ( { oauth2Client } ) => (
);

const OauthClientMasterbar = ( { oauth2Client } ) => {
if ( isCrowdsignalOAuth2Client( oauth2Client ) ) {
return <CrowdsignalOauthMasterbar oauth2Client={ oauth2Client } />;
}

if ( isWooOAuth2Client( oauth2Client ) ) {
return <WooOauthMasterbar />;
}
Expand Down
11 changes: 0 additions & 11 deletions client/signup/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,17 +41,6 @@ body.is-section-signup {
display: none;
}

// Force the masterbar for Crowdsignal OAuth pages
.crowdsignal {
.masterbar__crowdsignal {
display: block;
}

.layout__content {
padding: 140px 0 0;
}
}

.layout__secondary {
background: var(--color-primary);
border: 0;
Expand Down