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

🪟 🎉 Free connector program enrollment modal #21396

Merged
merged 15 commits into from
Jan 17, 2023
Merged

🪟 🎉 Free connector program enrollment modal #21396

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
4429b88
add svgs
josephkmh Jan 13, 2023
070bbed
add enrollment modal logic
josephkmh Jan 13, 2023
3d1fea3
syntax cleanup
josephkmh Jan 13, 2023
517abd6
Merge branch 'master' into joey/free-connectors-program-enrollment-modal
josephkmh Jan 13, 2023
f8f15bb
Merge branch 'master' into joey/free-connectors-program-enrollment-modal
josephkmh Jan 13, 2023
7198631
fix text sizing & spacing
josephkmh Jan 13, 2023
5e939ce
Merge branch 'master' into joey/free-connectors-program-enrollment-modal
josephkmh Jan 13, 2023
b4d614e
folder & file renaming
josephkmh Jan 13, 2023
dd70f8c
shorten names
josephkmh Jan 13, 2023
927f6ab
rename folder, use hook instead of EnrollmentButton
josephkmh Jan 16, 2023
4e4778f
import svgs directly
josephkmh Jan 16, 2023
7d73656
use width variable
josephkmh Jan 16, 2023
4ff5e54
remove more anonymous function wrappers
josephkmh Jan 16, 2023
3e88078
remove svg components
josephkmh Jan 17, 2023
8b68147
Merge branch 'master' into joey/free-connectors-program-enrollment-modal
josephkmh Jan 17, 2023
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
2 changes: 1 addition & 1 deletion airbyte-webapp/src/components/ui/Button/types.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from "react";

type ButtonSize = "xs" | "sm" | "lg";
type ButtonVariant = "primary" | "secondary" | "danger" | "light" | "clear" | "dark";
export type ButtonVariant = "primary" | "secondary" | "danger" | "light" | "clear" | "dark";

export interface ButtonProps extends React.ButtonHTMLAttributes<HTMLButtonElement> {
clickable?: boolean;
Expand Down
1 change: 1 addition & 0 deletions airbyte-webapp/src/hooks/services/Experiment/experiments.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,5 @@ export interface Experiments {
"connection.autoDetectSchemaChanges": boolean;
"connection.columnSelection": boolean;
"connection.newTableDesign": boolean;
"workspace.freeConnectorsProgram.visible": boolean;
}
9 changes: 8 additions & 1 deletion airbyte-webapp/src/locales/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -743,5 +743,12 @@

"jobs.noAttemptsFailure": "Failed to start job.",

"cloudApi.loginCallbackUrlError": "There was an error connecting to the developer portal. Please try again."
"cloudApi.loginCallbackUrlError": "There was an error connecting to the developer portal. Please try again.",

"freeConnectorProgram.enrollmentModal.title": "Free connector program",
"freeConnectorProgram.enrollmentModal.free": "<p1>Alpha and Beta Connectors are free while you're in the program.</p1><p2>The whole Connection is free until both Connectors have move into General Availability (GA)</p2>",
"freeConnectorProgram.enrollmentModal.emailNotification": "We will let you know through email before a Connector you use moves to GA",
"freeConnectorProgram.enrollmentModal.cardOnFile": "When both Connectors are in GA, the Connection will no longer be free. You'll need to have a credit card on file to enroll so Airbyte can handle a Connection's transition to paid service.",
"freeConnectorProgram.enrollmentModal.cancelButtonText": "Cancel",
"freeConnectorProgram.enrollmentModal.enrollButtonText": "Enroll now!"
}
63 changes: 63 additions & 0 deletions .../packages/cloud/components/experiments/FreeConnectorProgram/EnrollmentButton/CardsSvg.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
export const CardSVG = () => {
return (
<svg xmlns="http://www.w3.org/2000/svg" width="65" height="44" fill="none">
<path
fill="#FDF8E1"
d="m45.392 9.52 16.089 6.316c2.142.84 3.214 3.298 2.38 5.46L56.59 40.17c-.833 2.163-3.268 3.244-5.41 2.404L24.515 32.109l-7.49-2.85 22.987-20.7.991-.9 4.388 1.862Z"
/>
<path fill="#CBC8FF" d="M58.873 22.467 40.21 14.693l2.214 6.734 14.698 6.033 1.75-4.993Z" />
<path
fill="#CBC8FF"
d="M38.23 29.26H4.937c-2.18 0-3.963-1.8-3.963-4v-20c0-2.2 1.783-4 3.963-4H38.23c2.18 0 3.963 1.8 3.963 4v20c0 2.2-1.783 4-3.963 4Z"
/>
<path
fill="#1A194D"
d="M38.23 30.06H4.936c-2.623 0-4.756-2.153-4.756-4.8v-20c0-2.647 2.133-4.8 4.756-4.8h33.292c2.623 0 4.757 2.153 4.757 4.8v20c0 2.646-2.134 4.8-4.757 4.8Zm-33.293-28c-1.749 0-3.171 1.435-3.171 3.2v20c0 1.765 1.422 3.2 3.17 3.2H38.23c1.75 0 3.171-1.435 3.171-3.2v-20c0-1.765-1.422-3.2-3.17-3.2H4.936Z"
/>
<path
fill="#1A194D"
d="M52.686 43.66a4.9 4.9 0 0 1-1.796-.342L24.228 32.853a.8.8 0 0 1-.45-1.035.788.788 0 0 1 1.025-.455l26.662 10.465c1.74.68 3.709-.192 4.386-1.948l7.273-18.874c.676-1.756-.19-3.742-1.93-4.425l-16.09-6.316a.8.8 0 0 1-.45-1.035.788.788 0 0 1 1.025-.455l16.089 6.315c2.556 1.003 3.826 3.917 2.832 6.496L57.327 40.46a4.983 4.983 0 0 1-4.64 3.2Z"
/>
<path
fill="#1A194D"
d="M56.678 27.614a.407.407 0 0 1-.148-.03l-11.96-4.852a.4.4 0 0 1-.219-.52.394.394 0 0 1 .516-.222l11.959 4.853a.4.4 0 0 1-.148.77Z"
/>
<path
fill="#1A194D"
d="M50.593 38.697c-.373 0-.752-.068-1.12-.213l-15.404-6.06a.401.401 0 0 1-.225-.518c.08-.205.31-.31.513-.228L49.76 37.74a2.305 2.305 0 0 0 2.99-1.327l5.773-14.642a2.33 2.33 0 0 0-.043-1.779 2.302 2.302 0 0 0-1.272-1.234l-12.237-4.803a.4.4 0 0 1-.225-.517.395.395 0 0 1 .512-.227l12.237 4.802c1.593.625 2.386 2.442 1.766 4.05l-5.775 14.642a3.106 3.106 0 0 1-2.893 1.993Z"
/>
<path
fill="#1A194D"
d="M58.49 22.622c-.05 0-.1-.01-.149-.03L44.964 17.18a.4.4 0 0 1-.22-.52.394.394 0 0 1 .516-.222l13.377 5.413a.401.401 0 0 1-.147.77Z"
/>
<path
fill="#1A194D"
d="M54.588 26.7a.398.398 0 0 1-.396-.384l-.21-5.484a.4.4 0 0 1 .381-.416h.016c.212 0 .388.169.396.384l.21 5.484a.4.4 0 0 1-.381.416h-.016Zm-2.863-1.333a.398.398 0 0 1-.396-.384l-.21-5.484a.4.4 0 0 1 .38-.416h.017c.212 0 .387.169.396.384l.21 5.484a.4.4 0 0 1-.381.416h-.016Zm-2.922-1.156a.398.398 0 0 1-.396-.384l-.21-5.484a.4.4 0 0 1 .381-.416h.016c.212 0 .387.169.396.384l.21 5.484a.4.4 0 0 1-.381.416h-.016Z"
/>
<path
fill="#FF5E7B"
d="M26.34 16.06c-.736 0-1.442.337-1.962.937-.52.6-.813 1.414-.813 2.263s.292 1.663.813 2.263c.52.6 1.226.937 1.961.937.736 0 1.442-.337 1.962-.937.52-.6.813-1.414.813-2.263s-.293-1.663-.813-2.263c-.52-.6-1.226-.937-1.962-.937Z"
/>
<path
fill="#1A194D"
d="M26.34 22.86c-1.75 0-3.171-1.615-3.171-3.6s1.421-3.6 3.17-3.6c1.749 0 3.17 1.615 3.17 3.6s-1.421 3.6-3.17 3.6Zm0-6.4c-1.312 0-2.379 1.256-2.379 2.8 0 1.544 1.067 2.8 2.378 2.8 1.311 0 2.378-1.256 2.378-2.8 0-1.544-1.066-2.8-2.378-2.8Z"
/>
<path
fill="#F8D54E"
d="M30.304 17.414a2.88 2.88 0 0 1 2.157-.978c1.616 0 2.926 1.35 2.926 3.016s-1.31 3.016-2.926 3.016a2.883 2.883 0 0 1-2.211-1.042"
/>
<path
fill="#1A194D"
d="M32.461 22.867a3.28 3.28 0 0 1-2.513-1.183.401.401 0 0 1 .046-.563.393.393 0 0 1 .558.046c.48.572 1.177.9 1.91.9 1.394 0 2.529-1.173 2.529-2.616 0-1.442-1.135-2.616-2.53-2.616-.705 0-1.384.308-1.862.846a.392.392 0 0 1-.56.03.403.403 0 0 1-.03-.565 3.287 3.287 0 0 1 2.452-1.11c1.833 0 3.322 1.531 3.322 3.415 0 1.884-1.489 3.416-3.322 3.416ZM13.261 5.26H9.296a.398.398 0 0 1-.397-.4c0-.22.178-.4.397-.4h3.963c.219 0 .396.18.396.4 0 .22-.176.4-.396.4Z"
/>
<path
fill="#1A194D"
d="M35.92 26.06H7.245c-1.71 0-3.101-1.405-3.101-3.13V7.26c0-.22.178-.4.396-.4.22 0 .397.18.397.4v15.67c0 1.284 1.036 2.33 2.308 2.33H35.92c1.273 0 2.31-1.046 2.31-2.33V7.59c0-1.284-1.037-2.33-2.31-2.33H15.638a.398.398 0 0 1-.396-.4c0-.22.177-.4.396-.4H35.92c1.71 0 3.102 1.404 3.102 3.13v15.34c0 1.725-1.392 3.13-3.102 3.13ZM7.711 5.26h-.793a.398.398 0 0 1-.396-.4c0-.22.178-.4.396-.4h.793c.219 0 .396.18.396.4 0 .22-.176.4-.396.4Z"
/>
<path
fill="#1A194D"
d="M33.077 10.06H8.504a.398.398 0 0 1-.397-.4c0-.22.178-.4.397-.4h24.573c.219 0 .396.18.396.4 0 .22-.176.4-.396.4Zm-16.646 3.2H8.504a.398.398 0 0 1-.397-.4c0-.22.178-.4.397-.4h7.927c.218 0 .396.18.396.4 0 .22-.177.4-.396.4Z"
/>
</svg>
);
};
Loading