Skip to content
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

Refactor: change "Add Form" button link and styles #7462

Merged
merged 6 commits into from
Jul 30, 2024
Merged

Refactor: change "Add Form" button link and styles #7462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
03a809b
refactor: change add form link and use WP button classes
glaubersilva Jul 25, 2024
1c4a4b6
refactor: change button height
glaubersilva Jul 25, 2024
c87a095
refactor: replace button with link tag
glaubersilva Jul 29, 2024
630963f
refactor: change CSS classes
glaubersilva Jul 30, 2024
9d1eadd
refactor: update styles
glaubersilva Jul 30, 2024
c126903
Merge branch 'develop' into refactor/add-form-button-GIVE-999
glaubersilva Jul 30, 2024
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
40 changes: 24 additions & 16 deletions src/DonationForms/V2/resources/components/DonationFormsListTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ declare global {
tooltipActionUrl: string;
migrationApiRoot: string;
apiRoot: string;
authors: Array<{ id: string | number; name: string }>;
table: { columns: Array<object> };
authors: Array<{id: string | number; name: string}>;
table: {columns: Array<object>};
pluginUrl: string;
showUpgradedTooltip: boolean;
isMigrated: boolean;
Expand Down Expand Up @@ -82,15 +82,13 @@ const donationFormsFilters: Array<FilterConfig> = [
const columnFilters: Array<ColumnFilterConfig> = [
{
column: 'title',
filter: item => {
filter: (item) => {
if (item?.v3form) {
return (
<div className={styles.migratedForm}>
<div className={styles.tooltipContainer}>
<CubeIcon />
<div className={styles.tooltip}>
{__('Uses the Visual Form Builder', 'give')}
</div>
<div className={styles.tooltip}>{__('Uses the Visual Form Builder', 'give')}</div>
</div>
<Interweave attributes={{className: 'interweave'}} content={item?.title} />
</div>
Expand All @@ -108,13 +106,18 @@ const columnFilters: Array<ColumnFilterConfig> = [
<div className={styles.upgradedForm}>
<div className={styles.tooltipContainer}>
<div className={styles.tooltip}>
{__('The name of this form is already associated with an upgraded form. You can safely delete this form', 'give')}.
{__(
'The name of this form is already associated with an upgraded form. You can safely delete this form',
'give'
)}
.
<div
className={styles.link}
onClick={(e) => {
e.currentTarget.parentElement.remove();
fetch(window.GiveDonationForms.tooltipActionUrl, {method: 'POST'});
}}>
}}
>
{__('Got it', 'give')}
</div>
</div>
Expand All @@ -126,7 +129,7 @@ const columnFilters: Array<ColumnFilterConfig> = [

return <InterweaveSSR column={column} item={item} />;
},
}
},
];

const donationFormsBulkActions: Array<BulkActionsConfig> = [
Expand Down Expand Up @@ -236,10 +239,9 @@ const ListTableBlankSlate = (
);

export default function DonationFormsListTable() {

const [state, setState] = useState<OnboardingStateProps>({
showFeatureNoticeDialog: false
})
showFeatureNoticeDialog: false,
});

return (
<OnboardingContext.Provider value={[state, setState]}>
Expand All @@ -255,12 +257,18 @@ export default function DonationFormsListTable() {
columnFilters={columnFilters}
banner={Onboarding}
>
<a href={'post-new.php?post_type=give_forms'} className={styles.addFormButton}>
{__('Add Form', 'give')}
</a>
<button className={styles.addFormButton} onClick={showLegacyDonationForms}>
<button
className={`button button-secondary ${styles.button} ${styles.buttonSecondary}`}
onClick={showLegacyDonationForms}
>
{__('Switch to Legacy View')}
</button>
<a
href={'edit.php?post_type=give_forms&page=givewp-form-builder'}
className={`button button-primary ${styles.button}`}
>
{__('Add Form', 'give')}
</a>
</ListTablePage>
</OnboardingContext.Provider>
);
Expand Down
16 changes: 16 additions & 0 deletions src/Views/Components/ListTable/ListTablePage/ListTablePage.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,22 @@
justify-content: flex-end;
}

.button:is(:global(.button)) {
border-radius: 0.125rem;
font-size: 0.875rem;
font-weight: 600;
line-height: 1.25rem;
padding: 0.5rem 1rem;
}

.buttonSecondary:is(:global(.button)) {
background-color: #fff;

&:hover {
background-color: #f6f7f7;
}
}

.addFormButton {
$depth: 0px 1px 0px rgba(0, 0, 0, 0.25);

Expand Down
Loading